diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index f2096b7968827712150b6d89bdf431ca0d196f9b..26d2182e95fbe6c5c9b5c68bd44d73cf819f4e8b 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -610,20 +610,6 @@ Foam::Time& Foam::Time::operator+=(const dimensionedScalar& deltaT)
Foam::Time& Foam::Time::operator+=(const scalar deltaT)
{
- readModifiedObjects();
-
- if (!subCycling_)
- {
- if (timeIndex_ == startTimeIndex_)
- {
- functionObjects_.start();
- }
- else
- {
- functionObjects_.execute();
- }
- }
-
setDeltaT(deltaT);
operator++();
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 243799231f2a920d880e78a41ab3ca41fcafd922..2f0987d16b7e2b4ebafd8ce7ad63184696f49d97 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -79,12 +79,7 @@ bool Foam::dictionary::substituteKeyword(const word& keyword)
{
const dictionary& addDict = ePtr->dict();
- for
- (
- IDLList<entry>::const_iterator iter = addDict.begin();
- iter != addDict.end();
- ++iter
- )
+ forAllConstIter(IDLList<entry>, addDict, iter)
{
add(iter());
}
@@ -152,15 +147,22 @@ void Foam::dictionary::write(Ostream& os, bool subDict) const
os << nl << indent << token::BEGIN_BLOCK << incrIndent << nl;
}
- for
- (
- IDLList<entry>::const_iterator iter = begin();
- iter != end();
- ++iter
- )
+ forAllConstIter(IDLList<entry>, *this, iter)
{
- // Write entry & follow with carriage return.
- os << *iter;
+ const entry& e = *iter;
+
+ // Write entry
+ os << e;
+
+ // Add new line if applicable
+ if
+ (
+ (e.isDict() || (!e.isDict() && parent()==dictionary::null))
+ && e != *last()
+ )
+ {
+ os << nl;
+ }
// Check stream before going to next entry.
if (!os.good())
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index c6a95a976bd247715d2490461c4100bb76f13030..34a4606e088ade62d6f128c2c021c9524e81c33c 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -97,6 +97,7 @@ $(derivedFvPatchFields)/fixedFluxBoussinesqBuoyantPressure/fixedFluxBoussinesqBu
$(derivedFvPatchFields)/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
$(derivedFvPatchFields)/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
$(derivedFvPatchFields)/fixedNormalSlip/fixedNormalSlipFvPatchFields.C
+$(derivedFvPatchFields)/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
$(derivedFvPatchFields)/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
$(derivedFvPatchFields)/freestream/freestreamFvPatchFields.C
$(derivedFvPatchFields)/freestreamPressure/freestreamPressureFvPatchScalarField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
new file mode 100644
index 0000000000000000000000000000000000000000..0f01c960b00ee684bfa99b2b51eb0fb2e2c0aa16
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedPressureCompressibleDensityFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+fixedPressureCompressibleDensityFvPatchScalarField::
+fixedPressureCompressibleDensityFvPatchScalarField
+(
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF
+)
+:
+ fixedValueFvPatchField<scalar>(p, iF),
+ pName_("pNameIsUndefined")
+{}
+
+
+fixedPressureCompressibleDensityFvPatchScalarField::
+fixedPressureCompressibleDensityFvPatchScalarField
+(
+ const fixedPressureCompressibleDensityFvPatchScalarField& ptf,
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+ pName_(ptf.pName_)
+{}
+
+
+fixedPressureCompressibleDensityFvPatchScalarField::
+fixedPressureCompressibleDensityFvPatchScalarField
+(
+ const fvPatch& p,
+ const DimensionedField<scalar, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fixedValueFvPatchField<scalar>(p, iF, dict),
+ pName_(dict.lookup("p"))
+{}
+
+
+fixedPressureCompressibleDensityFvPatchScalarField::
+fixedPressureCompressibleDensityFvPatchScalarField
+(
+ const fixedPressureCompressibleDensityFvPatchScalarField& ptf
+)
+:
+ fixedValueFvPatchField<scalar>(ptf),
+ pName_(ptf.pName_)
+{}
+
+
+fixedPressureCompressibleDensityFvPatchScalarField::
+fixedPressureCompressibleDensityFvPatchScalarField
+(
+ const fixedPressureCompressibleDensityFvPatchScalarField& ptf,
+ const DimensionedField<scalar, volMesh>& iF
+)
+:
+ fixedValueFvPatchField<scalar>(ptf, iF),
+ pName_(ptf.pName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void fixedPressureCompressibleDensityFvPatchScalarField::updateCoeffs()
+{
+ if (updated())
+ {
+ return;
+ }
+
+ const fvPatchField<scalar>& pp =
+ patch().lookupPatchField<volScalarField, scalar>(pName_);
+
+ const dictionary& thermoProps =
+ db().lookupObject<IOdictionary>("thermodynamicProperties");
+
+ const scalar rholSat =
+ dimensionedScalar(thermoProps.lookup("rholSat")).value();
+
+ const scalar pSat =
+ dimensionedScalar(thermoProps.lookup("pSat")).value();
+
+ const scalar psil = dimensionedScalar(thermoProps.lookup("psil")).value();
+
+ operator==(rholSat + psil*(pp - pSat));
+
+ fixedValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void fixedPressureCompressibleDensityFvPatchScalarField::write
+(
+ Ostream& os
+) const
+{
+ fvPatchField<scalar>::write(os);
+ os.writeKeyword("p") << pName_ << token::END_STATEMENT << nl;
+ writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+ fvPatchScalarField,
+ fixedPressureCompressibleDensityFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H
new file mode 100644
index 0000000000000000000000000000000000000000..fbd2616aab6de5791a513df45ffd4e72eef858cd
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::fixedPressureCompressibleDensityFvPatchScalarField
+
+Description
+ Calculate compressible density as a function of pressure and fluid
+ properties.
+
+ Example of the boundary condition specification:
+ @verbatim
+ inlet
+ {
+ type fixedPressureCompressibleDensity;
+ p p; // Name of static pressure field
+ value uniform 1; // Initial value
+ }
+ @endverbatim
+
+SourceFiles
+ fixedPressureCompressibleDensityFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedPressureCompressibleDensityFvPatchScalarField_H
+#define fixedPressureCompressibleDensityFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class fixedPressureCompressibleDensityFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class fixedPressureCompressibleDensityFvPatchScalarField
+:
+ public fixedValueFvPatchScalarField
+{
+ // Private data
+
+ //- Name of static pressure field
+ word pName_;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("fixedPressureCompressibleDensity");
+
+
+ // Constructors
+
+ //- Construct from patch and internal field
+ fixedPressureCompressibleDensityFvPatchScalarField
+ (
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&
+ );
+
+ //- Construct from patch, internal field and dictionary
+ fixedPressureCompressibleDensityFvPatchScalarField
+ (
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&,
+ const dictionary&
+ );
+
+ //- Construct by mapping given
+ // fixedPressureCompressibleDensityFvPatchScalarField
+ // onto a new patch
+ fixedPressureCompressibleDensityFvPatchScalarField
+ (
+ const fixedPressureCompressibleDensityFvPatchScalarField&,
+ const fvPatch&,
+ const DimensionedField<scalar, volMesh>&,
+ const fvPatchFieldMapper&
+ );
+
+ //- Construct as copy
+ fixedPressureCompressibleDensityFvPatchScalarField
+ (
+ const fixedPressureCompressibleDensityFvPatchScalarField&
+ );
+
+ //- Construct and return a clone
+ virtual tmp<fvPatchScalarField> clone() const
+ {
+ return tmp<fvPatchScalarField>
+ (
+ new fixedPressureCompressibleDensityFvPatchScalarField(*this)
+ );
+ }
+
+ //- Construct as copy setting internal field reference
+ fixedPressureCompressibleDensityFvPatchScalarField
+ (
+ const fixedPressureCompressibleDensityFvPatchScalarField&,
+ const DimensionedField<scalar, volMesh>&
+ );
+
+ //- Construct and return a clone setting internal field reference
+ virtual tmp<fvPatchScalarField> clone
+ (
+ const DimensionedField<scalar, volMesh>& iF
+ ) const
+ {
+ return tmp<fvPatchScalarField>
+ (
+ new fixedPressureCompressibleDensityFvPatchScalarField
+ (
+ *this,
+ iF
+ )
+ );
+ }
+
+
+ // Member functions
+
+ //- Update the coefficients associated with the patch field
+ virtual void updateCoeffs();
+
+ //- Write
+ virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C
index 3e9ec64a8784ebcc6fd8760edd01c8f7c5697055..12db67822b324e48c1d4ab4aa4685834887566a0 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C
@@ -104,7 +104,7 @@ void pressureInletUniformVelocityFvPatchVectorField::updateCoeffs()
pressureInletVelocityFvPatchVectorField::updateCoeffs();
- operator==(patch().nf()*sum(patch().Sf() & *this)/sum(patch().magSf()));
+ operator==(patch().nf()*gSum(patch().Sf() & *this)/gSum(patch().magSf()));
}
@@ -115,7 +115,7 @@ void pressureInletUniformVelocityFvPatchVectorField::operator=
const fvPatchField<vector>& pvf
)
{
- operator==(patch().nf()*sum(patch().Sf() & pvf)/sum(patch().magSf()));
+ operator==(patch().nf()*gSum(patch().Sf() & pvf)/gSum(patch().magSf()));
}
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index 0e71e1e4d75a13cab7b3ffd02bb8b12971382da2..1af26992010a1e8d1cf4ab5a780eacddde5237a3 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -297,7 +297,7 @@ bool Foam::parcel::move(spray& sDB)
ms() -= ms()*(oTotMass-m())/oTotMass;
// remove parcel if it is 'small'
- if (m() < 1.0e-20)
+ if (m() < 1.0e-12)
{
keepParcel = false;
@@ -574,6 +574,56 @@ void Foam::parcel::updateParcelProperties
// Prevent droplet temperature to go too low
// Mainly a numerical stability issue
Tnew = max(200.0, Tnew);
+ scalar Td = Tnew;
+
+ scalar pAtSurface = fuels.pv(pg, Td, X());
+ scalar pCompare = 0.999*pg;
+ scalar boiling = pAtSurface >= pCompare;
+ if (boiling)
+ {
+ // can not go above boiling temperature
+ scalar Terr = 1.0e-3;
+ label n=0;
+ scalar dT = 1.0;
+ scalar pOld = pAtSurface;
+ while (dT > Terr)
+ {
+ n++;
+ pAtSurface = fuels.pv(pg, Td, X());
+ if ((pAtSurface < pCompare) && (pOld < pCompare))
+ {
+ Td += dT;
+ }
+ else
+ {
+ if ((pAtSurface > pCompare) && (pOld > pCompare))
+ {
+ Td -= dT;
+ }
+ else
+ {
+ dT *= 0.5;
+ if ((pAtSurface > pCompare) && (pOld < pCompare))
+ {
+ Td -= dT;
+ }
+ else
+ {
+ Td += dT;
+ }
+ }
+ }
+ pOld = pAtSurface;
+ if (debug)
+ {
+ if (n>100)
+ {
+ Info << "n = " << n << ", T = " << Td << ", pv = " << pAtSurface << endl;
+ }
+ }
+ }
+ Tnew = Td;
+ }
}
// Evaporate droplet!
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
index e92eacbbd7acc208dafb5e6ce076aeaa818e6764..2b5b4f4ae5259d787b165eb4777ddb913bf727f6 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
@@ -90,16 +90,10 @@ public:
:
liquid(60.056, 705.0, 9.050e+6, 0.218, 0.337, 405.85, 9.3131e+1, 465.0, 1.52e-29, 0.3449, 4.7813e+4),
rho_(1230.006936, 0, 0, 0, 0, 0),
- pv_(12.06, -3992.0, 0, 0, 0),
-// hl_(1463034.50113228, 0, 0, 0, 0, 0),
-// NN. we cant use constant heat of vapourisation, the below value is linear (sqrt) interpolation to critical temp
+ pv_(3015.15611544, -185497.059684, -430.223621983, 0.00017405122622, 2.0),
hl_(705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0),
cp_(2006.46063673904, 0, 0, 0, 0, 0),
- // NN: enthalpy, h_, is not used in the sprayModel.
- // For consistency, the enthalpy is derived from hlat and hl.
- // It is, however, convenient to have it available.
h_(-6154107.41641135, 2006.46063673904, 0, 0, 0, 0),
-
cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41),
B_(-0.000383641934194752, 0.447249234048222, -469062.208605302, 5.5628080458239e+18, -2.3040162514986e+21),
mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
@@ -107,7 +101,7 @@ public:
K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
Kg_(6.977e-05, 1.1243, 844.9, -148850),
sigma_(705.0, 1.0, 0.0, 0.0, 0.0, 0), // set to constant
- D_(147.18, 20.1, 60.056, 28) // NN: Same as nHeptane
+ D_(147.18, 20.1, 60.056, 28) // Same as nHeptane
{}
CH4N2O
(
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index e0e7c1cccd499653b85f382e95a62b4710c40dee..6521d8130c401d89f9b526f6497294210b00eb3e 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -337,7 +337,7 @@ void LRR::correct()
RASModel::correct();
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
- volScalarField G("G", 0.5*tr(P));
+ volScalarField G("G", 0.5*mag(tr(P)));
// Update espsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
@@ -376,7 +376,7 @@ void LRR::correct()
{
label faceCelli = curPatch.faceCells()[facei];
P[faceCelli]
- *= min(G[faceCelli]/(0.5*tr(P[faceCelli]) + SMALL), 100.0);
+ *= min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 100.0);
}
}
}
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 7f7b91a91af4d866e3639348360cc0883dc602ba..4a9987131f24f15042be7ef406404fceb7fc31a8 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -367,7 +367,7 @@ void LaunderGibsonRSTM::correct()
}
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
- volScalarField G("G", 0.5*tr(P));
+ volScalarField G("G", 0.5*mag(tr(P)));
// Update espsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
@@ -406,7 +406,7 @@ void LaunderGibsonRSTM::correct()
{
label faceCelli = curPatch.faceCells()[facei];
P[faceCelli] *=
- min(G[faceCelli]/(0.5*tr(P[faceCelli]) + SMALL), 100.0);
+ min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 100.0);
}
}
}
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index a0fd4c9ebf0f48193b7721ad563e029ce772dd84..f720a0312d932dc4a06dfbc94e3909feef52df99 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -297,7 +297,7 @@ void LRR::correct()
}
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
- volScalarField G("G", 0.5*tr(P));
+ volScalarField G("G", 0.5*mag(tr(P)));
// Update espsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
@@ -307,6 +307,7 @@ void LRR::correct()
(
fvm::ddt(epsilon_)
+ fvm::div(phi_, epsilon_)
+ - fvm::Sp(fvc::div(phi_), epsilon_)
//- fvm::laplacian(Ceps*(K/epsilon_)*R, epsilon_)
- fvm::laplacian(DepsilonEff(), epsilon_)
==
@@ -336,7 +337,7 @@ void LRR::correct()
{
label faceCelli = curPatch.faceCells()[facei];
P[faceCelli]
- *= min(G[faceCelli]/(0.5*tr(P[faceCelli]) + SMALL), 1.0);
+ *= min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 1.0);
}
}
}
@@ -346,6 +347,7 @@ void LRR::correct()
(
fvm::ddt(R_)
+ fvm::div(phi_, R_)
+ - fvm::Sp(fvc::div(phi_), R_)
//- fvm::laplacian(Cs*(k_/epsilon_)*R_, R_)
- fvm::laplacian(DREff(), R_)
+ fvm::Sp(Clrr1_*epsilon_/k_, R_)
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 48f4c5ab7ca4e09ed1cbc58cbd7efccf237e3c3d..6f130f2a31256f2c2bc4ef475e6dff780df0c3d0 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -329,7 +329,7 @@ void LaunderGibsonRSTM::correct()
}
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
- volScalarField G("G", 0.5*tr(P));
+ volScalarField G("G", 0.5*mag(tr(P)));
// Update espsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
@@ -339,6 +339,7 @@ void LaunderGibsonRSTM::correct()
(
fvm::ddt(epsilon_)
+ fvm::div(phi_, epsilon_)
+ - fvm::Sp(fvc::div(phi_), epsilon_)
//- fvm::laplacian(Ceps*(k_/epsilon_)*R_, epsilon_)
- fvm::laplacian(DepsilonEff(), epsilon_)
==
@@ -368,7 +369,7 @@ void LaunderGibsonRSTM::correct()
{
label faceCelli = curPatch.faceCells()[facei];
P[faceCelli] *=
- min(G[faceCelli]/(0.5*tr(P[faceCelli]) + SMALL), 1.0);
+ min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 1.0);
}
}
}
@@ -379,6 +380,7 @@ void LaunderGibsonRSTM::correct()
(
fvm::ddt(R_)
+ fvm::div(phi_, R_)
+ - fvm::Sp(fvc::div(phi_), R_)
//- fvm::laplacian(Cs*(k_/epsilon_)*R_, R_)
- fvm::laplacian(DREff(), R_)
+ fvm::Sp(Clg1_*epsilon_/k_, R_)
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index d1fa78134adc98d6fdc5fe20818f6bb5b51bb89e..c69d4035757713821cd2bf8256c4f56808771953 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -249,7 +249,7 @@ tmp<volScalarField> SpalartAllmaras::epsilon() const
(
IOobject
(
- "epslion",
+ "epsilon",
runTime_.timeName(),
mesh_
),
diff --git a/tutorials/dnsFoam/boxTurb16/0.org/Ek.q b/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.q
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0.org/Ek.q
rename to tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.q
diff --git a/tutorials/dnsFoam/boxTurb16/0.org/Ek.xy b/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.xy
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0.org/Ek.xy
rename to tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.xy
diff --git a/tutorials/dnsFoam/boxTurb16/0.org/U b/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0.org/U
rename to tutorials/DNS/dnsFoam/boxTurb16/0.org/U
diff --git a/tutorials/dnsFoam/boxTurb16/0.org/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0.org/enstrophy
rename to tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
diff --git a/tutorials/dnsFoam/boxTurb16/0.org/p b/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0.org/p
rename to tutorials/DNS/dnsFoam/boxTurb16/0.org/p
diff --git a/tutorials/dnsFoam/boxTurb16/0/Ek.q b/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.q
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0/Ek.q
rename to tutorials/DNS/dnsFoam/boxTurb16/0/Ek.q
diff --git a/tutorials/dnsFoam/boxTurb16/0/Ek.xy b/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.xy
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0/Ek.xy
rename to tutorials/DNS/dnsFoam/boxTurb16/0/Ek.xy
diff --git a/tutorials/dnsFoam/boxTurb16/0/U b/tutorials/DNS/dnsFoam/boxTurb16/0/U
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0/U
rename to tutorials/DNS/dnsFoam/boxTurb16/0/U
diff --git a/tutorials/dnsFoam/boxTurb16/0/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0/enstrophy
rename to tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
diff --git a/tutorials/dnsFoam/boxTurb16/0/p b/tutorials/DNS/dnsFoam/boxTurb16/0/p
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/0/p
rename to tutorials/DNS/dnsFoam/boxTurb16/0/p
diff --git a/tutorials/dnsFoam/boxTurb16/Allclean b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/Allclean
rename to tutorials/DNS/dnsFoam/boxTurb16/Allclean
diff --git a/tutorials/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/Allrun
rename to tutorials/DNS/dnsFoam/boxTurb16/Allrun
diff --git a/tutorials/dnsFoam/boxTurb16/constant/boxTurbDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
similarity index 89%
rename from tutorials/dnsFoam/boxTurb16/constant/boxTurbDict
rename to tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
index 98503931acb817e533c4105aeead9526140315f8..515ad8fc854e67e34c2020d59e8a36f4ae9e6916 100644
--- a/tutorials/dnsFoam/boxTurb16/constant/boxTurbDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/boxTurbDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object boxTurbDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +19,5 @@ Ea 10;
k0 5;
+
// ************************************************************************* //
diff --git a/tutorials/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
rename to tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/blockMeshDict
diff --git a/tutorials/dnsFoam/boxTurb16/constant/polyMesh/boundary b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/dnsFoam/boxTurb16/constant/polyMesh/boundary
rename to tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..39f1d33649e14760a4a7dde0d0d1a6bd2a15f8f6
--- /dev/null
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu nu [ 0 2 -1 0 0 0 0 ] 0.025;
+
+
+// ************************************************************************* //
diff --git a/tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
similarity index 85%
rename from tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties
rename to tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
index 92118a1ff607141ec4c262f52e89448c09c448c2..9869493485c2915d7395c3b6f3175410a9a62a70 100644
--- a/tutorials/dnsFoam/boxTurb16/constant/turbulenceProperties
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-UOsigma 0.090295049;
+UOsigma 0.090295;
-UOalpha 0.81532036;
+UOalpha 0.81532;
UOKupper 10;
UOKlower 7;
+
// ************************************************************************* //
diff --git a/tutorials/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
similarity index 92%
rename from tutorials/dnsFoam/boxTurb16/system/controlDict
rename to tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
index f059d93cded33ce2cef6394c0492ccefa8b50dd6..bbbc76ae09a81679c74be2307d9d1f80099f2468 100644
--- a/tutorials/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -45,4 +45,5 @@ runTimeModifiable yes;
graphFormat raw;
+
// ************************************************************************* //
diff --git a/tutorials/dnsFoam/boxTurb16/system/fvSchemes b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
similarity index 90%
rename from tutorials/dnsFoam/boxTurb16/system/fvSchemes
rename to tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
index 9d912c030fc5a00fb48a87f2bc3a365d61fdcb0c..845956eea894d5cc3f21e225551b5eece0c56720 100644
--- a/tutorials/dnsFoam/boxTurb16/system/fvSchemes
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -53,7 +54,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/dnsFoam/boxTurb16/system/fvSolution b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
similarity index 71%
rename from tutorials/dnsFoam/boxTurb16/system/fvSolution
rename to tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
index d2a0410ecf0f5d74726ead517a1f1388c5c28746..d58906f99c7e5c91999bc224262cd4b9652c68a3 100644
--- a/tutorials/dnsFoam/boxTurb16/system/fvSolution
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -36,4 +40,5 @@ PISO
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/files b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..26c96aaa9004f161fe6560cd50ef1a3e9a9e8fc5
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/files
@@ -0,0 +1,3 @@
+rhoPisoTwinParcelFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/rhoPisoTwinParcelFoam
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/UEqn.H b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/UEqn.H
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H
new file mode 100644
index 0000000000000000000000000000000000000000..bdf17e19efcdb715b5f7da5c01e96052ae41645f
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H
@@ -0,0 +1,20 @@
+ Info<< "Constructing thermoCloud1" << endl;
+ basicThermoCloud thermoCloud1
+ (
+ "thermoCloud1",
+ rho,
+ U,
+ g,
+ thermo()
+ );
+
+ Info<< "Constructing kinematicCloud1" << endl;
+ basicKinematicCloud kinematicCloud1
+ (
+ "kinematicCloud1",
+ rho,
+ U,
+ thermo().mu(),
+ g
+ );
+
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
similarity index 71%
rename from tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
index c22eeb8cc35115631cb94959c73b68a83de323cc..b07398a0314073ca5d677d4e7fc25362463dc03b 100644
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/createFields.H
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H
@@ -43,30 +43,16 @@
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::turbulenceModel> turbulence
(
- compressible::turbulenceModel::New(rho, U, phi, thermo())
+ compressible::turbulenceModel::New
+ (
+ rho,
+ U,
+ phi,
+ thermo()
+ )
);
+
Info<< "Creating field DpDt\n" << endl;
volScalarField DpDt =
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-
- Info<< "Constructing thermoCloud1" << endl;
- basicThermoCloud thermoCloud1
- (
- "thermoCloud1",
- rho,
- U,
- g,
- thermo()
- );
-
- Info<< "Constructing kinematicCloud1" << endl;
- basicKinematicCloud kinematicCloud1
- (
- "kinematicCloud1",
- rho,
- U,
- thermo().mu(),
- g
- );
-
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/hEqn.H b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/hEqn.H
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/pEqn.H b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/pEqn.H
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
similarity index 98%
rename from tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index e7f53341abd9281f324bd2645f15a15d0d244c00..0028a30b5be90fecb4ea752ee4846c78b323114d 100644
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam.C
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Application
- rhoTurbFoam
+ rhoPisoTwinParcelFoam
Description
Transient solver for compressible, turbulent flow with two thermo-clouds.
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
# include "createMesh.H"
# include "readEnvironmentalProperties.H"
# include "createFields.H"
+# include "createClouds.H"
# include "readPISOControls.H"
# include "initContinuityErrs.H"
# include "readTimeControls.H"
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/G b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/G
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/G
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/T b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/T
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/T
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/U b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/U
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/U
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/epsilon b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/epsilon
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/k b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/k
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/p b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/0/p
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/p
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..26216fcde0621aa1c526ab843d2825da511d520a
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Positions
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
new file mode 100644
index 0000000000000000000000000000000000000000..4a7f8b7b2b5d0f5f7c8e979a07185eb634c9a8c5
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -0,0 +1,117 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object kinematicCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+InjectionModel ManualInjection;
+
+DragModel SphereDrag;
+
+DispersionModel StochasticDispersionRAS;
+
+WallInteractionModel StandardWallInteraction;
+
+minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+
+rho0 rho0 [ 1 -3 0 0 0 ] 5000;
+
+coupled true;
+
+parcelTypeId 2;
+
+interpolationSchemes
+{
+ rho cell;
+ U cellPointFace;
+ mu cell;
+}
+
+integrationSchemes
+{
+ U Euler;
+}
+
+ManualInjectionCoeffs
+{
+ parcelBasisType mass;
+ massTotal massTotal [ 1 0 0 0 0 ] 0.0002;
+ SOI 0;
+ positionsFile kinematicCloud1Positions;
+ U0 ( 0 0 0 );
+ parcelPDF
+ {
+ pdfType RosinRammler;
+ RosinRammlerPDF
+ {
+ minValue 5e-05;
+ maxValue 0.0001;
+ d ( 7.5e-05 );
+ n ( 0.5 );
+ }
+ }
+}
+
+ConeInjectionCoeffs
+{
+ SOI 0.001;
+ duration 0.005;
+ position ( 0.25 0.25 0.05 );
+ direction ( 0 -1 0 );
+ parcelsPerSecond 10000;
+ volumeFlowRate Constant;
+ volumeFlowRateCoeffs
+ {
+ value 0.01;
+ }
+
+ Umag Constant;
+ UmagCoeffs
+ {
+ value 50;
+ }
+
+ thetaInner Constant;
+ thetaInnerCoeffs
+ {
+ value 0;
+ }
+
+ thetaOuter Constant;
+ thetaOuterCoeffs
+ {
+ value 30;
+ }
+
+ parcelPDF
+ {
+ pdfType RosinRammler;
+ RosinRammlerPDF
+ {
+ minValue 5e-05;
+ maxValue 0.0001;
+ d ( 7.5e-05 );
+ n ( 0.5 );
+ }
+ }
+}
+
+StandardWallInteractionCoeffs
+{
+ e e [ 0 0 0 0 0 ] 1;
+ mu mu [ 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
similarity index 100%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Positions
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
new file mode 100644
index 0000000000000000000000000000000000000000..fd752a082c9d60ef27277908ec50e7bf425a3970
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -0,0 +1,93 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermoCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+InjectionModel ManualInjection;
+
+DragModel SphereDrag;
+
+DispersionModel StochasticDispersionRAS;
+
+WallInteractionModel StandardWallInteraction;
+
+HeatTransferModel RanzMarshall;
+
+radiation off;
+
+minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+
+rho0 rho0 [ 1 -3 0 0 0 ] 2500;
+
+T0 T0 [ 0 0 0 1 0 ] 300;
+
+cp0 cp0 [ 0 2 -2 -1 0 ] 900;
+
+epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
+
+f0 f0 [ 0 0 0 0 0 ] 0.5;
+
+coupled true;
+
+parcelTypeId 1;
+
+interpolationSchemes
+{
+ rho cell;
+ U cellPointFace;
+ mu cell;
+ T cell;
+ Cp cell;
+}
+
+integrationSchemes
+{
+ U Euler;
+ T Analytical;
+}
+
+ManualInjectionCoeffs
+{
+ massTotal massTotal [ 1 0 0 0 0 ] 0.0001;
+ parcelBasisType mass;
+ SOI 0;
+ positionsFile thermoCloud1Positions;
+ U0 ( 0 0 0 );
+ parcelPDF
+ {
+ pdfType RosinRammler;
+ RosinRammlerPDF
+ {
+ minValue 5e-06;
+ maxValue 0.0005;
+ d ( 5e-05 );
+ n ( 0.5 );
+ }
+ }
+}
+
+StandardWallInteractionCoeffs
+{
+ e e [ 0 0 0 0 0 ] 1;
+ mu mu [ 0 0 0 0 0 ] 0;
+}
+
+RanzMarshallCoeffs
+{
+ Pr Pr [ 0 0 0 0 0 ] 0.7;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
similarity index 90%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
index 0b16fbae765198099571a7abfe177e43e63ebe07..d02b85fec4397d8da50129dd6d2374b56619abe6 100644
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Thermophysical model
thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture air 1 28.9 1007 0 1.84e-05 0.7;
+
// ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..498ad80a5436cbc895f2694fa68119f4fc090543
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.5;
+
+deltaT 0.0001;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.01;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 10;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.2;
+
+maxDeltaT 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
similarity index 82%
rename from tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
rename to tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
index d99b832df1fcc5b92a81b2ae29ad56b282204915..5b181b0e75a720fea3208f1e448f60a7aef8546d 100644
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method metis;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (1 1 1);
+ n ( 1 1 1 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..9f72da684a1205fade3c6f7ba1328ac21b6f947f
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSchemes
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+ grad(p) Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+ div(phi,U) Gauss upwind;
+ div(phid,p) Gauss upwind;
+ div(phiU,p) Gauss linear;
+ div(phi,h) Gauss upwind;
+ div(phi,k) Gauss upwind;
+ div(phi,epsilon) Gauss upwind;
+ div(U) Gauss linear;
+ div((muEff*dev2(grad(U).T()))) Gauss linear;
+ div(phi,Yi_h) Gauss upwind;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(mut,U) Gauss linear corrected;
+ laplacian(DkEff,k) Gauss linear corrected;
+ laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+ laplacian(DREff,R) Gauss linear corrected;
+ laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+ laplacian(alphaEff,h) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ p ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..219c7b1dbfcf72204cb60028597aa8550b9333d1
--- /dev/null
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/fvSolution
@@ -0,0 +1,158 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ G
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Yi
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ CO2
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ O2
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ N2
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ CH4
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ H2
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ H2O
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ CO
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ transonic yes;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ momentumPredictor yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/RASProperties b/tutorials/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
deleted file mode 100644
index a8a3fab2bae274efe4a8ad6fec8d83fbb1825259..0000000000000000000000000000000000000000
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
+++ /dev/null
@@ -1,191 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/cellSetDict b/tutorials/MRFSimpleFoam/mixerVessel2D/system/cellSetDict
deleted file mode 100644
index 3c56c10e12a8d53476c75f534f136d6178ab0c89..0000000000000000000000000000000000000000
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/cellSetDict
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Name of set to operate on
-name rotor;
-
-// One of clear/new/invert/add/delete|subset/list
-action new;
-
-// Actions to apply to cellSet. These are all the topoSetSource's ending
-// in ..ToCell (see the meshTools library).
-
-topoSetSources
-(
- // Cells in cell zone
- zoneToCell
- {
- name rotor; // name of cellZone
- }
-
-);
-
-// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict b/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
deleted file mode 100644
index 23471a04ad99f176c8efbfa87dfe607bfbfcf720..0000000000000000000000000000000000000000
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object faceSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Name of set to operate on
-name rotor;
-
-// One of clear/new/invert/add/delete|subset/list
-action delete;
-
-// Actions to apply to pointSet. These are all the topoSetSource's ending
-// in ..ToFace (see the meshTools library).
-topoSetSources
-(
- // Select boundary faces
- boundaryToFace
- {
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces b/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
deleted file mode 100644
index 23471a04ad99f176c8efbfa87dfe607bfbfcf720..0000000000000000000000000000000000000000
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object faceSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Name of set to operate on
-name rotor;
-
-// One of clear/new/invert/add/delete|subset/list
-action delete;
-
-// Actions to apply to pointSet. These are all the topoSetSource's ending
-// in ..ToFace (see the meshTools library).
-topoSetSources
-(
- // Select boundary faces
- boundaryToFace
- {
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces b/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
deleted file mode 100644
index d8e4665ba9583215cc369b167cd3350770cd7247..0000000000000000000000000000000000000000
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object faceSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Name of set to operate on
-name rotor;
-
-// One of clear/new/invert/add/delete|subset/list
-action new;
-
-// Actions to apply to pointSet. These are all the topoSetSource's ending
-// in ..ToFace (see the meshTools library).
-topoSetSources
-(
- // Select based on cellSet
- cellToFace
- {
- set rotor;
- option all; // All faces of cells
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/RASProperties b/tutorials/XiFoam/moriyoshiHomogeneous/constant/RASProperties
deleted file mode 100644
index 6fbe9dea83961fa03e9edd98a3017e1558548360..0000000000000000000000000000000000000000
--- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel LaunderSharmaKE;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0;
- alphah 1.111;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 0;
- alphah 1.111;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0;
- alphah 1.111;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/system/fvSolution b/tutorials/XiFoam/moriyoshiHomogeneous/system/fvSolution
deleted file mode 100644
index 35819bb013d775cf564cba1160c0adae75d33496..0000000000000000000000000000000000000000
--- a/tutorials/XiFoam/moriyoshiHomogeneous/system/fvSolution
+++ /dev/null
@@ -1,106 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- ft PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- fu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- b PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Xi PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Su PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- hu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- momentumPredictor yes;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily/system/fvSolution b/tutorials/Xoodles/pitzDaily/system/fvSolution
deleted file mode 100644
index 43ce07f2a08981802c16d6d1ed09232856fadae7..0000000000000000000000000000000000000000
--- a/tutorials/Xoodles/pitzDaily/system/fvSolution
+++ /dev/null
@@ -1,105 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- ft PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- fu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- b PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Xi PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Su PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- hu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/system/fvSolution b/tutorials/Xoodles/pitzDaily3D/system/fvSolution
deleted file mode 100644
index 43ce07f2a08981802c16d6d1ed09232856fadae7..0000000000000000000000000000000000000000
--- a/tutorials/Xoodles/pitzDaily3D/system/fvSolution
+++ /dev/null
@@ -1,105 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- ft PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- fu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- b PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Xi PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Su PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- hu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/laplacianFoam/flange/0/T b/tutorials/basic/laplacianFoam/flange/0/T
similarity index 100%
rename from tutorials/laplacianFoam/flange/0/T
rename to tutorials/basic/laplacianFoam/flange/0/T
diff --git a/tutorials/laplacianFoam/flange/Allclean b/tutorials/basic/laplacianFoam/flange/Allclean
similarity index 100%
rename from tutorials/laplacianFoam/flange/Allclean
rename to tutorials/basic/laplacianFoam/flange/Allclean
diff --git a/tutorials/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
similarity index 100%
rename from tutorials/laplacianFoam/flange/Allrun
rename to tutorials/basic/laplacianFoam/flange/Allrun
diff --git a/tutorials/laplacianFoam/flange/constant/polyMesh/boundary b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/laplacianFoam/flange/constant/polyMesh/boundary
rename to tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
diff --git a/tutorials/laplacianFoam/flange/constant/polyMesh/boundary.org b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
similarity index 100%
rename from tutorials/laplacianFoam/flange/constant/polyMesh/boundary.org
rename to tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
diff --git a/tutorials/basic/laplacianFoam/flange/constant/transportProperties b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..38a48552bb701038b40714e3196aa772427af552
--- /dev/null
+++ b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+DT DT [ 0 2 -1 0 0 0 0 ] 4e-05;
+
+
+// ************************************************************************* //
diff --git a/tutorials/laplacianFoam/flange/flange.ans b/tutorials/basic/laplacianFoam/flange/flange.ans
similarity index 100%
rename from tutorials/laplacianFoam/flange/flange.ans
rename to tutorials/basic/laplacianFoam/flange/flange.ans
diff --git a/tutorials/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict
similarity index 92%
rename from tutorials/laplacianFoam/flange/system/controlDict
rename to tutorials/basic/laplacianFoam/flange/system/controlDict
index 07a21543108361fa7020e9b6aebdff6d16117f2f..f936785ffabcb73f173ac5f5e5fb1706eab0706d 100644
--- a/tutorials/laplacianFoam/flange/system/controlDict
+++ b/tutorials/basic/laplacianFoam/flange/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/laplacianFoam/flange/system/fvSchemes b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
similarity index 85%
rename from tutorials/laplacianFoam/flange/system/fvSchemes
rename to tutorials/basic/laplacianFoam/flange/system/fvSchemes
index ecfee2c2c71ec111df94331a1bd3842448f43597..0791ea9054fa049ed91214ea8bfa4c6a20d80e85 100644
--- a/tutorials/laplacianFoam/flange/system/fvSchemes
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -33,7 +34,7 @@ divSchemes
laplacianSchemes
{
default none;
- laplacian(DT,T) Gauss linear corrected;
+ laplacian(DT,T) Gauss linear corrected;
}
interpolationSchemes
@@ -49,7 +50,8 @@ snGradSchemes
fluxRequired
{
default no;
- T;
+ T ;
}
+
// ************************************************************************* //
diff --git a/tutorials/laplacianFoam/flange/system/fvSolution b/tutorials/basic/laplacianFoam/flange/system/fvSolution
similarity index 79%
rename from tutorials/laplacianFoam/flange/system/fvSolution
rename to tutorials/basic/laplacianFoam/flange/system/fvSolution
index 367eb1e0eb15ef5a4b8b79ea93dfc6319d8678ae..705e6c81f56bdee1f8f0d5af59ca45972e5cb79d 100644
--- a/tutorials/laplacianFoam/flange/system/fvSolution
+++ b/tutorials/basic/laplacianFoam/flange/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- T PCG
+ T
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
SIMPLE
@@ -29,4 +31,5 @@ SIMPLE
nNonOrthogonalCorrectors 2;
}
+
// ************************************************************************* //
diff --git a/tutorials/potentialFoam/Allclean b/tutorials/basic/potentialFoam/Allclean
similarity index 100%
rename from tutorials/potentialFoam/Allclean
rename to tutorials/basic/potentialFoam/Allclean
diff --git a/tutorials/potentialFoam/cylinder/0.org/U b/tutorials/basic/potentialFoam/cylinder/0.org/U
similarity index 100%
rename from tutorials/potentialFoam/cylinder/0.org/U
rename to tutorials/basic/potentialFoam/cylinder/0.org/U
diff --git a/tutorials/potentialFoam/cylinder/0.org/p b/tutorials/basic/potentialFoam/cylinder/0.org/p
similarity index 100%
rename from tutorials/potentialFoam/cylinder/0.org/p
rename to tutorials/basic/potentialFoam/cylinder/0.org/p
diff --git a/tutorials/potentialFoam/cylinder/0/U b/tutorials/basic/potentialFoam/cylinder/0/U
similarity index 100%
rename from tutorials/potentialFoam/cylinder/0/U
rename to tutorials/basic/potentialFoam/cylinder/0/U
diff --git a/tutorials/potentialFoam/cylinder/0/p b/tutorials/basic/potentialFoam/cylinder/0/p
similarity index 100%
rename from tutorials/potentialFoam/cylinder/0/p
rename to tutorials/basic/potentialFoam/cylinder/0/p
diff --git a/tutorials/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
similarity index 100%
rename from tutorials/potentialFoam/cylinder/Allrun
rename to tutorials/basic/potentialFoam/cylinder/Allrun
diff --git a/tutorials/potentialFoam/cylinder/analyticalCylinder/Make/files b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/Make/files
similarity index 100%
rename from tutorials/potentialFoam/cylinder/analyticalCylinder/Make/files
rename to tutorials/basic/potentialFoam/cylinder/analyticalCylinder/Make/files
diff --git a/tutorials/buoyantFoam/hotRoom/setHotRoom/Make/options b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/Make/options
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/setHotRoom/Make/options
rename to tutorials/basic/potentialFoam/cylinder/analyticalCylinder/Make/options
diff --git a/tutorials/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
similarity index 100%
rename from tutorials/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
rename to tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
diff --git a/tutorials/potentialFoam/cylinder/analyticalCylinder/createFields.H b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/createFields.H
similarity index 100%
rename from tutorials/potentialFoam/cylinder/analyticalCylinder/createFields.H
rename to tutorials/basic/potentialFoam/cylinder/analyticalCylinder/createFields.H
diff --git a/tutorials/potentialFoam/cylinder/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
rename to tutorials/basic/potentialFoam/cylinder/constant/polyMesh/blockMeshDict
diff --git a/tutorials/potentialFoam/cylinder/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/potentialFoam/cylinder/constant/polyMesh/boundary
rename to tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
diff --git a/tutorials/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
similarity index 92%
rename from tutorials/potentialFoam/cylinder/system/controlDict
rename to tutorials/basic/potentialFoam/cylinder/system/controlDict
index 2300e2c09ea24050334b25de1cd227b6fbb88806..c160f2f414de84724ba785662c196277d8ab761b 100644
--- a/tutorials/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/potentialFoam/cylinder/system/fvSchemes b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
similarity index 88%
rename from tutorials/potentialFoam/cylinder/system/fvSchemes
rename to tutorials/basic/potentialFoam/cylinder/system/fvSchemes
index ab3c77e43dee4dcca22732ee4a92d1f5d67ec05a..77418cb53a684445a0be22f23c0f8b839cf5dbfd 100644
--- a/tutorials/potentialFoam/cylinder/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -48,7 +49,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/potentialFoam/cylinder/system/fvSolution b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
similarity index 79%
rename from tutorials/potentialFoam/cylinder/system/fvSolution
rename to tutorials/basic/potentialFoam/cylinder/system/fvSolution
index 6dc71af95290e7619e05947983b94ae97e911e2f..231dfc27bb71dd44f151c36e22cc703274bcb549 100644
--- a/tutorials/potentialFoam/cylinder/system/fvSolution
+++ b/tutorials/basic/potentialFoam/cylinder/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
SIMPLE
@@ -29,4 +31,5 @@ SIMPLE
nNonOrthogonalCorrectors 3;
}
+
// ************************************************************************* //
diff --git a/tutorials/potentialFoam/pitzDaily/0.org/U b/tutorials/basic/potentialFoam/pitzDaily/0.org/U
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/0.org/U
rename to tutorials/basic/potentialFoam/pitzDaily/0.org/U
diff --git a/tutorials/pisoFoam/les/pitzDaily/0/p b/tutorials/basic/potentialFoam/pitzDaily/0.org/p
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/0/p
rename to tutorials/basic/potentialFoam/pitzDaily/0.org/p
diff --git a/tutorials/potentialFoam/pitzDaily/0/U b/tutorials/basic/potentialFoam/pitzDaily/0/U
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/0/U
rename to tutorials/basic/potentialFoam/pitzDaily/0/U
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/0/p b/tutorials/basic/potentialFoam/pitzDaily/0/p
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/0/p
rename to tutorials/basic/potentialFoam/pitzDaily/0/p
diff --git a/tutorials/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/Allrun
rename to tutorials/basic/potentialFoam/pitzDaily/Allrun
diff --git a/tutorials/Xoodles/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
diff --git a/tutorials/Xoodles/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/constant/polyMesh/boundary
rename to tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
diff --git a/tutorials/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
similarity index 92%
rename from tutorials/potentialFoam/pitzDaily/system/controlDict
rename to tutorials/basic/potentialFoam/pitzDaily/system/controlDict
index 2300e2c09ea24050334b25de1cd227b6fbb88806..c160f2f414de84724ba785662c196277d8ab761b 100644
--- a/tutorials/potentialFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/potentialFoam/pitzDaily/system/fvSchemes b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
similarity index 88%
rename from tutorials/potentialFoam/pitzDaily/system/fvSchemes
rename to tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
index ab3c77e43dee4dcca22732ee4a92d1f5d67ec05a..77418cb53a684445a0be22f23c0f8b839cf5dbfd 100644
--- a/tutorials/potentialFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -48,7 +49,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/scalarTransportFoam/pitzDaily/system/fvSolution b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
similarity index 79%
rename from tutorials/scalarTransportFoam/pitzDaily/system/fvSolution
rename to tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
index 77cd8dbab65fa5a40ae8aa3a4f30276af848adcf..bff0832c0a29bc1f5dc1d21ac1d26aa37de21771 100644
--- a/tutorials/scalarTransportFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- T PBiCG
+ p
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
SIMPLE
@@ -29,4 +31,5 @@ SIMPLE
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/scalarTransportFoam/pitzDaily/0/T b/tutorials/basic/scalarTransportFoam/pitzDaily/0/T
similarity index 100%
rename from tutorials/scalarTransportFoam/pitzDaily/0/T
rename to tutorials/basic/scalarTransportFoam/pitzDaily/0/T
diff --git a/tutorials/scalarTransportFoam/pitzDaily/0/U b/tutorials/basic/scalarTransportFoam/pitzDaily/0/U
similarity index 100%
rename from tutorials/scalarTransportFoam/pitzDaily/0/U
rename to tutorials/basic/scalarTransportFoam/pitzDaily/0/U
diff --git a/tutorials/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
diff --git a/tutorials/potentialFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/constant/polyMesh/boundary
rename to tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
diff --git a/tutorials/icoDyMFoam/movingCone/constant/transportProperties b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
similarity index 85%
rename from tutorials/icoDyMFoam/movingCone/constant/transportProperties
rename to tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
index 793572135be35de77e7b775f5e5bc22e2811333a..080db3de4384102679e4121a5c546f7d96c50b8a 100644
--- a/tutorials/icoDyMFoam/movingCone/constant/transportProperties
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-nu nu [0 2 -1 0 0 0 0] 1e-05;
+DT DT [ 0 2 -1 0 0 0 0 ] 0.01;
+
// ************************************************************************* //
diff --git a/tutorials/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
similarity index 92%
rename from tutorials/scalarTransportFoam/pitzDaily/system/controlDict
rename to tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
index 754277eb2551d37d6b5180d30402c53697e91de6..83058ea6202b5efcca411c72ef055a08547bf46b 100644
--- a/tutorials/scalarTransportFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/scalarTransportFoam/pitzDaily/system/fvSchemes b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
similarity index 89%
rename from tutorials/scalarTransportFoam/pitzDaily/system/fvSchemes
rename to tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
index 6c290f72df0dee86a8f64b9ab35b6a3f06605531..3ffd8859ee1269e3b8a8fff103d4e81722df6737 100644
--- a/tutorials/scalarTransportFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -49,7 +50,8 @@ snGradSchemes
fluxRequired
{
default no;
- T;
+ T ;
}
+
// ************************************************************************* //
diff --git a/tutorials/potentialFoam/pitzDaily/system/fvSolution b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
similarity index 78%
rename from tutorials/potentialFoam/pitzDaily/system/fvSolution
rename to tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
index 4d5a8fcf13ce97ce6c455ad0f36ee0106faee0b2..44b0ece7910653243b9c652bc77cf22ba99cf3fe 100644
--- a/tutorials/potentialFoam/pitzDaily/system/fvSolution
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ T
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
SIMPLE
@@ -29,4 +31,5 @@ SIMPLE
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/0/epsilon b/tutorials/boundaryFoam/boundaryWallFunctions/0/epsilon
deleted file mode 100644
index f55c6401b2ff4b7bb669b99b250c31e4d15c8735..0000000000000000000000000000000000000000
--- a/tutorials/boundaryFoam/boundaryWallFunctions/0/epsilon
+++ /dev/null
@@ -1,44 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -3 0 0 0 0];
-
-internalField uniform 1e-08;
-
-boundaryField
-{
- lowerWall
- {
- type zeroGradient;
- }
-
- upperWall
- {
- type zeroGradient;
- }
-
- frontBack
- {
- type cyclic;
- }
-
- defaultFaces
- {
- type empty;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/0/k b/tutorials/boundaryFoam/boundaryWallFunctions/0/k
deleted file mode 100644
index 826940664711e0bb5525573eab69b1356fa50a32..0000000000000000000000000000000000000000
--- a/tutorials/boundaryFoam/boundaryWallFunctions/0/k
+++ /dev/null
@@ -1,44 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 0 0 0 0];
-
-internalField uniform 1e-10;
-
-boundaryField
-{
- lowerWall
- {
- type zeroGradient;
- }
-
- upperWall
- {
- type zeroGradient;
- }
-
- frontBack
- {
- type cyclic;
- }
-
- defaultFaces
- {
- type empty;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/RASProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/RASProperties
deleted file mode 100644
index 6f833da95cd7c5fd24dd659a62e8c4f37e54fb67..0000000000000000000000000000000000000000
--- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/RASProperties
+++ /dev/null
@@ -1,302 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Turbulence model selection
-RASModel kEpsilon;
-
-// Do you wish to calculate turbulence?
-turbulence on;
-
-printCoeffs on;
-
-// Laminar model coefficients
-laminarCoeffs
-{
-}
-
-// Standard k-epsilon model coefficients
-kEpsilonCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// RNG k-epsilon model coefficients
-RNGkEpsilonCoeffs
-{
- // Cmu
- Cmu 0.0845;
- // C1
- C1 1.42;
- // C2
- C2 1.68;
- // alphak
- alphak 1.39;
- // alphaEps
- alphaEps 1.39;
- // eta0
- eta0 4.38;
- // beta
- beta 0.012;
-}
-
-// k-omega-SST model coefficients
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-// Shih non-Linear k-epsilon model coefficients
-NonlinearKEShihCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76932;
- // A1
- A1 1.25;
- // A2
- A2 1000;
- // Ctau1
- Ctau1 -4;
- // Ctau2
- Ctau2 13;
- // Ctau3
- Ctau3 -2;
- // alphaKsi
- alphaKsi 0.9;
-}
-
-// Lien non-Linear cubic k-epsilon model coefficients
-LienCubicKECoeffs
-{
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
- // A1
- A1 1.25;
- // A2
- A2 1000;
- // Ctau1
- Ctau1 -4;
- // Ctau2
- Ctau2 13;
- // Ctau3
- Ctau3 -2;
- // alphaKsi
- alphaKsi 0.9;
-}
-
-// Gibson's q-zeta low Reynolds number k-epsilon model coefficients
-QZetaCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphaZeta
- alphaZeta 0.76923;
- // anisotropic?
- anisotropic no;
-}
-
-// Launder-Sharma low Reynolds number k-epsilon model coefficients
-LaunderSharmaKECoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// Lam-Bremhorst low Reynolds number k-Epsilon model coefficients
-LamBremhorstKECoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// Lien-Leschziner low Reynolds number cubic k-epsilon model coefficients
-LienCubicKELowReCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
- // A1
- A1 1.25;
- // A2
- A2 1000;
- // Ctau1
- Ctau1 -4;
- // Ctau2
- Ctau2 13;
- // Ctau3
- Ctau3 -2;
- // alphaKsi
- alphaKsi 0.9;
- // Am
- Am 0.016;
- // Aepsilon
- Aepsilon 0.263;
- // Amu
- Amu 0.00222;
-}
-
-// Lien-Leschziner low Reynolds number cubic k-epsilon model coefficients
-LienLeschzinerLowReCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
- // Am
- Am 0.016;
- // Aepsilon
- Aepsilon 0.263;
- // Amu
- Amu 0.00222;
-}
-
-// Launder-Reece-Rodi RSTM with wall functions model coefficients
-LRRCoeffs
-{
- // Cmu
- Cmu 0.09;
- // Clrr1
- Clrr1 1.8;
- // Clrr2
- Clrr2 0.6;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // Cs
- Cs 0.25;
- // Ceps
- Ceps 0.15;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// Launder-Gibson RSTM with wall reflection and wall functions model coefficients
-LaunderGibsonRSTMCoeffs
-{
- // Cmu
- Cmu 0.09;
- // Clg1
- Clg1 1.8;
- // Clg2
- Clg2 0.6;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C1Ref
- C1Ref 0.5;
- // C2Ref
- C2Ref 0.3;
- // Cs
- Cs 0.25;
- // Ceps
- Ceps 0.15;
- // alphaEps
- alphaEps 0.76923;
- // alphaR
- alphaR 1.22;
-}
-
-// Standard Spalart-Allmaras model coefficients
-SpalartAllmarasCoeffs
-{
- // alphaNut
- alphaNut 1.5;
- // Cb1
- Cb1 0.1355;
- // Cb2
- Cb2 0.622;
- // Cw2
- Cw2 0.3;
- // Cw3
- Cw3 2;
- // Cv1
- Cv1 7.1;
- Cv2 5.0;
-}
-
-// Wall function coefficients
-wallFunctionCoeffs
-{
- // kappa
- kappa 0.4187;
- // E
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/transportProperties b/tutorials/boundaryFoam/boundaryWallFunctions/constant/transportProperties
deleted file mode 100644
index 37d703adcb3eb25588dddc91f17c85675a8ef021..0000000000000000000000000000000000000000
--- a/tutorials/boundaryFoam/boundaryWallFunctions/constant/transportProperties
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Ubar
-Ubar Ubar [0 1 -1 0 0 0 0] (10 0 0);
-
-// Laminar incompressible transport model
-transportModel Newtonian;
-
-// nu
-nu nu [0 2 -1 0 0 0 0] 1e-05;
-
-// Coefficients for Cross's Power Law
-CrossPowerLawCoeffs
-{
- // nu0
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- // nuInf
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- // m
- m m [0 0 1 0 0 0 0] 1;
- // n
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// Coefficients for Bird-Carreau Law
-BirdCarreauCoeffs
-{
- // nu0
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- // nuInf
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- // k
- k k [0 0 1 0 0 0 0] 0;
- // n
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/boundaryFoam/boundaryWallFunctions/system/controlDict
deleted file mode 100644
index 0ae7a20daf5398aa2cc17f488b8ed315f2016084..0000000000000000000000000000000000000000
--- a/tutorials/boundaryFoam/boundaryWallFunctions/system/controlDict
+++ /dev/null
@@ -1,64 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Foam Application Class
-
-// Start point of run
-startFrom startTime;
-
-// Calculation start time
-startTime 0;
-
-// End point of run
-stopAt endTime;
-
-// Calculation end time
-endTime 1000;
-
-// Calculation time step
-deltaT 1;
-
-// Type of write output control
-writeControl timeStep;
-
-// Interval with which the results are output
-writeInterval 100;
-
-// Limits number of time directories before overwriting
-purgeWrite 0;
-
-// Write Format
-writeFormat ascii;
-
-// Significant figures of written ASCII data
-writePrecision 6;
-
-// Write Compression
-writeCompression uncompressed;
-
-// Time directories name format
-timeFormat general;
-
-// Decimal precision of time directory names
-timePrecision 6;
-
-// Can parameters be modified during run time?
-runTimeModifiable yes;
-
-// Output format for graphs
-graphFormat raw;
-
-// ************************************************************************* //
diff --git a/tutorials/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/bubbleFoam/bubbleColumn/system/fvSolution
deleted file mode 100644
index 8ca429638cb43cc2660a2c3cd57ad4f7d6729201..0000000000000000000000000000000000000000
--- a/tutorials/bubbleFoam/bubbleColumn/system/fvSolution
+++ /dev/null
@@ -1,73 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-10;
- relTol 0;
- };
- Ua PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Ub PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- alpha PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- beta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 2;
- correctAlpha no;
- pRefCell 0;
- pRefValue 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/constant/RASProperties b/tutorials/buoyantFoam/hotRoom/constant/RASProperties
deleted file mode 100644
index 5facd481a88eee3338dd6996c0c8c6b64d572e0a..0000000000000000000000000000000000000000
--- a/tutorials/buoyantFoam/hotRoom/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0.85;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- alphah 1;
- Cs 0.25;
- Ceps 0.15;
- alphaR 1;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- alphah 1;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaR 1;
- alphaEps 0.76923;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
deleted file mode 100644
index 321c08496ae7cbe64b73cb2b6f5b2b172bcc9eaf..0000000000000000000000000000000000000000
--- a/tutorials/buoyantFoam/hotRoom/constant/turbulenceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//simulationType laminar;
-simulationType RASModel;
-//simulationType LESModel;
-
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/system/fvSolution b/tutorials/buoyantFoam/hotRoom/system/fvSolution
deleted file mode 100644
index da2b1edf7c20bd0244bdf32c2f02aa68e3303cfe..0000000000000000000000000000000000000000
--- a/tutorials/buoyantFoam/hotRoom/system/fvSolution
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 0;
- relTol 0;
- };
- pd PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.1;
- };
- pdFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/RASProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/RASProperties
deleted file mode 100644
index 5facd481a88eee3338dd6996c0c8c6b64d572e0a..0000000000000000000000000000000000000000
--- a/tutorials/buoyantSimpleFoam/hotRoom/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0.85;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- alphah 1;
- Cs 0.25;
- Ceps 0.15;
- alphaR 1;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- alphah 1;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaR 1;
- alphaEps 0.76923;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
deleted file mode 100644
index 5facd481a88eee3338dd6996c0c8c6b64d572e0a..0000000000000000000000000000000000000000
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0.85;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- alphah 1;
- Cs 0.25;
- Ceps 0.15;
- alphaR 1;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- alphah 1;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaR 1;
- alphaEps 0.76923;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties b/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
deleted file mode 100644
index 9c35d375b1e2e74505828be2cbf1eb51a74ea1be..0000000000000000000000000000000000000000
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/cavitatingFoam/les/throttle/constant/thermodynamicProperties
deleted file mode 100644
index 39d5cf170cfd3616c094647b90a057d1469ed402..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle/constant/thermodynamicProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermodynamicProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-barotropicCompressibilityModel linear; //Chung;
-
-psiv psiv [0 -2 2 0 0] 2.5e-06;
-
-rholSat rholSat [1 -3 0 0 0] 830;
-
-psil psil [0 -2 2 0 0] 5e-07;
-
-pSat pSat [1 -1 -2 0 0] 4500;
-
-rhoMin rhoMin [1 -3 0 0 0] 0.001;
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/cavitatingFoam/les/throttle/constant/transportProperties
deleted file mode 100644
index dcf82123d287f2292957ea37d36a8ff7acc3d285..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle/constant/transportProperties
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mul mul [1 -1 -1 0 0] 6.500e-03;
-muv muv [1 -1 -1 0 0] 5.953e-06;
-
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 7.831e-06;
- rho rho [1 -3 0 0 0 0 0] 830;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- m m [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- k k [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 4.252e-05;
- rho rho [1 -3 0 0 0 0 0] 0.14;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- m m [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- k k [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/controlDict b/tutorials/cavitatingFoam/les/throttle/system/controlDict
deleted file mode 100644
index 8c40820a16523c37fd0b3d8430345fc7408b0ad6..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle/system/controlDict
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 2e-4;
-
-deltaT 1e-8;
-
-writeControl adjustableRunTime;
-
-writeInterval 2e-5;
-
-purgeWrite 0;
-
-writeFormat binary;
-
-writePrecision 6;
-
-writeCompression compressed;
-
-timeFormat general;
-
-runTimeModifiable yes;
-
-adjustTimeStep on;
-
-maxCo 0.5;
-
-maxAcousticCo 50.0;
-
-functions
-(
- fieldAverage1
- {
- // Type of functionObject
- type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
- enabled false;
-
- outputControl outputTime;
-
- // Fields to be probed. runTime modifiable!
- fields
- (
- U
- {
- mean on;
- prime2Mean off;
- base time;
- }
- p
- {
- mean on;
- prime2Mean off;
- base time;
- }
- gamma
- {
- mean on;
- prime2Mean off;
- base time;
- }
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/cavitatingFoam/les/throttle/system/fvSchemes
deleted file mode 100644
index 69156453d7f8b3a25f298b3f2918a456e57df374..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle/system/fvSchemes
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default Euler;
-}
-
-interpolationSchemes
-{
- default linear;
-}
-
-divSchemes
-{
- default none;
-// div(phiv,rho) Gauss upwind;
-// div(phi,U) Gauss upwind;
-// div(phiv,k) Gauss upwind;
-
- div(phiv,rho) Gauss limitedLinear 0.2;
- div(phi,U) Gauss filteredLinear2V 0.2 0;
- div(phiv,k) Gauss filteredLinear2 0.2 0;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-laplacianSchemes
-{
- default none;
-
- laplacian(nuf,rhoU) Gauss linear corrected;
- laplacian(muEff,U) Gauss linear corrected;
- laplacian(rrhoUAf,p) Gauss linear corrected;
- laplacian(rUAf,p) Gauss linear corrected;
- laplacian(DkEff,k) Gauss linear corrected;
-
- laplacian(1,p) Gauss linear corrected;
-}
-
-snGradSchemes
-{
- default none;
- snGrad(p) corrected;
-}
-
-fluxRequired
-{
- default none;
- p;
- rho;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/cavitatingFoam/les/throttle/system/fvSolution
deleted file mode 100644
index f5b778ec9cfd6c126100ba56c32093a7c536abfb..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle/system/fvSolution
+++ /dev/null
@@ -1,77 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- omega PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- rho PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- p GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
-
- cacheAgglomeration true;
-
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-}
-
-PISO
-{
- nCorrectors 3;
- nNonOrthogonalCorrectors 0;
-
-// removeSwirl 2;
-}
-
-SIMPLE
-{
-
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
deleted file mode 100644
index 39d5cf170cfd3616c094647b90a057d1469ed402..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermodynamicProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-barotropicCompressibilityModel linear; //Chung;
-
-psiv psiv [0 -2 2 0 0] 2.5e-06;
-
-rholSat rholSat [1 -3 0 0 0] 830;
-
-psil psil [0 -2 2 0 0] 5e-07;
-
-pSat pSat [1 -1 -2 0 0] 4500;
-
-rhoMin rhoMin [1 -3 0 0 0] 0.001;
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/cavitatingFoam/les/throttle3D/constant/transportProperties
deleted file mode 100644
index dcf82123d287f2292957ea37d36a8ff7acc3d285..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/constant/transportProperties
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mul mul [1 -1 -1 0 0] 6.500e-03;
-muv muv [1 -1 -1 0 0] 5.953e-06;
-
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 7.831e-06;
- rho rho [1 -3 0 0 0 0 0] 830;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- m m [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- k k [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 4.252e-05;
- rho rho [1 -3 0 0 0 0 0] 0.14;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- m m [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- k k [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.2 b/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.2
deleted file mode 100644
index 0eb66c8739bf5aaa726844faa441413d623c17cd..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.2
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box (4.5e-03 -0.75e-03 -1) (9.5e-3 0.75e-03 1);
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.3 b/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.3
deleted file mode 100644
index c1833b014ea36df11a792fe579eb49ea05df82c8..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.3
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box (4.75e-03 -0.375e-03 -1) (9e-03 0.375e-03 1);
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/cavitatingFoam/les/throttle3D/system/controlDict
deleted file mode 100644
index 903c0569a51c7c07ebdc28649a2b1e30eb78d4c8..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/system/controlDict
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 1e-4;
-
-deltaT 1e-8;
-
-writeControl adjustableRunTime;
-
-writeInterval 5e-6;
-
-purgeWrite 0;
-
-writeFormat binary;
-
-writePrecision 6;
-
-writeCompression compressed;
-
-timeFormat general;
-
-runTimeModifiable yes;
-
-adjustTimeStep on;
-
-maxCo 0.5;
-
-maxAcousticCo 50.0;
-
-functions
-(
- fieldAverage1
- {
- // Type of functionObject
- type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
- enabled false;
-
- outputControl outputTime;
-
- // Fields to be probed. runTime modifiable!
- fields
- (
- U
- {
- mean on;
- prime2Mean off;
- base time;
- }
- p
- {
- mean on;
- prime2Mean off;
- base time;
- }
- gamma
- {
- mean on;
- prime2Mean off;
- base time;
- }
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/cavitatingFoam/les/throttle3D/system/fvSchemes
deleted file mode 100644
index 69156453d7f8b3a25f298b3f2918a456e57df374..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/system/fvSchemes
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default Euler;
-}
-
-interpolationSchemes
-{
- default linear;
-}
-
-divSchemes
-{
- default none;
-// div(phiv,rho) Gauss upwind;
-// div(phi,U) Gauss upwind;
-// div(phiv,k) Gauss upwind;
-
- div(phiv,rho) Gauss limitedLinear 0.2;
- div(phi,U) Gauss filteredLinear2V 0.2 0;
- div(phiv,k) Gauss filteredLinear2 0.2 0;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-laplacianSchemes
-{
- default none;
-
- laplacian(nuf,rhoU) Gauss linear corrected;
- laplacian(muEff,U) Gauss linear corrected;
- laplacian(rrhoUAf,p) Gauss linear corrected;
- laplacian(rUAf,p) Gauss linear corrected;
- laplacian(DkEff,k) Gauss linear corrected;
-
- laplacian(1,p) Gauss linear corrected;
-}
-
-snGradSchemes
-{
- default none;
- snGrad(p) corrected;
-}
-
-fluxRequired
-{
- default none;
- p;
- rho;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/cavitatingFoam/les/throttle3D/system/fvSolution
deleted file mode 100644
index f5b778ec9cfd6c126100ba56c32093a7c536abfb..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/les/throttle3D/system/fvSolution
+++ /dev/null
@@ -1,77 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- omega PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- rho PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- p GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
-
- cacheAgglomeration true;
-
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-}
-
-PISO
-{
- nCorrectors 3;
- nNonOrthogonalCorrectors 0;
-
-// removeSwirl 2;
-}
-
-SIMPLE
-{
-
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/cavitatingFoam/ras/throttle/constant/RASProperties
deleted file mode 100644
index ee5f9ee5d7415f6981276e035737887017c780e4..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/ras/throttle/constant/RASProperties
+++ /dev/null
@@ -1,198 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kOmegaSST;
-
-turbulence on;
-
-laminarCoeffs
-{
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-realizableKECoeffs
-{
- Cmu 0.09;
- A0 4.0;
- C2 1.9;
- alphak 1;
- alphaEps 0.833333;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
deleted file mode 100644
index 39d5cf170cfd3616c094647b90a057d1469ed402..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermodynamicProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-barotropicCompressibilityModel linear; //Chung;
-
-psiv psiv [0 -2 2 0 0] 2.5e-06;
-
-rholSat rholSat [1 -3 0 0 0] 830;
-
-psil psil [0 -2 2 0 0] 5e-07;
-
-pSat pSat [1 -1 -2 0 0] 4500;
-
-rhoMin rhoMin [1 -3 0 0 0] 0.001;
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/cavitatingFoam/ras/throttle/constant/transportProperties
deleted file mode 100644
index dcf82123d287f2292957ea37d36a8ff7acc3d285..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/ras/throttle/constant/transportProperties
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mul mul [1 -1 -1 0 0] 6.500e-03;
-muv muv [1 -1 -1 0 0] 5.953e-06;
-
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 7.831e-06;
- rho rho [1 -3 0 0 0 0 0] 830;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- m m [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- k k [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 4.252e-05;
- rho rho [1 -3 0 0 0 0 0] 0.14;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- m m [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] -999;
- nuInf nuInf [0 2 -1 0 0 0 0] -999;
- k k [0 0 1 0 0 0 0] -999;
- n n [0 0 0 0 0 0 0] -999;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.3 b/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.3
deleted file mode 100644
index c1833b014ea36df11a792fe579eb49ea05df82c8..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.3
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box (4.75e-03 -0.375e-03 -1) (9e-03 0.375e-03 1);
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/cavitatingFoam/ras/throttle/system/fvSchemes
deleted file mode 100644
index fc43eb63b87746b8d2dd16a9fad5e20fa5c2be08..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/ras/throttle/system/fvSchemes
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default Euler;
-}
-
-interpolationSchemes
-{
- default linear;
-}
-
-divSchemes
-{
- default none;
- div(phiv,rho) Gauss limitedLinear 0.2;
- div(phi,U) Gauss limitedLinearV 0.2;
- div(phiv,omega) Gauss limitedLinear 0.2;
- div(phiv,k) Gauss limitedLinear 0.2;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-laplacianSchemes
-{
- default none;
-
- laplacian(nuf,rhoU) Gauss linear corrected;
- laplacian(muEff,U) Gauss linear corrected;
- laplacian(rrhoUAf,p) Gauss linear corrected;
- laplacian(rUAf,p) Gauss linear corrected;
- laplacian(DomegaEff,omega) Gauss linear corrected;
- laplacian(DkEff,k) Gauss linear corrected;
-
- laplacian(1,p) Gauss linear corrected;
-}
-
-snGradSchemes
-{
- default none;
- snGrad(p) corrected;
-}
-
-fluxRequired
-{
- default none;
- p;
- rho;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/cavitatingFoam/ras/throttle/system/fvSolution
deleted file mode 100644
index f6bad1ada0bf1ca6bae8743af73b528278e0e658..0000000000000000000000000000000000000000
--- a/tutorials/cavitatingFoam/ras/throttle/system/fvSolution
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- omega PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- rho PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-
- p GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
-
- cacheAgglomeration true;
-
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 1;
-
-// removeSwirl 2;
-}
-
-SIMPLE
-{}
-
-// ************************************************************************* //
diff --git a/tutorials/channelFoam/channel395/constant/postChannelDict b/tutorials/channelFoam/channel395/constant/postChannelDict
deleted file mode 100644
index d63cd656675c6ebe4aecf1608dca9b561a5a3fe8..0000000000000000000000000000000000000000
--- a/tutorials/channelFoam/channel395/constant/postChannelDict
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object postChannelDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Seed patches to start layering from
-patches (bottomWall);
-
-// Direction in which the layers are
-component y;
-
-// Is the mesh symmetric? If so average(symmetric fields) or
-// subtract(asymmetric) contributions from both halves
-symmetric true;
-
-// ************************************************************************* //
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/XiFoam/Allclean b/tutorials/combustion/XiFoam/Allclean
similarity index 100%
rename from tutorials/XiFoam/Allclean
rename to tutorials/combustion/XiFoam/Allclean
diff --git a/tutorials/XiFoam/Allrun b/tutorials/combustion/XiFoam/Allrun
similarity index 100%
rename from tutorials/XiFoam/Allrun
rename to tutorials/combustion/XiFoam/Allrun
diff --git a/tutorials/Xoodles/pitzDaily/0/B b/tutorials/combustion/XiFoam/les/pitzDaily/0/B
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/B
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/B
diff --git a/tutorials/Xoodles/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/Su
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/Su
diff --git a/tutorials/Xoodles/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/T
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/T
diff --git a/tutorials/Xoodles/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/Tu
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
diff --git a/tutorials/Xoodles/pitzDaily/0/U b/tutorials/combustion/XiFoam/les/pitzDaily/0/U
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/U
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/U
diff --git a/tutorials/Xoodles/pitzDaily/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/Xi
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
diff --git a/tutorials/Xoodles/pitzDaily/0/b b/tutorials/combustion/XiFoam/les/pitzDaily/0/b
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/b
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/b
diff --git a/tutorials/Xoodles/pitzDaily/0/ft b/tutorials/combustion/XiFoam/les/pitzDaily/0/ft
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/ft
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/ft
diff --git a/tutorials/Xoodles/pitzDaily/0/k b/tutorials/combustion/XiFoam/les/pitzDaily/0/k
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/k
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/k
diff --git a/tutorials/Xoodles/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/muSgs
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
diff --git a/tutorials/Xoodles/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/0/p
rename to tutorials/combustion/XiFoam/les/pitzDaily/0/p
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties
similarity index 74%
rename from tutorials/rhoPisoFoam/les/pitzDaily/constant/LESProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties
index ed200ef229047730da269445b4e38383ef4f92df..56c915c9248767858ba422364230811ed44db542 100644
--- a/tutorials/rhoPisoFoam/les/pitzDaily/constant/LESProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel oneEqEddy;
+LESModel oneEqEddy;
-printCoeffs on;
+delta cubeRootVol;
-delta cubeRootVol;
+printCoeffs on;
laminarCoeffs
{
@@ -26,34 +27,34 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ce 1.048;
- ck 0.094;
+ ce 1.048;
+ ck 0.094;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
lowReOneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
- beta 0.01;
+ ck 0.07;
+ ce 1.05;
+ beta 0.01;
}
SmagorinskyCoeffs
{
- ck 0.02;
- ce 0.202;
+ ck 0.02;
+ ce 0.202;
}
DeardorffDiffStressCoeffs
{
- ce 1.048;
- ck 0.094;
- cm 4.13;
+ ce 1.048;
+ ck 0.094;
+ cm 4.13;
}
cubeRootVolCoeffs
@@ -68,6 +69,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -75,9 +77,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -87,6 +91,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -94,10 +99,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -107,14 +114,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
similarity index 75%
rename from tutorials/Xoodles/pitzDaily/constant/combustionProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
index 88b91cb81a8d91f1e6674fa9e37be2ccb09e08b4..c82a1b4cc90caf39d28b1b34a2cbd30d40d1a398 100644
--- a/tutorials/Xoodles/pitzDaily/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object combustionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation constant;
fuel Propane;
-Su Su [0 1 -1 0 0 0 0] 0.135;
+Su Su [ 0 1 -1 0 0 0 0 ] 0.135;
SuModel transport;
-equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
+equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6;
-sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338;
+sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338;
XiModel transport;
-XiCoef XiCoef [0 0 0 0 0 0 0] 0.62;
+XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
-XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1;
+XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
-uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1;
+uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
GuldersCoeffs
{
@@ -45,6 +46,7 @@ GuldersCoeffs
beta -0.5;
f 2.3;
}
+
Propane
{
W 0.446;
@@ -54,6 +56,7 @@ GuldersCoeffs
beta -0.2;
f 2.3;
}
+
IsoOctane
{
W 0.4658;
@@ -67,16 +70,15 @@ GuldersCoeffs
ignite no;
-ignitionSites
-(
-);
+ignitionSites ( );
ignitionSphereFraction 0;
-ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0;
+ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0;
ignitionCircleFraction 0;
-ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
+ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
diff --git a/tutorials/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
similarity index 91%
rename from tutorials/XiFoam/moriyoshiHomogeneous/constant/thermophysicalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
index 41ef30b1efe91df74364aa9988ee17ae45f5365a..8e705f32e59da3381e1c209e1c6ff830d3677756 100644
--- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672;
@@ -28,4 +29,5 @@ products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9
burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/turbulenceProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties
similarity index 89%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties
index dcadcf17cd97481597090cf391913d3fe6432687..2e42797ca9558f9a6c4c3b2195313dda5504598a 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType LESModel;
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
similarity index 73%
rename from tutorials/Xoodles/pitzDaily/system/controlDict
rename to tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index eb71c634bbed219bdd043b57d6161d9901bdad21..0d13ac7ba5cb7b3ddfef7b359158d43aa4a48751 100644
--- a/tutorials/Xoodles/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,37 +43,36 @@ timePrecision 6;
runTimeModifiable yes;
+adjustTimeStep yes;
+
+maxCo 0.5;
+
functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
-
outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
similarity index 84%
rename from tutorials/Xoodles/pitzDaily3D/system/fvSchemes
rename to tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
index 319151c4c3c754926946f10f755d5aa542f32104..78f524d421c2d8e8c137d01b889d28a43cc97051 100644
--- a/tutorials/Xoodles/pitzDaily3D/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -37,14 +38,7 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear 1;
div(phiXi,Su) Gauss limitedLinear 1;
div(phiSt,b) Gauss limitedLinear01 1;
- div(phi,ft_b_h_hu) Gauss multivariateSelection
- {
- fu limitedLinear01 1;
- ft limitedLinear01 1;
- b limitedLinear01 1;
- h limitedLinear 1;
- hu limitedLinear 1;
- };
+ div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; };
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
@@ -77,7 +71,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..cd3fb63f14ed693afea0db5bfbf4af4b06dc61e2
--- /dev/null
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
@@ -0,0 +1,132 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ ft
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ fu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ b
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Xi
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Su
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ hu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/0/B b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/B
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/B
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/B
diff --git a/tutorials/Xoodles/pitzDaily3D/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/Su
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
diff --git a/tutorials/Xoodles/pitzDaily3D/0/T b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/T
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
diff --git a/tutorials/Xoodles/pitzDaily3D/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/Tu
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
diff --git a/tutorials/Xoodles/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/U
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
diff --git a/tutorials/Xoodles/pitzDaily3D/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/Xi
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
diff --git a/tutorials/Xoodles/pitzDaily3D/0/b b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/b
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
diff --git a/tutorials/Xoodles/pitzDaily3D/0/ft b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/ft
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft
diff --git a/tutorials/Xoodles/pitzDaily3D/0/k b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/k
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
diff --git a/tutorials/Xoodles/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/muSgs
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
diff --git a/tutorials/Xoodles/pitzDaily3D/0/p b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/0/p
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
diff --git a/tutorials/Xoodles/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties
similarity index 70%
rename from tutorials/Xoodles/pitzDaily/constant/LESProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties
index 1976bb4dac82678e5b14d9dc109387edf1dae0e3..95bb1c14f8c2d1a80c01f98d2d8b11202218d7b3 100644
--- a/tutorials/Xoodles/pitzDaily/constant/LESProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel oneEqEddy;
+LESModel oneEqEddy;
-delta cubeRootVol;
+delta cubeRootVol;
-printCoeffs on;
+printCoeffs on;
laminarCoeffs
{
@@ -26,34 +27,34 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ce 1.048;
- ck 0.094;
+ ce 1.048;
+ ck 0.094;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
- filter simple;
+ ce 1.05;
+ filter simple;
}
lowReOneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
- beta 0.01;
+ ck 0.07;
+ ce 1.05;
+ beta 0.01;
}
SmagorinskyCoeffs
{
- ck 0.02;
- ce 0.202;
+ ck 0.02;
+ ce 0.202;
}
DeardorffDiffStressCoeffs
{
- ce 1.048;
- ck 0.094;
- cm 4.13;
+ ce 1.048;
+ ck 0.094;
+ cm 4.13;
}
cubeRootVolCoeffs
@@ -68,6 +69,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -75,9 +77,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -87,6 +91,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -94,10 +99,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -107,14 +114,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
similarity index 68%
rename from tutorials/Xoodles/pitzDaily3D/constant/combustionProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
index 000883e1dafc4373d60543c5a695fd713105b17f..1568261fe21a51af1e7c78addec99a2b29deca8e 100644
--- a/tutorials/Xoodles/pitzDaily3D/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object combustionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders;
fuel Propane;
-Su Su [0 1 -1 0 0 0 0] 0.135;
+Su Su [ 0 1 -1 0 0 0 0 ] 0.135;
SuModel transport;
-equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
+equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6;
-sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338;
+sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338;
XiModel transport;
-XiCoef XiCoef [0 0 0 0 0 0 0] 0.62;
+XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
-XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1;
+XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
-uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1;
+uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
GuldersCoeffs
{
@@ -45,6 +46,7 @@ GuldersCoeffs
beta -0.5;
f 2.3;
}
+
Propane
{
W 0.446;
@@ -54,6 +56,7 @@ GuldersCoeffs
beta -0.2;
f 2.3;
}
+
IsoOctane
{
W 0.4658;
@@ -67,24 +70,15 @@ GuldersCoeffs
ignite yes;
-ignitionSites
-(
-
- {
- location (0 0 0);
- diameter 0.003;
- start 0;
- duration 0.001;
- strength 2;
- }
-);
+ignitionSites ( { location ( 0 0 0 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 2 ; } );
ignitionSphereFraction 1;
-ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0;
+ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0;
ignitionCircleFraction 0;
-ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
+ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
similarity index 84%
rename from tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
index c65ebf7f14b660d9bd5a86dbe868a819b4cf9fc7..ce7f648b7fae5d1ad1a6f0605b644e757b0728f3 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/Xoodles/pitzDaily3D/constant/polyMesh/boundary
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
similarity index 78%
rename from tutorials/Xoodles/pitzDaily3D/constant/thermophysicalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
index 0ca3b84735fd93ef85e06251a0171939f4e10c56..7c8fd76fe381691fab9e3e98d39ce25179db20f2 100644
--- a/tutorials/Xoodles/pitzDaily3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672;
@@ -28,14 +29,5 @@ products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9
burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
-/*
-thermoType hhuMixtureThermo<homogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 9.286;
-
-reactants reactants 1 28 1330.9 2.133e+06 1.798e-05 0.7;
-
-products products 1 28 1579.9 0 5.016e-05 0.7;
-*/
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties
similarity index 89%
rename from tutorials/cavitatingFoam/les/throttle/constant/turbulenceProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties
index dcadcf17cd97481597090cf391913d3fe6432687..2e42797ca9558f9a6c4c3b2195313dda5504598a 100644
--- a/tutorials/cavitatingFoam/les/throttle/constant/turbulenceProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType LESModel;
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
similarity index 69%
rename from tutorials/Xoodles/pitzDaily3D/system/controlDict
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 26a0e1c65af2be625a4902ab7e09847d3a4e75a8..693d3e125f66bb762c33e86168803fc21cb8c0fd 100644
--- a/tutorials/Xoodles/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,37 +43,36 @@ timePrecision 6;
runTimeModifiable yes;
+adjustTimeStep yes;
+
+maxCo 0.5;
+
functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
-
outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
similarity index 82%
rename from tutorials/Xoodles/pitzDaily/system/fvSchemes
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
index 319151c4c3c754926946f10f755d5aa542f32104..2398134a00a77dad1665370829a4350194bb6e98 100644
--- a/tutorials/Xoodles/pitzDaily/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -37,14 +38,7 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear 1;
div(phiXi,Su) Gauss limitedLinear 1;
div(phiSt,b) Gauss limitedLinear01 1;
- div(phi,ft_b_h_hu) Gauss multivariateSelection
- {
- fu limitedLinear01 1;
- ft limitedLinear01 1;
- b limitedLinear01 1;
- h limitedLinear 1;
- hu limitedLinear 1;
- };
+ div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; };
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
@@ -77,7 +71,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..d4656531edcb00756339a56f6ccb6ab26fa013af
--- /dev/null
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
@@ -0,0 +1,132 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ ft
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ fu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ b
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Xi
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Su
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ hu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/Su b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/Su
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Su
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/T b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/T
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/T
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/Tu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/Tu
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Tu
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/U b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/U
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/U
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/Xi b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/Xi
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/Xi
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/b b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/b
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/b
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/epsilon
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/ft b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/ft
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/ft
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/fu b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/fu
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/fu
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/k
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/0/p b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/0/p
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/p
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..564a9fbe2369dd88931d20ecbd46eca762ded935
--- /dev/null
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel LaunderSharmaKE;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0;
+ alphah 1.111;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 0;
+ alphah 1.111;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0;
+ alphah 1.111;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
similarity index 71%
rename from tutorials/XiFoam/moriyoshiHomogeneous/constant/combustionProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
index 19878d0cfe6073ccea35ee2d4a71394785c86870..0aac5c44dba25819ad0e207f36c7d28c6d55e46e 100644
--- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object combustionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders;
fuel Propane;
-Su Su [0 1 -1 0 0 0 0] 0.434;
+Su Su [ 0 1 -1 0 0 0 0 ] 0.434;
SuModel unstrained;
-equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1;
+equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1;
-sigmaExt sigmaExt [0 0 -1 0 0 0 0] 100000;
+sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 100000;
XiModel transport;
-XiCoef XiCoef [0 0 0 0 0 0 0] 0.62;
+XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
-XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1;
+XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
-uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1;
+uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
GuldersCoeffs
{
@@ -45,6 +46,7 @@ GuldersCoeffs
beta -0.5;
f 2.3;
}
+
Propane
{
W 0.446;
@@ -54,6 +56,7 @@ GuldersCoeffs
beta -0.2;
f 2.3;
}
+
IsoOctane
{
W 0.4658;
@@ -67,24 +70,15 @@ GuldersCoeffs
ignite yes;
-ignitionSites
-(
-
- {
- location (0 0 0.0005);
- diameter 0.003;
- start 0;
- duration 0.001;
- strength 1;
- }
-);
+ignitionSites ( { location ( 0 0 0.0005 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 1 ; } );
ignitionSphereFraction 1;
-ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001;
+ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0.001;
ignitionCircleFraction 0.5;
-ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0.001;
+ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0.001;
+
// ************************************************************************* //
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/environmentalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
similarity index 84%
rename from tutorials/Xoodles/pitzDaily3D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
index ca80af21ee6180ad2667f0efe40c92ac5df7ee7a..645c9af09920faa00dce17c1d3a52689e877a1f0 100644
--- a/tutorials/Xoodles/pitzDaily3D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 0);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+
// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/blockMeshDict
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/XiFoam/moriyoshiHomogeneous/constant/polyMesh/boundary
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
diff --git a/tutorials/Xoodles/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
similarity index 80%
rename from tutorials/Xoodles/pitzDaily/constant/thermophysicalProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index 0ca3b84735fd93ef85e06251a0171939f4e10c56..8e705f32e59da3381e1c209e1c6ff830d3677756 100644
--- a/tutorials/Xoodles/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672;
@@ -28,14 +29,5 @@ products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9
burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
-/*
-thermoType hhuMixtureThermo<homogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 9.286;
-
-reactants reactants 1 28 1330.9 2.133e+06 1.798e-05 0.7;
-
-products products 1 28 1579.9 0 5.016e-05 0.7;
-*/
// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/constant/turbulenceProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
similarity index 89%
rename from tutorials/interFoam/ras/damBreak/constant/turbulenceProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
index 07f85c68df22113b7c7747b89457597b0ea41d66..b70f6702e4ef7644c20687bce6536c6690720da9 100644
--- a/tutorials/interFoam/ras/damBreak/constant/turbulenceProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType RASModel;
+
// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
similarity index 92%
rename from tutorials/XiFoam/moriyoshiHomogeneous/system/controlDict
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
index 8cf37a24956d56096a164d5e82f1b323176694e1..576ae511764d77a754e38c23cdb24f0c9ae62012 100644
--- a/tutorials/XiFoam/moriyoshiHomogeneous/system/controlDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -49,4 +49,5 @@ maxCo 0.2;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/system/fvSchemes b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
similarity index 85%
rename from tutorials/XiFoam/moriyoshiHomogeneous/system/fvSchemes
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
index 8a345e5483e021258f575ee023b4c12c1984bddd..94a4bd22bf03892c293485b4610fba0552823721 100644
--- a/tutorials/XiFoam/moriyoshiHomogeneous/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -38,14 +39,7 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear 1;
div(phiXi,Su) Gauss limitedLinear 1;
div(phiSt,b) Gauss limitedLinear01 1;
- div(phi,ft_b_h_hu) Gauss multivariateSelection
- {
- fu limitedLinear01 1;
- ft limitedLinear01 1;
- b limitedLinear01 1;
- h limitedLinear 1;
- hu limitedLinear 1;
- };
+ div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; };
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
@@ -79,7 +73,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..061b461dd077e86b3bf2c6c2fc9a7aeaab29f1cb
--- /dev/null
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/fvSolution
@@ -0,0 +1,133 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ ft
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ fu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ b
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Xi
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Su
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ hu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ momentumPredictor yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/0/N2 b/tutorials/combustion/dieselFoam/aachenBomb/0/N2
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/N2
rename to tutorials/combustion/dieselFoam/aachenBomb/0/N2
diff --git a/tutorials/dieselFoam/aachenBomb/0/O2 b/tutorials/combustion/dieselFoam/aachenBomb/0/O2
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/O2
rename to tutorials/combustion/dieselFoam/aachenBomb/0/O2
diff --git a/tutorials/dieselFoam/aachenBomb/0/T b/tutorials/combustion/dieselFoam/aachenBomb/0/T
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/T
rename to tutorials/combustion/dieselFoam/aachenBomb/0/T
diff --git a/tutorials/dieselFoam/aachenBomb/0/U b/tutorials/combustion/dieselFoam/aachenBomb/0/U
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/U
rename to tutorials/combustion/dieselFoam/aachenBomb/0/U
diff --git a/tutorials/dieselFoam/aachenBomb/0/Ydefault b/tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/Ydefault
rename to tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault
diff --git a/tutorials/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
similarity index 93%
rename from tutorials/dieselFoam/aachenBomb/0/alphat
rename to tutorials/combustion/dieselFoam/aachenBomb/0/alphat
index 1681c54f00ab7d93ad91202def8d1a6418c69fb2..2684dd73c822be130389cc925a29ebd9cb627ec0 100644
--- a/tutorials/dieselFoam/aachenBomb/0/alphat
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/dieselFoam/aachenBomb/0/epsilon b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon
similarity index 93%
rename from tutorials/dieselFoam/aachenBomb/0/epsilon
rename to tutorials/combustion/dieselFoam/aachenBomb/0/epsilon
index c14d3d7e021c20c8bdd5d30a0c2592947c01e263..e9dd46eb33ab84ca1e8bab21d748bfc6f058750a 100644
--- a/tutorials/dieselFoam/aachenBomb/0/epsilon
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/dieselFoam/aachenBomb/0/ft b/tutorials/combustion/dieselFoam/aachenBomb/0/ft
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/ft
rename to tutorials/combustion/dieselFoam/aachenBomb/0/ft
diff --git a/tutorials/dieselFoam/aachenBomb/0/fu b/tutorials/combustion/dieselFoam/aachenBomb/0/fu
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/fu
rename to tutorials/combustion/dieselFoam/aachenBomb/0/fu
diff --git a/tutorials/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k
similarity index 93%
rename from tutorials/dieselFoam/aachenBomb/0/k
rename to tutorials/combustion/dieselFoam/aachenBomb/0/k
index e6e58aecfaf011558d8d20e2c5fc525ca4e63c6e..251a39ce81061432f904f98f80de677eb38ebce6 100644
--- a/tutorials/dieselFoam/aachenBomb/0/k
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut
similarity index 93%
rename from tutorials/dieselFoam/aachenBomb/0/mut
rename to tutorials/combustion/dieselFoam/aachenBomb/0/mut
index 2750ce32ecd5ed962213674d95930ff9b34920c5..e687f9b8fa216ba2de2f97e045c11372525473ae 100644
--- a/tutorials/dieselFoam/aachenBomb/0/mut
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/dieselFoam/aachenBomb/0/p b/tutorials/combustion/dieselFoam/aachenBomb/0/p
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/p
rename to tutorials/combustion/dieselFoam/aachenBomb/0/p
diff --git a/tutorials/dieselFoam/aachenBomb/0/spray b/tutorials/combustion/dieselFoam/aachenBomb/0/spray
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/0/spray
rename to tutorials/combustion/dieselFoam/aachenBomb/0/spray
diff --git a/tutorials/dieselFoam/aachenBomb/chemkin/chem.inp b/tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/chemkin/chem.inp
rename to tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp
diff --git a/tutorials/dieselFoam/aachenBomb/chemkin/chem.inp.1 b/tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp.1
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/chemkin/chem.inp.1
rename to tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp.1
diff --git a/tutorials/dieselFoam/aachenBomb/chemkin/chem.inp.full b/tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp.full
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/chemkin/chem.inp.full
rename to tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp.full
diff --git a/tutorials/dieselFoam/aachenBomb/chemkin/chem.inp_15 b/tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp_15
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/chemkin/chem.inp_15
rename to tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp_15
diff --git a/tutorials/dieselFoam/aachenBomb/chemkin/therm.dat b/tutorials/combustion/dieselFoam/aachenBomb/chemkin/therm.dat
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/chemkin/therm.dat
rename to tutorials/combustion/dieselFoam/aachenBomb/chemkin/therm.dat
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..991a2915d96e31f7a47ab1334189ddd642009f6c
--- /dev/null
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+ muLimiter on;
+ Lsgs 0.0002;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ Cs 0.25;
+ Ceps 0.15;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties
similarity index 67%
rename from tutorials/dieselFoam/aachenBomb/constant/chemistryProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties
index a607222ee1c164c56ff5ef6e25c29918c1ae0b48..be340ec092624c3700ecdf023d551ed099f103da 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/chemistryProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties
@@ -2,42 +2,42 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "constant";
object chemistryProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-chemistry off;
+chemistry off;
-chemistrySolver ODE;
-//chemistrySolver EulerImplicit;
-//chemistrySolver sequential;
+chemistrySolver ODE;
-initialChemicalTimeStep 1.0e-7;
+initialChemicalTimeStep 1e-07;
sequentialCoeffs
{
- cTauChem 1.0e-3;
+ cTauChem 0.001;
}
EulerImplicitCoeffs
{
- cTauChem 5.0e-2;
- equilibriumRateLimiter off;
+ cTauChem 0.05;
+ equilibriumRateLimiter off;
}
ODECoeffs
{
ODESolver SIBS;
- eps 5.0e-2;
- scale 1.0;
+ eps 0.05;
+ scale 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/combustionProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties
similarity index 67%
rename from tutorials/dieselFoam/aachenBomb/constant/combustionProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties
index a038d1e7f53483461e65de1728980a828eafcc8a..b43b4967c8bdcf920246e6d2864a4be23c444e58 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/combustionProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties
@@ -2,26 +2,28 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "constant";
object combustionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Cmix Cmix [ 0 0 0 0 0 0 0 ] 1.0 ;
+Cmix Cmix [ 0 0 0 0 0 0 0 ] 1;
ignitionProperties1
{
- ignite off;
- ignitionPoint ignitionPoint [ 0 1 0 0 0 0 0 ] ( 0.2 0 0.02 ) ;
- timing timing [ 0 0 1 0 0 0 0 ] 0.0e-1 ;
- duration duration [ 0 0 1 0 0 0 0 ] 1.0e-0 ;
+ ignite off;
+ ignitionPoint ignitionPoint [ 0 1 0 0 0 0 0 ] ( 0.2 0 0.02 );
+ timing timing [ 0 0 1 0 0 0 0 ] 0;
+ duration duration [ 0 0 1 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b5ad4b1cfd6a3ca2480b62a561d7bade6452f875
--- /dev/null
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/injectorProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
similarity index 97%
rename from tutorials/dieselFoam/aachenBomb/constant/injectorProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
index 81b8b07bc6d0135f84a4c63b2b0b78dbc917dd7d..1ae195e668d5c2be351e09f59a9298fbf7dcaf79 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/injectorProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object injectorProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -32,7 +33,7 @@ FoamFile
1.0
);
- massFlowRateProfile
+ massFlowRateProfile
(
(0 0.1272)
(4.16667e-05 6.1634)
@@ -91,7 +92,7 @@ FoamFile
1.0
);
- massFlowRateProfile
+ massFlowRateProfile
(
(0 0.1272)
(4.16667e-05 6.1634)
@@ -132,7 +133,7 @@ FoamFile
(0.00125 1.0)
);
}
- }
+ }
)
// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict
diff --git a/tutorials/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
similarity index 93%
rename from tutorials/dieselFoam/aachenBomb/constant/polyMesh/boundary
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
index 5e28555623fa8687c821f1ff8ff76939fe33007a..2e94e303b70438668052b23280a41adea47a0dd4 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/polyMesh/boundary
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
similarity index 63%
rename from tutorials/dieselFoam/aachenBomb/constant/sprayProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
index 8a53ee8d1eb90d6610d6c2a1c18653b408dbf06f..ec151bbf0ac2adcb4ec2946a9b579923af8ff1ce 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/sprayProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties
@@ -2,14 +2,15 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "constant";
object sprayProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -24,20 +25,13 @@ interpolationSchemes
subCycles 2;
-atomizationModel off;
-//atomizationModel LISA;
+atomizationModel off;
+
+includeOscillation yes;
-includeOscillation yes;
-//breakupModel TAB;
-//breakupModel ETAB;
-//breakupModel ReitzDiwakar;
breakupModel ReitzKHRT;
-//injectorModel constInjector;
-//injectorModel ChomiakInjector;
-//injectorModel definedInjector;
-//injectorModel pressureSwirlInjector;
-injectorModel hollowConeInjector;
+injectorModel hollowConeInjector;
collisionModel off;
@@ -53,33 +47,27 @@ wallModel reflect;
specConstAtomizationCoeffs
{
- dropletNozzleDiameterRatio
- (
- 0.4
- );
- sprayAngle
- (
- 10
- );
+ dropletNozzleDiameterRatio ( 0.4 );
+ sprayAngle ( 10 );
}
TABCoeffs
{
- y0 0.0;
- yDot0 0.0;
- Cmu 10.0;
- Comega 8.0;
+ y0 0;
+ yDot0 0;
+ Cmu 10;
+ Comega 8;
WeCrit 12;
}
ETABCoeffs
{
- Cmu 10.0;
- Comega 8.0;
- WeCrit 12;
- k1 0.2;
- k2 0.2;
- WeTransition 100.0;
+ Cmu 10;
+ Comega 8;
+ WeCrit 12;
+ k1 0.2;
+ k2 0.2;
+ WeTransition 100;
}
ReitzDiwakarCoeffs
@@ -134,45 +122,25 @@ hollowConeInjectorCoeffs
{
dropletPDF
{
- //pdfType exponential;
pdfType RosinRammler;
-
RosinRammlerPDF
{
- minValue 1.00e-6;
- maxValue 1.50e-4;
-
- d
- (
- 1.5e-4
- );
-
- n
- (
- 3
- );
+ minValue 1e-06;
+ maxValue 0.00015;
+ d ( 0.00015 );
+ n ( 3 );
}
+
exponentialPDF
{
- minValue 1.0e-4;
- maxValue 1.0e-3;
-
- lambda
- (
- 1.0e+4
- );
+ minValue 0.0001;
+ maxValue 0.001;
+ lambda ( 10000 );
}
}
- innerConeAngle
- (
- 0.0
- );
-
- outerConeAngle
- (
- 20.0
- );
+ innerConeAngle ( 0 );
+ outerConeAngle ( 20 );
}
reflectCoeffs
@@ -180,4 +148,5 @@ reflectCoeffs
elasticity 0.9;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..24238233850126a97429b47c579583a711ef9122
--- /dev/null
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hMixtureThermo<reactingMixture>;
+
+CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
+
+CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat";
+
+inertSpecie N2;
+
+liquidComponents ( C7H16 );
+
+liquidProperties
+{
+ C7H16 C7H16 defaultCoeffs;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..88ce3d1bc49c6e53d2c8455270909d32de538506
--- /dev/null
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..081c1d7369f1702ed1c0ce20445896c9889b8def
--- /dev/null
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.01;
+
+deltaT 2.5e-06;
+
+writeControl adjustableRunTime;
+
+writeInterval 5e-05;
+
+purgeWrite 0;
+
+writeFormat binary;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+adjustTimeStep yes;
+
+maxCo 0.1;
+
+runTimeModifiable yes;
+
+
+// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
similarity index 62%
rename from tutorials/dieselFoam/aachenBomb/system/fvSchemes
rename to tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
index e3033a80a284c72263d9a48843633853511667c3..5ed3bb30fa8c7dc529bb44900d8f2dbd2c181f0c 100644
--- a/tutorials/dieselFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
@@ -2,21 +2,22 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -27,31 +28,26 @@ gradSchemes
divSchemes
{
- default none;
- div(phi,rho) Gauss limitedLinear 1;
- div(phi,U) Gauss limitedLinearV 1;
- div(phiU,p) Gauss linear;
- div(phi,k) Gauss limitedLinear 1;
+ default none;
+ div(phi,rho) Gauss limitedLinear 1;
+ div(phi,U) Gauss limitedLinearV 1;
+ div(phiU,p) Gauss linear;
+ div(phi,k) Gauss limitedLinear 1;
div(phi,epsilon) Gauss limitedLinear 1;
- div(phi,Yi_h) Gauss upwind;
- div(phi,fu_ft_h) Gauss multivariateSelection
- {
- fu limitedLinear 1;
- ft limitedLinear 1;
- h limitedLinear 1;
- };
+ div(phi,Yi_h) Gauss upwind;
+ div(phi,fu_ft_h) Gauss multivariateSelection { fu limitedLinear 1 ; ft limitedLinear 1 ; h limitedLinear 1 ; };
div((muEff*dev2(grad(U).T()))) Gauss linear;
}
laplacianSchemes
{
- default Gauss linear corrected;
- laplacian(muEff,U) Gauss linear corrected;
- laplacian(muEff,ft) Gauss linear corrected;
- laplacian(muEff,fu) Gauss linear corrected;
+ default Gauss linear corrected;
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(muEff,ft) Gauss linear corrected;
+ laplacian(muEff,fu) Gauss linear corrected;
laplacian(((alphah*mut)+alpha),h) Gauss linear corrected;
laplacian((rho|A(U)),p) Gauss linear corrected;
- laplacian(rhoD,k) Gauss linear corrected;
+ laplacian(rhoD,k) Gauss linear corrected;
laplacian(rhoD,epsilon) Gauss linear corrected;
}
@@ -68,7 +64,8 @@ snGradSchemes
fluxRequired
{
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..6c09239a76c4ad32d881b9721b0ee445555e5451
--- /dev/null
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
@@ -0,0 +1,84 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-09;
+ relTol 0;
+ }
+
+ Yi
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/-180/Su.gz b/tutorials/combustion/engineFoam/kivaTest/-180/Su.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/Su.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/Su.gz
diff --git a/tutorials/engineFoam/kivaTest/-180/T.gz b/tutorials/combustion/engineFoam/kivaTest/-180/T.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/T.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/T.gz
diff --git a/tutorials/engineFoam/kivaTest/-180/Tu.gz b/tutorials/combustion/engineFoam/kivaTest/-180/Tu.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/Tu.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/Tu.gz
diff --git a/tutorials/engineFoam/kivaTest/-180/U.gz b/tutorials/combustion/engineFoam/kivaTest/-180/U.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/U.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/U.gz
diff --git a/tutorials/engineFoam/kivaTest/-180/Xi.gz b/tutorials/combustion/engineFoam/kivaTest/-180/Xi.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/Xi.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/Xi.gz
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/alphat b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..adf870f24a4c8cec3336bc741459b3e996966b02
--- /dev/null
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/alphat
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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 volScalarField;
+ location "-180";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ piston
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ liner
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ cylinderHead
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/-180/b.gz b/tutorials/combustion/engineFoam/kivaTest/-180/b.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/b.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/b.gz
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
new file mode 100644
index 0000000000000000000000000000000000000000..a686c3595536e9a183683346beee9db76b00cb37
--- /dev/null
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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 volScalarField;
+ location "-180";
+ object epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -3 0 0 0 0];
+
+internalField uniform 450;
+
+boundaryField
+{
+ piston
+ {
+ type epsilonWallFunction;
+ value uniform 450;
+ }
+ liner
+ {
+ type epsilonWallFunction;
+ value uniform 450;
+ }
+ cylinderHead
+ {
+ type epsilonWallFunction;
+ value uniform 450;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/-180/ft.gz b/tutorials/combustion/engineFoam/kivaTest/-180/ft.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/ft.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/ft.gz
diff --git a/tutorials/engineFoam/kivaTest/-180/fu.gz b/tutorials/combustion/engineFoam/kivaTest/-180/fu.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/fu.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/fu.gz
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k
new file mode 100644
index 0000000000000000000000000000000000000000..e643a368e6a2ab87ab90595b0da6a91689c365c6
--- /dev/null
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/k
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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 volScalarField;
+ location "-180";
+ object k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform 4;
+
+boundaryField
+{
+ piston
+ {
+ type kQRWallFunction;
+ value uniform 4;
+ }
+ liner
+ {
+ type kQRWallFunction;
+ value uniform 4;
+ }
+ cylinderHead
+ {
+ type kQRWallFunction;
+ value uniform 4;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/mut b/tutorials/combustion/engineFoam/kivaTest/-180/mut
new file mode 100644
index 0000000000000000000000000000000000000000..34a502ef779932701ea49454e00b295ac95f9471
--- /dev/null
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/mut
@@ -0,0 +1,42 @@
+/*--------------------------------*- 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 volScalarField;
+ location "-180";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ piston
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ liner
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ cylinderHead
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/-180/p.gz b/tutorials/combustion/engineFoam/kivaTest/-180/p.gz
similarity index 100%
rename from tutorials/engineFoam/kivaTest/-180/p.gz
rename to tutorials/combustion/engineFoam/kivaTest/-180/p.gz
diff --git a/tutorials/engineFoam/kivaTest/Allclean b/tutorials/combustion/engineFoam/kivaTest/Allclean
similarity index 100%
rename from tutorials/engineFoam/kivaTest/Allclean
rename to tutorials/combustion/engineFoam/kivaTest/Allclean
diff --git a/tutorials/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
similarity index 100%
rename from tutorials/engineFoam/kivaTest/Allrun
rename to tutorials/combustion/engineFoam/kivaTest/Allrun
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..62bcf8bb7155662932d3e2550af5bd866b54cc4e
--- /dev/null
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0;
+ alphah 1.111;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
similarity index 75%
rename from tutorials/engineFoam/kivaTest/constant/combustionProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
index 1b0c9a791675a8a1279b4cda2e12450da7ec4d6e..e79c47968c2a081bc18aa782829f3de42dc1020f 100644
--- a/tutorials/engineFoam/kivaTest/constant/combustionProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object combustionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders;
fuel IsoOctane;
-Su Su [0 1 -1 0 0 0 0] 0;
+Su Su [ 0 1 -1 0 0 0 0 ] 0;
SuModel unstrained;
-equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1;
+equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1;
-sigmaExt sigmaExt [0 0 -1 0 0 0 0] 100000;
+sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 100000;
XiModel transport;
-XiCoef XiCoef [0 0 0 0 0 0 0] 0.62;
+XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
-XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1;
+XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
-uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1;
+uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
GuldersCoeffs
{
@@ -45,6 +46,7 @@ GuldersCoeffs
beta -0.5;
f 2.3;
}
+
Propane
{
W 0.446;
@@ -54,6 +56,7 @@ GuldersCoeffs
beta -0.2;
f 2.3;
}
+
IsoOctane
{
W 0.4658;
@@ -69,7 +72,6 @@ ignite yes;
ignitionSites
(
-
{
location (0.03 0 0.091);
diameter 0.002;
@@ -79,11 +81,13 @@ ignitionSites
}
);
-ignitionSphereFraction 1.0;
+ignitionSphereFraction 1;
+
+ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0;
+
+ignitionCircleFraction 1;
-ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0;
-ignitionCircleFraction 1;
+ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0;
-ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
similarity index 70%
rename from tutorials/engineFoam/kivaTest/constant/engineGeometry
rename to tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
index 4b8dc36854fd7611b07d34f799777089bb190380..2ed448b1dd2c924e7abed172f8de5ecbcce74de6 100644
--- a/tutorials/engineFoam/kivaTest/constant/engineGeometry
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,22 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object engineGeometry;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
engineMesh layered;
-conRodLength conRodLength [0 1 0 0 0 0 0] 0.147;
+conRodLength conRodLength [ 0 1 0 0 0 0 0 ] 0.147;
-bore bore [0 1 0 0 0 0 0] 0.092;
+bore bore [ 0 1 0 0 0 0 0 ] 0.092;
-stroke stroke [0 1 0 0 0 0 0] 0.08423;
+stroke stroke [ 0 1 0 0 0 0 0 ] 0.08423;
-clearance clearance [0 1 0 0 0 0 0] 0.00115;
+clearance clearance [ 0 1 0 0 0 0 0 ] 0.00115;
+
+rpm rpm [ 0 0 -1 0 0 0 0 ] 1500;
-rpm rpm [0 0 -1 0 0 0 0] 1500;
// ************************************************************************* //
diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/environmentalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
similarity index 84%
rename from tutorials/bubbleFoam/bubbleColumn/constant/environmentalProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..645c9af09920faa00dce17c1d3a52689e877a1f0 100644
--- a/tutorials/bubbleFoam/bubbleColumn/constant/environmentalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/engineFoam/kivaTest/constant/polyMesh/boundary
rename to tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
diff --git a/tutorials/engineFoam/kivaTest/constant/polyMesh/boundary.org b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org
similarity index 100%
rename from tutorials/engineFoam/kivaTest/constant/polyMesh/boundary.org
rename to tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org
diff --git a/tutorials/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
similarity index 91%
rename from tutorials/engineFoam/kivaTest/constant/thermophysicalProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index a45a851b18c1f948471aa2a3aaf2299e447ae9a7..493713c379c8a3d5c75c3b8344a57b0a557cf1b7 100644
--- a/tutorials/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.0336;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;
fuel fuel 1 114.23 298.15 5000 1000 19.3963 0.0488137 -1.55798e-05 2.17831e-09 -1.08391e-13 -37133.9 -78.8531 0.429357 0.0765769 8.41306e-06 -5.86603e-08 2.79414e-11 -30446.4 25.6735 1.67212e-06 170.672;
@@ -28,4 +29,5 @@ products products 1 28.8478 298.15 5000 1000 3.10156 0.00124723 -4.2071e-
burntProducts burntProducts 1 28.6068 200 6000 1000 3.12468 0.00178578 -5.94695e-07 9.09801e-11 -5.1246e-15 -11005.8 5.03593 3.47612 0.000758205 -3.68739e-07 1.3449e-09 -8.08868e-13 -11071.5 3.3058 1.67212e-06 170.672;
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
similarity index 89%
rename from tutorials/pisoFoam/ras/cavity/constant/turbulenceProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
index 07f85c68df22113b7c7747b89457597b0ea41d66..b70f6702e4ef7644c20687bce6536c6690720da9 100644
--- a/tutorials/pisoFoam/ras/cavity/constant/turbulenceProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType RASModel;
+
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/otape17 b/tutorials/combustion/engineFoam/kivaTest/otape17
similarity index 100%
rename from tutorials/engineFoam/kivaTest/otape17
rename to tutorials/combustion/engineFoam/kivaTest/otape17
diff --git a/tutorials/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
similarity index 88%
rename from tutorials/engineFoam/kivaTest/system/controlDict
rename to tutorials/combustion/engineFoam/kivaTest/system/controlDict
index ba6351bc7c82956eb660e048c9329eb90aa56d63..359d4d135af67717be49fb54cd02cb64b8b16c58 100644
--- a/tutorials/engineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime -180;
@@ -43,10 +43,11 @@ timePrecision 6;
runTimeModifiable yes;
-adjustTimeStep no;
+adjustTimeStep no;
+
+maxCo 0.2;
-maxCo 0.2;
+maxDeltaT 1;
-maxDeltaT 1.0;
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
similarity index 85%
rename from tutorials/engineFoam/kivaTest/system/controlDict.1st
rename to tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
index d3c9a998580fcf3bcab63c2431f57d94d7b39a5a..2ae209cb5f6c44f1723423ec922326436a2e7b58 100644
--- a/tutorials/engineFoam/kivaTest/system/controlDict.1st
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,7 +10,8 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object controlDict;
+ location "system";
+ object controlDict.1st;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,10 +45,11 @@ timePrecision 6;
runTimeModifiable yes;
-adjustTimeStep no;
+adjustTimeStep no;
-maxCo 0.2;
+maxCo 0.2;
+
+maxDeltaT 1;
-maxDeltaT 1.0;
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
similarity index 85%
rename from tutorials/engineFoam/kivaTest/system/controlDict.2nd
rename to tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
index ea956c0093c9bae32147672a73b834bda88da912..4ec457ba621ecb9818bb93a61fbb1521df2123c0 100644
--- a/tutorials/engineFoam/kivaTest/system/controlDict.2nd
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,7 +10,8 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object controlDict;
+ location "system";
+ object controlDict.2nd;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,10 +45,11 @@ timePrecision 6;
runTimeModifiable yes;
-adjustTimeStep no;
+adjustTimeStep no;
-maxCo 0.2;
+maxCo 0.2;
+
+maxDeltaT 1;
-maxDeltaT 1.0;
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
similarity index 85%
rename from tutorials/engineFoam/kivaTest/system/fvSchemes
rename to tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
index 9d7fa7421b5960ff9c0a2083fa02816d1c15c281..98d6c3c3587a84e2d5818daa8ee3cfd6c377f54b 100644
--- a/tutorials/engineFoam/kivaTest/system/fvSchemes
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -38,14 +39,7 @@ divSchemes
div(phiXi,Xi) Gauss upwind;
div(phiXi,Su) Gauss upwind;
div(phiSt,b) Gauss limitedLinear01 1;
- div(phi,ft_b_h_hu) Gauss multivariateSelection
- {
- fu limitedLinear01 1;
- ft limitedLinear01 1;
- b limitedLinear01 1;
- h limitedLinear 1;
- hu limitedLinear 1;
- };
+ div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; };
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
@@ -79,7 +73,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..a940d2ad893f84a455b731fb30a02c24df13cb44
--- /dev/null
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
@@ -0,0 +1,134 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ ft
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ fu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ b
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Xi
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Su
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ hu
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 1;
+ momentumPredictor yes;
+ fluxGradp no;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/Allclean b/tutorials/compressible/rhoCentralFoam/Allclean
similarity index 100%
rename from tutorials/rhoCentralFoam/Allclean
rename to tutorials/compressible/rhoCentralFoam/Allclean
diff --git a/tutorials/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun
similarity index 100%
rename from tutorials/rhoCentralFoam/Allrun
rename to tutorials/compressible/rhoCentralFoam/Allrun
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/0.org/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/0.org/T
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/T
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/0.org/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/0.org/U
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/U
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/0.org/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/0.org/p
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.org/p
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/0/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/0/T
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/0/U b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/0/U
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/U
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/0/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/0/p
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/README b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/README
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/README
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/README
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
similarity index 90%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index 1eb45d2f887017b6d382c8f05d7bc4f31bbd0643..9081551c6f6942e27458d17f287b256ba4c3ea2f 100644
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +19,5 @@ thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<hConstTherm
mixture air 1 28.96 1004.5 0 1.458e-06 110.4;
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
similarity index 91%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/system/controlDict
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
index 70f03d15925f55913994872c59d52e361af4c787..3652392f931e44ead8522270601cc88878ca3aa0 100644
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -42,10 +43,9 @@ timePrecision 6;
adjustTimeStep yes;
-//maxCo 3.0;
-//maxCo 0.5;
maxCo 0.5;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
new file mode 100644
index 0000000000000000000000000000000000000000..26630d1b853934e05d20da3386ed146b19be22ad
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 8;
+
+method simple;
+
+simpleCoeffs
+{
+ n ( 8 1 1 );
+ delta 0.001;
+}
+
+hierarchicalCoeffs
+{
+ n ( 1 1 1 );
+ delta 0.001;
+ order xyz;
+}
+
+metisCoeffs
+{
+ processorWeights ( 1 1 1 1 );
+}
+
+manualCoeffs
+{
+ dataFile "";
+}
+
+distributed no;
+
+roots ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
similarity index 81%
rename from tutorials/rhoCentralFoam/shockTube/system/fvSchemes
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
index 8bf05386b7d04b0b7a54712155fc6de00fe80426..af6b9b8917cbb93c7db15c4d733ee3b0f95c7cd6 100644
--- a/tutorials/rhoCentralFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluxScheme Kurganov;
+fluxScheme Kurganov;
ddtSchemes
{
@@ -29,7 +30,7 @@ gradSchemes
divSchemes
{
default none;
- div(tauMC) Gauss linear;
+ div(tauMC) Gauss linear;
}
laplacianSchemes
@@ -39,10 +40,10 @@ laplacianSchemes
interpolationSchemes
{
- default linear;
+ default linear;
reconstruct(rho) vanLeer;
- reconstruct(U) vanLeerV;
- reconstruct(T) vanLeer;
+ reconstruct(U) vanLeerV;
+ reconstruct(T) vanLeer;
}
snGradSchemes
@@ -50,4 +51,5 @@ snGradSchemes
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
similarity index 58%
rename from tutorials/rhoSonicFoam/forwardStep/system/fvSolution
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
index 8275db3d4bdc290fa3d9430970f98a44cd3b9576..f662540afe6dccda4d07ed90a41e720f1bcffb4b 100644
--- a/tutorials/rhoSonicFoam/forwardStep/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,42 +10,45 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PBiCG
+ rho
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rho PBiCG
+ solver diagonal;
+ }
+
+ rhoU
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoU PBiCG
+ solver diagonal;
+ }
+
+ rhoE
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoE PBiCG
+ solver diagonal;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
-}
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-10;
+ relTol 0;
+ }
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
+ h
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-10 relTol 0;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/machines b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/machines
similarity index 100%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/system/machines
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/machines
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
similarity index 85%
rename from tutorials/cavitatingFoam/les/throttle3D/system/mapFieldsDict
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
index bc87cbc6a4dd987dd8a2c644600b04a813311a2c..a44b53188650987b0c7e97d1600d17a9d1af7fbc 100644
--- a/tutorials/cavitatingFoam/les/throttle3D/system/mapFieldsDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mapFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-patchMap
-(
-);
+patchMap ( );
+
+cuttingPatches ( );
-cuttingPatches
-(
-);
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
similarity index 60%
rename from tutorials/sonicFoam/shockTube/system/sampleDict
rename to tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
index 6e6e27cd9e8df49815edce5c68443a7ffb5946f4..39efd421b7d3cdcf9ba43f7ad9aa5e9976df61fc 100644
--- a/tutorials/sonicFoam/shockTube/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,35 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object sampleDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-interpolationScheme cellPoint;
+interpolationScheme cellPointFace;
-setFormat raw;
+writeFormat raw;
-sets
-(
- data
- {
- type uniform;
+sampleSets ( face { name cone25 ; axis x ; start ( 0 0 0 ) ; end ( 0.09208087 0.042939 0 ) ; nPoints 92 ; } face { name cone55 ; axis x ; start ( 0.09208087 0.042939 0 ) ; end ( 0.153683 0.13092 0 ) ; nPoints 61 ; } face { name base ; axis x ; start ( 0.153683 0.13092 0 ) ; end ( 0.193675 0.13092 0 ) ; nPoints 40 ; } );
- axis x;
- start (-4.995 0 0);
- end (4.995 0 0);
- nPoints 1000;
- }
-);
+fields ( p wallHeatTransRate );
-surfaces
-();
-
-fields
-(
- T
- magU
- p
-);
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/0/T b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/0/T
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/T
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/0/U b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/0/U
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/0/p b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/0/p
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/p
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/README b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/README
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/README
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/README
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/constant/points.tmp b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/constant/points.tmp
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/pointsHeader
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
similarity index 65%
rename from tutorials/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index c38497facbe89fb9aafe6aa6309fe10dd752c5b4..a4d934aeb2e5b8a50cb0e200272cff6f61f4483d 100644
--- a/tutorials/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,19 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-mixture
- air 1 28.9 // specieThermo
- 1007 0 // hConstThermo
-// 1.84766e-05 0.7 // constTransport - 300K
-// 2.68477e-05 0.7 // constTransport - 500K
-// 3.93094e-05 0.7 // constTransport - 900K
- 1.4792e-06 116 // sutherlandTransport (Star-CD)
-// 1.4584e-06 110.33 // sutherlandTransport (European Space Agency)
-;
+Pr Pr [ 0 0 0 0 0 0 0 ] 0.72;
+
+thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+
+mixture N2 1 28.01348 100 10000 1000 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15 -923.93753 5.8718221 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12 -1046.9637 2.9674391 1.458e-06 110;
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/constant/wedgeScr b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/wedgeScr
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/constant/wedgeScr
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/wedgeScr
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/files
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/options b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/options
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/options
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/Make/options
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/grid256.dat b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/grid256.dat
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/grid256.dat
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/grid256.dat
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/sampleCone b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
similarity index 100%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/sampleCone
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
similarity index 92%
rename from tutorials/rhoCentralFoam/biconic25-55Run35/system/controlDict
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index c8548cf1713c1ad3f9caa801598ac2890591c47f..b2f7a332955eac9adad0d9c16b9bc61e7a0fefd9 100644
--- a/tutorials/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -46,4 +47,5 @@ maxCo 0.5;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
similarity index 79%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
index 56ca99dbd2def552e7e71b13ea4ceb6bc631d9d0..af6b9b8917cbb93c7db15c4d733ee3b0f95c7cd6 100644
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluxScheme Kurganov;
+fluxScheme Kurganov;
ddtSchemes
{
@@ -29,7 +30,7 @@ gradSchemes
divSchemes
{
default none;
- div(tauMC) Gauss linear;
+ div(tauMC) Gauss linear;
}
laplacianSchemes
@@ -39,10 +40,10 @@ laplacianSchemes
interpolationSchemes
{
- default linear;
- reconstruct(rho) vanLeer;
- reconstruct(U) vanLeerV;
- reconstruct(T) vanLeer;
+ default linear;
+ reconstruct(rho) vanLeer;
+ reconstruct(U) vanLeerV;
+ reconstruct(T) vanLeer;
}
snGradSchemes
@@ -50,4 +51,5 @@ snGradSchemes
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..bcef97326917a073e5efd0a29b25c0658b325810
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/fvSolution
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver diagonal;
+ }
+
+ rhoU
+ {
+ solver diagonal;
+ }
+
+ rhoE
+ {
+ solver diagonal;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-09;
+ relTol 0.01;
+ }
+
+ h
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-09 relTol 0.1;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
similarity index 58%
rename from tutorials/rhoSonicFoam/shockTube/system/sampleDict
rename to tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
index 6e6e27cd9e8df49815edce5c68443a7ffb5946f4..d578a3cadd806453a97ffcffaa1d26d6822c92a4 100644
--- a/tutorials/rhoSonicFoam/shockTube/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,35 +10,22 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object sampleDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-interpolationScheme cellPoint;
+interpolationScheme cellPointFace;
-setFormat raw;
+setFormat raw;
-sets
-(
- data
- {
- type uniform;
+surfaceFormat vtk;
- axis x;
- start (-4.995 0 0);
- end (4.995 0 0);
- nPoints 1000;
- }
-);
+sets ( cone25 { type face ; axis x ; start ( 0 0 0 ) ; end ( 0.09208087 0.042939 0 ) ; nPoints 92 ; } cone55 { type face ; axis x ; start ( 0.09208087 0.042939 0 ) ; end ( 0.153683 0.13092 0 ) ; nPoints 61 ; } base { type face ; axis x ; start ( 0.153683 0.13092 0 ) ; end ( 0.193675 0.13092 0 ) ; nPoints 40 ; } );
-surfaces
-();
+surfaces ( );
+
+fields ( p wallHeatTransRate );
-fields
-(
- T
- magU
- p
-);
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/forwardStep/0/Ma b/tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma
similarity index 100%
rename from tutorials/rhoCentralFoam/forwardStep/0/Ma
rename to tutorials/compressible/rhoCentralFoam/forwardStep/0/Ma
diff --git a/tutorials/rhoCentralFoam/forwardStep/0/T b/tutorials/compressible/rhoCentralFoam/forwardStep/0/T
similarity index 100%
rename from tutorials/rhoCentralFoam/forwardStep/0/T
rename to tutorials/compressible/rhoCentralFoam/forwardStep/0/T
diff --git a/tutorials/rhoCentralFoam/forwardStep/0/U b/tutorials/compressible/rhoCentralFoam/forwardStep/0/U
similarity index 100%
rename from tutorials/rhoCentralFoam/forwardStep/0/U
rename to tutorials/compressible/rhoCentralFoam/forwardStep/0/U
diff --git a/tutorials/rhoCentralFoam/forwardStep/0/p b/tutorials/compressible/rhoCentralFoam/forwardStep/0/p
similarity index 100%
rename from tutorials/rhoCentralFoam/forwardStep/0/p
rename to tutorials/compressible/rhoCentralFoam/forwardStep/0/p
diff --git a/tutorials/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoCentralFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
rename to tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..841a143c18ed9bb76e2fa5d864cbdf9ca93fed50
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture normalisedGas 1 11640.3 2.5 0 0 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
similarity index 88%
rename from tutorials/rhoCentralFoam/forwardStep/system/controlDict
rename to tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
index 6f0806d91782f8d7aa9f42318aa65789c156f71f..8b725998eda188d44583f528aafe0335f2a80bde 100644
--- a/tutorials/rhoCentralFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -42,10 +43,11 @@ timePrecision 6;
runTimeModifiable yes;
-adjustTimeStep yes;
+adjustTimeStep yes;
-maxCo 0.2;
+maxCo 0.2;
+
+maxDeltaT 1;
-maxDeltaT 1;
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
similarity index 79%
rename from tutorials/rhoCentralFoam/wedge15Ma5/system/fvSchemes
rename to tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
index 56ca99dbd2def552e7e71b13ea4ceb6bc631d9d0..af6b9b8917cbb93c7db15c4d733ee3b0f95c7cd6 100644
--- a/tutorials/rhoCentralFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluxScheme Kurganov;
+fluxScheme Kurganov;
ddtSchemes
{
@@ -29,7 +30,7 @@ gradSchemes
divSchemes
{
default none;
- div(tauMC) Gauss linear;
+ div(tauMC) Gauss linear;
}
laplacianSchemes
@@ -39,10 +40,10 @@ laplacianSchemes
interpolationSchemes
{
- default linear;
- reconstruct(rho) vanLeer;
- reconstruct(U) vanLeerV;
- reconstruct(T) vanLeer;
+ default linear;
+ reconstruct(rho) vanLeer;
+ reconstruct(U) vanLeerV;
+ reconstruct(T) vanLeer;
}
snGradSchemes
@@ -50,4 +51,5 @@ snGradSchemes
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
similarity index 58%
rename from tutorials/rhoSonicFoam/shockTube/system/fvSolution
rename to tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
index 8275db3d4bdc290fa3d9430970f98a44cd3b9576..ed875f376e1556d0b8dd2da773d785e2868bed5d 100644
--- a/tutorials/rhoSonicFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,42 +10,45 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PBiCG
+ rho
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rho PBiCG
+ solver diagonal;
+ }
+
+ rhoU
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoU PBiCG
+ solver diagonal;
+ }
+
+ rhoE
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoE PBiCG
+ solver diagonal;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
-}
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-09;
+ relTol 0.01;
+ }
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
+ h
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-10 relTol 0;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/obliqueShock/0/T b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
similarity index 100%
rename from tutorials/rhoCentralFoam/obliqueShock/0/T
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/0/T
diff --git a/tutorials/rhoCentralFoam/obliqueShock/0/U b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
similarity index 100%
rename from tutorials/rhoCentralFoam/obliqueShock/0/U
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/0/U
diff --git a/tutorials/rhoCentralFoam/obliqueShock/0/p b/tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
similarity index 100%
rename from tutorials/rhoCentralFoam/obliqueShock/0/p
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/0/p
diff --git a/tutorials/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..841a143c18ed9bb76e2fa5d864cbdf9ca93fed50
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture normalisedGas 1 11640.3 2.5 0 0 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
similarity index 93%
rename from tutorials/rhoCentralFoam/obliqueShock/system/controlDict
rename to tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
index d5385089b9f456c55835fc5ee302edc0f7f68c3f..5fa869b4cd25c11e9403eee9512bbf2379e26e7f 100644
--- a/tutorials/rhoCentralFoam/obliqueShock/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -51,4 +51,5 @@ maxCo 0.2;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..af6b9b8917cbb93c7db15c4d733ee3b0f95c7cd6
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSchemes
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fluxScheme Kurganov;
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+ div(tauMC) Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+ reconstruct(rho) vanLeer;
+ reconstruct(U) vanLeerV;
+ reconstruct(T) vanLeer;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ed875f376e1556d0b8dd2da773d785e2868bed5d
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/fvSolution
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver diagonal;
+ }
+
+ rhoU
+ {
+ solver diagonal;
+ }
+
+ rhoE
+ {
+ solver diagonal;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-09;
+ relTol 0.01;
+ }
+
+ h
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-10 relTol 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/0.org/T b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/0.org/T
rename to tutorials/compressible/rhoCentralFoam/shockTube/0.org/T
diff --git a/tutorials/rhoCentralFoam/shockTube/0.org/U b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/0.org/U
rename to tutorials/compressible/rhoCentralFoam/shockTube/0.org/U
diff --git a/tutorials/rhoCentralFoam/shockTube/0.org/p b/tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/0.org/p
rename to tutorials/compressible/rhoCentralFoam/shockTube/0.org/p
diff --git a/tutorials/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/0/T
rename to tutorials/compressible/rhoCentralFoam/shockTube/0/T
diff --git a/tutorials/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/0/U
rename to tutorials/compressible/rhoCentralFoam/shockTube/0/U
diff --git a/tutorials/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/0/p
rename to tutorials/compressible/rhoCentralFoam/shockTube/0/p
diff --git a/tutorials/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoCentralFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoCentralFoam/shockTube/constant/polyMesh/boundary
rename to tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
diff --git a/tutorials/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
similarity index 86%
rename from tutorials/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
rename to tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index 86b760a58ee443d41c085e19a5d33049cd8f8937..919fec0ceab7d526193af6520876a6a75fe08f7a 100644
--- a/tutorials/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0;
+mixture air 1 28.96 1004.5 2.544e+06 0 1;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..37f10188677b87b112eca4a9a65bf90cdd8a3c76
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.007;
+
+deltaT 1e-06;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.001;
+
+cycleWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.2;
+
+maxDeltaT 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..af6b9b8917cbb93c7db15c4d733ee3b0f95c7cd6
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fluxScheme Kurganov;
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+ div(tauMC) Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+ reconstruct(rho) vanLeer;
+ reconstruct(U) vanLeerV;
+ reconstruct(T) vanLeer;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ed875f376e1556d0b8dd2da773d785e2868bed5d
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSolution
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver diagonal;
+ }
+
+ rhoU
+ {
+ solver diagonal;
+ }
+
+ rhoE
+ {
+ solver diagonal;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-09;
+ relTol 0.01;
+ }
+
+ h
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-10 relTol 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/system/sampleDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
similarity index 71%
rename from tutorials/solidDisplacementFoam/plateHole/system/sampleDict
rename to tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
index 3fa6bffca47a4e2720027457219917d0f67a4059..d8e4f7301d62fdcb2de27a553192f4c058f8a394 100644
--- a/tutorials/solidDisplacementFoam/plateHole/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,32 +10,22 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object sampleDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
interpolationScheme cellPoint;
-setFormat raw;
-
-sets
-(
- leftPatch
- {
- type uniform;
- axis y;
- start (0 0.5 0.25);
- end (0 2 0.25);
- nPoints 100;
- }
-);
-
-surfaces
-();
-
-fields
-(
- sigmaxx
-);
+setFormat raw;
+
+surfaceFormat vtk;
+
+sets ( line { type face ; axis x ; start ( -5 0 0 ) ; end ( 5 0 0 ) ; nPoints 100 ; } );
+
+surfaces ( );
+
+fields ( p U.component(0) T rho );
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..2bc209827558629de80b0cfdaa06243e57599789
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 );
+
+regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/0/T b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
similarity index 100%
rename from tutorials/rhoCentralFoam/wedge15Ma5/0/T
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/T
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/0/U b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
similarity index 100%
rename from tutorials/rhoCentralFoam/wedge15Ma5/0/U
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/U
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/0/p b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
similarity index 100%
rename from tutorials/rhoCentralFoam/wedge15Ma5/0/p
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/0/p
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..841a143c18ed9bb76e2fa5d864cbdf9ca93fed50
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture normalisedGas 1 11640.3 2.5 0 0 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
similarity index 89%
rename from tutorials/rhoCentralFoam/wedge15Ma5/system/controlDict
rename to tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
index 301694b88c4e9d42cf37bde9bbc9115f9a5c1fe4..a65835e8058cacae3f5dd00aea77d33923ae6fc6 100644
--- a/tutorials/rhoCentralFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -23,7 +23,7 @@ stopAt endTime;
endTime 0.2;
-deltaT 1e-04;
+deltaT 0.0001;
writeControl runTime;
@@ -45,8 +45,9 @@ runTimeModifiable yes;
adjustTimeStep no;
-maxCo 1.0;
+maxCo 1;
maxDeltaT 1e-06;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..af6b9b8917cbb93c7db15c4d733ee3b0f95c7cd6
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSchemes
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fluxScheme Kurganov;
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+divSchemes
+{
+ default none;
+ div(tauMC) Gauss linear;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+ reconstruct(rho) vanLeer;
+ reconstruct(U) vanLeerV;
+ reconstruct(T) vanLeer;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ed875f376e1556d0b8dd2da773d785e2868bed5d
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/fvSolution
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver diagonal;
+ }
+
+ rhoU
+ {
+ solver diagonal;
+ }
+
+ rhoE
+ {
+ solver diagonal;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-09;
+ relTol 0.01;
+ }
+
+ h
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-10 relTol 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/0/T b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/T
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/0/T
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/0/T
diff --git a/tutorials/rhoPimpleFoam/angledDuct/0/U b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/U
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/0/U
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/0/U
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..f609fa6c14c41bba0ec2726af2cf56a9ca8c949a
--- /dev/null
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ front
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ back
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ wall
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ porosityWall
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon
similarity index 64%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon
index ca6ec2ff0d794beb9ea394d4187d986b001eb4f2..502e0489570c5c063dd34ce656009712bd077300 100644
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,46 +10,50 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
dimensions [0 2 -3 0 0 0 0];
internalField uniform 200;
boundaryField
{
-
front
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 200;
}
back
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 200;
}
wall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 200;
}
porosityWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 200;
}
-
inlet
{
type turbulentMixingLengthDissipationRateInlet;
mixingLength 0.005;
- value $internalField;
+ value uniform 200;
}
-
outlet
{
type inletOutlet;
- inletValue $internalField;
- value $internalField;
+ inletValue uniform 200;
+ value uniform 200;
}
-
}
+
+
// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k
similarity index 65%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/k
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/0/k
index c1cf0e833d52e74023d3b7d56d9c4ab4b9a8e2af..6171b9506b8a48d2de911a5c485b6c2bd13d6028 100644
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,46 +10,50 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
dimensions [0 2 -2 0 0 0 0];
internalField uniform 1;
boundaryField
{
-
front
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 1;
}
back
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 1;
}
wall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 1;
}
porosityWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 1;
}
-
inlet
{
type turbulentIntensityKineticEnergyInlet;
intensity 0.05;
- value $internalField;
+ value uniform 1;
}
-
outlet
{
type inletOutlet;
- inletValue $internalField;
- value $internalField;
+ inletValue uniform 1;
+ value uniform 1;
}
-
}
+
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut
new file mode 100644
index 0000000000000000000000000000000000000000..9fab05e162af34c39ebce17f1c0dc40ce2950d05
--- /dev/null
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/mut
@@ -0,0 +1,57 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ front
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ back
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ wall
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ porosityWall
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/0/p b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/p
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/0/p
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/0/p
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..26216fcde0621aa1c526ab843d2825da511d520a
--- /dev/null
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/porousZones b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones
similarity index 97%
rename from tutorials/rhoPimpleFoam/angledDuct/constant/porousZones
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones
index 0570df39482527988f963e81f1324bbbb4002ff5..e5104d4460fd3a1e63101d61253102a296bad289 100644
--- a/tutorials/rhoPimpleFoam/angledDuct/constant/porousZones
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/porousZones
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object porousZones;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..bd1a6c1f0496c414f331f2d0c1357fd1918e36a8
--- /dev/null
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/thermophysicalProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture air 1 28.9 1007 0 1.4792e-06 116;
+
+
+// ************************************************************************* //
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
similarity index 89%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
index 07f85c68df22113b7c7747b89457597b0ea41d66..b70f6702e4ef7644c20687bce6536c6690720da9 100644
--- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType RASModel;
+
// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
similarity index 92%
rename from tutorials/rhoPimpleFoam/angledDuct/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
index 3924b69fcc5eeea0fa23e981c4a86f4dfb21486e..d7d107cf4c4b0f542d2fcd260553be94e5d5930e 100644
--- a/tutorials/rhoPimpleFoam/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -49,4 +49,5 @@ maxCo 10;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
similarity index 94%
rename from tutorials/rhoPimpleFoam/angledDuct/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
index 3eb78297f75d1b7efafdb69e654a430e3d64518d..2d98eef357cbb0dde60f3940903e6e152c2787c2 100644
--- a/tutorials/rhoPimpleFoam/angledDuct/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,7 +29,6 @@ gradSchemes
divSchemes
{
default none;
-
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phiU,p) Gauss linear;
@@ -37,7 +37,6 @@ divSchemes
div(phi,epsilon) Gauss upwind;
div(phi,R) Gauss upwind;
div(phi,omega) Gauss upwind;
-
div((rho*R)) Gauss linear;
div(R) Gauss linear;
div(U) Gauss linear;
@@ -47,7 +46,6 @@ divSchemes
laplacianSchemes
{
default none;
-
laplacian(muEff,U) Gauss linear corrected;
laplacian(mut,U) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
@@ -71,8 +69,8 @@ snGradSchemes
fluxRequired
{
default no;
-
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..41749badafb7d4950c7c4239cfb8aee61724a34b
--- /dev/null
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSolution
@@ -0,0 +1,129 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ UFinal
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.01;
+ }
+
+ pFinal
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ hFinal
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ omega
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PIMPLE
+{
+ nOuterCorrectors 50;
+ nCorrectors 1;
+ nNonOrthogonalCorrectors 0;
+ momentumPredictor yes;
+ pMin pMin [ 1 -1 -2 0 0 0 0 ] 1000;
+}
+
+relaxationFactors
+{
+ U 0.7;
+ p 0.3;
+ rho 0.05;
+ h 0.7;
+ k 0.7;
+ omega 0.7;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDaily/0/B b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/B
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/0/B
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/B
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/T b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/T
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/T
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/T
diff --git a/tutorials/pisoFoam/les/pitzDaily/0/U b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/U
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/0/U
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/U
diff --git a/tutorials/pisoFoam/les/pitzDaily/0/k b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/k
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/0/k
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/k
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/muSgs b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/muSgs
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/muTilda b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muTilda
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/muTilda
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muTilda
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/p
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/p
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/p
diff --git a/tutorials/Xoodles/pitzDaily3D/constant/LESProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties
similarity index 74%
rename from tutorials/Xoodles/pitzDaily3D/constant/LESProperties
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties
index fb22276165743d7d3aa7c040f30187c0c58b9095..25be4174a3fc504065d9065a7ebaf9762690ace8 100644
--- a/tutorials/Xoodles/pitzDaily3D/constant/LESProperties
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel oneEqEddy;
+LESModel oneEqEddy;
-delta cubeRootVol;
+printCoeffs on;
-printCoeffs on;
+delta cubeRootVol;
laminarCoeffs
{
@@ -26,34 +27,34 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ce 1.048;
- ck 0.094;
+ ce 1.048;
+ ck 0.094;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
lowReOneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
- beta 0.01;
+ ck 0.07;
+ ce 1.05;
+ beta 0.01;
}
SmagorinskyCoeffs
{
- ck 0.02;
- ce 0.202;
+ ck 0.02;
+ ce 0.202;
}
DeardorffDiffStressCoeffs
{
- ce 1.048;
- ck 0.094;
- cm 4.13;
+ ce 1.048;
+ ck 0.094;
+ cm 4.13;
}
cubeRootVolCoeffs
@@ -68,6 +69,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -75,9 +77,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -87,6 +91,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -94,10 +99,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -107,14 +114,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
diff --git a/tutorials/buoyantFoam/hotRoom/constant/thermophysicalProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties
similarity index 90%
rename from tutorials/buoyantFoam/hotRoom/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties
index 845c425d42fbdc9f9c6738c6d16c3d95c24ed67c..7f85f2afd5e60654d526bf686b5f4f2819841dab 100644
--- a/tutorials/buoyantFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,6 +19,5 @@ thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<per
mixture air 1 28.9 1000 0 1.8e-05 0.7;
-pRef 1e5;
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/turbulenceProperties
similarity index 89%
rename from tutorials/pisoFoam/les/pitzDaily/constant/turbulenceProperties
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/turbulenceProperties
index dcadcf17cd97481597090cf391913d3fe6432687..2e42797ca9558f9a6c4c3b2195313dda5504598a 100644
--- a/tutorials/pisoFoam/les/pitzDaily/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType LESModel;
+
// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
similarity index 73%
rename from tutorials/rhoPisoFoam/les/pitzDaily/system/controlDict
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index a5870996dd1b84b595517af4ba98625a49f07b9a..c211c964aefdc8369964f2503d0b64a66cd65771 100644
--- a/tutorials/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -47,33 +47,28 @@ functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
-
outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
similarity index 92%
rename from tutorials/rhoPisoFoam/les/pitzDaily/system/fvSchemes
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
index fc4a469b4641d33bc1565bbaf7d800a7ca596517..feb54a18766defb301663362d68bff1ae409c81b 100644
--- a/tutorials/rhoPisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default backward;
+ default backward;
}
gradSchemes
@@ -35,7 +36,6 @@ divSchemes
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
div(phi,muTilda) Gauss limitedLinear 1;
-
div(B) Gauss linear;
div((muEff*dev2(grad(U).T()))) Gauss linear;
}
@@ -65,7 +65,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..601b3a8901c63faa9d482074b01e96fa85ddc183
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/fvSolution
@@ -0,0 +1,84 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/0/R b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/R
similarity index 100%
rename from tutorials/pisoFoam/ras/cavity/0/R
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/0/R
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/T b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/T
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/0/T
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/0/T
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/U b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/U
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/0/U
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/0/U
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..0545c858d46b7300f2b523c04b1c6398bddbb95d
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/alphat
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ movingWall
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ fixedWalls
+ {
+ type alphatWallFunction;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/0/epsilon
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/0/epsilon
diff --git a/tutorials/pisoFoam/ras/cavity/0/k b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/k
similarity index 100%
rename from tutorials/pisoFoam/ras/cavity/0/k
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/0/k
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
new file mode 100644
index 0000000000000000000000000000000000000000..a0f4c473102445c3741b8324de193086abc82af1
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/mut
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ movingWall
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ fixedWalls
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega
new file mode 100644
index 0000000000000000000000000000000000000000..b825b4913ae0eb79cdf93ea5c333ebc0a1013115
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/omega
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object omega;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 -1 0 0 0 0];
+
+internalField uniform 2.6;
+
+boundaryField
+{
+ movingWall
+ {
+ type omegaWallFunction;
+ value uniform 2.6;
+ }
+ fixedWalls
+ {
+ type omegaWallFunction;
+ value uniform 2.6;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/p b/tutorials/compressible/rhoPisoFoam/ras/cavity/0/p
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/0/p
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/0/p
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..15184ba185eeec5496fdf68cd9236f4120a7b634
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/RASProperties
@@ -0,0 +1,117 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kOmegaSST;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+ alphah 1;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/constant/polyMesh/boundary
diff --git a/tutorials/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
similarity index 90%
rename from tutorials/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
index 0b16fbae765198099571a7abfe177e43e63ebe07..d02b85fec4397d8da50129dd6d2374b56619abe6 100644
--- a/tutorials/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Thermophysical model
thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
mixture air 1 28.9 1007 0 1.84e-05 0.7;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b70f6702e4ef7644c20687bce6536c6690720da9
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..c90f2db15f74ed64f0b2e84d71466a6852614bbf
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1;
+
+deltaT 0.01;
+
+writeControl runTime;
+
+writeInterval 0.1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep no;
+
+maxCo 0.3;
+
+maxDeltaT 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/system/fvSchemes b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
similarity index 80%
rename from tutorials/rhoPisoFoam/ras/cavity/system/fvSchemes
rename to tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
index 27cf1a8bee994e6ed5ed42cd9b41e3fbbddc1a69..ce82f9337bcc43d36956f786df045a15e938733f 100644
--- a/tutorials/rhoPisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,29 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Time derivative discretisation schemes
ddtSchemes
{
- // Default scheme
default Euler;
}
-// Gradient discretisation schemes
gradSchemes
{
- // Default gradient scheme
default Gauss linear;
grad(p) Gauss linear;
}
-// Convection discretisation schemes
divSchemes
{
- // Default scheme
default none;
div(phi,U) Gauss limitedLinearV 1;
div(phid,p) Gauss limitedLinear 1;
@@ -48,10 +43,8 @@ divSchemes
div((muEff*dev2(grad(U).T()))) Gauss linear;
}
-// Laplacian discretisation schemes
laplacianSchemes
{
- // Default scheme
default none;
laplacian(muEff,U) Gauss linear corrected;
laplacian(mut,U) Gauss linear corrected;
@@ -63,26 +56,21 @@ laplacianSchemes
laplacian(alphaEff,h) Gauss linear corrected;
}
-// Interpolation schemes
interpolationSchemes
{
- // Default scheme
default linear;
}
-// Surface normal gradient schemes
snGradSchemes
{
- // Default scheme
default corrected;
}
-// Calculation of flux
fluxRequired
{
- // Create storage for flux for all solved variables?
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..2d540c81d3fa7e3e9f0f879a472e2f07442e1169
--- /dev/null
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/fvSolution
@@ -0,0 +1,93 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ omega
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ momentumPredictor yes;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/0 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctExplicit/0
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/constant b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctExplicit/constant
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
similarity index 92%
rename from tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
index 691db89a86f361d2ae2ca4ed9bb939e03eb452ca..23e7202b524bf7bf7a221df42cb5deea33a3e8d0 100644
--- a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -45,4 +45,5 @@ graphFormat raw;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..5a36eadc4b4f2f8282e9553d8731154b5605c9c9
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -0,0 +1,69 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default steadyState;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+ grad(U) Gauss linear;
+ grad(p) Gauss linear;
+}
+
+divSchemes
+{
+ div(phi,U) Gauss upwind;
+ div((muEff*dev2(grad(U).T()))) Gauss linear;
+ div(phi,h) Gauss upwind;
+ div(phi,epsilon) Gauss upwind;
+ div(phi,k) Gauss upwind;
+ div(phid,p) Gauss linear;
+}
+
+laplacianSchemes
+{
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(alphaEff,h) Gauss linear corrected;
+ laplacian((rho|A(U)),p) Gauss linear corrected;
+ laplacian((rho*rAU),p) Gauss linear corrected;
+ laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+ laplacian(DkEff,k) Gauss linear corrected;
+ laplacian(1,p) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+ div(U,p) upwind phi;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ p ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..337edfcc986aca0a7f703672a36f84bb1013cdff
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -0,0 +1,85 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.05;
+ smoother GaussSeidel;
+ cacheAgglomeration off;
+ nCellsInCoarsestLevel 20;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-06;
+ relTol 0.1;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0.1;
+ }
+
+ k
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
+
+ epsilon
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
+}
+
+SIMPLE
+{
+ nNonOrthogonalCorrectors 0;
+ pMin pMin [ 1 -1 -2 0 0 0 0 ] 100;
+}
+
+relaxationFactors
+{
+ p 0.3;
+ rho 0.05;
+ U 0.7;
+ k 0.7;
+ epsilon 0.7;
+ h 0.5;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/T
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/U
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U
diff --git a/tutorials/rhoPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/0/epsilon
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
diff --git a/tutorials/rhoPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
similarity index 100%
rename from tutorials/rhoPimpleFoam/angledDuct/0/k
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/0/p
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..48bd2ba11798f2e75054f36380ba62c9f1f1628c
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
similarity index 100%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
similarity index 97%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
index 0570df39482527988f963e81f1324bbbb4002ff5..e5104d4460fd3a1e63101d61253102a296bad289 100644
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object porousZones;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ab0fa0fe3c8b725dac44909a43c7849d66428e8c
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+
+mixture air 1 28.9 1007 0 1.4792e-06 116;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
similarity index 90%
rename from tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
index b354267d9e85882f79c51118a48ea47d26ba024e..85cf9616b921c09b6f2c457f64e704e81944dfac 100644
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -2,19 +2,19 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -45,4 +45,5 @@ graphFormat raw;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..d3687aaaf95db4ce57df2672c74ce1cae85bf5c4
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -0,0 +1,68 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default steadyState;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+ grad(U) Gauss linear;
+ grad(p) Gauss linear;
+}
+
+divSchemes
+{
+ div(phi,U) Gauss upwind;
+ div((muEff*dev2(grad(U).T()))) Gauss linear;
+ div(phi,h) Gauss upwind;
+ div(phi,epsilon) Gauss upwind;
+ div(phi,k) Gauss upwind;
+ div(phid,p) Gauss linear;
+}
+
+laplacianSchemes
+{
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(alphaEff,h) Gauss linear corrected;
+ laplacian((rho*rAU),p) Gauss linear corrected;
+ laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+ laplacian(DkEff,k) Gauss linear corrected;
+ laplacian(1,p) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+ div(U,p) upwind phi;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ p ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..fa9e34149b18ea43c9b471372956b51466b685fc
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -0,0 +1,77 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.05;
+ smoother GaussSeidel;
+ cacheAgglomeration off;
+ nCellsInCoarsestLevel 20;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0.1;
+ }
+
+ k
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
+
+ epsilon
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
+}
+
+SIMPLE
+{
+ nUCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ pMin pMin [ 1 -1 -2 0 0 0 0 ] 100;
+}
+
+relaxationFactors
+{
+ p 0.3;
+ rho 1;
+ U 0.7;
+ k 0.9;
+ epsilon 0.9;
+ h 0.9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/forwardStep/0/T b/tutorials/compressible/rhoSonicFoam/forwardStep/0/T
similarity index 100%
rename from tutorials/rhoSonicFoam/forwardStep/0/T
rename to tutorials/compressible/rhoSonicFoam/forwardStep/0/T
diff --git a/tutorials/rhoSonicFoam/forwardStep/0/U b/tutorials/compressible/rhoSonicFoam/forwardStep/0/U
similarity index 100%
rename from tutorials/rhoSonicFoam/forwardStep/0/U
rename to tutorials/compressible/rhoSonicFoam/forwardStep/0/U
diff --git a/tutorials/rhoSonicFoam/forwardStep/0/p b/tutorials/compressible/rhoSonicFoam/forwardStep/0/p
similarity index 100%
rename from tutorials/rhoSonicFoam/forwardStep/0/p
rename to tutorials/compressible/rhoSonicFoam/forwardStep/0/p
diff --git a/tutorials/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoSonicFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
rename to tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties
similarity index 80%
rename from tutorials/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties
rename to tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties
index 06d85de3fda58355e45f9eabd319f9f2d651c046..c6bf31c073b282576473751b3d19f08f877cb84a 100644
--- a/tutorials/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermodynamicProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Cv Cv [0 2 -2 -1 0 0 0] 1.78571;
+Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571;
+
+R R [ 0 2 -2 -1 0 0 0 ] 0.714286;
-R R [0 2 -2 -1 0 0 0] 0.714286;
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
similarity index 92%
rename from tutorials/rhoSonicFoam/forwardStep/system/controlDict
rename to tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
index 4a7ac2d55093860131e3519f96fa5623cc787eb8..11edd652c6c9c09c833965be09865c402b673c0b 100644
--- a/tutorials/rhoSonicFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/forwardStep/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes
similarity index 90%
rename from tutorials/rhoSonicFoam/forwardStep/system/fvSchemes
rename to tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes
index 2f67c16f8a423b1f3485f5fc85d9213f5b130c23..dce91897e29b2b057db5da19c0a6615f14e7da62 100644
--- a/tutorials/rhoSonicFoam/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -53,7 +54,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..d0dcdc1851b1a359a317f7ed65401f8f3157160c
--- /dev/null
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/fvSolution
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoU
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoE
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/0.org/T b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/T
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0.org/T
rename to tutorials/compressible/rhoSonicFoam/shockTube/0.org/T
diff --git a/tutorials/rhoSonicFoam/shockTube/0.org/U b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/U
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0.org/U
rename to tutorials/compressible/rhoSonicFoam/shockTube/0.org/U
diff --git a/tutorials/rhoSonicFoam/shockTube/0.org/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0.org/magU
rename to tutorials/compressible/rhoSonicFoam/shockTube/0.org/magU
diff --git a/tutorials/rhoSonicFoam/shockTube/0.org/p b/tutorials/compressible/rhoSonicFoam/shockTube/0.org/p
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0.org/p
rename to tutorials/compressible/rhoSonicFoam/shockTube/0.org/p
diff --git a/tutorials/rhoSonicFoam/shockTube/0/T b/tutorials/compressible/rhoSonicFoam/shockTube/0/T
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0/T
rename to tutorials/compressible/rhoSonicFoam/shockTube/0/T
diff --git a/tutorials/rhoSonicFoam/shockTube/0/U b/tutorials/compressible/rhoSonicFoam/shockTube/0/U
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0/U
rename to tutorials/compressible/rhoSonicFoam/shockTube/0/U
diff --git a/tutorials/rhoSonicFoam/shockTube/0/magU b/tutorials/compressible/rhoSonicFoam/shockTube/0/magU
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0/magU
rename to tutorials/compressible/rhoSonicFoam/shockTube/0/magU
diff --git a/tutorials/rhoSonicFoam/shockTube/0/p b/tutorials/compressible/rhoSonicFoam/shockTube/0/p
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/0/p
rename to tutorials/compressible/rhoSonicFoam/shockTube/0/p
diff --git a/tutorials/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/Allrun
rename to tutorials/compressible/rhoSonicFoam/shockTube/Allrun
diff --git a/tutorials/rhoSonicFoam/shockTube/constant/initProperties b/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties
similarity index 73%
rename from tutorials/rhoSonicFoam/shockTube/constant/initProperties
rename to tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties
index f3770d39708fa519cb7d84184928fb6c56b2a152..35229cd9855400a067b0e26013d4a30970e18d73 100644
--- a/tutorials/rhoSonicFoam/shockTube/constant/initProperties
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/initProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object initProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-x0 0 ;
+x0 0;
-pL 1.0e+5 ;
-TL 348.43206 ;
-UL ( 0 0 0 ) ;
+pL 100000;
+
+TL 348.432;
+
+UL ( 0 0 0 );
+
+pR 10000;
+
+TR 278.746;
+
+UR ( 0 0 0 );
-pR 1.0e+4 ;
-TR 278.74564 ;
-UR ( 0 0 0 ) ;
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhoSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhoSonicFoam/shockTube/constant/polyMesh/boundary
rename to tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
diff --git a/tutorials/rhoSonicFoam/forwardStep/constant/thermodynamicProperties b/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties
similarity index 81%
rename from tutorials/rhoSonicFoam/forwardStep/constant/thermodynamicProperties
rename to tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties
index 06d85de3fda58355e45f9eabd319f9f2d651c046..99575bf65f9fdb7cb344ff2a4c3b245e342c8b7e 100644
--- a/tutorials/rhoSonicFoam/forwardStep/constant/thermodynamicProperties
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermodynamicProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Cv Cv [0 2 -2 -1 0 0 0] 1.78571;
+Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5;
+
+R R [ 0 2 -2 -1 0 0 0 ] 287;
-R R [0 2 -2 -1 0 0 0] 0.714286;
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
similarity index 92%
rename from tutorials/sonicFoam/shockTube/system/controlDict
rename to tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
index cf7893b7647e2594cc0ec63d3681a4a5d2a9cb3d..e22c10e25dafecb15adfd5548a95c6ab292b81df 100644
--- a/tutorials/sonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes
similarity index 90%
rename from tutorials/rhoSonicFoam/shockTube/system/fvSchemes
rename to tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes
index 2f67c16f8a423b1f3485f5fc85d9213f5b130c23..dce91897e29b2b057db5da19c0a6615f14e7da62 100644
--- a/tutorials/rhoSonicFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -53,7 +54,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..d0dcdc1851b1a359a317f7ed65401f8f3157160c
--- /dev/null
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/fvSolution
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoU
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoE
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/system/sampleSurfaceDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict
similarity index 74%
rename from tutorials/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
rename to tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict
index 48cc2fbe89ca86ad009976e8fe729312648bd235..9d71da62e2e4a3822de0ccbc361e2a9631bc88fd 100644
--- a/tutorials/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object sampleDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
interpolationScheme cellPoint;
-surfaceFormat dx;
+setFormat raw;
-surfaces
-(
- constantPlane
- {
- name plate;
- basePoint (0 0 0.25);
- normalVector (0 0 1);
- }
-);
+sets ( data { type uniform ; axis x ; start ( -4.995 0 0 ) ; end ( 4.995 0 0 ) ; nPoints 1000 ; } );
+
+surfaces ( );
+
+fields ( T magU p );
-fields
-(
- sigmaxx
-);
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..2bc209827558629de80b0cfdaa06243e57599789
--- /dev/null
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/setFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 );
+
+regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/shockTube/0.org/T b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/T
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/0.org/T
rename to tutorials/compressible/rhopSonicFoam/shockTube/0.org/T
diff --git a/tutorials/rhopSonicFoam/shockTube/0.org/U b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/U
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/0.org/U
rename to tutorials/compressible/rhopSonicFoam/shockTube/0.org/U
diff --git a/tutorials/rhopSonicFoam/shockTube/0.org/p b/tutorials/compressible/rhopSonicFoam/shockTube/0.org/p
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/0.org/p
rename to tutorials/compressible/rhopSonicFoam/shockTube/0.org/p
diff --git a/tutorials/rhopSonicFoam/shockTube/0/T b/tutorials/compressible/rhopSonicFoam/shockTube/0/T
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/0/T
rename to tutorials/compressible/rhopSonicFoam/shockTube/0/T
diff --git a/tutorials/rhopSonicFoam/shockTube/0/U b/tutorials/compressible/rhopSonicFoam/shockTube/0/U
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/0/U
rename to tutorials/compressible/rhopSonicFoam/shockTube/0/U
diff --git a/tutorials/rhopSonicFoam/shockTube/0/p b/tutorials/compressible/rhopSonicFoam/shockTube/0/p
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/0/p
rename to tutorials/compressible/rhopSonicFoam/shockTube/0/p
diff --git a/tutorials/rhopSonicFoam/shockTube/Allclean b/tutorials/compressible/rhopSonicFoam/shockTube/Allclean
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/Allclean
rename to tutorials/compressible/rhopSonicFoam/shockTube/Allclean
diff --git a/tutorials/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/Allrun
rename to tutorials/compressible/rhopSonicFoam/shockTube/Allrun
diff --git a/tutorials/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhopSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhopSonicFoam/shockTube/constant/polyMesh/boundary
rename to tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
diff --git a/tutorials/rhoSonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties
similarity index 81%
rename from tutorials/rhoSonicFoam/shockTube/constant/thermodynamicProperties
rename to tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties
index 059e9ca5da5a9c48fadead26dd23cc1f173de03a..99575bf65f9fdb7cb344ff2a4c3b245e342c8b7e 100644
--- a/tutorials/rhoSonicFoam/shockTube/constant/thermodynamicProperties
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermodynamicProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Cv Cv [0 2 -2 -1 0 0 0] 717.5;
+Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5;
+
+R R [ 0 2 -2 -1 0 0 0 ] 287;
-R R [0 2 -2 -1 0 0 0] 287;
// ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..581f82c6b5a8f04290339875c186768ffb0a0aab
--- /dev/null
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.007;
+
+deltaT 2e-05;
+
+writeControl runTime;
+
+writeInterval 0.001;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep no;
+
+maxCo 0.05;
+
+maxDeltaT 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes
similarity index 88%
rename from tutorials/rhopSonicFoam/shockTube/system/fvSchemes
rename to tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes
index d21dcd7c0de94f041ef2b6e840a2d9dc6cfa4579..6433c7d1b3416844f48437941c0e223cf268bc65 100644
--- a/tutorials/rhopSonicFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -48,7 +49,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/shockTube/system/fvSolution b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
similarity index 51%
rename from tutorials/rhopSonicFoam/shockTube/system/fvSolution
rename to tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
index 945f35d9e35d1f745b337fe4e8fa3a15f6d79ae9..e9d281212c082778a400cedbd1ce6b4e0f16664b 100644
--- a/tutorials/rhopSonicFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,49 +10,60 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-15;
- relTol 0;
- };
- rho PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rho
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoU PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoU
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoE PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoE
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoH PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoH
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
}
PISO
{
nOuterCorrectors 3;
- nCorrectors 1;
- HbyAblend 0.0;
+ nCorrectors 1;
+ HbyAblend 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..2bc209827558629de80b0cfdaa06243e57599789
--- /dev/null
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/setFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 );
+
+regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/0/T b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T
similarity index 100%
rename from tutorials/rhopSonicFoam/wedge15Ma5/0/T
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/T
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/0/U b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U
similarity index 100%
rename from tutorials/rhopSonicFoam/wedge15Ma5/0/U
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/U
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/0/p b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p
similarity index 100%
rename from tutorials/rhopSonicFoam/wedge15Ma5/0/p
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/0/p
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties
new file mode 100644
index 0000000000000000000000000000000000000000..c6bf31c073b282576473751b3d19f08f877cb84a
--- /dev/null
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/thermodynamicProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermodynamicProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571;
+
+R R [ 0 2 -2 -1 0 0 0 ] 0.714286;
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
similarity index 89%
rename from tutorials/rhopSonicFoam/wedge15Ma5/system/controlDict
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
index 301694b88c4e9d42cf37bde9bbc9115f9a5c1fe4..a65835e8058cacae3f5dd00aea77d33923ae6fc6 100644
--- a/tutorials/rhopSonicFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -23,7 +23,7 @@ stopAt endTime;
endTime 0.2;
-deltaT 1e-04;
+deltaT 0.0001;
writeControl runTime;
@@ -45,8 +45,9 @@ runTimeModifiable yes;
adjustTimeStep no;
-maxCo 1.0;
+maxCo 1;
maxDeltaT 1e-06;
+
// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/system/fvSchemes b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes
similarity index 85%
rename from tutorials/rhopSonicFoam/wedge15Ma5/system/fvSchemes
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes
index ad2e2bb1e579b344e3d13f8b44ee24e256d33974..e849daf6ed8c42df7dd3eaea450e984d079be76a 100644
--- a/tutorials/rhopSonicFoam/wedge15Ma5/system/fvSchemes
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,14 +10,15 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
-}
+ default Euler;
+}
gradSchemes
{
@@ -32,7 +33,7 @@ divSchemes
laplacianSchemes
{
- default Gauss linear corrected;
+ default Gauss linear corrected;
}
interpolationSchemes
@@ -48,7 +49,8 @@ snGradSchemes
fluxRequired
{
default yes;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/wedge15Ma5/system/fvSolution b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
similarity index 51%
rename from tutorials/rhopSonicFoam/wedge15Ma5/system/fvSolution
rename to tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
index c0d4b7c2e77aaf98c4ebffd1c9570cce6a6934f7..e3d198e89e9dc29e0d69692040e5e76ba66c454f 100644
--- a/tutorials/rhopSonicFoam/wedge15Ma5/system/fvSolution
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,49 +10,60 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-15;
- relTol 0;
- };
- rho PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rho
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoU PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoU
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoE PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoE
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rhoH PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rhoH
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
}
PISO
{
nOuterCorrectors 2;
- nCorrectors 2;
- HbyAblend 0.95;
+ nCorrectors 2;
+ HbyAblend 0.95;
}
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/forwardStep/0/T b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
similarity index 100%
rename from tutorials/sonicFoam/forwardStep/0/T
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
diff --git a/tutorials/sonicFoam/forwardStep/0/U b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
similarity index 100%
rename from tutorials/sonicFoam/forwardStep/0/U
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
diff --git a/tutorials/sonicFoam/forwardStep/0/p b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
similarity index 100%
rename from tutorials/sonicFoam/forwardStep/0/p
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
diff --git a/tutorials/sonicFoam/forwardStep/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/sonicFoam/forwardStep/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/blockMeshDict
diff --git a/tutorials/sonicFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/sonicFoam/forwardStep/constant/polyMesh/boundary
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties
new file mode 100644
index 0000000000000000000000000000000000000000..c6bf31c073b282576473751b3d19f08f877cb84a
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object thermodynamicProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571;
+
+R R [ 0 2 -2 -1 0 0 0 ] 0.714286;
+
+
+// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityClipped/constant/transportProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties
similarity index 85%
rename from tutorials/icoFoam/cavityClipped/constant/transportProperties
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties
index cdba3d7843fa1dfac369fedafeb7d3d893d3025b..1e9d5be60c285c2403250e1961ee8d1552dd14a8 100644
--- a/tutorials/icoFoam/cavityClipped/constant/transportProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-nu nu [0 2 -1 0 0 0 0] 0.01;
+mu mu [ 1 -1 -1 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
similarity index 92%
rename from tutorials/sonicFoam/forwardStep/system/controlDict
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
index be42312415b2ef6708bb457a4b7580bca3474579..7bf4401d7dc6cfdc49795305e50df03056e69d07 100644
--- a/tutorials/sonicFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
similarity index 90%
rename from tutorials/sonicFoam/forwardStep/system/fvSchemes
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
index 45bb66da3a4159384d8fa6ec5d268536f3276401..1c36c50aa67708935b325763ac50f49fc7fc4a44 100644
--- a/tutorials/sonicFoam/forwardStep/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -55,7 +56,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/forwardStep/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
similarity index 58%
rename from tutorials/sonicFoam/forwardStep/system/fvSolution
rename to tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
index 478fdf91384ce5ddbd82fc62846d526552a62b83..bc954e2aa217f9196b8c2351f788ccfed6fafc0f 100644
--- a/tutorials/sonicFoam/forwardStep/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,36 +10,44 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PBiCG
+ p
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- rho PCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ rho
{
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- e PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ e
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -48,4 +56,5 @@ PISO
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/0.org/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0.org/T
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0.org/T
diff --git a/tutorials/sonicFoam/shockTube/0.org/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0.org/U
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0.org/U
diff --git a/tutorials/sonicFoam/shockTube/0.org/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0.org/magU
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0.org/magU
diff --git a/tutorials/sonicFoam/shockTube/0.org/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0.org/p
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0.org/p
diff --git a/tutorials/sonicFoam/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0/T
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/T
diff --git a/tutorials/sonicFoam/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0/U
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/U
diff --git a/tutorials/sonicFoam/shockTube/0/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0/magU
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/magU
diff --git a/tutorials/sonicFoam/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p
similarity index 100%
rename from tutorials/sonicFoam/shockTube/0/p
rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/p
diff --git a/tutorials/sonicFoam/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
similarity index 100%
rename from tutorials/sonicFoam/shockTube/Allclean
rename to tutorials/compressible/sonicFoam/laminar/shockTube/Allclean
diff --git a/tutorials/sonicFoam/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
similarity index 100%
rename from tutorials/sonicFoam/shockTube/Allrun
rename to tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
diff --git a/tutorials/sonicFoam/shockTube/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/sonicFoam/shockTube/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/blockMeshDict
diff --git a/tutorials/sonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/sonicFoam/shockTube/constant/polyMesh/boundary
rename to tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
diff --git a/tutorials/rhopSonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties
similarity index 81%
rename from tutorials/rhopSonicFoam/shockTube/constant/thermodynamicProperties
rename to tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties
index 059e9ca5da5a9c48fadead26dd23cc1f173de03a..99575bf65f9fdb7cb344ff2a4c3b245e342c8b7e 100644
--- a/tutorials/rhopSonicFoam/shockTube/constant/thermodynamicProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermodynamicProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Cv Cv [0 2 -2 -1 0 0 0] 717.5;
+Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5;
+
+R R [ 0 2 -2 -1 0 0 0 ] 287;
-R R [0 2 -2 -1 0 0 0] 287;
// ************************************************************************* //
diff --git a/tutorials/dnsFoam/boxTurb16/constant/transportProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties
similarity index 85%
rename from tutorials/dnsFoam/boxTurb16/constant/transportProperties
rename to tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties
index 919c99624537d0701231d7e2c367cde5058a0248..1e9d5be60c285c2403250e1961ee8d1552dd14a8 100644
--- a/tutorials/dnsFoam/boxTurb16/constant/transportProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-nu nu [0 2 -1 0 0 0 0] 0.025;
+mu mu [ 1 -1 -1 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
similarity index 92%
rename from tutorials/rhoSonicFoam/shockTube/system/controlDict
rename to tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
index cf7893b7647e2594cc0ec63d3681a4a5d2a9cb3d..e22c10e25dafecb15adfd5548a95c6ab292b81df 100644
--- a/tutorials/rhoSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
similarity index 90%
rename from tutorials/sonicFoam/shockTube/system/fvSchemes
rename to tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
index efcc5c9ab662d993ee2f416789bc6eba99cdb8cf..deef4abd2614ed5708f90773817385c711ea18e4 100644
--- a/tutorials/sonicFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -55,7 +56,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/system/fvSolution b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
similarity index 58%
rename from tutorials/sonicFoam/shockTube/system/fvSolution
rename to tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
index 61c4ec92c4085e79a961f03f49785be000c41b23..1e1334a389f8348a1831d049f0bceb06ab7891c0 100644
--- a/tutorials/sonicFoam/shockTube/system/fvSolution
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,36 +10,44 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PBiCG
+ p
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- U PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
- rho PCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ rho
{
- preconditioner DIC;
- tolerance 1e-15;
- relTol 0;
- };
- e PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-15;
+ relTol 0;
+ }
+
+ e
{
- preconditioner DILU;
- tolerance 1e-15;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-15;
+ relTol 0;
+ }
}
PISO
@@ -48,4 +56,5 @@ PISO
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
similarity index 70%
rename from tutorials/rhoCentralFoam/shockTube/system/sampleDict
rename to tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
index 460a73553cce2771b8db0b26c4d12ed4a28fbaba..9d71da62e2e4a3822de0ccbc361e2a9631bc88fd 100644
--- a/tutorials/rhoCentralFoam/shockTube/system/sampleDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,31 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object sampleDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
interpolationScheme cellPoint;
-setFormat raw;
-surfaceFormat vtk;
-sets
-(
- line
- {
- type face;
- axis x;
- start (-5 0 0);
- end ( 5 0 0);
- nPoints 100;
- }
-);
+setFormat raw;
-surfaces ();
+sets ( data { type uniform ; axis x ; start ( -4.995 0 0 ) ; end ( 4.995 0 0 ) ; nPoints 1000 ; } );
+
+surfaces ( );
+
+fields ( T magU p );
-fields
-(
- p U.component(0) T rho
-);
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..2bc209827558629de80b0cfdaa06243e57599789
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues ( volVectorFieldValue U ( 0 0 0 ) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 );
+
+regions ( boxToCell { box ( 0 -1 -1 ) ( 5 1 1 ) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/Allrun b/tutorials/compressible/sonicFoam/ras/Allrun
similarity index 100%
rename from tutorials/sonicTurbFoam/Allrun
rename to tutorials/compressible/sonicFoam/ras/Allrun
diff --git a/tutorials/sonicTurbFoam/Running_Notes b/tutorials/compressible/sonicFoam/ras/Running_Notes
similarity index 100%
rename from tutorials/sonicTurbFoam/Running_Notes
rename to tutorials/compressible/sonicFoam/ras/Running_Notes
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/0/T b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/0/T
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/T
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/0/U b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/0/U
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/U
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/0/epsilon b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/0/epsilon
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/epsilon
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/0/k b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/0/k
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/k
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/0/p
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..226b420b22c824b9f604219a77865aae3774212b
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel LaunderSharmaKE;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/constant/polyMesh/boundary
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/polyMesh/boundary.org b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/constant/polyMesh/boundary.org
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary.org
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
similarity index 84%
rename from tutorials/sonicTurbFoam/nacaAirfoil/constant/thermophysicalProperties
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index 2ac1bd2d596f3cf1769a8cb62c315e1f6efbc9fd..8e15891e509cc2f3819180595b2f41133983d22c 100644
--- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +19,5 @@ thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<per
mixture air 1 28.9 1000 2.544e+06 1.8e-05 0.7;
+
// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/prostar/nacaAirfoil.bnd.gz b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/prostar/nacaAirfoil.cel.gz b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/prostar/nacaAirfoil.cel.gz
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.cel.gz
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/prostar/nacaAirfoil.vrt.gz b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
similarity index 100%
rename from tutorials/sonicTurbFoam/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
similarity index 65%
rename from tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index f560d7c85b5347667d40360680158761709e773a..2fe2edf6fac8ee8491494075962c4930ba5bb3af 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
stopAt endTime;
-endTime 2;
+endTime 0.03;
-deltaT 0.001;
+deltaT 4e-08;
-writeControl adjustableRunTime; //timeStep; //adjustableRunTime;
+writeControl runTime;
-writeInterval 0.02; //10; //0.02;
+writeInterval 1e-05;
purgeWrite 0;
@@ -35,7 +35,7 @@ writeFormat ascii;
writePrecision 6;
-writeCompression uncompressed;
+writeCompression compressed;
timeFormat general;
@@ -43,10 +43,7 @@ timePrecision 6;
runTimeModifiable yes;
-adjustTimeStep yes;
-
-maxCo 0.1;
+functions ( forces { type forceCoeffs ; functionObjectLibs ( "libforces.so" ) ; patches ( WALL10 ) ; pName p ; UName U ; log true ; rhoInf 1 ; CofR ( 0 0 0 ) ; liftDir ( -0.239733 0.970839 0 ) ; dragDir ( 0.970839 0.239733 0 ) ; pitchAxis ( 0 0 1 ) ; magUInf 618.022 ; lRef 1 ; Aref 1 ; } );
-maxDeltaT 1;
// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
similarity index 89%
rename from tutorials/sonicTurbFoam/nacaAirfoil/system/fvSchemes
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
index 661348ce32ce8d346f6d5d9ccccd3ae7dc950598..0cab17b88eec287ffaaa417e472a94fefbc2d732 100644
--- a/tutorials/sonicTurbFoam/nacaAirfoil/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -62,7 +63,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..a1782db6853bdb92132e5fc1a5e57cffb57a091f
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution
@@ -0,0 +1,84 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-12;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 2;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/prism/0/T b/tutorials/compressible/sonicFoam/ras/prism/0/T
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/0/T
rename to tutorials/compressible/sonicFoam/ras/prism/0/T
diff --git a/tutorials/sonicTurbFoam/prism/0/U b/tutorials/compressible/sonicFoam/ras/prism/0/U
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/0/U
rename to tutorials/compressible/sonicFoam/ras/prism/0/U
diff --git a/tutorials/sonicTurbFoam/prism/0/epsilon b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/0/epsilon
rename to tutorials/compressible/sonicFoam/ras/prism/0/epsilon
diff --git a/tutorials/sonicTurbFoam/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/0/k
rename to tutorials/compressible/sonicFoam/ras/prism/0/k
diff --git a/tutorials/sonicTurbFoam/prism/0/p b/tutorials/compressible/sonicFoam/ras/prism/0/p
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/0/p
rename to tutorials/compressible/sonicFoam/ras/prism/0/p
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..26216fcde0621aa1c526ab843d2825da511d520a
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphah 1;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/prism/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/blockMeshDict
diff --git a/tutorials/sonicTurbFoam/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/sonicTurbFoam/prism/constant/polyMesh/boundary
rename to tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
diff --git a/tutorials/sonicTurbFoam/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
similarity index 90%
rename from tutorials/sonicTurbFoam/prism/constant/thermophysicalProperties
rename to tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index be4fe9207272159ff5a5835ed7f781afe34334b5..754163e2a972e3860710533ee809e51d9c3a99d7 100644
--- a/tutorials/sonicTurbFoam/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +19,5 @@ thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<per
mixture air 1 28.9 1300 2.544e+06 1.84e-05 0.7;
+
// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
similarity index 92%
rename from tutorials/sonicTurbFoam/prism/system/controlDict
rename to tutorials/compressible/sonicFoam/ras/prism/system/controlDict
index 34291293c0ebe9171282cfc87d9ad3b93245f9fe..ebaf12e75938f8771a6ef2bcdcb2443055f83961 100644
--- a/tutorials/sonicTurbFoam/prism/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
similarity index 92%
rename from tutorials/sonicTurbFoam/prism/system/fvSchemes
rename to tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
index bc68e899f455e75dd7683e39a97eec15d0a13c6a..7b3c03466f4a90b221e27fd07136ba28a964021b 100644
--- a/tutorials/sonicTurbFoam/prism/system/fvSchemes
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -62,7 +63,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..5341a980f476377d047e400880c6756dafccccc2
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution
@@ -0,0 +1,84 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 2;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/sonicLiquidFoam/Allclean b/tutorials/compressible/sonicLiquidFoam/Allclean
similarity index 100%
rename from tutorials/sonicLiquidFoam/Allclean
rename to tutorials/compressible/sonicLiquidFoam/Allclean
diff --git a/tutorials/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
similarity index 100%
rename from tutorials/sonicLiquidFoam/Allrun
rename to tutorials/compressible/sonicLiquidFoam/Allrun
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
similarity index 100%
rename from tutorials/sonicLiquidFoam/decompressionTank/0/U
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
similarity index 100%
rename from tutorials/sonicLiquidFoam/decompressionTank/0/p
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/blockMeshDict
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
new file mode 100644
index 0000000000000000000000000000000000000000..bb5efe789707d74951c20b26871d819be9d79071
--- /dev/null
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 "constant";
+ object thermodynamicProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+rho0 rho0 [ 1 -3 0 0 0 0 0 ] 1000;
+
+p0 p0 [ 1 -1 -2 0 0 0 0 ] 100000;
+
+psi psi [ 0 -2 2 0 0 0 0 ] 4.54e-07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..21ee6987d63fa523538dfd0405390e6f530383c8
--- /dev/null
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+mu mu [ 1 -1 -1 0 0 0 0 ] 0.001;
+
+
+// ************************************************************************* //
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
similarity index 87%
rename from tutorials/sonicLiquidFoam/decompressionTank/system/controlDict
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
index f2cc0d0177ce23100a4bf9caa1ba4e99b71ff2c2..8607f0b47efc252c4d31210777dc9fe0a13d050b 100644
--- a/tutorials/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
similarity index 85%
rename from tutorials/sonicLiquidFoam/decompressionTank/system/fvSchemes
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
index 6c385d2d31ab7c2c0c644674b48b864f1dcff795..d7aad508a2c0d987406d7ab0b34a888da769ac57 100644
--- a/tutorials/sonicLiquidFoam/decompressionTank/system/fvSchemes
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
similarity index 59%
rename from tutorials/sonicLiquidFoam/decompressionTank/system/fvSolution
rename to tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
index 6a88316a18f3c92129f6a46e25edce1f16848e54..0be50bc833f4be1152f334a84da7d8cf4e28b339 100644
--- a/tutorials/sonicLiquidFoam/decompressionTank/system/fvSolution
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,36 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PBiCG
+ p
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- rho PCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ rho
{
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -42,4 +48,5 @@ PISO
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties b/tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties
deleted file mode 100644
index 201e3b4946c6a80782a848fc0e55a8a2bf6fce8f..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge2D/constant/transportProperties
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phase1 //water
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 1000;
- rho0 rho0 [1 -3 0 0 0 0 0] 1000;
- psi psi [0 -2 2 0 0] 1e-5;
-}
-
-phase2 //air
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.589e-5;
- rho rho [1 -3 0 0 0 0 0] 1;
- rho0 rho0 [1 -3 0 0 0 0 0] 0;
- psi psi [0 -2 2 0 0] 1e-5;
-}
-
-pMin pMin [1 -1 -2 0 0 0 0] 1e4;
-
-sigma sigma [1 0 -2 0 0 0 0] 0.07;
-
-// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution b/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution
deleted file mode 100644
index 868252473975e23b298727de38f9dd66fbef0b56..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge2D/system/fvSolution
+++ /dev/null
@@ -1,126 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- rho diagonal
- {};
-
- pd GAMG
- {
- tolerance 1e-7;
- relTol 0.01;
-
- smoother DIC; //GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-7;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-7;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- transSonic no;
- nOuterCorrectors 3;
- nCorrectors 1;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 1;
- cAlpha 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict b/tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict
deleted file mode 100644
index 510871c44b36a0002f4a97b6fa70c3e4e0b63e99..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge2D/system/setFieldsDict
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volScalarFieldValue alpha1 1
- volScalarFieldValue pd 1e5
-);
-
-regions
-(
- sphereToCell
- {
- centre (0.5 0.5 0);
- radius 0.1;
-
- fieldValues
- (
- volScalarFieldValue alpha1 0
- volScalarFieldValue pd 10e5
- );
- }
-
- boxToCell
- {
- box (-10 1 -1) (10 10 1);
-
- fieldValues
- (
- volScalarFieldValue alpha1 0
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties
deleted file mode 100644
index 201e3b4946c6a80782a848fc0e55a8a2bf6fce8f..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge3D/constant/transportProperties
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phase1 //water
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 1000;
- rho0 rho0 [1 -3 0 0 0 0 0] 1000;
- psi psi [0 -2 2 0 0] 1e-5;
-}
-
-phase2 //air
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.589e-5;
- rho rho [1 -3 0 0 0 0 0] 1;
- rho0 rho0 [1 -3 0 0 0 0 0] 0;
- psi psi [0 -2 2 0 0] 1e-5;
-}
-
-pMin pMin [1 -1 -2 0 0 0 0] 1e4;
-
-sigma sigma [1 0 -2 0 0 0 0] 0.07;
-
-// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties b/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
deleted file mode 100644
index fe67e8fecae0729e7345802955479523972bb72d..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
+++ /dev/null
@@ -1,22 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//simulationType laminar;
-//simulationType RASModel;
-simulationType LESModel;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution b/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution
deleted file mode 100644
index 868252473975e23b298727de38f9dd66fbef0b56..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge3D/system/fvSolution
+++ /dev/null
@@ -1,126 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- rho diagonal
- {};
-
- pd GAMG
- {
- tolerance 1e-7;
- relTol 0.01;
-
- smoother DIC; //GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-7;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-7;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- transSonic no;
- nOuterCorrectors 3;
- nCorrectors 1;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 1;
- cAlpha 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict b/tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict
deleted file mode 100644
index d0e435037219410e9f082c6b98ea271b807be53c..0000000000000000000000000000000000000000
--- a/tutorials/compressibleInterFoam/depthCharge3D/system/setFieldsDict
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volScalarFieldValue alpha1 1
- volScalarFieldValue pd 1e5
-);
-
-regions
-(
- sphereToCell
- {
- centre (0.5 0.5 0.5);
- radius 0.1;
-
- fieldValues
- (
- volScalarFieldValue alpha1 0
- volScalarFieldValue pd 10e5
- );
- }
-
- boxToCell
- {
- box (-10 1 -1) (10 10 1);
-
- fieldValues
- (
- volScalarFieldValue alpha1 0
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/RASProperties b/tutorials/dieselFoam/aachenBomb/constant/RASProperties
deleted file mode 100644
index c652dd95b20f2f0291c27112da7563d34e41594e..0000000000000000000000000000000000000000
--- a/tutorials/dieselFoam/aachenBomb/constant/RASProperties
+++ /dev/null
@@ -1,99 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
- muLimiter on;
- Lsgs 0.0002;
-
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- Cs 0.25;
- Ceps 0.15;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/environmentalProperties b/tutorials/dieselFoam/aachenBomb/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/dieselFoam/aachenBomb/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties
deleted file mode 100644
index e23158128b165f52bcb9ba3b2ecab702c7958931..0000000000000000000000000000000000000000
--- a/tutorials/dieselFoam/aachenBomb/constant/thermophysicalProperties
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermodynamicProperties;
-}
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-thermoType hMixtureThermo<reactingMixture>;
-
-CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
-// We use the central thermo data:
-CHEMKINThermoFile "~OpenFOAM/thermoData/therm.dat";
-
-inertSpecie N2;
-
-liquidComponents
-(
- C7H16
-);
-
-liquidProperties
-{
- C7H16 C7H16 defaultCoeffs;
-}
-
-/*********************************************************************/
diff --git a/tutorials/dieselFoam/aachenBomb/system/controlDict b/tutorials/dieselFoam/aachenBomb/system/controlDict
deleted file mode 100644
index 951d757ff8aae1c119347b3faf588293f5dc8482..0000000000000000000000000000000000000000
--- a/tutorials/dieselFoam/aachenBomb/system/controlDict
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 0.01;
-
-deltaT 2.5e-06;
-
-writeControl adjustableRunTime;
-
-writeInterval 5.0e-5;
-
-purgeWrite 0;
-
-writeFormat binary;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-adjustTimeStep yes;
-
-maxCo 0.1;
-
-runTimeModifiable yes;
-
-// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/system/fvSolution b/tutorials/dieselFoam/aachenBomb/system/fvSolution
deleted file mode 100644
index 3183443d6e5b2ec36b2026dd79ff502416332082..0000000000000000000000000000000000000000
--- a/tutorials/dieselFoam/aachenBomb/system/fvSolution
+++ /dev/null
@@ -1,76 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- p
- {
- solver PCG;
- preconditioner DIC;
- tolerance 1e-09;
- relTol 0;
- };
- Yi
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- h
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- k
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- epsilon
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/electrostaticFoam/chargedWire/0/phi b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
similarity index 100%
rename from tutorials/electrostaticFoam/chargedWire/0/phi
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
diff --git a/tutorials/electrostaticFoam/chargedWire/0/rho b/tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
similarity index 100%
rename from tutorials/electrostaticFoam/chargedWire/0/rho
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
diff --git a/tutorials/electrostaticFoam/chargedWire/constant/physicalProperties b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
similarity index 79%
rename from tutorials/electrostaticFoam/chargedWire/constant/physicalProperties
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
index b6cc58030c0eb4448cd04f41b5db2cead26c8c26..922738868c442a17e365d11aa40cd9e746229fa0 100644
--- a/tutorials/electrostaticFoam/chargedWire/constant/physicalProperties
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object physicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-epsilon0 epsilon0 [-1 -3 4 0 0 2 0] 8.85419e-12;
+epsilon0 epsilon0 [ -1 -3 4 0 0 2 0 ] 8.85419e-12;
+
+k k [ -1 0 2 0 0 1 0 ] 0.00016;
-k k [-1 0 2 0 0 1 0] 0.00016;
// ************************************************************************* //
diff --git a/tutorials/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/blockMeshDict
diff --git a/tutorials/electrostaticFoam/chargedWire/constant/polyMesh/boundary b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/electrostaticFoam/chargedWire/constant/polyMesh/boundary
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary
diff --git a/tutorials/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
similarity index 92%
rename from tutorials/electrostaticFoam/chargedWire/system/controlDict
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
index 7c2f3213b79c680ce2eebca320f7f98dd047001a..25b59d0c428b0260a7451bc4f2355ed78b15086a 100644
--- a/tutorials/electrostaticFoam/chargedWire/system/controlDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/electrostaticFoam/chargedWire/system/fvSchemes b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
similarity index 89%
rename from tutorials/electrostaticFoam/chargedWire/system/fvSchemes
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
index b29cd97b9cbb406fd41b8956deab524fa7f11893..f1581eecb1c59593764371a78abb765d3b4468eb 100644
--- a/tutorials/electrostaticFoam/chargedWire/system/fvSchemes
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -49,7 +50,8 @@ snGradSchemes
fluxRequired
{
default no;
- phi;
+ phi ;
}
+
// ************************************************************************* //
diff --git a/tutorials/electrostaticFoam/chargedWire/system/fvSolution b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
similarity index 68%
rename from tutorials/electrostaticFoam/chargedWire/system/fvSolution
rename to tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
index 5bfe4c6c5a4ab3beb991b13c7dd4924cc821f72c..8200d7d1a1f9b5b8f336970543d22e8cffff9bcf 100644
--- a/tutorials/electrostaticFoam/chargedWire/system/fvSolution
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,29 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- phi PCG
+ phi
{
- preconditioner DIC;
- tolerance 1e-08;
- relTol 0.2;
- };
- rho PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-08;
+ relTol 0.2;
+ }
+
+ rho
{
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0.2;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0.2;
+ }
}
+
// ************************************************************************* //
diff --git a/tutorials/mhdFoam/Allclean b/tutorials/electromagnetics/mhdFoam/Allclean
similarity index 100%
rename from tutorials/mhdFoam/Allclean
rename to tutorials/electromagnetics/mhdFoam/Allclean
diff --git a/tutorials/mhdFoam/Allrun b/tutorials/electromagnetics/mhdFoam/Allrun
similarity index 100%
rename from tutorials/mhdFoam/Allrun
rename to tutorials/electromagnetics/mhdFoam/Allrun
diff --git a/tutorials/mhdFoam/hartmann/0/B b/tutorials/electromagnetics/mhdFoam/hartmann/0/B
similarity index 100%
rename from tutorials/mhdFoam/hartmann/0/B
rename to tutorials/electromagnetics/mhdFoam/hartmann/0/B
diff --git a/tutorials/mhdFoam/hartmann/0/U b/tutorials/electromagnetics/mhdFoam/hartmann/0/U
similarity index 100%
rename from tutorials/mhdFoam/hartmann/0/U
rename to tutorials/electromagnetics/mhdFoam/hartmann/0/U
diff --git a/tutorials/mhdFoam/hartmann/0/p b/tutorials/electromagnetics/mhdFoam/hartmann/0/p
similarity index 100%
rename from tutorials/mhdFoam/hartmann/0/p
rename to tutorials/electromagnetics/mhdFoam/hartmann/0/p
diff --git a/tutorials/mhdFoam/hartmann/0/pB b/tutorials/electromagnetics/mhdFoam/hartmann/0/pB
similarity index 100%
rename from tutorials/mhdFoam/hartmann/0/pB
rename to tutorials/electromagnetics/mhdFoam/hartmann/0/pB
diff --git a/tutorials/mhdFoam/hartmann/constant/polyMesh/blockMeshDict b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
rename to tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/blockMeshDict
diff --git a/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/mhdFoam/hartmann/constant/polyMesh/boundary
rename to tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
index 0be28ca2082b6a0b68d2ee50bd36df6db0680dac..6b2eb1756208b4f3348f13fd03b66f67d4835636 100644
--- a/tutorials/mhdFoam/hartmann/constant/polyMesh/boundary
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev-8cbffd16687e |
+| \\ / O peration | Version: 1.5-8cbffd16687e |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/mhdFoam/hartmann/constant/transportProperties b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
similarity index 74%
rename from tutorials/mhdFoam/hartmann/constant/transportProperties
rename to tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
index 4466758559e3c6d2fd35ac34819fe69b5654792f..884ea21fed5a2fd076595938fc6f912b708697ca 100644
--- a/tutorials/mhdFoam/hartmann/constant/transportProperties
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rho rho [1 -3 0 0 0 0 0] 1;
+rho rho [ 1 -3 0 0 0 0 0 ] 1;
-nu nu [0 2 -1 0 0 0 0] 1;
+nu nu [ 0 2 -1 0 0 0 0 ] 1;
-mu mu [1 1 -2 0 0 -2 0] 1;
+mu mu [ 1 1 -2 0 0 -2 0 ] 1;
+
+sigma sigma [ -1 -3 3 0 0 2 0 ] 1;
-sigma sigma [-1 -3 3 0 0 2 0] 1;
// ************************************************************************* //
diff --git a/tutorials/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
similarity index 92%
rename from tutorials/mhdFoam/hartmann/system/controlDict
rename to tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
index 267187bdbf65f957449ab63638753b485a977c22..4e7c7961eff2eb55c2f6fa412e789155fba80c65 100644
--- a/tutorials/mhdFoam/hartmann/system/controlDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/mhdFoam/hartmann/system/fvSchemes b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
similarity index 90%
rename from tutorials/mhdFoam/hartmann/system/fvSchemes
rename to tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
index ac40c59658b97331f5d24c8d168eb261edbbcd37..7a294b277b67cfafe3346b77aa841f95d7c1522b 100644
--- a/tutorials/mhdFoam/hartmann/system/fvSchemes
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -59,8 +60,9 @@ snGradSchemes
fluxRequired
{
default no;
- p;
- pB;
+ p ;
+ pB ;
}
+
// ************************************************************************* //
diff --git a/tutorials/mhdFoam/hartmann/system/fvSolution b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
similarity index 59%
rename from tutorials/mhdFoam/hartmann/system/fvSolution
rename to tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
index 89f066f29e7c26ee8ac3e5bcea6c8097186ed90e..bf2138f3d4db95d3e25285b93e63d0d6ab7a1f1c 100644
--- a/tutorials/mhdFoam/hartmann/system/fvSolution
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,36 +10,44 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- B PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ B
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- pB PCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ pB
{
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -53,4 +61,5 @@ BPISO
nCorrectors 3;
}
+
// ************************************************************************* //
diff --git a/tutorials/mhdFoam/hartmann/system/sampleDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
similarity index 70%
rename from tutorials/mhdFoam/hartmann/system/sampleDict
rename to tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
index e62120c869735ae45ea76e62cde6f7ae2d551a3b..9fa14b49198962c11fe51b74e772d8fc31102bbd 100644
--- a/tutorials/mhdFoam/hartmann/system/sampleDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,33 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object sampleDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
interpolationScheme cellPoint;
-setFormat raw;
+setFormat raw;
-sets
-(
- line_centreProfile
- {
- type uniform;
+sets ( line_centreProfile { type uniform ; axis distance ; start ( 10.001 -1 0.01 ) ; end ( 10.001 1 0.01 ) ; nPoints 100 ; } );
- axis distance;
- start (10.001 -1 0.01);
- end (10.001 1 0.01);
- nPoints 100;
- }
-);
+surfaces ( );
-surfaces
-();
+fields ( Ux );
-fields
-(
- Ux
-);
// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/-180/epsilon.gz b/tutorials/engineFoam/kivaTest/-180/epsilon.gz
deleted file mode 100644
index 0ff7bad2641702a8c79a275b75753ebffd0e99f4..0000000000000000000000000000000000000000
Binary files a/tutorials/engineFoam/kivaTest/-180/epsilon.gz and /dev/null differ
diff --git a/tutorials/engineFoam/kivaTest/-180/k.gz b/tutorials/engineFoam/kivaTest/-180/k.gz
deleted file mode 100644
index 933ad7a5fa2db1f0c42a248ffea2b9abcac04261..0000000000000000000000000000000000000000
Binary files a/tutorials/engineFoam/kivaTest/-180/k.gz and /dev/null differ
diff --git a/tutorials/engineFoam/kivaTest/constant/RASProperties b/tutorials/engineFoam/kivaTest/constant/RASProperties
deleted file mode 100644
index 6236e36490ffd60b82bc269893149846196f477f..0000000000000000000000000000000000000000
--- a/tutorials/engineFoam/kivaTest/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0;
- alphah 1.111;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/constant/environmentalProperties b/tutorials/engineFoam/kivaTest/constant/environmentalProperties
deleted file mode 100644
index ca80af21ee6180ad2667f0efe40c92ac5df7ee7a..0000000000000000000000000000000000000000
--- a/tutorials/engineFoam/kivaTest/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 0);
-
-// ************************************************************************* //
diff --git a/tutorials/engineFoam/kivaTest/system/fvSolution b/tutorials/engineFoam/kivaTest/system/fvSolution
deleted file mode 100644
index 42e0957d1797174b7c84bf242b16d9efe5ca95e9..0000000000000000000000000000000000000000
--- a/tutorials/engineFoam/kivaTest/system/fvSolution
+++ /dev/null
@@ -1,107 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- ft PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- fu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- b PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Xi PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Su PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- hu PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 1;
- momentumPredictor yes;
- fluxGradp no;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/financialFoam/europeanCall/0/V b/tutorials/financial/financialFoam/europeanCall/0/V
similarity index 100%
rename from tutorials/financialFoam/europeanCall/0/V
rename to tutorials/financial/financialFoam/europeanCall/0/V
diff --git a/tutorials/financialFoam/europeanCall/constant/financialProperties b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
similarity index 68%
rename from tutorials/financialFoam/europeanCall/constant/financialProperties
rename to tutorials/financial/financialFoam/europeanCall/constant/financialProperties
index c6ee52d4f36a00a08e00b5f404e2b099f758181d..d8f847422d7eb94c94e9683f36d6c5fb522d0945 100644
--- a/tutorials/financialFoam/europeanCall/constant/financialProperties
+++ b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,22 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object financialProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-strike strike [0 1 0 0 0 0 0] 40;
+strike strike [ 0 1 0 0 0 0 0 ] 40;
-r r [0 0 -1 0 0 0 0] 0.1;
+r r [ 0 0 -1 0 0 0 0 ] 0.1;
-sigma sigma [0 0 -0.5 0 0 0 0] 0.2;
+sigma sigma [ 0 0 -0.5 0 0 0 0 ] 0.2;
-s s [0 0 -1 0 0 0 0] 0;
+s s [ 0 0 -1 0 0 0 0 ] 0;
-xi xi [0 0 -0.5 0 0 0 0] 0.1;
+xi xi [ 0 0 -0.5 0 0 0 0 ] 0.1;
+
+eta eta [ 0 0 0 0 0 0 0 ] 0;
-eta eta [0 0 0 0 0 0 0] 0;
// ************************************************************************* //
diff --git a/tutorials/financialFoam/europeanCall/constant/polyMesh/blockMeshDict b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
rename to tutorials/financial/financialFoam/europeanCall/constant/polyMesh/blockMeshDict
diff --git a/tutorials/financialFoam/europeanCall/constant/polyMesh/boundary b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/financialFoam/europeanCall/constant/polyMesh/boundary
rename to tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
diff --git a/tutorials/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict
similarity index 92%
rename from tutorials/financialFoam/europeanCall/system/controlDict
rename to tutorials/financial/financialFoam/europeanCall/system/controlDict
index 4cb5448f1deb2a5d31ab8b2809bdb3e37a9eee47..d24c1823498a33eb94e917e50da352a78697a187 100644
--- a/tutorials/financialFoam/europeanCall/system/controlDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -45,4 +45,5 @@ runTimeModifiable yes;
graphFormat raw;
+
// ************************************************************************* //
diff --git a/tutorials/financialFoam/europeanCall/system/fvSchemes b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
similarity index 90%
rename from tutorials/financialFoam/europeanCall/system/fvSchemes
rename to tutorials/financial/financialFoam/europeanCall/system/fvSchemes
index b0868a0ec4845c9e5752adfd28d0549e06afc9ce..5617eab9d797b666bce5ae8732fed34183ddb101 100644
--- a/tutorials/financialFoam/europeanCall/system/fvSchemes
+++ b/tutorials/financial/financialFoam/europeanCall/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -47,4 +48,5 @@ snGradSchemes
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/system/fvSolution b/tutorials/financial/financialFoam/europeanCall/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..7d17c2314f6f40833cfc7175da805eefb1471743
--- /dev/null
+++ b/tutorials/financial/financialFoam/europeanCall/system/fvSolution
@@ -0,0 +1,30 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ V
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/financialFoam/europeanCall/system/fvSolution b/tutorials/financialFoam/europeanCall/system/fvSolution
deleted file mode 100644
index 49b0058c61e48d8abeca849e71f05b69246d5f34..0000000000000000000000000000000000000000
--- a/tutorials/financialFoam/europeanCall/system/fvSolution
+++ /dev/null
@@ -1,27 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- V PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/constrictedChannel/system/molConfigDict b/tutorials/gnemdFoam/constrictedChannel/system/molConfigDict
deleted file mode 100644
index 9423fb934a55fc0082b2616aa268bba1587b7ca9..0000000000000000000000000000000000000000
--- a/tutorials/gnemdFoam/constrictedChannel/system/molConfigDict
+++ /dev/null
@@ -1,66 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object molConfigDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Subdictionaries specifying the contents of zones
-
-// Euler angles, expressed in degrees as phi, theta, psi, see http://mathworld.wolfram.com/EulerAngles.html
-
-bottomWall
-{
- massDensity 1220.0;
- temperature 300.0;
- velocityDistribution maxwellian;
- bulkVelocity (0.0 0.0 0.0);
- id Ar;
- mass 6.63352033e-26;
- latticeStructure FCC;
- anchor (1.05e-9 3.18e-9 2.87e-9);
- anchorSpecifies molecule;
- tethered yes;
- orientationAngles (30 0 0);
-}
-
-liquid
-{
- massDensity 1100.0;
- temperature 250.0;
- velocityDistribution maxwellian;
- bulkVelocity (245.0 0.0 0.0);
- id Ne;
- mass 3.350996347e-26;
- latticeStructure SC;
- anchor (1.05e-9 3.18e-9 2.87e-9);
- anchorSpecifies molecule;
- tethered no;
- orientationAngles (45 0 0);
-}
-
-topWall
-{
- massDensity 1220.0;
- temperature 200.0;
- velocityDistribution maxwellian;
- bulkVelocity (0.0 0.0 0.0);
- id Ar;
- mass 6.63352033e-26;
- latticeStructure BCC;
- anchor (1.05e-9 3.18e-9 2.87e-9);
- anchorSpecifies corner;
- tethered yes;
- orientationAngles (0 0 0);
-}
-
-// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/constrictedChannel/system/potentialDict b/tutorials/gnemdFoam/constrictedChannel/system/potentialDict
deleted file mode 100644
index 7f9346077fcf8b79c7f7fd36f1be33ff4037ae2e..0000000000000000000000000000000000000000
--- a/tutorials/gnemdFoam/constrictedChannel/system/potentialDict
+++ /dev/null
@@ -1,131 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object potentials;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Subdictionaries specifying types of intermolecular potential.
-// Sub-sub dictionaries specify the potentials themselves.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Removal order
-
-// This is the order in which to remove overlapping pairs if more than one
-// type of molecule is present. The most valuable molecule type is at the
-// right hand end, the molecule that will be removed 1st is 1st on the list.
-// Not all types need to be present, a molecule that is not present is
-// automatically less valuable than any on the list. For molecules of the
-// same type there is no control over which is removed.
-
-removalOrder 2 (Ne Ar);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Pair potentials
-
-// If there are r different type of molecules, and a pair force is required
-// between all combinations, then there are C = r(r+1)/2 combinations,
-// i.e. for r = {1,2,3,4}, C = {1,3,6,10} (sum of triangular numbers).
-
-// Pair potentials are specified by the combinaition of their ids,
-// for MOLA and MOLB, "MOLA-MOLB" OR "MOLB-MOLA" is acceptable
-// (strictly OR, both or neither will thrown an error)
-
-pair
-{
- Ar-Ar
- {
- pairPotential maitlandSmith;
- rCut 1.0e-9;
- rMin 0.15e-9;
- dr 5e-14;
- maitlandSmithCoeffs
- {
- m 13.0;
- gamma 7.5;
- rm 0.3756e-9;
- epsilon 1.990108438e-21;
- }
- energyScalingFunction doubleSigmoid;
- doubleSigmoidCoeffs
- {
- shift1 0.9e-9;
- scale1 0.3e11;
- shift2 0.97e-9;
- scale2 1.2e11;
- }
- writeTables yes;
- }
-
- Ar-Ne
- {
- pairPotential maitlandSmith;
- rCut 0.9e-9;
- rMin 0.1e-9;
- dr 5e-14;
- maitlandSmithCoeffs
- {
- m 13.0;
- gamma 4;
- rm 0.348e-9;
- epsilon 8.765026657e-22;
- }
- energyScalingFunction shiftedForce;
- writeTables yes;
- }
-
- Ne-Ne
- {
- pairPotential maitlandSmith;
- rCut 0.8e-9;
- rMin 0.1e-9;
- dr 5e-14;
- maitlandSmithCoeffs
- {
- m 13.0;
- gamma 5;
- rm 0.30739e-9;
- epsilon 5.813260729e-22;
- }
- energyScalingFunction shiftedForce;
- writeTables yes;
- }
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Tethering Potentials
-
-tether
-{
- Ar
- {
- tetherPotential restrainedHarmonicSpring;
- restrainedHarmonicSpringCoeffs
- {
- springConstant 0.1;
- rR 1.2e-9;
- }
- }
-}
-
-// ************************************************************************* //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// External Forces
-
-// Bulk external forces (namely gravity) will be specified as forces rather
-// than potentials to allow their direction to be controlled.
-
-external
-{
- gravity (0 0 0);
-}
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/molConfigDict b/tutorials/gnemdFoam/nanoNozzle/system/molConfigDict
deleted file mode 100644
index 63d337e5dcbb501ebdfa62b5011799847bddc2fa..0000000000000000000000000000000000000000
--- a/tutorials/gnemdFoam/nanoNozzle/system/molConfigDict
+++ /dev/null
@@ -1,67 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object molConfigDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Subdictionaries specifying the contents of zones - for the moment have a single species in each block - move to mixed
-
-// Euler angles, expressed in degrees as phi, theta, psi, see http://mathworld.wolfram.com/EulerAngles.html
-
-sectionA
-{
- massDensity 1220.0;
- temperature 300.0;
- velocityDistribution maxwellian;
- bulkVelocity (-250.0 0.0 0.0);
- id Ar;
- mass 6.63352033e-26;
- latticeStructure SC;
- anchor (0.0 0.0 0.0);
- anchorSpecifies molecule;
- tethered no;
- orientationAngles (0 0 0);
-}
-
-sectionB
-{
- massDensity 1220.0;
- temperature 300.0;
- velocityDistribution maxwellian;
- bulkVelocity (-250.0 0.0 0.0);
- id Ne;
- mass 3.350917e-26;
- latticeStructure SC;
- anchor (0.0 0.0 0.0);
- anchorSpecifies molecule;
- tethered no;
- orientationAngles (0 0 0);
-}
-
-sectionC
-{
- massDensity 1220.0;
- temperature 300.0;
- velocityDistribution maxwellian;
- bulkVelocity (-250.0 0.0 0.0);
- id Ar;
- mass 6.63352033e-26;
- latticeStructure SC;
- anchor (0.0 0.0 0.0);
- anchorSpecifies molecule;
- tethered no;
- orientationAngles (0 0 0);
-}
-
-// ************************************************************************* //
-
\ No newline at end of file
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/potentialDict b/tutorials/gnemdFoam/nanoNozzle/system/potentialDict
deleted file mode 100644
index 7789766620729c6ee94392f0ccfa7414a318636c..0000000000000000000000000000000000000000
--- a/tutorials/gnemdFoam/nanoNozzle/system/potentialDict
+++ /dev/null
@@ -1,104 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object potentials;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Subdictionaries specifying types of intermolecular potential.
-// Sub-sub dictionaries specify the potentials themselves.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Removal order
-
-// This is the order in which to remove overlapping pairs if more than one
-// type of molecule is present. The most valuable molecule type is at the
-// right hand end, the molecule that will be removed 1st is 1st on the list.
-// Not all types need to be present, a molecule that is not present is
-// automatically less valuable than any on the list. For molecules of the
-// same type there is no control over which is removed.
-
-removalOrder 1 (Ar);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Pair potentials
-
-// If there are r different type of molecules, and a pair force is required
-// between all combinations, then there are C = r(r+1)/2 combinations,
-// i.e. for r = {1,2,3,4}, C = {1,3,6,10} (sum of triangular numbers).
-
-// Pair potentials are specified by the combinaition of their ids,
-// for MOLA and MOLB, "MOLA-MOLB" OR "MOLB-MOLA" is acceptable
-// (strictly OR, both or neither will thrown an error)
-
-pair
-{
- Ar-Ar
- {
- pairPotential maitlandSmith;
- rCut 1.0e-9;
- rMin 0.15e-9;
- dr 5e-14;
- maitlandSmithCoeffs
- {
- m 13.0;
- gamma 7.5;
- rm 0.3756e-9;
- epsilon 1.990108438e-21;
- }
- energyScalingFunction doubleSigmoid;
- doubleSigmoidCoeffs
- {
- shift1 0.9e-9;
- scale1 0.3e11;
- shift2 0.97e-9;
- scale2 1.2e11;
- }
- writeTables no;
- }
-
- Ar-Ne
- {
- pairPotential maitlandSmith;
- rCut 0.9e-9;
- rMin 0.1e-9;
- dr 5e-14;
- maitlandSmithCoeffs
- {
- m 13.0;
- gamma 4;
- rm 0.348e-9;
- epsilon 8.765026657e-22;
- }
- energyScalingFunction shiftedForce;
- writeTables no;
- }
-
- Ne-Ne
- {
- pairPotential maitlandSmith;
- rCut 0.8e-9;
- rMin 0.1e-9;
- dr 5e-14;
- maitlandSmithCoeffs
- {
- m 13.0;
- gamma 5;
- rm 0.30739e-9;
- epsilon 5.813260729e-22;
- }
- energyScalingFunction shiftedForce;
- writeTables no;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/T
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/T
diff --git a/tutorials/buoyantFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/T.org
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/T.org
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/T.org
diff --git a/tutorials/buoyantFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/U
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/U
diff --git a/tutorials/buoyantFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/epsilon
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/epsilon
diff --git a/tutorials/buoyantFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/k
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/k
diff --git a/tutorials/buoyantFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/p
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/p
diff --git a/tutorials/buoyantFoam/hotRoom/0/pd b/tutorials/heatTransfer/buoyantFoam/hotRoom/0/pd
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/0/pd
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/0/pd
diff --git a/tutorials/buoyantFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantFoam/hotRoom/Allclean
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/Allclean
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/Allclean
diff --git a/tutorials/buoyantFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantFoam/hotRoom/Allrun
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/Allrun
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/Allrun
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..35b5a409f230c180f07469bfe0679cdf00cb419d
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0.85;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ alphah 1;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaR 1;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ alphah 1;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaR 1;
+ alphaEps 0.76923;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/blockMeshDict
diff --git a/tutorials/buoyantFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/constant/polyMesh/boundary
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/polyMesh/boundary
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/thermophysicalProperties
similarity index 88%
rename from tutorials/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/constant/thermophysicalProperties
index 845c425d42fbdc9f9c6738c6d16c3d95c24ed67c..f826516c2ebc44480f764103bbcc05c3f2e83efd 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,6 +19,7 @@ thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<per
mixture air 1 28.9 1000 0 1.8e-05 0.7;
-pRef 1e5;
+pRef 100000;
+
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b70f6702e4ef7644c20687bce6536c6690720da9
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/setHotRoom/Make/files b/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/files
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/setHotRoom/Make/files
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/files
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/options b/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/options
similarity index 100%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/options
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/Make/options
diff --git a/tutorials/buoyantFoam/hotRoom/setHotRoom/createFields.H b/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/createFields.H
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/setHotRoom/createFields.H
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/createFields.H
diff --git a/tutorials/buoyantFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/setHotRoom.C
similarity index 100%
rename from tutorials/buoyantFoam/hotRoom/setHotRoom/setHotRoom.C
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/setHotRoom/setHotRoom.C
diff --git a/tutorials/buoyantFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict
similarity index 92%
rename from tutorials/buoyantFoam/hotRoom/system/controlDict
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict
index 513d5d8d857441f6bd89ea580b71ce538fe98ba5..f413425423be7e5cce874661512daa4f490ec0fb 100644
--- a/tutorials/buoyantFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes
similarity index 92%
rename from tutorials/buoyantFoam/hotRoom/system/fvSchemes
rename to tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes
index fb77a2e8897ded729d1b4c69b2c696918ff05221..1006ba6d1fa7c94161a12979af2b5fd49da985f5 100644
--- a/tutorials/buoyantFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -60,7 +61,8 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
+ pd ;
}
+
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..c7dcb8279da2f8d7c4afc7063a37071da1f38f73
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantFoam/hotRoom/system/fvSolution
@@ -0,0 +1,92 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 0;
+ relTol 0;
+ }
+
+ pd
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/T b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/T
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/T.org b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T.org
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/T.org
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/T.org
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/U b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/U
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/U
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/alphat b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/alphat
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
index a413baf8ed52f13df3079e39ad1d827607e1c0ce..3bcb9c03b13cf7d96e3456eabea33e5f6d0ee8e1 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/0/alphat
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/alphat
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon
index 243a852f894cddeea49c2aaf7f81a2e9c1141cb5..fcda1ad91f0555e9302263cb3bc42b7e70960b7a 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/epsilon.old b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon.old
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/epsilon.old
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon.old
index f39bcff94273d77d588fdff4411f29c3b2915360..d7f61316978a5d62e73f55f6dbf948d957a00e95 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/0/epsilon.old
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/epsilon.old
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/k b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/k
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k
index 1b8a55e1b5900fec1c1b03ce90f5811cdc90a955..93cd1e0334ff778d059a5d6c43fef6b118f39d18 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/k.old b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k.old
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/k.old
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k.old
index 6289576d7823dc3408fd1574320cc7e04414940d..1130003c3b067e123df3d3d97a094acc387e6456 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/0/k.old
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/k.old
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/mut b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/mut
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut
index 64a67eea2ad3b4c701d91ba4507c56d6da4cba4a..fca37fcb40bdec040dd0e57f6fecaebe4c58562c 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/0/mut
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/mut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/p
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/0/pd b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/pd
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/0/pd
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/pd
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/Allclean b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allclean
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/Allclean
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allclean
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/Allrun
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..35b5a409f230c180f07469bfe0679cdf00cb419d
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0.85;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ alphah 1;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaR 1;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ alphah 1;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaR 1;
+ alphaEps 0.76923;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/blockMeshDict
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
index 9590626e73b22338987ef922d3789c839e0ded3e..d0eb52935f2b14b9b94f41a477063f46188ccf5f 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
similarity index 88%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
index 845c425d42fbdc9f9c6738c6d16c3d95c24ed67c..f826516c2ebc44480f764103bbcc05c3f2e83efd 100644
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,6 +19,7 @@ thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<per
mixture air 1 28.9 1000 0 1.8e-05 0.7;
-pRef 1e5;
+pRef 100000;
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
similarity index 92%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
index b29648dddaa5e148ddcae7e6a39a9ecc25d69edb..bfc52cf914e6d70563729bb9790dda8a20daaa70 100644
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
similarity index 91%
rename from tutorials/buoyantSimpleFoam/hotRoom/system/fvSchemes
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
index 3430f8f76ef8239890f6dbd09d5e1d5b87f9bfad..9dbebd21cbc1a0cd01091dde9e0cbcd63a459855 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -60,7 +61,8 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
+ pd ;
}
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
similarity index 52%
rename from tutorials/buoyantSimpleFoam/hotRoom/system/fvSolution
rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
index fecb215fc68f07a383ae6f755c5b9d484698b597..dfbfd6a27f1d095120342e7f47910f85b53f92c8 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,60 +10,72 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- pd PCG
+ pd
{
- preconditioner DIC;
- tolerance 1e-08;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ h
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
SIMPLE
{
nNonOrthogonalCorrectors 0;
- pdRefCell 0;
- pdRefValue 0;
+ pdRefCell 0;
+ pdRefValue 0;
}
relaxationFactors
{
- rho 1.0;
+ rho 1;
pd 0.3;
U 0.7;
h 0.7;
@@ -72,4 +84,5 @@ relaxationFactors
R 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/G
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/T
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/U
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..35b5a409f230c180f07469bfe0679cdf00cb419d
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/RASProperties
@@ -0,0 +1,100 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0.85;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ C3 -0.33;
+ alphah 1;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.33;
+ alphah 1;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ alphah 1;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaR 1;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ alphah 1;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaR 1;
+ alphaEps 0.76923;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..639bd90b066ffdac881dc8722b84c1bf39170e9d
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/blockMeshDict
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
similarity index 66%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
index 4ff28e364d3f000529dd4730e5b258f9195aaf40..d8bbfe7f595cd351683a08e8f1d8fe5974ea401d 100644
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/radiationProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object environmentalProperties;
+ location "constant";
+ object radiationProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-radiation on;
+radiation on;
-radiationModel P1;
+radiationModel P1;
noRadiation
{
@@ -30,17 +31,18 @@ absorptionEmissionModel constantAbsorptionEmission;
constantAbsorptionEmissionCoeffs
{
- a a [ 0 -1 0 0 0 0 0] 0.5;
- e e [ 0 -1 0 0 0 0 0] 0.5;
- E E [ 1 -1 -3 0 0 0 0] 0.0;
+ a a [ 0 -1 0 0 0 0 0 ] 0.5;
+ e e [ 0 -1 0 0 0 0 0 ] 0.5;
+ E E [ 1 -1 -3 0 0 0 0 ] 0;
}
-scatterModel constantScatter;
+scatterModel constantScatter;
constantScatterCoeffs
{
- sigma sigma [ 0 -1 0 0 0 0 0] 0.0;
- C C [ 0 0 0 0 0 0 0] 0.0;
+ sigma sigma [ 0 -1 0 0 0 0 0 ] 0;
+ C C [ 0 0 0 0 0 0 0 ] 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
similarity index 88%
rename from tutorials/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
index 7eb3ee5b9f430e1429510ce0cf7063914b1f4f41..f826516c2ebc44480f764103bbcc05c3f2e83efd 100644
--- a/tutorials/rhoPisoFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +19,7 @@ thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<per
mixture air 1 28.9 1000 0 1.8e-05 0.7;
+pRef 100000;
+
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
similarity index 92%
rename from tutorials/buoyantSimpleFoam/hotRoom/system/controlDict
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
index b29648dddaa5e148ddcae7e6a39a9ecc25d69edb..bfc52cf914e6d70563729bb9790dda8a20daaa70 100644
--- a/tutorials/buoyantSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
similarity index 92%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
index 248f87defa6c0d2d7c82c720d6c846dbfc5a22d3..2263c0977531361f056a900481ca7409854ed755 100644
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -61,7 +62,8 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
+ pd ;
}
+
// ************************************************************************* //
diff --git a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
similarity index 51%
rename from tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
index 7bc226e1319e2f74d06c72d5c6356895073f75c0..f6c1f9453a3985e9e77725582bd8f113f91cf78a 100644
--- a/tutorials/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,60 +10,72 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- pd PCG
+ pd
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.01;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.01;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- h PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ h
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- G PCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ G
{
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0.1;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
}
SIMPLE
{
nNonOrthogonalCorrectors 0;
- pdRefCell 0;
- pdRefValue 0;
+ pdRefCell 0;
+ pdRefValue 0;
}
relaxationFactors
{
- rho 1.0;
+ rho 1;
pd 0.3;
U 0.7;
h 0.7;
@@ -72,4 +84,5 @@ relaxationFactors
G 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/K
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/K
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/T
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/U
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/cp
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/cp
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/epsilon
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/epsilon
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/k
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/pd b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pd
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/pd
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/pd
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/0/rho
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/rho
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties
diff --git a/tutorials/Xoodles/pitzDaily/constant/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
similarity index 100%
rename from tutorials/Xoodles/pitzDaily/constant/environmentalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
diff --git a/tutorials/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/constant/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/turbulenceProperties
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
index f47b89c7057bfbef2e8933953dec19c3dbc99599..69a0952209dee387ae6cda9212a645086bba6b7a 100644
--- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
similarity index 79%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
index bff96505ebefbae96c7c20ceac2628b60edea66b..e72fde91a8b5918e35f833a9997d6ba34d496a92 100644
--- a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,23 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object regionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-fluidRegionNames
-(
- bottomAir
- topAir
-);
+fluidRegionNames ( bottomAir topAir );
-solidRegionNames
-(
- heater
- leftSolid
- rightSolid
-);
+solidRegionNames ( heater leftSolid rightSolid );
+
+pRef 100000;
-pRef 100000;
// ************************************************************************* //
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
similarity index 90%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index 946dee0084cb5f0d655ef16d3f6fd5e78080aeaf..2a5d32fc95549424c2cb293f12ff9656a8daf9c9 100644
--- a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -26,9 +26,8 @@ endTime 180;
deltaT 0.001;
writeControl adjustableRunTime;
+
writeInterval 5;
-// writeControl timeStep;
-// writeInterval 20;
purgeWrite 0;
@@ -48,4 +47,5 @@ maxCo 0.3;
adjustTimeStep yes;
+
// ************************************************************************* //
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes
diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
similarity index 100%
rename from tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
diff --git a/tutorials/icoDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/icoDyMFoam/movingCone/constant/dynamicMeshDict
deleted file mode 100644
index 68afe8d578518e853c22f05833308c3474cfb90c..0000000000000000000000000000000000000000
--- a/tutorials/icoDyMFoam/movingCone/constant/dynamicMeshDict
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh dynamicMotionSolverFvMesh;
-
-motionSolverLibs ("libfvMotionSolvers.so");
-
-//solver laplacian;
-solver velocityComponentLaplacian x;
-
-// diffusivity uniform;
-diffusivity directional (1 200 0);
-// diffusivity motionDirectional (1 1000 0);
-// diffusivity inverseDistance 1(movingWall);
-// diffusivity file motionDiffusivity;
-// diffusivity quadratic inverseDistance 1(movingWall);
-// diffusivity exponential 2000 inverseDistance 1(movingWall);
-
-// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityClipped/system/mapFieldsDict b/tutorials/icoFoam/cavityClipped/system/mapFieldsDict
deleted file mode 100644
index 3a4867ef76b098b2f1e2f331acc07b956ca3e736..0000000000000000000000000000000000000000
--- a/tutorials/icoFoam/cavityClipped/system/mapFieldsDict
+++ /dev/null
@@ -1,27 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object mapFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-patchMap
-(
- lid movingWall
-);
-
-cuttingPatches
-(
- fixedWalls
-);
-
-// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityGrade/constant/transportProperties b/tutorials/icoFoam/cavityGrade/constant/transportProperties
deleted file mode 100644
index cdba3d7843fa1dfac369fedafeb7d3d893d3025b..0000000000000000000000000000000000000000
--- a/tutorials/icoFoam/cavityGrade/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-nu nu [0 2 -1 0 0 0 0] 0.01;
-
-// ************************************************************************* //
diff --git a/tutorials/icoFoam/elbow/constant/transportProperties b/tutorials/icoFoam/elbow/constant/transportProperties
deleted file mode 100644
index cdba3d7843fa1dfac369fedafeb7d3d893d3025b..0000000000000000000000000000000000000000
--- a/tutorials/icoFoam/elbow/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-nu nu [0 2 -1 0 0 0 0] 0.01;
-
-// ************************************************************************* //
diff --git a/tutorials/icoFoam/resetFixedWallsScr b/tutorials/icoFoam/resetFixedWallsScr
deleted file mode 100644
index 5a8d98ce462da5095632a9ad2cd29867838b55e0..0000000000000000000000000000000000000000
--- a/tutorials/icoFoam/resetFixedWallsScr
+++ /dev/null
@@ -1,8 +0,0 @@
-/fixedWalls/,/}/{
-/fixedWalls/p
-/{/p
-/type fixedValue;/p
-s/value[ \t]*nonuniform[ \t]*List<vector>[ \t]*/value uniform (0 0 0);/p
-/}/p
-d
-}
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
similarity index 100%
rename from tutorials/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
rename to tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/files b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/files
similarity index 100%
rename from tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/files
rename to tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/files
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/options
similarity index 100%
rename from tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
rename to tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/Make/options
diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H
similarity index 100%
rename from tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
rename to tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/0/U b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/0/U
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/U
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/0/epsilon b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/epsilon
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/0/epsilon
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/epsilon
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/0/k b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/0/k
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/k
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/0/p b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/0/p
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/0/p
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/Allrun
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
similarity index 97%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
index 4ac648890f4af2d3b07278dbfd57df74299b8783..7c8989f567d4a9a0e15a45764d33a184b984917d 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object MRFZones;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/RASProperties b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
similarity index 94%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
index 8bb764255ae395dbd58cea425864904a56f9037a..36c840062fd1dd27bc791d712469bc3bbc828a37 100644
--- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel LaunderSharmaKE;
+RASModel kEpsilon;
-turbulence on;
+turbulence on;
-printCoeffs on;
+printCoeffs on;
laminarCoeffs
{
@@ -46,17 +47,16 @@ RNGkEpsilonCoeffs
kOmegaSSTCoeffs
{
alphaK1 0.85034;
- alphaK2 1.0;
+ alphaK2 1;
alphaOmega1 0.5;
alphaOmega2 0.85616;
gamma1 0.5532;
gamma2 0.4403;
- beta1 0.0750;
+ beta1 0.075;
beta2 0.0828;
betaStar 0.09;
a1 0.31;
c1 10;
-
Cmu 0.09;
}
@@ -179,7 +179,7 @@ SpalartAllmarasCoeffs
Cw2 0.3;
Cw3 2;
Cv1 7.1;
- Cv2 5.0;
+ Cv2 5;
}
wallFunctionCoeffs
@@ -188,4 +188,5 @@ wallFunctionCoeffs
E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/dynamicMeshDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/dynamicMeshDict
similarity index 72%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/dynamicMeshDict
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/dynamicMeshDict
index ba8565090f4ece17775d5c8f19b1ab7707c21084..c0bac183dec1e307a8f456c02dc686f3c185aa62 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/dynamicMeshDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,33 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object dynamicMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dynamicFvMeshLib "libtopoChangerFvMesh.so";
-dynamicFvMesh mixerFvMesh;
+dynamicFvMeshLib "libtopoChangerFvMesh.so";
+
+dynamicFvMesh mixerFvMesh;
mixerFvMeshCoeffs
{
coordinateSystem
{
type cylindrical;
- origin (0 0 0);
- axis (0 0 1);
- direction (1 0 0);
+ origin ( 0 0 0 );
+ axis ( 0 0 1 );
+ direction ( 1 0 0 );
}
rpm 10;
slider
{
- inside insideSlider;
- outside outsideSlider;
+ inside insideSlider;
+ outside outsideSlider;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor_old b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor_old
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor_old
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/sets/rotor_old
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/transportProperties b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/transportProperties
similarity index 62%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/transportProperties
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/transportProperties
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..aad34b40df2a22407d363cccfba0f552c4bf276f 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/transportProperties
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,28 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
transportModel Newtonian;
-nu nu [0 2 -1 0 0 0 0] 1e-05;
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh
similarity index 100%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/makeMesh
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/cellSetDict
similarity index 80%
rename from tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/cellSetDict
index d56de07c7ff767844393cd8be435f9ac0f0297fb..6d1af846e3c61c753852a90c8c8bcc5cfd68cf4d 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/cellSetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object cellSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name rotor;
-action new;
+action new;
+
+topoSetSources ( zoneToCell { name rotor ; } );
-topoSetSources
-(
- boxToCell
- {
- box (0 0 -20e-06) (3600e-6 300e-06 20e-06);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
similarity index 92%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/system/controlDict
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
index 2afc0afc4f479af8ad94b9d8e534b7fd5754a334..5ffeca45c194e81b786db45f4be90461fdf70d30 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.1 b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
similarity index 78%
rename from tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.1
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
index 9dc6572157363a81371dd84e0eb1e9371d758ce7..5507dbd729453219d583c8c3f7e8867eee0ac1a4 100644
--- a/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.1
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ location "system";
+ object faceSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name rotor;
-action new;
+action delete;
+
+topoSetSources ( boundaryToFace { } );
-topoSetSources
-(
- boxToCell
- {
- box (4e-03 -1e-03 -1) (12e-3 1e-03 1);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/cellSetDict.2 b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
similarity index 76%
rename from tutorials/cavitatingFoam/les/throttle/system/cellSetDict.2
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
index 0eb66c8739bf5aaa726844faa441413d623c17cd..062727698328907a23480d3aaae086f2030a1537 100644
--- a/tutorials/cavitatingFoam/les/throttle/system/cellSetDict.2
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_noBoundaryFaces
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ location "system";
+ object faceSetDict_noBoundaryFaces;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name rotor;
-action new;
+action delete;
+
+topoSetSources ( boundaryToFace { } );
-topoSetSources
-(
- boxToCell
- {
- box (4.5e-03 -0.75e-03 -1) (9.5e-3 0.75e-03 1);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/cellSetDict.3 b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
similarity index 75%
rename from tutorials/cavitatingFoam/les/throttle/system/cellSetDict.3
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
index c1833b014ea36df11a792fe579eb49ea05df82c8..5e7917b2fe4f3eae8b3dd4db38d66a39f29a92a3 100644
--- a/tutorials/cavitatingFoam/les/throttle/system/cellSetDict.3
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/faceSetDict_rotorFaces
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ location "system";
+ object faceSetDict_rotorFaces;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name rotor;
-action new;
+action new;
+
+topoSetSources ( cellToFace { set rotor ; option all ; } );
-topoSetSources
-(
- boxToCell
- {
- box (4.75e-03 -0.375e-03 -1) (9e-03 0.375e-03 1);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/fvSchemes b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
similarity index 91%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
index 2e72f9dd37565f63c2c3b19bae3a4a6d9879bcc6..1941f8b8d7b6bc2afbe95863c513b78dc7ad0ec0 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -58,7 +59,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
similarity index 54%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/system/fvSolution
rename to tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
index 1a2ddd83a3aa535e211397464349916a3123717d..a33d7a62e6a7ae70a8eac28b24103cc74088a097 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,56 +10,58 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p GAMG
+ p
{
- tolerance 1e-8;
- relTol 0.05;
-
- smoother GaussSeidel;
-
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.05;
+ smoother GaussSeidel;
cacheAgglomeration true;
-
nCellsInCoarsestLevel 20;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
- U smoothSolver
+ U
{
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
- k smoothSolver
+ k
{
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
- epsilon smoothSolver
+ epsilon
{
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-07;
+ relTol 0.1;
+ }
}
SIMPLE
{
nNonOrthogonalCorrectors 0;
- pRefCell 0;
- pRefValue 0;
+ pRefCell 0;
+ pRefValue 0;
}
relaxationFactors
@@ -70,4 +72,5 @@ relaxationFactors
epsilon 0.5;
}
+
// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/0/R b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/0/R
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/R
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/0/U b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/0/U
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/0/epsilon
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/0/k b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/0/k
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nu.xy
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/0/nu.xy
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nu.xy
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/0/nuTilda
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..7bffdbfa6bc2ebdb4515aecbbd6893f5b05a1dfd
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/RASProperties
@@ -0,0 +1,192 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel LaunderSharmaKE;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/gammaDot.xy b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/gammaDot.xy
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/constant/gammaDot.xy
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/gammaDot.xy
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/blockMeshDict
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..c853d571dd43e7be14f5e9e19d761067cfdb0996
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Ubar Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
similarity index 92%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/system/controlDict
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
index db61aae9da3e4d163f18be4fc796458e99b90e12..d3dd7b0ae51f5726b74666ffebf4312b2251c5df 100644
--- a/tutorials/boundaryFoam/boundaryLaunderSharma/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -45,4 +45,5 @@ runTimeModifiable yes;
graphFormat raw;
+
// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
similarity index 92%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
index 82875da8a078a2ca6cd26c273b16e1b9c72f2321..c5174e958c4e939fb3a8149b7612ef2aaf587c9b 100644
--- a/tutorials/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -54,4 +55,5 @@ snGradSchemes
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
similarity index 57%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/system/fvSolution
rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
index 7f9f7b1c5e7e9cbbdbf3a5dcf104010f4fcb35e3..73dc214917b107c1560f4685714df6ac19d7af89 100644
--- a/tutorials/boundaryFoam/boundaryLaunderSharma/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,42 +10,52 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- U PCG
+ U
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- k PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- R PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ R
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- nuTilda PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ nuTilda
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
PISO
@@ -63,4 +73,5 @@ relaxationFactors
nuTilda 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/0/R b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/0/R
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/R
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/0/U
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
new file mode 100644
index 0000000000000000000000000000000000000000..0a998ced67dbc814840df24204e5d57e4915b6b4
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -3 0 0 0 0];
+
+internalField uniform 1e-08;
+
+boundaryField
+{
+ lowerWall
+ {
+ type epsilonWallFunction;
+ value uniform 1e-08;
+ }
+ upperWall
+ {
+ type epsilonWallFunction;
+ value uniform 1e-08;
+ }
+ frontBack
+ {
+ type cyclic;
+ value uniform 1e-08;
+ }
+ defaultFaces
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
new file mode 100644
index 0000000000000000000000000000000000000000..007ca488434d81472bc40090d27d23e0f08950cc
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
@@ -0,0 +1,210 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -2 0 0 0 0];
+
+internalField uniform 1e-10;
+
+boundaryField
+{
+ lowerWall
+ {
+ type kQRWallFunction;
+ value uniform 1e-10;
+ }
+ upperWall
+ {
+ type kQRWallFunction;
+ value uniform 1e-10;
+ }
+ frontBack
+ {
+ type cyclic;
+ value nonuniform List<scalar>
+160
+(
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+1e-10
+)
+;
+ }
+ defaultFaces
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/0/nu.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/0/nu.xy
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nu.xy
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/0/nuTilda
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..0f7bcf36a77fc21372f81156dbe177183d2f1c1c
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ lowerWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ upperWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ frontBack
+ {
+ type cyclic;
+ value uniform 0;
+ }
+ defaultFaces
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..36c840062fd1dd27bc791d712469bc3bbc828a37
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/RASProperties
@@ -0,0 +1,192 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/gammaDot.xy b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/gammaDot.xy
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/constant/gammaDot.xy
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/gammaDot.xy
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/blockMeshDict
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..c853d571dd43e7be14f5e9e19d761067cfdb0996
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Ubar Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..d3dd7b0ae51f5726b74666ffebf4312b2251c5df
--- /dev/null
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1000;
+
+deltaT 1;
+
+writeControl timeStep;
+
+writeInterval 100;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+graphFormat raw;
+
+
+// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/system/fvSchemes b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
similarity index 78%
rename from tutorials/boundaryFoam/boundaryWallFunctions/system/fvSchemes
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
index 3e867f478158c8a2efa0d29bd8530579e2df182b..c5174e958c4e939fb3a8149b7612ef2aaf587c9b 100644
--- a/tutorials/boundaryFoam/boundaryWallFunctions/system/fvSchemes
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,28 +10,23 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Time derivative discretisation schemes
ddtSchemes
{
- // Default scheme
default steadyState;
}
-// Gradient discretisation schemes
gradSchemes
{
- // Default gradient scheme
default Gauss linear;
}
-// Convection discretisation schemes
divSchemes
{
- // Default scheme
default none;
div(phi,k) Gauss linear;
div(phi,epsilon) Gauss linear;
@@ -40,10 +35,8 @@ divSchemes
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
-// Laplacian discretisation schemes
laplacianSchemes
{
- // Default scheme
default none;
laplacian(nuEff,U) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
@@ -52,18 +45,15 @@ laplacianSchemes
laplacian(DnuTildaEff,nuTilda) Gauss linear corrected;
}
-// Interpolation schemes
interpolationSchemes
{
- // Default scheme
default linear;
}
-// Surface normal gradient schemes
snGradSchemes
{
- // Default scheme
default corrected;
}
+
// ************************************************************************* //
diff --git a/tutorials/boundaryFoam/boundaryWallFunctions/system/fvSolution b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
similarity index 52%
rename from tutorials/boundaryFoam/boundaryWallFunctions/system/fvSolution
rename to tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
index 537858fc3336344e3cb5921236e26699c13cedd9..508336e30cf56479db5cd33542c7bcd2aaece215 100644
--- a/tutorials/boundaryFoam/boundaryWallFunctions/system/fvSolution
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,73 +10,70 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- // Solver for the U equation
- U PCG
+ U
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- // Solver for the k equation
- k PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- // Solver for the epsilon equation
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- // Solver for the R equation
- R PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ R
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- // Solver for the nuTilda equation
- nuTilda PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ nuTilda
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
PISO
{
- // Number of PISO correctors
nCorrectors 2;
- // Number of non-orthogonal correctors
nNonOrthogonalCorrectors 0;
- // momentumPredictor?
momentumPredictor yes;
- // fluxGradp?
fluxGradp no;
}
relaxationFactors
{
- // U
U 0.5;
- // k
k 0.7;
- // epsilon
epsilon 0.7;
- // R
R 0.7;
- // nuTilda
nuTilda 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/channelFoam/channel395/0.org/B b/tutorials/incompressible/channelFoam/channel395/0.org/B
similarity index 100%
rename from tutorials/channelFoam/channel395/0.org/B
rename to tutorials/incompressible/channelFoam/channel395/0.org/B
diff --git a/tutorials/channelFoam/channel395/0.org/U b/tutorials/incompressible/channelFoam/channel395/0.org/U
similarity index 100%
rename from tutorials/channelFoam/channel395/0.org/U
rename to tutorials/incompressible/channelFoam/channel395/0.org/U
diff --git a/tutorials/channelFoam/channel395/0.org/k b/tutorials/incompressible/channelFoam/channel395/0.org/k
similarity index 100%
rename from tutorials/channelFoam/channel395/0.org/k
rename to tutorials/incompressible/channelFoam/channel395/0.org/k
diff --git a/tutorials/channelFoam/channel395/0.org/nuSgs b/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs
similarity index 100%
rename from tutorials/channelFoam/channel395/0.org/nuSgs
rename to tutorials/incompressible/channelFoam/channel395/0.org/nuSgs
diff --git a/tutorials/channelFoam/channel395/0.org/nuTilda b/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda
similarity index 100%
rename from tutorials/channelFoam/channel395/0.org/nuTilda
rename to tutorials/incompressible/channelFoam/channel395/0.org/nuTilda
diff --git a/tutorials/channelFoam/channel395/0.org/p b/tutorials/incompressible/channelFoam/channel395/0.org/p
similarity index 100%
rename from tutorials/channelFoam/channel395/0.org/p
rename to tutorials/incompressible/channelFoam/channel395/0.org/p
diff --git a/tutorials/channelFoam/channel395/0/B.gz b/tutorials/incompressible/channelFoam/channel395/0/B.gz
similarity index 100%
rename from tutorials/channelFoam/channel395/0/B.gz
rename to tutorials/incompressible/channelFoam/channel395/0/B.gz
diff --git a/tutorials/channelFoam/channel395/0/U.gz b/tutorials/incompressible/channelFoam/channel395/0/U.gz
similarity index 100%
rename from tutorials/channelFoam/channel395/0/U.gz
rename to tutorials/incompressible/channelFoam/channel395/0/U.gz
diff --git a/tutorials/channelFoam/channel395/0/k.gz b/tutorials/incompressible/channelFoam/channel395/0/k.gz
similarity index 100%
rename from tutorials/channelFoam/channel395/0/k.gz
rename to tutorials/incompressible/channelFoam/channel395/0/k.gz
diff --git a/tutorials/channelFoam/channel395/0/nuSgs.gz b/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz
similarity index 100%
rename from tutorials/channelFoam/channel395/0/nuSgs.gz
rename to tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz
diff --git a/tutorials/channelFoam/channel395/0/nuTilda.gz b/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz
similarity index 100%
rename from tutorials/channelFoam/channel395/0/nuTilda.gz
rename to tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz
diff --git a/tutorials/channelFoam/channel395/0/p.gz b/tutorials/incompressible/channelFoam/channel395/0/p.gz
similarity index 100%
rename from tutorials/channelFoam/channel395/0/p.gz
rename to tutorials/incompressible/channelFoam/channel395/0/p.gz
diff --git a/tutorials/channelFoam/channel395/Allrun b/tutorials/incompressible/channelFoam/channel395/Allrun
similarity index 100%
rename from tutorials/channelFoam/channel395/Allrun
rename to tutorials/incompressible/channelFoam/channel395/Allrun
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/LESProperties b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties
similarity index 62%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/LESProperties
rename to tutorials/incompressible/channelFoam/channel395/constant/LESProperties
index 568799d2231b34f683f1f6bd3c02c7a237abb64f..8c32bfa67ce64c36026916a7cfe522166062711d 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/LESProperties
+++ b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,17 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel oneEqEddy;
+LESModel oneEqEddy;
-turbulence on;
+turbulence on;
-delta smooth;
+printCoeffs on;
-printCoeffs on;
+delta vanDriest;
laminarCoeffs
{
@@ -28,90 +29,90 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -126,6 +127,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -133,9 +135,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -145,6 +149,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -152,10 +157,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -165,14 +172,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/channelFoam/channel395/constant/polyMesh/blockMeshDict b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/channelFoam/channel395/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict
diff --git a/tutorials/channelFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/channelFoam/channel395/constant/polyMesh/boundary
rename to tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties b/tutorials/incompressible/channelFoam/channel395/constant/postChannelDict
similarity index 78%
rename from tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
rename to tutorials/incompressible/channelFoam/channel395/constant/postChannelDict
index d3f32ecb06e6235cefb9e465d2767faa80138f38..89fcd5080961334007bc68fd3ea0921fcdddf1d9 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
+++ b/tutorials/incompressible/channelFoam/channel395/constant/postChannelDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object turbulenceProperties;
+ location "constant";
+ object postChannelDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//simulationType laminar;
-//simulationType RASModel;
-simulationType LESModel;
+patches ( bottomWall );
+
+component y;
+
+symmetric true;
// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/transportProperties b/tutorials/incompressible/channelFoam/channel395/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..da91d4f46466fc6baee1234da0f1e2a8d6ecc7e2
--- /dev/null
+++ b/tutorials/incompressible/channelFoam/channel395/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Ubar Ubar [ 0 1 -1 0 0 0 0 ] ( 0.1335 0 0 );
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 2e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..2ca28c29a1150383756dc56581f73663dd918fa9
--- /dev/null
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1000;
+
+deltaT 0.2;
+
+writeControl timeStep;
+
+writeInterval 200;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+functions ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; enabled true ; outputControl outputTime ; fields ( U { mean on ; prime2Mean on ; base time ; } p { mean on ; prime2Mean on ; base time ; } ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDaily/system/fvSchemes b/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
similarity index 92%
rename from tutorials/pisoFoam/les/pitzDaily/system/fvSchemes
rename to tutorials/incompressible/channelFoam/channel395/system/fvSchemes
index 9c7d6d936d9ca0d5b2240ed2f1cec971a6f65b92..4a4278dda93ded7d52dc3d2e170a87d43b4ba2fa 100644
--- a/tutorials/pisoFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/channelFoam/channel395/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default backward;
+ default backward;
}
gradSchemes
@@ -32,9 +33,8 @@ divSchemes
div(phi,U) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
- div(phi,nuTilda) Gauss limitedLinear 1;
-
div(B) Gauss linear;
+ div(phi,nuTilda) Gauss limitedLinear 1;
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -62,7 +62,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/channelFoam/channel395/system/fvSolution b/tutorials/incompressible/channelFoam/channel395/system/fvSolution
similarity index 51%
rename from tutorials/channelFoam/channel395/system/fvSolution
rename to tutorials/incompressible/channelFoam/channel395/system/fvSolution
index 80dc8f8ef7cccaf5fcf03973489a1fb837991b63..836e1ef0b2f0f4c465bc3c1169f7701be946a943 100644
--- a/tutorials/channelFoam/channel395/system/fvSolution
+++ b/tutorials/incompressible/channelFoam/channel395/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,48 +10,60 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.05;
- };
- pFinal PCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.05;
+ }
+
+ pFinal
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- B PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ B
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- nuTilda PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ nuTilda
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -62,4 +74,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/Allclean b/tutorials/incompressible/icoFoam/Allclean
similarity index 100%
rename from tutorials/icoFoam/Allclean
rename to tutorials/incompressible/icoFoam/Allclean
diff --git a/tutorials/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
similarity index 100%
rename from tutorials/icoFoam/Allrun
rename to tutorials/incompressible/icoFoam/Allrun
diff --git a/tutorials/icoFoam/cavity/0/U b/tutorials/incompressible/icoFoam/cavity/0/U
similarity index 100%
rename from tutorials/icoFoam/cavity/0/U
rename to tutorials/incompressible/icoFoam/cavity/0/U
diff --git a/tutorials/icoFoam/cavity/0/p b/tutorials/incompressible/icoFoam/cavity/0/p
similarity index 100%
rename from tutorials/icoFoam/cavity/0/p
rename to tutorials/incompressible/icoFoam/cavity/0/p
diff --git a/tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavity/constant/polyMesh/blockMeshDict
diff --git a/tutorials/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/icoFoam/cavity/constant/polyMesh/boundary
rename to tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
diff --git a/tutorials/icoFoam/cavity/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
similarity index 85%
rename from tutorials/icoFoam/cavity/constant/transportProperties
rename to tutorials/incompressible/icoFoam/cavity/constant/transportProperties
index cdba3d7843fa1dfac369fedafeb7d3d893d3025b..673c8479a2698a13c3d93e012e41261b2d5f401a 100644
--- a/tutorials/icoFoam/cavity/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-nu nu [0 2 -1 0 0 0 0] 0.01;
+nu nu [ 0 2 -1 0 0 0 0 ] 0.01;
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict
similarity index 92%
rename from tutorials/icoFoam/cavity/system/controlDict
rename to tutorials/incompressible/icoFoam/cavity/system/controlDict
index 17032f75aba95125660fccdb4a0c4f3c1dbb93b2..d2d91fe2ec372b98b50a3751f1f60e85765e6439 100644
--- a/tutorials/icoFoam/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavity/system/fvSchemes b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
similarity index 91%
rename from tutorials/icoFoam/cavity/system/fvSchemes
rename to tutorials/incompressible/icoFoam/cavity/system/fvSchemes
index 712cc1a60396c9df9263a799f88d0be2fdec283e..80e325f22075fbf0a71559923253b3e923441645 100644
--- a/tutorials/icoFoam/cavity/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavity/system/fvSolution b/tutorials/incompressible/icoFoam/cavity/system/fvSolution
similarity index 72%
rename from tutorials/icoFoam/cavity/system/fvSolution
rename to tutorials/incompressible/icoFoam/cavity/system/fvSolution
index 07e380a3587cea9b574eb34743ad8a666fd8cc92..46670343363af32a79fcf7bd788316556b9de7d7 100644
--- a/tutorials/icoFoam/cavity/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavity/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,25 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
- U PBiCG
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -39,4 +42,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityClipped/0/U b/tutorials/incompressible/icoFoam/cavityClipped/0/U
similarity index 100%
rename from tutorials/icoFoam/cavityClipped/0/U
rename to tutorials/incompressible/icoFoam/cavityClipped/0/U
diff --git a/tutorials/icoFoam/cavityClipped/0/p b/tutorials/incompressible/icoFoam/cavityClipped/0/p
similarity index 100%
rename from tutorials/icoFoam/cavityClipped/0/p
rename to tutorials/incompressible/icoFoam/cavityClipped/0/p
diff --git a/tutorials/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/blockMeshDict
diff --git a/tutorials/icoFoam/cavityClipped/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/icoFoam/cavityClipped/constant/polyMesh/boundary
rename to tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..673c8479a2698a13c3d93e012e41261b2d5f401a
--- /dev/null
+++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu nu [ 0 2 -1 0 0 0 0 ] 0.01;
+
+
+// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
similarity index 92%
rename from tutorials/icoFoam/cavityClipped/system/controlDict
rename to tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
index 5c66b311095841f56dba45729a25059cf138d867..07204830ae46eec356050380fb2727a6a2e4241b 100644
--- a/tutorials/icoFoam/cavityClipped/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0.5;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityClipped/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
similarity index 90%
rename from tutorials/icoFoam/cavityClipped/system/fvSchemes
rename to tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
index 46492b3d9c0f52510ca8dd9ed814c6a7f334c448..80e325f22075fbf0a71559923253b3e923441645 100644
--- a/tutorials/icoFoam/cavityClipped/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityClipped/system/fvSolution b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
similarity index 72%
rename from tutorials/icoFoam/cavityClipped/system/fvSolution
rename to tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
index c78cc469b78763963829ffa68c90d847bd1c188c..46670343363af32a79fcf7bd788316556b9de7d7 100644
--- a/tutorials/icoFoam/cavityClipped/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -38,4 +42,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
similarity index 82%
rename from tutorials/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
rename to tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
index c7529e911320cc7f723e97cf7f33d9484ea2f12e..20b346f8480f93d42e3c9b9e35c207750b5b3d96 100644
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/mapFieldsDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/mapFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mapFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-patchMap
-(
-);
+patchMap ( lid movingWall );
+
+cuttingPatches ( fixedWalls );
-cuttingPatches
-(
-);
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityGrade/0/U b/tutorials/incompressible/icoFoam/cavityGrade/0/U
similarity index 100%
rename from tutorials/icoFoam/cavityGrade/0/U
rename to tutorials/incompressible/icoFoam/cavityGrade/0/U
diff --git a/tutorials/icoFoam/cavityGrade/0/p b/tutorials/incompressible/icoFoam/cavityGrade/0/p
similarity index 100%
rename from tutorials/icoFoam/cavityGrade/0/p
rename to tutorials/incompressible/icoFoam/cavityGrade/0/p
diff --git a/tutorials/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/blockMeshDict
diff --git a/tutorials/icoFoam/cavityGrade/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/icoFoam/cavityGrade/constant/polyMesh/boundary
rename to tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..673c8479a2698a13c3d93e012e41261b2d5f401a
--- /dev/null
+++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu nu [ 0 2 -1 0 0 0 0 ] 0.01;
+
+
+// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
similarity index 92%
rename from tutorials/icoFoam/cavityGrade/system/controlDict
rename to tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
index 266d138f79283742bc98b4aad8bf7a5a8bbc52a4..db022260482c7b1a59dac94923ab692e057d5c55 100644
--- a/tutorials/icoFoam/cavityGrade/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0.7;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityGrade/system/fvSchemes b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
similarity index 90%
rename from tutorials/icoFoam/cavityGrade/system/fvSchemes
rename to tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
index 46492b3d9c0f52510ca8dd9ed814c6a7f334c448..80e325f22075fbf0a71559923253b3e923441645 100644
--- a/tutorials/icoFoam/cavityGrade/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityGrade/system/fvSolution b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
similarity index 72%
rename from tutorials/icoFoam/cavityGrade/system/fvSolution
rename to tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
index c78cc469b78763963829ffa68c90d847bd1c188c..46670343363af32a79fcf7bd788316556b9de7d7 100644
--- a/tutorials/icoFoam/cavityGrade/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -38,4 +42,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/cavityGrade/system/mapFieldsDict b/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
similarity index 85%
rename from tutorials/icoFoam/cavityGrade/system/mapFieldsDict
rename to tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
index 626289bcc0cfc0dc503c30f3090750b50c3c7a8a..a44b53188650987b0c7e97d1600d17a9d1af7fbc 100644
--- a/tutorials/icoFoam/cavityGrade/system/mapFieldsDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/mapFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mapFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-patchMap
-(
-);
+patchMap ( );
+
+cuttingPatches ( );
-cuttingPatches
-(
-);
// ************************************************************************* //
diff --git a/tutorials/icoFoam/elbow/0/U b/tutorials/incompressible/icoFoam/elbow/0/U
similarity index 100%
rename from tutorials/icoFoam/elbow/0/U
rename to tutorials/incompressible/icoFoam/elbow/0/U
diff --git a/tutorials/icoFoam/elbow/0/p b/tutorials/incompressible/icoFoam/elbow/0/p
similarity index 100%
rename from tutorials/icoFoam/elbow/0/p
rename to tutorials/incompressible/icoFoam/elbow/0/p
diff --git a/tutorials/icoFoam/elbow/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/icoFoam/elbow/constant/polyMesh/boundary
rename to tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
diff --git a/tutorials/icoFoam/elbow/constant/polyMesh/boundary.org b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
similarity index 100%
rename from tutorials/icoFoam/elbow/constant/polyMesh/boundary.org
rename to tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary.org
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..673c8479a2698a13c3d93e012e41261b2d5f401a
--- /dev/null
+++ b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu nu [ 0 2 -1 0 0 0 0 ] 0.01;
+
+
+// ************************************************************************* //
diff --git a/tutorials/icoFoam/elbow/elbow.msh b/tutorials/incompressible/icoFoam/elbow/elbow.msh
similarity index 100%
rename from tutorials/icoFoam/elbow/elbow.msh
rename to tutorials/incompressible/icoFoam/elbow/elbow.msh
diff --git a/tutorials/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict
similarity index 92%
rename from tutorials/icoFoam/elbow/system/controlDict
rename to tutorials/incompressible/icoFoam/elbow/system/controlDict
index 07c621ef1862c02b3d3cfac734380d3ae93ff516..da4697ad557df739f6428062a1d9dd1b225bcfca 100644
--- a/tutorials/icoFoam/elbow/system/controlDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/elbow/system/foamDataToFluentDict b/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
similarity index 91%
rename from tutorials/icoFoam/elbow/system/foamDataToFluentDict
rename to tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
index 2500971b1126fdec07a557116523a1aa4d8e8804..8c862c612a013bbef14534980cde91b85b8a160a 100644
--- a/tutorials/icoFoam/elbow/system/foamDataToFluentDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/foamDataToFluentDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object foamDataToFluentDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,4 +29,5 @@ epsilon 6;
gamma 150;
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/elbow/system/fvSchemes b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
similarity index 90%
rename from tutorials/icoFoam/elbow/system/fvSchemes
rename to tutorials/incompressible/icoFoam/elbow/system/fvSchemes
index 23fa68cc10adbe7698dbd5d02b843b7a4e93ca5f..f7edfb6abf9c305253f5535b99e1de3e4beda843 100644
--- a/tutorials/icoFoam/elbow/system/fvSchemes
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoFoam/elbow/system/fvSolution b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
similarity index 71%
rename from tutorials/icoFoam/elbow/system/fvSolution
rename to tutorials/incompressible/icoFoam/elbow/system/fvSolution
index 57e726c13ad6a48cafab6ede0ccf96183ffd661f..0351e82f81727998a4d3638a6ffd61ea7154e475 100644
--- a/tutorials/icoFoam/elbow/system/fvSolution
+++ b/tutorials/incompressible/icoFoam/elbow/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -36,4 +40,5 @@ PISO
nNonOrthogonalCorrectors 2;
}
+
// ************************************************************************* //
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/0/U b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
similarity index 100%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/0/U
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/U
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/0/p b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
similarity index 100%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/0/p
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/0/p
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/blockMeshDict
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
similarity index 62%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
index a177fd7947a7102d14a9535483a0b377eed7e7fb..3be0d60ae2c74ea48b7fec88e3ef640480ea090a 100644
--- a/tutorials/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,28 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
transportModel CrossPowerLaw;
-nu nu [0 2 -1 0 0 0 0] 1;
+nu nu [ 0 2 -1 0 0 0 0 ] 1;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 0.01;
- nuInf nuInf [0 2 -1 0 0 0 0] 10;
- m m [0 0 1 0 0 0 0] 0.4;
- n n [0 0 0 0 0 0 0] 3;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.01;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 10;
+ m m [ 0 0 1 0 0 0 0 ] 0.4;
+ n n [ 0 0 0 0 0 0 0 ] 3;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
similarity index 92%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
index 4d404e35f6b94583d0b7734d136f1ada114f48b4..55886792bdd81fde1f3c0ac83fcb45958c285498 100644
--- a/tutorials/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
similarity index 90%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
index 1decc09a6e6be51099c445871419a12b0203333d..67dc9336eefd5952b64c5dc84667a7bf89bcc418 100644
--- a/tutorials/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
similarity index 71%
rename from tutorials/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
rename to tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
index 9ee7a559e4d3d64324fafc11b5a12ab701f93dff..5eb4c1f30ec856b675f6e991fbd23db996a19d0d 100644
--- a/tutorials/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -36,4 +40,5 @@ PISO
nNonOrthogonalCorrectors 2;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoDyMFoam/movingCone/0/U b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
similarity index 100%
rename from tutorials/icoDyMFoam/movingCone/0/U
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/0/U
diff --git a/tutorials/icoDyMFoam/movingCone/0/cellMotionUx b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/cellMotionUx
similarity index 100%
rename from tutorials/icoDyMFoam/movingCone/0/cellMotionUx
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/0/cellMotionUx
diff --git a/tutorials/icoDyMFoam/movingCone/0/p b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
similarity index 100%
rename from tutorials/icoDyMFoam/movingCone/0/p
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
diff --git a/tutorials/icoDyMFoam/movingCone/0/pointMotionUx b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
similarity index 100%
rename from tutorials/icoDyMFoam/movingCone/0/pointMotionUx
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/0/pointMotionUx
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..14c08af36e26848295e53091d753d8189bb967ae
--- /dev/null
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh dynamicMotionSolverFvMesh;
+
+motionSolverLibs ( "libfvMotionSolvers.so" );
+
+solver velocityComponentLaplacian x;
+
+diffusivity directional ( 1 200 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/icoDyMFoam/movingCone/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/icoDyMFoam/movingCone/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/blockMeshDict
diff --git a/tutorials/icoDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary
similarity index 90%
rename from tutorials/icoDyMFoam/movingCone/constant/polyMesh/boundary
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary
index f272243696f77ea97ab257b511f8b47b629f5a39..bf656b10e3727c479de4ca77f5329ad458abc5f8 100644
--- a/tutorials/icoDyMFoam/movingCone/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format binary;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/pimpleFoam/t-junction/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
similarity index 62%
rename from tutorials/pimpleFoam/t-junction/constant/transportProperties
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..aad34b40df2a22407d363cccfba0f552c4bf276f 100644
--- a/tutorials/pimpleFoam/t-junction/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,28 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
transportModel Newtonian;
-nu nu [0 2 -1 0 0 0 0] 1e-05;
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties
similarity index 89%
rename from tutorials/interFoam/laminar/damBreak/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties
index 0efb448180f1ba26ac35d2dda07035e9ec6873f6..886d34bdef135c39216d342240a96bf0530bdd62 100644
--- a/tutorials/interFoam/laminar/damBreak/constant/turbulenceProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType laminar;
+
// ************************************************************************* //
diff --git a/tutorials/icoDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
similarity index 90%
rename from tutorials/icoDyMFoam/movingCone/system/controlDict
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
index f6035d845c358f98088c6077d36f147d3d40638d..3e9d4d55765bfbdd14f80fb7d8c20637e3ef95a7 100644
--- a/tutorials/icoDyMFoam/movingCone/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
@@ -2,19 +2,19 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -47,4 +47,5 @@ adjustTimeStep no;
maxCo 0.2;
+
// ************************************************************************* //
diff --git a/tutorials/icoDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
similarity index 82%
rename from tutorials/icoDyMFoam/movingCone/system/fvSchemes
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
index 4e8e6a520ca6aeaa32d66fa88d822bc5e6047716..c7c76eb965b2020fe51f9d6272970adfeefc5083 100644
--- a/tutorials/icoDyMFoam/movingCone/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
@@ -2,21 +2,22 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -29,6 +30,7 @@ divSchemes
{
default none;
div(phi,U) Gauss linear;
+ div((nuEff*dev(grad(U).T()))) Gauss linear;
}
laplacianSchemes
@@ -37,8 +39,8 @@ laplacianSchemes
laplacian(nu,U) Gauss linear corrected;
laplacian(rAU,pcorr) Gauss linear corrected;
laplacian(rAU,p) Gauss linear corrected;
-
laplacian(diffusivity,cellMotionU) Gauss linear uncorrected;
+ laplacian(nuEff,U) Gauss linear uncorrected;
}
interpolationSchemes
@@ -55,8 +57,9 @@ snGradSchemes
fluxRequired
{
default no;
- pcorr;
- p;
+ pcorr ;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
similarity index 52%
rename from tutorials/icoDyMFoam/movingCone/system/fvSolution
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index a348c8239f625400309190dfc71a39600a5e85a6..486f7ad5fb2836444d68502c50b37e8c4e55b62a 100644
--- a/tutorials/icoDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -2,54 +2,60 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- pcorr PCG
+ pcorr
{
- preconditioner DIC;
- tolerance 1e-02;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 0.01;
+ relTol 0;
+ }
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.05;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.05;
+ }
- pFinal PCG
+ pFinal
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
- U PBiCG
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
- cellMotionUx PCG
+ cellMotionUx
{
- preconditioner DIC;
- tolerance 1e-08;
- relTol 0;
- };
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-08;
+ relTol 0;
+ }
}
PISO
@@ -58,4 +64,5 @@ PISO
nNonOrthogonalCorrectors 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/icoDyMFoam/movingCone/system/tetFemSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/tetFemSolution
similarity index 87%
rename from tutorials/icoDyMFoam/movingCone/system/tetFemSolution
rename to tutorials/incompressible/pimpleDyMFoam/movingCone/system/tetFemSolution
index 7d2e64868b131a329d8a64af5a60a55eaa2240f0..a953cbea78c1cc94d078478229b646f681964265 100644
--- a/tutorials/icoDyMFoam/movingCone/system/tetFemSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/tetFemSolution
@@ -2,14 +2,15 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object tetFemSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,4 +20,5 @@ solvers
motionU ICCG 1e-06 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/t-junction/0/U
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/0/U
rename to tutorials/incompressible/pimpleFoam/t-junction/0/U
diff --git a/tutorials/pimpleFoam/t-junction/0/epsilon b/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/0/epsilon
rename to tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
diff --git a/tutorials/pimpleFoam/t-junction/0/k b/tutorials/incompressible/pimpleFoam/t-junction/0/k
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/0/k
rename to tutorials/incompressible/pimpleFoam/t-junction/0/k
diff --git a/tutorials/pimpleFoam/t-junction/0/nuTilda b/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/0/nuTilda
rename to tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
diff --git a/tutorials/pimpleFoam/t-junction/0/p b/tutorials/incompressible/pimpleFoam/t-junction/0/p
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/0/p
rename to tutorials/incompressible/pimpleFoam/t-junction/0/p
diff --git a/tutorials/pimpleFoam/t-junction/README.txt b/tutorials/incompressible/pimpleFoam/t-junction/README.txt
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/README.txt
rename to tutorials/incompressible/pimpleFoam/t-junction/README.txt
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties b/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..559c506d1113db8266b365093851601b52fde4e5
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties
@@ -0,0 +1,201 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+realizableKECoeffs
+{
+ Cmu 0.09;
+ A0 4;
+ C2 1.9;
+ alphak 1;
+ alphaEps 0.833333;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
diff --git a/tutorials/pimpleFoam/t-junction/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/pimpleFoam/t-junction/constant/polyMesh/boundary
rename to tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
index 4ea7f95a3e9c35ac60edb879d026c17c690eddce..a6e8b86643cf972ce282b9086d884c39843d9c88 100644
--- a/tutorials/pimpleFoam/t-junction/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/transportProperties b/tutorials/incompressible/pimpleFoam/t-junction/constant/transportProperties
similarity index 62%
rename from tutorials/MRFSimpleFoam/mixerVessel2D/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/t-junction/constant/transportProperties
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..aad34b40df2a22407d363cccfba0f552c4bf276f 100644
--- a/tutorials/MRFSimpleFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,28 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
transportModel Newtonian;
-nu nu [0 2 -1 0 0 0 0] 1e-05;
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..e312fcb839f09a63570876e37965f1e6b39028a0
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 1;
+
+deltaT 0.001;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.1;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 5;
+
+functions ( probes { type probes ; functionObjectLibs ( "libsampling.so" ) ; name probes ; probeLocations ( ( 1e-06 0 0.01 ) ( 0.21 -0.20999 0.01 ) ( 0.21 0.20999 0.01 ) ( 0.21 0 0.01 ) ) ; fields ( p U ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/system/fvSchemes b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
similarity index 92%
rename from tutorials/pisoFoam/ras/cavity/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
index bbe7fab0d2e1553b63c1695352cb9fe538ecd597..2535b6a258dd5c5cc2a9bcecdf59955e0665ea59 100644
--- a/tutorials/pisoFoam/ras/cavity/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -63,7 +64,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
similarity index 50%
rename from tutorials/pimpleFoam/t-junction/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
index 995edf623c2b4a9ff14788cf5b6202105c66d15b..5b237f6dfe4683541673f4b8a8e3f5fd5f9a0dc0 100644
--- a/tutorials/pimpleFoam/t-junction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,61 +10,68 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p GAMG
+ p
{
- tolerance 1e-6;
- relTol 0.01;
-
- smoother GaussSeidel;
-
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0.01;
+ smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
- pFinal GAMG
- {
- tolerance 1e-6;
- relTol 0.0;
-
- smoother GaussSeidel;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+ pFinal
+ {
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0;
+ smoother GaussSeidel;
cacheAgglomeration true;
nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
- U PBiCG
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- UFinal PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ UFinal
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PIMPLE
@@ -78,10 +85,9 @@ PIMPLE
relaxationFactors
{
- //p 0.3;
- U 1.0;
- k 1.0;
- epsilon 1.0;
+ U 1;
+ k 1;
+ epsilon 1;
}
diff --git a/tutorials/pisoFoam/Allrun b/tutorials/incompressible/pisoFoam/Allrun
similarity index 100%
rename from tutorials/pisoFoam/Allrun
rename to tutorials/incompressible/pisoFoam/Allrun
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/B b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/B
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/B
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/B
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/U b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/U
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/U
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/0/k b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
similarity index 100%
rename from tutorials/rhoPisoFoam/les/pitzDaily/0/k
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/k
diff --git a/tutorials/pisoFoam/les/pitzDaily/0/nuSgs b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/0/nuSgs
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuSgs
diff --git a/tutorials/pisoFoam/les/pitzDaily/0/nuTilda b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDaily/0/nuTilda
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/nuTilda
diff --git a/tutorials/potentialFoam/pitzDaily/0.org/p b/tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/0.org/p
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/0/p
diff --git a/tutorials/channelFoam/channel395/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
similarity index 61%
rename from tutorials/channelFoam/channel395/constant/LESProperties
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
index da3b2d07d56ad9c2569a517238d4e20482b1cbd9..0d948b7ff1b7b9c634f644678edfa869a4261515 100644
--- a/tutorials/channelFoam/channel395/constant/LESProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,17 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel oneEqEddy;
+turbulence on;
-turbulence on;
+LESModel oneEqEddy;
-printCoeffs on;
+delta cubeRootVol;
-delta vanDriest;
+printCoeffs on;
laminarCoeffs
{
@@ -28,90 +29,90 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -126,6 +127,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -133,9 +135,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -145,6 +149,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -152,10 +157,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -165,14 +172,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/scalarTransportFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
diff --git a/tutorials/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 313dcceba1abd7b93d57320c4c674f1734692506..903f3ef57e0b5ca8acaec1fa58531aaa1e354515 100644
--- a/tutorials/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/pisoFoam/les/pitzDaily/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
similarity index 62%
rename from tutorials/pisoFoam/les/pitzDaily/constant/transportProperties
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..aad34b40df2a22407d363cccfba0f552c4bf276f 100644
--- a/tutorials/pisoFoam/les/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,28 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
transportModel Newtonian;
-nu nu [0 2 -1 0 0 0 0] 1e-05;
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
similarity index 89%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/turbulenceProperties
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
index dcadcf17cd97481597090cf391913d3fe6432687..2e42797ca9558f9a6c4c3b2195313dda5504598a 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/turbulenceProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
simulationType LESModel;
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
similarity index 61%
rename from tutorials/pisoFoam/les/pitzDaily/system/controlDict
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 627a1b2516eae4c0246f8660912a9018f5201ef7..ba9c0f1c408ade3c92b46328d6431f481f78ed8f 100644
--- a/tutorials/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -47,30 +47,22 @@ functions
(
probes1
{
- // Type of functionObject
type probes;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
+ functionObjectLibs ( "libsampling.so" );
enabled true;
-
outputControl timeStep;
outputInterval 1;
-
- // Locations to be probed. runTime modifiable!
probeLocations
(
- (0.0254 0.0253 0.0)
- (0.0508 0.0253 0.0)
- (0.0762 0.0253 0.0)
- (0.1016 0.0253 0.0)
- (0.1270 0.0253 0.0)
- (0.1524 0.0253 0.0)
- (0.1778 0.0253 0.0)
+ ( 0.0254 0.0253 0 )
+ ( 0.0508 0.0253 0 )
+ ( 0.0762 0.0253 0 )
+ ( 0.1016 0.0253 0 )
+ ( 0.127 0.0253 0 )
+ ( 0.1524 0.0253 0 )
+ ( 0.1778 0.0253 0 )
);
- // Fields to be probed. runTime modifiable!
fields
(
p
@@ -79,33 +71,28 @@ functions
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
-
outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/channelFoam/channel395/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
similarity index 92%
rename from tutorials/channelFoam/channel395/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
index d747166f05d817fae80f57f79119ee66e4505196..5f9d2562590179306bc73fe47adcd1ce49564a86 100644
--- a/tutorials/channelFoam/channel395/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default backward;
+ default backward;
}
gradSchemes
@@ -32,8 +33,8 @@ divSchemes
div(phi,U) Gauss linear;
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
- div(B) Gauss linear;
div(phi,nuTilda) Gauss limitedLinear 1;
+ div(B) Gauss linear;
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -61,7 +62,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..486c70a9d67f191446dcdec0d87a2df182739f88
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSolution
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.05;
+ }
+
+ pFinal
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/0/B b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/B
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/0/B
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/B
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/0/U b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/U
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/0/U
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/U
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/0/k b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/k
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/0/k
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/k
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuSgs
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/nuTilda
diff --git a/tutorials/potentialFoam/pitzDaily/0/p b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/p
similarity index 100%
rename from tutorials/potentialFoam/pitzDaily/0/p
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/0/p
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/Allrun
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
diff --git a/tutorials/pisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
similarity index 61%
rename from tutorials/pisoFoam/les/pitzDaily/constant/LESProperties
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
index 336220cfbb49c0b792f2e7ec104a60ca04ad55ad..0d948b7ff1b7b9c634f644678edfa869a4261515 100644
--- a/tutorials/pisoFoam/les/pitzDaily/constant/LESProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,17 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-turbulence on;
+turbulence on;
-LESModel oneEqEddy;
+LESModel oneEqEddy;
-delta cubeRootVol;
+delta cubeRootVol;
-printCoeffs on;
+printCoeffs on;
laminarCoeffs
{
@@ -28,90 +29,90 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -126,6 +127,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -133,9 +135,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -145,6 +149,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -152,10 +157,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -165,14 +172,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/blockMeshDict
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
index 8f75d94824cb714851d10e610a52c55725f09605..0b56bb9f5e8be426cd22b962d4b254728ac55ab7 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aad34b40df2a22407d363cccfba0f552c4bf276f
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/transportProperties
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..2e42797ca9558f9a6c4c3b2195313dda5504598a
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
similarity index 82%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
index 7ae2253dbf5c90cf4469241fe931c7683a181268..9490b8433231b6579abeff8ee805e39857951c3b 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/changeDictionaryDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,23 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object changePatchTypeDict;
+ location "system";
+ object changeDictionaryDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
{
- // boundary handled explicitly since not dictionary.
boundary
{
inlet
{
type directMappedPatch;
- offset (0.0495 0 0);
+ offset ( 0.0495 0 0 );
sampleMode nearestCell;
samplePatch none;
}
}
}
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
similarity index 61%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index 627a1b2516eae4c0246f8660912a9018f5201ef7..2f1e1a9074d1bb120bb6e322598ac641b536ce64 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -47,30 +47,21 @@ functions
(
probes1
{
- // Type of functionObject
type probes;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
+ functionObjectLibs ( "libsampling.so" );
enabled true;
-
outputControl timeStep;
outputInterval 1;
-
- // Locations to be probed. runTime modifiable!
probeLocations
(
- (0.0254 0.0253 0.0)
- (0.0508 0.0253 0.0)
- (0.0762 0.0253 0.0)
- (0.1016 0.0253 0.0)
- (0.1270 0.0253 0.0)
- (0.1524 0.0253 0.0)
- (0.1778 0.0253 0.0)
+ ( 0.0254 0.0253 0 )
+ ( 0.0508 0.0253 0 )
+ ( 0.0762 0.0253 0 )
+ ( 0.1016 0.0253 0 )
+ ( 0.127 0.0253 0 )
+ ( 0.1524 0.0253 0 )
+ ( 0.1778 0.0253 0 )
);
-
- // Fields to be probed. runTime modifiable!
fields
(
p
@@ -79,33 +70,28 @@ functions
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
enabled true;
-
outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean on;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
similarity index 79%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
index 6f0a26b2e80ce669baaa95cdfdf817a87795e081..d05a60d7eae9fb56aa574c27d1300ff851f9f9fe 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,37 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 8;
-//method hierarchical;
method metis;
simpleCoeffs
{
- n (2 1 1);
+ n ( 2 1 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (2 1 1);
+ n ( 2 1 1 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- //processorWeights
- //(
- // 1
- // 1
- // 1
- // 1
- //);
}
manualCoeffs
@@ -50,8 +43,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
similarity index 87%
rename from tutorials/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
index 759d8e2a91dc650930610632d467ea0e67700fb4..4bbb97c52c3a935c6db23724a6e4d7ae4e035ced 100644
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default backward;
+ default backward;
}
gradSchemes
@@ -29,13 +30,10 @@ gradSchemes
divSchemes
{
default none;
- // rate(0.2) of adding gradient, allow unboundedness(0.)
- div(phi,U) Gauss filteredLinear2V 0.2 0.0;
- //div(phi,U) Gauss linear;
+ div(phi,U) Gauss filteredLinear2V 0.2 0;
div(phi,k) Gauss limitedLinear 1;
div(phi,B) Gauss limitedLinear 1;
div(phi,nuTilda) Gauss limitedLinear 1;
-
div(B) Gauss linear;
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -64,7 +62,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..486c70a9d67f191446dcdec0d87a2df182739f88
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.05;
+ }
+
+ pFinal
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/R b/tutorials/incompressible/pisoFoam/ras/cavity/0/R
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/0/R
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/R
diff --git a/tutorials/pisoFoam/ras/cavity/0/U b/tutorials/incompressible/pisoFoam/ras/cavity/0/U
similarity index 100%
rename from tutorials/pisoFoam/ras/cavity/0/U
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/U
diff --git a/tutorials/pisoFoam/ras/cavity/0/epsilon b/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
similarity index 94%
rename from tutorials/pisoFoam/ras/cavity/0/epsilon
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
index 6b009c939ad092fdef7f54b8ecb9b755fb70ac3c..1dcb29b690a7e2f3b7c67fc4be7cdea05a5accb9 100644
--- a/tutorials/pisoFoam/ras/cavity/0/epsilon
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/k b/tutorials/incompressible/pisoFoam/ras/cavity/0/k
similarity index 75%
rename from tutorials/rhoPisoFoam/ras/cavity/0/k
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/k
index 7cbb3473bab716c2f2ab079295a740c1302a54f4..021fce6763409ae2d5f416c34311ac0d7ea4b165 100644
--- a/tutorials/rhoPisoFoam/ras/cavity/0/k
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/k
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,20 +21,21 @@ internalField uniform 0.00325;
boundaryField
{
- movingWall
+ movingWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.00325;
}
-
- fixedWalls
+ fixedWalls
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.00325;
}
-
- frontAndBack
+ frontAndBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/0/nuTilda b/tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
similarity index 100%
rename from tutorials/pisoFoam/ras/cavity/0/nuTilda
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/nuTilda
diff --git a/tutorials/pisoFoam/ras/cavity/0/nut b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
similarity index 94%
rename from tutorials/pisoFoam/ras/cavity/0/nut
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/nut
index dc341e7a1c76b1bafc28d58d8ca450c0b77d0e14..7322181e3b1983806407b41f962bacc86ee9d79b 100644
--- a/tutorials/pisoFoam/ras/cavity/0/nut
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/0/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/pisoFoam/ras/cavity/0/p b/tutorials/incompressible/pisoFoam/ras/cavity/0/p
similarity index 100%
rename from tutorials/pisoFoam/ras/cavity/0/p
rename to tutorials/incompressible/pisoFoam/ras/cavity/0/p
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..559c506d1113db8266b365093851601b52fde4e5
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/RASProperties
@@ -0,0 +1,201 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+realizableKECoeffs
+{
+ Cmu 0.09;
+ A0 4;
+ C2 1.9;
+ alphak 1;
+ alphaEps 0.833333;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/rhoPisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/blockMeshDict
diff --git a/tutorials/pisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/pisoFoam/ras/cavity/constant/polyMesh/boundary
rename to tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
index 61feadd97403fbf58a57c925fc262f3de46ec95a..d68c9a703602f71086c9279a70c87fab73e11c73 100644
--- a/tutorials/pisoFoam/ras/cavity/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aad34b40df2a22407d363cccfba0f552c4bf276f
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b70f6702e4ef7644c20687bce6536c6690720da9
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
similarity index 92%
rename from tutorials/pisoFoam/ras/cavity/system/controlDict
rename to tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
index 54904fd3daadf40e61fb4fb207420ff90004ece2..c7ddb43b7daea9385c7f11e67a9b8156f9367cae 100644
--- a/tutorials/pisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/pimpleFoam/t-junction/system/fvSchemes b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
similarity index 92%
rename from tutorials/pimpleFoam/t-junction/system/fvSchemes
rename to tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
index bbe7fab0d2e1553b63c1695352cb9fe538ecd597..2535b6a258dd5c5cc2a9bcecdf59955e0665ea59 100644
--- a/tutorials/pimpleFoam/t-junction/system/fvSchemes
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -63,7 +64,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..d64a84ecfe9f5563ad179088e0e5b337d3a51e6e
--- /dev/null
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/fvSolution
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.1;
+ }
+
+ pFinal
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/0/U b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
similarity index 95%
rename from tutorials/simpleFoam/airFoil2D/0/U
rename to tutorials/incompressible/simpleFoam/airFoil2D/0/U
index b047ad78c70a1b436e5e4245976d97552c02741b..df71a3d3b3564d77197d671ca7772246a9d6a278 100644
--- a/tutorials/simpleFoam/airFoil2D/0/U
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/0/nuTilda b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
similarity index 94%
rename from tutorials/simpleFoam/airFoil2D/0/nuTilda
rename to tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
index fae6a50d142da208e3a7eb1d7101d4c72a8fc535..883544254c4e2e7be300958270afa7c3059292c4 100644
--- a/tutorials/simpleFoam/airFoil2D/0/nuTilda
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nuTilda
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/0/nut b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
similarity index 94%
rename from tutorials/simpleFoam/airFoil2D/0/nut
rename to tutorials/incompressible/simpleFoam/airFoil2D/0/nut
index f170fb808fab454b6e4515658e6ec7c28ecebd1d..739392ea8e3d6e5262e353aadc18677674b338f8 100644
--- a/tutorials/simpleFoam/airFoil2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/nut
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/0/p b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
similarity index 94%
rename from tutorials/simpleFoam/airFoil2D/0/p
rename to tutorials/incompressible/simpleFoam/airFoil2D/0/p
index 9cf68305ea01ad895a091b2727e85ed6ac497ab5..3309bb65cb47d99834beea7c05043b20b08c52be 100644
--- a/tutorials/simpleFoam/airFoil2D/0/p
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/settlingFoam/tank3D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
similarity index 100%
rename from tutorials/settlingFoam/tank3D/Allclean
rename to tutorials/incompressible/simpleFoam/airFoil2D/Allclean
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ec7ffbd28bddc32280b11e167efc7b00f466ce47
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/RASProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel SpalartAllmaras;
+
+turbulence on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/simpleFoam/airFoil2D/constant/polyMesh/boundary
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
index d9946a2c683518c83dbff08288ba7dd50c88fda1..90a755393f8483c1069ff5a1a8bd3bb00a0f8016 100644
--- a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/cells b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
similarity index 99%
rename from tutorials/simpleFoam/airFoil2D/constant/polyMesh/cells
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
index 85222fba6bc2a6863f2dbccfd4e665f6521d4a69..25b2e32bff13877b5a08bd26f4cd210f11532b2d 100644
--- a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/cells
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/cells
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/faces b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
similarity index 99%
rename from tutorials/simpleFoam/airFoil2D/constant/polyMesh/faces
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
index 4cfd2f9580b69164d05906be060273e1e715e72d..d2b3b06560a3fe92d52881e8c15457eb176b893e 100644
--- a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/faces
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/faces
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/neighbour b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
similarity index 99%
rename from tutorials/simpleFoam/airFoil2D/constant/polyMesh/neighbour
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
index eca8a993ad73b7c6c61f1357e7832b0f0d490d54..f5c77a51ee10d3c3adac1b96f149bc224ce6c61a 100644
--- a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/neighbour
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/neighbour
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/owner b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
similarity index 99%
rename from tutorials/simpleFoam/airFoil2D/constant/polyMesh/owner
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
index 0665c5a059a7ee9d38f6f8ed5477e9134d308972..8f484aa69a79a700f321a06d611b1606cc6704d2 100644
--- a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/owner
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/owner
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/points b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
similarity index 99%
rename from tutorials/simpleFoam/airFoil2D/constant/polyMesh/points
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
index d09b631e686d456052dd66d00e7e2669a3d2338f..6cdbde6f8237e625a0ca0e0f54e3b6af5d31284b 100644
--- a/tutorials/simpleFoam/airFoil2D/constant/polyMesh/points
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/polyMesh/points
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/channelFoam/channel395/constant/transportProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
similarity index 60%
rename from tutorials/channelFoam/channel395/constant/transportProperties
rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
index c9bc77911ec08f3549db77cc7bedeb92f461d41a..2d0ecd1a70c43546c5acc36bb6ecd0014c69572e 100644
--- a/tutorials/channelFoam/channel395/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,32 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Ubar Ubar [0 1 -1 0 0 0 0] (0.1335 0 0);
-
transportModel Newtonian;
-nu nu [0 2 -1 0 0 0 0] 2e-05;
+rho rho [ 1 -3 0 0 0 0 0 ] 1;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..871d8e64aa5f27d5e8ae105b7f9bffa65a35652d
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+turbulenceModel SpalartAllmaras;
+
+turbulence on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.0845;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.42;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.68;
+ alphak alphaK [ 0 0 0 0 0 0 0 ] 1.39;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 1.39;
+ eta0 eta0 [ 0 0 0 0 0 0 0 ] 4.38;
+ beta beta [ 0 0 0 0 0 0 0 ] 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphak alphak [ 0 0 0 0 0 0 0 ] 1;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76932;
+ A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
+ A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
+ Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
+ Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
+ Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
+ alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphak alphak [ 0 0 0 0 0 0 0 ] 1;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+ A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
+ A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
+ Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
+ Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
+ Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
+ alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphaZeta alphaZeta [ 0 0 0 0 0 0 0 ] 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphak alphak [ 0 0 0 0 0 0 0 ] 1;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+ A1 A1 [ 0 0 0 0 0 0 0 ] 1.25;
+ A2 A2 [ 0 0 0 0 0 0 0 ] 1000;
+ Ctau1 Ctau1 [ 0 0 0 0 0 0 0 ] -4;
+ Ctau2 Ctau2 [ 0 0 0 0 0 0 0 ] 13;
+ Ctau3 Ctau3 [ 0 0 0 0 0 0 0 ] -2;
+ alphaKsi alphaKsi [ 0 0 0 0 0 0 0 ] 0.9;
+ Am Am [ 0 0 0 0 0 0 0 ] 0.016;
+ Aepsilon Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
+ Amu Amu [ 0 0 0 0 0 0 0 ] 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ alphak alphak [ 0 0 0 0 0 0 0 ] 1;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+ Am Am [ 0 0 0 0 0 0 0 ] 0.016;
+ Aepsilon Aepsilon [ 0 0 0 0 0 0 0 ] 0.263;
+ Amu Amu [ 0 0 0 0 0 0 0 ] 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ Clrr1 Clrr1 [ 0 0 0 0 0 0 0 ] 1.8;
+ Clrr2 Clrr2 [ 0 0 0 0 0 0 0 ] 0.6;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ Cs Cs [ 0 0 0 0 0 0 0 ] 0.25;
+ Ceps Ceps [ 0 0 0 0 0 0 0 ] 0.15;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu Cmu [ 0 0 0 0 0 0 0 ] 0.09;
+ Clg1 Clg1 [ 0 0 0 0 0 0 0 ] 1.8;
+ Clg2 Clg2 [ 0 0 0 0 0 0 0 ] 0.6;
+ C1 C1 [ 0 0 0 0 0 0 0 ] 1.44;
+ C2 C2 [ 0 0 0 0 0 0 0 ] 1.92;
+ C1Ref C1Ref [ 0 0 0 0 0 0 0 ] 0.5;
+ C2Ref C2Ref [ 0 0 0 0 0 0 0 ] 0.3;
+ Cs Cs [ 0 0 0 0 0 0 0 ] 0.25;
+ Ceps Ceps [ 0 0 0 0 0 0 0 ] 0.15;
+ alphaEps alphaEps [ 0 0 0 0 0 0 0 ] 0.76923;
+ alphaR alphaR [ 0 0 0 0 0 0 0 ] 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut alphaNut [ 0 0 0 0 0 0 0 ] 1.5;
+ Cb1 Cb1 [ 0 0 0 0 0 0 0 ] 0.1355;
+ Cb2 Cb2 [ 0 0 0 0 0 0 0 ] 0.622;
+ Cw2 Cw2 [ 0 0 0 0 0 0 0 ] 0.3;
+ Cw3 Cw3 [ 0 0 0 0 0 0 0 ] 2;
+ Cv1 Cv1 [ 0 0 0 0 0 0 0 ] 7.1;
+ Cv2 Cv2 [ 0 0 0 0 0 0 0 ] 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa kappa [ 0 0 0 0 0 0 0 ] 0.4187;
+ E E [ 0 0 0 0 0 0 0 ] 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..0b19a7dffe63dc2309cf919e422252246088bafa
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 500;
+
+deltaT 1;
+
+writeControl timeStep;
+
+writeInterval 50;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/system/fvSchemes b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
similarity index 84%
rename from tutorials/simpleFoam/airFoil2D/system/fvSchemes
rename to tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
index 6b972e1acd5a209b76e9d26f0f1fd76cbfdf193c..db79ef84a1a8e4367e4859d63bf5711b8d0d54f5 100644
--- a/tutorials/simpleFoam/airFoil2D/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -40,8 +41,7 @@ laplacianSchemes
laplacian(nuEff,U) Gauss linear corrected;
laplacian((1|A(U)),p) Gauss linear corrected;
laplacian(DnuTildaEff,nuTilda) Gauss linear corrected;
-
- laplacian(1,p) Gauss linear corrected;
+ laplacian(1,p) Gauss linear corrected;
}
interpolationSchemes
@@ -58,7 +58,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
similarity index 53%
rename from tutorials/simpleFoam/airFoil2D/system/fvSolution
rename to tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
index 7da40edc0a82d80dcd1b3d79c4486163dafd5cbe..6f7dffd99bd59c324d9f1e673cce74169fc25975 100644
--- a/tutorials/simpleFoam/airFoil2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,50 +10,51 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p GAMG
+ p
{
- tolerance 1e-6;
- relTol 0.1;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
-
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0.1;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
cacheAgglomeration true;
-
nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
- U smoothSolver
+ U
{
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-8;
- relTol 0.1;
- };
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-08;
+ relTol 0.1;
+ }
- nuTilda smoothSolver
+ nuTilda
{
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-8;
- relTol 0.1;
- };
+ solver smoothSolver;
+ smoother GaussSeidel;
+ nSweeps 2;
+ tolerance 1e-08;
+ relTol 0.1;
+ }
}
SIMPLE
{
nNonOrthogonalCorrectors 0;
- pRefCell 0;
- pRefValue 0;
+ pRefCell 0;
+ pRefValue 0;
}
relaxationFactors
@@ -63,4 +64,5 @@ relaxationFactors
nuTilda 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/0/R b/tutorials/incompressible/simpleFoam/pitzDaily/0/R
similarity index 100%
rename from tutorials/simpleFoam/pitzDaily/0/R
rename to tutorials/incompressible/simpleFoam/pitzDaily/0/R
diff --git a/tutorials/simpleFoam/pitzDaily/0/U b/tutorials/incompressible/simpleFoam/pitzDaily/0/U
similarity index 100%
rename from tutorials/simpleFoam/pitzDaily/0/U
rename to tutorials/incompressible/simpleFoam/pitzDaily/0/U
diff --git a/tutorials/simpleFoam/pitzDaily/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
similarity index 72%
rename from tutorials/simpleFoam/pitzDaily/0/epsilon
rename to tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
index 1241e472d9f8c9545f0484231f647bcdf251ac31..d82c45e6290be093bee3d9a3d6af3f84072a543d 100644
--- a/tutorials/simpleFoam/pitzDaily/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/epsilon
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,31 +21,30 @@ internalField uniform 14.855;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 14.855;
}
-
- outlet
+ outlet
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 14.855;
}
-
- lowerWall
+ lowerWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 14.855;
}
-
- frontAndBack
+ frontAndBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/0/k b/tutorials/incompressible/simpleFoam/pitzDaily/0/k
similarity index 72%
rename from tutorials/simpleFoam/pitzDaily/0/k
rename to tutorials/incompressible/simpleFoam/pitzDaily/0/k
index 329176cef2e8e52f8935bdfa13250477f75d3af1..41e4f133aa778b329b7cbcf76cb979d1c57ff3bd 100644
--- a/tutorials/simpleFoam/pitzDaily/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,31 +21,30 @@ internalField uniform 0.375;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 0.375;
}
-
- outlet
+ outlet
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.375;
}
-
- lowerWall
+ lowerWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.375;
}
-
- frontAndBack
+ frontAndBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
similarity index 100%
rename from tutorials/simpleFoam/pitzDaily/0/nuTilda
rename to tutorials/incompressible/simpleFoam/pitzDaily/0/nuTilda
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/0/nut b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..7ac85d8a18b666deeeb82444e2e864de2f100424
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/0/nut
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ upperWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ lowerWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/0/p b/tutorials/incompressible/simpleFoam/pitzDaily/0/p
similarity index 100%
rename from tutorials/simpleFoam/pitzDaily/0/p
rename to tutorials/incompressible/simpleFoam/pitzDaily/0/p
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..559c506d1113db8266b365093851601b52fde4e5
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/RASProperties
@@ -0,0 +1,201 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+realizableKECoeffs
+{
+ Cmu 0.09;
+ A0 4;
+ C2 1.9;
+ alphak 1;
+ alphaEps 0.833333;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/blockMeshDict
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aad34b40df2a22407d363cccfba0f552c4bf276f
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
similarity index 92%
rename from tutorials/simpleFoam/pitzDailyExptInlet/system/controlDict
rename to tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 77e3a65b502c713669b69feb25d664894139c35f..29292679f23bcb180a3eb138052ce6a8ae0661f7 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
similarity index 92%
rename from tutorials/simpleFoam/pitzDaily/system/fvSchemes
rename to tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
index 49767ffb28201561b24dc72ef7c7a0d600cd306a..0477c57b510377b1dadd485d418aad07f85cca1f 100644
--- a/tutorials/simpleFoam/pitzDaily/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -63,7 +64,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
similarity index 53%
rename from tutorials/simpleFoam/pitzDailyExptInlet/system/fvSolution
rename to tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index 8a32ba1d6c29306485b4a9da6b594cf0c29db770..a8d89c42281647be46dba2f59b00096ff3eeb5e6 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,48 +10,60 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.01;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.01;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- R PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ R
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- nuTilda PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ nuTilda
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
}
SIMPLE
@@ -69,4 +81,5 @@ relaxationFactors
nuTilda 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/0/R b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/0/R
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/R
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/0/U
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/U
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
similarity index 58%
rename from tutorials/simpleFoam/pitzDailyExptInlet/0/epsilon
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
index 68d55b1cbdaf7da1fb83a89f25a84330dfe5e97b..2004b9a0252486e7b5f43be9e1001720511d1ac5 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/epsilon
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,31 +21,65 @@ internalField uniform 14.855;
boundaryField
{
- inlet
+ inlet
{
type timeVaryingMappedFixedValue;
- setAverage off;
+ setAverage 0;
+ value nonuniform List<scalar>
+30
+(
+9813.84
+8665.24
+1866.31
+755.118
+205.654
+76.6694
+28.4518
+16.0868
+15.9867
+11.0187
+7.95753
+5.26064
+3.44136
+2.55317
+2.27183
+2.33608
+2.9115
+3.59492
+3.0497
+2.716
+2.9325
+3.88456
+6.91821
+14.9754
+37.5461
+217.022
+2043.58
+4864.22
+6244
+6334.7
+)
+;
}
-
- outlet
+ outlet
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 14.855;
}
-
- lowerWall
+ lowerWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ value uniform 14.855;
}
-
- frontAndBack
+ frontAndBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
similarity index 56%
rename from tutorials/simpleFoam/pitzDailyExptInlet/0/k
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
index c8418e6e43e91f53cc33e755dfa83065aff8c065..d33d92f39f6147a530080449b798f3ed3c5ea120 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/0/k
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,31 +21,65 @@ internalField uniform 0.375;
boundaryField
{
- inlet
+ inlet
{
type timeVaryingMappedFixedValue;
- setAverage off;
+ setAverage 0;
+ value nonuniform List<scalar>
+30
+(
+2.95219
+2.54219
+0.725449
+0.486465
+0.353566
+0.240375
+0.172984
+0.147052
+0.146827
+0.135658
+0.12147
+0.0942189
+0.0833465
+0.0828453
+0.0955983
+0.0920838
+0.0967682
+0.0990811
+0.100866
+0.101556
+0.0967155
+0.0841739
+0.0904567
+0.130411
+0.194046
+0.219327
+0.975528
+2.22578
+3.12421
+2.28104
+)
+;
}
-
- outlet
+ outlet
{
type zeroGradient;
}
-
- upperWall
+ upperWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.375;
}
-
- lowerWall
+ lowerWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.375;
}
-
- frontAndBack
+ frontAndBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/0/nuTilda b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/0/nuTilda
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nuTilda
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..7ac85d8a18b666deeeb82444e2e864de2f100424
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/nut
@@ -0,0 +1,51 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ upperWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ lowerWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/0/p b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/0/p
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/0/p
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..559c506d1113db8266b365093851601b52fde4e5
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/RASProperties
@@ -0,0 +1,201 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+realizableKECoeffs
+{
+ Cmu 0.09;
+ A0 4;
+ C2 1.9;
+ alphak 1;
+ alphaEps 0.833333;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/U
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/epsilon
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/0/k
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/boundaryData/inlet/points
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/blockMeshDict
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aad34b40df2a22407d363cccfba0f552c4bf276f
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+transportModel Newtonian;
+
+nu nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+
+CrossPowerLawCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+BirdCarreauCoeffs
+{
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
similarity index 92%
rename from tutorials/simpleFoam/pitzDaily/system/controlDict
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 77e3a65b502c713669b69feb25d664894139c35f..29292679f23bcb180a3eb138052ce6a8ae0661f7 100644
--- a/tutorials/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/system/decomposeParDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
similarity index 84%
rename from tutorials/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
index 296e5226e1198e26acebdfa8fdfcc2dbefbbd70d..e6a13cc19051491fead1b45cf30ae2bc347a04d8 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,24 +18,23 @@ FoamFile
numberOfSubdomains 4;
method hierarchical;
-//method metis;
-//method parMetis;
simpleCoeffs
{
- n (2 1 1);
+ n ( 2 1 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
order xyz;
}
metisCoeffs
-{}
+{
+}
manualCoeffs
{
@@ -43,8 +43,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/system/fvSchemes b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
similarity index 92%
rename from tutorials/simpleFoam/pitzDailyExptInlet/system/fvSchemes
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
index 49767ffb28201561b24dc72ef7c7a0d600cd306a..0477c57b510377b1dadd485d418aad07f85cca1f 100644
--- a/tutorials/simpleFoam/pitzDailyExptInlet/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -63,7 +64,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
similarity index 53%
rename from tutorials/simpleFoam/pitzDaily/system/fvSolution
rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
index 8a32ba1d6c29306485b4a9da6b594cf0c29db770..a8d89c42281647be46dba2f59b00096ff3eeb5e6 100644
--- a/tutorials/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,48 +10,60 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.01;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.01;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- R PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ R
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- nuTilda PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ nuTilda
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
}
SIMPLE
@@ -69,4 +81,5 @@ relaxationFactors
nuTilda 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/0/Urel b/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
similarity index 100%
rename from tutorials/simpleSRFFoam/mixer/0/Urel
rename to tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
diff --git a/tutorials/simpleSRFFoam/mixer/0/epsilon b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
similarity index 84%
rename from tutorials/simpleSRFFoam/mixer/0/epsilon
rename to tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
index b2de5276310cb7914161c561001c1d902ec74a58..680983af0a0ed390102e4645be6637d58cadd982 100644
--- a/tutorials/simpleSRFFoam/mixer/0/epsilon
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
@@ -33,12 +33,16 @@ boundaryField
innerWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ U Urel;
+ value uniform 14.855;
}
outerWall
{
- type zeroGradient;
+ type epsilonWallFunction;
+ U Urel;
+ value uniform 14.855;
}
cyclic
diff --git a/tutorials/simpleSRFFoam/mixer/0/k b/tutorials/incompressible/simpleSRFFoam/mixer/0/k
similarity index 75%
rename from tutorials/simpleSRFFoam/mixer/0/k
rename to tutorials/incompressible/simpleSRFFoam/mixer/0/k
index 0b8345b26efe221193356ed67d8afbc933859af6..59c1b73fc341de0269e7d827e7bd10d725220416 100644
--- a/tutorials/simpleSRFFoam/mixer/0/k
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,26 +26,26 @@ boundaryField
type fixedValue;
value uniform 0.375;
}
-
outlet
{
type zeroGradient;
}
-
innerWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.375;
}
-
outerWall
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 0.375;
}
-
cyclic
{
type cyclic;
+ value uniform 0.375;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..3bc0c6bc016011212012aa19733d3783dd8c68a7
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
@@ -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 volScalarField;
+ location "0";
+ object nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ innerWall
+ {
+ type nutWallFunction;
+ U Urel;
+ value uniform 0;
+ }
+ outerWall
+ {
+ type nutWallFunction;
+ U Urel;
+ value uniform 0;
+ }
+ cyclic
+ {
+ type cyclic;
+ value uniform 0;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/0/omega b/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
similarity index 72%
rename from tutorials/simpleSRFFoam/mixer/0/omega
rename to tutorials/incompressible/simpleSRFFoam/mixer/0/omega
index c5c54bbe2d523fdbdfa1c687648166cdd6d46449..ac3556f3d243ac5a792a165830d5460fae4f4434 100644
--- a/tutorials/simpleSRFFoam/mixer/0/omega
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object omega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,26 +26,28 @@ boundaryField
type fixedValue;
value uniform 3.5;
}
-
outlet
{
type zeroGradient;
}
-
innerWall
{
- type zeroGradient;
+ type omegaWallFunction;
+ U Urel;
+ value uniform 3.5;
}
-
outerWall
{
- type zeroGradient;
+ type omegaWallFunction;
+ U Urel;
+ value uniform 3.5;
}
-
cyclic
{
type cyclic;
+ value uniform 3.5;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/0/p b/tutorials/incompressible/simpleSRFFoam/mixer/0/p
similarity index 100%
rename from tutorials/simpleSRFFoam/mixer/0/p
rename to tutorials/incompressible/simpleSRFFoam/mixer/0/p
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties b/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..f543226c9b0ae5af82f266274304fb8acf2f5ab6
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/RASProperties
@@ -0,0 +1,192 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kOmegaSST;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/constant/SRFProperties b/tutorials/incompressible/simpleSRFFoam/mixer/constant/SRFProperties
similarity index 82%
rename from tutorials/simpleSRFFoam/mixer/constant/SRFProperties
rename to tutorials/incompressible/simpleSRFFoam/mixer/constant/SRFProperties
index 97e480826337d414e2c900af8b78c0c949ca347d..e3281ee1e6bb4bcb88f9ec21091a2e8c7418c227 100644
--- a/tutorials/simpleSRFFoam/mixer/constant/SRFProperties
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/SRFProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,17 +10,19 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object SRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-SRFModel rpm;
+SRFModel rpm;
-axis (0 0 1);
+axis ( 0 0 1 );
rpmCoeffs
{
- rpm 5000.0;
+ rpm 5000;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/blockMeshDict
diff --git a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/transportProperties b/tutorials/incompressible/simpleSRFFoam/mixer/constant/transportProperties
similarity index 62%
rename from tutorials/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
rename to tutorials/incompressible/simpleSRFFoam/mixer/constant/transportProperties
index 2e7013649399a8e51afef28778c65d86a9b20198..50b8da0ba579db00f7a2c47fe50d1b0b9d5741d1 100644
--- a/tutorials/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-Ubar Ubar [0 1 -1 0 0 0 0] (10 0 0);
-
transportModel Newtonian;
-nu nu [0 2 -1 0 0 0 0] 1e-05;
+nu nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
CrossPowerLawCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
BirdCarreauCoeffs
{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 0;
+ n n [ 0 0 0 0 0 0 0 ] 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
similarity index 92%
rename from tutorials/simpleSRFFoam/mixer/system/controlDict
rename to tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
index b50c43e4d8e33d82cf15abb63810d2a99130f9b1..46e7cd00c334efd3d10a44f4e932cef57ccff22d 100644
--- a/tutorials/simpleSRFFoam/mixer/system/controlDict
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/system/fvSchemes b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
similarity index 90%
rename from tutorials/simpleSRFFoam/mixer/system/fvSchemes
rename to tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
index 636bf4ad6727a3f02c97a3848b3f23ff1dc4db6f..f2697595694d0407519f8badc4cbff3c4f661f9d 100644
--- a/tutorials/simpleSRFFoam/mixer/system/fvSchemes
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -32,7 +33,7 @@ divSchemes
div(phi,Urel) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
- div(phi,omega) Gauss upwind;
+ div(phi,omega) Gauss upwind;
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phi,nuTilda) Gauss upwind;
@@ -65,7 +66,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/system/fvSolution b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
similarity index 50%
rename from tutorials/simpleSRFFoam/mixer/system/fvSolution
rename to tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
index f16662b3e5152175f478cd786dfc5fb46abcaaa8..f2fd9ead3d3e5c80c2e54aa946c162cf942743a4 100644
--- a/tutorials/simpleSRFFoam/mixer/system/fvSolution
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,54 +10,68 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- p PCG
+ p
{
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.01;
- };
- Urel PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0.01;
+ }
+
+ Urel
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- k PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ k
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- epsilon PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ epsilon
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- omega PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ omega
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- R PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ R
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- nuTilda PBiCG
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
+
+ nuTilda
{
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0.1;
+ }
}
SIMPLE
@@ -76,4 +90,5 @@ relaxationFactors
nuTilda 0.7;
}
+
// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/files b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/files
similarity index 100%
rename from tutorials/simpleSRFFoam/simpleSRFFoam/Make/files
rename to tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/files
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/options b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..cc3cd5e731e99caa395cc3bd58b9f23b9bb0a210
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/Make/options
@@ -0,0 +1,12 @@
+EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
+
+EXE_LIBS = \
+ -lincompressibleRASModels \
+ -lincompressibleTransportModels \
+ -lfiniteVolume \
+ -lmeshTools
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/UEqn.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/UEqn.H
new file mode 100644
index 0000000000000000000000000000000000000000..72f3ea654393f94a1a1d554e1b35ab6a000f0059
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/UEqn.H
@@ -0,0 +1,16 @@
+ // Momentum predictor
+ tmp<fvVectorMatrix> UrelEqn
+ (
+ fvm::div(phi, Urel)
+ + turbulence->divDevReff(Urel)
+ + SRF->Su()
+ );
+
+ UrelEqn().relax();
+
+ eqnResidual = solve
+ (
+ UrelEqn() == -fvc::grad(p)
+ ).initialResidual();
+
+ maxResidual = max(eqnResidual, maxResidual);
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/convergenceCheck.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/convergenceCheck.H
new file mode 100644
index 0000000000000000000000000000000000000000..8958063193af348a058fd8f3baecb2547c00da3c
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/convergenceCheck.H
@@ -0,0 +1,9 @@
+// check convergence
+
+if (maxResidual < convergenceCriterion)
+{
+ Info<< "reached convergence criterion: " << convergenceCriterion << endl;
+ runTime.writeAndEnd();
+ Info<< "latestTime = " << runTime.timeName() << endl;
+}
+
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H
similarity index 100%
rename from tutorials/simpleSRFFoam/simpleSRFFoam/createFields.H
rename to tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/initConvergenceCheck.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/initConvergenceCheck.H
new file mode 100644
index 0000000000000000000000000000000000000000..b56197f22a50cfd07b04fc14d40b9a5454da8c5b
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/initConvergenceCheck.H
@@ -0,0 +1,7 @@
+// initialize values for convergence checks
+
+ scalar eqnResidual = 1, maxResidual = 0;
+ scalar convergenceCriterion = 0;
+
+ simple.readIfPresent("convergence", convergenceCriterion);
+
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/pEqn.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/pEqn.H
new file mode 100644
index 0000000000000000000000000000000000000000..b2bc37fd5db808c1ef3c13fd9350958c28b9bba2
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/pEqn.H
@@ -0,0 +1,34 @@
+{
+ p.boundaryField().updateCoeffs();
+ volScalarField AUrel = UrelEqn().A();
+ Urel = UrelEqn().H()/AUrel;
+ UrelEqn.clear();
+ phi = fvc::interpolate(Urel) & mesh.Sf();
+ adjustPhi(phi, Urel, p);
+
+ // Non-orthogonal pressure corrector loop
+ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+ {
+ fvScalarMatrix pEqn
+ (
+ fvm::laplacian(1.0/AUrel, p) == fvc::div(phi)
+ );
+
+ pEqn.setReference(pRefCell, pRefValue);
+ pEqn.solve();
+
+ if (nonOrth == nNonOrthCorr)
+ {
+ phi -= pEqn.flux();
+ }
+ }
+
+# include "continuityErrs.H"
+
+ // Explicitly relax pressure for momentum corrector
+ p.relax();
+
+ // Momentum corrector
+ Urel -= fvc::grad(p)/AUrel;
+ Urel.correctBoundaryConditions();
+}
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
similarity index 66%
rename from tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
rename to tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
index 9098e63bc59cacd6605d7ba14f578d4e8b54c98d..f0ce70e69350084925f7061e4d78d663a9f44155 100644
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
@@ -32,8 +32,8 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "singlePhaseTransportModel.H"
+#include "RASModel.H"
#include "SRFModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -42,7 +42,6 @@ int main(int argc, char *argv[])
{
# include "setRootCase.H"
-
# include "createTime.H"
# include "createMesh.H"
# include "createFields.H"
@@ -59,55 +58,14 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H"
+# include "initConvergenceCheck.H"
p.storePrevIter();
// Pressure-velocity SIMPLE corrector
{
- // Momentum predictor
- tmp<fvVectorMatrix> UrelEqn
- (
- fvm::div(phi, Urel)
- + turbulence->divDevReff(Urel)
- + SRF->Su()
- );
-
- UrelEqn().relax();
-
- solve(UrelEqn() == -fvc::grad(p));
-
- p.boundaryField().updateCoeffs();
- volScalarField AUrel = UrelEqn().A();
- Urel = UrelEqn().H()/AUrel;
- UrelEqn.clear();
- phi = fvc::interpolate(Urel) & mesh.Sf();
- adjustPhi(phi, Urel, p);
-
- // Non-orthogonal pressure corrector loop
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
- fvScalarMatrix pEqn
- (
- fvm::laplacian(1.0/AUrel, p) == fvc::div(phi)
- );
-
- pEqn.setReference(pRefCell, pRefValue);
- pEqn.solve();
-
- if (nonOrth == nNonOrthCorr)
- {
- phi -= pEqn.flux();
- }
- }
-
-# include "continuityErrs.H"
-
- // Explicitly relax pressure for momentum corrector
- p.relax();
-
- // Momentum corrector
- Urel -= fvc::grad(p)/AUrel;
- Urel.correctBoundaryConditions();
+# include "UEqn.H"
+# include "pEqn.H"
}
turbulence->correct();
@@ -134,6 +92,8 @@ int main(int argc, char *argv[])
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
<< nl << endl;
+
+# include "convergenceCheck.H"
}
Info<< "End\n" << endl;
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/RASProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/RASProperties
deleted file mode 100644
index 919d435ff3602345a8e7191d795a24a89434bfcc..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/RASProperties
+++ /dev/null
@@ -1,175 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// RASModel kEpsilon;
-RASModel laminar;
-
-turbulence on;
-
-printCoeffs off;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict
deleted file mode 100644
index 56b10abaf93c5fe737903f5f97a810dd11e0f240..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh dynamicRefineFvMesh;
-
-// Refinement
-dynamicRefineFvMeshCoeffs
-{
- // Refine every refineInterval timesteps
- refineInterval 1;
-
- // volScalarField to base refinement on
- field gamma;
-
- //
- // 1. interpolate field
- // 2. mark any cell
- // - using a point value >minLevel <maxLevel
- // - level < maxRefinement
- // - unprotected
- // 3. if too many cells determine cost function:
- // - lowest level wins
- // - cell closest to (0.5*minLevel + 0.5*maxLevel) wins
-
- // Which cells to un/refine: based on point values (simple averaging).
- // - refine pointCells of point value > refineLevel
- // - unrefine pointCells of point value < unrefineLevel and that
- // are not within nBufferLayers of points marked for refinement.
-
- // All cells (neighbouring a cell with) gamma get refined
- lowerRefineLevel 0.001;
- upperRefineLevel 0.999;
- // All points are candidates for unrefining (gamma always <1)
- unrefineLevel 10;
- nBufferLayers 1;
-
- // Maximum refinement level (starts from 0)
- maxRefinement 2;
-
- // Maximum cell limit (approximate)
- maxCells 200000;
-
- // Fluxes to correct and variable they can be interpolated from
- correctFluxes ((phi U));
-
- // Write cellLevel?
- dumpLevel true;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/transportProperties b/tutorials/interDyMFoam/damBreakWithObstacle/constant/transportProperties
deleted file mode 100644
index 3460aba08f9209a1c2842221d35d8b00c3a8f2dc..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/transportProperties
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 1000;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-sigma sigma [1 0 -2 0 0 0 0] 0.07;
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/interDyMFoam/damBreakWithObstacle/system/fvSchemes
deleted file mode 100644
index a03b85207dd4384e28573b1487fef828812a300f..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/damBreakWithObstacle/system/fvSchemes
+++ /dev/null
@@ -1,59 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default Euler;
-}
-
-gradSchemes
-{
- default Gauss linear;
- grad(U) Gauss linear;
- grad(gamma) Gauss linear;
-}
-
-divSchemes
-{
- div(rho*phi,U) Gauss upwind; //limitedLinearV 1;
- div(phi,gamma) Gauss vanLeer;
- div(phirb,gamma) Gauss interfaceCompression;
-}
-
-laplacianSchemes
-{
- default Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-fluxRequired
-{
- default no;
- pd;
- pcorr;
- gamma;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/fvSolution b/tutorials/interDyMFoam/damBreakWithObstacle/system/fvSolution
deleted file mode 100644
index ecb3469be2182e87d2759857b9af6d184bc53784..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/damBreakWithObstacle/system/fvSolution
+++ /dev/null
@@ -1,128 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-3;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-4;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-8;
- relTol 0.05;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- nVcycles 2;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-8;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 3;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 3;
- cGamma 1;
- pdRefCell 0;
- pdRefValue 0;
- pRefProbe
- {
- fields (pd);
- probeLocations ((0.51 0.51 0.51));
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/Allclean b/tutorials/interDyMFoam/sloshingTank2D/Allclean
deleted file mode 100755
index 2ffbd01addc2d4c2c5326f0f401c575945c12b7d..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D/Allclean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/RASProperties b/tutorials/interDyMFoam/sloshingTank2D/constant/RASProperties
deleted file mode 100644
index ac1efb34c5d460ae6483a045c147312455969903..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// RASModel kEpsilon;
-RASModel laminar;
-
-turbulence off;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict
deleted file mode 100644
index e7a0ec06d662ae2718dffc093a0605bbf62f732f..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh solidBodyMotionFvMesh;
-
-solidBodyMotionFvMeshCoeffs
-{
- solidBodyMotionFunction SDA;
-
- SDACoeffs
- {
- // Centre of gravity
- CofG (0 0 0);
-
- // Model scale ratio
- lamda 50;
-
- // Max roll amplitude [rad]
- rollAmax 0.22654;
-
- // Min roll amplitude [rad]
- rollAmin 0.10472;
-
- // Heave amplitude [m]
- heaveA 3.79;
-
- // Sway amplitude [m]
- swayA 2.34;
-
- // Damping Coefficient [-]
- Q 2.00;
-
- // Time Period for liquid [sec]
- Tp 13.93;
-
- // Natural Period of Ship [sec]
- Tpn 11.93;
-
- // Reference time step [sec]
- dTi 0.059;
-
- // Incr. in Tp/unit 'dTi'[-]
- dTp -0.001;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/system/fvSolution b/tutorials/interDyMFoam/sloshingTank2D/system/fvSolution
deleted file mode 100644
index 3aaca52375805f2de0bb55235af2d945db86e22c..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D/system/fvSolution
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-8;
- relTol 0.01;
-
- smoother DIC;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 2e-9;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 2e-9;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 3;
- cGamma 1.5;
- correctPhi no;
-
- pRefProbe
- {
- fields
- (
- p
- );
-
- probeLocations
- (
- (0 0 0.15)
- );
- }
-
- pRefValue 1e5;
-}
-
-relaxationFactors
-{
- U 1.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/Allclean b/tutorials/interDyMFoam/sloshingTank2D3DoF/Allclean
deleted file mode 100755
index 2ffbd01addc2d4c2c5326f0f401c575945c12b7d..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/Allclean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties b/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties
deleted file mode 100644
index ac1efb34c5d460ae6483a045c147312455969903..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// RASModel kEpsilon;
-RASModel laminar;
-
-turbulence off;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict
deleted file mode 100644
index 2b9f0bed1195391eeea3f4c700c909217a838025..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh solidBodyMotionFvMesh;
-
-solidBodyMotionFvMeshCoeffs
-{
- solidBodyMotionFunction SDA;
-
- SDACoeffs
- {
- // Centre of gravity
- CofG (0 0 0);
-
- // Model scale ratio
- lamda 50;
-
- // Max roll amplitude [rad]
- rollAmax 0.2;
-
- // Min roll amplitude [rad]
- rollAmin 0.1;
-
- // Heave amplitude [m]
- heaveA 4;
-
- // Sway amplitude [m]
- swayA 2.4;
-
- // Damping Coefficient [-]
- Q 2;
-
- // Time Period for liquid [sec]
- Tp 14;
-
- // Natural Period of Ship [sec]
- Tpn 12;
-
- // Reference time step [sec]
- dTi 0.06;
-
- // Incr. in Tp/unit 'dTi'[-]
- dTp -0.001;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties b/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties
deleted file mode 100644
index 40232c0c406c02d21a4ae29a31f702bbf84c6214..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/fvSolution b/tutorials/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
deleted file mode 100644
index 3aaca52375805f2de0bb55235af2d945db86e22c..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-8;
- relTol 0.01;
-
- smoother DIC;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 2e-9;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 2e-9;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 3;
- cGamma 1.5;
- correctPhi no;
-
- pRefProbe
- {
- fields
- (
- p
- );
-
- probeLocations
- (
- (0 0 0.15)
- );
- }
-
- pRefValue 1e5;
-}
-
-relaxationFactors
-{
- U 1.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/Allclean b/tutorials/interDyMFoam/sloshingTank3D/Allclean
deleted file mode 100755
index 2ffbd01addc2d4c2c5326f0f401c575945c12b7d..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D/Allclean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/RASProperties b/tutorials/interDyMFoam/sloshingTank3D/constant/RASProperties
deleted file mode 100644
index ac1efb34c5d460ae6483a045c147312455969903..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// RASModel kEpsilon;
-RASModel laminar;
-
-turbulence off;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict b/tutorials/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict
deleted file mode 100644
index e7a0ec06d662ae2718dffc093a0605bbf62f732f..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh solidBodyMotionFvMesh;
-
-solidBodyMotionFvMeshCoeffs
-{
- solidBodyMotionFunction SDA;
-
- SDACoeffs
- {
- // Centre of gravity
- CofG (0 0 0);
-
- // Model scale ratio
- lamda 50;
-
- // Max roll amplitude [rad]
- rollAmax 0.22654;
-
- // Min roll amplitude [rad]
- rollAmin 0.10472;
-
- // Heave amplitude [m]
- heaveA 3.79;
-
- // Sway amplitude [m]
- swayA 2.34;
-
- // Damping Coefficient [-]
- Q 2.00;
-
- // Time Period for liquid [sec]
- Tp 13.93;
-
- // Natural Period of Ship [sec]
- Tpn 11.93;
-
- // Reference time step [sec]
- dTi 0.059;
-
- // Incr. in Tp/unit 'dTi'[-]
- dTp -0.001;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/environmentalProperties b/tutorials/interDyMFoam/sloshingTank3D/constant/environmentalProperties
deleted file mode 100644
index 40232c0c406c02d21a4ae29a31f702bbf84c6214..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/system/controlDict b/tutorials/interDyMFoam/sloshingTank3D/system/controlDict
deleted file mode 100644
index 959e229e953ce20fe0db08f76ba8b25023588583..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D/system/controlDict
+++ /dev/null
@@ -1,113 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 40;
-
-deltaT 0.01;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.05;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep yes;
-
-maxCo 0.5;
-
-maxDeltaT 1;
-
-functions
-(
- probes
- {
- // Type of functionObject
- type probes;
-
- // Output every
- outputControl timeStep;
- outputInterval 1;
-
- // Name of the directory for the probe data
- name probes;
-
- // Locations to be probed. runTime modifiable!
- probeLocations
- (
- (0 9.95 19.77)
- (0 -9.95 19.77)
- );
-
- // Fields to be probed. runTime modifiable!
- fields
- (
- p
- );
- }
-
- /*
- wallPressure
- {
- // Type of functionObject
- type surfaces;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
- // Output every 10th time step
- outputControl timeStep;
- outputInterval 10;
-
- surfaceFormat raw;
-
- fields
- (
- p
- );
-
- surfaces
- (
- walls
- {
- type patch;
- patchName walls;
- triangulate false;
- }
- );
- }
- */
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/system/fvSolution b/tutorials/interDyMFoam/sloshingTank3D/system/fvSolution
deleted file mode 100644
index 3aaca52375805f2de0bb55235af2d945db86e22c..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D/system/fvSolution
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-8;
- relTol 0.01;
-
- smoother DIC;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 2e-9;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 2e-9;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 3;
- cGamma 1.5;
- correctPhi no;
-
- pRefProbe
- {
- fields
- (
- p
- );
-
- probeLocations
- (
- (0 0 0.15)
- );
- }
-
- pRefValue 1e5;
-}
-
-relaxationFactors
-{
- U 1.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/Allclean b/tutorials/interDyMFoam/sloshingTank3D3DoF/Allclean
deleted file mode 100755
index 2ffbd01addc2d4c2c5326f0f401c575945c12b7d..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/Allclean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties b/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties
deleted file mode 100644
index ac1efb34c5d460ae6483a045c147312455969903..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// RASModel kEpsilon;
-RASModel laminar;
-
-turbulence off;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict
deleted file mode 100644
index 2b9f0bed1195391eeea3f4c700c909217a838025..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object motionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh solidBodyMotionFvMesh;
-
-solidBodyMotionFvMeshCoeffs
-{
- solidBodyMotionFunction SDA;
-
- SDACoeffs
- {
- // Centre of gravity
- CofG (0 0 0);
-
- // Model scale ratio
- lamda 50;
-
- // Max roll amplitude [rad]
- rollAmax 0.2;
-
- // Min roll amplitude [rad]
- rollAmin 0.1;
-
- // Heave amplitude [m]
- heaveA 4;
-
- // Sway amplitude [m]
- swayA 2.4;
-
- // Damping Coefficient [-]
- Q 2;
-
- // Time Period for liquid [sec]
- Tp 14;
-
- // Natural Period of Ship [sec]
- Tpn 12;
-
- // Reference time step [sec]
- dTi 0.06;
-
- // Incr. in Tp/unit 'dTi'[-]
- dTp -0.001;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties b/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties
deleted file mode 100644
index 40232c0c406c02d21a4ae29a31f702bbf84c6214..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/controlDict b/tutorials/interDyMFoam/sloshingTank3D3DoF/system/controlDict
deleted file mode 100644
index 959e229e953ce20fe0db08f76ba8b25023588583..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/controlDict
+++ /dev/null
@@ -1,113 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 40;
-
-deltaT 0.01;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.05;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep yes;
-
-maxCo 0.5;
-
-maxDeltaT 1;
-
-functions
-(
- probes
- {
- // Type of functionObject
- type probes;
-
- // Output every
- outputControl timeStep;
- outputInterval 1;
-
- // Name of the directory for the probe data
- name probes;
-
- // Locations to be probed. runTime modifiable!
- probeLocations
- (
- (0 9.95 19.77)
- (0 -9.95 19.77)
- );
-
- // Fields to be probed. runTime modifiable!
- fields
- (
- p
- );
- }
-
- /*
- wallPressure
- {
- // Type of functionObject
- type surfaces;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
- // Output every 10th time step
- outputControl timeStep;
- outputInterval 10;
-
- surfaceFormat raw;
-
- fields
- (
- p
- );
-
- surfaces
- (
- walls
- {
- type patch;
- patchName walls;
- triangulate false;
- }
- );
- }
- */
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/fvSolution b/tutorials/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
deleted file mode 100644
index 3aaca52375805f2de0bb55235af2d945db86e22c..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-8;
- relTol 0.01;
-
- smoother DIC;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 2e-9;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 2e-9;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 3;
- cGamma 1.5;
- correctPhi no;
-
- pRefProbe
- {
- fields
- (
- p
- );
-
- probeLocations
- (
- (0 0 0.15)
- );
- }
-
- pRefValue 1e5;
-}
-
-relaxationFactors
-{
- U 1.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/Allclean b/tutorials/interDyMFoam/sloshingTank3D6DoF/Allclean
deleted file mode 100755
index 2ffbd01addc2d4c2c5326f0f401c575945c12b7d..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/Allclean
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/Allrun b/tutorials/interDyMFoam/sloshingTank3D6DoF/Allrun
deleted file mode 100755
index df799d7732174c55cd675c8ed99294bf8c4a4897..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/Allrun
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
-runApplication blockMesh
-cp 0/gamma.org 0/gamma
-runApplication setFields
-runApplication interDyMFoam
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties
deleted file mode 100644
index ac1efb34c5d460ae6483a045c147312455969903..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// RASModel kEpsilon;
-RASModel laminar;
-
-turbulence off;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties
deleted file mode 100644
index 40232c0c406c02d21a4ae29a31f702bbf84c6214..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties
deleted file mode 100644
index c20854a9031a956ad8bc154b0a4ae87375add730..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 998.2;
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
-}
-
-sigma sigma [1 0 -2 0 0 0 0] 0.0;
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/controlDict b/tutorials/interDyMFoam/sloshingTank3D6DoF/system/controlDict
deleted file mode 100644
index 959e229e953ce20fe0db08f76ba8b25023588583..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/controlDict
+++ /dev/null
@@ -1,113 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 40;
-
-deltaT 0.01;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.05;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep yes;
-
-maxCo 0.5;
-
-maxDeltaT 1;
-
-functions
-(
- probes
- {
- // Type of functionObject
- type probes;
-
- // Output every
- outputControl timeStep;
- outputInterval 1;
-
- // Name of the directory for the probe data
- name probes;
-
- // Locations to be probed. runTime modifiable!
- probeLocations
- (
- (0 9.95 19.77)
- (0 -9.95 19.77)
- );
-
- // Fields to be probed. runTime modifiable!
- fields
- (
- p
- );
- }
-
- /*
- wallPressure
- {
- // Type of functionObject
- type surfaces;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
- // Output every 10th time step
- outputControl timeStep;
- outputInterval 10;
-
- surfaceFormat raw;
-
- fields
- (
- p
- );
-
- surfaces
- (
- walls
- {
- type patch;
- patchName walls;
- triangulate false;
- }
- );
- }
- */
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict
deleted file mode 100644
index d4594e09475d920c6ca71413fa457c4ec15810ac..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 16;
-
-method hierarchical;
-
-simpleCoeffs
-{
- n (2 2 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (4 2 2);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
-}
-
-manualCoeffs
-{
- dataFile "";
-}
-
-distributed no;
-
-roots
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes b/tutorials/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
deleted file mode 100644
index f089e4e5e6a14300b65f1deeeda14777be255c0c..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
+++ /dev/null
@@ -1,59 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default Euler;
-}
-
-gradSchemes
-{
- default Gauss linear;
- grad(U) Gauss linear;
- grad(gamma) Gauss linear;
-}
-
-divSchemes
-{
- div(rho*phi,U) Gauss vanLeerV;
- div(phi,gamma) Gauss vanLeer;
- div(phirb,gamma) Gauss vanLeer;
-}
-
-laplacianSchemes
-{
- default Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-fluxRequired
-{
- default no;
- pd;
- pcorr;
- gamma;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/fvSolution b/tutorials/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
deleted file mode 100644
index 3aaca52375805f2de0bb55235af2d945db86e22c..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
+++ /dev/null
@@ -1,123 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-8;
- relTol 0.01;
-
- smoother DIC;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 2e-9;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 2e-9;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 3;
- cGamma 1.5;
- correctPhi no;
-
- pRefProbe
- {
- fields
- (
- p
- );
-
- probeLocations
- (
- (0 0 0.15)
- );
- }
-
- pRefValue 1e5;
-}
-
-relaxationFactors
-{
- U 1.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
deleted file mode 100644
index 2c881a7ba48d03bc05de5c2d82ab02c90c1928ef..0000000000000000000000000000000000000000
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volScalarFieldValue gamma 0
-);
-
-regions
-(
- boxToCell
- {
- box (-100 -100 -100) (100 100 0);
-
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/constant/environmentalProperties b/tutorials/interFoam/laminar/damBreak/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/laminar/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/interFoam/laminar/damBreak/constant/transportProperties
deleted file mode 100644
index 117a1c916919c1ed2f9036e1b0ea66d5b64f804a..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/laminar/damBreak/constant/transportProperties
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 1000;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-sigma sigma [1 0 -2 0 0 0 0] 0.07;
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/environmentalProperties b/tutorials/interFoam/les/nozzleFlow2D/constant/environmentalProperties
deleted file mode 100644
index ca80af21ee6180ad2667f0efe40c92ac5df7ee7a..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 0 0);
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/interFoam/les/nozzleFlow2D/constant/transportProperties
deleted file mode 100644
index ef321fd883b4c0a85f785c9ffec235fe27f90d80..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/transportProperties
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 5.952e-06;
- rho rho [1 -3 0 0 0 0 0] 840;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 8.5e-07;
- rho rho [1 -3 0 0 0 0 0] 20;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-sigma sigma [1 0 -2 0 0 0 0] 0.0261;
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict.1 b/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict.1
deleted file mode 100644
index ae151cca9d707fddfb638b2485829ed6e608d309..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict.1
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box (0 0 -20e-06) (3600e-6 800e-06 40e-06);
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict.2 b/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict.2
deleted file mode 100644
index d56de07c7ff767844393cd8be435f9ac0f0297fb..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/les/nozzleFlow2D/system/cellSetDict.2
+++ /dev/null
@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object cellSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-name c0;
-
-action new;
-
-topoSetSources
-(
- boxToCell
- {
- box (0 0 -20e-06) (3600e-6 300e-06 20e-06);
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/interFoam/les/nozzleFlow2D/system/fvSolution
deleted file mode 100644
index 8d5181515e957c9eaaab47d8d389359bbb9bf3a6..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/les/nozzleFlow2D/system/fvSolution
+++ /dev/null
@@ -1,121 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother DICGaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration false;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-7;
- relTol 0.01;
-
- smoother DIC; //GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-7;
- relTol 0;
-
- nVcycles 2;
-
- smoother DICGaussSeidel;
- nPreSweeps 2;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-7;
- relTol 0;
- maxIter 20;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-6;
- relTol 0;
- nSweeps 1;
- };
-
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 2;
- nNonOrthogonalCorrectors 1;
- nAlphaCorr 1;
- nAlphaSubCycles 4;
- cAlpha 2;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/constant/RASProperties b/tutorials/interFoam/ras/damBreak/constant/RASProperties
deleted file mode 100644
index 8bf244a6058dcebb47174e2c822be1157593fa81..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/ras/damBreak/constant/RASProperties
+++ /dev/null
@@ -1,183 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-realizableKECoeffs
-{
- Cmu 0.09;
- A0 4.0;
- C2 1.9;
- alphak 1;
- alphaEps 0.833333;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/constant/environmentalProperties b/tutorials/interFoam/ras/damBreak/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/ras/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/constant/transportProperties b/tutorials/interFoam/ras/damBreak/constant/transportProperties
deleted file mode 100644
index f2b23a57f19e1117a77663a61a3635779056038f..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/ras/damBreak/constant/transportProperties
+++ /dev/null
@@ -1,68 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-twoPhase
-{
- transportModel twoPhase;
- phase1 phase1;
- phase2 phase2;
-}
-
-phase1
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 1000;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-phase2
-{
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
- CrossPowerLawCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 0;
- }
- BirdCarreauCoeffs
- {
- nu0 nu0 [0 2 -1 0 0 0 0] 0.0142515;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 99.6;
- n n [0 0 0 0 0 0 0] 0.1003;
- }
-}
-
-sigma sigma [1 0 -2 0 0 0 0] 0.07;
-
-// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/system/fvSolution b/tutorials/interFoam/ras/damBreak/system/fvSolution
deleted file mode 100644
index edb52854d056a9fb8bb4799708743400264369a2..0000000000000000000000000000000000000000
--- a/tutorials/interFoam/ras/damBreak/system/fvSolution
+++ /dev/null
@@ -1,79 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner DIC;
- tolerance 1e-10;
- relTol 0;
- };
- pd PCG
- {
- preconditioner DIC;
- tolerance 1e-7;
- relTol 0.05;
- };
- pdFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-7;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-}
-
-PISO
-{
- momentumPredictor no;
- nCorrectors 3;
- nNonOrthogonalCorrectors 0;
- nGammaCorr 1;
- nGammaSubCycles 4;
- cGamma 2;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/laplacianFoam/flange/constant/transportProperties b/tutorials/laplacianFoam/flange/constant/transportProperties
deleted file mode 100644
index e202aa0bc79b89adbce17e0f5ab6041bda60138b..0000000000000000000000000000000000000000
--- a/tutorials/laplacianFoam/flange/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-DT DT [0 2 -1 0 0 0 0] 4e-05;
-
-// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/fvSolution b/tutorials/mdEquilibrationFoam/periodicCube/system/fvSolution
deleted file mode 100644
index ca4069e5ccf30fe01342cf94f0a77ee5abc18a14..0000000000000000000000000000000000000000
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/fvSolution
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p ICCG 1e-06 0;
- U BICCG 1e-05 0;
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- pRefCell 0;
- pRefValue 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/molConfigDict b/tutorials/mdEquilibrationFoam/periodicCube/system/molConfigDict
deleted file mode 100644
index 9ae05138695aaa3318c057b041796500fadef8b6..0000000000000000000000000000000000000000
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/molConfigDict
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object molConfigDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Euler angles, expressed in degrees as phi, theta, psi,
-// see http://mathworld.wolfram.com/EulerAngles.html
-
-liquid
-{
- massDensity 1220.0;
- temperature 300.0;
- velocityDistribution maxwellian;
- bulkVelocity (0.0 0.0 0.0);
- id Ar;
- mass 6.63352033e-26;
- latticeStructure SC;
- anchor (0.0 0.0 0.0);
- anchorSpecifies molecule;
- tethered no;
- orientationAngles (0 0 0);
-}
-
-// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/potentialDict b/tutorials/mdEquilibrationFoam/periodicCube/system/potentialDict
deleted file mode 100644
index 15af6ed181a6dbe23c4370e35f174a986539f1a3..0000000000000000000000000000000000000000
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/potentialDict
+++ /dev/null
@@ -1,95 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object potentials;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Subdictionaries specifying types of intermolecular potential.
-// Sub-sub dictionaries specify the potentials themselves.
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Removal order
-
-// This is the order in which to remove overlapping pairs if more than one
-// type of molecule is present. The most valuable molecule type is at the
-// right hand end, the molecule that will be removed 1st is 1st on the list.
-// Not all types need to be present, a molecule that is not present is
-// automatically less valuable than any on the list. For molecules of the
-// same type there is no control over which is removed.
-
-removalOrder 1 (Ar);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Pair potentials
-
-// If there are r different type of molecules, and a pair force is required
-// between all combinations, then there are C = r(r+1)/2 combinations,
-// i.e. for r = {1,2,3,4}, C = {1,3,6,10} (sum of triangular numbers).
-
-// Pair potentials are specified by the combinaition of their ids,
-// for MOLA and MOLB, "MOLA-MOLB" OR "MOLB-MOLA" is acceptable
-// (strictly OR, both or neither will thrown an error)
-
-pair
-{
- Ar-Ar
- {
- pairPotential azizChen;
- rCut 1.2e-9;
- rMin 0.15e-9;
- dr 2e-14;
- azizChenCoeffs
- {
- epsilon 1.97742255e-21;
- rm 3.759e-10;
- A 0.9502720e7;
- alpha 16.345655;
- C6 1.0914254;
- C8 0.6002595;
- C10 0.3700113;
- D 1.4;
- gamma 2.0;
- }
- energyScalingFunction noScaling;
- writeTables yes;
- }
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Tethering Potentials
-
-tether
-{
- Ar
- {
- tetherPotential restrainedHarmonicSpring;
- restrainedHarmonicSpringCoeffs
- {
- springConstant 0.0277;
- rR 1.2e-9;
- }
- }
-}
-
-// ************************************************************************* //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// External Forces
-
-// Bulk external forces (namely gravity) will be specified as forces rather
-// than potentials to allow their direction to be controlled.
-
-external
-{
- gravity (0 0 0);
-}
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/controlDict
similarity index 92%
rename from tutorials/snappyHexMesh/iglooWithFridges/system/controlDict
rename to tutorials/mesh/snappyHexMesh/iglooWithFridges/system/controlDict
index b2622384ddabbbd9022f1607b1080bc55f64a584..ef80311ee11931792c1d637b6d45c5a9b75c24de 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -32,7 +31,6 @@ writeInterval 1;
purgeWrite 0;
-//writeFormat binary;
writeFormat ascii;
writePrecision 7;
@@ -45,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/decomposeParDict
similarity index 79%
rename from tutorials/snappyHexMesh/motorBike/system/decomposeParDict
rename to tutorials/mesh/snappyHexMesh/iglooWithFridges/system/decomposeParDict
index 25b7e5c29b7f7a4c789c87be17168cd90f722122..c0de7923c6eef835d325647f9b074087c87add01 100644
--- a/tutorials/snappyHexMesh/motorBike/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,18 +18,16 @@ FoamFile
numberOfSubdomains 6;
method hierarchical;
-//method metis;
-//method parMetis;
simpleCoeffs
{
- n (4 1 1);
+ n ( 4 1 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (3 2 1);
+ n ( 3 2 1 );
delta 0.001;
order xyz;
}
@@ -40,8 +39,6 @@ manualCoeffs
metisCoeffs
{
- //n (5 1 1);
- //cellWeightsFile "constant/cellWeightsFile";
}
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/fvSchemes
similarity index 92%
rename from tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes
rename to tutorials/mesh/snappyHexMesh/iglooWithFridges/system/fvSchemes
index 51ebb81a9da7ee1d671f1bdf6351da21d6c12cd7..2fa85964b7e2113902ff5be6f03334f6777d84b6 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,9 +10,9 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
@@ -24,8 +24,6 @@ gradSchemes
{
default Gauss linear;
grad(p) Gauss linear;
-
- //snGradCorr(cellMotionU) Gauss linear;
}
divSchemes
@@ -39,7 +37,6 @@ laplacianSchemes
default none;
laplacian(nu,U) Gauss linear corrected;
laplacian(1|A(U),p) Gauss linear corrected;
-
laplacian(diffusivity,cellMotionU) Gauss linear uncorrected;
}
@@ -57,7 +54,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/constrictedChannel/system/fvSolution b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/fvSolution
similarity index 86%
rename from tutorials/gnemdFoam/constrictedChannel/system/fvSolution
rename to tutorials/mesh/snappyHexMesh/iglooWithFridges/system/fvSolution
index ca4069e5ccf30fe01342cf94f0a77ee5abc18a14..876c8c233f9dece81ca38c9186f66b783bae4ec9 100644
--- a/tutorials/gnemdFoam/constrictedChannel/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,13 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
-{
- p ICCG 1e-06 0;
- U BICCG 1e-05 0;
-}
+{}
PISO
{
@@ -28,4 +26,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..2efe6901aa1657a7bb782cd7991cfc944b713132
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
@@ -0,0 +1,147 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+castellatedMesh true;
+
+snap true;
+
+addLayers true;
+
+geometry
+{
+ fridgeA
+ {
+ type searchableBox;
+ min ( 2 2 0 );
+ max ( 3 3 2 );
+ }
+
+ fridgeB
+ {
+ type searchableBox;
+ min ( 3.5 3 0 );
+ max ( 4.3 3.8 1.8 );
+ }
+
+ igloo
+ {
+ type searchableSphere;
+ centre ( 3 3 0 );
+ radius 4;
+ }
+}
+
+castellatedMeshControls
+{
+ maxLocalCells 1000000;
+ maxGlobalCells 2000000;
+ minRefinementCells 0;
+ nCellsBetweenLevels 1;
+ features ( );
+ refinementSurfaces
+ {
+ fridgeA
+ {
+ level ( 2 2 );
+ }
+
+ fridgeB
+ {
+ level ( 2 2 );
+ }
+
+ igloo
+ {
+ level ( 1 1 );
+ }
+ }
+
+ resolveFeatureAngle 60;
+ refinementRegions
+ {
+ }
+
+ locationInMesh ( 3 0.28 0.43 );
+}
+
+snapControls
+{
+ nSmoothPatch 3;
+ tolerance 4;
+ nSolveIter 30;
+ nRelaxIter 5;
+}
+
+addLayersControls
+{
+ layers
+ {
+ fridgeA_region0
+ {
+ nSurfaceLayers 1;
+ }
+
+ fridgeB_region0
+ {
+ nSurfaceLayers 1;
+ }
+
+ igloo_region0
+ {
+ nSurfaceLayers 1;
+ }
+ }
+
+ expansionRatio 1;
+ finalLayerRatio 0.5;
+ minThickness 0.25;
+ nGrow 0;
+ featureAngle 60;
+ nRelaxIter 5;
+ nSmoothSurfaceNormals 1;
+ nSmoothNormals 3;
+ nSmoothThickness 10;
+ maxFaceThicknessRatio 0.5;
+ maxThicknessToMedialRatio 0.3;
+ minMedianAxisAngle 130;
+ nBufferCellsNoExtrude 0;
+}
+
+meshQualityControls
+{
+ maxNonOrtho 65;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 4;
+ maxConcave 80;
+ minFlatness 0.5;
+ minVol 1e-13;
+ minArea -1;
+ minTwist 0.05;
+ minDeterminant 0.001;
+ minFaceWeight 0.05;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ nSmoothScale 4;
+ errorReduction 0.75;
+}
+
+debug 0;
+
+mergeTolerance 1e-06;
+
+
+// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict b/tutorials/mesh/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict
rename to tutorials/mesh/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict
diff --git a/tutorials/snappyHexMesh/motorBike/constant/triSurface/motorBike.stl b/tutorials/mesh/snappyHexMesh/motorBike/constant/triSurface/motorBike.stl
similarity index 100%
rename from tutorials/snappyHexMesh/motorBike/constant/triSurface/motorBike.stl
rename to tutorials/mesh/snappyHexMesh/motorBike/constant/triSurface/motorBike.stl
diff --git a/tutorials/snappyHexMesh/motorBike/system/controlDict b/tutorials/mesh/snappyHexMesh/motorBike/system/controlDict
similarity index 92%
rename from tutorials/snappyHexMesh/motorBike/system/controlDict
rename to tutorials/mesh/snappyHexMesh/motorBike/system/controlDict
index b2622384ddabbbd9022f1607b1080bc55f64a584..ef80311ee11931792c1d637b6d45c5a9b75c24de 100644
--- a/tutorials/snappyHexMesh/motorBike/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -32,7 +31,6 @@ writeInterval 1;
purgeWrite 0;
-//writeFormat binary;
writeFormat ascii;
writePrecision 7;
@@ -45,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict
similarity index 79%
rename from tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict
rename to tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict
index 25b7e5c29b7f7a4c789c87be17168cd90f722122..c0de7923c6eef835d325647f9b074087c87add01 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict
+++ b/tutorials/mesh/snappyHexMesh/motorBike/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,18 +18,16 @@ FoamFile
numberOfSubdomains 6;
method hierarchical;
-//method metis;
-//method parMetis;
simpleCoeffs
{
- n (4 1 1);
+ n ( 4 1 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (3 2 1);
+ n ( 3 2 1 );
delta 0.001;
order xyz;
}
@@ -40,8 +39,6 @@ manualCoeffs
metisCoeffs
{
- //n (5 1 1);
- //cellWeightsFile "constant/cellWeightsFile";
}
diff --git a/tutorials/snappyHexMesh/motorBike/system/fvSchemes b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes
similarity index 92%
rename from tutorials/snappyHexMesh/motorBike/system/fvSchemes
rename to tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes
index 51ebb81a9da7ee1d671f1bdf6351da21d6c12cd7..2fa85964b7e2113902ff5be6f03334f6777d84b6 100644
--- a/tutorials/snappyHexMesh/motorBike/system/fvSchemes
+++ b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,9 +10,9 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
@@ -24,8 +24,6 @@ gradSchemes
{
default Gauss linear;
grad(p) Gauss linear;
-
- //snGradCorr(cellMotionU) Gauss linear;
}
divSchemes
@@ -39,7 +37,6 @@ laplacianSchemes
default none;
laplacian(nu,U) Gauss linear corrected;
laplacian(1|A(U),p) Gauss linear corrected;
-
laplacian(diffusivity,cellMotionU) Gauss linear uncorrected;
}
@@ -57,7 +54,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/fvSolution b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution
similarity index 86%
rename from tutorials/gnemdFoam/nanoNozzle/system/fvSolution
rename to tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution
index ca4069e5ccf30fe01342cf94f0a77ee5abc18a14..876c8c233f9dece81ca38c9186f66b783bae4ec9 100644
--- a/tutorials/gnemdFoam/nanoNozzle/system/fvSolution
+++ b/tutorials/mesh/snappyHexMesh/motorBike/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,13 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
-{
- p ICCG 1e-06 0;
- U BICCG 1e-05 0;
-}
+{}
PISO
{
@@ -28,4 +26,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..fa094e1b03b4fe1b3d419af45a6b757592cfac4c
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/motorBike/system/snappyHexMeshDict
@@ -0,0 +1,459 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object snappyHexMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+castellatedMesh true;
+
+snap true;
+
+addLayers true;
+
+geometry
+{
+ motorBike.stl
+ {
+ type triSurfaceMesh;
+ name motorBike;
+ }
+
+ refinementBox
+ {
+ type searchableBox;
+ min ( -0.3 -0.4 -0.1 );
+ max ( 3 0.4 1.4 );
+ }
+}
+
+castellatedMeshControls
+{
+ maxLocalCells 1000000;
+ maxGlobalCells 2000000;
+ minRefinementCells 10;
+ nCellsBetweenLevels 2;
+ features ( );
+ refinementSurfaces
+ {
+ motorBike
+ {
+ level ( 5 6 );
+ }
+ }
+
+ resolveFeatureAngle 30;
+ refinementRegions
+ {
+ refinementBox
+ {
+ mode inside;
+ levels ( ( 1e+15 4 ) );
+ }
+ }
+
+ locationInMesh ( 3 3 0.43 );
+}
+
+snapControls
+{
+ nSmoothPatch 3;
+ tolerance 4;
+ nSolveIter 30;
+ nRelaxIter 5;
+}
+
+addLayersControls
+{
+ layers
+ {
+ minZ
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frt-fairing:001%1
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_windshield:002%2
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-rim:005%5
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-rim:010%10
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-wh-rim:011%11
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-wh-brake-disk:012%12
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frame:016-shadow%13
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-susp:014%14
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-susp:014-shadow%15
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frame:016%16
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-rim:005-shadow%17
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-chain-hub:022%22
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rearseat%24
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frt-fairing%25
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_windshield%26
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_headlights%27
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_driversseat%28
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-body%29
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fuel-tank%30
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_exhaust%31
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-rim%32
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-mud-guard%33
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-wh-rim%34
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-wh-brake-disk%35
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-brake-caliper%36
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-wh-tyre%37
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_hbars%38
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-forks%39
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_chain%40
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-tyre%41
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_square-dial%42
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_round-dial%43
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_dial-holder%44
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-susp%45
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-brake-lights%46
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-light-bracket%47
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frame%48
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-mud-guard%49
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-susp-spring-damp%50
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fairing-inner-plate%51
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_clutch-housing%52
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_radiator%53
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_water-pipe%54
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_water-pump%55
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_engine%56
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-shock-link%57
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-brake-fluid-pot-bracket%58
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-brake-fluid-pot%59
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_footpeg%60
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-chain-hub%61
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-brake-caliper%62
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rider-helmet%65
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rider-visor%66
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rider-boots%67
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rider-gloves%68
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rider-body%69
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frame:0%70
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_frt-fairing:001-shadow%74
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_windshield-shadow%75
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-mud-guard-shadow%81
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_fr-wh-brake-disk-shadow%83
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-mud-guard-shadow%84
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-susp-spring-damp-shadow%85
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_radiator-shadow%86
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-shock-link-shadow%87
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rear-brake-fluid-pot-bracket-shadow%88
+ {
+ nSurfaceLayers 1;
+ }
+
+ motorBike_rr-wh-chain-hub-shadow%89
+ {
+ nSurfaceLayers 1;
+ }
+ }
+
+ expansionRatio 1;
+ finalLayerRatio 0.3;
+ minThickness 0.1;
+ nGrow 1;
+ featureAngle 30;
+ nRelaxIter 3;
+ nSmoothSurfaceNormals 1;
+ nSmoothNormals 3;
+ nSmoothThickness 10;
+ maxFaceThicknessRatio 0.5;
+ maxThicknessToMedialRatio 0.3;
+ minMedianAxisAngle 130;
+ nBufferCellsNoExtrude 0;
+}
+
+meshQualityControls
+{
+ maxNonOrtho 65;
+ maxBoundarySkewness 20;
+ maxInternalSkewness 4;
+ maxConcave 80;
+ minFlatness 0.5;
+ minVol 1e-13;
+ minArea -1;
+ minTwist 0.02;
+ minDeterminant 0.001;
+ minFaceWeight 0.02;
+ minVolRatio 0.01;
+ minTriangleTwist -1;
+ nSmoothScale 4;
+ errorReduction 0.75;
+}
+
+debug 0;
+
+mergeTolerance 1e-06;
+
+
+// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/Allclean b/tutorials/molecularDynamics/gnemdFoam/Allclean
similarity index 100%
rename from tutorials/gnemdFoam/Allclean
rename to tutorials/molecularDynamics/gnemdFoam/Allclean
diff --git a/tutorials/gnemdFoam/Allrun b/tutorials/molecularDynamics/gnemdFoam/Allrun
similarity index 100%
rename from tutorials/gnemdFoam/Allrun
rename to tutorials/molecularDynamics/gnemdFoam/Allrun
diff --git a/tutorials/gnemdFoam/constrictedChannel/constant/polyMesh/blockMeshDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/gnemdFoam/constrictedChannel/constant/polyMesh/blockMeshDict
rename to tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/blockMeshDict
diff --git a/tutorials/gnemdFoam/constrictedChannel/constant/polyMesh/boundary b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/gnemdFoam/constrictedChannel/constant/polyMesh/boundary
rename to tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary
index eaeb38f09e82e1b87d50473c0f179baa840d4791..e9d933420b7298f5aa2fef9909433f031b113f5a 100644
--- a/tutorials/gnemdFoam/constrictedChannel/constant/polyMesh/boundary
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/gnemdFoam/constrictedChannel/system/controlDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict
similarity index 92%
rename from tutorials/gnemdFoam/constrictedChannel/system/controlDict
rename to tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict
index eb2d79fa78af0722fd2592d5ec1f0238e1ca7419..c43b52a4489940816c201cd8c03c5ca1f7694a2e 100644
--- a/tutorials/gnemdFoam/constrictedChannel/system/controlDict
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,4 +45,5 @@ runTimeModifiable yes;
adjustTimeStep no;
+
// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/fvSchemes b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes
similarity index 91%
rename from tutorials/mdEquilibrationFoam/periodicCube/system/fvSchemes
rename to tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes
index 83f984c2ed5482b1e2d4577dd0655845b3095878..f923afcfacf038c5cd521b7e67b1c11b4d535866 100644
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/fvSchemes
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution
similarity index 71%
rename from tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution
rename to tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution
index 9e9998642e78ea59c1aef2bbb95c799fffef6501..46670343363af32a79fcf7bd788316556b9de7d7 100644
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- // p ICCG 1e-06 0;
- p AMG 1e-06 0 10;
- U BICCG 1e-05 0;
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
- // Meshmotion
- cellMotionU ICCG 1e-6 0.0;
- cellMotionUx ICCG 1e-6 0.0;
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
}
PISO
@@ -34,4 +42,5 @@ PISO
pRefValue 0;
}
+
// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/mdSolution b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution
similarity index 81%
rename from tutorials/mdEquilibrationFoam/periodicCube/system/mdSolution
rename to tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution
index fa264d59f7facf72f25e2156a909e3a27acb9261..dfef948901fc9407d740d27c3f58e12fc09f78c8 100644
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/mdSolution
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/mdSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mdSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-integrationMethod verletLeapfrog;
+integrationMethod verletLeapfrog;
-potentialEnergyLimit 5.256e-20;
+potentialEnergyLimit 5.256e-20;
-// ************************************************************************* //
\ No newline at end of file
+
+// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict
new file mode 100644
index 0000000000000000000000000000000000000000..6bd9f1538e2c0723d9505442bdf2453015012738
--- /dev/null
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/molConfigDict
@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object molConfigDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+bottomWall
+{
+ massDensity 1220;
+ temperature 300;
+ velocityDistribution maxwellian;
+ bulkVelocity ( 0 0 0 );
+ id Ar;
+ mass 6.63352033e-26;
+ latticeStructure FCC;
+ anchor ( 1.05e-09 3.18e-09 2.87e-09 );
+ anchorSpecifies molecule;
+ tethered yes;
+ orientationAngles ( 30 0 0 );
+}
+
+liquid
+{
+ massDensity 1100;
+ temperature 250;
+ velocityDistribution maxwellian;
+ bulkVelocity ( 245 0 0 );
+ id Ne;
+ mass 3.350996347e-26;
+ latticeStructure SC;
+ anchor ( 1.05e-09 3.18e-09 2.87e-09 );
+ anchorSpecifies molecule;
+ tethered no;
+ orientationAngles ( 45 0 0 );
+}
+
+topWall
+{
+ massDensity 1220;
+ temperature 200;
+ velocityDistribution maxwellian;
+ bulkVelocity ( 0 0 0 );
+ id Ar;
+ mass 6.63352033e-26;
+ latticeStructure BCC;
+ anchor ( 1.05e-09 3.18e-09 2.87e-09 );
+ anchorSpecifies corner;
+ tethered yes;
+ orientationAngles ( 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict
new file mode 100644
index 0000000000000000000000000000000000000000..56a7bbee713bf0a24860dad6ad2e592c9e17f464
--- /dev/null
+++ b/tutorials/molecularDynamics/gnemdFoam/constrictedChannel/system/potentialDict
@@ -0,0 +1,104 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object potentialDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+removalOrder 2 ( Ne Ar );
+
+pair
+{
+ Ar-Ar
+ {
+ pairPotential maitlandSmith;
+ rCut 1e-09;
+ rMin 1.5e-10;
+ dr 5e-14;
+ maitlandSmithCoeffs
+ {
+ m 13;
+ gamma 7.5;
+ rm 3.756e-10;
+ epsilon 1.990108438e-21;
+ }
+
+ energyScalingFunction doubleSigmoid;
+ doubleSigmoidCoeffs
+ {
+ shift1 9e-10;
+ scale1 -64771072;
+ shift2 9.7e-10;
+ scale2 -259084288;
+ }
+
+ writeTables yes;
+ }
+
+ Ar-Ne
+ {
+ pairPotential maitlandSmith;
+ rCut 9e-10;
+ rMin 1e-10;
+ dr 5e-14;
+ maitlandSmithCoeffs
+ {
+ m 13;
+ gamma 4;
+ rm 3.48e-10;
+ epsilon 8.765026657e-22;
+ }
+
+ energyScalingFunction shiftedForce;
+ writeTables yes;
+ }
+
+ Ne-Ne
+ {
+ pairPotential maitlandSmith;
+ rCut 8e-10;
+ rMin 1e-10;
+ dr 5e-14;
+ maitlandSmithCoeffs
+ {
+ m 13;
+ gamma 5;
+ rm 3.0739e-10;
+ epsilon 5.813260729e-22;
+ }
+
+ energyScalingFunction shiftedForce;
+ writeTables yes;
+ }
+}
+
+tether
+{
+ Ar
+ {
+ tetherPotential restrainedHarmonicSpring;
+ restrainedHarmonicSpringCoeffs
+ {
+ springConstant 0.1;
+ rR 1.2e-09;
+ }
+ }
+}
+
+external
+{
+ gravity ( 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/nanoNozzle/constant/polyMesh/blockMeshDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/gnemdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
rename to tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/blockMeshDict
diff --git a/tutorials/gnemdFoam/nanoNozzle/constant/polyMesh/boundary b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/gnemdFoam/nanoNozzle/constant/polyMesh/boundary
rename to tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary
index b94dd10f195233028313de6f35c87882b3d03f0b..a58d17ed7f51a0b1d98167dadad04ec7b6a21c8b 100644
--- a/tutorials/gnemdFoam/nanoNozzle/constant/polyMesh/boundary
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/controlDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict
similarity index 92%
rename from tutorials/gnemdFoam/nanoNozzle/system/controlDict
rename to tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict
index d28aa588409e247da3a38560004a1e8b422f7a6b..46436871638186b4ead04e658ceeadd2579b9a5f 100644
--- a/tutorials/gnemdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,4 +45,5 @@ runTimeModifiable yes;
adjustTimeStep no;
+
// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict
new file mode 100644
index 0000000000000000000000000000000000000000..2b1855ea4634bda4d66c8129ce2d08d57a2fb0c9
--- /dev/null
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/decomposeParDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method metis;
+
+simpleCoeffs
+{
+ n ( 4 1 1 );
+ delta 0.001;
+}
+
+hierarchicalCoeffs
+{
+ n ( 1 1 1 );
+ delta 0.001;
+ order xyz;
+}
+
+metisCoeffs
+{
+ processorWeights ( 1 1 1 1 );
+}
+
+manualCoeffs
+{
+ dataFile "";
+}
+
+distributed no;
+
+roots ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/fvSchemes b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes
similarity index 91%
rename from tutorials/gnemdFoam/nanoNozzle/system/fvSchemes
rename to tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes
index 83f984c2ed5482b1e2d4577dd0655845b3095878..f923afcfacf038c5cd521b7e67b1c11b4d535866 100644
--- a/tutorials/gnemdFoam/nanoNozzle/system/fvSchemes
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..46670343363af32a79fcf7bd788316556b9de7d7
--- /dev/null
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/fvSolution
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/constrictedChannel/system/mdSolution b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution
similarity index 81%
rename from tutorials/gnemdFoam/constrictedChannel/system/mdSolution
rename to tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution
index fa264d59f7facf72f25e2156a909e3a27acb9261..dfef948901fc9407d740d27c3f58e12fc09f78c8 100644
--- a/tutorials/gnemdFoam/constrictedChannel/system/mdSolution
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/mdSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mdSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-integrationMethod verletLeapfrog;
+integrationMethod verletLeapfrog;
-potentialEnergyLimit 5.256e-20;
+potentialEnergyLimit 5.256e-20;
-// ************************************************************************* //
\ No newline at end of file
+
+// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict
new file mode 100644
index 0000000000000000000000000000000000000000..937130f4ac3ba22f29b727686566f27b6adfa45a
--- /dev/null
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/molConfigDict
@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object molConfigDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+sectionA
+{
+ massDensity 1220;
+ temperature 300;
+ velocityDistribution maxwellian;
+ bulkVelocity ( -250 0 0 );
+ id Ar;
+ mass 6.63352033e-26;
+ latticeStructure SC;
+ anchor ( 0 0 0 );
+ anchorSpecifies molecule;
+ tethered no;
+ orientationAngles ( 0 0 0 );
+}
+
+sectionB
+{
+ massDensity 1220;
+ temperature 300;
+ velocityDistribution maxwellian;
+ bulkVelocity ( -250 0 0 );
+ id Ne;
+ mass 3.350917e-26;
+ latticeStructure SC;
+ anchor ( 0 0 0 );
+ anchorSpecifies molecule;
+ tethered no;
+ orientationAngles ( 0 0 0 );
+}
+
+sectionC
+{
+ massDensity 1220;
+ temperature 300;
+ velocityDistribution maxwellian;
+ bulkVelocity ( -250 0 0 );
+ id Ar;
+ mass 6.63352033e-26;
+ latticeStructure SC;
+ anchor ( 0 0 0 );
+ anchorSpecifies molecule;
+ tethered no;
+ orientationAngles ( 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict
new file mode 100644
index 0000000000000000000000000000000000000000..0386a6994e0d9708901895788978e11f2d5bf453
--- /dev/null
+++ b/tutorials/molecularDynamics/gnemdFoam/nanoNozzle/system/potentialDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object potentialDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+removalOrder 1 ( Ar );
+
+pair
+{
+ Ar-Ar
+ {
+ pairPotential maitlandSmith;
+ rCut 1e-09;
+ rMin 1.5e-10;
+ dr 5e-14;
+ maitlandSmithCoeffs
+ {
+ m 13;
+ gamma 7.5;
+ rm 3.756e-10;
+ epsilon 1.990108438e-21;
+ }
+
+ energyScalingFunction doubleSigmoid;
+ doubleSigmoidCoeffs
+ {
+ shift1 9e-10;
+ scale1 -64771072;
+ shift2 9.7e-10;
+ scale2 -259084288;
+ }
+
+ writeTables no;
+ }
+
+ Ar-Ne
+ {
+ pairPotential maitlandSmith;
+ rCut 9e-10;
+ rMin 1e-10;
+ dr 5e-14;
+ maitlandSmithCoeffs
+ {
+ m 13;
+ gamma 4;
+ rm 3.48e-10;
+ epsilon 8.765026657e-22;
+ }
+
+ energyScalingFunction shiftedForce;
+ writeTables no;
+ }
+
+ Ne-Ne
+ {
+ pairPotential maitlandSmith;
+ rCut 8e-10;
+ rMin 1e-10;
+ dr 5e-14;
+ maitlandSmithCoeffs
+ {
+ m 13;
+ gamma 5;
+ rm 3.0739e-10;
+ epsilon 5.813260729e-22;
+ }
+
+ energyScalingFunction shiftedForce;
+ writeTables no;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/Allclean b/tutorials/molecularDynamics/mdEquilibrationFoam/Allclean
similarity index 100%
rename from tutorials/mdEquilibrationFoam/Allclean
rename to tutorials/molecularDynamics/mdEquilibrationFoam/Allclean
diff --git a/tutorials/mdEquilibrationFoam/Allrun b/tutorials/molecularDynamics/mdEquilibrationFoam/Allrun
similarity index 100%
rename from tutorials/mdEquilibrationFoam/Allrun
rename to tutorials/molecularDynamics/mdEquilibrationFoam/Allrun
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/constant/polyMesh/blockMeshDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/mdEquilibrationFoam/periodicCube/constant/polyMesh/blockMeshDict
rename to tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/blockMeshDict
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary
rename to tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary
index 54dbb7ef4a6be0e63882c5fe42752ad8c7a3b896..b3548de91cf4646aa6692d8e02914c5ed4755ff7 100644
--- a/tutorials/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/controlDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict
similarity index 92%
rename from tutorials/mdEquilibrationFoam/periodicCube/system/controlDict
rename to tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict
index 76f7ed8a7ee4afac7f47fb4c97b4a42a01147053..f1052a4864fad271f58b2d6f62e0f3898d42c81d 100644
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/controlDict
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,4 +45,5 @@ runTimeModifiable yes;
adjustTimeStep no;
+
// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/constrictedChannel/system/fvSchemes b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes
similarity index 91%
rename from tutorials/gnemdFoam/constrictedChannel/system/fvSchemes
rename to tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes
index 83f984c2ed5482b1e2d4577dd0655845b3095878..f923afcfacf038c5cd521b7e67b1c11b4d535866 100644
--- a/tutorials/gnemdFoam/constrictedChannel/system/fvSchemes
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +53,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..46670343363af32a79fcf7bd788316556b9de7d7
--- /dev/null
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/fvSolution
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict
similarity index 84%
rename from tutorials/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict
rename to tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict
index e044b8378542974b38127b812d5a4e04aa9e2ac3..2dd296045bbd9676b0bf078bc53d2dc5e4958365 100644
--- a/tutorials/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdEquilibrationDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mdEquilibrationDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-equilibrationTargetTemperature 300.0;
+equilibrationTargetTemperature 300;
-// ************************************************************************* //
\ No newline at end of file
+
+// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/mdSolution b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution
similarity index 81%
rename from tutorials/gnemdFoam/nanoNozzle/system/mdSolution
rename to tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution
index fa264d59f7facf72f25e2156a909e3a27acb9261..dfef948901fc9407d740d27c3f58e12fc09f78c8 100644
--- a/tutorials/gnemdFoam/nanoNozzle/system/mdSolution
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/mdSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,12 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object mdSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-integrationMethod verletLeapfrog;
+integrationMethod verletLeapfrog;
-potentialEnergyLimit 5.256e-20;
+potentialEnergyLimit 5.256e-20;
-// ************************************************************************* //
\ No newline at end of file
+
+// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict
new file mode 100644
index 0000000000000000000000000000000000000000..6f48e375e8c3ba101230631096b6ecd6df24a156
--- /dev/null
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/molConfigDict
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object molConfigDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+liquid
+{
+ massDensity 1220;
+ temperature 300;
+ velocityDistribution maxwellian;
+ bulkVelocity ( 0 0 0 );
+ id Ar;
+ mass 6.63352033e-26;
+ latticeStructure SC;
+ anchor ( 0 0 0 );
+ anchorSpecifies molecule;
+ tethered no;
+ orientationAngles ( 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict
new file mode 100644
index 0000000000000000000000000000000000000000..1abf7b0e569b0a3b4dd0530d9c9f3ec332d43f6c
--- /dev/null
+++ b/tutorials/molecularDynamics/mdEquilibrationFoam/periodicCube/system/potentialDict
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object potentialDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+removalOrder 1 ( Ar );
+
+pair
+{
+ Ar-Ar
+ {
+ pairPotential azizChen;
+ rCut 1.2e-09;
+ rMin 1.5e-10;
+ dr 2e-14;
+ azizChenCoeffs
+ {
+ epsilon 1.97742255e-21;
+ rm 3.759e-10;
+ A 9502720;
+ alpha 16.345655;
+ C6 1.0914254;
+ C8 0.6002595;
+ C10 0.3700113;
+ D 1.4;
+ gamma 2;
+ }
+
+ energyScalingFunction noScaling;
+ writeTables yes;
+ }
+}
+
+tether
+{
+ Ar
+ {
+ tetherPotential restrainedHarmonicSpring;
+ restrainedHarmonicSpringCoeffs
+ {
+ springConstant 0.0277;
+ rR 1.2e-09;
+ }
+ }
+}
+
+external
+{
+ gravity ( 0 0 0 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/bubbleFoam/bubbleColumn/0.org/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0.org/Ua
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ua
diff --git a/tutorials/bubbleFoam/bubbleColumn/0.org/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0.org/Ub
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/Ub
diff --git a/tutorials/bubbleFoam/bubbleColumn/0.org/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0.org/alpha
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/alpha
diff --git a/tutorials/bubbleFoam/bubbleColumn/0.org/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0.org/epsilon
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/epsilon
diff --git a/tutorials/bubbleFoam/bubbleColumn/0.org/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0.org/k
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/k
diff --git a/tutorials/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0.org/p
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
diff --git a/tutorials/bubbleFoam/bubbleColumn/0/Ua b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0/Ua
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ua
diff --git a/tutorials/bubbleFoam/bubbleColumn/0/Ub b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0/Ub
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/Ub
diff --git a/tutorials/bubbleFoam/bubbleColumn/0/alpha b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0/alpha
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/alpha
diff --git a/tutorials/bubbleFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0/epsilon
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/epsilon
diff --git a/tutorials/bubbleFoam/bubbleColumn/0/k b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0/k
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/k
diff --git a/tutorials/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/0/p
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties
similarity index 71%
rename from tutorials/bubbleFoam/bubbleColumn/constant/RASProperties
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties
index 3bb698673a1b454d8de4ae16debf32147e030d10..3569e78dc3564dc685fe71877c195db359d8343e 100644
--- a/tutorials/bubbleFoam/bubbleColumn/constant/RASProperties
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel laminar;
+RASModel laminar;
-turbulence off;
+turbulence off;
-printCoeffs off;
+printCoeffs off;
laminarCoeffs
{
@@ -26,17 +27,18 @@ laminarCoeffs
kEpsilonCoeffs
{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
}
wallFunctionCoeffs
{
- kappa 0.4187;
- E 9;
+ kappa 0.4187;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/blockMeshDict
diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
diff --git a/tutorials/bubbleFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
similarity index 61%
rename from tutorials/bubbleFoam/bubbleColumn/constant/transportProperties
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
index 11155a1923264716a2e5fcdb56bbe5f4c342b5fc..cfdcc78cc78f9a84679629a8773b81552d8f9924 100644
--- a/tutorials/bubbleFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,26 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rhoa rhoa [1 -3 0 0 0 0 0] 1;
+rhoa rhoa [ 1 -3 0 0 0 0 0 ] 1;
-rhob rhob [1 -3 0 0 0 0 0] 1000;
+rhob rhob [ 1 -3 0 0 0 0 0 ] 1000;
-nua nua [0 2 -1 0 0 0 0] 1.6e-05;
+nua nua [ 0 2 -1 0 0 0 0 ] 1.6e-05;
-nub nub [0 2 -1 0 0 0 0] 1e-06;
+nub nub [ 0 2 -1 0 0 0 0 ] 1e-06;
-da da [0 1 0 0 0 0 0] 0.003;
+da da [ 0 1 0 0 0 0 0 ] 0.003;
-db db [0 1 0 0 0 0 0] 0.0001;
+db db [ 0 1 0 0 0 0 0 ] 0.0001;
-Cvm Cvm [0 0 0 0 0 0 0] 0.5;
+Cvm Cvm [ 0 0 0 0 0 0 0 ] 0.5;
-Cl Cl [0 0 0 0 0 0 0] 0;
+Cl Cl [ 0 0 0 0 0 0 0 ] 0;
+
+Ct Ct [ 0 0 0 0 0 0 0 ] 1;
-Ct Ct [0 0 0 0 0 0 0] 1;
// ************************************************************************* //
diff --git a/tutorials/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
similarity index 92%
rename from tutorials/bubbleFoam/bubbleColumn/system/controlDict
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
index aad7cb2e7540f810f3fee89159c6e089b21fccb9..3691a7b810a4b94605892528dead9681db9cd880 100644
--- a/tutorials/bubbleFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/bubbleFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
similarity index 89%
rename from tutorials/bubbleFoam/bubbleColumn/system/fvSchemes
rename to tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
index 8a016bd1c44d2f6430dd6d1f89a0a1e5528c035b..9817f51954040119e64e4ad036f16c64d06437ac 100644
--- a/tutorials/bubbleFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -29,7 +30,7 @@ divSchemes
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
- div(phib,k) Gauss limitedLinear 1;
+ div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div((-nuEffa*grad(Ua).T())) Gauss linear;
@@ -57,7 +58,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..e987a2da9fd838660cb54a78ec1073ad9bfb8503
--- /dev/null
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/fvSolution
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ Ua
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Ub
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ alpha
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ beta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 2;
+ correctAlpha no;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/Allclean b/tutorials/multiphase/cavitatingFoam/les/Allclean
similarity index 100%
rename from tutorials/cavitatingFoam/les/Allclean
rename to tutorials/multiphase/cavitatingFoam/les/Allclean
diff --git a/tutorials/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
similarity index 100%
rename from tutorials/cavitatingFoam/les/Allrun
rename to tutorials/multiphase/cavitatingFoam/les/Allrun
diff --git a/tutorials/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/0/U
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/U
diff --git a/tutorials/cavitatingFoam/les/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/0/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/gamma
diff --git a/tutorials/cavitatingFoam/les/throttle/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/0/k
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/k
diff --git a/tutorials/cavitatingFoam/les/throttle/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/0/nuSgs
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs
diff --git a/tutorials/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/0/p
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/p
diff --git a/tutorials/cavitatingFoam/les/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/0/rho
rename to tutorials/multiphase/cavitatingFoam/les/throttle/0/rho
diff --git a/tutorials/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
similarity index 62%
rename from tutorials/cavitatingFoam/les/throttle/constant/LESProperties
rename to tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
index 86f1040611b61575a7159ed3fd9907dd8e31a62a..b16fea4ab2fb0e04dcbe2d821bf1b77c1f5eb3a5 100644
--- a/tutorials/cavitatingFoam/les/throttle/constant/LESProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
@@ -2,19 +2,22 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel devOneEqEddy;
+LESModel oneEqEddy;
+
+turbulence on;
delta smooth;
@@ -24,96 +27,96 @@ laminarCoeffs
devOneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -128,6 +131,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -135,9 +139,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -147,6 +153,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -154,10 +161,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -167,14 +176,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict
diff --git a/tutorials/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/cavitatingFoam/les/throttle/constant/polyMesh/boundary
rename to tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
index f7d75820c377876486fc7e532ffb122f9547d02d..b2c07faf58570d3ca814e6ea0b4f1697eca466a6 100644
--- a/tutorials/cavitatingFoam/les/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
new file mode 100644
index 0000000000000000000000000000000000000000..806b177923e7ad915e792f8d15a3546bc6ccd320
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "constant";
+ object thermodynamicProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+barotropicCompressibilityModel linear;
+
+psiv psiv [ 0 -2 2 0 0 ] 2.5e-06;
+
+rholSat rholSat [ 1 -3 0 0 0 ] 830;
+
+psil psil [ 0 -2 2 0 0 ] 5e-07;
+
+pSat pSat [ 1 -1 -2 0 0 ] 4500;
+
+rhoMin rhoMin [ 1 -3 0 0 0 ] 0.001;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..7d254ddcf23603b5709e6a4d1bc0fb82d9934386
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
@@ -0,0 +1,74 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+mul mul [ 1 -1 -1 0 0 ] 0.0065;
+
+muv muv [ 1 -1 -1 0 0 ] 5.953e-06;
+
+twoPhase
+{
+ transportModel twoPhase;
+ phase1 phase1;
+ phase2 phase2;
+}
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 830;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ m m [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ k k [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 0.14;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ m m [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ k k [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9ddab1bfcd2e922809b338b9bf02770bf770a024
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1
new file mode 100644
index 0000000000000000000000000000000000000000..a7c7e625e5403387aa3b92c464b9d8c5615c7ba4
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object cellSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2
new file mode 100644
index 0000000000000000000000000000000000000000..470258895d1a503d39431f85dc16d207019b0cc0
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object cellSetDict.2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3
new file mode 100644
index 0000000000000000000000000000000000000000..530c710e1f0e6bae3655c4127e4bca08ecd7a049
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object cellSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/channelFoam/channel395/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
similarity index 56%
rename from tutorials/channelFoam/channel395/system/controlDict
rename to tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 8ac4d8f359239087919e5ac021bf5762053f1cf5..073ada6caa4135e14a0734304802d068a2d2b87a 100644
--- a/tutorials/channelFoam/channel395/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -1,79 +1,85 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-startFrom startTime;
+startFrom latestTime;
startTime 0;
stopAt endTime;
-endTime 1000;
+endTime 0.0002;
-deltaT 0.2;
+deltaT 1e-08;
-writeControl timeStep;
+writeControl adjustableRunTime;
-writeInterval 200;
+writeInterval 2e-05;
purgeWrite 0;
-writeFormat ascii;
+writeFormat binary;
writePrecision 6;
-writeCompression uncompressed;
+writeCompression compressed;
timeFormat general;
-timePrecision 6;
-
runTimeModifiable yes;
+adjustTimeStep on;
+
+maxCo 0.5;
+
+maxAcousticCo 50;
+
functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
- enabled true;
-
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
+ enabled false;
outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
fields
(
U
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
+
p
{
- mean on;
- prime2Mean on;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
+ }
+
+ gamma
+ {
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..957a4953528940c7639e5bd5dda7dec8949d68f1
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes
@@ -0,0 +1,66 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+divSchemes
+{
+ default none;
+ div(phiv,rho) Gauss limitedLinear 0.2;
+ div(phi,U) Gauss filteredLinear2V 0.2 0;
+ div(phiv,k) Gauss filteredLinear2 0.2 0;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+laplacianSchemes
+{
+ default none;
+ laplacian(nuf,rhoU) Gauss linear corrected;
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(rrhoUAf,p) Gauss linear corrected;
+ laplacian(rUAf,p) Gauss linear corrected;
+ laplacian(DkEff,k) Gauss linear corrected;
+ laplacian(1,p) Gauss linear corrected;
+}
+
+snGradSchemes
+{
+ default none;
+ snGrad(p) corrected;
+}
+
+fluxRequired
+{
+ default none;
+ p ;
+ rho ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..b0f2c1c77191ffe367c8e7e163f0a0e3e9e802e6
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
@@ -0,0 +1,92 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ omega
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ p
+ {
+ solver GAMG;
+ tolerance 0;
+ relTol 0.1;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pFinal
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+}
+
+PISO
+{
+ nCorrectors 3;
+ nNonOrthogonalCorrectors 0;
+}
+
+SIMPLE
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..1cc48dd0cc739a9bfdf6c12df5980eeb0f78379b
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+set c0;
+
+coordinateSystem global;
+
+globalCoeffs
+{
+ tan1 ( 1 0 0 );
+ tan2 ( 0 1 0 );
+}
+
+directions ( tan1 tan2 );
+
+useHexTopology yes;
+
+geometricCut no;
+
+writeMesh no;
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0.org/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0.org/U
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0.org/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0.org/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/gamma
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0.org/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0.org/k
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0.org/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0.org/nuSgs
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0.org/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0.org/p
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0.org/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0.org/rho
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0/U
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0/U
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0/gamma b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0/gamma
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0/gamma
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0/k
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0/k
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0/nuSgs
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0/p
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0/p
diff --git a/tutorials/cavitatingFoam/les/throttle3D/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/0/rho
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/0/rho
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b16fea4ab2fb0e04dcbe2d821bf1b77c1f5eb3a5
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
@@ -0,0 +1,191 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object LESProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+LESModel oneEqEddy;
+
+turbulence on;
+
+delta smooth;
+
+laminarCoeffs
+{
+}
+
+devOneEqEddyCoeffs
+{
+ ck 0.07;
+ ce 1.05;
+}
+
+oneEqEddyCoeffs
+{
+ ck 0.07;
+ ce 1.05;
+}
+
+dynOneEqEddyCoeffs
+{
+ ce 1.05;
+ filter simple;
+}
+
+locDynOneEqEddyCoeffs
+{
+ ce 1.05;
+ filter simple;
+}
+
+SmagorinskyCoeffs
+{
+ ce 1.05;
+ ck 0.07;
+}
+
+Smagorinsky2Coeffs
+{
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
+}
+
+spectEddyViscCoeffs
+{
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
+}
+
+dynSmagorinskyCoeffs
+{
+ ce 1.05;
+ filter simple;
+}
+
+mixedSmagorinskyCoeffs
+{
+ ce 1.05;
+ ck 0.07;
+ filter simple;
+}
+
+dynMixedSmagorinskyCoeffs
+{
+ ce 1.05;
+ filter simple;
+}
+
+LRRDiffStressCoeffs
+{
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
+}
+
+DeardorffDiffStressCoeffs
+{
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+ CDES 0.65;
+ ck 0.07;
+}
+
+cubeRootVolCoeffs
+{
+ deltaCoeff 1;
+}
+
+PrandtlCoeffs
+{
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ smoothCoeffs
+ {
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ maxDeltaRatio 1.1;
+ }
+
+ Cdelta 0.158;
+}
+
+vanDriestCoeffs
+{
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ smoothCoeffs
+ {
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ maxDeltaRatio 1.1;
+ }
+
+ Aplus 26;
+ Cdelta 0.158;
+}
+
+smoothCoeffs
+{
+ delta cubeRootVol;
+ cubeRootVolCoeffs
+ {
+ deltaCoeff 1;
+ }
+
+ maxDeltaRatio 1.1;
+}
+
+kappa 0.4187;
+
+wallFunctionCoeffs
+{
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict
diff --git a/tutorials/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
rename to tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
index 30c545703a24f488a1d52a1d8ceca4fb3dfdc69e..adffe02dd45cd472f937c168e19da397fa4b5792 100644
--- a/tutorials/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
new file mode 100644
index 0000000000000000000000000000000000000000..806b177923e7ad915e792f8d15a3546bc6ccd320
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "constant";
+ object thermodynamicProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+barotropicCompressibilityModel linear;
+
+psiv psiv [ 0 -2 2 0 0 ] 2.5e-06;
+
+rholSat rholSat [ 1 -3 0 0 0 ] 830;
+
+psil psil [ 0 -2 2 0 0 ] 5e-07;
+
+pSat pSat [ 1 -1 -2 0 0 ] 4500;
+
+rhoMin rhoMin [ 1 -3 0 0 0 ] 0.001;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..7d254ddcf23603b5709e6a4d1bc0fb82d9934386
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
@@ -0,0 +1,74 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+mul mul [ 1 -1 -1 0 0 ] 0.0065;
+
+muv muv [ 1 -1 -1 0 0 ] 5.953e-06;
+
+twoPhase
+{
+ transportModel twoPhase;
+ phase1 phase1;
+ phase2 phase2;
+}
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 830;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ m m [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ k k [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 0.14;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ m m [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ k k [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9ddab1bfcd2e922809b338b9bf02770bf770a024
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1
new file mode 100644
index 0000000000000000000000000000000000000000..a7c7e625e5403387aa3b92c464b9d8c5615c7ba4
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object cellSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2
new file mode 100644
index 0000000000000000000000000000000000000000..470258895d1a503d39431f85dc16d207019b0cc0
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object cellSetDict.2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3
new file mode 100644
index 0000000000000000000000000000000000000000..530c710e1f0e6bae3655c4127e4bca08ecd7a049
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3
@@ -0,0 +1,25 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object cellSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..0b3c87648677c77cd65dbecb5951ab982b360f6a
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -0,0 +1,85 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.0001;
+
+deltaT 1e-08;
+
+writeControl adjustableRunTime;
+
+writeInterval 5e-06;
+
+purgeWrite 0;
+
+writeFormat binary;
+
+writePrecision 6;
+
+writeCompression compressed;
+
+timeFormat general;
+
+runTimeModifiable yes;
+
+adjustTimeStep on;
+
+maxCo 0.5;
+
+maxAcousticCo 50;
+
+functions
+(
+ fieldAverage1
+ {
+ type fieldAverage;
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
+ enabled false;
+ outputControl outputTime;
+ fields
+ (
+ U
+ {
+ mean on;
+ prime2Mean off;
+ base time;
+ }
+
+ p
+ {
+ mean on;
+ prime2Mean off;
+ base time ;
+ }
+
+ gamma
+ {
+ mean on;
+ prime2Mean off;
+ base time;
+ }
+ );
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
new file mode 100644
index 0000000000000000000000000000000000000000..14efcafd72ee49e7952c70bb62c02612ac4bdd7b
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method simple;
+
+simpleCoeffs
+{
+ n ( 2 2 1 );
+ delta 0.001;
+}
+
+hierarchicalCoeffs
+{
+ n ( 1 1 1 );
+ delta 0.001;
+ order xyz;
+}
+
+metisCoeffs
+{
+ processorWeights ( 1 1 1 1 );
+}
+
+manualCoeffs
+{
+ dataFile "";
+}
+
+distributed no;
+
+roots ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..957a4953528940c7639e5bd5dda7dec8949d68f1
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes
@@ -0,0 +1,66 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+divSchemes
+{
+ default none;
+ div(phiv,rho) Gauss limitedLinear 0.2;
+ div(phi,U) Gauss filteredLinear2V 0.2 0;
+ div(phiv,k) Gauss filteredLinear2 0.2 0;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+laplacianSchemes
+{
+ default none;
+ laplacian(nuf,rhoU) Gauss linear corrected;
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(rrhoUAf,p) Gauss linear corrected;
+ laplacian(rUAf,p) Gauss linear corrected;
+ laplacian(DkEff,k) Gauss linear corrected;
+ laplacian(1,p) Gauss linear corrected;
+}
+
+snGradSchemes
+{
+ default none;
+ snGrad(p) corrected;
+}
+
+fluxRequired
+{
+ default none;
+ p ;
+ rho ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..b0f2c1c77191ffe367c8e7e163f0a0e3e9e802e6
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
@@ -0,0 +1,92 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ omega
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ p
+ {
+ solver GAMG;
+ tolerance 0;
+ relTol 0.1;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pFinal
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+}
+
+PISO
+{
+ nCorrectors 3;
+ nNonOrthogonalCorrectors 0;
+}
+
+SIMPLE
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..f162b0b3abe50a21696b0064fee988297e061024
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object mapFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+patchMap ( );
+
+cuttingPatches ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..b2ee8aaba8be572268e2eb4dad46b011c87112d5
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict
@@ -0,0 +1,38 @@
+/*--------------------------------*- 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 binary;
+ class dictionary;
+ location "system";
+ object refineMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+set c0;
+
+coordinateSystem global;
+
+globalCoeffs
+{
+ tan1 ( 1 0 0 );
+ tan2 ( 0 1 0 );
+ tan3 ( 0 0 1 );
+}
+
+directions ( tan1 tan2 tan3 );
+
+useHexTopology yes;
+
+geometricCut no;
+
+writeMesh no;
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/0/U
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/U
diff --git a/tutorials/cavitatingFoam/ras/throttle/0/gamma b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/0/gamma
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/gamma
diff --git a/tutorials/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
similarity index 77%
rename from tutorials/cavitatingFoam/ras/throttle/0/k
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
index 835c3a9992879be78d1f2ea259527535159f405a..732cdd4d128bc45a4ba908f6ffafd53c5da08971 100644
--- a/tutorials/cavitatingFoam/ras/throttle/0/k
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0];
+dimensions [0 2 -2 0 0 0 0];
-internalField uniform 10.0;
+internalField uniform 10;
boundaryField
{
@@ -26,21 +27,20 @@ boundaryField
intensity 0.05;
value uniform 0.05;
}
-
outlet
{
type zeroGradient;
}
-
walls
{
- type zeroGradient;
+ type kQRWallFunction;
+ value uniform 10;
}
-
frontBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..933ce47778c7422cd0fbf38d27abdea527a5e350
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut
@@ -0,0 +1,46 @@
+/*--------------------------------*- 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 volScalarField;
+ location "0";
+ object nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ walls
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ frontBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
similarity index 77%
rename from tutorials/cavitatingFoam/ras/throttle/0/omega
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
index 330a29d8c18b0445f18a41e3384372f8d48970b6..17b398f9c3ead11f88ad8b7f411e599bd4ac9f99 100644
--- a/tutorials/cavitatingFoam/ras/throttle/0/omega
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object omega;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 -1 0 0];
+dimensions [0 0 -1 0 0 0 0];
internalField uniform 77200;
@@ -23,25 +24,24 @@ boundaryField
inlet
{
type turbulentMixingLengthFrequencyInlet;
- mixingLength 0.5e-03;
+ mixingLength 0.0005;
k k;
value uniform 77200;
}
-
outlet
{
type zeroGradient;
}
-
walls
{
- type zeroGradient;
+ type omegaWallFunction;
+ value uniform 77200;
}
-
frontBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/0/p
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
diff --git a/tutorials/cavitatingFoam/ras/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/0/rho
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho
diff --git a/tutorials/cavitatingFoam/ras/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/Allclean
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/Allclean
diff --git a/tutorials/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/Allrun
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..461a7c61ff5489e67e96b994a036d66ca9355ed8
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties
@@ -0,0 +1,199 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kOmegaSST;
+
+turbulence on;
+
+laminarCoeffs
+{
+}
+
+kOmegaSSTCoeffs
+{
+ alphaK1 0.85034;
+ alphaK2 1;
+ alphaOmega1 0.5;
+ alphaOmega2 0.85616;
+ gamma1 0.5532;
+ gamma2 0.4403;
+ beta1 0.075;
+ beta2 0.0828;
+ betaStar 0.09;
+ a1 0.31;
+ c1 10;
+ Cmu 0.09;
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+realizableKECoeffs
+{
+ Cmu 0.09;
+ A0 4;
+ C2 1.9;
+ alphak 1;
+ alphaEps 0.833333;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict
diff --git a/tutorials/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index 716ff9df05e0d84e526e8feefb9a721fd0f04798..59f24d80d0f357d27a4b9bfd10777011d610ffa8 100644
--- a/tutorials/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
similarity index 68%
rename from tutorials/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
index 95d1ebb145b62ea87b5cb0a4a08f0d9cf720b7a9..8e37778cf1a27db45ef5d5bc72717cb214e87f7e 100644
--- a/tutorials/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,14 +10,22 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermodynamicProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rho0 rho0 [1 -3 0 0 0 0 0] 1000;
+barotropicCompressibilityModel linear;
-p0 p0 [1 -1 -2 0 0 0 0] 100000;
+psiv psiv [ 0 -2 2 0 0 ] 2.5e-06;
+
+rholSat rholSat [ 1 -3 0 0 0 ] 830;
+
+psil psil [ 0 -2 2 0 0 ] 5e-07;
+
+pSat pSat [ 1 -1 -2 0 0 ] 4500;
+
+rhoMin rhoMin [ 1 -3 0 0 0 ] 0.001;
-psi psi [0 -2 2 0 0 0 0] 4.54e-07;
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..d87d3805cadf39344df36bc66e637941abe44596
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
@@ -0,0 +1,74 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+mul mul [ 1 -1 -1 0 0 ] 0.0065;
+
+muv muv [ 1 -1 -1 0 0 ] 5.953e-06;
+
+twoPhase
+{
+ transportModel twoPhase;
+ phase1 phase1;
+ phase2 phase2;
+}
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 830;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ m m [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ k k [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 0.14;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ m m [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] -999;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] -999;
+ k k [ 0 0 1 0 0 0 0 ] -999;
+ n n [ 0 0 0 0 0 0 0 ] -999;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b70f6702e4ef7644c20687bce6536c6690720da9
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1
similarity index 75%
rename from tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.1
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1
index 9dc6572157363a81371dd84e0eb1e9371d758ce7..b693a8e2658b1a4f06071d32ac4bdae3a08ba2e5 100644
--- a/tutorials/cavitatingFoam/les/throttle3D/system/cellSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.1
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ location "system";
+ object cellSetDict.1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name c0;
-action new;
+action new;
+
+topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } );
-topoSetSources
-(
- boxToCell
- {
- box (4e-03 -1e-03 -1) (12e-3 1e-03 1);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2
new file mode 100644
index 0000000000000000000000000000000000000000..bb0f5cec255a6bf0c46c0c540c6c39ca0bec70a2
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.2
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object cellSetDict.2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3
new file mode 100644
index 0000000000000000000000000000000000000000..910813740228d284c14885b2d13cd3b40b812bf2
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/cellSetDict.3
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object cellSetDict.3;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..d541a7c7ef32bd611f562d8519435e5d5db17486
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.002;
+
+deltaT 1e-08;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.0001;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+runTimeModifiable yes;
+
+adjustTimeStep on;
+
+maxCo 0.5;
+
+maxAcousticCo 50;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..28237bd21c5a7b0331d99edf1b10d94a8fe533f8
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes
@@ -0,0 +1,68 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+divSchemes
+{
+ default none;
+ div(phiv,rho) Gauss limitedLinear 0.2;
+ div(phi,U) Gauss limitedLinearV 0.2;
+ div(phiv,omega) Gauss limitedLinear 0.2;
+ div(phiv,k) Gauss limitedLinear 0.2;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+}
+
+laplacianSchemes
+{
+ default none;
+ laplacian(nuf,rhoU) Gauss linear corrected;
+ laplacian(muEff,U) Gauss linear corrected;
+ laplacian(rrhoUAf,p) Gauss linear corrected;
+ laplacian(rUAf,p) Gauss linear corrected;
+ laplacian(DomegaEff,omega) Gauss linear corrected;
+ laplacian(DkEff,k) Gauss linear corrected;
+ laplacian(1,p) Gauss linear corrected;
+}
+
+snGradSchemes
+{
+ default none;
+ snGrad(p) corrected;
+}
+
+fluxRequired
+{
+ default none;
+ p ;
+ rho ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..f139c3dde474429bb5378044aa3de7471a7f6385
--- /dev/null
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
@@ -0,0 +1,92 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ omega
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ p
+ {
+ solver GAMG;
+ tolerance 0;
+ relTol 0.1;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pFinal
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 1;
+}
+
+SIMPLE
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
similarity index 75%
rename from tutorials/interFoam/les/nozzleFlow2D/system/refineMeshDict
rename to tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
index 170cf1ffab6f9cf63b5879fa6a5801d2a548b6cb..0a46e4d6670e184852cea0fb39376e957a24fdc3 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/system/refineMeshDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,35 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object refineMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-set c0;
+set c0;
coordinateSystem global;
globalCoeffs
{
- tan1 (1 0 0);
- tan2 (0 1 0);
+ tan1 ( 1 0 0 );
+ tan2 ( 0 1 0 );
}
-patchLocalCoeffs
-{
- patch outside;
- tan1 (1 0 0);
-}
+directions ( tan1 tan2 );
-directions
-(
- tan1
-);
+useHexTopology yes;
-useHexTopology no;
+geometricCut no;
-geometricCut yes;
+writeMesh no;
-writeMesh no;
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/0/U b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U
similarity index 94%
rename from tutorials/compressibleInterFoam/depthCharge2D/0/U
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U
index 367007d0c0ac04629d7b7b24464e19c55ce25d22..5b7a093a4f1a7a3fd9d894c5816520479f592166 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org
similarity index 93%
rename from tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org
index f0a978580ee347e0159ed3b5f47665127c7b85a9..355df071cbcdb252069691da3b06e4b3a5f43460 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/0/alpha1.org
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org
similarity index 93%
rename from tutorials/compressibleInterFoam/depthCharge2D/0/pd.org
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org
index dd6d6631cad8b29e8cb23c402504b1b6757bed8e..5f5f977f4311ab2cad0ebf9602845f7a3a48cf50 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/0/pd.org
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/0/pd.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun
similarity index 100%
rename from tutorials/compressibleInterFoam/depthCharge2D/Allrun
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/Allrun
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties
similarity index 65%
rename from tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties
index bb84772ba51036c08aa1082c7e6720dfe9d65037..dd76a64b4322ec34e9f1ad69d99f59864483e211 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/constant/LESProperties
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,89 +27,89 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -123,6 +124,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -130,9 +132,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -142,6 +146,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -149,10 +154,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -162,14 +169,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
similarity index 84%
rename from tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
index c65ebf7f14b660d9bd5a86dbe868a819b4cf9fc7..938322374a12738e1c9fd6b846c4b8187e6177df 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
similarity index 94%
rename from tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
index 56d39f67b2f56dabcc34b604d8bd5caad2d60703..0231b385dfca17e9f7af6bbbc59bada7b7f369fb 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
index a6a3281fd72f7a13b8fb5bd5a0d44edc0abc0059..52529b0c3d5075ad4224ad57b495a8f91cda9eaf 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev-09ca1eb6b56f |
+| \\ / O peration | Version: 1.5-09ca1eb6b56f |
| \\ / A nd | |
| \\/ M anipulation | www.OpenFOAM.org |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..67e66cd27d1df7d295302ee3b4f3744065d9a450
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ rho0 rho0 [ 1 -3 0 0 0 0 0 ] 1000;
+ psi psi [ 0 -2 2 0 0 ] 1e-05;
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.589e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ rho0 rho0 [ 1 -3 0 0 0 0 0 ] 0;
+ psi psi [ 0 -2 2 0 0 ] 1e-05;
+}
+
+pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000;
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a925d3cc2b28640b5aebf7779f6a9008e77b09fc
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict
similarity index 89%
rename from tutorials/compressibleInterFoam/depthCharge2D/system/controlDict
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict
index 03f0c207d6fd268ad7267214f33a705e87554c1f..53a30129f4a4eb55b01f71112d3864e8b66b7462 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -23,11 +23,11 @@ stopAt endTime;
endTime 0.5;
-deltaT 1e-04;
+deltaT 0.0001;
writeControl adjustableRunTime;
-writeInterval 5e-03;
+writeInterval 0.005;
purgeWrite 0;
@@ -49,4 +49,5 @@ maxCo 0.25;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes
similarity index 77%
rename from tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes
index ee05b3ed1d2133d70d60afad6c05a6f7c65b92e8..373e1ca67d95f93b6f87c25f206a931c6c14ba76 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -26,15 +27,11 @@ gradSchemes
divSchemes
{
- div(rho*phi,U) Gauss upwind; //linear;
-
+ div(rho*phi,U) Gauss upwind;
div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss interfaceCompression 1.0;
-
- div(phi,pd) Gauss upwind; //vanLeer; //linear;
-
+ div(phirb,alpha) Gauss interfaceCompression 1;
+ div(phi,pd) Gauss upwind;
div(phi,k) Gauss vanLeer;
-
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -45,7 +42,7 @@ laplacianSchemes
interpolationSchemes
{
- default linear;
+ default linear;
}
snGradSchemes
@@ -56,9 +53,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ gamma ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..3416674d0782e6a26af8e5de6eb075c7b792a6cf
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/fvSolution
@@ -0,0 +1,134 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ rho
+ {
+ solver diagonal;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-07;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-07;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-07;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ transSonic no;
+ nOuterCorrectors 3;
+ nCorrectors 1;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 1;
+ cAlpha 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict
similarity index 65%
rename from tutorials/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
rename to tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict
index 708c1cacd697d76dc1290bd72a30614d92ada9ef..d1992643325e54bb632fa934b57dc0c257580c08 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge2D/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-defaultFieldValues
-(
- volScalarFieldValue gamma 0
- volVectorFieldValue U (0 0 0)
-);
+defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 );
-regions
-(
- boxToCell
- {
- box (0 0 0) (0.60 0.1875 0.75);
+regions ( sphereToCell { centre ( 0.5 0.5 0 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } );
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
- }
-);
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/0/U b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U
similarity index 93%
rename from tutorials/compressibleInterFoam/depthCharge3D/0/U
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U
index 6840d0129ffba7002bf7ffcee4028d548ac2d02f..06fac63442a65c66af325f4e0110e0465d84f85f 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/0/U
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org
similarity index 93%
rename from tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org
index cf3931804ff3b104621bada30b87c449748808b2..38175b056ae3aba273aa07f76b4d2ee94da9fd4e 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/0/alpha1.org
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org
similarity index 93%
rename from tutorials/compressibleInterFoam/depthCharge3D/0/pd.org
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org
index 57bee34347bb93e83fc679b2360f4bc9aa216195..efe6f4ca9c57592011bedf77d0c8ff218a2eea5c 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/0/pd.org
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/0/pd.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean
similarity index 100%
rename from tutorials/compressibleInterFoam/depthCharge3D/Allclean
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allclean
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun
similarity index 100%
rename from tutorials/compressibleInterFoam/depthCharge3D/Allrun
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/Allrun
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties
similarity index 65%
rename from tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties
index bb84772ba51036c08aa1082c7e6720dfe9d65037..dd76a64b4322ec34e9f1ad69d99f59864483e211 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/constant/LESProperties
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,89 +27,89 @@ laminarCoeffs
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -123,6 +124,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -130,9 +132,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -142,6 +146,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -149,10 +154,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -162,14 +169,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
similarity index 84%
rename from tutorials/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
index 40232c0c406c02d21a4ae29a31f702bbf84c6214..938322374a12738e1c9fd6b846c4b8187e6177df 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
similarity index 94%
rename from tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
index 6a0e1ca9ce740b5cae31b95714d2f2f6bba392b1..c93921851e1c854413cb7e2aff8f2bd474d83fea 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
similarity index 93%
rename from tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
index 3517ca55be180a00b154b971fd6945bd75fd1afc..f3c84ef8fbdd9331d89e5698db346553c27425d6 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev-09ca1eb6b56f |
+| \\ / O peration | Version: 1.5-09ca1eb6b56f |
| \\ / A nd | |
| \\/ M anipulation | www.OpenFOAM.org |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..67e66cd27d1df7d295302ee3b4f3744065d9a450
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- 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 "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ rho0 rho0 [ 1 -3 0 0 0 0 0 ] 1000;
+ psi psi [ 0 -2 2 0 0 ] 1e-05;
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.589e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ rho0 rho0 [ 1 -3 0 0 0 0 0 ] 0;
+ psi psi [ 0 -2 2 0 0 ] 1e-05;
+}
+
+pMin pMin [ 1 -1 -2 0 0 0 0 ] 10000;
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a925d3cc2b28640b5aebf7779f6a9008e77b09fc
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict
similarity index 89%
rename from tutorials/compressibleInterFoam/depthCharge3D/system/controlDict
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict
index 03f0c207d6fd268ad7267214f33a705e87554c1f..53a30129f4a4eb55b01f71112d3864e8b66b7462 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -23,11 +23,11 @@ stopAt endTime;
endTime 0.5;
-deltaT 1e-04;
+deltaT 0.0001;
writeControl adjustableRunTime;
-writeInterval 5e-03;
+writeInterval 0.005;
purgeWrite 0;
@@ -49,4 +49,5 @@ maxCo 0.25;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict
similarity index 84%
rename from tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict
index fd4a88324169c196c7a5ff8e48a0a1fd3893b6d3..59ad3aca886f37729e4941e28a63e9982d6f660e 100644
--- a/tutorials/compressibleInterFoam/depthCharge3D/system/decomposeParDict
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,24 +18,23 @@ FoamFile
numberOfSubdomains 4;
method hierarchical;
-//method metis;
-//method parMetis;
simpleCoeffs
{
- n (1 4 1);
+ n ( 1 4 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (1 4 1);
+ n ( 1 4 1 );
delta 0.001;
order xyz;
}
metisCoeffs
-{}
+{
+}
manualCoeffs
{
@@ -43,8 +43,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes
similarity index 77%
rename from tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes
index ee05b3ed1d2133d70d60afad6c05a6f7c65b92e8..373e1ca67d95f93b6f87c25f206a931c6c14ba76 100644
--- a/tutorials/compressibleInterFoam/depthCharge2D/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -26,15 +27,11 @@ gradSchemes
divSchemes
{
- div(rho*phi,U) Gauss upwind; //linear;
-
+ div(rho*phi,U) Gauss upwind;
div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss interfaceCompression 1.0;
-
- div(phi,pd) Gauss upwind; //vanLeer; //linear;
-
+ div(phirb,alpha) Gauss interfaceCompression 1;
+ div(phi,pd) Gauss upwind;
div(phi,k) Gauss vanLeer;
-
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -45,7 +42,7 @@ laplacianSchemes
interpolationSchemes
{
- default linear;
+ default linear;
}
snGradSchemes
@@ -56,9 +53,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ gamma ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..3416674d0782e6a26af8e5de6eb075c7b792a6cf
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/fvSolution
@@ -0,0 +1,134 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ rho
+ {
+ solver diagonal;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-07;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-07;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-07;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ transSonic no;
+ nOuterCorrectors 3;
+ nCorrectors 1;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 1;
+ cAlpha 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressibleInterFoam/depthCharge3D/system/machines b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/machines
similarity index 100%
rename from tutorials/compressibleInterFoam/depthCharge3D/system/machines
rename to tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/machines
diff --git a/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..fb686e791c29a4621e44bf2cab9b086005d62bc0
--- /dev/null
+++ b/tutorials/multiphase/compressibleInterFoam/depthCharge3D/system/setFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- 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 setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 );
+
+regions ( sphereToCell { centre ( 0.5 0.5 0.5 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/U b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U
similarity index 94%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0-orig/U
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U
index be74aea5a1aaf718ea75cf5a20eb54ccd26c383d..f37e2e0d0f33e4884077c84e9cca1affac24fa4f 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/U
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0/gamma.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1
similarity index 92%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1
index e7dd5fba7368da3b79bb3cbb827b2dd005130122..07881e9c0cc055b86dae8ee60e356cc97141dfdb 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/gamma b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1.org
similarity index 92%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0-orig/gamma
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1.org
index e7dd5fba7368da3b79bb3cbb827b2dd005130122..07881e9c0cc055b86dae8ee60e356cc97141dfdb 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/gamma
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0/pd b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd
similarity index 95%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0/pd
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd
index bf55dd55f315cf27b92d411d5096a5a4aec43242..f5801776cf3a904337fb7591c1581bbfa72c7a6d 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0/pd
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0/U b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U
similarity index 92%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0/U
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U
index 92dbcc46724d7ba2b763f571d9ca3dfb0fd93ead..6d3ce2531bf967c9224c82b1f55f1c483848fa0b 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0/U
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/U
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,7 +24,6 @@ boundaryField
atmosphere
{
type pressureInletOutletVelocity;
- phi phi;
value uniform (0 0 0);
}
walls
@@ -33,4 +33,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0/gamma b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1
similarity index 99%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0/gamma
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1
index f933566bb4830a8d9a3feb50b92a98c0840a81a0..c6e0907e27289d26c9e1974628e640457cfc51bb 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0/gamma
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,7 +10,8 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ location "0";
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -32804,4 +32805,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org
similarity index 92%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org
index e7dd5fba7368da3b79bb3cbb827b2dd005130122..07881e9c0cc055b86dae8ee60e356cc97141dfdb 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/pd b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd
similarity index 95%
rename from tutorials/interDyMFoam/damBreakWithObstacle/0-orig/pd
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd
index bf55dd55f315cf27b92d411d5096a5a4aec43242..f5801776cf3a904337fb7591c1581bbfa72c7a6d 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/0-orig/pd
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/Allrun b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/Allrun
similarity index 100%
rename from tutorials/interDyMFoam/damBreakWithObstacle/Allrun
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/Allrun
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/VTK/c0/c0_1.vtk b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/VTK/c0/c0_1.vtk
new file mode 100644
index 0000000000000000000000000000000000000000..af03eba46538789965e6f8ab0137eb890e833a2b
Binary files /dev/null and b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/VTK/c0/c0_1.vtk differ
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..035a467881184ab15b7f8e2874b04983bc167675
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/RASProperties
@@ -0,0 +1,176 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel laminar;
+
+turbulence on;
+
+printCoeffs off;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/gnemdFoam/nanoNozzle/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict
similarity index 61%
rename from tutorials/gnemdFoam/nanoNozzle/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict
index 69e7126628c6cb18221392557b2e3bc2d2eb46e5..0560899a729106f76c45811f4429b8014a711d30 100644
--- a/tutorials/gnemdFoam/nanoNozzle/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/dynamicMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,47 +10,32 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object decomposeParDict;
+ location "constant";
+ object dynamicMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-numberOfSubdomains 4;
+dynamicFvMesh dynamicRefineFvMesh;
-method metis;
-
-simpleCoeffs
-{
- n (4 1 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
+dynamicRefineFvMeshCoeffs
{
- n (1 1 1);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- processorWeights
+ refineInterval 1;
+ field alpha1;
+ lowerRefineLevel 0.001;
+ upperRefineLevel 0.999;
+ unrefineLevel 10;
+ nBufferLayers 1;
+ maxRefinement 2;
+ maxCells 200000;
+ correctFluxes
(
- 1
- 1
- 1
- 1
+ (
+ phi
+ U
+ )
);
+ dumpLevel true;
}
-manualCoeffs
-{
- dataFile "";
-}
-
-distributed no;
-
-roots
-(
-);
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..639bd90b066ffdac881dc8722b84c1bf39170e9d
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict
similarity index 94%
rename from tutorials/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict
index 09be8b82ff78d294ba284bb86ff83c3a10e33f1b..b31c66979716d07e62e665e402c29a9f64111e35 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary
index 1300f15c762cb0db7971c1aca556785ce057f860..924d99d9373a00ca40e7b97192e8911704e94737 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0 b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0
new file mode 100644
index 0000000000000000000000000000000000000000..2f7f7412e51609a949d7c20ea4fbb7d3a183fae3
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0
@@ -0,0 +1,32277 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class cellSet;
+ object c0;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+32256
+(
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522
+523
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+543
+544
+545
+546
+547
+548
+549
+550
+551
+552
+553
+554
+555
+564
+565
+566
+567
+568
+569
+570
+571
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582
+583
+584
+585
+586
+587
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+607
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639
+640
+641
+642
+643
+644
+645
+646
+647
+648
+649
+650
+651
+652
+653
+654
+655
+656
+657
+658
+659
+660
+661
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688
+689
+690
+691
+692
+693
+694
+695
+696
+697
+698
+699
+700
+701
+702
+703
+704
+705
+706
+707
+708
+709
+710
+711
+712
+713
+714
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740
+741
+742
+743
+744
+745
+746
+747
+748
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+760
+761
+762
+763
+764
+765
+766
+767
+768
+769
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+793
+794
+795
+796
+797
+798
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+820
+821
+822
+823
+824
+825
+826
+827
+828
+829
+830
+831
+832
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846
+847
+848
+849
+850
+851
+852
+853
+854
+855
+856
+857
+858
+859
+860
+861
+862
+863
+864
+865
+866
+867
+868
+869
+870
+871
+872
+873
+874
+875
+876
+877
+878
+879
+880
+881
+882
+883
+884
+885
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+931
+932
+933
+934
+935
+936
+937
+938
+939
+940
+941
+942
+943
+944
+945
+946
+947
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982
+983
+984
+985
+986
+987
+988
+989
+990
+991
+992
+993
+994
+995
+996
+997
+998
+999
+1000
+1001
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013
+1014
+1015
+1016
+1017
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026
+1027
+1028
+1029
+1030
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047
+1048
+1049
+1050
+1051
+1052
+1053
+1054
+1055
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066
+1067
+1068
+1069
+1070
+1071
+1072
+1073
+1074
+1075
+1076
+1077
+1078
+1079
+1080
+1081
+1082
+1083
+1084
+1085
+1086
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096
+1097
+1098
+1099
+1100
+1101
+1102
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113
+1114
+1115
+1116
+1117
+1118
+1119
+1120
+1121
+1122
+1123
+1124
+1125
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134
+1135
+1136
+1137
+1138
+1139
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149
+1150
+1151
+1152
+1153
+1154
+1155
+1156
+1157
+1158
+1159
+1160
+1161
+1162
+1163
+1164
+1165
+1166
+1167
+1168
+1169
+1170
+1171
+1172
+1173
+1174
+1175
+1176
+1177
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1200
+1201
+1202
+1203
+1204
+1205
+1206
+1207
+1208
+1209
+1210
+1211
+1212
+1213
+1214
+1215
+1216
+1217
+1218
+1219
+1220
+1221
+1222
+1223
+1224
+1225
+1226
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294
+1295
+1296
+1297
+1298
+1299
+1300
+1301
+1302
+1303
+1304
+1305
+1306
+1307
+1308
+1309
+1310
+1311
+1312
+1313
+1314
+1315
+1316
+1317
+1318
+1319
+1320
+1321
+1322
+1323
+1324
+1325
+1326
+1327
+1328
+1329
+1330
+1331
+1332
+1333
+1334
+1335
+1336
+1337
+1338
+1339
+1340
+1341
+1342
+1343
+1344
+1345
+1346
+1347
+1348
+1349
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357
+1358
+1359
+1360
+1361
+1362
+1363
+1364
+1365
+1366
+1367
+1368
+1369
+1370
+1371
+1372
+1373
+1374
+1375
+1376
+1377
+1378
+1379
+1380
+1381
+1382
+1383
+1384
+1385
+1386
+1387
+1388
+1389
+1390
+1391
+1392
+1393
+1394
+1395
+1396
+1397
+1398
+1399
+1400
+1401
+1402
+1403
+1404
+1405
+1406
+1407
+1408
+1409
+1410
+1411
+1412
+1413
+1414
+1415
+1416
+1417
+1418
+1419
+1428
+1429
+1430
+1431
+1432
+1433
+1434
+1435
+1436
+1437
+1438
+1439
+1440
+1441
+1442
+1443
+1444
+1445
+1446
+1447
+1448
+1449
+1450
+1451
+1460
+1461
+1462
+1463
+1464
+1465
+1466
+1467
+1468
+1469
+1470
+1471
+1472
+1473
+1474
+1475
+1476
+1477
+1478
+1479
+1480
+1481
+1482
+1483
+1492
+1493
+1494
+1495
+1496
+1497
+1498
+1499
+1500
+1501
+1502
+1503
+1504
+1505
+1506
+1507
+1508
+1509
+1510
+1511
+1512
+1513
+1514
+1515
+1524
+1525
+1526
+1527
+1528
+1529
+1530
+1531
+1532
+1533
+1534
+1535
+1536
+1537
+1538
+1539
+1540
+1541
+1542
+1543
+1544
+1545
+1546
+1547
+1556
+1557
+1558
+1559
+1560
+1561
+1562
+1563
+1564
+1565
+1566
+1567
+1568
+1569
+1570
+1571
+1572
+1573
+1574
+1575
+1576
+1577
+1578
+1579
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+1600
+1601
+1602
+1603
+1604
+1605
+1606
+1607
+1608
+1609
+1610
+1611
+1620
+1621
+1622
+1623
+1624
+1625
+1626
+1627
+1628
+1629
+1630
+1631
+1632
+1633
+1634
+1635
+1636
+1637
+1638
+1639
+1640
+1641
+1642
+1643
+1652
+1653
+1654
+1655
+1656
+1657
+1658
+1659
+1660
+1661
+1662
+1663
+1664
+1665
+1666
+1667
+1668
+1669
+1670
+1671
+1672
+1673
+1674
+1675
+1676
+1677
+1678
+1679
+1680
+1681
+1682
+1683
+1684
+1685
+1686
+1687
+1688
+1689
+1690
+1691
+1692
+1693
+1694
+1695
+1696
+1697
+1698
+1699
+1700
+1701
+1702
+1703
+1704
+1705
+1706
+1707
+1708
+1709
+1710
+1711
+1712
+1713
+1714
+1715
+1716
+1717
+1718
+1719
+1720
+1721
+1722
+1723
+1724
+1725
+1726
+1727
+1728
+1729
+1730
+1731
+1732
+1733
+1734
+1735
+1736
+1737
+1738
+1739
+1740
+1741
+1742
+1743
+1744
+1745
+1746
+1747
+1748
+1749
+1750
+1751
+1752
+1753
+1754
+1755
+1756
+1757
+1758
+1759
+1760
+1761
+1762
+1763
+1764
+1765
+1766
+1767
+1768
+1769
+1770
+1771
+1772
+1773
+1774
+1775
+1776
+1777
+1778
+1779
+1780
+1781
+1782
+1783
+1784
+1785
+1786
+1787
+1788
+1789
+1790
+1791
+1792
+1793
+1794
+1795
+1796
+1797
+1798
+1799
+1800
+1801
+1802
+1803
+1804
+1805
+1806
+1807
+1808
+1809
+1810
+1811
+1812
+1813
+1814
+1815
+1816
+1817
+1818
+1819
+1820
+1821
+1822
+1823
+1824
+1825
+1826
+1827
+1828
+1829
+1830
+1831
+1832
+1833
+1834
+1835
+1836
+1837
+1838
+1839
+1840
+1841
+1842
+1843
+1844
+1845
+1846
+1847
+1848
+1849
+1850
+1851
+1852
+1853
+1854
+1855
+1856
+1857
+1858
+1859
+1860
+1861
+1862
+1863
+1864
+1865
+1866
+1867
+1868
+1869
+1870
+1871
+1872
+1873
+1874
+1875
+1876
+1877
+1878
+1879
+1880
+1881
+1882
+1883
+1884
+1885
+1886
+1887
+1888
+1889
+1890
+1891
+1892
+1893
+1894
+1895
+1896
+1897
+1898
+1899
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+2011
+2012
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+2024
+2025
+2026
+2027
+2028
+2029
+2030
+2031
+2032
+2033
+2034
+2035
+2036
+2037
+2038
+2039
+2040
+2041
+2042
+2043
+2044
+2045
+2046
+2047
+2048
+2049
+2050
+2051
+2052
+2053
+2054
+2055
+2056
+2057
+2058
+2059
+2060
+2061
+2062
+2063
+2064
+2065
+2066
+2067
+2068
+2069
+2070
+2071
+2072
+2073
+2074
+2075
+2076
+2077
+2078
+2079
+2080
+2081
+2082
+2083
+2084
+2085
+2086
+2087
+2088
+2089
+2090
+2091
+2092
+2093
+2094
+2095
+2096
+2097
+2098
+2099
+2100
+2101
+2102
+2103
+2104
+2105
+2106
+2107
+2108
+2109
+2110
+2111
+2112
+2113
+2114
+2115
+2116
+2117
+2118
+2119
+2120
+2121
+2122
+2123
+2124
+2125
+2126
+2127
+2128
+2129
+2130
+2131
+2132
+2133
+2134
+2135
+2136
+2137
+2138
+2139
+2140
+2141
+2142
+2143
+2144
+2145
+2146
+2147
+2148
+2149
+2150
+2151
+2152
+2153
+2154
+2155
+2156
+2157
+2158
+2159
+2160
+2161
+2162
+2163
+2164
+2165
+2166
+2167
+2168
+2169
+2170
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
+2186
+2187
+2188
+2189
+2190
+2191
+2192
+2193
+2194
+2195
+2196
+2197
+2198
+2199
+2200
+2201
+2202
+2203
+2204
+2205
+2206
+2207
+2208
+2209
+2210
+2211
+2212
+2213
+2214
+2215
+2216
+2217
+2218
+2219
+2220
+2221
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
+2232
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
+2246
+2247
+2248
+2249
+2250
+2251
+2252
+2253
+2254
+2255
+2256
+2257
+2258
+2259
+2260
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
+2281
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
+2303
+2304
+2305
+2306
+2307
+2308
+2309
+2310
+2311
+2312
+2313
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
+2344
+2345
+2346
+2347
+2348
+2349
+2350
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
+2373
+2374
+2375
+2376
+2377
+2378
+2379
+2380
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
+2390
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
+2400
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
+2422
+2423
+2424
+2425
+2426
+2427
+2428
+2429
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2452
+2453
+2454
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
+2471
+2472
+2473
+2474
+2475
+2484
+2485
+2486
+2487
+2488
+2489
+2490
+2491
+2492
+2493
+2494
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
+2507
+2516
+2517
+2518
+2519
+2520
+2521
+2522
+2523
+2524
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2548
+2549
+2550
+2551
+2552
+2553
+2554
+2555
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
+2588
+2589
+2590
+2591
+2592
+2593
+2594
+2595
+2596
+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2612
+2613
+2614
+2615
+2616
+2617
+2618
+2619
+2620
+2621
+2622
+2623
+2624
+2625
+2626
+2627
+2628
+2629
+2630
+2631
+2632
+2633
+2634
+2635
+2644
+2645
+2646
+2647
+2648
+2649
+2650
+2651
+2652
+2653
+2654
+2655
+2656
+2657
+2658
+2659
+2660
+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2676
+2677
+2678
+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691
+2692
+2693
+2694
+2695
+2696
+2697
+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716
+2717
+2718
+2719
+2720
+2721
+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745
+2746
+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759
+2760
+2761
+2762
+2763
+2764
+2765
+2766
+2767
+2768
+2769
+2770
+2771
+2772
+2773
+2774
+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783
+2784
+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811
+2812
+2813
+2814
+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844
+2845
+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860
+2861
+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872
+2873
+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888
+2889
+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903
+2904
+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914
+2915
+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930
+2931
+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942
+2943
+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964
+2965
+2966
+2967
+2968
+2969
+2970
+2971
+2972
+2973
+2974
+2975
+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983
+2984
+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997
+2998
+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009
+3010
+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018
+3019
+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037
+3038
+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061
+3062
+3063
+3064
+3065
+3066
+3067
+3068
+3069
+3070
+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086
+3087
+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096
+3097
+3098
+3099
+3100
+3101
+3102
+3103
+3104
+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120
+3121
+3122
+3123
+3124
+3125
+3126
+3127
+3128
+3129
+3130
+3131
+3132
+3133
+3134
+3135
+3136
+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145
+3146
+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154
+3155
+3156
+3157
+3158
+3159
+3160
+3161
+3162
+3163
+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174
+3175
+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187
+3188
+3189
+3190
+3191
+3192
+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204
+3205
+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227
+3228
+3229
+3230
+3231
+3232
+3233
+3234
+3235
+3236
+3237
+3238
+3239
+3240
+3241
+3242
+3243
+3244
+3245
+3246
+3247
+3248
+3249
+3250
+3251
+3252
+3253
+3254
+3255
+3256
+3257
+3258
+3259
+3260
+3261
+3262
+3263
+3264
+3265
+3266
+3267
+3268
+3269
+3270
+3271
+3272
+3273
+3274
+3275
+3276
+3277
+3278
+3279
+3280
+3281
+3282
+3283
+3284
+3285
+3286
+3287
+3288
+3289
+3290
+3291
+3292
+3293
+3294
+3295
+3296
+3297
+3298
+3299
+3300
+3301
+3302
+3303
+3304
+3305
+3306
+3307
+3308
+3309
+3310
+3311
+3312
+3313
+3314
+3315
+3316
+3317
+3318
+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348
+3349
+3350
+3351
+3352
+3353
+3354
+3355
+3356
+3357
+3358
+3359
+3360
+3361
+3362
+3363
+3364
+3365
+3366
+3367
+3368
+3369
+3370
+3371
+3372
+3373
+3374
+3375
+3376
+3377
+3378
+3379
+3380
+3381
+3382
+3383
+3384
+3385
+3386
+3387
+3388
+3389
+3390
+3391
+3392
+3393
+3394
+3395
+3396
+3397
+3398
+3399
+3400
+3401
+3402
+3403
+3404
+3405
+3406
+3407
+3408
+3409
+3410
+3411
+3412
+3413
+3414
+3415
+3416
+3417
+3418
+3419
+3420
+3421
+3422
+3423
+3424
+3425
+3426
+3427
+3428
+3429
+3430
+3431
+3432
+3433
+3434
+3435
+3436
+3437
+3438
+3439
+3440
+3441
+3442
+3443
+3444
+3445
+3446
+3447
+3448
+3449
+3450
+3451
+3452
+3453
+3454
+3455
+3456
+3457
+3458
+3459
+3460
+3461
+3462
+3463
+3464
+3465
+3466
+3467
+3476
+3477
+3478
+3479
+3480
+3481
+3482
+3483
+3484
+3485
+3486
+3487
+3488
+3489
+3490
+3491
+3492
+3493
+3494
+3495
+3496
+3497
+3498
+3499
+3508
+3509
+3510
+3511
+3512
+3513
+3514
+3515
+3516
+3517
+3518
+3519
+3520
+3521
+3522
+3523
+3524
+3525
+3526
+3527
+3528
+3529
+3530
+3531
+3540
+3541
+3542
+3543
+3544
+3545
+3546
+3547
+3548
+3549
+3550
+3551
+3552
+3553
+3554
+3555
+3556
+3557
+3558
+3559
+3560
+3561
+3562
+3563
+3572
+3573
+3574
+3575
+3576
+3577
+3578
+3579
+3580
+3581
+3582
+3583
+3584
+3585
+3586
+3587
+3588
+3589
+3590
+3591
+3592
+3593
+3594
+3595
+3604
+3605
+3606
+3607
+3608
+3609
+3610
+3611
+3612
+3613
+3614
+3615
+3616
+3617
+3618
+3619
+3620
+3621
+3622
+3623
+3624
+3625
+3626
+3627
+3636
+3637
+3638
+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3668
+3669
+3670
+3671
+3672
+3673
+3674
+3675
+3676
+3677
+3678
+3679
+3680
+3681
+3682
+3683
+3684
+3685
+3686
+3687
+3688
+3689
+3690
+3691
+3700
+3701
+3702
+3703
+3704
+3705
+3706
+3707
+3708
+3709
+3710
+3711
+3712
+3713
+3714
+3715
+3716
+3717
+3718
+3719
+3720
+3721
+3722
+3723
+3724
+3725
+3726
+3727
+3728
+3729
+3730
+3731
+3732
+3733
+3734
+3735
+3736
+3737
+3738
+3739
+3740
+3741
+3742
+3743
+3744
+3745
+3746
+3747
+3748
+3749
+3750
+3751
+3752
+3753
+3754
+3755
+3756
+3757
+3758
+3759
+3760
+3761
+3762
+3763
+3764
+3765
+3766
+3767
+3768
+3769
+3770
+3771
+3772
+3773
+3774
+3775
+3776
+3777
+3778
+3779
+3780
+3781
+3782
+3783
+3784
+3785
+3786
+3787
+3788
+3789
+3790
+3791
+3792
+3793
+3794
+3795
+3796
+3797
+3798
+3799
+3800
+3801
+3802
+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832
+3833
+3834
+3835
+3836
+3837
+3838
+3839
+3840
+3841
+3842
+3843
+3844
+3845
+3846
+3847
+3848
+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878
+3879
+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909
+3910
+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919
+3920
+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932
+3933
+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950
+3951
+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959
+3960
+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975
+3976
+3977
+3978
+3979
+3980
+3981
+3982
+3983
+3984
+3985
+3986
+3987
+3988
+3989
+3990
+3991
+3992
+3993
+3994
+3995
+3996
+3997
+3998
+3999
+4000
+4001
+4002
+4003
+4004
+4005
+4006
+4007
+4008
+4009
+4010
+4011
+4012
+4013
+4014
+4015
+4016
+4017
+4018
+4019
+4020
+4021
+4022
+4023
+4024
+4025
+4026
+4027
+4028
+4029
+4030
+4031
+4032
+4033
+4034
+4035
+4036
+4037
+4038
+4039
+4040
+4041
+4042
+4043
+4044
+4045
+4046
+4047
+4048
+4049
+4050
+4051
+4052
+4053
+4054
+4055
+4056
+4057
+4058
+4059
+4060
+4061
+4062
+4063
+4064
+4065
+4066
+4067
+4068
+4069
+4070
+4071
+4072
+4073
+4074
+4075
+4076
+4077
+4078
+4079
+4080
+4081
+4082
+4083
+4084
+4085
+4086
+4087
+4088
+4089
+4090
+4091
+4092
+4093
+4094
+4095
+4096
+4097
+4098
+4099
+4100
+4101
+4102
+4103
+4104
+4105
+4106
+4107
+4108
+4109
+4110
+4111
+4112
+4113
+4114
+4115
+4116
+4117
+4118
+4119
+4120
+4121
+4122
+4123
+4124
+4125
+4126
+4127
+4128
+4129
+4130
+4131
+4132
+4133
+4134
+4135
+4136
+4137
+4138
+4139
+4140
+4141
+4142
+4143
+4144
+4145
+4146
+4147
+4148
+4149
+4150
+4151
+4152
+4153
+4154
+4155
+4156
+4157
+4158
+4159
+4160
+4161
+4162
+4163
+4164
+4165
+4166
+4167
+4168
+4169
+4170
+4171
+4172
+4173
+4174
+4175
+4176
+4177
+4178
+4179
+4180
+4181
+4182
+4183
+4184
+4185
+4186
+4187
+4188
+4189
+4190
+4191
+4192
+4193
+4194
+4195
+4196
+4197
+4198
+4199
+4200
+4201
+4202
+4203
+4204
+4205
+4206
+4207
+4208
+4209
+4210
+4211
+4212
+4213
+4214
+4215
+4216
+4217
+4218
+4219
+4220
+4221
+4222
+4223
+4224
+4225
+4226
+4227
+4228
+4229
+4230
+4231
+4232
+4233
+4234
+4235
+4236
+4237
+4238
+4239
+4240
+4241
+4242
+4243
+4244
+4245
+4246
+4247
+4248
+4249
+4250
+4251
+4252
+4253
+4254
+4255
+4256
+4257
+4258
+4259
+4260
+4261
+4262
+4263
+4264
+4265
+4266
+4267
+4268
+4269
+4270
+4271
+4272
+4273
+4274
+4275
+4276
+4277
+4278
+4279
+4280
+4281
+4282
+4283
+4284
+4285
+4286
+4287
+4288
+4289
+4290
+4291
+4292
+4293
+4294
+4295
+4296
+4297
+4298
+4299
+4300
+4301
+4302
+4303
+4304
+4305
+4306
+4307
+4308
+4309
+4310
+4311
+4312
+4313
+4314
+4315
+4316
+4317
+4318
+4319
+4320
+4321
+4322
+4323
+4324
+4325
+4326
+4327
+4328
+4329
+4330
+4331
+4332
+4333
+4334
+4335
+4336
+4337
+4338
+4339
+4340
+4341
+4342
+4343
+4344
+4345
+4346
+4347
+4348
+4349
+4350
+4351
+4352
+4353
+4354
+4355
+4356
+4357
+4358
+4359
+4360
+4361
+4362
+4363
+4364
+4365
+4366
+4367
+4368
+4369
+4370
+4371
+4372
+4373
+4374
+4375
+4376
+4377
+4378
+4379
+4380
+4381
+4382
+4383
+4384
+4385
+4386
+4387
+4388
+4389
+4390
+4391
+4392
+4393
+4394
+4395
+4396
+4397
+4398
+4399
+4400
+4401
+4402
+4403
+4404
+4405
+4406
+4407
+4408
+4409
+4410
+4411
+4412
+4413
+4414
+4415
+4416
+4417
+4418
+4419
+4420
+4421
+4422
+4423
+4424
+4425
+4426
+4427
+4428
+4429
+4430
+4431
+4432
+4433
+4434
+4435
+4436
+4437
+4438
+4439
+4440
+4441
+4442
+4443
+4444
+4445
+4446
+4447
+4448
+4449
+4450
+4451
+4452
+4453
+4454
+4455
+4456
+4457
+4458
+4459
+4460
+4461
+4462
+4463
+4464
+4465
+4466
+4467
+4468
+4469
+4470
+4471
+4472
+4473
+4474
+4475
+4476
+4477
+4478
+4479
+4480
+4481
+4482
+4483
+4484
+4485
+4486
+4487
+4488
+4489
+4490
+4491
+4500
+4501
+4502
+4503
+4504
+4505
+4506
+4507
+4508
+4509
+4510
+4511
+4512
+4513
+4514
+4515
+4516
+4517
+4518
+4519
+4520
+4521
+4522
+4523
+4532
+4533
+4534
+4535
+4536
+4537
+4538
+4539
+4540
+4541
+4542
+4543
+4544
+4545
+4546
+4547
+4548
+4549
+4550
+4551
+4552
+4553
+4554
+4555
+4564
+4565
+4566
+4567
+4568
+4569
+4570
+4571
+4572
+4573
+4574
+4575
+4576
+4577
+4578
+4579
+4580
+4581
+4582
+4583
+4584
+4585
+4586
+4587
+4596
+4597
+4598
+4599
+4600
+4601
+4602
+4603
+4604
+4605
+4606
+4607
+4608
+4609
+4610
+4611
+4612
+4613
+4614
+4615
+4616
+4617
+4618
+4619
+4628
+4629
+4630
+4631
+4632
+4633
+4634
+4635
+4636
+4637
+4638
+4639
+4640
+4641
+4642
+4643
+4644
+4645
+4646
+4647
+4648
+4649
+4650
+4651
+4660
+4661
+4662
+4663
+4664
+4665
+4666
+4667
+4668
+4669
+4670
+4671
+4672
+4673
+4674
+4675
+4676
+4677
+4678
+4679
+4680
+4681
+4682
+4683
+4692
+4693
+4694
+4695
+4696
+4697
+4698
+4699
+4700
+4701
+4702
+4703
+4704
+4705
+4706
+4707
+4708
+4709
+4710
+4711
+4712
+4713
+4714
+4715
+4724
+4725
+4726
+4727
+4728
+4729
+4730
+4731
+4732
+4733
+4734
+4735
+4736
+4737
+4738
+4739
+4740
+4741
+4742
+4743
+4744
+4745
+4746
+4747
+4748
+4749
+4750
+4751
+4752
+4753
+4754
+4755
+4756
+4757
+4758
+4759
+4760
+4761
+4762
+4763
+4764
+4765
+4766
+4767
+4768
+4769
+4770
+4771
+4772
+4773
+4774
+4775
+4776
+4777
+4778
+4779
+4780
+4781
+4782
+4783
+4784
+4785
+4786
+4787
+4788
+4789
+4790
+4791
+4792
+4793
+4794
+4795
+4796
+4797
+4798
+4799
+4800
+4801
+4802
+4803
+4804
+4805
+4806
+4807
+4808
+4809
+4810
+4811
+4812
+4813
+4814
+4815
+4816
+4817
+4818
+4819
+4820
+4821
+4822
+4823
+4824
+4825
+4826
+4827
+4828
+4829
+4830
+4831
+4832
+4833
+4834
+4835
+4836
+4837
+4838
+4839
+4840
+4841
+4842
+4843
+4844
+4845
+4846
+4847
+4848
+4849
+4850
+4851
+4852
+4853
+4854
+4855
+4856
+4857
+4858
+4859
+4860
+4861
+4862
+4863
+4864
+4865
+4866
+4867
+4868
+4869
+4870
+4871
+4872
+4873
+4874
+4875
+4876
+4877
+4878
+4879
+4880
+4881
+4882
+4883
+4884
+4885
+4886
+4887
+4888
+4889
+4890
+4891
+4892
+4893
+4894
+4895
+4896
+4897
+4898
+4899
+4900
+4901
+4902
+4903
+4904
+4905
+4906
+4907
+4908
+4909
+4910
+4911
+4912
+4913
+4914
+4915
+4916
+4917
+4918
+4919
+4920
+4921
+4922
+4923
+4924
+4925
+4926
+4927
+4928
+4929
+4930
+4931
+4932
+4933
+4934
+4935
+4936
+4937
+4938
+4939
+4940
+4941
+4942
+4943
+4944
+4945
+4946
+4947
+4948
+4949
+4950
+4951
+4952
+4953
+4954
+4955
+4956
+4957
+4958
+4959
+4960
+4961
+4962
+4963
+4964
+4965
+4966
+4967
+4968
+4969
+4970
+4971
+4972
+4973
+4974
+4975
+4976
+4977
+4978
+4979
+4980
+4981
+4982
+4983
+4984
+4985
+4986
+4987
+4988
+4989
+4990
+4991
+4992
+4993
+4994
+4995
+4996
+4997
+4998
+4999
+5000
+5001
+5002
+5003
+5004
+5005
+5006
+5007
+5008
+5009
+5010
+5011
+5012
+5013
+5014
+5015
+5016
+5017
+5018
+5019
+5020
+5021
+5022
+5023
+5024
+5025
+5026
+5027
+5028
+5029
+5030
+5031
+5032
+5033
+5034
+5035
+5036
+5037
+5038
+5039
+5040
+5041
+5042
+5043
+5044
+5045
+5046
+5047
+5048
+5049
+5050
+5051
+5052
+5053
+5054
+5055
+5056
+5057
+5058
+5059
+5060
+5061
+5062
+5063
+5064
+5065
+5066
+5067
+5068
+5069
+5070
+5071
+5072
+5073
+5074
+5075
+5076
+5077
+5078
+5079
+5080
+5081
+5082
+5083
+5084
+5085
+5086
+5087
+5088
+5089
+5090
+5091
+5092
+5093
+5094
+5095
+5096
+5097
+5098
+5099
+5100
+5101
+5102
+5103
+5104
+5105
+5106
+5107
+5108
+5109
+5110
+5111
+5112
+5113
+5114
+5115
+5116
+5117
+5118
+5119
+5120
+5121
+5122
+5123
+5124
+5125
+5126
+5127
+5128
+5129
+5130
+5131
+5132
+5133
+5134
+5135
+5136
+5137
+5138
+5139
+5140
+5141
+5142
+5143
+5144
+5145
+5146
+5147
+5148
+5149
+5150
+5151
+5152
+5153
+5154
+5155
+5156
+5157
+5158
+5159
+5160
+5161
+5162
+5163
+5164
+5165
+5166
+5167
+5168
+5169
+5170
+5171
+5172
+5173
+5174
+5175
+5176
+5177
+5178
+5179
+5180
+5181
+5182
+5183
+5184
+5185
+5186
+5187
+5188
+5189
+5190
+5191
+5192
+5193
+5194
+5195
+5196
+5197
+5198
+5199
+5200
+5201
+5202
+5203
+5204
+5205
+5206
+5207
+5208
+5209
+5210
+5211
+5212
+5213
+5214
+5215
+5216
+5217
+5218
+5219
+5220
+5221
+5222
+5223
+5224
+5225
+5226
+5227
+5228
+5229
+5230
+5231
+5232
+5233
+5234
+5235
+5236
+5237
+5238
+5239
+5240
+5241
+5242
+5243
+5244
+5245
+5246
+5247
+5248
+5249
+5250
+5251
+5252
+5253
+5254
+5255
+5256
+5257
+5258
+5259
+5260
+5261
+5262
+5263
+5264
+5265
+5266
+5267
+5268
+5269
+5270
+5271
+5272
+5273
+5274
+5275
+5276
+5277
+5278
+5279
+5280
+5281
+5282
+5283
+5284
+5285
+5286
+5287
+5288
+5289
+5290
+5291
+5292
+5293
+5294
+5295
+5296
+5297
+5298
+5299
+5300
+5301
+5302
+5303
+5304
+5305
+5306
+5307
+5308
+5309
+5310
+5311
+5312
+5313
+5314
+5315
+5316
+5317
+5318
+5319
+5320
+5321
+5322
+5323
+5324
+5325
+5326
+5327
+5328
+5329
+5330
+5331
+5332
+5333
+5334
+5335
+5336
+5337
+5338
+5339
+5340
+5341
+5342
+5343
+5344
+5345
+5346
+5347
+5348
+5349
+5350
+5351
+5352
+5353
+5354
+5355
+5356
+5357
+5358
+5359
+5360
+5361
+5362
+5363
+5364
+5365
+5366
+5367
+5368
+5369
+5370
+5371
+5372
+5373
+5374
+5375
+5376
+5377
+5378
+5379
+5380
+5381
+5382
+5383
+5384
+5385
+5386
+5387
+5388
+5389
+5390
+5391
+5392
+5393
+5394
+5395
+5396
+5397
+5398
+5399
+5400
+5401
+5402
+5403
+5404
+5405
+5406
+5407
+5408
+5409
+5410
+5411
+5412
+5413
+5414
+5415
+5416
+5417
+5418
+5419
+5420
+5421
+5422
+5423
+5424
+5425
+5426
+5427
+5428
+5429
+5430
+5431
+5432
+5433
+5434
+5435
+5436
+5437
+5438
+5439
+5440
+5441
+5442
+5443
+5444
+5445
+5446
+5447
+5448
+5449
+5450
+5451
+5452
+5453
+5454
+5455
+5456
+5457
+5458
+5459
+5460
+5461
+5462
+5463
+5464
+5465
+5466
+5467
+5468
+5469
+5470
+5471
+5472
+5473
+5474
+5475
+5476
+5477
+5478
+5479
+5480
+5481
+5482
+5483
+5484
+5485
+5486
+5487
+5488
+5489
+5490
+5491
+5492
+5493
+5494
+5495
+5496
+5497
+5498
+5499
+5500
+5501
+5502
+5503
+5504
+5505
+5506
+5507
+5508
+5509
+5510
+5511
+5512
+5513
+5514
+5515
+5524
+5525
+5526
+5527
+5528
+5529
+5530
+5531
+5532
+5533
+5534
+5535
+5536
+5537
+5538
+5539
+5540
+5541
+5542
+5543
+5544
+5545
+5546
+5547
+5556
+5557
+5558
+5559
+5560
+5561
+5562
+5563
+5564
+5565
+5566
+5567
+5568
+5569
+5570
+5571
+5572
+5573
+5574
+5575
+5576
+5577
+5578
+5579
+5588
+5589
+5590
+5591
+5592
+5593
+5594
+5595
+5596
+5597
+5598
+5599
+5600
+5601
+5602
+5603
+5604
+5605
+5606
+5607
+5608
+5609
+5610
+5611
+5620
+5621
+5622
+5623
+5624
+5625
+5626
+5627
+5628
+5629
+5630
+5631
+5632
+5633
+5634
+5635
+5636
+5637
+5638
+5639
+5640
+5641
+5642
+5643
+5652
+5653
+5654
+5655
+5656
+5657
+5658
+5659
+5660
+5661
+5662
+5663
+5664
+5665
+5666
+5667
+5668
+5669
+5670
+5671
+5672
+5673
+5674
+5675
+5684
+5685
+5686
+5687
+5688
+5689
+5690
+5691
+5692
+5693
+5694
+5695
+5696
+5697
+5698
+5699
+5700
+5701
+5702
+5703
+5704
+5705
+5706
+5707
+5716
+5717
+5718
+5719
+5720
+5721
+5722
+5723
+5724
+5725
+5726
+5727
+5728
+5729
+5730
+5731
+5732
+5733
+5734
+5735
+5736
+5737
+5738
+5739
+5748
+5749
+5750
+5751
+5752
+5753
+5754
+5755
+5756
+5757
+5758
+5759
+5760
+5761
+5762
+5763
+5764
+5765
+5766
+5767
+5768
+5769
+5770
+5771
+5772
+5773
+5774
+5775
+5776
+5777
+5778
+5779
+5780
+5781
+5782
+5783
+5784
+5785
+5786
+5787
+5788
+5789
+5790
+5791
+5792
+5793
+5794
+5795
+5796
+5797
+5798
+5799
+5800
+5801
+5802
+5803
+5804
+5805
+5806
+5807
+5808
+5809
+5810
+5811
+5812
+5813
+5814
+5815
+5816
+5817
+5818
+5819
+5820
+5821
+5822
+5823
+5824
+5825
+5826
+5827
+5828
+5829
+5830
+5831
+5832
+5833
+5834
+5835
+5836
+5837
+5838
+5839
+5840
+5841
+5842
+5843
+5844
+5845
+5846
+5847
+5848
+5849
+5850
+5851
+5852
+5853
+5854
+5855
+5856
+5857
+5858
+5859
+5860
+5861
+5862
+5863
+5864
+5865
+5866
+5867
+5868
+5869
+5870
+5871
+5872
+5873
+5874
+5875
+5876
+5877
+5878
+5879
+5880
+5881
+5882
+5883
+5884
+5885
+5886
+5887
+5888
+5889
+5890
+5891
+5892
+5893
+5894
+5895
+5896
+5897
+5898
+5899
+5900
+5901
+5902
+5903
+5904
+5905
+5906
+5907
+5908
+5909
+5910
+5911
+5912
+5913
+5914
+5915
+5916
+5917
+5918
+5919
+5920
+5921
+5922
+5923
+5924
+5925
+5926
+5927
+5928
+5929
+5930
+5931
+5932
+5933
+5934
+5935
+5936
+5937
+5938
+5939
+5940
+5941
+5942
+5943
+5944
+5945
+5946
+5947
+5948
+5949
+5950
+5951
+5952
+5953
+5954
+5955
+5956
+5957
+5958
+5959
+5960
+5961
+5962
+5963
+5964
+5965
+5966
+5967
+5968
+5969
+5970
+5971
+5972
+5973
+5974
+5975
+5976
+5977
+5978
+5979
+5980
+5981
+5982
+5983
+5984
+5985
+5986
+5987
+5988
+5989
+5990
+5991
+5992
+5993
+5994
+5995
+5996
+5997
+5998
+5999
+6000
+6001
+6002
+6003
+6004
+6005
+6006
+6007
+6008
+6009
+6010
+6011
+6012
+6013
+6014
+6015
+6016
+6017
+6018
+6019
+6020
+6021
+6022
+6023
+6024
+6025
+6026
+6027
+6028
+6029
+6030
+6031
+6032
+6033
+6034
+6035
+6036
+6037
+6038
+6039
+6040
+6041
+6042
+6043
+6044
+6045
+6046
+6047
+6048
+6049
+6050
+6051
+6052
+6053
+6054
+6055
+6056
+6057
+6058
+6059
+6060
+6061
+6062
+6063
+6064
+6065
+6066
+6067
+6068
+6069
+6070
+6071
+6072
+6073
+6074
+6075
+6076
+6077
+6078
+6079
+6080
+6081
+6082
+6083
+6084
+6085
+6086
+6087
+6088
+6089
+6090
+6091
+6092
+6093
+6094
+6095
+6096
+6097
+6098
+6099
+6100
+6101
+6102
+6103
+6104
+6105
+6106
+6107
+6108
+6109
+6110
+6111
+6112
+6113
+6114
+6115
+6116
+6117
+6118
+6119
+6120
+6121
+6122
+6123
+6124
+6125
+6126
+6127
+6128
+6129
+6130
+6131
+6132
+6133
+6134
+6135
+6136
+6137
+6138
+6139
+6140
+6141
+6142
+6143
+6144
+6145
+6146
+6147
+6148
+6149
+6150
+6151
+6152
+6153
+6154
+6155
+6156
+6157
+6158
+6159
+6160
+6161
+6162
+6163
+6164
+6165
+6166
+6167
+6168
+6169
+6170
+6171
+6172
+6173
+6174
+6175
+6176
+6177
+6178
+6179
+6180
+6181
+6182
+6183
+6184
+6185
+6186
+6187
+6188
+6189
+6190
+6191
+6192
+6193
+6194
+6195
+6196
+6197
+6198
+6199
+6200
+6201
+6202
+6203
+6204
+6205
+6206
+6207
+6208
+6209
+6210
+6211
+6212
+6213
+6214
+6215
+6216
+6217
+6218
+6219
+6220
+6221
+6222
+6223
+6224
+6225
+6226
+6227
+6228
+6229
+6230
+6231
+6232
+6233
+6234
+6235
+6236
+6237
+6238
+6239
+6240
+6241
+6242
+6243
+6244
+6245
+6246
+6247
+6248
+6249
+6250
+6251
+6252
+6253
+6254
+6255
+6256
+6257
+6258
+6259
+6260
+6261
+6262
+6263
+6264
+6265
+6266
+6267
+6268
+6269
+6270
+6271
+6272
+6273
+6274
+6275
+6276
+6277
+6278
+6279
+6280
+6281
+6282
+6283
+6284
+6285
+6286
+6287
+6288
+6289
+6290
+6291
+6292
+6293
+6294
+6295
+6296
+6297
+6298
+6299
+6300
+6301
+6302
+6303
+6304
+6305
+6306
+6307
+6308
+6309
+6310
+6311
+6312
+6313
+6314
+6315
+6316
+6317
+6318
+6319
+6320
+6321
+6322
+6323
+6324
+6325
+6326
+6327
+6328
+6329
+6330
+6331
+6332
+6333
+6334
+6335
+6336
+6337
+6338
+6339
+6340
+6341
+6342
+6343
+6344
+6345
+6346
+6347
+6348
+6349
+6350
+6351
+6352
+6353
+6354
+6355
+6356
+6357
+6358
+6359
+6360
+6361
+6362
+6363
+6364
+6365
+6366
+6367
+6368
+6369
+6370
+6371
+6372
+6373
+6374
+6375
+6376
+6377
+6378
+6379
+6380
+6381
+6382
+6383
+6384
+6385
+6386
+6387
+6388
+6389
+6390
+6391
+6392
+6393
+6394
+6395
+6396
+6397
+6398
+6399
+6400
+6401
+6402
+6403
+6404
+6405
+6406
+6407
+6408
+6409
+6410
+6411
+6412
+6413
+6414
+6415
+6416
+6417
+6418
+6419
+6420
+6421
+6422
+6423
+6424
+6425
+6426
+6427
+6428
+6429
+6430
+6431
+6432
+6433
+6434
+6435
+6436
+6437
+6438
+6439
+6440
+6441
+6442
+6443
+6444
+6445
+6446
+6447
+6448
+6449
+6450
+6451
+6452
+6453
+6454
+6455
+6456
+6457
+6458
+6459
+6460
+6461
+6462
+6463
+6464
+6465
+6466
+6467
+6468
+6469
+6470
+6471
+6472
+6473
+6474
+6475
+6476
+6477
+6478
+6479
+6480
+6481
+6482
+6483
+6484
+6485
+6486
+6487
+6488
+6489
+6490
+6491
+6492
+6493
+6494
+6495
+6496
+6497
+6498
+6499
+6500
+6501
+6502
+6503
+6504
+6505
+6506
+6507
+6508
+6509
+6510
+6511
+6512
+6513
+6514
+6515
+6516
+6517
+6518
+6519
+6520
+6521
+6522
+6523
+6524
+6525
+6526
+6527
+6528
+6529
+6530
+6531
+6532
+6533
+6534
+6535
+6536
+6537
+6538
+6539
+6548
+6549
+6550
+6551
+6552
+6553
+6554
+6555
+6556
+6557
+6558
+6559
+6560
+6561
+6562
+6563
+6564
+6565
+6566
+6567
+6568
+6569
+6570
+6571
+6580
+6581
+6582
+6583
+6584
+6585
+6586
+6587
+6588
+6589
+6590
+6591
+6592
+6593
+6594
+6595
+6596
+6597
+6598
+6599
+6600
+6601
+6602
+6603
+6612
+6613
+6614
+6615
+6616
+6617
+6618
+6619
+6620
+6621
+6622
+6623
+6624
+6625
+6626
+6627
+6628
+6629
+6630
+6631
+6632
+6633
+6634
+6635
+6644
+6645
+6646
+6647
+6648
+6649
+6650
+6651
+6652
+6653
+6654
+6655
+6656
+6657
+6658
+6659
+6660
+6661
+6662
+6663
+6664
+6665
+6666
+6667
+6676
+6677
+6678
+6679
+6680
+6681
+6682
+6683
+6684
+6685
+6686
+6687
+6688
+6689
+6690
+6691
+6692
+6693
+6694
+6695
+6696
+6697
+6698
+6699
+6708
+6709
+6710
+6711
+6712
+6713
+6714
+6715
+6716
+6717
+6718
+6719
+6720
+6721
+6722
+6723
+6724
+6725
+6726
+6727
+6728
+6729
+6730
+6731
+6740
+6741
+6742
+6743
+6744
+6745
+6746
+6747
+6748
+6749
+6750
+6751
+6752
+6753
+6754
+6755
+6756
+6757
+6758
+6759
+6760
+6761
+6762
+6763
+6772
+6773
+6774
+6775
+6776
+6777
+6778
+6779
+6780
+6781
+6782
+6783
+6784
+6785
+6786
+6787
+6788
+6789
+6790
+6791
+6792
+6793
+6794
+6795
+6796
+6797
+6798
+6799
+6800
+6801
+6802
+6803
+6804
+6805
+6806
+6807
+6808
+6809
+6810
+6811
+6812
+6813
+6814
+6815
+6816
+6817
+6818
+6819
+6820
+6821
+6822
+6823
+6824
+6825
+6826
+6827
+6828
+6829
+6830
+6831
+6832
+6833
+6834
+6835
+6836
+6837
+6838
+6839
+6840
+6841
+6842
+6843
+6844
+6845
+6846
+6847
+6848
+6849
+6850
+6851
+6852
+6853
+6854
+6855
+6856
+6857
+6858
+6859
+6860
+6861
+6862
+6863
+6864
+6865
+6866
+6867
+6868
+6869
+6870
+6871
+6872
+6873
+6874
+6875
+6876
+6877
+6878
+6879
+6880
+6881
+6882
+6883
+6884
+6885
+6886
+6887
+6888
+6889
+6890
+6891
+6892
+6893
+6894
+6895
+6896
+6897
+6898
+6899
+6900
+6901
+6902
+6903
+6904
+6905
+6906
+6907
+6908
+6909
+6910
+6911
+6912
+6913
+6914
+6915
+6916
+6917
+6918
+6919
+6920
+6921
+6922
+6923
+6924
+6925
+6926
+6927
+6928
+6929
+6930
+6931
+6932
+6933
+6934
+6935
+6936
+6937
+6938
+6939
+6940
+6941
+6942
+6943
+6944
+6945
+6946
+6947
+6948
+6949
+6950
+6951
+6952
+6953
+6954
+6955
+6956
+6957
+6958
+6959
+6960
+6961
+6962
+6963
+6964
+6965
+6966
+6967
+6968
+6969
+6970
+6971
+6972
+6973
+6974
+6975
+6976
+6977
+6978
+6979
+6980
+6981
+6982
+6983
+6984
+6985
+6986
+6987
+6988
+6989
+6990
+6991
+6992
+6993
+6994
+6995
+6996
+6997
+6998
+6999
+7000
+7001
+7002
+7003
+7004
+7005
+7006
+7007
+7008
+7009
+7010
+7011
+7012
+7013
+7014
+7015
+7016
+7017
+7018
+7019
+7020
+7021
+7022
+7023
+7024
+7025
+7026
+7027
+7028
+7029
+7030
+7031
+7032
+7033
+7034
+7035
+7036
+7037
+7038
+7039
+7040
+7041
+7042
+7043
+7044
+7045
+7046
+7047
+7048
+7049
+7050
+7051
+7052
+7053
+7054
+7055
+7056
+7057
+7058
+7059
+7060
+7061
+7062
+7063
+7064
+7065
+7066
+7067
+7068
+7069
+7070
+7071
+7072
+7073
+7074
+7075
+7076
+7077
+7078
+7079
+7080
+7081
+7082
+7083
+7084
+7085
+7086
+7087
+7088
+7089
+7090
+7091
+7092
+7093
+7094
+7095
+7096
+7097
+7098
+7099
+7100
+7101
+7102
+7103
+7104
+7105
+7106
+7107
+7108
+7109
+7110
+7111
+7112
+7113
+7114
+7115
+7116
+7117
+7118
+7119
+7120
+7121
+7122
+7123
+7124
+7125
+7126
+7127
+7128
+7129
+7130
+7131
+7132
+7133
+7134
+7135
+7136
+7137
+7138
+7139
+7140
+7141
+7142
+7143
+7144
+7145
+7146
+7147
+7148
+7149
+7150
+7151
+7152
+7153
+7154
+7155
+7156
+7157
+7158
+7159
+7160
+7161
+7162
+7163
+7164
+7165
+7166
+7167
+7168
+7169
+7170
+7171
+7172
+7173
+7174
+7175
+7176
+7177
+7178
+7179
+7180
+7181
+7182
+7183
+7184
+7185
+7186
+7187
+7188
+7189
+7190
+7191
+7192
+7193
+7194
+7195
+7196
+7197
+7198
+7199
+7200
+7201
+7202
+7203
+7204
+7205
+7206
+7207
+7208
+7209
+7210
+7211
+7212
+7213
+7214
+7215
+7216
+7217
+7218
+7219
+7220
+7221
+7222
+7223
+7224
+7225
+7226
+7227
+7228
+7229
+7230
+7231
+7232
+7233
+7234
+7235
+7236
+7237
+7238
+7239
+7240
+7241
+7242
+7243
+7244
+7245
+7246
+7247
+7248
+7249
+7250
+7251
+7252
+7253
+7254
+7255
+7256
+7257
+7258
+7259
+7260
+7261
+7262
+7263
+7264
+7265
+7266
+7267
+7268
+7269
+7270
+7271
+7272
+7273
+7274
+7275
+7276
+7277
+7278
+7279
+7280
+7281
+7282
+7283
+7284
+7285
+7286
+7287
+7288
+7289
+7290
+7291
+7292
+7293
+7294
+7295
+7296
+7297
+7298
+7299
+7300
+7301
+7302
+7303
+7304
+7305
+7306
+7307
+7308
+7309
+7310
+7311
+7312
+7313
+7314
+7315
+7316
+7317
+7318
+7319
+7320
+7321
+7322
+7323
+7324
+7325
+7326
+7327
+7328
+7329
+7330
+7331
+7332
+7333
+7334
+7335
+7336
+7337
+7338
+7339
+7340
+7341
+7342
+7343
+7344
+7345
+7346
+7347
+7348
+7349
+7350
+7351
+7352
+7353
+7354
+7355
+7356
+7357
+7358
+7359
+7360
+7361
+7362
+7363
+7364
+7365
+7366
+7367
+7368
+7369
+7370
+7371
+7372
+7373
+7374
+7375
+7376
+7377
+7378
+7379
+7380
+7381
+7382
+7383
+7384
+7385
+7386
+7387
+7388
+7389
+7390
+7391
+7392
+7393
+7394
+7395
+7396
+7397
+7398
+7399
+7400
+7401
+7402
+7403
+7404
+7405
+7406
+7407
+7408
+7409
+7410
+7411
+7412
+7413
+7414
+7415
+7416
+7417
+7418
+7419
+7420
+7421
+7422
+7423
+7424
+7425
+7426
+7427
+7428
+7429
+7430
+7431
+7432
+7433
+7434
+7435
+7436
+7437
+7438
+7439
+7440
+7441
+7442
+7443
+7444
+7445
+7446
+7447
+7448
+7449
+7450
+7451
+7452
+7453
+7454
+7455
+7456
+7457
+7458
+7459
+7460
+7461
+7462
+7463
+7464
+7465
+7466
+7467
+7468
+7469
+7470
+7471
+7472
+7473
+7474
+7475
+7476
+7477
+7478
+7479
+7480
+7481
+7482
+7483
+7484
+7485
+7486
+7487
+7488
+7489
+7490
+7491
+7492
+7493
+7494
+7495
+7496
+7497
+7498
+7499
+7500
+7501
+7502
+7503
+7504
+7505
+7506
+7507
+7508
+7509
+7510
+7511
+7512
+7513
+7514
+7515
+7516
+7517
+7518
+7519
+7520
+7521
+7522
+7523
+7524
+7525
+7526
+7527
+7528
+7529
+7530
+7531
+7532
+7533
+7534
+7535
+7536
+7537
+7538
+7539
+7540
+7541
+7542
+7543
+7544
+7545
+7546
+7547
+7548
+7549
+7550
+7551
+7552
+7553
+7554
+7555
+7556
+7557
+7558
+7559
+7560
+7561
+7562
+7563
+7572
+7573
+7574
+7575
+7576
+7577
+7578
+7579
+7580
+7581
+7582
+7583
+7584
+7585
+7586
+7587
+7588
+7589
+7590
+7591
+7592
+7593
+7594
+7595
+7604
+7605
+7606
+7607
+7608
+7609
+7610
+7611
+7612
+7613
+7614
+7615
+7616
+7617
+7618
+7619
+7620
+7621
+7622
+7623
+7624
+7625
+7626
+7627
+7636
+7637
+7638
+7639
+7640
+7641
+7642
+7643
+7644
+7645
+7646
+7647
+7648
+7649
+7650
+7651
+7652
+7653
+7654
+7655
+7656
+7657
+7658
+7659
+7668
+7669
+7670
+7671
+7672
+7673
+7674
+7675
+7676
+7677
+7678
+7679
+7680
+7681
+7682
+7683
+7684
+7685
+7686
+7687
+7688
+7689
+7690
+7691
+7700
+7701
+7702
+7703
+7704
+7705
+7706
+7707
+7708
+7709
+7710
+7711
+7712
+7713
+7714
+7715
+7716
+7717
+7718
+7719
+7720
+7721
+7722
+7723
+7732
+7733
+7734
+7735
+7736
+7737
+7738
+7739
+7740
+7741
+7742
+7743
+7744
+7745
+7746
+7747
+7748
+7749
+7750
+7751
+7752
+7753
+7754
+7755
+7764
+7765
+7766
+7767
+7768
+7769
+7770
+7771
+7772
+7773
+7774
+7775
+7776
+7777
+7778
+7779
+7780
+7781
+7782
+7783
+7784
+7785
+7786
+7787
+7796
+7797
+7798
+7799
+7800
+7801
+7802
+7803
+7804
+7805
+7806
+7807
+7808
+7809
+7810
+7811
+7812
+7813
+7814
+7815
+7816
+7817
+7818
+7819
+7820
+7821
+7822
+7823
+7824
+7825
+7826
+7827
+7828
+7829
+7830
+7831
+7832
+7833
+7834
+7835
+7836
+7837
+7838
+7839
+7840
+7841
+7842
+7843
+7844
+7845
+7846
+7847
+7848
+7849
+7850
+7851
+7852
+7853
+7854
+7855
+7856
+7857
+7858
+7859
+7860
+7861
+7862
+7863
+7864
+7865
+7866
+7867
+7868
+7869
+7870
+7871
+7872
+7873
+7874
+7875
+7876
+7877
+7878
+7879
+7880
+7881
+7882
+7883
+7884
+7885
+7886
+7887
+7888
+7889
+7890
+7891
+7892
+7893
+7894
+7895
+7896
+7897
+7898
+7899
+7900
+7901
+7902
+7903
+7904
+7905
+7906
+7907
+7908
+7909
+7910
+7911
+7912
+7913
+7914
+7915
+7916
+7917
+7918
+7919
+7920
+7921
+7922
+7923
+7924
+7925
+7926
+7927
+7928
+7929
+7930
+7931
+7932
+7933
+7934
+7935
+7936
+7937
+7938
+7939
+7940
+7941
+7942
+7943
+7944
+7945
+7946
+7947
+7948
+7949
+7950
+7951
+7952
+7953
+7954
+7955
+7956
+7957
+7958
+7959
+7960
+7961
+7962
+7963
+7964
+7965
+7966
+7967
+7968
+7969
+7970
+7971
+7972
+7973
+7974
+7975
+7976
+7977
+7978
+7979
+7980
+7981
+7982
+7983
+7984
+7985
+7986
+7987
+7988
+7989
+7990
+7991
+7992
+7993
+7994
+7995
+7996
+7997
+7998
+7999
+8000
+8001
+8002
+8003
+8004
+8005
+8006
+8007
+8008
+8009
+8010
+8011
+8012
+8013
+8014
+8015
+8016
+8017
+8018
+8019
+8020
+8021
+8022
+8023
+8024
+8025
+8026
+8027
+8028
+8029
+8030
+8031
+8032
+8033
+8034
+8035
+8036
+8037
+8038
+8039
+8040
+8041
+8042
+8043
+8044
+8045
+8046
+8047
+8048
+8049
+8050
+8051
+8052
+8053
+8054
+8055
+8056
+8057
+8058
+8059
+8060
+8061
+8062
+8063
+8064
+8065
+8066
+8067
+8068
+8069
+8070
+8071
+8072
+8073
+8074
+8075
+8076
+8077
+8078
+8079
+8080
+8081
+8082
+8083
+8084
+8085
+8086
+8087
+8088
+8089
+8090
+8091
+8092
+8093
+8094
+8095
+8096
+8097
+8098
+8099
+8100
+8101
+8102
+8103
+8104
+8105
+8106
+8107
+8108
+8109
+8110
+8111
+8112
+8113
+8114
+8115
+8116
+8117
+8118
+8119
+8120
+8121
+8122
+8123
+8124
+8125
+8126
+8127
+8128
+8129
+8130
+8131
+8132
+8133
+8134
+8135
+8136
+8137
+8138
+8139
+8140
+8141
+8142
+8143
+8144
+8145
+8146
+8147
+8148
+8149
+8150
+8151
+8152
+8153
+8154
+8155
+8156
+8157
+8158
+8159
+8160
+8161
+8162
+8163
+8164
+8165
+8166
+8167
+8168
+8169
+8170
+8171
+8172
+8173
+8174
+8175
+8176
+8177
+8178
+8179
+8180
+8181
+8182
+8183
+8184
+8185
+8186
+8187
+8188
+8189
+8190
+8191
+8192
+8193
+8194
+8195
+8196
+8197
+8198
+8199
+8200
+8201
+8202
+8203
+8204
+8205
+8206
+8207
+8208
+8209
+8210
+8211
+8212
+8213
+8214
+8215
+8216
+8217
+8218
+8219
+8220
+8221
+8222
+8223
+8224
+8225
+8226
+8227
+8228
+8229
+8230
+8231
+8232
+8233
+8234
+8235
+8236
+8237
+8238
+8239
+8240
+8241
+8242
+8243
+8244
+8245
+8246
+8247
+8248
+8249
+8250
+8251
+8252
+8253
+8254
+8255
+8256
+8257
+8258
+8259
+8260
+8261
+8262
+8263
+8264
+8265
+8266
+8267
+8268
+8269
+8270
+8271
+8272
+8273
+8274
+8275
+8276
+8277
+8278
+8279
+8280
+8281
+8282
+8283
+8284
+8285
+8286
+8287
+8288
+8289
+8290
+8291
+8292
+8293
+8294
+8295
+8296
+8297
+8298
+8299
+8300
+8301
+8302
+8303
+8304
+8305
+8306
+8307
+8308
+8309
+8310
+8311
+8312
+8313
+8314
+8315
+8316
+8317
+8318
+8319
+8320
+8321
+8322
+8323
+8324
+8325
+8326
+8327
+8328
+8329
+8330
+8331
+8332
+8333
+8334
+8335
+8336
+8337
+8338
+8339
+8340
+8341
+8342
+8343
+8344
+8345
+8346
+8347
+8348
+8349
+8350
+8351
+8352
+8353
+8354
+8355
+8356
+8357
+8358
+8359
+8360
+8361
+8362
+8363
+8364
+8365
+8366
+8367
+8368
+8369
+8370
+8371
+8372
+8373
+8374
+8375
+8376
+8377
+8378
+8379
+8380
+8381
+8382
+8383
+8384
+8385
+8386
+8387
+8388
+8389
+8390
+8391
+8392
+8393
+8394
+8395
+8396
+8397
+8398
+8399
+8400
+8401
+8402
+8403
+8404
+8405
+8406
+8407
+8408
+8409
+8410
+8411
+8412
+8413
+8414
+8415
+8416
+8417
+8418
+8419
+8420
+8421
+8422
+8423
+8424
+8425
+8426
+8427
+8428
+8429
+8430
+8431
+8432
+8433
+8434
+8435
+8436
+8437
+8438
+8439
+8440
+8441
+8442
+8443
+8444
+8445
+8446
+8447
+8448
+8449
+8450
+8451
+8452
+8453
+8454
+8455
+8456
+8457
+8458
+8459
+8460
+8461
+8462
+8463
+8464
+8465
+8466
+8467
+8468
+8469
+8470
+8471
+8472
+8473
+8474
+8475
+8476
+8477
+8478
+8479
+8480
+8481
+8482
+8483
+8484
+8485
+8486
+8487
+8488
+8489
+8490
+8491
+8492
+8493
+8494
+8495
+8496
+8497
+8498
+8499
+8500
+8501
+8502
+8503
+8504
+8505
+8506
+8507
+8508
+8509
+8510
+8511
+8512
+8513
+8514
+8515
+8516
+8517
+8518
+8519
+8520
+8521
+8522
+8523
+8524
+8525
+8526
+8527
+8528
+8529
+8530
+8531
+8532
+8533
+8534
+8535
+8536
+8537
+8538
+8539
+8540
+8541
+8542
+8543
+8544
+8545
+8546
+8547
+8548
+8549
+8550
+8551
+8552
+8553
+8554
+8555
+8556
+8557
+8558
+8559
+8560
+8561
+8562
+8563
+8564
+8565
+8566
+8567
+8568
+8569
+8570
+8571
+8572
+8573
+8574
+8575
+8576
+8577
+8578
+8579
+8580
+8581
+8582
+8583
+8584
+8585
+8586
+8587
+8588
+8589
+8590
+8591
+8592
+8593
+8594
+8595
+8596
+8597
+8598
+8599
+8600
+8601
+8602
+8603
+8604
+8605
+8606
+8607
+8608
+8609
+8610
+8611
+8612
+8613
+8614
+8615
+8616
+8617
+8618
+8619
+8620
+8621
+8622
+8623
+8624
+8625
+8626
+8627
+8628
+8629
+8630
+8631
+8632
+8633
+8634
+8635
+8636
+8637
+8638
+8639
+8640
+8641
+8642
+8643
+8644
+8645
+8646
+8647
+8648
+8649
+8650
+8651
+8652
+8653
+8654
+8655
+8656
+8657
+8658
+8659
+8660
+8661
+8662
+8663
+8664
+8665
+8666
+8667
+8668
+8669
+8670
+8671
+8672
+8673
+8674
+8675
+8676
+8677
+8678
+8679
+8680
+8681
+8682
+8683
+8684
+8685
+8686
+8687
+8688
+8689
+8690
+8691
+8692
+8693
+8694
+8695
+8696
+8697
+8698
+8699
+8700
+8701
+8702
+8703
+8704
+8705
+8706
+8707
+8708
+8709
+8710
+8711
+8712
+8713
+8714
+8715
+8716
+8717
+8718
+8719
+8720
+8721
+8722
+8723
+8724
+8725
+8726
+8727
+8728
+8729
+8730
+8731
+8732
+8733
+8734
+8735
+8736
+8737
+8738
+8739
+8740
+8741
+8742
+8743
+8744
+8745
+8746
+8747
+8748
+8749
+8750
+8751
+8752
+8753
+8754
+8755
+8756
+8757
+8758
+8759
+8760
+8761
+8762
+8763
+8764
+8765
+8766
+8767
+8768
+8769
+8770
+8771
+8772
+8773
+8774
+8775
+8776
+8777
+8778
+8779
+8780
+8781
+8782
+8783
+8784
+8785
+8786
+8787
+8788
+8789
+8790
+8791
+8792
+8793
+8794
+8795
+8796
+8797
+8798
+8799
+8800
+8801
+8802
+8803
+8804
+8805
+8806
+8807
+8808
+8809
+8810
+8811
+8812
+8813
+8814
+8815
+8816
+8817
+8818
+8819
+8820
+8821
+8822
+8823
+8824
+8825
+8826
+8827
+8828
+8829
+8830
+8831
+8832
+8833
+8834
+8835
+8836
+8837
+8838
+8839
+8840
+8841
+8842
+8843
+8844
+8845
+8846
+8847
+8848
+8849
+8850
+8851
+8852
+8853
+8854
+8855
+8856
+8857
+8858
+8859
+8860
+8861
+8862
+8863
+8864
+8865
+8866
+8867
+8868
+8869
+8870
+8871
+8872
+8873
+8874
+8875
+8876
+8877
+8878
+8879
+8880
+8881
+8882
+8883
+8884
+8885
+8886
+8887
+8888
+8889
+8890
+8891
+8892
+8893
+8894
+8895
+8896
+8897
+8898
+8899
+8900
+8901
+8902
+8903
+8904
+8905
+8906
+8907
+8908
+8909
+8910
+8911
+8912
+8913
+8914
+8915
+8916
+8917
+8918
+8919
+8920
+8921
+8922
+8923
+8924
+8925
+8926
+8927
+8928
+8929
+8930
+8931
+8932
+8933
+8934
+8935
+8936
+8937
+8938
+8939
+8940
+8941
+8942
+8943
+8944
+8945
+8946
+8947
+8948
+8949
+8950
+8951
+8952
+8953
+8954
+8955
+8956
+8957
+8958
+8959
+8960
+8961
+8962
+8963
+8964
+8965
+8966
+8967
+8968
+8969
+8970
+8971
+8972
+8973
+8974
+8975
+8976
+8977
+8978
+8979
+8980
+8981
+8982
+8983
+8984
+8985
+8986
+8987
+8988
+8989
+8990
+8991
+8992
+8993
+8994
+8995
+8996
+8997
+8998
+8999
+9000
+9001
+9002
+9003
+9004
+9005
+9006
+9007
+9008
+9009
+9010
+9011
+9012
+9013
+9014
+9015
+9016
+9017
+9018
+9019
+9020
+9021
+9022
+9023
+9024
+9025
+9026
+9027
+9028
+9029
+9030
+9031
+9032
+9033
+9034
+9035
+9036
+9037
+9038
+9039
+9040
+9041
+9042
+9043
+9044
+9045
+9046
+9047
+9048
+9049
+9050
+9051
+9052
+9053
+9054
+9055
+9056
+9057
+9058
+9059
+9060
+9061
+9062
+9063
+9064
+9065
+9066
+9067
+9068
+9069
+9070
+9071
+9072
+9073
+9074
+9075
+9076
+9077
+9078
+9079
+9080
+9081
+9082
+9083
+9084
+9085
+9086
+9087
+9088
+9089
+9090
+9091
+9092
+9093
+9094
+9095
+9096
+9097
+9098
+9099
+9100
+9101
+9102
+9103
+9104
+9105
+9106
+9107
+9108
+9109
+9110
+9111
+9112
+9113
+9114
+9115
+9116
+9117
+9118
+9119
+9120
+9121
+9122
+9123
+9124
+9125
+9126
+9127
+9128
+9129
+9130
+9131
+9132
+9133
+9134
+9135
+9136
+9137
+9138
+9139
+9140
+9141
+9142
+9143
+9144
+9145
+9146
+9147
+9148
+9149
+9150
+9151
+9152
+9153
+9154
+9155
+9156
+9157
+9158
+9159
+9160
+9161
+9162
+9163
+9164
+9165
+9166
+9167
+9168
+9169
+9170
+9171
+9172
+9173
+9174
+9175
+9176
+9177
+9178
+9179
+9180
+9181
+9182
+9183
+9184
+9185
+9186
+9187
+9188
+9189
+9190
+9191
+9192
+9193
+9194
+9195
+9196
+9197
+9198
+9199
+9200
+9201
+9202
+9203
+9204
+9205
+9206
+9207
+9208
+9209
+9210
+9211
+9212
+9213
+9214
+9215
+9216
+9217
+9218
+9219
+9220
+9221
+9222
+9223
+9224
+9225
+9226
+9227
+9228
+9229
+9230
+9231
+9232
+9233
+9234
+9235
+9236
+9237
+9238
+9239
+9240
+9241
+9242
+9243
+9244
+9245
+9246
+9247
+9248
+9249
+9250
+9251
+9252
+9253
+9254
+9255
+9256
+9257
+9258
+9259
+9260
+9261
+9262
+9263
+9264
+9265
+9266
+9267
+9268
+9269
+9270
+9271
+9272
+9273
+9274
+9275
+9276
+9277
+9278
+9279
+9280
+9281
+9282
+9283
+9284
+9285
+9286
+9287
+9288
+9289
+9290
+9291
+9292
+9293
+9294
+9295
+9296
+9297
+9298
+9299
+9300
+9301
+9302
+9303
+9304
+9305
+9306
+9307
+9308
+9309
+9310
+9311
+9312
+9313
+9314
+9315
+9316
+9317
+9318
+9319
+9320
+9321
+9322
+9323
+9324
+9325
+9326
+9327
+9328
+9329
+9330
+9331
+9332
+9333
+9334
+9335
+9336
+9337
+9338
+9339
+9340
+9341
+9342
+9343
+9344
+9345
+9346
+9347
+9348
+9349
+9350
+9351
+9352
+9353
+9354
+9355
+9356
+9357
+9358
+9359
+9360
+9361
+9362
+9363
+9364
+9365
+9366
+9367
+9368
+9369
+9370
+9371
+9372
+9373
+9374
+9375
+9376
+9377
+9378
+9379
+9380
+9381
+9382
+9383
+9384
+9385
+9386
+9387
+9388
+9389
+9390
+9391
+9392
+9393
+9394
+9395
+9396
+9397
+9398
+9399
+9400
+9401
+9402
+9403
+9404
+9405
+9406
+9407
+9408
+9409
+9410
+9411
+9412
+9413
+9414
+9415
+9416
+9417
+9418
+9419
+9420
+9421
+9422
+9423
+9424
+9425
+9426
+9427
+9428
+9429
+9430
+9431
+9432
+9433
+9434
+9435
+9436
+9437
+9438
+9439
+9440
+9441
+9442
+9443
+9444
+9445
+9446
+9447
+9448
+9449
+9450
+9451
+9452
+9453
+9454
+9455
+9456
+9457
+9458
+9459
+9460
+9461
+9462
+9463
+9464
+9465
+9466
+9467
+9468
+9469
+9470
+9471
+9472
+9473
+9474
+9475
+9476
+9477
+9478
+9479
+9480
+9481
+9482
+9483
+9484
+9485
+9486
+9487
+9488
+9489
+9490
+9491
+9492
+9493
+9494
+9495
+9496
+9497
+9498
+9499
+9500
+9501
+9502
+9503
+9504
+9505
+9506
+9507
+9508
+9509
+9510
+9511
+9512
+9513
+9514
+9515
+9516
+9517
+9518
+9519
+9520
+9521
+9522
+9523
+9524
+9525
+9526
+9527
+9528
+9529
+9530
+9531
+9532
+9533
+9534
+9535
+9536
+9537
+9538
+9539
+9540
+9541
+9542
+9543
+9544
+9545
+9546
+9547
+9548
+9549
+9550
+9551
+9552
+9553
+9554
+9555
+9556
+9557
+9558
+9559
+9560
+9561
+9562
+9563
+9564
+9565
+9566
+9567
+9568
+9569
+9570
+9571
+9572
+9573
+9574
+9575
+9576
+9577
+9578
+9579
+9580
+9581
+9582
+9583
+9584
+9585
+9586
+9587
+9588
+9589
+9590
+9591
+9592
+9593
+9594
+9595
+9596
+9597
+9598
+9599
+9600
+9601
+9602
+9603
+9604
+9605
+9606
+9607
+9608
+9609
+9610
+9611
+9612
+9613
+9614
+9615
+9616
+9617
+9618
+9619
+9620
+9621
+9622
+9623
+9624
+9625
+9626
+9627
+9628
+9629
+9630
+9631
+9632
+9633
+9634
+9635
+9636
+9637
+9638
+9639
+9640
+9641
+9642
+9643
+9644
+9645
+9646
+9647
+9648
+9649
+9650
+9651
+9652
+9653
+9654
+9655
+9656
+9657
+9658
+9659
+9660
+9661
+9662
+9663
+9664
+9665
+9666
+9667
+9668
+9669
+9670
+9671
+9672
+9673
+9674
+9675
+9676
+9677
+9678
+9679
+9680
+9681
+9682
+9683
+9684
+9685
+9686
+9687
+9688
+9689
+9690
+9691
+9692
+9693
+9694
+9695
+9696
+9697
+9698
+9699
+9700
+9701
+9702
+9703
+9704
+9705
+9706
+9707
+9708
+9709
+9710
+9711
+9712
+9713
+9714
+9715
+9716
+9717
+9718
+9719
+9720
+9721
+9722
+9723
+9724
+9725
+9726
+9727
+9728
+9729
+9730
+9731
+9732
+9733
+9734
+9735
+9736
+9737
+9738
+9739
+9740
+9741
+9742
+9743
+9744
+9745
+9746
+9747
+9748
+9749
+9750
+9751
+9752
+9753
+9754
+9755
+9756
+9757
+9758
+9759
+9760
+9761
+9762
+9763
+9764
+9765
+9766
+9767
+9768
+9769
+9770
+9771
+9772
+9773
+9774
+9775
+9776
+9777
+9778
+9779
+9780
+9781
+9782
+9783
+9784
+9785
+9786
+9787
+9788
+9789
+9790
+9791
+9792
+9793
+9794
+9795
+9796
+9797
+9798
+9799
+9800
+9801
+9802
+9803
+9804
+9805
+9806
+9807
+9808
+9809
+9810
+9811
+9812
+9813
+9814
+9815
+9816
+9817
+9818
+9819
+9820
+9821
+9822
+9823
+9824
+9825
+9826
+9827
+9828
+9829
+9830
+9831
+9832
+9833
+9834
+9835
+9836
+9837
+9838
+9839
+9840
+9841
+9842
+9843
+9844
+9845
+9846
+9847
+9848
+9849
+9850
+9851
+9852
+9853
+9854
+9855
+9856
+9857
+9858
+9859
+9860
+9861
+9862
+9863
+9864
+9865
+9866
+9867
+9868
+9869
+9870
+9871
+9872
+9873
+9874
+9875
+9876
+9877
+9878
+9879
+9880
+9881
+9882
+9883
+9884
+9885
+9886
+9887
+9888
+9889
+9890
+9891
+9892
+9893
+9894
+9895
+9896
+9897
+9898
+9899
+9900
+9901
+9902
+9903
+9904
+9905
+9906
+9907
+9908
+9909
+9910
+9911
+9912
+9913
+9914
+9915
+9916
+9917
+9918
+9919
+9920
+9921
+9922
+9923
+9924
+9925
+9926
+9927
+9928
+9929
+9930
+9931
+9932
+9933
+9934
+9935
+9936
+9937
+9938
+9939
+9940
+9941
+9942
+9943
+9944
+9945
+9946
+9947
+9948
+9949
+9950
+9951
+9952
+9953
+9954
+9955
+9956
+9957
+9958
+9959
+9960
+9961
+9962
+9963
+9964
+9965
+9966
+9967
+9968
+9969
+9970
+9971
+9972
+9973
+9974
+9975
+9976
+9977
+9978
+9979
+9980
+9981
+9982
+9983
+9984
+9985
+9986
+9987
+9988
+9989
+9990
+9991
+9992
+9993
+9994
+9995
+9996
+9997
+9998
+9999
+10000
+10001
+10002
+10003
+10004
+10005
+10006
+10007
+10008
+10009
+10010
+10011
+10012
+10013
+10014
+10015
+10016
+10017
+10018
+10019
+10020
+10021
+10022
+10023
+10024
+10025
+10026
+10027
+10028
+10029
+10030
+10031
+10032
+10033
+10034
+10035
+10036
+10037
+10038
+10039
+10040
+10041
+10042
+10043
+10044
+10045
+10046
+10047
+10048
+10049
+10050
+10051
+10052
+10053
+10054
+10055
+10056
+10057
+10058
+10059
+10060
+10061
+10062
+10063
+10064
+10065
+10066
+10067
+10068
+10069
+10070
+10071
+10072
+10073
+10074
+10075
+10076
+10077
+10078
+10079
+10080
+10081
+10082
+10083
+10084
+10085
+10086
+10087
+10088
+10089
+10090
+10091
+10092
+10093
+10094
+10095
+10096
+10097
+10098
+10099
+10100
+10101
+10102
+10103
+10104
+10105
+10106
+10107
+10108
+10109
+10110
+10111
+10112
+10113
+10114
+10115
+10116
+10117
+10118
+10119
+10120
+10121
+10122
+10123
+10124
+10125
+10126
+10127
+10128
+10129
+10130
+10131
+10132
+10133
+10134
+10135
+10136
+10137
+10138
+10139
+10140
+10141
+10142
+10143
+10144
+10145
+10146
+10147
+10148
+10149
+10150
+10151
+10152
+10153
+10154
+10155
+10156
+10157
+10158
+10159
+10160
+10161
+10162
+10163
+10164
+10165
+10166
+10167
+10168
+10169
+10170
+10171
+10172
+10173
+10174
+10175
+10176
+10177
+10178
+10179
+10180
+10181
+10182
+10183
+10184
+10185
+10186
+10187
+10188
+10189
+10190
+10191
+10192
+10193
+10194
+10195
+10196
+10197
+10198
+10199
+10200
+10201
+10202
+10203
+10204
+10205
+10206
+10207
+10208
+10209
+10210
+10211
+10212
+10213
+10214
+10215
+10216
+10217
+10218
+10219
+10220
+10221
+10222
+10223
+10224
+10225
+10226
+10227
+10228
+10229
+10230
+10231
+10232
+10233
+10234
+10235
+10236
+10237
+10238
+10239
+10240
+10241
+10242
+10243
+10244
+10245
+10246
+10247
+10248
+10249
+10250
+10251
+10252
+10253
+10254
+10255
+10256
+10257
+10258
+10259
+10260
+10261
+10262
+10263
+10264
+10265
+10266
+10267
+10268
+10269
+10270
+10271
+10272
+10273
+10274
+10275
+10276
+10277
+10278
+10279
+10280
+10281
+10282
+10283
+10284
+10285
+10286
+10287
+10288
+10289
+10290
+10291
+10292
+10293
+10294
+10295
+10296
+10297
+10298
+10299
+10300
+10301
+10302
+10303
+10304
+10305
+10306
+10307
+10308
+10309
+10310
+10311
+10312
+10313
+10314
+10315
+10316
+10317
+10318
+10319
+10320
+10321
+10322
+10323
+10324
+10325
+10326
+10327
+10328
+10329
+10330
+10331
+10332
+10333
+10334
+10335
+10336
+10337
+10338
+10339
+10340
+10341
+10342
+10343
+10344
+10345
+10346
+10347
+10348
+10349
+10350
+10351
+10352
+10353
+10354
+10355
+10356
+10357
+10358
+10359
+10360
+10361
+10362
+10363
+10364
+10365
+10366
+10367
+10368
+10369
+10370
+10371
+10372
+10373
+10374
+10375
+10376
+10377
+10378
+10379
+10380
+10381
+10382
+10383
+10384
+10385
+10386
+10387
+10388
+10389
+10390
+10391
+10392
+10393
+10394
+10395
+10396
+10397
+10398
+10399
+10400
+10401
+10402
+10403
+10404
+10405
+10406
+10407
+10408
+10409
+10410
+10411
+10412
+10413
+10414
+10415
+10416
+10417
+10418
+10419
+10420
+10421
+10422
+10423
+10424
+10425
+10426
+10427
+10428
+10429
+10430
+10431
+10432
+10433
+10434
+10435
+10436
+10437
+10438
+10439
+10440
+10441
+10442
+10443
+10444
+10445
+10446
+10447
+10448
+10449
+10450
+10451
+10452
+10453
+10454
+10455
+10456
+10457
+10458
+10459
+10460
+10461
+10462
+10463
+10464
+10465
+10466
+10467
+10468
+10469
+10470
+10471
+10472
+10473
+10474
+10475
+10476
+10477
+10478
+10479
+10480
+10481
+10482
+10483
+10484
+10485
+10486
+10487
+10488
+10489
+10490
+10491
+10492
+10493
+10494
+10495
+10496
+10497
+10498
+10499
+10500
+10501
+10502
+10503
+10504
+10505
+10506
+10507
+10508
+10509
+10510
+10511
+10512
+10513
+10514
+10515
+10516
+10517
+10518
+10519
+10520
+10521
+10522
+10523
+10524
+10525
+10526
+10527
+10528
+10529
+10530
+10531
+10532
+10533
+10534
+10535
+10536
+10537
+10538
+10539
+10540
+10541
+10542
+10543
+10544
+10545
+10546
+10547
+10548
+10549
+10550
+10551
+10552
+10553
+10554
+10555
+10556
+10557
+10558
+10559
+10560
+10561
+10562
+10563
+10564
+10565
+10566
+10567
+10568
+10569
+10570
+10571
+10572
+10573
+10574
+10575
+10576
+10577
+10578
+10579
+10580
+10581
+10582
+10583
+10584
+10585
+10586
+10587
+10588
+10589
+10590
+10591
+10592
+10593
+10594
+10595
+10596
+10597
+10598
+10599
+10600
+10601
+10602
+10603
+10604
+10605
+10606
+10607
+10608
+10609
+10610
+10611
+10612
+10613
+10614
+10615
+10616
+10617
+10618
+10619
+10620
+10621
+10622
+10623
+10624
+10625
+10626
+10627
+10628
+10629
+10630
+10631
+10632
+10633
+10634
+10635
+10636
+10637
+10638
+10639
+10640
+10641
+10642
+10643
+10644
+10645
+10646
+10647
+10648
+10649
+10650
+10651
+10652
+10653
+10654
+10655
+10656
+10657
+10658
+10659
+10660
+10661
+10662
+10663
+10664
+10665
+10666
+10667
+10668
+10669
+10670
+10671
+10672
+10673
+10674
+10675
+10676
+10677
+10678
+10679
+10680
+10681
+10682
+10683
+10684
+10685
+10686
+10687
+10688
+10689
+10690
+10691
+10692
+10693
+10694
+10695
+10696
+10697
+10698
+10699
+10700
+10701
+10702
+10703
+10704
+10705
+10706
+10707
+10708
+10709
+10710
+10711
+10712
+10713
+10714
+10715
+10716
+10717
+10718
+10719
+10720
+10721
+10722
+10723
+10724
+10725
+10726
+10727
+10728
+10729
+10730
+10731
+10732
+10733
+10734
+10735
+10736
+10737
+10738
+10739
+10740
+10741
+10742
+10743
+10744
+10745
+10746
+10747
+10748
+10749
+10750
+10751
+10752
+10753
+10754
+10755
+10756
+10757
+10758
+10759
+10760
+10761
+10762
+10763
+10764
+10765
+10766
+10767
+10768
+10769
+10770
+10771
+10772
+10773
+10774
+10775
+10776
+10777
+10778
+10779
+10780
+10781
+10782
+10783
+10784
+10785
+10786
+10787
+10788
+10789
+10790
+10791
+10792
+10793
+10794
+10795
+10796
+10797
+10798
+10799
+10800
+10801
+10802
+10803
+10804
+10805
+10806
+10807
+10808
+10809
+10810
+10811
+10812
+10813
+10814
+10815
+10816
+10817
+10818
+10819
+10820
+10821
+10822
+10823
+10824
+10825
+10826
+10827
+10828
+10829
+10830
+10831
+10832
+10833
+10834
+10835
+10836
+10837
+10838
+10839
+10840
+10841
+10842
+10843
+10844
+10845
+10846
+10847
+10848
+10849
+10850
+10851
+10852
+10853
+10854
+10855
+10856
+10857
+10858
+10859
+10860
+10861
+10862
+10863
+10864
+10865
+10866
+10867
+10868
+10869
+10870
+10871
+10872
+10873
+10874
+10875
+10876
+10877
+10878
+10879
+10880
+10881
+10882
+10883
+10884
+10885
+10886
+10887
+10888
+10889
+10890
+10891
+10892
+10893
+10894
+10895
+10896
+10897
+10898
+10899
+10900
+10901
+10902
+10903
+10904
+10905
+10906
+10907
+10908
+10909
+10910
+10911
+10912
+10913
+10914
+10915
+10916
+10917
+10918
+10919
+10920
+10921
+10922
+10923
+10924
+10925
+10926
+10927
+10928
+10929
+10930
+10931
+10932
+10933
+10934
+10935
+10936
+10937
+10938
+10939
+10940
+10941
+10942
+10943
+10944
+10945
+10946
+10947
+10948
+10949
+10950
+10951
+10952
+10953
+10954
+10955
+10956
+10957
+10958
+10959
+10960
+10961
+10962
+10963
+10964
+10965
+10966
+10967
+10968
+10969
+10970
+10971
+10972
+10973
+10974
+10975
+10976
+10977
+10978
+10979
+10980
+10981
+10982
+10983
+10984
+10985
+10986
+10987
+10988
+10989
+10990
+10991
+10992
+10993
+10994
+10995
+10996
+10997
+10998
+10999
+11000
+11001
+11002
+11003
+11004
+11005
+11006
+11007
+11008
+11009
+11010
+11011
+11012
+11013
+11014
+11015
+11016
+11017
+11018
+11019
+11020
+11021
+11022
+11023
+11024
+11025
+11026
+11027
+11028
+11029
+11030
+11031
+11032
+11033
+11034
+11035
+11036
+11037
+11038
+11039
+11040
+11041
+11042
+11043
+11044
+11045
+11046
+11047
+11048
+11049
+11050
+11051
+11052
+11053
+11054
+11055
+11056
+11057
+11058
+11059
+11060
+11061
+11062
+11063
+11064
+11065
+11066
+11067
+11068
+11069
+11070
+11071
+11072
+11073
+11074
+11075
+11076
+11077
+11078
+11079
+11080
+11081
+11082
+11083
+11084
+11085
+11086
+11087
+11088
+11089
+11090
+11091
+11092
+11093
+11094
+11095
+11096
+11097
+11098
+11099
+11100
+11101
+11102
+11103
+11104
+11105
+11106
+11107
+11108
+11109
+11110
+11111
+11112
+11113
+11114
+11115
+11116
+11117
+11118
+11119
+11120
+11121
+11122
+11123
+11124
+11125
+11126
+11127
+11128
+11129
+11130
+11131
+11132
+11133
+11134
+11135
+11136
+11137
+11138
+11139
+11140
+11141
+11142
+11143
+11144
+11145
+11146
+11147
+11148
+11149
+11150
+11151
+11152
+11153
+11154
+11155
+11156
+11157
+11158
+11159
+11160
+11161
+11162
+11163
+11164
+11165
+11166
+11167
+11168
+11169
+11170
+11171
+11172
+11173
+11174
+11175
+11176
+11177
+11178
+11179
+11180
+11181
+11182
+11183
+11184
+11185
+11186
+11187
+11188
+11189
+11190
+11191
+11192
+11193
+11194
+11195
+11196
+11197
+11198
+11199
+11200
+11201
+11202
+11203
+11204
+11205
+11206
+11207
+11208
+11209
+11210
+11211
+11212
+11213
+11214
+11215
+11216
+11217
+11218
+11219
+11220
+11221
+11222
+11223
+11224
+11225
+11226
+11227
+11228
+11229
+11230
+11231
+11232
+11233
+11234
+11235
+11236
+11237
+11238
+11239
+11240
+11241
+11242
+11243
+11244
+11245
+11246
+11247
+11248
+11249
+11250
+11251
+11252
+11253
+11254
+11255
+11256
+11257
+11258
+11259
+11260
+11261
+11262
+11263
+11264
+11265
+11266
+11267
+11268
+11269
+11270
+11271
+11272
+11273
+11274
+11275
+11276
+11277
+11278
+11279
+11280
+11281
+11282
+11283
+11284
+11285
+11286
+11287
+11288
+11289
+11290
+11291
+11292
+11293
+11294
+11295
+11296
+11297
+11298
+11299
+11300
+11301
+11302
+11303
+11304
+11305
+11306
+11307
+11308
+11309
+11310
+11311
+11312
+11313
+11314
+11315
+11316
+11317
+11318
+11319
+11320
+11321
+11322
+11323
+11324
+11325
+11326
+11327
+11328
+11329
+11330
+11331
+11332
+11333
+11334
+11335
+11336
+11337
+11338
+11339
+11340
+11341
+11342
+11343
+11344
+11345
+11346
+11347
+11348
+11349
+11350
+11351
+11352
+11353
+11354
+11355
+11356
+11357
+11358
+11359
+11360
+11361
+11362
+11363
+11364
+11365
+11366
+11367
+11368
+11369
+11370
+11371
+11372
+11373
+11374
+11375
+11376
+11377
+11378
+11379
+11380
+11381
+11382
+11383
+11384
+11385
+11386
+11387
+11388
+11389
+11390
+11391
+11392
+11393
+11394
+11395
+11396
+11397
+11398
+11399
+11400
+11401
+11402
+11403
+11404
+11405
+11406
+11407
+11408
+11409
+11410
+11411
+11412
+11413
+11414
+11415
+11416
+11417
+11418
+11419
+11420
+11421
+11422
+11423
+11424
+11425
+11426
+11427
+11428
+11429
+11430
+11431
+11432
+11433
+11434
+11435
+11436
+11437
+11438
+11439
+11440
+11441
+11442
+11443
+11444
+11445
+11446
+11447
+11448
+11449
+11450
+11451
+11452
+11453
+11454
+11455
+11456
+11457
+11458
+11459
+11460
+11461
+11462
+11463
+11464
+11465
+11466
+11467
+11468
+11469
+11470
+11471
+11472
+11473
+11474
+11475
+11476
+11477
+11478
+11479
+11480
+11481
+11482
+11483
+11484
+11485
+11486
+11487
+11488
+11489
+11490
+11491
+11492
+11493
+11494
+11495
+11496
+11497
+11498
+11499
+11500
+11501
+11502
+11503
+11504
+11505
+11506
+11507
+11508
+11509
+11510
+11511
+11512
+11513
+11514
+11515
+11516
+11517
+11518
+11519
+11520
+11521
+11522
+11523
+11524
+11525
+11526
+11527
+11528
+11529
+11530
+11531
+11532
+11533
+11534
+11535
+11536
+11537
+11538
+11539
+11540
+11541
+11542
+11543
+11544
+11545
+11546
+11547
+11548
+11549
+11550
+11551
+11552
+11553
+11554
+11555
+11556
+11557
+11558
+11559
+11560
+11561
+11562
+11563
+11564
+11565
+11566
+11567
+11568
+11569
+11570
+11571
+11572
+11573
+11574
+11575
+11576
+11577
+11578
+11579
+11580
+11581
+11582
+11583
+11584
+11585
+11586
+11587
+11588
+11589
+11590
+11591
+11592
+11593
+11594
+11595
+11596
+11597
+11598
+11599
+11600
+11601
+11602
+11603
+11604
+11605
+11606
+11607
+11608
+11609
+11610
+11611
+11612
+11613
+11614
+11615
+11616
+11617
+11618
+11619
+11620
+11621
+11622
+11623
+11624
+11625
+11626
+11627
+11628
+11629
+11630
+11631
+11632
+11633
+11634
+11635
+11636
+11637
+11638
+11639
+11640
+11641
+11642
+11643
+11644
+11645
+11646
+11647
+11648
+11649
+11650
+11651
+11652
+11653
+11654
+11655
+11656
+11657
+11658
+11659
+11660
+11661
+11662
+11663
+11664
+11665
+11666
+11667
+11668
+11669
+11670
+11671
+11672
+11673
+11674
+11675
+11676
+11677
+11678
+11679
+11680
+11681
+11682
+11683
+11684
+11685
+11686
+11687
+11688
+11689
+11690
+11691
+11692
+11693
+11694
+11695
+11696
+11697
+11698
+11699
+11700
+11701
+11702
+11703
+11704
+11705
+11706
+11707
+11708
+11709
+11710
+11711
+11712
+11713
+11714
+11715
+11716
+11717
+11718
+11719
+11720
+11721
+11722
+11723
+11724
+11725
+11726
+11727
+11728
+11729
+11730
+11731
+11732
+11733
+11734
+11735
+11736
+11737
+11738
+11739
+11740
+11741
+11742
+11743
+11744
+11745
+11746
+11747
+11748
+11749
+11750
+11751
+11752
+11753
+11754
+11755
+11756
+11757
+11758
+11759
+11760
+11761
+11762
+11763
+11764
+11765
+11766
+11767
+11768
+11769
+11770
+11771
+11772
+11773
+11774
+11775
+11776
+11777
+11778
+11779
+11780
+11781
+11782
+11783
+11784
+11785
+11786
+11787
+11788
+11789
+11790
+11791
+11792
+11793
+11794
+11795
+11796
+11797
+11798
+11799
+11800
+11801
+11802
+11803
+11804
+11805
+11806
+11807
+11808
+11809
+11810
+11811
+11812
+11813
+11814
+11815
+11816
+11817
+11818
+11819
+11820
+11821
+11822
+11823
+11824
+11825
+11826
+11827
+11828
+11829
+11830
+11831
+11832
+11833
+11834
+11835
+11836
+11837
+11838
+11839
+11840
+11841
+11842
+11843
+11844
+11845
+11846
+11847
+11848
+11849
+11850
+11851
+11852
+11853
+11854
+11855
+11856
+11857
+11858
+11859
+11860
+11861
+11862
+11863
+11864
+11865
+11866
+11867
+11868
+11869
+11870
+11871
+11872
+11873
+11874
+11875
+11876
+11877
+11878
+11879
+11880
+11881
+11882
+11883
+11884
+11885
+11886
+11887
+11888
+11889
+11890
+11891
+11892
+11893
+11894
+11895
+11896
+11897
+11898
+11899
+11900
+11901
+11902
+11903
+11904
+11905
+11906
+11907
+11908
+11909
+11910
+11911
+11912
+11913
+11914
+11915
+11916
+11917
+11918
+11919
+11920
+11921
+11922
+11923
+11924
+11925
+11926
+11927
+11928
+11929
+11930
+11931
+11932
+11933
+11934
+11935
+11936
+11937
+11938
+11939
+11940
+11941
+11942
+11943
+11944
+11945
+11946
+11947
+11948
+11949
+11950
+11951
+11952
+11953
+11954
+11955
+11956
+11957
+11958
+11959
+11960
+11961
+11962
+11963
+11964
+11965
+11966
+11967
+11968
+11969
+11970
+11971
+11972
+11973
+11974
+11975
+11976
+11977
+11978
+11979
+11980
+11981
+11982
+11983
+11984
+11985
+11986
+11987
+11988
+11989
+11990
+11991
+11992
+11993
+11994
+11995
+11996
+11997
+11998
+11999
+12000
+12001
+12002
+12003
+12004
+12005
+12006
+12007
+12008
+12009
+12010
+12011
+12012
+12013
+12014
+12015
+12016
+12017
+12018
+12019
+12020
+12021
+12022
+12023
+12024
+12025
+12026
+12027
+12028
+12029
+12030
+12031
+12032
+12033
+12034
+12035
+12036
+12037
+12038
+12039
+12040
+12041
+12042
+12043
+12044
+12045
+12046
+12047
+12048
+12049
+12050
+12051
+12052
+12053
+12054
+12055
+12056
+12057
+12058
+12059
+12060
+12061
+12062
+12063
+12064
+12065
+12066
+12067
+12068
+12069
+12070
+12071
+12072
+12073
+12074
+12075
+12076
+12077
+12078
+12079
+12080
+12081
+12082
+12083
+12084
+12085
+12086
+12087
+12088
+12089
+12090
+12091
+12092
+12093
+12094
+12095
+12096
+12097
+12098
+12099
+12100
+12101
+12102
+12103
+12104
+12105
+12106
+12107
+12108
+12109
+12110
+12111
+12112
+12113
+12114
+12115
+12116
+12117
+12118
+12119
+12120
+12121
+12122
+12123
+12124
+12125
+12126
+12127
+12128
+12129
+12130
+12131
+12132
+12133
+12134
+12135
+12136
+12137
+12138
+12139
+12140
+12141
+12142
+12143
+12144
+12145
+12146
+12147
+12148
+12149
+12150
+12151
+12152
+12153
+12154
+12155
+12156
+12157
+12158
+12159
+12160
+12161
+12162
+12163
+12164
+12165
+12166
+12167
+12168
+12169
+12170
+12171
+12172
+12173
+12174
+12175
+12176
+12177
+12178
+12179
+12180
+12181
+12182
+12183
+12184
+12185
+12186
+12187
+12188
+12189
+12190
+12191
+12192
+12193
+12194
+12195
+12196
+12197
+12198
+12199
+12200
+12201
+12202
+12203
+12204
+12205
+12206
+12207
+12208
+12209
+12210
+12211
+12212
+12213
+12214
+12215
+12216
+12217
+12218
+12219
+12220
+12221
+12222
+12223
+12224
+12225
+12226
+12227
+12228
+12229
+12230
+12231
+12232
+12233
+12234
+12235
+12236
+12237
+12238
+12239
+12240
+12241
+12242
+12243
+12244
+12245
+12246
+12247
+12248
+12249
+12250
+12251
+12252
+12253
+12254
+12255
+12256
+12257
+12258
+12259
+12260
+12261
+12262
+12263
+12264
+12265
+12266
+12267
+12268
+12269
+12270
+12271
+12272
+12273
+12274
+12275
+12276
+12277
+12278
+12279
+12280
+12281
+12282
+12283
+12284
+12285
+12286
+12287
+12288
+12289
+12290
+12291
+12292
+12293
+12294
+12295
+12296
+12297
+12298
+12299
+12300
+12301
+12302
+12303
+12304
+12305
+12306
+12307
+12308
+12309
+12310
+12311
+12312
+12313
+12314
+12315
+12316
+12317
+12318
+12319
+12320
+12321
+12322
+12323
+12324
+12325
+12326
+12327
+12328
+12329
+12330
+12331
+12332
+12333
+12334
+12335
+12336
+12337
+12338
+12339
+12340
+12341
+12342
+12343
+12344
+12345
+12346
+12347
+12348
+12349
+12350
+12351
+12352
+12353
+12354
+12355
+12356
+12357
+12358
+12359
+12360
+12361
+12362
+12363
+12364
+12365
+12366
+12367
+12368
+12369
+12370
+12371
+12372
+12373
+12374
+12375
+12376
+12377
+12378
+12379
+12380
+12381
+12382
+12383
+12384
+12385
+12386
+12387
+12388
+12389
+12390
+12391
+12392
+12393
+12394
+12395
+12396
+12397
+12398
+12399
+12400
+12401
+12402
+12403
+12404
+12405
+12406
+12407
+12408
+12409
+12410
+12411
+12412
+12413
+12414
+12415
+12416
+12417
+12418
+12419
+12420
+12421
+12422
+12423
+12424
+12425
+12426
+12427
+12428
+12429
+12430
+12431
+12432
+12433
+12434
+12435
+12436
+12437
+12438
+12439
+12440
+12441
+12442
+12443
+12444
+12445
+12446
+12447
+12448
+12449
+12450
+12451
+12452
+12453
+12454
+12455
+12456
+12457
+12458
+12459
+12460
+12461
+12462
+12463
+12464
+12465
+12466
+12467
+12468
+12469
+12470
+12471
+12472
+12473
+12474
+12475
+12476
+12477
+12478
+12479
+12480
+12481
+12482
+12483
+12484
+12485
+12486
+12487
+12488
+12489
+12490
+12491
+12492
+12493
+12494
+12495
+12496
+12497
+12498
+12499
+12500
+12501
+12502
+12503
+12504
+12505
+12506
+12507
+12508
+12509
+12510
+12511
+12512
+12513
+12514
+12515
+12516
+12517
+12518
+12519
+12520
+12521
+12522
+12523
+12524
+12525
+12526
+12527
+12528
+12529
+12530
+12531
+12532
+12533
+12534
+12535
+12536
+12537
+12538
+12539
+12540
+12541
+12542
+12543
+12544
+12545
+12546
+12547
+12548
+12549
+12550
+12551
+12552
+12553
+12554
+12555
+12556
+12557
+12558
+12559
+12560
+12561
+12562
+12563
+12564
+12565
+12566
+12567
+12568
+12569
+12570
+12571
+12572
+12573
+12574
+12575
+12576
+12577
+12578
+12579
+12580
+12581
+12582
+12583
+12584
+12585
+12586
+12587
+12588
+12589
+12590
+12591
+12592
+12593
+12594
+12595
+12596
+12597
+12598
+12599
+12600
+12601
+12602
+12603
+12604
+12605
+12606
+12607
+12608
+12609
+12610
+12611
+12612
+12613
+12614
+12615
+12616
+12617
+12618
+12619
+12620
+12621
+12622
+12623
+12624
+12625
+12626
+12627
+12628
+12629
+12630
+12631
+12632
+12633
+12634
+12635
+12636
+12637
+12638
+12639
+12640
+12641
+12642
+12643
+12644
+12645
+12646
+12647
+12648
+12649
+12650
+12651
+12652
+12653
+12654
+12655
+12656
+12657
+12658
+12659
+12660
+12661
+12662
+12663
+12664
+12665
+12666
+12667
+12668
+12669
+12670
+12671
+12672
+12673
+12674
+12675
+12676
+12677
+12678
+12679
+12680
+12681
+12682
+12683
+12684
+12685
+12686
+12687
+12688
+12689
+12690
+12691
+12692
+12693
+12694
+12695
+12696
+12697
+12698
+12699
+12700
+12701
+12702
+12703
+12704
+12705
+12706
+12707
+12708
+12709
+12710
+12711
+12712
+12713
+12714
+12715
+12716
+12717
+12718
+12719
+12720
+12721
+12722
+12723
+12724
+12725
+12726
+12727
+12728
+12729
+12730
+12731
+12732
+12733
+12734
+12735
+12736
+12737
+12738
+12739
+12740
+12741
+12742
+12743
+12744
+12745
+12746
+12747
+12748
+12749
+12750
+12751
+12752
+12753
+12754
+12755
+12756
+12757
+12758
+12759
+12760
+12761
+12762
+12763
+12764
+12765
+12766
+12767
+12768
+12769
+12770
+12771
+12772
+12773
+12774
+12775
+12776
+12777
+12778
+12779
+12780
+12781
+12782
+12783
+12784
+12785
+12786
+12787
+12788
+12789
+12790
+12791
+12792
+12793
+12794
+12795
+12796
+12797
+12798
+12799
+12800
+12801
+12802
+12803
+12804
+12805
+12806
+12807
+12808
+12809
+12810
+12811
+12812
+12813
+12814
+12815
+12816
+12817
+12818
+12819
+12820
+12821
+12822
+12823
+12824
+12825
+12826
+12827
+12828
+12829
+12830
+12831
+12832
+12833
+12834
+12835
+12836
+12837
+12838
+12839
+12840
+12841
+12842
+12843
+12844
+12845
+12846
+12847
+12848
+12849
+12850
+12851
+12852
+12853
+12854
+12855
+12856
+12857
+12858
+12859
+12860
+12861
+12862
+12863
+12864
+12865
+12866
+12867
+12868
+12869
+12870
+12871
+12872
+12873
+12874
+12875
+12876
+12877
+12878
+12879
+12880
+12881
+12882
+12883
+12884
+12885
+12886
+12887
+12888
+12889
+12890
+12891
+12892
+12893
+12894
+12895
+12896
+12897
+12898
+12899
+12900
+12901
+12902
+12903
+12904
+12905
+12906
+12907
+12908
+12909
+12910
+12911
+12912
+12913
+12914
+12915
+12916
+12917
+12918
+12919
+12920
+12921
+12922
+12923
+12924
+12925
+12926
+12927
+12928
+12929
+12930
+12931
+12932
+12933
+12934
+12935
+12936
+12937
+12938
+12939
+12940
+12941
+12942
+12943
+12944
+12945
+12946
+12947
+12948
+12949
+12950
+12951
+12952
+12953
+12954
+12955
+12956
+12957
+12958
+12959
+12960
+12961
+12962
+12963
+12964
+12965
+12966
+12967
+12968
+12969
+12970
+12971
+12972
+12973
+12974
+12975
+12976
+12977
+12978
+12979
+12980
+12981
+12982
+12983
+12984
+12985
+12986
+12987
+12988
+12989
+12990
+12991
+12992
+12993
+12994
+12995
+12996
+12997
+12998
+12999
+13000
+13001
+13002
+13003
+13004
+13005
+13006
+13007
+13008
+13009
+13010
+13011
+13012
+13013
+13014
+13015
+13016
+13017
+13018
+13019
+13020
+13021
+13022
+13023
+13024
+13025
+13026
+13027
+13028
+13029
+13030
+13031
+13032
+13033
+13034
+13035
+13036
+13037
+13038
+13039
+13040
+13041
+13042
+13043
+13044
+13045
+13046
+13047
+13048
+13049
+13050
+13051
+13052
+13053
+13054
+13055
+13056
+13057
+13058
+13059
+13060
+13061
+13062
+13063
+13064
+13065
+13066
+13067
+13068
+13069
+13070
+13071
+13072
+13073
+13074
+13075
+13076
+13077
+13078
+13079
+13080
+13081
+13082
+13083
+13084
+13085
+13086
+13087
+13088
+13089
+13090
+13091
+13092
+13093
+13094
+13095
+13096
+13097
+13098
+13099
+13100
+13101
+13102
+13103
+13104
+13105
+13106
+13107
+13108
+13109
+13110
+13111
+13112
+13113
+13114
+13115
+13116
+13117
+13118
+13119
+13120
+13121
+13122
+13123
+13124
+13125
+13126
+13127
+13128
+13129
+13130
+13131
+13132
+13133
+13134
+13135
+13136
+13137
+13138
+13139
+13140
+13141
+13142
+13143
+13144
+13145
+13146
+13147
+13148
+13149
+13150
+13151
+13152
+13153
+13154
+13155
+13156
+13157
+13158
+13159
+13160
+13161
+13162
+13163
+13164
+13165
+13166
+13167
+13168
+13169
+13170
+13171
+13172
+13173
+13174
+13175
+13176
+13177
+13178
+13179
+13180
+13181
+13182
+13183
+13184
+13185
+13186
+13187
+13188
+13189
+13190
+13191
+13192
+13193
+13194
+13195
+13196
+13197
+13198
+13199
+13200
+13201
+13202
+13203
+13204
+13205
+13206
+13207
+13208
+13209
+13210
+13211
+13212
+13213
+13214
+13215
+13216
+13217
+13218
+13219
+13220
+13221
+13222
+13223
+13224
+13225
+13226
+13227
+13228
+13229
+13230
+13231
+13232
+13233
+13234
+13235
+13236
+13237
+13238
+13239
+13240
+13241
+13242
+13243
+13244
+13245
+13246
+13247
+13248
+13249
+13250
+13251
+13252
+13253
+13254
+13255
+13256
+13257
+13258
+13259
+13260
+13261
+13262
+13263
+13264
+13265
+13266
+13267
+13268
+13269
+13270
+13271
+13272
+13273
+13274
+13275
+13276
+13277
+13278
+13279
+13280
+13281
+13282
+13283
+13284
+13285
+13286
+13287
+13288
+13289
+13290
+13291
+13292
+13293
+13294
+13295
+13296
+13297
+13298
+13299
+13300
+13301
+13302
+13303
+13304
+13305
+13306
+13307
+13308
+13309
+13310
+13311
+13312
+13313
+13314
+13315
+13316
+13317
+13318
+13319
+13320
+13321
+13322
+13323
+13324
+13325
+13326
+13327
+13328
+13329
+13330
+13331
+13332
+13333
+13334
+13335
+13336
+13337
+13338
+13339
+13340
+13341
+13342
+13343
+13344
+13345
+13346
+13347
+13348
+13349
+13350
+13351
+13352
+13353
+13354
+13355
+13356
+13357
+13358
+13359
+13360
+13361
+13362
+13363
+13364
+13365
+13366
+13367
+13368
+13369
+13370
+13371
+13372
+13373
+13374
+13375
+13376
+13377
+13378
+13379
+13380
+13381
+13382
+13383
+13384
+13385
+13386
+13387
+13388
+13389
+13390
+13391
+13392
+13393
+13394
+13395
+13396
+13397
+13398
+13399
+13400
+13401
+13402
+13403
+13404
+13405
+13406
+13407
+13408
+13409
+13410
+13411
+13412
+13413
+13414
+13415
+13416
+13417
+13418
+13419
+13420
+13421
+13422
+13423
+13424
+13425
+13426
+13427
+13428
+13429
+13430
+13431
+13432
+13433
+13434
+13435
+13436
+13437
+13438
+13439
+13440
+13441
+13442
+13443
+13444
+13445
+13446
+13447
+13448
+13449
+13450
+13451
+13452
+13453
+13454
+13455
+13456
+13457
+13458
+13459
+13460
+13461
+13462
+13463
+13464
+13465
+13466
+13467
+13468
+13469
+13470
+13471
+13472
+13473
+13474
+13475
+13476
+13477
+13478
+13479
+13480
+13481
+13482
+13483
+13484
+13485
+13486
+13487
+13488
+13489
+13490
+13491
+13492
+13493
+13494
+13495
+13496
+13497
+13498
+13499
+13500
+13501
+13502
+13503
+13504
+13505
+13506
+13507
+13508
+13509
+13510
+13511
+13512
+13513
+13514
+13515
+13516
+13517
+13518
+13519
+13520
+13521
+13522
+13523
+13524
+13525
+13526
+13527
+13528
+13529
+13530
+13531
+13532
+13533
+13534
+13535
+13536
+13537
+13538
+13539
+13540
+13541
+13542
+13543
+13544
+13545
+13546
+13547
+13548
+13549
+13550
+13551
+13552
+13553
+13554
+13555
+13556
+13557
+13558
+13559
+13560
+13561
+13562
+13563
+13564
+13565
+13566
+13567
+13568
+13569
+13570
+13571
+13572
+13573
+13574
+13575
+13576
+13577
+13578
+13579
+13580
+13581
+13582
+13583
+13584
+13585
+13586
+13587
+13588
+13589
+13590
+13591
+13592
+13593
+13594
+13595
+13596
+13597
+13598
+13599
+13600
+13601
+13602
+13603
+13604
+13605
+13606
+13607
+13608
+13609
+13610
+13611
+13612
+13613
+13614
+13615
+13616
+13617
+13618
+13619
+13620
+13621
+13622
+13623
+13624
+13625
+13626
+13627
+13628
+13629
+13630
+13631
+13632
+13633
+13634
+13635
+13636
+13637
+13638
+13639
+13640
+13641
+13642
+13643
+13644
+13645
+13646
+13647
+13648
+13649
+13650
+13651
+13652
+13653
+13654
+13655
+13656
+13657
+13658
+13659
+13660
+13661
+13662
+13663
+13664
+13665
+13666
+13667
+13668
+13669
+13670
+13671
+13672
+13673
+13674
+13675
+13676
+13677
+13678
+13679
+13680
+13681
+13682
+13683
+13684
+13685
+13686
+13687
+13688
+13689
+13690
+13691
+13692
+13693
+13694
+13695
+13696
+13697
+13698
+13699
+13700
+13701
+13702
+13703
+13704
+13705
+13706
+13707
+13708
+13709
+13710
+13711
+13712
+13713
+13714
+13715
+13716
+13717
+13718
+13719
+13720
+13721
+13722
+13723
+13724
+13725
+13726
+13727
+13728
+13729
+13730
+13731
+13732
+13733
+13734
+13735
+13736
+13737
+13738
+13739
+13740
+13741
+13742
+13743
+13744
+13745
+13746
+13747
+13748
+13749
+13750
+13751
+13752
+13753
+13754
+13755
+13756
+13757
+13758
+13759
+13760
+13761
+13762
+13763
+13764
+13765
+13766
+13767
+13768
+13769
+13770
+13771
+13772
+13773
+13774
+13775
+13776
+13777
+13778
+13779
+13780
+13781
+13782
+13783
+13784
+13785
+13786
+13787
+13788
+13789
+13790
+13791
+13792
+13793
+13794
+13795
+13796
+13797
+13798
+13799
+13800
+13801
+13802
+13803
+13804
+13805
+13806
+13807
+13808
+13809
+13810
+13811
+13812
+13813
+13814
+13815
+13816
+13817
+13818
+13819
+13820
+13821
+13822
+13823
+13824
+13825
+13826
+13827
+13828
+13829
+13830
+13831
+13832
+13833
+13834
+13835
+13836
+13837
+13838
+13839
+13840
+13841
+13842
+13843
+13844
+13845
+13846
+13847
+13848
+13849
+13850
+13851
+13852
+13853
+13854
+13855
+13856
+13857
+13858
+13859
+13860
+13861
+13862
+13863
+13864
+13865
+13866
+13867
+13868
+13869
+13870
+13871
+13872
+13873
+13874
+13875
+13876
+13877
+13878
+13879
+13880
+13881
+13882
+13883
+13884
+13885
+13886
+13887
+13888
+13889
+13890
+13891
+13892
+13893
+13894
+13895
+13896
+13897
+13898
+13899
+13900
+13901
+13902
+13903
+13904
+13905
+13906
+13907
+13908
+13909
+13910
+13911
+13912
+13913
+13914
+13915
+13916
+13917
+13918
+13919
+13920
+13921
+13922
+13923
+13924
+13925
+13926
+13927
+13928
+13929
+13930
+13931
+13932
+13933
+13934
+13935
+13936
+13937
+13938
+13939
+13940
+13941
+13942
+13943
+13944
+13945
+13946
+13947
+13948
+13949
+13950
+13951
+13952
+13953
+13954
+13955
+13956
+13957
+13958
+13959
+13960
+13961
+13962
+13963
+13964
+13965
+13966
+13967
+13968
+13969
+13970
+13971
+13972
+13973
+13974
+13975
+13976
+13977
+13978
+13979
+13980
+13981
+13982
+13983
+13984
+13985
+13986
+13987
+13988
+13989
+13990
+13991
+13992
+13993
+13994
+13995
+13996
+13997
+13998
+13999
+14000
+14001
+14002
+14003
+14004
+14005
+14006
+14007
+14008
+14009
+14010
+14011
+14012
+14013
+14014
+14015
+14016
+14017
+14018
+14019
+14020
+14021
+14022
+14023
+14024
+14025
+14026
+14027
+14028
+14029
+14030
+14031
+14032
+14033
+14034
+14035
+14036
+14037
+14038
+14039
+14040
+14041
+14042
+14043
+14044
+14045
+14046
+14047
+14048
+14049
+14050
+14051
+14052
+14053
+14054
+14055
+14056
+14057
+14058
+14059
+14060
+14061
+14062
+14063
+14064
+14065
+14066
+14067
+14068
+14069
+14070
+14071
+14072
+14073
+14074
+14075
+14076
+14077
+14078
+14079
+14080
+14081
+14082
+14083
+14084
+14085
+14086
+14087
+14088
+14089
+14090
+14091
+14092
+14093
+14094
+14095
+14096
+14097
+14098
+14099
+14100
+14101
+14102
+14103
+14104
+14105
+14106
+14107
+14108
+14109
+14110
+14111
+14112
+14113
+14114
+14115
+14116
+14117
+14118
+14119
+14120
+14121
+14122
+14123
+14124
+14125
+14126
+14127
+14128
+14129
+14130
+14131
+14132
+14133
+14134
+14135
+14136
+14137
+14138
+14139
+14140
+14141
+14142
+14143
+14144
+14145
+14146
+14147
+14148
+14149
+14150
+14151
+14152
+14153
+14154
+14155
+14156
+14157
+14158
+14159
+14160
+14161
+14162
+14163
+14164
+14165
+14166
+14167
+14168
+14169
+14170
+14171
+14172
+14173
+14174
+14175
+14176
+14177
+14178
+14179
+14180
+14181
+14182
+14183
+14184
+14185
+14186
+14187
+14188
+14189
+14190
+14191
+14192
+14193
+14194
+14195
+14196
+14197
+14198
+14199
+14200
+14201
+14202
+14203
+14204
+14205
+14206
+14207
+14208
+14209
+14210
+14211
+14212
+14213
+14214
+14215
+14216
+14217
+14218
+14219
+14220
+14221
+14222
+14223
+14224
+14225
+14226
+14227
+14228
+14229
+14230
+14231
+14232
+14233
+14234
+14235
+14236
+14237
+14238
+14239
+14240
+14241
+14242
+14243
+14244
+14245
+14246
+14247
+14248
+14249
+14250
+14251
+14252
+14253
+14254
+14255
+14256
+14257
+14258
+14259
+14260
+14261
+14262
+14263
+14264
+14265
+14266
+14267
+14268
+14269
+14270
+14271
+14272
+14273
+14274
+14275
+14276
+14277
+14278
+14279
+14280
+14281
+14282
+14283
+14284
+14285
+14286
+14287
+14288
+14289
+14290
+14291
+14292
+14293
+14294
+14295
+14296
+14297
+14298
+14299
+14300
+14301
+14302
+14303
+14304
+14305
+14306
+14307
+14308
+14309
+14310
+14311
+14312
+14313
+14314
+14315
+14316
+14317
+14318
+14319
+14320
+14321
+14322
+14323
+14324
+14325
+14326
+14327
+14328
+14329
+14330
+14331
+14332
+14333
+14334
+14335
+14336
+14337
+14338
+14339
+14340
+14341
+14342
+14343
+14344
+14345
+14346
+14347
+14348
+14349
+14350
+14351
+14352
+14353
+14354
+14355
+14356
+14357
+14358
+14359
+14360
+14361
+14362
+14363
+14364
+14365
+14366
+14367
+14368
+14369
+14370
+14371
+14372
+14373
+14374
+14375
+14376
+14377
+14378
+14379
+14380
+14381
+14382
+14383
+14384
+14385
+14386
+14387
+14388
+14389
+14390
+14391
+14392
+14393
+14394
+14395
+14396
+14397
+14398
+14399
+14400
+14401
+14402
+14403
+14404
+14405
+14406
+14407
+14408
+14409
+14410
+14411
+14412
+14413
+14414
+14415
+14416
+14417
+14418
+14419
+14420
+14421
+14422
+14423
+14424
+14425
+14426
+14427
+14428
+14429
+14430
+14431
+14432
+14433
+14434
+14435
+14436
+14437
+14438
+14439
+14440
+14441
+14442
+14443
+14444
+14445
+14446
+14447
+14448
+14449
+14450
+14451
+14452
+14453
+14454
+14455
+14456
+14457
+14458
+14459
+14460
+14461
+14462
+14463
+14464
+14465
+14466
+14467
+14468
+14469
+14470
+14471
+14472
+14473
+14474
+14475
+14476
+14477
+14478
+14479
+14480
+14481
+14482
+14483
+14484
+14485
+14486
+14487
+14488
+14489
+14490
+14491
+14492
+14493
+14494
+14495
+14496
+14497
+14498
+14499
+14500
+14501
+14502
+14503
+14504
+14505
+14506
+14507
+14508
+14509
+14510
+14511
+14512
+14513
+14514
+14515
+14516
+14517
+14518
+14519
+14520
+14521
+14522
+14523
+14524
+14525
+14526
+14527
+14528
+14529
+14530
+14531
+14532
+14533
+14534
+14535
+14536
+14537
+14538
+14539
+14540
+14541
+14542
+14543
+14544
+14545
+14546
+14547
+14548
+14549
+14550
+14551
+14552
+14553
+14554
+14555
+14556
+14557
+14558
+14559
+14560
+14561
+14562
+14563
+14564
+14565
+14566
+14567
+14568
+14569
+14570
+14571
+14572
+14573
+14574
+14575
+14576
+14577
+14578
+14579
+14580
+14581
+14582
+14583
+14584
+14585
+14586
+14587
+14588
+14589
+14590
+14591
+14592
+14593
+14594
+14595
+14596
+14597
+14598
+14599
+14600
+14601
+14602
+14603
+14604
+14605
+14606
+14607
+14608
+14609
+14610
+14611
+14612
+14613
+14614
+14615
+14616
+14617
+14618
+14619
+14620
+14621
+14622
+14623
+14624
+14625
+14626
+14627
+14628
+14629
+14630
+14631
+14632
+14633
+14634
+14635
+14636
+14637
+14638
+14639
+14640
+14641
+14642
+14643
+14644
+14645
+14646
+14647
+14648
+14649
+14650
+14651
+14652
+14653
+14654
+14655
+14656
+14657
+14658
+14659
+14660
+14661
+14662
+14663
+14664
+14665
+14666
+14667
+14668
+14669
+14670
+14671
+14672
+14673
+14674
+14675
+14676
+14677
+14678
+14679
+14680
+14681
+14682
+14683
+14684
+14685
+14686
+14687
+14688
+14689
+14690
+14691
+14692
+14693
+14694
+14695
+14696
+14697
+14698
+14699
+14700
+14701
+14702
+14703
+14704
+14705
+14706
+14707
+14708
+14709
+14710
+14711
+14712
+14713
+14714
+14715
+14716
+14717
+14718
+14719
+14720
+14721
+14722
+14723
+14724
+14725
+14726
+14727
+14728
+14729
+14730
+14731
+14732
+14733
+14734
+14735
+14736
+14737
+14738
+14739
+14740
+14741
+14742
+14743
+14744
+14745
+14746
+14747
+14748
+14749
+14750
+14751
+14752
+14753
+14754
+14755
+14756
+14757
+14758
+14759
+14760
+14761
+14762
+14763
+14764
+14765
+14766
+14767
+14768
+14769
+14770
+14771
+14772
+14773
+14774
+14775
+14776
+14777
+14778
+14779
+14780
+14781
+14782
+14783
+14784
+14785
+14786
+14787
+14788
+14789
+14790
+14791
+14792
+14793
+14794
+14795
+14796
+14797
+14798
+14799
+14800
+14801
+14802
+14803
+14804
+14805
+14806
+14807
+14808
+14809
+14810
+14811
+14812
+14813
+14814
+14815
+14816
+14817
+14818
+14819
+14820
+14821
+14822
+14823
+14824
+14825
+14826
+14827
+14828
+14829
+14830
+14831
+14832
+14833
+14834
+14835
+14836
+14837
+14838
+14839
+14840
+14841
+14842
+14843
+14844
+14845
+14846
+14847
+14848
+14849
+14850
+14851
+14852
+14853
+14854
+14855
+14856
+14857
+14858
+14859
+14860
+14861
+14862
+14863
+14864
+14865
+14866
+14867
+14868
+14869
+14870
+14871
+14872
+14873
+14874
+14875
+14876
+14877
+14878
+14879
+14880
+14881
+14882
+14883
+14884
+14885
+14886
+14887
+14888
+14889
+14890
+14891
+14892
+14893
+14894
+14895
+14896
+14897
+14898
+14899
+14900
+14901
+14902
+14903
+14904
+14905
+14906
+14907
+14908
+14909
+14910
+14911
+14912
+14913
+14914
+14915
+14916
+14917
+14918
+14919
+14920
+14921
+14922
+14923
+14924
+14925
+14926
+14927
+14928
+14929
+14930
+14931
+14932
+14933
+14934
+14935
+14936
+14937
+14938
+14939
+14940
+14941
+14942
+14943
+14944
+14945
+14946
+14947
+14948
+14949
+14950
+14951
+14952
+14953
+14954
+14955
+14956
+14957
+14958
+14959
+14960
+14961
+14962
+14963
+14964
+14965
+14966
+14967
+14968
+14969
+14970
+14971
+14972
+14973
+14974
+14975
+14976
+14977
+14978
+14979
+14980
+14981
+14982
+14983
+14984
+14985
+14986
+14987
+14988
+14989
+14990
+14991
+14992
+14993
+14994
+14995
+14996
+14997
+14998
+14999
+15000
+15001
+15002
+15003
+15004
+15005
+15006
+15007
+15008
+15009
+15010
+15011
+15012
+15013
+15014
+15015
+15016
+15017
+15018
+15019
+15020
+15021
+15022
+15023
+15024
+15025
+15026
+15027
+15028
+15029
+15030
+15031
+15032
+15033
+15034
+15035
+15036
+15037
+15038
+15039
+15040
+15041
+15042
+15043
+15044
+15045
+15046
+15047
+15048
+15049
+15050
+15051
+15052
+15053
+15054
+15055
+15056
+15057
+15058
+15059
+15060
+15061
+15062
+15063
+15064
+15065
+15066
+15067
+15068
+15069
+15070
+15071
+15072
+15073
+15074
+15075
+15076
+15077
+15078
+15079
+15080
+15081
+15082
+15083
+15084
+15085
+15086
+15087
+15088
+15089
+15090
+15091
+15092
+15093
+15094
+15095
+15096
+15097
+15098
+15099
+15100
+15101
+15102
+15103
+15104
+15105
+15106
+15107
+15108
+15109
+15110
+15111
+15112
+15113
+15114
+15115
+15116
+15117
+15118
+15119
+15120
+15121
+15122
+15123
+15124
+15125
+15126
+15127
+15128
+15129
+15130
+15131
+15132
+15133
+15134
+15135
+15136
+15137
+15138
+15139
+15140
+15141
+15142
+15143
+15144
+15145
+15146
+15147
+15148
+15149
+15150
+15151
+15152
+15153
+15154
+15155
+15156
+15157
+15158
+15159
+15160
+15161
+15162
+15163
+15164
+15165
+15166
+15167
+15168
+15169
+15170
+15171
+15172
+15173
+15174
+15175
+15176
+15177
+15178
+15179
+15180
+15181
+15182
+15183
+15184
+15185
+15186
+15187
+15188
+15189
+15190
+15191
+15192
+15193
+15194
+15195
+15196
+15197
+15198
+15199
+15200
+15201
+15202
+15203
+15204
+15205
+15206
+15207
+15208
+15209
+15210
+15211
+15212
+15213
+15214
+15215
+15216
+15217
+15218
+15219
+15220
+15221
+15222
+15223
+15224
+15225
+15226
+15227
+15228
+15229
+15230
+15231
+15232
+15233
+15234
+15235
+15236
+15237
+15238
+15239
+15240
+15241
+15242
+15243
+15244
+15245
+15246
+15247
+15248
+15249
+15250
+15251
+15252
+15253
+15254
+15255
+15256
+15257
+15258
+15259
+15260
+15261
+15262
+15263
+15264
+15265
+15266
+15267
+15268
+15269
+15270
+15271
+15272
+15273
+15274
+15275
+15276
+15277
+15278
+15279
+15280
+15281
+15282
+15283
+15284
+15285
+15286
+15287
+15288
+15289
+15290
+15291
+15292
+15293
+15294
+15295
+15296
+15297
+15298
+15299
+15300
+15301
+15302
+15303
+15304
+15305
+15306
+15307
+15308
+15309
+15310
+15311
+15312
+15313
+15314
+15315
+15316
+15317
+15318
+15319
+15320
+15321
+15322
+15323
+15324
+15325
+15326
+15327
+15328
+15329
+15330
+15331
+15332
+15333
+15334
+15335
+15336
+15337
+15338
+15339
+15340
+15341
+15342
+15343
+15344
+15345
+15346
+15347
+15348
+15349
+15350
+15351
+15352
+15353
+15354
+15355
+15356
+15357
+15358
+15359
+15360
+15361
+15362
+15363
+15364
+15365
+15366
+15367
+15368
+15369
+15370
+15371
+15372
+15373
+15374
+15375
+15376
+15377
+15378
+15379
+15380
+15381
+15382
+15383
+15384
+15385
+15386
+15387
+15388
+15389
+15390
+15391
+15392
+15393
+15394
+15395
+15396
+15397
+15398
+15399
+15400
+15401
+15402
+15403
+15404
+15405
+15406
+15407
+15408
+15409
+15410
+15411
+15412
+15413
+15414
+15415
+15416
+15417
+15418
+15419
+15420
+15421
+15422
+15423
+15424
+15425
+15426
+15427
+15428
+15429
+15430
+15431
+15432
+15433
+15434
+15435
+15436
+15437
+15438
+15439
+15440
+15441
+15442
+15443
+15444
+15445
+15446
+15447
+15448
+15449
+15450
+15451
+15452
+15453
+15454
+15455
+15456
+15457
+15458
+15459
+15460
+15461
+15462
+15463
+15464
+15465
+15466
+15467
+15468
+15469
+15470
+15471
+15472
+15473
+15474
+15475
+15476
+15477
+15478
+15479
+15480
+15481
+15482
+15483
+15484
+15485
+15486
+15487
+15488
+15489
+15490
+15491
+15492
+15493
+15494
+15495
+15496
+15497
+15498
+15499
+15500
+15501
+15502
+15503
+15504
+15505
+15506
+15507
+15508
+15509
+15510
+15511
+15512
+15513
+15514
+15515
+15516
+15517
+15518
+15519
+15520
+15521
+15522
+15523
+15524
+15525
+15526
+15527
+15528
+15529
+15530
+15531
+15532
+15533
+15534
+15535
+15536
+15537
+15538
+15539
+15540
+15541
+15542
+15543
+15544
+15545
+15546
+15547
+15548
+15549
+15550
+15551
+15552
+15553
+15554
+15555
+15556
+15557
+15558
+15559
+15560
+15561
+15562
+15563
+15564
+15565
+15566
+15567
+15568
+15569
+15570
+15571
+15572
+15573
+15574
+15575
+15576
+15577
+15578
+15579
+15580
+15581
+15582
+15583
+15584
+15585
+15586
+15587
+15588
+15589
+15590
+15591
+15592
+15593
+15594
+15595
+15596
+15597
+15598
+15599
+15600
+15601
+15602
+15603
+15604
+15605
+15606
+15607
+15608
+15609
+15610
+15611
+15612
+15613
+15614
+15615
+15616
+15617
+15618
+15619
+15620
+15621
+15622
+15623
+15624
+15625
+15626
+15627
+15628
+15629
+15630
+15631
+15632
+15633
+15634
+15635
+15636
+15637
+15638
+15639
+15640
+15641
+15642
+15643
+15644
+15645
+15646
+15647
+15648
+15649
+15650
+15651
+15652
+15653
+15654
+15655
+15656
+15657
+15658
+15659
+15660
+15661
+15662
+15663
+15664
+15665
+15666
+15667
+15668
+15669
+15670
+15671
+15672
+15673
+15674
+15675
+15676
+15677
+15678
+15679
+15680
+15681
+15682
+15683
+15684
+15685
+15686
+15687
+15688
+15689
+15690
+15691
+15692
+15693
+15694
+15695
+15696
+15697
+15698
+15699
+15700
+15701
+15702
+15703
+15704
+15705
+15706
+15707
+15708
+15709
+15710
+15711
+15712
+15713
+15714
+15715
+15716
+15717
+15718
+15719
+15720
+15721
+15722
+15723
+15724
+15725
+15726
+15727
+15728
+15729
+15730
+15731
+15732
+15733
+15734
+15735
+15736
+15737
+15738
+15739
+15740
+15741
+15742
+15743
+15744
+15745
+15746
+15747
+15748
+15749
+15750
+15751
+15752
+15753
+15754
+15755
+15756
+15757
+15758
+15759
+15760
+15761
+15762
+15763
+15764
+15765
+15766
+15767
+15768
+15769
+15770
+15771
+15772
+15773
+15774
+15775
+15776
+15777
+15778
+15779
+15780
+15781
+15782
+15783
+15784
+15785
+15786
+15787
+15788
+15789
+15790
+15791
+15792
+15793
+15794
+15795
+15796
+15797
+15798
+15799
+15800
+15801
+15802
+15803
+15804
+15805
+15806
+15807
+15808
+15809
+15810
+15811
+15812
+15813
+15814
+15815
+15816
+15817
+15818
+15819
+15820
+15821
+15822
+15823
+15824
+15825
+15826
+15827
+15828
+15829
+15830
+15831
+15832
+15833
+15834
+15835
+15836
+15837
+15838
+15839
+15840
+15841
+15842
+15843
+15844
+15845
+15846
+15847
+15848
+15849
+15850
+15851
+15852
+15853
+15854
+15855
+15856
+15857
+15858
+15859
+15860
+15861
+15862
+15863
+15864
+15865
+15866
+15867
+15868
+15869
+15870
+15871
+15872
+15873
+15874
+15875
+15876
+15877
+15878
+15879
+15880
+15881
+15882
+15883
+15884
+15885
+15886
+15887
+15888
+15889
+15890
+15891
+15892
+15893
+15894
+15895
+15896
+15897
+15898
+15899
+15900
+15901
+15902
+15903
+15904
+15905
+15906
+15907
+15908
+15909
+15910
+15911
+15912
+15913
+15914
+15915
+15916
+15917
+15918
+15919
+15920
+15921
+15922
+15923
+15924
+15925
+15926
+15927
+15928
+15929
+15930
+15931
+15932
+15933
+15934
+15935
+15936
+15937
+15938
+15939
+15940
+15941
+15942
+15943
+15944
+15945
+15946
+15947
+15948
+15949
+15950
+15951
+15952
+15953
+15954
+15955
+15956
+15957
+15958
+15959
+15960
+15961
+15962
+15963
+15964
+15965
+15966
+15967
+15968
+15969
+15970
+15971
+15972
+15973
+15974
+15975
+15976
+15977
+15978
+15979
+15980
+15981
+15982
+15983
+15984
+15985
+15986
+15987
+15988
+15989
+15990
+15991
+15992
+15993
+15994
+15995
+15996
+15997
+15998
+15999
+16000
+16001
+16002
+16003
+16004
+16005
+16006
+16007
+16008
+16009
+16010
+16011
+16012
+16013
+16014
+16015
+16016
+16017
+16018
+16019
+16020
+16021
+16022
+16023
+16024
+16025
+16026
+16027
+16028
+16029
+16030
+16031
+16032
+16033
+16034
+16035
+16036
+16037
+16038
+16039
+16040
+16041
+16042
+16043
+16044
+16045
+16046
+16047
+16048
+16049
+16050
+16051
+16052
+16053
+16054
+16055
+16056
+16057
+16058
+16059
+16060
+16061
+16062
+16063
+16064
+16065
+16066
+16067
+16068
+16069
+16070
+16071
+16072
+16073
+16074
+16075
+16076
+16077
+16078
+16079
+16080
+16081
+16082
+16083
+16084
+16085
+16086
+16087
+16088
+16089
+16090
+16091
+16092
+16093
+16094
+16095
+16096
+16097
+16098
+16099
+16100
+16101
+16102
+16103
+16104
+16105
+16106
+16107
+16108
+16109
+16110
+16111
+16112
+16113
+16114
+16115
+16116
+16117
+16118
+16119
+16120
+16121
+16122
+16123
+16124
+16125
+16126
+16127
+16128
+16129
+16130
+16131
+16132
+16133
+16134
+16135
+16136
+16137
+16138
+16139
+16140
+16141
+16142
+16143
+16144
+16145
+16146
+16147
+16148
+16149
+16150
+16151
+16152
+16153
+16154
+16155
+16156
+16157
+16158
+16159
+16160
+16161
+16162
+16163
+16164
+16165
+16166
+16167
+16168
+16169
+16170
+16171
+16172
+16173
+16174
+16175
+16176
+16177
+16178
+16179
+16180
+16181
+16182
+16183
+16184
+16185
+16186
+16187
+16188
+16189
+16190
+16191
+16192
+16193
+16194
+16195
+16196
+16197
+16198
+16199
+16200
+16201
+16202
+16203
+16204
+16205
+16206
+16207
+16208
+16209
+16210
+16211
+16212
+16213
+16214
+16215
+16216
+16217
+16218
+16219
+16220
+16221
+16222
+16223
+16224
+16225
+16226
+16227
+16228
+16229
+16230
+16231
+16232
+16233
+16234
+16235
+16236
+16237
+16238
+16239
+16240
+16241
+16242
+16243
+16244
+16245
+16246
+16247
+16248
+16249
+16250
+16251
+16252
+16253
+16254
+16255
+16256
+16257
+16258
+16259
+16260
+16261
+16262
+16263
+16264
+16265
+16266
+16267
+16268
+16269
+16270
+16271
+16272
+16273
+16274
+16275
+16276
+16277
+16278
+16279
+16280
+16281
+16282
+16283
+16284
+16285
+16286
+16287
+16288
+16289
+16290
+16291
+16292
+16293
+16294
+16295
+16296
+16297
+16298
+16299
+16300
+16301
+16302
+16303
+16304
+16305
+16306
+16307
+16308
+16309
+16310
+16311
+16312
+16313
+16314
+16315
+16316
+16317
+16318
+16319
+16320
+16321
+16322
+16323
+16324
+16325
+16326
+16327
+16328
+16329
+16330
+16331
+16332
+16333
+16334
+16335
+16336
+16337
+16338
+16339
+16340
+16341
+16342
+16343
+16344
+16345
+16346
+16347
+16348
+16349
+16350
+16351
+16352
+16353
+16354
+16355
+16356
+16357
+16358
+16359
+16360
+16361
+16362
+16363
+16364
+16365
+16366
+16367
+16368
+16369
+16370
+16371
+16372
+16373
+16374
+16375
+16376
+16377
+16378
+16379
+16380
+16381
+16382
+16383
+16384
+16385
+16386
+16387
+16388
+16389
+16390
+16391
+16392
+16393
+16394
+16395
+16396
+16397
+16398
+16399
+16400
+16401
+16402
+16403
+16404
+16405
+16406
+16407
+16408
+16409
+16410
+16411
+16412
+16413
+16414
+16415
+16416
+16417
+16418
+16419
+16420
+16421
+16422
+16423
+16424
+16425
+16426
+16427
+16428
+16429
+16430
+16431
+16432
+16433
+16434
+16435
+16436
+16437
+16438
+16439
+16440
+16441
+16442
+16443
+16444
+16445
+16446
+16447
+16448
+16449
+16450
+16451
+16452
+16453
+16454
+16455
+16456
+16457
+16458
+16459
+16460
+16461
+16462
+16463
+16464
+16465
+16466
+16467
+16468
+16469
+16470
+16471
+16472
+16473
+16474
+16475
+16476
+16477
+16478
+16479
+16480
+16481
+16482
+16483
+16484
+16485
+16486
+16487
+16488
+16489
+16490
+16491
+16492
+16493
+16494
+16495
+16496
+16497
+16498
+16499
+16500
+16501
+16502
+16503
+16504
+16505
+16506
+16507
+16508
+16509
+16510
+16511
+16512
+16513
+16514
+16515
+16516
+16517
+16518
+16519
+16520
+16521
+16522
+16523
+16524
+16525
+16526
+16527
+16528
+16529
+16530
+16531
+16532
+16533
+16534
+16535
+16536
+16537
+16538
+16539
+16540
+16541
+16542
+16543
+16544
+16545
+16546
+16547
+16548
+16549
+16550
+16551
+16552
+16553
+16554
+16555
+16556
+16557
+16558
+16559
+16560
+16561
+16562
+16563
+16564
+16565
+16566
+16567
+16568
+16569
+16570
+16571
+16572
+16573
+16574
+16575
+16576
+16577
+16578
+16579
+16580
+16581
+16582
+16583
+16584
+16585
+16586
+16587
+16588
+16589
+16590
+16591
+16592
+16593
+16594
+16595
+16596
+16597
+16598
+16599
+16600
+16601
+16602
+16603
+16604
+16605
+16606
+16607
+16608
+16609
+16610
+16611
+16612
+16613
+16614
+16615
+16616
+16617
+16618
+16619
+16620
+16621
+16622
+16623
+16624
+16625
+16626
+16627
+16628
+16629
+16630
+16631
+16632
+16633
+16634
+16635
+16636
+16637
+16638
+16639
+16640
+16641
+16642
+16643
+16644
+16645
+16646
+16647
+16648
+16649
+16650
+16651
+16652
+16653
+16654
+16655
+16656
+16657
+16658
+16659
+16660
+16661
+16662
+16663
+16664
+16665
+16666
+16667
+16668
+16669
+16670
+16671
+16672
+16673
+16674
+16675
+16676
+16677
+16678
+16679
+16680
+16681
+16682
+16683
+16684
+16685
+16686
+16687
+16688
+16689
+16690
+16691
+16692
+16693
+16694
+16695
+16696
+16697
+16698
+16699
+16700
+16701
+16702
+16703
+16704
+16705
+16706
+16707
+16708
+16709
+16710
+16711
+16712
+16713
+16714
+16715
+16716
+16717
+16718
+16719
+16720
+16721
+16722
+16723
+16724
+16725
+16726
+16727
+16728
+16729
+16730
+16731
+16732
+16733
+16734
+16735
+16736
+16737
+16738
+16739
+16740
+16741
+16742
+16743
+16744
+16745
+16746
+16747
+16748
+16749
+16750
+16751
+16752
+16753
+16754
+16755
+16756
+16757
+16758
+16759
+16760
+16761
+16762
+16763
+16764
+16765
+16766
+16767
+16768
+16769
+16770
+16771
+16772
+16773
+16774
+16775
+16776
+16777
+16778
+16779
+16780
+16781
+16782
+16783
+16784
+16785
+16786
+16787
+16788
+16789
+16790
+16791
+16792
+16793
+16794
+16795
+16796
+16797
+16798
+16799
+16800
+16801
+16802
+16803
+16804
+16805
+16806
+16807
+16808
+16809
+16810
+16811
+16812
+16813
+16814
+16815
+16816
+16817
+16818
+16819
+16820
+16821
+16822
+16823
+16824
+16825
+16826
+16827
+16828
+16829
+16830
+16831
+16832
+16833
+16834
+16835
+16836
+16837
+16838
+16839
+16840
+16841
+16842
+16843
+16844
+16845
+16846
+16847
+16848
+16849
+16850
+16851
+16852
+16853
+16854
+16855
+16856
+16857
+16858
+16859
+16860
+16861
+16862
+16863
+16864
+16865
+16866
+16867
+16868
+16869
+16870
+16871
+16872
+16873
+16874
+16875
+16876
+16877
+16878
+16879
+16880
+16881
+16882
+16883
+16884
+16885
+16886
+16887
+16888
+16889
+16890
+16891
+16892
+16893
+16894
+16895
+16896
+16897
+16898
+16899
+16900
+16901
+16902
+16903
+16904
+16905
+16906
+16907
+16908
+16909
+16910
+16911
+16912
+16913
+16914
+16915
+16916
+16917
+16918
+16919
+16920
+16921
+16922
+16923
+16924
+16925
+16926
+16927
+16928
+16929
+16930
+16931
+16932
+16933
+16934
+16935
+16936
+16937
+16938
+16939
+16940
+16941
+16942
+16943
+16944
+16945
+16946
+16947
+16948
+16949
+16950
+16951
+16952
+16953
+16954
+16955
+16956
+16957
+16958
+16959
+16960
+16961
+16962
+16963
+16964
+16965
+16966
+16967
+16968
+16969
+16970
+16971
+16972
+16973
+16974
+16975
+16976
+16977
+16978
+16979
+16980
+16981
+16982
+16983
+16984
+16985
+16986
+16987
+16988
+16989
+16990
+16991
+16992
+16993
+16994
+16995
+16996
+16997
+16998
+16999
+17000
+17001
+17002
+17003
+17004
+17005
+17006
+17007
+17008
+17009
+17010
+17011
+17012
+17013
+17014
+17015
+17016
+17017
+17018
+17019
+17020
+17021
+17022
+17023
+17024
+17025
+17026
+17027
+17028
+17029
+17030
+17031
+17032
+17033
+17034
+17035
+17036
+17037
+17038
+17039
+17040
+17041
+17042
+17043
+17044
+17045
+17046
+17047
+17048
+17049
+17050
+17051
+17052
+17053
+17054
+17055
+17056
+17057
+17058
+17059
+17060
+17061
+17062
+17063
+17064
+17065
+17066
+17067
+17068
+17069
+17070
+17071
+17072
+17073
+17074
+17075
+17076
+17077
+17078
+17079
+17080
+17081
+17082
+17083
+17084
+17085
+17086
+17087
+17088
+17089
+17090
+17091
+17092
+17093
+17094
+17095
+17096
+17097
+17098
+17099
+17100
+17101
+17102
+17103
+17104
+17105
+17106
+17107
+17108
+17109
+17110
+17111
+17112
+17113
+17114
+17115
+17116
+17117
+17118
+17119
+17120
+17121
+17122
+17123
+17124
+17125
+17126
+17127
+17128
+17129
+17130
+17131
+17132
+17133
+17134
+17135
+17136
+17137
+17138
+17139
+17140
+17141
+17142
+17143
+17144
+17145
+17146
+17147
+17148
+17149
+17150
+17151
+17152
+17153
+17154
+17155
+17156
+17157
+17158
+17159
+17160
+17161
+17162
+17163
+17164
+17165
+17166
+17167
+17168
+17169
+17170
+17171
+17172
+17173
+17174
+17175
+17176
+17177
+17178
+17179
+17180
+17181
+17182
+17183
+17184
+17185
+17186
+17187
+17188
+17189
+17190
+17191
+17192
+17193
+17194
+17195
+17196
+17197
+17198
+17199
+17200
+17201
+17202
+17203
+17204
+17205
+17206
+17207
+17208
+17209
+17210
+17211
+17212
+17213
+17214
+17215
+17216
+17217
+17218
+17219
+17220
+17221
+17222
+17223
+17224
+17225
+17226
+17227
+17228
+17229
+17230
+17231
+17232
+17233
+17234
+17235
+17236
+17237
+17238
+17239
+17240
+17241
+17242
+17243
+17244
+17245
+17246
+17247
+17248
+17249
+17250
+17251
+17252
+17253
+17254
+17255
+17256
+17257
+17258
+17259
+17260
+17261
+17262
+17263
+17264
+17265
+17266
+17267
+17268
+17269
+17270
+17271
+17272
+17273
+17274
+17275
+17276
+17277
+17278
+17279
+17280
+17281
+17282
+17283
+17284
+17285
+17286
+17287
+17288
+17289
+17290
+17291
+17292
+17293
+17294
+17295
+17296
+17297
+17298
+17299
+17300
+17301
+17302
+17303
+17304
+17305
+17306
+17307
+17308
+17309
+17310
+17311
+17312
+17313
+17314
+17315
+17316
+17317
+17318
+17319
+17320
+17321
+17322
+17323
+17324
+17325
+17326
+17327
+17328
+17329
+17330
+17331
+17332
+17333
+17334
+17335
+17336
+17337
+17338
+17339
+17340
+17341
+17342
+17343
+17344
+17345
+17346
+17347
+17348
+17349
+17350
+17351
+17352
+17353
+17354
+17355
+17356
+17357
+17358
+17359
+17360
+17361
+17362
+17363
+17364
+17365
+17366
+17367
+17368
+17369
+17370
+17371
+17372
+17373
+17374
+17375
+17376
+17377
+17378
+17379
+17380
+17381
+17382
+17383
+17384
+17385
+17386
+17387
+17388
+17389
+17390
+17391
+17392
+17393
+17394
+17395
+17396
+17397
+17398
+17399
+17400
+17401
+17402
+17403
+17404
+17405
+17406
+17407
+17408
+17409
+17410
+17411
+17412
+17413
+17414
+17415
+17416
+17417
+17418
+17419
+17420
+17421
+17422
+17423
+17424
+17425
+17426
+17427
+17428
+17429
+17430
+17431
+17432
+17433
+17434
+17435
+17436
+17437
+17438
+17439
+17440
+17441
+17442
+17443
+17444
+17445
+17446
+17447
+17448
+17449
+17450
+17451
+17452
+17453
+17454
+17455
+17456
+17457
+17458
+17459
+17460
+17461
+17462
+17463
+17464
+17465
+17466
+17467
+17468
+17469
+17470
+17471
+17472
+17473
+17474
+17475
+17476
+17477
+17478
+17479
+17480
+17481
+17482
+17483
+17484
+17485
+17486
+17487
+17488
+17489
+17490
+17491
+17492
+17493
+17494
+17495
+17496
+17497
+17498
+17499
+17500
+17501
+17502
+17503
+17504
+17505
+17506
+17507
+17508
+17509
+17510
+17511
+17512
+17513
+17514
+17515
+17516
+17517
+17518
+17519
+17520
+17521
+17522
+17523
+17524
+17525
+17526
+17527
+17528
+17529
+17530
+17531
+17532
+17533
+17534
+17535
+17536
+17537
+17538
+17539
+17540
+17541
+17542
+17543
+17544
+17545
+17546
+17547
+17548
+17549
+17550
+17551
+17552
+17553
+17554
+17555
+17556
+17557
+17558
+17559
+17560
+17561
+17562
+17563
+17564
+17565
+17566
+17567
+17568
+17569
+17570
+17571
+17572
+17573
+17574
+17575
+17576
+17577
+17578
+17579
+17580
+17581
+17582
+17583
+17584
+17585
+17586
+17587
+17588
+17589
+17590
+17591
+17592
+17593
+17594
+17595
+17596
+17597
+17598
+17599
+17600
+17601
+17602
+17603
+17604
+17605
+17606
+17607
+17608
+17609
+17610
+17611
+17612
+17613
+17614
+17615
+17616
+17617
+17618
+17619
+17620
+17621
+17622
+17623
+17624
+17625
+17626
+17627
+17628
+17629
+17630
+17631
+17632
+17633
+17634
+17635
+17636
+17637
+17638
+17639
+17640
+17641
+17642
+17643
+17644
+17645
+17646
+17647
+17648
+17649
+17650
+17651
+17652
+17653
+17654
+17655
+17656
+17657
+17658
+17659
+17660
+17661
+17662
+17663
+17664
+17665
+17666
+17667
+17668
+17669
+17670
+17671
+17672
+17673
+17674
+17675
+17676
+17677
+17678
+17679
+17680
+17681
+17682
+17683
+17684
+17685
+17686
+17687
+17688
+17689
+17690
+17691
+17692
+17693
+17694
+17695
+17696
+17697
+17698
+17699
+17700
+17701
+17702
+17703
+17704
+17705
+17706
+17707
+17708
+17709
+17710
+17711
+17712
+17713
+17714
+17715
+17716
+17717
+17718
+17719
+17720
+17721
+17722
+17723
+17724
+17725
+17726
+17727
+17728
+17729
+17730
+17731
+17732
+17733
+17734
+17735
+17736
+17737
+17738
+17739
+17740
+17741
+17742
+17743
+17744
+17745
+17746
+17747
+17748
+17749
+17750
+17751
+17752
+17753
+17754
+17755
+17756
+17757
+17758
+17759
+17760
+17761
+17762
+17763
+17764
+17765
+17766
+17767
+17768
+17769
+17770
+17771
+17772
+17773
+17774
+17775
+17776
+17777
+17778
+17779
+17780
+17781
+17782
+17783
+17784
+17785
+17786
+17787
+17788
+17789
+17790
+17791
+17792
+17793
+17794
+17795
+17796
+17797
+17798
+17799
+17800
+17801
+17802
+17803
+17804
+17805
+17806
+17807
+17808
+17809
+17810
+17811
+17812
+17813
+17814
+17815
+17816
+17817
+17818
+17819
+17820
+17821
+17822
+17823
+17824
+17825
+17826
+17827
+17828
+17829
+17830
+17831
+17832
+17833
+17834
+17835
+17836
+17837
+17838
+17839
+17840
+17841
+17842
+17843
+17844
+17845
+17846
+17847
+17848
+17849
+17850
+17851
+17852
+17853
+17854
+17855
+17856
+17857
+17858
+17859
+17860
+17861
+17862
+17863
+17864
+17865
+17866
+17867
+17868
+17869
+17870
+17871
+17872
+17873
+17874
+17875
+17876
+17877
+17878
+17879
+17880
+17881
+17882
+17883
+17884
+17885
+17886
+17887
+17888
+17889
+17890
+17891
+17892
+17893
+17894
+17895
+17896
+17897
+17898
+17899
+17900
+17901
+17902
+17903
+17904
+17905
+17906
+17907
+17908
+17909
+17910
+17911
+17912
+17913
+17914
+17915
+17916
+17917
+17918
+17919
+17920
+17921
+17922
+17923
+17924
+17925
+17926
+17927
+17928
+17929
+17930
+17931
+17932
+17933
+17934
+17935
+17936
+17937
+17938
+17939
+17940
+17941
+17942
+17943
+17944
+17945
+17946
+17947
+17948
+17949
+17950
+17951
+17952
+17953
+17954
+17955
+17956
+17957
+17958
+17959
+17960
+17961
+17962
+17963
+17964
+17965
+17966
+17967
+17968
+17969
+17970
+17971
+17972
+17973
+17974
+17975
+17976
+17977
+17978
+17979
+17980
+17981
+17982
+17983
+17984
+17985
+17986
+17987
+17988
+17989
+17990
+17991
+17992
+17993
+17994
+17995
+17996
+17997
+17998
+17999
+18000
+18001
+18002
+18003
+18004
+18005
+18006
+18007
+18008
+18009
+18010
+18011
+18012
+18013
+18014
+18015
+18016
+18017
+18018
+18019
+18020
+18021
+18022
+18023
+18024
+18025
+18026
+18027
+18028
+18029
+18030
+18031
+18032
+18033
+18034
+18035
+18036
+18037
+18038
+18039
+18040
+18041
+18042
+18043
+18044
+18045
+18046
+18047
+18048
+18049
+18050
+18051
+18052
+18053
+18054
+18055
+18056
+18057
+18058
+18059
+18060
+18061
+18062
+18063
+18064
+18065
+18066
+18067
+18068
+18069
+18070
+18071
+18072
+18073
+18074
+18075
+18076
+18077
+18078
+18079
+18080
+18081
+18082
+18083
+18084
+18085
+18086
+18087
+18088
+18089
+18090
+18091
+18092
+18093
+18094
+18095
+18096
+18097
+18098
+18099
+18100
+18101
+18102
+18103
+18104
+18105
+18106
+18107
+18108
+18109
+18110
+18111
+18112
+18113
+18114
+18115
+18116
+18117
+18118
+18119
+18120
+18121
+18122
+18123
+18124
+18125
+18126
+18127
+18128
+18129
+18130
+18131
+18132
+18133
+18134
+18135
+18136
+18137
+18138
+18139
+18140
+18141
+18142
+18143
+18144
+18145
+18146
+18147
+18148
+18149
+18150
+18151
+18152
+18153
+18154
+18155
+18156
+18157
+18158
+18159
+18160
+18161
+18162
+18163
+18164
+18165
+18166
+18167
+18168
+18169
+18170
+18171
+18172
+18173
+18174
+18175
+18176
+18177
+18178
+18179
+18180
+18181
+18182
+18183
+18184
+18185
+18186
+18187
+18188
+18189
+18190
+18191
+18192
+18193
+18194
+18195
+18196
+18197
+18198
+18199
+18200
+18201
+18202
+18203
+18204
+18205
+18206
+18207
+18208
+18209
+18210
+18211
+18212
+18213
+18214
+18215
+18216
+18217
+18218
+18219
+18220
+18221
+18222
+18223
+18224
+18225
+18226
+18227
+18228
+18229
+18230
+18231
+18232
+18233
+18234
+18235
+18236
+18237
+18238
+18239
+18240
+18241
+18242
+18243
+18244
+18245
+18246
+18247
+18248
+18249
+18250
+18251
+18252
+18253
+18254
+18255
+18256
+18257
+18258
+18259
+18260
+18261
+18262
+18263
+18264
+18265
+18266
+18267
+18268
+18269
+18270
+18271
+18272
+18273
+18274
+18275
+18276
+18277
+18278
+18279
+18280
+18281
+18282
+18283
+18284
+18285
+18286
+18287
+18288
+18289
+18290
+18291
+18292
+18293
+18294
+18295
+18296
+18297
+18298
+18299
+18300
+18301
+18302
+18303
+18304
+18305
+18306
+18307
+18308
+18309
+18310
+18311
+18312
+18313
+18314
+18315
+18316
+18317
+18318
+18319
+18320
+18321
+18322
+18323
+18324
+18325
+18326
+18327
+18328
+18329
+18330
+18331
+18332
+18333
+18334
+18335
+18336
+18337
+18338
+18339
+18340
+18341
+18342
+18343
+18344
+18345
+18346
+18347
+18348
+18349
+18350
+18351
+18352
+18353
+18354
+18355
+18356
+18357
+18358
+18359
+18360
+18361
+18362
+18363
+18364
+18365
+18366
+18367
+18368
+18369
+18370
+18371
+18372
+18373
+18374
+18375
+18376
+18377
+18378
+18379
+18380
+18381
+18382
+18383
+18384
+18385
+18386
+18387
+18388
+18389
+18390
+18391
+18392
+18393
+18394
+18395
+18396
+18397
+18398
+18399
+18400
+18401
+18402
+18403
+18404
+18405
+18406
+18407
+18408
+18409
+18410
+18411
+18412
+18413
+18414
+18415
+18416
+18417
+18418
+18419
+18420
+18421
+18422
+18423
+18424
+18425
+18426
+18427
+18428
+18429
+18430
+18431
+18432
+18433
+18434
+18435
+18436
+18437
+18438
+18439
+18440
+18441
+18442
+18443
+18444
+18445
+18446
+18447
+18448
+18449
+18450
+18451
+18452
+18453
+18454
+18455
+18456
+18457
+18458
+18459
+18460
+18461
+18462
+18463
+18464
+18465
+18466
+18467
+18468
+18469
+18470
+18471
+18472
+18473
+18474
+18475
+18476
+18477
+18478
+18479
+18480
+18481
+18482
+18483
+18484
+18485
+18486
+18487
+18488
+18489
+18490
+18491
+18492
+18493
+18494
+18495
+18496
+18497
+18498
+18499
+18500
+18501
+18502
+18503
+18504
+18505
+18506
+18507
+18508
+18509
+18510
+18511
+18512
+18513
+18514
+18515
+18516
+18517
+18518
+18519
+18520
+18521
+18522
+18523
+18524
+18525
+18526
+18527
+18528
+18529
+18530
+18531
+18532
+18533
+18534
+18535
+18536
+18537
+18538
+18539
+18540
+18541
+18542
+18543
+18544
+18545
+18546
+18547
+18548
+18549
+18550
+18551
+18552
+18553
+18554
+18555
+18556
+18557
+18558
+18559
+18560
+18561
+18562
+18563
+18564
+18565
+18566
+18567
+18568
+18569
+18570
+18571
+18572
+18573
+18574
+18575
+18576
+18577
+18578
+18579
+18580
+18581
+18582
+18583
+18584
+18585
+18586
+18587
+18588
+18589
+18590
+18591
+18592
+18593
+18594
+18595
+18596
+18597
+18598
+18599
+18600
+18601
+18602
+18603
+18604
+18605
+18606
+18607
+18608
+18609
+18610
+18611
+18612
+18613
+18614
+18615
+18616
+18617
+18618
+18619
+18620
+18621
+18622
+18623
+18624
+18625
+18626
+18627
+18628
+18629
+18630
+18631
+18632
+18633
+18634
+18635
+18636
+18637
+18638
+18639
+18640
+18641
+18642
+18643
+18644
+18645
+18646
+18647
+18648
+18649
+18650
+18651
+18652
+18653
+18654
+18655
+18656
+18657
+18658
+18659
+18660
+18661
+18662
+18663
+18664
+18665
+18666
+18667
+18668
+18669
+18670
+18671
+18672
+18673
+18674
+18675
+18676
+18677
+18678
+18679
+18680
+18681
+18682
+18683
+18684
+18685
+18686
+18687
+18688
+18689
+18690
+18691
+18692
+18693
+18694
+18695
+18696
+18697
+18698
+18699
+18700
+18701
+18702
+18703
+18704
+18705
+18706
+18707
+18708
+18709
+18710
+18711
+18712
+18713
+18714
+18715
+18716
+18717
+18718
+18719
+18720
+18721
+18722
+18723
+18724
+18725
+18726
+18727
+18728
+18729
+18730
+18731
+18732
+18733
+18734
+18735
+18736
+18737
+18738
+18739
+18740
+18741
+18742
+18743
+18744
+18745
+18746
+18747
+18748
+18749
+18750
+18751
+18752
+18753
+18754
+18755
+18756
+18757
+18758
+18759
+18760
+18761
+18762
+18763
+18764
+18765
+18766
+18767
+18768
+18769
+18770
+18771
+18772
+18773
+18774
+18775
+18776
+18777
+18778
+18779
+18780
+18781
+18782
+18783
+18784
+18785
+18786
+18787
+18788
+18789
+18790
+18791
+18792
+18793
+18794
+18795
+18796
+18797
+18798
+18799
+18800
+18801
+18802
+18803
+18804
+18805
+18806
+18807
+18808
+18809
+18810
+18811
+18812
+18813
+18814
+18815
+18816
+18817
+18818
+18819
+18820
+18821
+18822
+18823
+18824
+18825
+18826
+18827
+18828
+18829
+18830
+18831
+18832
+18833
+18834
+18835
+18836
+18837
+18838
+18839
+18840
+18841
+18842
+18843
+18844
+18845
+18846
+18847
+18848
+18849
+18850
+18851
+18852
+18853
+18854
+18855
+18856
+18857
+18858
+18859
+18860
+18861
+18862
+18863
+18864
+18865
+18866
+18867
+18868
+18869
+18870
+18871
+18872
+18873
+18874
+18875
+18876
+18877
+18878
+18879
+18880
+18881
+18882
+18883
+18884
+18885
+18886
+18887
+18888
+18889
+18890
+18891
+18892
+18893
+18894
+18895
+18896
+18897
+18898
+18899
+18900
+18901
+18902
+18903
+18904
+18905
+18906
+18907
+18908
+18909
+18910
+18911
+18912
+18913
+18914
+18915
+18916
+18917
+18918
+18919
+18920
+18921
+18922
+18923
+18924
+18925
+18926
+18927
+18928
+18929
+18930
+18931
+18932
+18933
+18934
+18935
+18936
+18937
+18938
+18939
+18940
+18941
+18942
+18943
+18944
+18945
+18946
+18947
+18948
+18949
+18950
+18951
+18952
+18953
+18954
+18955
+18956
+18957
+18958
+18959
+18960
+18961
+18962
+18963
+18964
+18965
+18966
+18967
+18968
+18969
+18970
+18971
+18972
+18973
+18974
+18975
+18976
+18977
+18978
+18979
+18980
+18981
+18982
+18983
+18984
+18985
+18986
+18987
+18988
+18989
+18990
+18991
+18992
+18993
+18994
+18995
+18996
+18997
+18998
+18999
+19000
+19001
+19002
+19003
+19004
+19005
+19006
+19007
+19008
+19009
+19010
+19011
+19012
+19013
+19014
+19015
+19016
+19017
+19018
+19019
+19020
+19021
+19022
+19023
+19024
+19025
+19026
+19027
+19028
+19029
+19030
+19031
+19032
+19033
+19034
+19035
+19036
+19037
+19038
+19039
+19040
+19041
+19042
+19043
+19044
+19045
+19046
+19047
+19048
+19049
+19050
+19051
+19052
+19053
+19054
+19055
+19056
+19057
+19058
+19059
+19060
+19061
+19062
+19063
+19064
+19065
+19066
+19067
+19068
+19069
+19070
+19071
+19072
+19073
+19074
+19075
+19076
+19077
+19078
+19079
+19080
+19081
+19082
+19083
+19084
+19085
+19086
+19087
+19088
+19089
+19090
+19091
+19092
+19093
+19094
+19095
+19096
+19097
+19098
+19099
+19100
+19101
+19102
+19103
+19104
+19105
+19106
+19107
+19108
+19109
+19110
+19111
+19112
+19113
+19114
+19115
+19116
+19117
+19118
+19119
+19120
+19121
+19122
+19123
+19124
+19125
+19126
+19127
+19128
+19129
+19130
+19131
+19132
+19133
+19134
+19135
+19136
+19137
+19138
+19139
+19140
+19141
+19142
+19143
+19144
+19145
+19146
+19147
+19148
+19149
+19150
+19151
+19152
+19153
+19154
+19155
+19156
+19157
+19158
+19159
+19160
+19161
+19162
+19163
+19164
+19165
+19166
+19167
+19168
+19169
+19170
+19171
+19172
+19173
+19174
+19175
+19176
+19177
+19178
+19179
+19180
+19181
+19182
+19183
+19184
+19185
+19186
+19187
+19188
+19189
+19190
+19191
+19192
+19193
+19194
+19195
+19196
+19197
+19198
+19199
+19200
+19201
+19202
+19203
+19204
+19205
+19206
+19207
+19208
+19209
+19210
+19211
+19212
+19213
+19214
+19215
+19216
+19217
+19218
+19219
+19220
+19221
+19222
+19223
+19224
+19225
+19226
+19227
+19228
+19229
+19230
+19231
+19232
+19233
+19234
+19235
+19236
+19237
+19238
+19239
+19240
+19241
+19242
+19243
+19244
+19245
+19246
+19247
+19248
+19249
+19250
+19251
+19252
+19253
+19254
+19255
+19256
+19257
+19258
+19259
+19260
+19261
+19262
+19263
+19264
+19265
+19266
+19267
+19268
+19269
+19270
+19271
+19272
+19273
+19274
+19275
+19276
+19277
+19278
+19279
+19280
+19281
+19282
+19283
+19284
+19285
+19286
+19287
+19288
+19289
+19290
+19291
+19292
+19293
+19294
+19295
+19296
+19297
+19298
+19299
+19300
+19301
+19302
+19303
+19304
+19305
+19306
+19307
+19308
+19309
+19310
+19311
+19312
+19313
+19314
+19315
+19316
+19317
+19318
+19319
+19320
+19321
+19322
+19323
+19324
+19325
+19326
+19327
+19328
+19329
+19330
+19331
+19332
+19333
+19334
+19335
+19336
+19337
+19338
+19339
+19340
+19341
+19342
+19343
+19344
+19345
+19346
+19347
+19348
+19349
+19350
+19351
+19352
+19353
+19354
+19355
+19356
+19357
+19358
+19359
+19360
+19361
+19362
+19363
+19364
+19365
+19366
+19367
+19368
+19369
+19370
+19371
+19372
+19373
+19374
+19375
+19376
+19377
+19378
+19379
+19380
+19381
+19382
+19383
+19384
+19385
+19386
+19387
+19388
+19389
+19390
+19391
+19392
+19393
+19394
+19395
+19396
+19397
+19398
+19399
+19400
+19401
+19402
+19403
+19404
+19405
+19406
+19407
+19408
+19409
+19410
+19411
+19412
+19413
+19414
+19415
+19416
+19417
+19418
+19419
+19420
+19421
+19422
+19423
+19424
+19425
+19426
+19427
+19428
+19429
+19430
+19431
+19432
+19433
+19434
+19435
+19436
+19437
+19438
+19439
+19440
+19441
+19442
+19443
+19444
+19445
+19446
+19447
+19448
+19449
+19450
+19451
+19452
+19453
+19454
+19455
+19456
+19457
+19458
+19459
+19460
+19461
+19462
+19463
+19464
+19465
+19466
+19467
+19468
+19469
+19470
+19471
+19472
+19473
+19474
+19475
+19476
+19477
+19478
+19479
+19480
+19481
+19482
+19483
+19484
+19485
+19486
+19487
+19488
+19489
+19490
+19491
+19492
+19493
+19494
+19495
+19496
+19497
+19498
+19499
+19500
+19501
+19502
+19503
+19504
+19505
+19506
+19507
+19508
+19509
+19510
+19511
+19512
+19513
+19514
+19515
+19516
+19517
+19518
+19519
+19520
+19521
+19522
+19523
+19524
+19525
+19526
+19527
+19528
+19529
+19530
+19531
+19532
+19533
+19534
+19535
+19536
+19537
+19538
+19539
+19540
+19541
+19542
+19543
+19544
+19545
+19546
+19547
+19548
+19549
+19550
+19551
+19552
+19553
+19554
+19555
+19556
+19557
+19558
+19559
+19560
+19561
+19562
+19563
+19564
+19565
+19566
+19567
+19568
+19569
+19570
+19571
+19572
+19573
+19574
+19575
+19576
+19577
+19578
+19579
+19580
+19581
+19582
+19583
+19584
+19585
+19586
+19587
+19588
+19589
+19590
+19591
+19592
+19593
+19594
+19595
+19596
+19597
+19598
+19599
+19600
+19601
+19602
+19603
+19604
+19605
+19606
+19607
+19608
+19609
+19610
+19611
+19612
+19613
+19614
+19615
+19616
+19617
+19618
+19619
+19620
+19621
+19622
+19623
+19624
+19625
+19626
+19627
+19628
+19629
+19630
+19631
+19632
+19633
+19634
+19635
+19636
+19637
+19638
+19639
+19640
+19641
+19642
+19643
+19644
+19645
+19646
+19647
+19648
+19649
+19650
+19651
+19652
+19653
+19654
+19655
+19656
+19657
+19658
+19659
+19660
+19661
+19662
+19663
+19664
+19665
+19666
+19667
+19668
+19669
+19670
+19671
+19672
+19673
+19674
+19675
+19676
+19677
+19678
+19679
+19680
+19681
+19682
+19683
+19684
+19685
+19686
+19687
+19688
+19689
+19690
+19691
+19692
+19693
+19694
+19695
+19696
+19697
+19698
+19699
+19700
+19701
+19702
+19703
+19704
+19705
+19706
+19707
+19708
+19709
+19710
+19711
+19712
+19713
+19714
+19715
+19716
+19717
+19718
+19719
+19720
+19721
+19722
+19723
+19724
+19725
+19726
+19727
+19728
+19729
+19730
+19731
+19732
+19733
+19734
+19735
+19736
+19737
+19738
+19739
+19740
+19741
+19742
+19743
+19744
+19745
+19746
+19747
+19748
+19749
+19750
+19751
+19752
+19753
+19754
+19755
+19756
+19757
+19758
+19759
+19760
+19761
+19762
+19763
+19764
+19765
+19766
+19767
+19768
+19769
+19770
+19771
+19772
+19773
+19774
+19775
+19776
+19777
+19778
+19779
+19780
+19781
+19782
+19783
+19784
+19785
+19786
+19787
+19788
+19789
+19790
+19791
+19792
+19793
+19794
+19795
+19796
+19797
+19798
+19799
+19800
+19801
+19802
+19803
+19804
+19805
+19806
+19807
+19808
+19809
+19810
+19811
+19812
+19813
+19814
+19815
+19816
+19817
+19818
+19819
+19820
+19821
+19822
+19823
+19824
+19825
+19826
+19827
+19828
+19829
+19830
+19831
+19832
+19833
+19834
+19835
+19836
+19837
+19838
+19839
+19840
+19841
+19842
+19843
+19844
+19845
+19846
+19847
+19848
+19849
+19850
+19851
+19852
+19853
+19854
+19855
+19856
+19857
+19858
+19859
+19860
+19861
+19862
+19863
+19864
+19865
+19866
+19867
+19868
+19869
+19870
+19871
+19872
+19873
+19874
+19875
+19876
+19877
+19878
+19879
+19880
+19881
+19882
+19883
+19884
+19885
+19886
+19887
+19888
+19889
+19890
+19891
+19892
+19893
+19894
+19895
+19896
+19897
+19898
+19899
+19900
+19901
+19902
+19903
+19904
+19905
+19906
+19907
+19908
+19909
+19910
+19911
+19912
+19913
+19914
+19915
+19916
+19917
+19918
+19919
+19920
+19921
+19922
+19923
+19924
+19925
+19926
+19927
+19928
+19929
+19930
+19931
+19932
+19933
+19934
+19935
+19936
+19937
+19938
+19939
+19940
+19941
+19942
+19943
+19944
+19945
+19946
+19947
+19948
+19949
+19950
+19951
+19952
+19953
+19954
+19955
+19956
+19957
+19958
+19959
+19960
+19961
+19962
+19963
+19964
+19965
+19966
+19967
+19968
+19969
+19970
+19971
+19972
+19973
+19974
+19975
+19976
+19977
+19978
+19979
+19980
+19981
+19982
+19983
+19984
+19985
+19986
+19987
+19988
+19989
+19990
+19991
+19992
+19993
+19994
+19995
+19996
+19997
+19998
+19999
+20000
+20001
+20002
+20003
+20004
+20005
+20006
+20007
+20008
+20009
+20010
+20011
+20012
+20013
+20014
+20015
+20016
+20017
+20018
+20019
+20020
+20021
+20022
+20023
+20024
+20025
+20026
+20027
+20028
+20029
+20030
+20031
+20032
+20033
+20034
+20035
+20036
+20037
+20038
+20039
+20040
+20041
+20042
+20043
+20044
+20045
+20046
+20047
+20048
+20049
+20050
+20051
+20052
+20053
+20054
+20055
+20056
+20057
+20058
+20059
+20060
+20061
+20062
+20063
+20064
+20065
+20066
+20067
+20068
+20069
+20070
+20071
+20072
+20073
+20074
+20075
+20076
+20077
+20078
+20079
+20080
+20081
+20082
+20083
+20084
+20085
+20086
+20087
+20088
+20089
+20090
+20091
+20092
+20093
+20094
+20095
+20096
+20097
+20098
+20099
+20100
+20101
+20102
+20103
+20104
+20105
+20106
+20107
+20108
+20109
+20110
+20111
+20112
+20113
+20114
+20115
+20116
+20117
+20118
+20119
+20120
+20121
+20122
+20123
+20124
+20125
+20126
+20127
+20128
+20129
+20130
+20131
+20132
+20133
+20134
+20135
+20136
+20137
+20138
+20139
+20140
+20141
+20142
+20143
+20144
+20145
+20146
+20147
+20148
+20149
+20150
+20151
+20152
+20153
+20154
+20155
+20156
+20157
+20158
+20159
+20160
+20161
+20162
+20163
+20164
+20165
+20166
+20167
+20168
+20169
+20170
+20171
+20172
+20173
+20174
+20175
+20176
+20177
+20178
+20179
+20180
+20181
+20182
+20183
+20184
+20185
+20186
+20187
+20188
+20189
+20190
+20191
+20192
+20193
+20194
+20195
+20196
+20197
+20198
+20199
+20200
+20201
+20202
+20203
+20204
+20205
+20206
+20207
+20208
+20209
+20210
+20211
+20212
+20213
+20214
+20215
+20216
+20217
+20218
+20219
+20220
+20221
+20222
+20223
+20224
+20225
+20226
+20227
+20228
+20229
+20230
+20231
+20232
+20233
+20234
+20235
+20236
+20237
+20238
+20239
+20240
+20241
+20242
+20243
+20244
+20245
+20246
+20247
+20248
+20249
+20250
+20251
+20252
+20253
+20254
+20255
+20256
+20257
+20258
+20259
+20260
+20261
+20262
+20263
+20264
+20265
+20266
+20267
+20268
+20269
+20270
+20271
+20272
+20273
+20274
+20275
+20276
+20277
+20278
+20279
+20280
+20281
+20282
+20283
+20284
+20285
+20286
+20287
+20288
+20289
+20290
+20291
+20292
+20293
+20294
+20295
+20296
+20297
+20298
+20299
+20300
+20301
+20302
+20303
+20304
+20305
+20306
+20307
+20308
+20309
+20310
+20311
+20312
+20313
+20314
+20315
+20316
+20317
+20318
+20319
+20320
+20321
+20322
+20323
+20324
+20325
+20326
+20327
+20328
+20329
+20330
+20331
+20332
+20333
+20334
+20335
+20336
+20337
+20338
+20339
+20340
+20341
+20342
+20343
+20344
+20345
+20346
+20347
+20348
+20349
+20350
+20351
+20352
+20353
+20354
+20355
+20356
+20357
+20358
+20359
+20360
+20361
+20362
+20363
+20364
+20365
+20366
+20367
+20368
+20369
+20370
+20371
+20372
+20373
+20374
+20375
+20376
+20377
+20378
+20379
+20380
+20381
+20382
+20383
+20384
+20385
+20386
+20387
+20388
+20389
+20390
+20391
+20392
+20393
+20394
+20395
+20396
+20397
+20398
+20399
+20400
+20401
+20402
+20403
+20404
+20405
+20406
+20407
+20408
+20409
+20410
+20411
+20412
+20413
+20414
+20415
+20416
+20417
+20418
+20419
+20420
+20421
+20422
+20423
+20424
+20425
+20426
+20427
+20428
+20429
+20430
+20431
+20432
+20433
+20434
+20435
+20436
+20437
+20438
+20439
+20440
+20441
+20442
+20443
+20444
+20445
+20446
+20447
+20448
+20449
+20450
+20451
+20452
+20453
+20454
+20455
+20456
+20457
+20458
+20459
+20460
+20461
+20462
+20463
+20464
+20465
+20466
+20467
+20468
+20469
+20470
+20471
+20472
+20473
+20474
+20475
+20476
+20477
+20478
+20479
+20480
+20481
+20482
+20483
+20484
+20485
+20486
+20487
+20488
+20489
+20490
+20491
+20492
+20493
+20494
+20495
+20496
+20497
+20498
+20499
+20500
+20501
+20502
+20503
+20504
+20505
+20506
+20507
+20508
+20509
+20510
+20511
+20512
+20513
+20514
+20515
+20516
+20517
+20518
+20519
+20520
+20521
+20522
+20523
+20524
+20525
+20526
+20527
+20528
+20529
+20530
+20531
+20532
+20533
+20534
+20535
+20536
+20537
+20538
+20539
+20540
+20541
+20542
+20543
+20544
+20545
+20546
+20547
+20548
+20549
+20550
+20551
+20552
+20553
+20554
+20555
+20556
+20557
+20558
+20559
+20560
+20561
+20562
+20563
+20564
+20565
+20566
+20567
+20568
+20569
+20570
+20571
+20572
+20573
+20574
+20575
+20576
+20577
+20578
+20579
+20580
+20581
+20582
+20583
+20584
+20585
+20586
+20587
+20588
+20589
+20590
+20591
+20592
+20593
+20594
+20595
+20596
+20597
+20598
+20599
+20600
+20601
+20602
+20603
+20604
+20605
+20606
+20607
+20608
+20609
+20610
+20611
+20612
+20613
+20614
+20615
+20616
+20617
+20618
+20619
+20620
+20621
+20622
+20623
+20624
+20625
+20626
+20627
+20628
+20629
+20630
+20631
+20632
+20633
+20634
+20635
+20636
+20637
+20638
+20639
+20640
+20641
+20642
+20643
+20644
+20645
+20646
+20647
+20648
+20649
+20650
+20651
+20652
+20653
+20654
+20655
+20656
+20657
+20658
+20659
+20660
+20661
+20662
+20663
+20664
+20665
+20666
+20667
+20668
+20669
+20670
+20671
+20672
+20673
+20674
+20675
+20676
+20677
+20678
+20679
+20680
+20681
+20682
+20683
+20684
+20685
+20686
+20687
+20688
+20689
+20690
+20691
+20692
+20693
+20694
+20695
+20696
+20697
+20698
+20699
+20700
+20701
+20702
+20703
+20704
+20705
+20706
+20707
+20708
+20709
+20710
+20711
+20712
+20713
+20714
+20715
+20716
+20717
+20718
+20719
+20720
+20721
+20722
+20723
+20724
+20725
+20726
+20727
+20728
+20729
+20730
+20731
+20732
+20733
+20734
+20735
+20736
+20737
+20738
+20739
+20740
+20741
+20742
+20743
+20744
+20745
+20746
+20747
+20748
+20749
+20750
+20751
+20752
+20753
+20754
+20755
+20756
+20757
+20758
+20759
+20760
+20761
+20762
+20763
+20764
+20765
+20766
+20767
+20768
+20769
+20770
+20771
+20772
+20773
+20774
+20775
+20776
+20777
+20778
+20779
+20780
+20781
+20782
+20783
+20784
+20785
+20786
+20787
+20788
+20789
+20790
+20791
+20792
+20793
+20794
+20795
+20796
+20797
+20798
+20799
+20800
+20801
+20802
+20803
+20804
+20805
+20806
+20807
+20808
+20809
+20810
+20811
+20812
+20813
+20814
+20815
+20816
+20817
+20818
+20819
+20820
+20821
+20822
+20823
+20824
+20825
+20826
+20827
+20828
+20829
+20830
+20831
+20832
+20833
+20834
+20835
+20836
+20837
+20838
+20839
+20840
+20841
+20842
+20843
+20844
+20845
+20846
+20847
+20848
+20849
+20850
+20851
+20852
+20853
+20854
+20855
+20856
+20857
+20858
+20859
+20860
+20861
+20862
+20863
+20864
+20865
+20866
+20867
+20868
+20869
+20870
+20871
+20872
+20873
+20874
+20875
+20876
+20877
+20878
+20879
+20880
+20881
+20882
+20883
+20884
+20885
+20886
+20887
+20888
+20889
+20890
+20891
+20892
+20893
+20894
+20895
+20896
+20897
+20898
+20899
+20900
+20901
+20902
+20903
+20904
+20905
+20906
+20907
+20908
+20909
+20910
+20911
+20912
+20913
+20914
+20915
+20916
+20917
+20918
+20919
+20920
+20921
+20922
+20923
+20924
+20925
+20926
+20927
+20928
+20929
+20930
+20931
+20932
+20933
+20934
+20935
+20936
+20937
+20938
+20939
+20940
+20941
+20942
+20943
+20944
+20945
+20946
+20947
+20948
+20949
+20950
+20951
+20952
+20953
+20954
+20955
+20956
+20957
+20958
+20959
+20960
+20961
+20962
+20963
+20964
+20965
+20966
+20967
+20968
+20969
+20970
+20971
+20972
+20973
+20974
+20975
+20976
+20977
+20978
+20979
+20980
+20981
+20982
+20983
+20984
+20985
+20986
+20987
+20988
+20989
+20990
+20991
+20992
+20993
+20994
+20995
+20996
+20997
+20998
+20999
+21000
+21001
+21002
+21003
+21004
+21005
+21006
+21007
+21008
+21009
+21010
+21011
+21012
+21013
+21014
+21015
+21016
+21017
+21018
+21019
+21020
+21021
+21022
+21023
+21024
+21025
+21026
+21027
+21028
+21029
+21030
+21031
+21032
+21033
+21034
+21035
+21036
+21037
+21038
+21039
+21040
+21041
+21042
+21043
+21044
+21045
+21046
+21047
+21048
+21049
+21050
+21051
+21052
+21053
+21054
+21055
+21056
+21057
+21058
+21059
+21060
+21061
+21062
+21063
+21064
+21065
+21066
+21067
+21068
+21069
+21070
+21071
+21072
+21073
+21074
+21075
+21076
+21077
+21078
+21079
+21080
+21081
+21082
+21083
+21084
+21085
+21086
+21087
+21088
+21089
+21090
+21091
+21092
+21093
+21094
+21095
+21096
+21097
+21098
+21099
+21100
+21101
+21102
+21103
+21104
+21105
+21106
+21107
+21108
+21109
+21110
+21111
+21112
+21113
+21114
+21115
+21116
+21117
+21118
+21119
+21120
+21121
+21122
+21123
+21124
+21125
+21126
+21127
+21128
+21129
+21130
+21131
+21132
+21133
+21134
+21135
+21136
+21137
+21138
+21139
+21140
+21141
+21142
+21143
+21144
+21145
+21146
+21147
+21148
+21149
+21150
+21151
+21152
+21153
+21154
+21155
+21156
+21157
+21158
+21159
+21160
+21161
+21162
+21163
+21164
+21165
+21166
+21167
+21168
+21169
+21170
+21171
+21172
+21173
+21174
+21175
+21176
+21177
+21178
+21179
+21180
+21181
+21182
+21183
+21184
+21185
+21186
+21187
+21188
+21189
+21190
+21191
+21192
+21193
+21194
+21195
+21196
+21197
+21198
+21199
+21200
+21201
+21202
+21203
+21204
+21205
+21206
+21207
+21208
+21209
+21210
+21211
+21212
+21213
+21214
+21215
+21216
+21217
+21218
+21219
+21220
+21221
+21222
+21223
+21224
+21225
+21226
+21227
+21228
+21229
+21230
+21231
+21232
+21233
+21234
+21235
+21236
+21237
+21238
+21239
+21240
+21241
+21242
+21243
+21244
+21245
+21246
+21247
+21248
+21249
+21250
+21251
+21252
+21253
+21254
+21255
+21256
+21257
+21258
+21259
+21260
+21261
+21262
+21263
+21264
+21265
+21266
+21267
+21268
+21269
+21270
+21271
+21272
+21273
+21274
+21275
+21276
+21277
+21278
+21279
+21280
+21281
+21282
+21283
+21284
+21285
+21286
+21287
+21288
+21289
+21290
+21291
+21292
+21293
+21294
+21295
+21296
+21297
+21298
+21299
+21300
+21301
+21302
+21303
+21304
+21305
+21306
+21307
+21308
+21309
+21310
+21311
+21312
+21313
+21314
+21315
+21316
+21317
+21318
+21319
+21320
+21321
+21322
+21323
+21324
+21325
+21326
+21327
+21328
+21329
+21330
+21331
+21332
+21333
+21334
+21335
+21336
+21337
+21338
+21339
+21340
+21341
+21342
+21343
+21344
+21345
+21346
+21347
+21348
+21349
+21350
+21351
+21352
+21353
+21354
+21355
+21356
+21357
+21358
+21359
+21360
+21361
+21362
+21363
+21364
+21365
+21366
+21367
+21368
+21369
+21370
+21371
+21372
+21373
+21374
+21375
+21376
+21377
+21378
+21379
+21380
+21381
+21382
+21383
+21384
+21385
+21386
+21387
+21388
+21389
+21390
+21391
+21392
+21393
+21394
+21395
+21396
+21397
+21398
+21399
+21400
+21401
+21402
+21403
+21404
+21405
+21406
+21407
+21408
+21409
+21410
+21411
+21412
+21413
+21414
+21415
+21416
+21417
+21418
+21419
+21420
+21421
+21422
+21423
+21424
+21425
+21426
+21427
+21428
+21429
+21430
+21431
+21432
+21433
+21434
+21435
+21436
+21437
+21438
+21439
+21440
+21441
+21442
+21443
+21444
+21445
+21446
+21447
+21448
+21449
+21450
+21451
+21452
+21453
+21454
+21455
+21456
+21457
+21458
+21459
+21460
+21461
+21462
+21463
+21464
+21465
+21466
+21467
+21468
+21469
+21470
+21471
+21472
+21473
+21474
+21475
+21476
+21477
+21478
+21479
+21480
+21481
+21482
+21483
+21484
+21485
+21486
+21487
+21488
+21489
+21490
+21491
+21492
+21493
+21494
+21495
+21496
+21497
+21498
+21499
+21500
+21501
+21502
+21503
+21504
+21505
+21506
+21507
+21508
+21509
+21510
+21511
+21512
+21513
+21514
+21515
+21516
+21517
+21518
+21519
+21520
+21521
+21522
+21523
+21524
+21525
+21526
+21527
+21528
+21529
+21530
+21531
+21532
+21533
+21534
+21535
+21536
+21537
+21538
+21539
+21540
+21541
+21542
+21543
+21544
+21545
+21546
+21547
+21548
+21549
+21550
+21551
+21552
+21553
+21554
+21555
+21556
+21557
+21558
+21559
+21560
+21561
+21562
+21563
+21564
+21565
+21566
+21567
+21568
+21569
+21570
+21571
+21572
+21573
+21574
+21575
+21576
+21577
+21578
+21579
+21580
+21581
+21582
+21583
+21584
+21585
+21586
+21587
+21588
+21589
+21590
+21591
+21592
+21593
+21594
+21595
+21596
+21597
+21598
+21599
+21600
+21601
+21602
+21603
+21604
+21605
+21606
+21607
+21608
+21609
+21610
+21611
+21612
+21613
+21614
+21615
+21616
+21617
+21618
+21619
+21620
+21621
+21622
+21623
+21624
+21625
+21626
+21627
+21628
+21629
+21630
+21631
+21632
+21633
+21634
+21635
+21636
+21637
+21638
+21639
+21640
+21641
+21642
+21643
+21644
+21645
+21646
+21647
+21648
+21649
+21650
+21651
+21652
+21653
+21654
+21655
+21656
+21657
+21658
+21659
+21660
+21661
+21662
+21663
+21664
+21665
+21666
+21667
+21668
+21669
+21670
+21671
+21672
+21673
+21674
+21675
+21676
+21677
+21678
+21679
+21680
+21681
+21682
+21683
+21684
+21685
+21686
+21687
+21688
+21689
+21690
+21691
+21692
+21693
+21694
+21695
+21696
+21697
+21698
+21699
+21700
+21701
+21702
+21703
+21704
+21705
+21706
+21707
+21708
+21709
+21710
+21711
+21712
+21713
+21714
+21715
+21716
+21717
+21718
+21719
+21720
+21721
+21722
+21723
+21724
+21725
+21726
+21727
+21728
+21729
+21730
+21731
+21732
+21733
+21734
+21735
+21736
+21737
+21738
+21739
+21740
+21741
+21742
+21743
+21744
+21745
+21746
+21747
+21748
+21749
+21750
+21751
+21752
+21753
+21754
+21755
+21756
+21757
+21758
+21759
+21760
+21761
+21762
+21763
+21764
+21765
+21766
+21767
+21768
+21769
+21770
+21771
+21772
+21773
+21774
+21775
+21776
+21777
+21778
+21779
+21780
+21781
+21782
+21783
+21784
+21785
+21786
+21787
+21788
+21789
+21790
+21791
+21792
+21793
+21794
+21795
+21796
+21797
+21798
+21799
+21800
+21801
+21802
+21803
+21804
+21805
+21806
+21807
+21808
+21809
+21810
+21811
+21812
+21813
+21814
+21815
+21816
+21817
+21818
+21819
+21820
+21821
+21822
+21823
+21824
+21825
+21826
+21827
+21828
+21829
+21830
+21831
+21832
+21833
+21834
+21835
+21836
+21837
+21838
+21839
+21840
+21841
+21842
+21843
+21844
+21845
+21846
+21847
+21848
+21849
+21850
+21851
+21852
+21853
+21854
+21855
+21856
+21857
+21858
+21859
+21860
+21861
+21862
+21863
+21864
+21865
+21866
+21867
+21868
+21869
+21870
+21871
+21872
+21873
+21874
+21875
+21876
+21877
+21878
+21879
+21880
+21881
+21882
+21883
+21884
+21885
+21886
+21887
+21888
+21889
+21890
+21891
+21892
+21893
+21894
+21895
+21896
+21897
+21898
+21899
+21900
+21901
+21902
+21903
+21904
+21905
+21906
+21907
+21908
+21909
+21910
+21911
+21912
+21913
+21914
+21915
+21916
+21917
+21918
+21919
+21920
+21921
+21922
+21923
+21924
+21925
+21926
+21927
+21928
+21929
+21930
+21931
+21932
+21933
+21934
+21935
+21936
+21937
+21938
+21939
+21940
+21941
+21942
+21943
+21944
+21945
+21946
+21947
+21948
+21949
+21950
+21951
+21952
+21953
+21954
+21955
+21956
+21957
+21958
+21959
+21960
+21961
+21962
+21963
+21964
+21965
+21966
+21967
+21968
+21969
+21970
+21971
+21972
+21973
+21974
+21975
+21976
+21977
+21978
+21979
+21980
+21981
+21982
+21983
+21984
+21985
+21986
+21987
+21988
+21989
+21990
+21991
+21992
+21993
+21994
+21995
+21996
+21997
+21998
+21999
+22000
+22001
+22002
+22003
+22004
+22005
+22006
+22007
+22008
+22009
+22010
+22011
+22012
+22013
+22014
+22015
+22016
+22017
+22018
+22019
+22020
+22021
+22022
+22023
+22024
+22025
+22026
+22027
+22028
+22029
+22030
+22031
+22032
+22033
+22034
+22035
+22036
+22037
+22038
+22039
+22040
+22041
+22042
+22043
+22044
+22045
+22046
+22047
+22048
+22049
+22050
+22051
+22052
+22053
+22054
+22055
+22056
+22057
+22058
+22059
+22060
+22061
+22062
+22063
+22064
+22065
+22066
+22067
+22068
+22069
+22070
+22071
+22072
+22073
+22074
+22075
+22076
+22077
+22078
+22079
+22080
+22081
+22082
+22083
+22084
+22085
+22086
+22087
+22088
+22089
+22090
+22091
+22092
+22093
+22094
+22095
+22096
+22097
+22098
+22099
+22100
+22101
+22102
+22103
+22104
+22105
+22106
+22107
+22108
+22109
+22110
+22111
+22112
+22113
+22114
+22115
+22116
+22117
+22118
+22119
+22120
+22121
+22122
+22123
+22124
+22125
+22126
+22127
+22128
+22129
+22130
+22131
+22132
+22133
+22134
+22135
+22136
+22137
+22138
+22139
+22140
+22141
+22142
+22143
+22144
+22145
+22146
+22147
+22148
+22149
+22150
+22151
+22152
+22153
+22154
+22155
+22156
+22157
+22158
+22159
+22160
+22161
+22162
+22163
+22164
+22165
+22166
+22167
+22168
+22169
+22170
+22171
+22172
+22173
+22174
+22175
+22176
+22177
+22178
+22179
+22180
+22181
+22182
+22183
+22184
+22185
+22186
+22187
+22188
+22189
+22190
+22191
+22192
+22193
+22194
+22195
+22196
+22197
+22198
+22199
+22200
+22201
+22202
+22203
+22204
+22205
+22206
+22207
+22208
+22209
+22210
+22211
+22212
+22213
+22214
+22215
+22216
+22217
+22218
+22219
+22220
+22221
+22222
+22223
+22224
+22225
+22226
+22227
+22228
+22229
+22230
+22231
+22232
+22233
+22234
+22235
+22236
+22237
+22238
+22239
+22240
+22241
+22242
+22243
+22244
+22245
+22246
+22247
+22248
+22249
+22250
+22251
+22252
+22253
+22254
+22255
+22256
+22257
+22258
+22259
+22260
+22261
+22262
+22263
+22264
+22265
+22266
+22267
+22268
+22269
+22270
+22271
+22272
+22273
+22274
+22275
+22276
+22277
+22278
+22279
+22280
+22281
+22282
+22283
+22284
+22285
+22286
+22287
+22288
+22289
+22290
+22291
+22292
+22293
+22294
+22295
+22296
+22297
+22298
+22299
+22300
+22301
+22302
+22303
+22304
+22305
+22306
+22307
+22308
+22309
+22310
+22311
+22312
+22313
+22314
+22315
+22316
+22317
+22318
+22319
+22320
+22321
+22322
+22323
+22324
+22325
+22326
+22327
+22328
+22329
+22330
+22331
+22332
+22333
+22334
+22335
+22336
+22337
+22338
+22339
+22340
+22341
+22342
+22343
+22344
+22345
+22346
+22347
+22348
+22349
+22350
+22351
+22352
+22353
+22354
+22355
+22356
+22357
+22358
+22359
+22360
+22361
+22362
+22363
+22364
+22365
+22366
+22367
+22368
+22369
+22370
+22371
+22372
+22373
+22374
+22375
+22376
+22377
+22378
+22379
+22380
+22381
+22382
+22383
+22384
+22385
+22386
+22387
+22388
+22389
+22390
+22391
+22392
+22393
+22394
+22395
+22396
+22397
+22398
+22399
+22400
+22401
+22402
+22403
+22404
+22405
+22406
+22407
+22408
+22409
+22410
+22411
+22412
+22413
+22414
+22415
+22416
+22417
+22418
+22419
+22420
+22421
+22422
+22423
+22424
+22425
+22426
+22427
+22428
+22429
+22430
+22431
+22432
+22433
+22434
+22435
+22436
+22437
+22438
+22439
+22440
+22441
+22442
+22443
+22444
+22445
+22446
+22447
+22448
+22449
+22450
+22451
+22452
+22453
+22454
+22455
+22456
+22457
+22458
+22459
+22460
+22461
+22462
+22463
+22464
+22465
+22466
+22467
+22468
+22469
+22470
+22471
+22472
+22473
+22474
+22475
+22476
+22477
+22478
+22479
+22480
+22481
+22482
+22483
+22484
+22485
+22486
+22487
+22488
+22489
+22490
+22491
+22492
+22493
+22494
+22495
+22496
+22497
+22498
+22499
+22500
+22501
+22502
+22503
+22504
+22505
+22506
+22507
+22508
+22509
+22510
+22511
+22512
+22513
+22514
+22515
+22516
+22517
+22518
+22519
+22520
+22521
+22522
+22523
+22524
+22525
+22526
+22527
+22528
+22529
+22530
+22531
+22532
+22533
+22534
+22535
+22536
+22537
+22538
+22539
+22540
+22541
+22542
+22543
+22544
+22545
+22546
+22547
+22548
+22549
+22550
+22551
+22552
+22553
+22554
+22555
+22556
+22557
+22558
+22559
+22560
+22561
+22562
+22563
+22564
+22565
+22566
+22567
+22568
+22569
+22570
+22571
+22572
+22573
+22574
+22575
+22576
+22577
+22578
+22579
+22580
+22581
+22582
+22583
+22584
+22585
+22586
+22587
+22588
+22589
+22590
+22591
+22592
+22593
+22594
+22595
+22596
+22597
+22598
+22599
+22600
+22601
+22602
+22603
+22604
+22605
+22606
+22607
+22608
+22609
+22610
+22611
+22612
+22613
+22614
+22615
+22616
+22617
+22618
+22619
+22620
+22621
+22622
+22623
+22624
+22625
+22626
+22627
+22628
+22629
+22630
+22631
+22632
+22633
+22634
+22635
+22636
+22637
+22638
+22639
+22640
+22641
+22642
+22643
+22644
+22645
+22646
+22647
+22648
+22649
+22650
+22651
+22652
+22653
+22654
+22655
+22656
+22657
+22658
+22659
+22660
+22661
+22662
+22663
+22664
+22665
+22666
+22667
+22668
+22669
+22670
+22671
+22672
+22673
+22674
+22675
+22676
+22677
+22678
+22679
+22680
+22681
+22682
+22683
+22684
+22685
+22686
+22687
+22688
+22689
+22690
+22691
+22692
+22693
+22694
+22695
+22696
+22697
+22698
+22699
+22700
+22701
+22702
+22703
+22704
+22705
+22706
+22707
+22708
+22709
+22710
+22711
+22712
+22713
+22714
+22715
+22716
+22717
+22718
+22719
+22720
+22721
+22722
+22723
+22724
+22725
+22726
+22727
+22728
+22729
+22730
+22731
+22732
+22733
+22734
+22735
+22736
+22737
+22738
+22739
+22740
+22741
+22742
+22743
+22744
+22745
+22746
+22747
+22748
+22749
+22750
+22751
+22752
+22753
+22754
+22755
+22756
+22757
+22758
+22759
+22760
+22761
+22762
+22763
+22764
+22765
+22766
+22767
+22768
+22769
+22770
+22771
+22772
+22773
+22774
+22775
+22776
+22777
+22778
+22779
+22780
+22781
+22782
+22783
+22784
+22785
+22786
+22787
+22788
+22789
+22790
+22791
+22792
+22793
+22794
+22795
+22796
+22797
+22798
+22799
+22800
+22801
+22802
+22803
+22804
+22805
+22806
+22807
+22808
+22809
+22810
+22811
+22812
+22813
+22814
+22815
+22816
+22817
+22818
+22819
+22820
+22821
+22822
+22823
+22824
+22825
+22826
+22827
+22828
+22829
+22830
+22831
+22832
+22833
+22834
+22835
+22836
+22837
+22838
+22839
+22840
+22841
+22842
+22843
+22844
+22845
+22846
+22847
+22848
+22849
+22850
+22851
+22852
+22853
+22854
+22855
+22856
+22857
+22858
+22859
+22860
+22861
+22862
+22863
+22864
+22865
+22866
+22867
+22868
+22869
+22870
+22871
+22872
+22873
+22874
+22875
+22876
+22877
+22878
+22879
+22880
+22881
+22882
+22883
+22884
+22885
+22886
+22887
+22888
+22889
+22890
+22891
+22892
+22893
+22894
+22895
+22896
+22897
+22898
+22899
+22900
+22901
+22902
+22903
+22904
+22905
+22906
+22907
+22908
+22909
+22910
+22911
+22912
+22913
+22914
+22915
+22916
+22917
+22918
+22919
+22920
+22921
+22922
+22923
+22924
+22925
+22926
+22927
+22928
+22929
+22930
+22931
+22932
+22933
+22934
+22935
+22936
+22937
+22938
+22939
+22940
+22941
+22942
+22943
+22944
+22945
+22946
+22947
+22948
+22949
+22950
+22951
+22952
+22953
+22954
+22955
+22956
+22957
+22958
+22959
+22960
+22961
+22962
+22963
+22964
+22965
+22966
+22967
+22968
+22969
+22970
+22971
+22972
+22973
+22974
+22975
+22976
+22977
+22978
+22979
+22980
+22981
+22982
+22983
+22984
+22985
+22986
+22987
+22988
+22989
+22990
+22991
+22992
+22993
+22994
+22995
+22996
+22997
+22998
+22999
+23000
+23001
+23002
+23003
+23004
+23005
+23006
+23007
+23008
+23009
+23010
+23011
+23012
+23013
+23014
+23015
+23016
+23017
+23018
+23019
+23020
+23021
+23022
+23023
+23024
+23025
+23026
+23027
+23028
+23029
+23030
+23031
+23032
+23033
+23034
+23035
+23036
+23037
+23038
+23039
+23040
+23041
+23042
+23043
+23044
+23045
+23046
+23047
+23048
+23049
+23050
+23051
+23052
+23053
+23054
+23055
+23056
+23057
+23058
+23059
+23060
+23061
+23062
+23063
+23064
+23065
+23066
+23067
+23068
+23069
+23070
+23071
+23072
+23073
+23074
+23075
+23076
+23077
+23078
+23079
+23080
+23081
+23082
+23083
+23084
+23085
+23086
+23087
+23088
+23089
+23090
+23091
+23092
+23093
+23094
+23095
+23096
+23097
+23098
+23099
+23100
+23101
+23102
+23103
+23104
+23105
+23106
+23107
+23108
+23109
+23110
+23111
+23112
+23113
+23114
+23115
+23116
+23117
+23118
+23119
+23120
+23121
+23122
+23123
+23124
+23125
+23126
+23127
+23128
+23129
+23130
+23131
+23132
+23133
+23134
+23135
+23136
+23137
+23138
+23139
+23140
+23141
+23142
+23143
+23144
+23145
+23146
+23147
+23148
+23149
+23150
+23151
+23152
+23153
+23154
+23155
+23156
+23157
+23158
+23159
+23160
+23161
+23162
+23163
+23164
+23165
+23166
+23167
+23168
+23169
+23170
+23171
+23172
+23173
+23174
+23175
+23176
+23177
+23178
+23179
+23180
+23181
+23182
+23183
+23184
+23185
+23186
+23187
+23188
+23189
+23190
+23191
+23192
+23193
+23194
+23195
+23196
+23197
+23198
+23199
+23200
+23201
+23202
+23203
+23204
+23205
+23206
+23207
+23208
+23209
+23210
+23211
+23212
+23213
+23214
+23215
+23216
+23217
+23218
+23219
+23220
+23221
+23222
+23223
+23224
+23225
+23226
+23227
+23228
+23229
+23230
+23231
+23232
+23233
+23234
+23235
+23236
+23237
+23238
+23239
+23240
+23241
+23242
+23243
+23244
+23245
+23246
+23247
+23248
+23249
+23250
+23251
+23252
+23253
+23254
+23255
+23256
+23257
+23258
+23259
+23260
+23261
+23262
+23263
+23264
+23265
+23266
+23267
+23268
+23269
+23270
+23271
+23272
+23273
+23274
+23275
+23276
+23277
+23278
+23279
+23280
+23281
+23282
+23283
+23284
+23285
+23286
+23287
+23288
+23289
+23290
+23291
+23292
+23293
+23294
+23295
+23296
+23297
+23298
+23299
+23300
+23301
+23302
+23303
+23304
+23305
+23306
+23307
+23308
+23309
+23310
+23311
+23312
+23313
+23314
+23315
+23316
+23317
+23318
+23319
+23320
+23321
+23322
+23323
+23324
+23325
+23326
+23327
+23328
+23329
+23330
+23331
+23332
+23333
+23334
+23335
+23336
+23337
+23338
+23339
+23340
+23341
+23342
+23343
+23344
+23345
+23346
+23347
+23348
+23349
+23350
+23351
+23352
+23353
+23354
+23355
+23356
+23357
+23358
+23359
+23360
+23361
+23362
+23363
+23364
+23365
+23366
+23367
+23368
+23369
+23370
+23371
+23372
+23373
+23374
+23375
+23376
+23377
+23378
+23379
+23380
+23381
+23382
+23383
+23384
+23385
+23386
+23387
+23388
+23389
+23390
+23391
+23392
+23393
+23394
+23395
+23396
+23397
+23398
+23399
+23400
+23401
+23402
+23403
+23404
+23405
+23406
+23407
+23408
+23409
+23410
+23411
+23412
+23413
+23414
+23415
+23416
+23417
+23418
+23419
+23420
+23421
+23422
+23423
+23424
+23425
+23426
+23427
+23428
+23429
+23430
+23431
+23432
+23433
+23434
+23435
+23436
+23437
+23438
+23439
+23440
+23441
+23442
+23443
+23444
+23445
+23446
+23447
+23448
+23449
+23450
+23451
+23452
+23453
+23454
+23455
+23456
+23457
+23458
+23459
+23460
+23461
+23462
+23463
+23464
+23465
+23466
+23467
+23468
+23469
+23470
+23471
+23472
+23473
+23474
+23475
+23476
+23477
+23478
+23479
+23480
+23481
+23482
+23483
+23484
+23485
+23486
+23487
+23488
+23489
+23490
+23491
+23492
+23493
+23494
+23495
+23496
+23497
+23498
+23499
+23500
+23501
+23502
+23503
+23504
+23505
+23506
+23507
+23508
+23509
+23510
+23511
+23512
+23513
+23514
+23515
+23516
+23517
+23518
+23519
+23520
+23521
+23522
+23523
+23524
+23525
+23526
+23527
+23528
+23529
+23530
+23531
+23532
+23533
+23534
+23535
+23536
+23537
+23538
+23539
+23540
+23541
+23542
+23543
+23544
+23545
+23546
+23547
+23548
+23549
+23550
+23551
+23552
+23553
+23554
+23555
+23556
+23557
+23558
+23559
+23560
+23561
+23562
+23563
+23564
+23565
+23566
+23567
+23568
+23569
+23570
+23571
+23572
+23573
+23574
+23575
+23576
+23577
+23578
+23579
+23580
+23581
+23582
+23583
+23584
+23585
+23586
+23587
+23588
+23589
+23590
+23591
+23592
+23593
+23594
+23595
+23596
+23597
+23598
+23599
+23600
+23601
+23602
+23603
+23604
+23605
+23606
+23607
+23608
+23609
+23610
+23611
+23612
+23613
+23614
+23615
+23616
+23617
+23618
+23619
+23620
+23621
+23622
+23623
+23624
+23625
+23626
+23627
+23628
+23629
+23630
+23631
+23632
+23633
+23634
+23635
+23636
+23637
+23638
+23639
+23640
+23641
+23642
+23643
+23644
+23645
+23646
+23647
+23648
+23649
+23650
+23651
+23652
+23653
+23654
+23655
+23656
+23657
+23658
+23659
+23660
+23661
+23662
+23663
+23664
+23665
+23666
+23667
+23668
+23669
+23670
+23671
+23672
+23673
+23674
+23675
+23676
+23677
+23678
+23679
+23680
+23681
+23682
+23683
+23684
+23685
+23686
+23687
+23688
+23689
+23690
+23691
+23692
+23693
+23694
+23695
+23696
+23697
+23698
+23699
+23700
+23701
+23702
+23703
+23704
+23705
+23706
+23707
+23708
+23709
+23710
+23711
+23712
+23713
+23714
+23715
+23716
+23717
+23718
+23719
+23720
+23721
+23722
+23723
+23724
+23725
+23726
+23727
+23728
+23729
+23730
+23731
+23732
+23733
+23734
+23735
+23736
+23737
+23738
+23739
+23740
+23741
+23742
+23743
+23744
+23745
+23746
+23747
+23748
+23749
+23750
+23751
+23752
+23753
+23754
+23755
+23756
+23757
+23758
+23759
+23760
+23761
+23762
+23763
+23764
+23765
+23766
+23767
+23768
+23769
+23770
+23771
+23772
+23773
+23774
+23775
+23776
+23777
+23778
+23779
+23780
+23781
+23782
+23783
+23784
+23785
+23786
+23787
+23788
+23789
+23790
+23791
+23792
+23793
+23794
+23795
+23796
+23797
+23798
+23799
+23800
+23801
+23802
+23803
+23804
+23805
+23806
+23807
+23808
+23809
+23810
+23811
+23812
+23813
+23814
+23815
+23816
+23817
+23818
+23819
+23820
+23821
+23822
+23823
+23824
+23825
+23826
+23827
+23828
+23829
+23830
+23831
+23832
+23833
+23834
+23835
+23836
+23837
+23838
+23839
+23840
+23841
+23842
+23843
+23844
+23845
+23846
+23847
+23848
+23849
+23850
+23851
+23852
+23853
+23854
+23855
+23856
+23857
+23858
+23859
+23860
+23861
+23862
+23863
+23864
+23865
+23866
+23867
+23868
+23869
+23870
+23871
+23872
+23873
+23874
+23875
+23876
+23877
+23878
+23879
+23880
+23881
+23882
+23883
+23884
+23885
+23886
+23887
+23888
+23889
+23890
+23891
+23892
+23893
+23894
+23895
+23896
+23897
+23898
+23899
+23900
+23901
+23902
+23903
+23904
+23905
+23906
+23907
+23908
+23909
+23910
+23911
+23912
+23913
+23914
+23915
+23916
+23917
+23918
+23919
+23920
+23921
+23922
+23923
+23924
+23925
+23926
+23927
+23928
+23929
+23930
+23931
+23932
+23933
+23934
+23935
+23936
+23937
+23938
+23939
+23940
+23941
+23942
+23943
+23944
+23945
+23946
+23947
+23948
+23949
+23950
+23951
+23952
+23953
+23954
+23955
+23956
+23957
+23958
+23959
+23960
+23961
+23962
+23963
+23964
+23965
+23966
+23967
+23968
+23969
+23970
+23971
+23972
+23973
+23974
+23975
+23976
+23977
+23978
+23979
+23980
+23981
+23982
+23983
+23984
+23985
+23986
+23987
+23988
+23989
+23990
+23991
+23992
+23993
+23994
+23995
+23996
+23997
+23998
+23999
+24000
+24001
+24002
+24003
+24004
+24005
+24006
+24007
+24008
+24009
+24010
+24011
+24012
+24013
+24014
+24015
+24016
+24017
+24018
+24019
+24020
+24021
+24022
+24023
+24024
+24025
+24026
+24027
+24028
+24029
+24030
+24031
+24032
+24033
+24034
+24035
+24036
+24037
+24038
+24039
+24040
+24041
+24042
+24043
+24044
+24045
+24046
+24047
+24048
+24049
+24050
+24051
+24052
+24053
+24054
+24055
+24056
+24057
+24058
+24059
+24060
+24061
+24062
+24063
+24064
+24065
+24066
+24067
+24068
+24069
+24070
+24071
+24072
+24073
+24074
+24075
+24076
+24077
+24078
+24079
+24080
+24081
+24082
+24083
+24084
+24085
+24086
+24087
+24088
+24089
+24090
+24091
+24092
+24093
+24094
+24095
+24096
+24097
+24098
+24099
+24100
+24101
+24102
+24103
+24104
+24105
+24106
+24107
+24108
+24109
+24110
+24111
+24112
+24113
+24114
+24115
+24116
+24117
+24118
+24119
+24120
+24121
+24122
+24123
+24124
+24125
+24126
+24127
+24128
+24129
+24130
+24131
+24132
+24133
+24134
+24135
+24136
+24137
+24138
+24139
+24140
+24141
+24142
+24143
+24144
+24145
+24146
+24147
+24148
+24149
+24150
+24151
+24152
+24153
+24154
+24155
+24156
+24157
+24158
+24159
+24160
+24161
+24162
+24163
+24164
+24165
+24166
+24167
+24168
+24169
+24170
+24171
+24172
+24173
+24174
+24175
+24176
+24177
+24178
+24179
+24180
+24181
+24182
+24183
+24184
+24185
+24186
+24187
+24188
+24189
+24190
+24191
+24192
+24193
+24194
+24195
+24196
+24197
+24198
+24199
+24200
+24201
+24202
+24203
+24204
+24205
+24206
+24207
+24208
+24209
+24210
+24211
+24212
+24213
+24214
+24215
+24216
+24217
+24218
+24219
+24220
+24221
+24222
+24223
+24224
+24225
+24226
+24227
+24228
+24229
+24230
+24231
+24232
+24233
+24234
+24235
+24236
+24237
+24238
+24239
+24240
+24241
+24242
+24243
+24244
+24245
+24246
+24247
+24248
+24249
+24250
+24251
+24252
+24253
+24254
+24255
+24256
+24257
+24258
+24259
+24260
+24261
+24262
+24263
+24264
+24265
+24266
+24267
+24268
+24269
+24270
+24271
+24272
+24273
+24274
+24275
+24276
+24277
+24278
+24279
+24280
+24281
+24282
+24283
+24284
+24285
+24286
+24287
+24288
+24289
+24290
+24291
+24292
+24293
+24294
+24295
+24296
+24297
+24298
+24299
+24300
+24301
+24302
+24303
+24304
+24305
+24306
+24307
+24308
+24309
+24310
+24311
+24312
+24313
+24314
+24315
+24316
+24317
+24318
+24319
+24320
+24321
+24322
+24323
+24324
+24325
+24326
+24327
+24328
+24329
+24330
+24331
+24332
+24333
+24334
+24335
+24336
+24337
+24338
+24339
+24340
+24341
+24342
+24343
+24344
+24345
+24346
+24347
+24348
+24349
+24350
+24351
+24352
+24353
+24354
+24355
+24356
+24357
+24358
+24359
+24360
+24361
+24362
+24363
+24364
+24365
+24366
+24367
+24368
+24369
+24370
+24371
+24372
+24373
+24374
+24375
+24376
+24377
+24378
+24379
+24380
+24381
+24382
+24383
+24384
+24385
+24386
+24387
+24388
+24389
+24390
+24391
+24392
+24393
+24394
+24395
+24396
+24397
+24398
+24399
+24400
+24401
+24402
+24403
+24404
+24405
+24406
+24407
+24408
+24409
+24410
+24411
+24412
+24413
+24414
+24415
+24416
+24417
+24418
+24419
+24420
+24421
+24422
+24423
+24424
+24425
+24426
+24427
+24428
+24429
+24430
+24431
+24432
+24433
+24434
+24435
+24436
+24437
+24438
+24439
+24440
+24441
+24442
+24443
+24444
+24445
+24446
+24447
+24448
+24449
+24450
+24451
+24452
+24453
+24454
+24455
+24456
+24457
+24458
+24459
+24460
+24461
+24462
+24463
+24464
+24465
+24466
+24467
+24468
+24469
+24470
+24471
+24472
+24473
+24474
+24475
+24476
+24477
+24478
+24479
+24480
+24481
+24482
+24483
+24484
+24485
+24486
+24487
+24488
+24489
+24490
+24491
+24492
+24493
+24494
+24495
+24496
+24497
+24498
+24499
+24500
+24501
+24502
+24503
+24504
+24505
+24506
+24507
+24508
+24509
+24510
+24511
+24512
+24513
+24514
+24515
+24516
+24517
+24518
+24519
+24520
+24521
+24522
+24523
+24524
+24525
+24526
+24527
+24528
+24529
+24530
+24531
+24532
+24533
+24534
+24535
+24536
+24537
+24538
+24539
+24540
+24541
+24542
+24543
+24544
+24545
+24546
+24547
+24548
+24549
+24550
+24551
+24552
+24553
+24554
+24555
+24556
+24557
+24558
+24559
+24560
+24561
+24562
+24563
+24564
+24565
+24566
+24567
+24568
+24569
+24570
+24571
+24572
+24573
+24574
+24575
+24576
+24577
+24578
+24579
+24580
+24581
+24582
+24583
+24584
+24585
+24586
+24587
+24588
+24589
+24590
+24591
+24592
+24593
+24594
+24595
+24596
+24597
+24598
+24599
+24600
+24601
+24602
+24603
+24604
+24605
+24606
+24607
+24608
+24609
+24610
+24611
+24612
+24613
+24614
+24615
+24616
+24617
+24618
+24619
+24620
+24621
+24622
+24623
+24624
+24625
+24626
+24627
+24628
+24629
+24630
+24631
+24632
+24633
+24634
+24635
+24636
+24637
+24638
+24639
+24640
+24641
+24642
+24643
+24644
+24645
+24646
+24647
+24648
+24649
+24650
+24651
+24652
+24653
+24654
+24655
+24656
+24657
+24658
+24659
+24660
+24661
+24662
+24663
+24664
+24665
+24666
+24667
+24668
+24669
+24670
+24671
+24672
+24673
+24674
+24675
+24676
+24677
+24678
+24679
+24680
+24681
+24682
+24683
+24684
+24685
+24686
+24687
+24688
+24689
+24690
+24691
+24692
+24693
+24694
+24695
+24696
+24697
+24698
+24699
+24700
+24701
+24702
+24703
+24704
+24705
+24706
+24707
+24708
+24709
+24710
+24711
+24712
+24713
+24714
+24715
+24716
+24717
+24718
+24719
+24720
+24721
+24722
+24723
+24724
+24725
+24726
+24727
+24728
+24729
+24730
+24731
+24732
+24733
+24734
+24735
+24736
+24737
+24738
+24739
+24740
+24741
+24742
+24743
+24744
+24745
+24746
+24747
+24748
+24749
+24750
+24751
+24752
+24753
+24754
+24755
+24756
+24757
+24758
+24759
+24760
+24761
+24762
+24763
+24764
+24765
+24766
+24767
+24768
+24769
+24770
+24771
+24772
+24773
+24774
+24775
+24776
+24777
+24778
+24779
+24780
+24781
+24782
+24783
+24784
+24785
+24786
+24787
+24788
+24789
+24790
+24791
+24792
+24793
+24794
+24795
+24796
+24797
+24798
+24799
+24800
+24801
+24802
+24803
+24804
+24805
+24806
+24807
+24808
+24809
+24810
+24811
+24812
+24813
+24814
+24815
+24816
+24817
+24818
+24819
+24820
+24821
+24822
+24823
+24824
+24825
+24826
+24827
+24828
+24829
+24830
+24831
+24832
+24833
+24834
+24835
+24836
+24837
+24838
+24839
+24840
+24841
+24842
+24843
+24844
+24845
+24846
+24847
+24848
+24849
+24850
+24851
+24852
+24853
+24854
+24855
+24856
+24857
+24858
+24859
+24860
+24861
+24862
+24863
+24864
+24865
+24866
+24867
+24868
+24869
+24870
+24871
+24872
+24873
+24874
+24875
+24876
+24877
+24878
+24879
+24880
+24881
+24882
+24883
+24884
+24885
+24886
+24887
+24888
+24889
+24890
+24891
+24892
+24893
+24894
+24895
+24896
+24897
+24898
+24899
+24900
+24901
+24902
+24903
+24904
+24905
+24906
+24907
+24908
+24909
+24910
+24911
+24912
+24913
+24914
+24915
+24916
+24917
+24918
+24919
+24920
+24921
+24922
+24923
+24924
+24925
+24926
+24927
+24928
+24929
+24930
+24931
+24932
+24933
+24934
+24935
+24936
+24937
+24938
+24939
+24940
+24941
+24942
+24943
+24944
+24945
+24946
+24947
+24948
+24949
+24950
+24951
+24952
+24953
+24954
+24955
+24956
+24957
+24958
+24959
+24960
+24961
+24962
+24963
+24964
+24965
+24966
+24967
+24968
+24969
+24970
+24971
+24972
+24973
+24974
+24975
+24976
+24977
+24978
+24979
+24980
+24981
+24982
+24983
+24984
+24985
+24986
+24987
+24988
+24989
+24990
+24991
+24992
+24993
+24994
+24995
+24996
+24997
+24998
+24999
+25000
+25001
+25002
+25003
+25004
+25005
+25006
+25007
+25008
+25009
+25010
+25011
+25012
+25013
+25014
+25015
+25016
+25017
+25018
+25019
+25020
+25021
+25022
+25023
+25024
+25025
+25026
+25027
+25028
+25029
+25030
+25031
+25032
+25033
+25034
+25035
+25036
+25037
+25038
+25039
+25040
+25041
+25042
+25043
+25044
+25045
+25046
+25047
+25048
+25049
+25050
+25051
+25052
+25053
+25054
+25055
+25056
+25057
+25058
+25059
+25060
+25061
+25062
+25063
+25064
+25065
+25066
+25067
+25068
+25069
+25070
+25071
+25072
+25073
+25074
+25075
+25076
+25077
+25078
+25079
+25080
+25081
+25082
+25083
+25084
+25085
+25086
+25087
+25088
+25089
+25090
+25091
+25092
+25093
+25094
+25095
+25096
+25097
+25098
+25099
+25100
+25101
+25102
+25103
+25104
+25105
+25106
+25107
+25108
+25109
+25110
+25111
+25112
+25113
+25114
+25115
+25116
+25117
+25118
+25119
+25120
+25121
+25122
+25123
+25124
+25125
+25126
+25127
+25128
+25129
+25130
+25131
+25132
+25133
+25134
+25135
+25136
+25137
+25138
+25139
+25140
+25141
+25142
+25143
+25144
+25145
+25146
+25147
+25148
+25149
+25150
+25151
+25152
+25153
+25154
+25155
+25156
+25157
+25158
+25159
+25160
+25161
+25162
+25163
+25164
+25165
+25166
+25167
+25168
+25169
+25170
+25171
+25172
+25173
+25174
+25175
+25176
+25177
+25178
+25179
+25180
+25181
+25182
+25183
+25184
+25185
+25186
+25187
+25188
+25189
+25190
+25191
+25192
+25193
+25194
+25195
+25196
+25197
+25198
+25199
+25200
+25201
+25202
+25203
+25204
+25205
+25206
+25207
+25208
+25209
+25210
+25211
+25212
+25213
+25214
+25215
+25216
+25217
+25218
+25219
+25220
+25221
+25222
+25223
+25224
+25225
+25226
+25227
+25228
+25229
+25230
+25231
+25232
+25233
+25234
+25235
+25236
+25237
+25238
+25239
+25240
+25241
+25242
+25243
+25244
+25245
+25246
+25247
+25248
+25249
+25250
+25251
+25252
+25253
+25254
+25255
+25256
+25257
+25258
+25259
+25260
+25261
+25262
+25263
+25264
+25265
+25266
+25267
+25268
+25269
+25270
+25271
+25272
+25273
+25274
+25275
+25276
+25277
+25278
+25279
+25280
+25281
+25282
+25283
+25284
+25285
+25286
+25287
+25288
+25289
+25290
+25291
+25292
+25293
+25294
+25295
+25296
+25297
+25298
+25299
+25300
+25301
+25302
+25303
+25304
+25305
+25306
+25307
+25308
+25309
+25310
+25311
+25312
+25313
+25314
+25315
+25316
+25317
+25318
+25319
+25320
+25321
+25322
+25323
+25324
+25325
+25326
+25327
+25328
+25329
+25330
+25331
+25332
+25333
+25334
+25335
+25336
+25337
+25338
+25339
+25340
+25341
+25342
+25343
+25344
+25345
+25346
+25347
+25348
+25349
+25350
+25351
+25352
+25353
+25354
+25355
+25356
+25357
+25358
+25359
+25360
+25361
+25362
+25363
+25364
+25365
+25366
+25367
+25368
+25369
+25370
+25371
+25372
+25373
+25374
+25375
+25376
+25377
+25378
+25379
+25380
+25381
+25382
+25383
+25384
+25385
+25386
+25387
+25388
+25389
+25390
+25391
+25392
+25393
+25394
+25395
+25396
+25397
+25398
+25399
+25400
+25401
+25402
+25403
+25404
+25405
+25406
+25407
+25408
+25409
+25410
+25411
+25412
+25413
+25414
+25415
+25416
+25417
+25418
+25419
+25420
+25421
+25422
+25423
+25424
+25425
+25426
+25427
+25428
+25429
+25430
+25431
+25432
+25433
+25434
+25435
+25436
+25437
+25438
+25439
+25440
+25441
+25442
+25443
+25444
+25445
+25446
+25447
+25448
+25449
+25450
+25451
+25452
+25453
+25454
+25455
+25456
+25457
+25458
+25459
+25460
+25461
+25462
+25463
+25464
+25465
+25466
+25467
+25468
+25469
+25470
+25471
+25472
+25473
+25474
+25475
+25476
+25477
+25478
+25479
+25480
+25481
+25482
+25483
+25484
+25485
+25486
+25487
+25488
+25489
+25490
+25491
+25492
+25493
+25494
+25495
+25496
+25497
+25498
+25499
+25500
+25501
+25502
+25503
+25504
+25505
+25506
+25507
+25508
+25509
+25510
+25511
+25512
+25513
+25514
+25515
+25516
+25517
+25518
+25519
+25520
+25521
+25522
+25523
+25524
+25525
+25526
+25527
+25528
+25529
+25530
+25531
+25532
+25533
+25534
+25535
+25536
+25537
+25538
+25539
+25540
+25541
+25542
+25543
+25544
+25545
+25546
+25547
+25548
+25549
+25550
+25551
+25552
+25553
+25554
+25555
+25556
+25557
+25558
+25559
+25560
+25561
+25562
+25563
+25564
+25565
+25566
+25567
+25568
+25569
+25570
+25571
+25572
+25573
+25574
+25575
+25576
+25577
+25578
+25579
+25580
+25581
+25582
+25583
+25584
+25585
+25586
+25587
+25588
+25589
+25590
+25591
+25592
+25593
+25594
+25595
+25596
+25597
+25598
+25599
+25600
+25601
+25602
+25603
+25604
+25605
+25606
+25607
+25608
+25609
+25610
+25611
+25612
+25613
+25614
+25615
+25616
+25617
+25618
+25619
+25620
+25621
+25622
+25623
+25624
+25625
+25626
+25627
+25628
+25629
+25630
+25631
+25632
+25633
+25634
+25635
+25636
+25637
+25638
+25639
+25640
+25641
+25642
+25643
+25644
+25645
+25646
+25647
+25648
+25649
+25650
+25651
+25652
+25653
+25654
+25655
+25656
+25657
+25658
+25659
+25660
+25661
+25662
+25663
+25664
+25665
+25666
+25667
+25668
+25669
+25670
+25671
+25672
+25673
+25674
+25675
+25676
+25677
+25678
+25679
+25680
+25681
+25682
+25683
+25684
+25685
+25686
+25687
+25688
+25689
+25690
+25691
+25692
+25693
+25694
+25695
+25696
+25697
+25698
+25699
+25700
+25701
+25702
+25703
+25704
+25705
+25706
+25707
+25708
+25709
+25710
+25711
+25712
+25713
+25714
+25715
+25716
+25717
+25718
+25719
+25720
+25721
+25722
+25723
+25724
+25725
+25726
+25727
+25728
+25729
+25730
+25731
+25732
+25733
+25734
+25735
+25736
+25737
+25738
+25739
+25740
+25741
+25742
+25743
+25744
+25745
+25746
+25747
+25748
+25749
+25750
+25751
+25752
+25753
+25754
+25755
+25756
+25757
+25758
+25759
+25760
+25761
+25762
+25763
+25764
+25765
+25766
+25767
+25768
+25769
+25770
+25771
+25772
+25773
+25774
+25775
+25776
+25777
+25778
+25779
+25780
+25781
+25782
+25783
+25784
+25785
+25786
+25787
+25788
+25789
+25790
+25791
+25792
+25793
+25794
+25795
+25796
+25797
+25798
+25799
+25800
+25801
+25802
+25803
+25804
+25805
+25806
+25807
+25808
+25809
+25810
+25811
+25812
+25813
+25814
+25815
+25816
+25817
+25818
+25819
+25820
+25821
+25822
+25823
+25824
+25825
+25826
+25827
+25828
+25829
+25830
+25831
+25832
+25833
+25834
+25835
+25836
+25837
+25838
+25839
+25840
+25841
+25842
+25843
+25844
+25845
+25846
+25847
+25848
+25849
+25850
+25851
+25852
+25853
+25854
+25855
+25856
+25857
+25858
+25859
+25860
+25861
+25862
+25863
+25864
+25865
+25866
+25867
+25868
+25869
+25870
+25871
+25872
+25873
+25874
+25875
+25876
+25877
+25878
+25879
+25880
+25881
+25882
+25883
+25884
+25885
+25886
+25887
+25888
+25889
+25890
+25891
+25892
+25893
+25894
+25895
+25896
+25897
+25898
+25899
+25900
+25901
+25902
+25903
+25904
+25905
+25906
+25907
+25908
+25909
+25910
+25911
+25912
+25913
+25914
+25915
+25916
+25917
+25918
+25919
+25920
+25921
+25922
+25923
+25924
+25925
+25926
+25927
+25928
+25929
+25930
+25931
+25932
+25933
+25934
+25935
+25936
+25937
+25938
+25939
+25940
+25941
+25942
+25943
+25944
+25945
+25946
+25947
+25948
+25949
+25950
+25951
+25952
+25953
+25954
+25955
+25956
+25957
+25958
+25959
+25960
+25961
+25962
+25963
+25964
+25965
+25966
+25967
+25968
+25969
+25970
+25971
+25972
+25973
+25974
+25975
+25976
+25977
+25978
+25979
+25980
+25981
+25982
+25983
+25984
+25985
+25986
+25987
+25988
+25989
+25990
+25991
+25992
+25993
+25994
+25995
+25996
+25997
+25998
+25999
+26000
+26001
+26002
+26003
+26004
+26005
+26006
+26007
+26008
+26009
+26010
+26011
+26012
+26013
+26014
+26015
+26016
+26017
+26018
+26019
+26020
+26021
+26022
+26023
+26024
+26025
+26026
+26027
+26028
+26029
+26030
+26031
+26032
+26033
+26034
+26035
+26036
+26037
+26038
+26039
+26040
+26041
+26042
+26043
+26044
+26045
+26046
+26047
+26048
+26049
+26050
+26051
+26052
+26053
+26054
+26055
+26056
+26057
+26058
+26059
+26060
+26061
+26062
+26063
+26064
+26065
+26066
+26067
+26068
+26069
+26070
+26071
+26072
+26073
+26074
+26075
+26076
+26077
+26078
+26079
+26080
+26081
+26082
+26083
+26084
+26085
+26086
+26087
+26088
+26089
+26090
+26091
+26092
+26093
+26094
+26095
+26096
+26097
+26098
+26099
+26100
+26101
+26102
+26103
+26104
+26105
+26106
+26107
+26108
+26109
+26110
+26111
+26112
+26113
+26114
+26115
+26116
+26117
+26118
+26119
+26120
+26121
+26122
+26123
+26124
+26125
+26126
+26127
+26128
+26129
+26130
+26131
+26132
+26133
+26134
+26135
+26136
+26137
+26138
+26139
+26140
+26141
+26142
+26143
+26144
+26145
+26146
+26147
+26148
+26149
+26150
+26151
+26152
+26153
+26154
+26155
+26156
+26157
+26158
+26159
+26160
+26161
+26162
+26163
+26164
+26165
+26166
+26167
+26168
+26169
+26170
+26171
+26172
+26173
+26174
+26175
+26176
+26177
+26178
+26179
+26180
+26181
+26182
+26183
+26184
+26185
+26186
+26187
+26188
+26189
+26190
+26191
+26192
+26193
+26194
+26195
+26196
+26197
+26198
+26199
+26200
+26201
+26202
+26203
+26204
+26205
+26206
+26207
+26208
+26209
+26210
+26211
+26212
+26213
+26214
+26215
+26216
+26217
+26218
+26219
+26220
+26221
+26222
+26223
+26224
+26225
+26226
+26227
+26228
+26229
+26230
+26231
+26232
+26233
+26234
+26235
+26236
+26237
+26238
+26239
+26240
+26241
+26242
+26243
+26244
+26245
+26246
+26247
+26248
+26249
+26250
+26251
+26252
+26253
+26254
+26255
+26256
+26257
+26258
+26259
+26260
+26261
+26262
+26263
+26264
+26265
+26266
+26267
+26268
+26269
+26270
+26271
+26272
+26273
+26274
+26275
+26276
+26277
+26278
+26279
+26280
+26281
+26282
+26283
+26284
+26285
+26286
+26287
+26288
+26289
+26290
+26291
+26292
+26293
+26294
+26295
+26296
+26297
+26298
+26299
+26300
+26301
+26302
+26303
+26304
+26305
+26306
+26307
+26308
+26309
+26310
+26311
+26312
+26313
+26314
+26315
+26316
+26317
+26318
+26319
+26320
+26321
+26322
+26323
+26324
+26325
+26326
+26327
+26328
+26329
+26330
+26331
+26332
+26333
+26334
+26335
+26336
+26337
+26338
+26339
+26340
+26341
+26342
+26343
+26344
+26345
+26346
+26347
+26348
+26349
+26350
+26351
+26352
+26353
+26354
+26355
+26356
+26357
+26358
+26359
+26360
+26361
+26362
+26363
+26364
+26365
+26366
+26367
+26368
+26369
+26370
+26371
+26372
+26373
+26374
+26375
+26376
+26377
+26378
+26379
+26380
+26381
+26382
+26383
+26384
+26385
+26386
+26387
+26388
+26389
+26390
+26391
+26392
+26393
+26394
+26395
+26396
+26397
+26398
+26399
+26400
+26401
+26402
+26403
+26404
+26405
+26406
+26407
+26408
+26409
+26410
+26411
+26412
+26413
+26414
+26415
+26416
+26417
+26418
+26419
+26420
+26421
+26422
+26423
+26424
+26425
+26426
+26427
+26428
+26429
+26430
+26431
+26432
+26433
+26434
+26435
+26436
+26437
+26438
+26439
+26440
+26441
+26442
+26443
+26444
+26445
+26446
+26447
+26448
+26449
+26450
+26451
+26452
+26453
+26454
+26455
+26456
+26457
+26458
+26459
+26460
+26461
+26462
+26463
+26464
+26465
+26466
+26467
+26468
+26469
+26470
+26471
+26472
+26473
+26474
+26475
+26476
+26477
+26478
+26479
+26480
+26481
+26482
+26483
+26484
+26485
+26486
+26487
+26488
+26489
+26490
+26491
+26492
+26493
+26494
+26495
+26496
+26497
+26498
+26499
+26500
+26501
+26502
+26503
+26504
+26505
+26506
+26507
+26508
+26509
+26510
+26511
+26512
+26513
+26514
+26515
+26516
+26517
+26518
+26519
+26520
+26521
+26522
+26523
+26524
+26525
+26526
+26527
+26528
+26529
+26530
+26531
+26532
+26533
+26534
+26535
+26536
+26537
+26538
+26539
+26540
+26541
+26542
+26543
+26544
+26545
+26546
+26547
+26548
+26549
+26550
+26551
+26552
+26553
+26554
+26555
+26556
+26557
+26558
+26559
+26560
+26561
+26562
+26563
+26564
+26565
+26566
+26567
+26568
+26569
+26570
+26571
+26572
+26573
+26574
+26575
+26576
+26577
+26578
+26579
+26580
+26581
+26582
+26583
+26584
+26585
+26586
+26587
+26588
+26589
+26590
+26591
+26592
+26593
+26594
+26595
+26596
+26597
+26598
+26599
+26600
+26601
+26602
+26603
+26604
+26605
+26606
+26607
+26608
+26609
+26610
+26611
+26612
+26613
+26614
+26615
+26616
+26617
+26618
+26619
+26620
+26621
+26622
+26623
+26624
+26625
+26626
+26627
+26628
+26629
+26630
+26631
+26632
+26633
+26634
+26635
+26636
+26637
+26638
+26639
+26640
+26641
+26642
+26643
+26644
+26645
+26646
+26647
+26648
+26649
+26650
+26651
+26652
+26653
+26654
+26655
+26656
+26657
+26658
+26659
+26660
+26661
+26662
+26663
+26664
+26665
+26666
+26667
+26668
+26669
+26670
+26671
+26672
+26673
+26674
+26675
+26676
+26677
+26678
+26679
+26680
+26681
+26682
+26683
+26684
+26685
+26686
+26687
+26688
+26689
+26690
+26691
+26692
+26693
+26694
+26695
+26696
+26697
+26698
+26699
+26700
+26701
+26702
+26703
+26704
+26705
+26706
+26707
+26708
+26709
+26710
+26711
+26712
+26713
+26714
+26715
+26716
+26717
+26718
+26719
+26720
+26721
+26722
+26723
+26724
+26725
+26726
+26727
+26728
+26729
+26730
+26731
+26732
+26733
+26734
+26735
+26736
+26737
+26738
+26739
+26740
+26741
+26742
+26743
+26744
+26745
+26746
+26747
+26748
+26749
+26750
+26751
+26752
+26753
+26754
+26755
+26756
+26757
+26758
+26759
+26760
+26761
+26762
+26763
+26764
+26765
+26766
+26767
+26768
+26769
+26770
+26771
+26772
+26773
+26774
+26775
+26776
+26777
+26778
+26779
+26780
+26781
+26782
+26783
+26784
+26785
+26786
+26787
+26788
+26789
+26790
+26791
+26792
+26793
+26794
+26795
+26796
+26797
+26798
+26799
+26800
+26801
+26802
+26803
+26804
+26805
+26806
+26807
+26808
+26809
+26810
+26811
+26812
+26813
+26814
+26815
+26816
+26817
+26818
+26819
+26820
+26821
+26822
+26823
+26824
+26825
+26826
+26827
+26828
+26829
+26830
+26831
+26832
+26833
+26834
+26835
+26836
+26837
+26838
+26839
+26840
+26841
+26842
+26843
+26844
+26845
+26846
+26847
+26848
+26849
+26850
+26851
+26852
+26853
+26854
+26855
+26856
+26857
+26858
+26859
+26860
+26861
+26862
+26863
+26864
+26865
+26866
+26867
+26868
+26869
+26870
+26871
+26872
+26873
+26874
+26875
+26876
+26877
+26878
+26879
+26880
+26881
+26882
+26883
+26884
+26885
+26886
+26887
+26888
+26889
+26890
+26891
+26892
+26893
+26894
+26895
+26896
+26897
+26898
+26899
+26900
+26901
+26902
+26903
+26904
+26905
+26906
+26907
+26908
+26909
+26910
+26911
+26912
+26913
+26914
+26915
+26916
+26917
+26918
+26919
+26920
+26921
+26922
+26923
+26924
+26925
+26926
+26927
+26928
+26929
+26930
+26931
+26932
+26933
+26934
+26935
+26936
+26937
+26938
+26939
+26940
+26941
+26942
+26943
+26944
+26945
+26946
+26947
+26948
+26949
+26950
+26951
+26952
+26953
+26954
+26955
+26956
+26957
+26958
+26959
+26960
+26961
+26962
+26963
+26964
+26965
+26966
+26967
+26968
+26969
+26970
+26971
+26972
+26973
+26974
+26975
+26976
+26977
+26978
+26979
+26980
+26981
+26982
+26983
+26984
+26985
+26986
+26987
+26988
+26989
+26990
+26991
+26992
+26993
+26994
+26995
+26996
+26997
+26998
+26999
+27000
+27001
+27002
+27003
+27004
+27005
+27006
+27007
+27008
+27009
+27010
+27011
+27012
+27013
+27014
+27015
+27016
+27017
+27018
+27019
+27020
+27021
+27022
+27023
+27024
+27025
+27026
+27027
+27028
+27029
+27030
+27031
+27032
+27033
+27034
+27035
+27036
+27037
+27038
+27039
+27040
+27041
+27042
+27043
+27044
+27045
+27046
+27047
+27048
+27049
+27050
+27051
+27052
+27053
+27054
+27055
+27056
+27057
+27058
+27059
+27060
+27061
+27062
+27063
+27064
+27065
+27066
+27067
+27068
+27069
+27070
+27071
+27072
+27073
+27074
+27075
+27076
+27077
+27078
+27079
+27080
+27081
+27082
+27083
+27084
+27085
+27086
+27087
+27088
+27089
+27090
+27091
+27092
+27093
+27094
+27095
+27096
+27097
+27098
+27099
+27100
+27101
+27102
+27103
+27104
+27105
+27106
+27107
+27108
+27109
+27110
+27111
+27112
+27113
+27114
+27115
+27116
+27117
+27118
+27119
+27120
+27121
+27122
+27123
+27124
+27125
+27126
+27127
+27128
+27129
+27130
+27131
+27132
+27133
+27134
+27135
+27136
+27137
+27138
+27139
+27140
+27141
+27142
+27143
+27144
+27145
+27146
+27147
+27148
+27149
+27150
+27151
+27152
+27153
+27154
+27155
+27156
+27157
+27158
+27159
+27160
+27161
+27162
+27163
+27164
+27165
+27166
+27167
+27168
+27169
+27170
+27171
+27172
+27173
+27174
+27175
+27176
+27177
+27178
+27179
+27180
+27181
+27182
+27183
+27184
+27185
+27186
+27187
+27188
+27189
+27190
+27191
+27192
+27193
+27194
+27195
+27196
+27197
+27198
+27199
+27200
+27201
+27202
+27203
+27204
+27205
+27206
+27207
+27208
+27209
+27210
+27211
+27212
+27213
+27214
+27215
+27216
+27217
+27218
+27219
+27220
+27221
+27222
+27223
+27224
+27225
+27226
+27227
+27228
+27229
+27230
+27231
+27232
+27233
+27234
+27235
+27236
+27237
+27238
+27239
+27240
+27241
+27242
+27243
+27244
+27245
+27246
+27247
+27248
+27249
+27250
+27251
+27252
+27253
+27254
+27255
+27256
+27257
+27258
+27259
+27260
+27261
+27262
+27263
+27264
+27265
+27266
+27267
+27268
+27269
+27270
+27271
+27272
+27273
+27274
+27275
+27276
+27277
+27278
+27279
+27280
+27281
+27282
+27283
+27284
+27285
+27286
+27287
+27288
+27289
+27290
+27291
+27292
+27293
+27294
+27295
+27296
+27297
+27298
+27299
+27300
+27301
+27302
+27303
+27304
+27305
+27306
+27307
+27308
+27309
+27310
+27311
+27312
+27313
+27314
+27315
+27316
+27317
+27318
+27319
+27320
+27321
+27322
+27323
+27324
+27325
+27326
+27327
+27328
+27329
+27330
+27331
+27332
+27333
+27334
+27335
+27336
+27337
+27338
+27339
+27340
+27341
+27342
+27343
+27344
+27345
+27346
+27347
+27348
+27349
+27350
+27351
+27352
+27353
+27354
+27355
+27356
+27357
+27358
+27359
+27360
+27361
+27362
+27363
+27364
+27365
+27366
+27367
+27368
+27369
+27370
+27371
+27372
+27373
+27374
+27375
+27376
+27377
+27378
+27379
+27380
+27381
+27382
+27383
+27384
+27385
+27386
+27387
+27388
+27389
+27390
+27391
+27392
+27393
+27394
+27395
+27396
+27397
+27398
+27399
+27400
+27401
+27402
+27403
+27404
+27405
+27406
+27407
+27408
+27409
+27410
+27411
+27412
+27413
+27414
+27415
+27416
+27417
+27418
+27419
+27420
+27421
+27422
+27423
+27424
+27425
+27426
+27427
+27428
+27429
+27430
+27431
+27432
+27433
+27434
+27435
+27436
+27437
+27438
+27439
+27440
+27441
+27442
+27443
+27444
+27445
+27446
+27447
+27448
+27449
+27450
+27451
+27452
+27453
+27454
+27455
+27456
+27457
+27458
+27459
+27460
+27461
+27462
+27463
+27464
+27465
+27466
+27467
+27468
+27469
+27470
+27471
+27472
+27473
+27474
+27475
+27476
+27477
+27478
+27479
+27480
+27481
+27482
+27483
+27484
+27485
+27486
+27487
+27488
+27489
+27490
+27491
+27492
+27493
+27494
+27495
+27496
+27497
+27498
+27499
+27500
+27501
+27502
+27503
+27504
+27505
+27506
+27507
+27508
+27509
+27510
+27511
+27512
+27513
+27514
+27515
+27516
+27517
+27518
+27519
+27520
+27521
+27522
+27523
+27524
+27525
+27526
+27527
+27528
+27529
+27530
+27531
+27532
+27533
+27534
+27535
+27536
+27537
+27538
+27539
+27540
+27541
+27542
+27543
+27544
+27545
+27546
+27547
+27548
+27549
+27550
+27551
+27552
+27553
+27554
+27555
+27556
+27557
+27558
+27559
+27560
+27561
+27562
+27563
+27564
+27565
+27566
+27567
+27568
+27569
+27570
+27571
+27572
+27573
+27574
+27575
+27576
+27577
+27578
+27579
+27580
+27581
+27582
+27583
+27584
+27585
+27586
+27587
+27588
+27589
+27590
+27591
+27592
+27593
+27594
+27595
+27596
+27597
+27598
+27599
+27600
+27601
+27602
+27603
+27604
+27605
+27606
+27607
+27608
+27609
+27610
+27611
+27612
+27613
+27614
+27615
+27616
+27617
+27618
+27619
+27620
+27621
+27622
+27623
+27624
+27625
+27626
+27627
+27628
+27629
+27630
+27631
+27632
+27633
+27634
+27635
+27636
+27637
+27638
+27639
+27640
+27641
+27642
+27643
+27644
+27645
+27646
+27647
+27648
+27649
+27650
+27651
+27652
+27653
+27654
+27655
+27656
+27657
+27658
+27659
+27660
+27661
+27662
+27663
+27664
+27665
+27666
+27667
+27668
+27669
+27670
+27671
+27672
+27673
+27674
+27675
+27676
+27677
+27678
+27679
+27680
+27681
+27682
+27683
+27684
+27685
+27686
+27687
+27688
+27689
+27690
+27691
+27692
+27693
+27694
+27695
+27696
+27697
+27698
+27699
+27700
+27701
+27702
+27703
+27704
+27705
+27706
+27707
+27708
+27709
+27710
+27711
+27712
+27713
+27714
+27715
+27716
+27717
+27718
+27719
+27720
+27721
+27722
+27723
+27724
+27725
+27726
+27727
+27728
+27729
+27730
+27731
+27732
+27733
+27734
+27735
+27736
+27737
+27738
+27739
+27740
+27741
+27742
+27743
+27744
+27745
+27746
+27747
+27748
+27749
+27750
+27751
+27752
+27753
+27754
+27755
+27756
+27757
+27758
+27759
+27760
+27761
+27762
+27763
+27764
+27765
+27766
+27767
+27768
+27769
+27770
+27771
+27772
+27773
+27774
+27775
+27776
+27777
+27778
+27779
+27780
+27781
+27782
+27783
+27784
+27785
+27786
+27787
+27788
+27789
+27790
+27791
+27792
+27793
+27794
+27795
+27796
+27797
+27798
+27799
+27800
+27801
+27802
+27803
+27804
+27805
+27806
+27807
+27808
+27809
+27810
+27811
+27812
+27813
+27814
+27815
+27816
+27817
+27818
+27819
+27820
+27821
+27822
+27823
+27824
+27825
+27826
+27827
+27828
+27829
+27830
+27831
+27832
+27833
+27834
+27835
+27836
+27837
+27838
+27839
+27840
+27841
+27842
+27843
+27844
+27845
+27846
+27847
+27848
+27849
+27850
+27851
+27852
+27853
+27854
+27855
+27856
+27857
+27858
+27859
+27860
+27861
+27862
+27863
+27864
+27865
+27866
+27867
+27868
+27869
+27870
+27871
+27872
+27873
+27874
+27875
+27876
+27877
+27878
+27879
+27880
+27881
+27882
+27883
+27884
+27885
+27886
+27887
+27888
+27889
+27890
+27891
+27892
+27893
+27894
+27895
+27896
+27897
+27898
+27899
+27900
+27901
+27902
+27903
+27904
+27905
+27906
+27907
+27908
+27909
+27910
+27911
+27912
+27913
+27914
+27915
+27916
+27917
+27918
+27919
+27920
+27921
+27922
+27923
+27924
+27925
+27926
+27927
+27928
+27929
+27930
+27931
+27932
+27933
+27934
+27935
+27936
+27937
+27938
+27939
+27940
+27941
+27942
+27943
+27944
+27945
+27946
+27947
+27948
+27949
+27950
+27951
+27952
+27953
+27954
+27955
+27956
+27957
+27958
+27959
+27960
+27961
+27962
+27963
+27964
+27965
+27966
+27967
+27968
+27969
+27970
+27971
+27972
+27973
+27974
+27975
+27976
+27977
+27978
+27979
+27980
+27981
+27982
+27983
+27984
+27985
+27986
+27987
+27988
+27989
+27990
+27991
+27992
+27993
+27994
+27995
+27996
+27997
+27998
+27999
+28000
+28001
+28002
+28003
+28004
+28005
+28006
+28007
+28008
+28009
+28010
+28011
+28012
+28013
+28014
+28015
+28016
+28017
+28018
+28019
+28020
+28021
+28022
+28023
+28024
+28025
+28026
+28027
+28028
+28029
+28030
+28031
+28032
+28033
+28034
+28035
+28036
+28037
+28038
+28039
+28040
+28041
+28042
+28043
+28044
+28045
+28046
+28047
+28048
+28049
+28050
+28051
+28052
+28053
+28054
+28055
+28056
+28057
+28058
+28059
+28060
+28061
+28062
+28063
+28064
+28065
+28066
+28067
+28068
+28069
+28070
+28071
+28072
+28073
+28074
+28075
+28076
+28077
+28078
+28079
+28080
+28081
+28082
+28083
+28084
+28085
+28086
+28087
+28088
+28089
+28090
+28091
+28092
+28093
+28094
+28095
+28096
+28097
+28098
+28099
+28100
+28101
+28102
+28103
+28104
+28105
+28106
+28107
+28108
+28109
+28110
+28111
+28112
+28113
+28114
+28115
+28116
+28117
+28118
+28119
+28120
+28121
+28122
+28123
+28124
+28125
+28126
+28127
+28128
+28129
+28130
+28131
+28132
+28133
+28134
+28135
+28136
+28137
+28138
+28139
+28140
+28141
+28142
+28143
+28144
+28145
+28146
+28147
+28148
+28149
+28150
+28151
+28152
+28153
+28154
+28155
+28156
+28157
+28158
+28159
+28160
+28161
+28162
+28163
+28164
+28165
+28166
+28167
+28168
+28169
+28170
+28171
+28172
+28173
+28174
+28175
+28176
+28177
+28178
+28179
+28180
+28181
+28182
+28183
+28184
+28185
+28186
+28187
+28188
+28189
+28190
+28191
+28192
+28193
+28194
+28195
+28196
+28197
+28198
+28199
+28200
+28201
+28202
+28203
+28204
+28205
+28206
+28207
+28208
+28209
+28210
+28211
+28212
+28213
+28214
+28215
+28216
+28217
+28218
+28219
+28220
+28221
+28222
+28223
+28224
+28225
+28226
+28227
+28228
+28229
+28230
+28231
+28232
+28233
+28234
+28235
+28236
+28237
+28238
+28239
+28240
+28241
+28242
+28243
+28244
+28245
+28246
+28247
+28248
+28249
+28250
+28251
+28252
+28253
+28254
+28255
+28256
+28257
+28258
+28259
+28260
+28261
+28262
+28263
+28264
+28265
+28266
+28267
+28268
+28269
+28270
+28271
+28272
+28273
+28274
+28275
+28276
+28277
+28278
+28279
+28280
+28281
+28282
+28283
+28284
+28285
+28286
+28287
+28288
+28289
+28290
+28291
+28292
+28293
+28294
+28295
+28296
+28297
+28298
+28299
+28300
+28301
+28302
+28303
+28304
+28305
+28306
+28307
+28308
+28309
+28310
+28311
+28312
+28313
+28314
+28315
+28316
+28317
+28318
+28319
+28320
+28321
+28322
+28323
+28324
+28325
+28326
+28327
+28328
+28329
+28330
+28331
+28332
+28333
+28334
+28335
+28336
+28337
+28338
+28339
+28340
+28341
+28342
+28343
+28344
+28345
+28346
+28347
+28348
+28349
+28350
+28351
+28352
+28353
+28354
+28355
+28356
+28357
+28358
+28359
+28360
+28361
+28362
+28363
+28364
+28365
+28366
+28367
+28368
+28369
+28370
+28371
+28372
+28373
+28374
+28375
+28376
+28377
+28378
+28379
+28380
+28381
+28382
+28383
+28384
+28385
+28386
+28387
+28388
+28389
+28390
+28391
+28392
+28393
+28394
+28395
+28396
+28397
+28398
+28399
+28400
+28401
+28402
+28403
+28404
+28405
+28406
+28407
+28408
+28409
+28410
+28411
+28412
+28413
+28414
+28415
+28416
+28417
+28418
+28419
+28420
+28421
+28422
+28423
+28424
+28425
+28426
+28427
+28428
+28429
+28430
+28431
+28432
+28433
+28434
+28435
+28436
+28437
+28438
+28439
+28440
+28441
+28442
+28443
+28444
+28445
+28446
+28447
+28448
+28449
+28450
+28451
+28452
+28453
+28454
+28455
+28456
+28457
+28458
+28459
+28460
+28461
+28462
+28463
+28464
+28465
+28466
+28467
+28468
+28469
+28470
+28471
+28472
+28473
+28474
+28475
+28476
+28477
+28478
+28479
+28480
+28481
+28482
+28483
+28484
+28485
+28486
+28487
+28488
+28489
+28490
+28491
+28492
+28493
+28494
+28495
+28496
+28497
+28498
+28499
+28500
+28501
+28502
+28503
+28504
+28505
+28506
+28507
+28508
+28509
+28510
+28511
+28512
+28513
+28514
+28515
+28516
+28517
+28518
+28519
+28520
+28521
+28522
+28523
+28524
+28525
+28526
+28527
+28528
+28529
+28530
+28531
+28532
+28533
+28534
+28535
+28536
+28537
+28538
+28539
+28540
+28541
+28542
+28543
+28544
+28545
+28546
+28547
+28548
+28549
+28550
+28551
+28552
+28553
+28554
+28555
+28556
+28557
+28558
+28559
+28560
+28561
+28562
+28563
+28564
+28565
+28566
+28567
+28568
+28569
+28570
+28571
+28572
+28573
+28574
+28575
+28576
+28577
+28578
+28579
+28580
+28581
+28582
+28583
+28584
+28585
+28586
+28587
+28588
+28589
+28590
+28591
+28592
+28593
+28594
+28595
+28596
+28597
+28598
+28599
+28600
+28601
+28602
+28603
+28604
+28605
+28606
+28607
+28608
+28609
+28610
+28611
+28612
+28613
+28614
+28615
+28616
+28617
+28618
+28619
+28620
+28621
+28622
+28623
+28624
+28625
+28626
+28627
+28628
+28629
+28630
+28631
+28632
+28633
+28634
+28635
+28636
+28637
+28638
+28639
+28640
+28641
+28642
+28643
+28644
+28645
+28646
+28647
+28648
+28649
+28650
+28651
+28652
+28653
+28654
+28655
+28656
+28657
+28658
+28659
+28660
+28661
+28662
+28663
+28664
+28665
+28666
+28667
+28668
+28669
+28670
+28671
+28672
+28673
+28674
+28675
+28676
+28677
+28678
+28679
+28680
+28681
+28682
+28683
+28684
+28685
+28686
+28687
+28688
+28689
+28690
+28691
+28692
+28693
+28694
+28695
+28696
+28697
+28698
+28699
+28700
+28701
+28702
+28703
+28704
+28705
+28706
+28707
+28708
+28709
+28710
+28711
+28712
+28713
+28714
+28715
+28716
+28717
+28718
+28719
+28720
+28721
+28722
+28723
+28724
+28725
+28726
+28727
+28728
+28729
+28730
+28731
+28732
+28733
+28734
+28735
+28736
+28737
+28738
+28739
+28740
+28741
+28742
+28743
+28744
+28745
+28746
+28747
+28748
+28749
+28750
+28751
+28752
+28753
+28754
+28755
+28756
+28757
+28758
+28759
+28760
+28761
+28762
+28763
+28764
+28765
+28766
+28767
+28768
+28769
+28770
+28771
+28772
+28773
+28774
+28775
+28776
+28777
+28778
+28779
+28780
+28781
+28782
+28783
+28784
+28785
+28786
+28787
+28788
+28789
+28790
+28791
+28792
+28793
+28794
+28795
+28796
+28797
+28798
+28799
+28800
+28801
+28802
+28803
+28804
+28805
+28806
+28807
+28808
+28809
+28810
+28811
+28812
+28813
+28814
+28815
+28816
+28817
+28818
+28819
+28820
+28821
+28822
+28823
+28824
+28825
+28826
+28827
+28828
+28829
+28830
+28831
+28832
+28833
+28834
+28835
+28836
+28837
+28838
+28839
+28840
+28841
+28842
+28843
+28844
+28845
+28846
+28847
+28848
+28849
+28850
+28851
+28852
+28853
+28854
+28855
+28856
+28857
+28858
+28859
+28860
+28861
+28862
+28863
+28864
+28865
+28866
+28867
+28868
+28869
+28870
+28871
+28872
+28873
+28874
+28875
+28876
+28877
+28878
+28879
+28880
+28881
+28882
+28883
+28884
+28885
+28886
+28887
+28888
+28889
+28890
+28891
+28892
+28893
+28894
+28895
+28896
+28897
+28898
+28899
+28900
+28901
+28902
+28903
+28904
+28905
+28906
+28907
+28908
+28909
+28910
+28911
+28912
+28913
+28914
+28915
+28916
+28917
+28918
+28919
+28920
+28921
+28922
+28923
+28924
+28925
+28926
+28927
+28928
+28929
+28930
+28931
+28932
+28933
+28934
+28935
+28936
+28937
+28938
+28939
+28940
+28941
+28942
+28943
+28944
+28945
+28946
+28947
+28948
+28949
+28950
+28951
+28952
+28953
+28954
+28955
+28956
+28957
+28958
+28959
+28960
+28961
+28962
+28963
+28964
+28965
+28966
+28967
+28968
+28969
+28970
+28971
+28972
+28973
+28974
+28975
+28976
+28977
+28978
+28979
+28980
+28981
+28982
+28983
+28984
+28985
+28986
+28987
+28988
+28989
+28990
+28991
+28992
+28993
+28994
+28995
+28996
+28997
+28998
+28999
+29000
+29001
+29002
+29003
+29004
+29005
+29006
+29007
+29008
+29009
+29010
+29011
+29012
+29013
+29014
+29015
+29016
+29017
+29018
+29019
+29020
+29021
+29022
+29023
+29024
+29025
+29026
+29027
+29028
+29029
+29030
+29031
+29032
+29033
+29034
+29035
+29036
+29037
+29038
+29039
+29040
+29041
+29042
+29043
+29044
+29045
+29046
+29047
+29048
+29049
+29050
+29051
+29052
+29053
+29054
+29055
+29056
+29057
+29058
+29059
+29060
+29061
+29062
+29063
+29064
+29065
+29066
+29067
+29068
+29069
+29070
+29071
+29072
+29073
+29074
+29075
+29076
+29077
+29078
+29079
+29080
+29081
+29082
+29083
+29084
+29085
+29086
+29087
+29088
+29089
+29090
+29091
+29092
+29093
+29094
+29095
+29096
+29097
+29098
+29099
+29100
+29101
+29102
+29103
+29104
+29105
+29106
+29107
+29108
+29109
+29110
+29111
+29112
+29113
+29114
+29115
+29116
+29117
+29118
+29119
+29120
+29121
+29122
+29123
+29124
+29125
+29126
+29127
+29128
+29129
+29130
+29131
+29132
+29133
+29134
+29135
+29136
+29137
+29138
+29139
+29140
+29141
+29142
+29143
+29144
+29145
+29146
+29147
+29148
+29149
+29150
+29151
+29152
+29153
+29154
+29155
+29156
+29157
+29158
+29159
+29160
+29161
+29162
+29163
+29164
+29165
+29166
+29167
+29168
+29169
+29170
+29171
+29172
+29173
+29174
+29175
+29176
+29177
+29178
+29179
+29180
+29181
+29182
+29183
+29184
+29185
+29186
+29187
+29188
+29189
+29190
+29191
+29192
+29193
+29194
+29195
+29196
+29197
+29198
+29199
+29200
+29201
+29202
+29203
+29204
+29205
+29206
+29207
+29208
+29209
+29210
+29211
+29212
+29213
+29214
+29215
+29216
+29217
+29218
+29219
+29220
+29221
+29222
+29223
+29224
+29225
+29226
+29227
+29228
+29229
+29230
+29231
+29232
+29233
+29234
+29235
+29236
+29237
+29238
+29239
+29240
+29241
+29242
+29243
+29244
+29245
+29246
+29247
+29248
+29249
+29250
+29251
+29252
+29253
+29254
+29255
+29256
+29257
+29258
+29259
+29260
+29261
+29262
+29263
+29264
+29265
+29266
+29267
+29268
+29269
+29270
+29271
+29272
+29273
+29274
+29275
+29276
+29277
+29278
+29279
+29280
+29281
+29282
+29283
+29284
+29285
+29286
+29287
+29288
+29289
+29290
+29291
+29292
+29293
+29294
+29295
+29296
+29297
+29298
+29299
+29300
+29301
+29302
+29303
+29304
+29305
+29306
+29307
+29308
+29309
+29310
+29311
+29312
+29313
+29314
+29315
+29316
+29317
+29318
+29319
+29320
+29321
+29322
+29323
+29324
+29325
+29326
+29327
+29328
+29329
+29330
+29331
+29332
+29333
+29334
+29335
+29336
+29337
+29338
+29339
+29340
+29341
+29342
+29343
+29344
+29345
+29346
+29347
+29348
+29349
+29350
+29351
+29352
+29353
+29354
+29355
+29356
+29357
+29358
+29359
+29360
+29361
+29362
+29363
+29364
+29365
+29366
+29367
+29368
+29369
+29370
+29371
+29372
+29373
+29374
+29375
+29376
+29377
+29378
+29379
+29380
+29381
+29382
+29383
+29384
+29385
+29386
+29387
+29388
+29389
+29390
+29391
+29392
+29393
+29394
+29395
+29396
+29397
+29398
+29399
+29400
+29401
+29402
+29403
+29404
+29405
+29406
+29407
+29408
+29409
+29410
+29411
+29412
+29413
+29414
+29415
+29416
+29417
+29418
+29419
+29420
+29421
+29422
+29423
+29424
+29425
+29426
+29427
+29428
+29429
+29430
+29431
+29432
+29433
+29434
+29435
+29436
+29437
+29438
+29439
+29440
+29441
+29442
+29443
+29444
+29445
+29446
+29447
+29448
+29449
+29450
+29451
+29452
+29453
+29454
+29455
+29456
+29457
+29458
+29459
+29460
+29461
+29462
+29463
+29464
+29465
+29466
+29467
+29468
+29469
+29470
+29471
+29472
+29473
+29474
+29475
+29476
+29477
+29478
+29479
+29480
+29481
+29482
+29483
+29484
+29485
+29486
+29487
+29488
+29489
+29490
+29491
+29492
+29493
+29494
+29495
+29496
+29497
+29498
+29499
+29500
+29501
+29502
+29503
+29504
+29505
+29506
+29507
+29508
+29509
+29510
+29511
+29512
+29513
+29514
+29515
+29516
+29517
+29518
+29519
+29520
+29521
+29522
+29523
+29524
+29525
+29526
+29527
+29528
+29529
+29530
+29531
+29532
+29533
+29534
+29535
+29536
+29537
+29538
+29539
+29540
+29541
+29542
+29543
+29544
+29545
+29546
+29547
+29548
+29549
+29550
+29551
+29552
+29553
+29554
+29555
+29556
+29557
+29558
+29559
+29560
+29561
+29562
+29563
+29564
+29565
+29566
+29567
+29568
+29569
+29570
+29571
+29572
+29573
+29574
+29575
+29576
+29577
+29578
+29579
+29580
+29581
+29582
+29583
+29584
+29585
+29586
+29587
+29588
+29589
+29590
+29591
+29592
+29593
+29594
+29595
+29596
+29597
+29598
+29599
+29600
+29601
+29602
+29603
+29604
+29605
+29606
+29607
+29608
+29609
+29610
+29611
+29612
+29613
+29614
+29615
+29616
+29617
+29618
+29619
+29620
+29621
+29622
+29623
+29624
+29625
+29626
+29627
+29628
+29629
+29630
+29631
+29632
+29633
+29634
+29635
+29636
+29637
+29638
+29639
+29640
+29641
+29642
+29643
+29644
+29645
+29646
+29647
+29648
+29649
+29650
+29651
+29652
+29653
+29654
+29655
+29656
+29657
+29658
+29659
+29660
+29661
+29662
+29663
+29664
+29665
+29666
+29667
+29668
+29669
+29670
+29671
+29672
+29673
+29674
+29675
+29676
+29677
+29678
+29679
+29680
+29681
+29682
+29683
+29684
+29685
+29686
+29687
+29688
+29689
+29690
+29691
+29692
+29693
+29694
+29695
+29696
+29697
+29698
+29699
+29700
+29701
+29702
+29703
+29704
+29705
+29706
+29707
+29708
+29709
+29710
+29711
+29712
+29713
+29714
+29715
+29716
+29717
+29718
+29719
+29720
+29721
+29722
+29723
+29724
+29725
+29726
+29727
+29728
+29729
+29730
+29731
+29732
+29733
+29734
+29735
+29736
+29737
+29738
+29739
+29740
+29741
+29742
+29743
+29744
+29745
+29746
+29747
+29748
+29749
+29750
+29751
+29752
+29753
+29754
+29755
+29756
+29757
+29758
+29759
+29760
+29761
+29762
+29763
+29764
+29765
+29766
+29767
+29768
+29769
+29770
+29771
+29772
+29773
+29774
+29775
+29776
+29777
+29778
+29779
+29780
+29781
+29782
+29783
+29784
+29785
+29786
+29787
+29788
+29789
+29790
+29791
+29792
+29793
+29794
+29795
+29796
+29797
+29798
+29799
+29800
+29801
+29802
+29803
+29804
+29805
+29806
+29807
+29808
+29809
+29810
+29811
+29812
+29813
+29814
+29815
+29816
+29817
+29818
+29819
+29820
+29821
+29822
+29823
+29824
+29825
+29826
+29827
+29828
+29829
+29830
+29831
+29832
+29833
+29834
+29835
+29836
+29837
+29838
+29839
+29840
+29841
+29842
+29843
+29844
+29845
+29846
+29847
+29848
+29849
+29850
+29851
+29852
+29853
+29854
+29855
+29856
+29857
+29858
+29859
+29860
+29861
+29862
+29863
+29864
+29865
+29866
+29867
+29868
+29869
+29870
+29871
+29872
+29873
+29874
+29875
+29876
+29877
+29878
+29879
+29880
+29881
+29882
+29883
+29884
+29885
+29886
+29887
+29888
+29889
+29890
+29891
+29892
+29893
+29894
+29895
+29896
+29897
+29898
+29899
+29900
+29901
+29902
+29903
+29904
+29905
+29906
+29907
+29908
+29909
+29910
+29911
+29912
+29913
+29914
+29915
+29916
+29917
+29918
+29919
+29920
+29921
+29922
+29923
+29924
+29925
+29926
+29927
+29928
+29929
+29930
+29931
+29932
+29933
+29934
+29935
+29936
+29937
+29938
+29939
+29940
+29941
+29942
+29943
+29944
+29945
+29946
+29947
+29948
+29949
+29950
+29951
+29952
+29953
+29954
+29955
+29956
+29957
+29958
+29959
+29960
+29961
+29962
+29963
+29964
+29965
+29966
+29967
+29968
+29969
+29970
+29971
+29972
+29973
+29974
+29975
+29976
+29977
+29978
+29979
+29980
+29981
+29982
+29983
+29984
+29985
+29986
+29987
+29988
+29989
+29990
+29991
+29992
+29993
+29994
+29995
+29996
+29997
+29998
+29999
+30000
+30001
+30002
+30003
+30004
+30005
+30006
+30007
+30008
+30009
+30010
+30011
+30012
+30013
+30014
+30015
+30016
+30017
+30018
+30019
+30020
+30021
+30022
+30023
+30024
+30025
+30026
+30027
+30028
+30029
+30030
+30031
+30032
+30033
+30034
+30035
+30036
+30037
+30038
+30039
+30040
+30041
+30042
+30043
+30044
+30045
+30046
+30047
+30048
+30049
+30050
+30051
+30052
+30053
+30054
+30055
+30056
+30057
+30058
+30059
+30060
+30061
+30062
+30063
+30064
+30065
+30066
+30067
+30068
+30069
+30070
+30071
+30072
+30073
+30074
+30075
+30076
+30077
+30078
+30079
+30080
+30081
+30082
+30083
+30084
+30085
+30086
+30087
+30088
+30089
+30090
+30091
+30092
+30093
+30094
+30095
+30096
+30097
+30098
+30099
+30100
+30101
+30102
+30103
+30104
+30105
+30106
+30107
+30108
+30109
+30110
+30111
+30112
+30113
+30114
+30115
+30116
+30117
+30118
+30119
+30120
+30121
+30122
+30123
+30124
+30125
+30126
+30127
+30128
+30129
+30130
+30131
+30132
+30133
+30134
+30135
+30136
+30137
+30138
+30139
+30140
+30141
+30142
+30143
+30144
+30145
+30146
+30147
+30148
+30149
+30150
+30151
+30152
+30153
+30154
+30155
+30156
+30157
+30158
+30159
+30160
+30161
+30162
+30163
+30164
+30165
+30166
+30167
+30168
+30169
+30170
+30171
+30172
+30173
+30174
+30175
+30176
+30177
+30178
+30179
+30180
+30181
+30182
+30183
+30184
+30185
+30186
+30187
+30188
+30189
+30190
+30191
+30192
+30193
+30194
+30195
+30196
+30197
+30198
+30199
+30200
+30201
+30202
+30203
+30204
+30205
+30206
+30207
+30208
+30209
+30210
+30211
+30212
+30213
+30214
+30215
+30216
+30217
+30218
+30219
+30220
+30221
+30222
+30223
+30224
+30225
+30226
+30227
+30228
+30229
+30230
+30231
+30232
+30233
+30234
+30235
+30236
+30237
+30238
+30239
+30240
+30241
+30242
+30243
+30244
+30245
+30246
+30247
+30248
+30249
+30250
+30251
+30252
+30253
+30254
+30255
+30256
+30257
+30258
+30259
+30260
+30261
+30262
+30263
+30264
+30265
+30266
+30267
+30268
+30269
+30270
+30271
+30272
+30273
+30274
+30275
+30276
+30277
+30278
+30279
+30280
+30281
+30282
+30283
+30284
+30285
+30286
+30287
+30288
+30289
+30290
+30291
+30292
+30293
+30294
+30295
+30296
+30297
+30298
+30299
+30300
+30301
+30302
+30303
+30304
+30305
+30306
+30307
+30308
+30309
+30310
+30311
+30312
+30313
+30314
+30315
+30316
+30317
+30318
+30319
+30320
+30321
+30322
+30323
+30324
+30325
+30326
+30327
+30328
+30329
+30330
+30331
+30332
+30333
+30334
+30335
+30336
+30337
+30338
+30339
+30340
+30341
+30342
+30343
+30344
+30345
+30346
+30347
+30348
+30349
+30350
+30351
+30352
+30353
+30354
+30355
+30356
+30357
+30358
+30359
+30360
+30361
+30362
+30363
+30364
+30365
+30366
+30367
+30368
+30369
+30370
+30371
+30372
+30373
+30374
+30375
+30376
+30377
+30378
+30379
+30380
+30381
+30382
+30383
+30384
+30385
+30386
+30387
+30388
+30389
+30390
+30391
+30392
+30393
+30394
+30395
+30396
+30397
+30398
+30399
+30400
+30401
+30402
+30403
+30404
+30405
+30406
+30407
+30408
+30409
+30410
+30411
+30412
+30413
+30414
+30415
+30416
+30417
+30418
+30419
+30420
+30421
+30422
+30423
+30424
+30425
+30426
+30427
+30428
+30429
+30430
+30431
+30432
+30433
+30434
+30435
+30436
+30437
+30438
+30439
+30440
+30441
+30442
+30443
+30444
+30445
+30446
+30447
+30448
+30449
+30450
+30451
+30452
+30453
+30454
+30455
+30456
+30457
+30458
+30459
+30460
+30461
+30462
+30463
+30464
+30465
+30466
+30467
+30468
+30469
+30470
+30471
+30472
+30473
+30474
+30475
+30476
+30477
+30478
+30479
+30480
+30481
+30482
+30483
+30484
+30485
+30486
+30487
+30488
+30489
+30490
+30491
+30492
+30493
+30494
+30495
+30496
+30497
+30498
+30499
+30500
+30501
+30502
+30503
+30504
+30505
+30506
+30507
+30508
+30509
+30510
+30511
+30512
+30513
+30514
+30515
+30516
+30517
+30518
+30519
+30520
+30521
+30522
+30523
+30524
+30525
+30526
+30527
+30528
+30529
+30530
+30531
+30532
+30533
+30534
+30535
+30536
+30537
+30538
+30539
+30540
+30541
+30542
+30543
+30544
+30545
+30546
+30547
+30548
+30549
+30550
+30551
+30552
+30553
+30554
+30555
+30556
+30557
+30558
+30559
+30560
+30561
+30562
+30563
+30564
+30565
+30566
+30567
+30568
+30569
+30570
+30571
+30572
+30573
+30574
+30575
+30576
+30577
+30578
+30579
+30580
+30581
+30582
+30583
+30584
+30585
+30586
+30587
+30588
+30589
+30590
+30591
+30592
+30593
+30594
+30595
+30596
+30597
+30598
+30599
+30600
+30601
+30602
+30603
+30604
+30605
+30606
+30607
+30608
+30609
+30610
+30611
+30612
+30613
+30614
+30615
+30616
+30617
+30618
+30619
+30620
+30621
+30622
+30623
+30624
+30625
+30626
+30627
+30628
+30629
+30630
+30631
+30632
+30633
+30634
+30635
+30636
+30637
+30638
+30639
+30640
+30641
+30642
+30643
+30644
+30645
+30646
+30647
+30648
+30649
+30650
+30651
+30652
+30653
+30654
+30655
+30656
+30657
+30658
+30659
+30660
+30661
+30662
+30663
+30664
+30665
+30666
+30667
+30668
+30669
+30670
+30671
+30672
+30673
+30674
+30675
+30676
+30677
+30678
+30679
+30680
+30681
+30682
+30683
+30684
+30685
+30686
+30687
+30688
+30689
+30690
+30691
+30692
+30693
+30694
+30695
+30696
+30697
+30698
+30699
+30700
+30701
+30702
+30703
+30704
+30705
+30706
+30707
+30708
+30709
+30710
+30711
+30712
+30713
+30714
+30715
+30716
+30717
+30718
+30719
+30720
+30721
+30722
+30723
+30724
+30725
+30726
+30727
+30728
+30729
+30730
+30731
+30732
+30733
+30734
+30735
+30736
+30737
+30738
+30739
+30740
+30741
+30742
+30743
+30744
+30745
+30746
+30747
+30748
+30749
+30750
+30751
+30752
+30753
+30754
+30755
+30756
+30757
+30758
+30759
+30760
+30761
+30762
+30763
+30764
+30765
+30766
+30767
+30768
+30769
+30770
+30771
+30772
+30773
+30774
+30775
+30776
+30777
+30778
+30779
+30780
+30781
+30782
+30783
+30784
+30785
+30786
+30787
+30788
+30789
+30790
+30791
+30792
+30793
+30794
+30795
+30796
+30797
+30798
+30799
+30800
+30801
+30802
+30803
+30804
+30805
+30806
+30807
+30808
+30809
+30810
+30811
+30812
+30813
+30814
+30815
+30816
+30817
+30818
+30819
+30820
+30821
+30822
+30823
+30824
+30825
+30826
+30827
+30828
+30829
+30830
+30831
+30832
+30833
+30834
+30835
+30836
+30837
+30838
+30839
+30840
+30841
+30842
+30843
+30844
+30845
+30846
+30847
+30848
+30849
+30850
+30851
+30852
+30853
+30854
+30855
+30856
+30857
+30858
+30859
+30860
+30861
+30862
+30863
+30864
+30865
+30866
+30867
+30868
+30869
+30870
+30871
+30872
+30873
+30874
+30875
+30876
+30877
+30878
+30879
+30880
+30881
+30882
+30883
+30884
+30885
+30886
+30887
+30888
+30889
+30890
+30891
+30892
+30893
+30894
+30895
+30896
+30897
+30898
+30899
+30900
+30901
+30902
+30903
+30904
+30905
+30906
+30907
+30908
+30909
+30910
+30911
+30912
+30913
+30914
+30915
+30916
+30917
+30918
+30919
+30920
+30921
+30922
+30923
+30924
+30925
+30926
+30927
+30928
+30929
+30930
+30931
+30932
+30933
+30934
+30935
+30936
+30937
+30938
+30939
+30940
+30941
+30942
+30943
+30944
+30945
+30946
+30947
+30948
+30949
+30950
+30951
+30952
+30953
+30954
+30955
+30956
+30957
+30958
+30959
+30960
+30961
+30962
+30963
+30964
+30965
+30966
+30967
+30968
+30969
+30970
+30971
+30972
+30973
+30974
+30975
+30976
+30977
+30978
+30979
+30980
+30981
+30982
+30983
+30984
+30985
+30986
+30987
+30988
+30989
+30990
+30991
+30992
+30993
+30994
+30995
+30996
+30997
+30998
+30999
+31000
+31001
+31002
+31003
+31004
+31005
+31006
+31007
+31008
+31009
+31010
+31011
+31012
+31013
+31014
+31015
+31016
+31017
+31018
+31019
+31020
+31021
+31022
+31023
+31024
+31025
+31026
+31027
+31028
+31029
+31030
+31031
+31032
+31033
+31034
+31035
+31036
+31037
+31038
+31039
+31040
+31041
+31042
+31043
+31044
+31045
+31046
+31047
+31048
+31049
+31050
+31051
+31052
+31053
+31054
+31055
+31056
+31057
+31058
+31059
+31060
+31061
+31062
+31063
+31064
+31065
+31066
+31067
+31068
+31069
+31070
+31071
+31072
+31073
+31074
+31075
+31076
+31077
+31078
+31079
+31080
+31081
+31082
+31083
+31084
+31085
+31086
+31087
+31088
+31089
+31090
+31091
+31092
+31093
+31094
+31095
+31096
+31097
+31098
+31099
+31100
+31101
+31102
+31103
+31104
+31105
+31106
+31107
+31108
+31109
+31110
+31111
+31112
+31113
+31114
+31115
+31116
+31117
+31118
+31119
+31120
+31121
+31122
+31123
+31124
+31125
+31126
+31127
+31128
+31129
+31130
+31131
+31132
+31133
+31134
+31135
+31136
+31137
+31138
+31139
+31140
+31141
+31142
+31143
+31144
+31145
+31146
+31147
+31148
+31149
+31150
+31151
+31152
+31153
+31154
+31155
+31156
+31157
+31158
+31159
+31160
+31161
+31162
+31163
+31164
+31165
+31166
+31167
+31168
+31169
+31170
+31171
+31172
+31173
+31174
+31175
+31176
+31177
+31178
+31179
+31180
+31181
+31182
+31183
+31184
+31185
+31186
+31187
+31188
+31189
+31190
+31191
+31192
+31193
+31194
+31195
+31196
+31197
+31198
+31199
+31200
+31201
+31202
+31203
+31204
+31205
+31206
+31207
+31208
+31209
+31210
+31211
+31212
+31213
+31214
+31215
+31216
+31217
+31218
+31219
+31220
+31221
+31222
+31223
+31224
+31225
+31226
+31227
+31228
+31229
+31230
+31231
+31232
+31233
+31234
+31235
+31236
+31237
+31238
+31239
+31240
+31241
+31242
+31243
+31244
+31245
+31246
+31247
+31248
+31249
+31250
+31251
+31252
+31253
+31254
+31255
+31256
+31257
+31258
+31259
+31260
+31261
+31262
+31263
+31264
+31265
+31266
+31267
+31268
+31269
+31270
+31271
+31272
+31273
+31274
+31275
+31276
+31277
+31278
+31279
+31280
+31281
+31282
+31283
+31284
+31285
+31286
+31287
+31288
+31289
+31290
+31291
+31292
+31293
+31294
+31295
+31296
+31297
+31298
+31299
+31300
+31301
+31302
+31303
+31304
+31305
+31306
+31307
+31308
+31309
+31310
+31311
+31312
+31313
+31314
+31315
+31316
+31317
+31318
+31319
+31320
+31321
+31322
+31323
+31324
+31325
+31326
+31327
+31328
+31329
+31330
+31331
+31332
+31333
+31334
+31335
+31336
+31337
+31338
+31339
+31340
+31341
+31342
+31343
+31344
+31345
+31346
+31347
+31348
+31349
+31350
+31351
+31352
+31353
+31354
+31355
+31356
+31357
+31358
+31359
+31360
+31361
+31362
+31363
+31364
+31365
+31366
+31367
+31368
+31369
+31370
+31371
+31372
+31373
+31374
+31375
+31376
+31377
+31378
+31379
+31380
+31381
+31382
+31383
+31384
+31385
+31386
+31387
+31388
+31389
+31390
+31391
+31392
+31393
+31394
+31395
+31396
+31397
+31398
+31399
+31400
+31401
+31402
+31403
+31404
+31405
+31406
+31407
+31408
+31409
+31410
+31411
+31412
+31413
+31414
+31415
+31416
+31417
+31418
+31419
+31420
+31421
+31422
+31423
+31424
+31425
+31426
+31427
+31428
+31429
+31430
+31431
+31432
+31433
+31434
+31435
+31436
+31437
+31438
+31439
+31440
+31441
+31442
+31443
+31444
+31445
+31446
+31447
+31448
+31449
+31450
+31451
+31452
+31453
+31454
+31455
+31456
+31457
+31458
+31459
+31460
+31461
+31462
+31463
+31464
+31465
+31466
+31467
+31468
+31469
+31470
+31471
+31472
+31473
+31474
+31475
+31476
+31477
+31478
+31479
+31480
+31481
+31482
+31483
+31484
+31485
+31486
+31487
+31488
+31489
+31490
+31491
+31492
+31493
+31494
+31495
+31496
+31497
+31498
+31499
+31500
+31501
+31502
+31503
+31504
+31505
+31506
+31507
+31508
+31509
+31510
+31511
+31512
+31513
+31514
+31515
+31516
+31517
+31518
+31519
+31520
+31521
+31522
+31523
+31524
+31525
+31526
+31527
+31528
+31529
+31530
+31531
+31532
+31533
+31534
+31535
+31536
+31537
+31538
+31539
+31540
+31541
+31542
+31543
+31544
+31545
+31546
+31547
+31548
+31549
+31550
+31551
+31552
+31553
+31554
+31555
+31556
+31557
+31558
+31559
+31560
+31561
+31562
+31563
+31564
+31565
+31566
+31567
+31568
+31569
+31570
+31571
+31572
+31573
+31574
+31575
+31576
+31577
+31578
+31579
+31580
+31581
+31582
+31583
+31584
+31585
+31586
+31587
+31588
+31589
+31590
+31591
+31592
+31593
+31594
+31595
+31596
+31597
+31598
+31599
+31600
+31601
+31602
+31603
+31604
+31605
+31606
+31607
+31608
+31609
+31610
+31611
+31612
+31613
+31614
+31615
+31616
+31617
+31618
+31619
+31620
+31621
+31622
+31623
+31624
+31625
+31626
+31627
+31628
+31629
+31630
+31631
+31632
+31633
+31634
+31635
+31636
+31637
+31638
+31639
+31640
+31641
+31642
+31643
+31644
+31645
+31646
+31647
+31648
+31649
+31650
+31651
+31652
+31653
+31654
+31655
+31656
+31657
+31658
+31659
+31660
+31661
+31662
+31663
+31664
+31665
+31666
+31667
+31668
+31669
+31670
+31671
+31672
+31673
+31674
+31675
+31676
+31677
+31678
+31679
+31680
+31681
+31682
+31683
+31684
+31685
+31686
+31687
+31688
+31689
+31690
+31691
+31692
+31693
+31694
+31695
+31696
+31697
+31698
+31699
+31700
+31701
+31702
+31703
+31704
+31705
+31706
+31707
+31708
+31709
+31710
+31711
+31712
+31713
+31714
+31715
+31716
+31717
+31718
+31719
+31720
+31721
+31722
+31723
+31724
+31725
+31726
+31727
+31728
+31729
+31730
+31731
+31732
+31733
+31734
+31735
+31736
+31737
+31738
+31739
+31740
+31741
+31742
+31743
+31744
+31745
+31746
+31747
+31748
+31749
+31750
+31751
+31752
+31753
+31754
+31755
+31756
+31757
+31758
+31759
+31760
+31761
+31762
+31763
+31764
+31765
+31766
+31767
+31768
+31769
+31770
+31771
+31772
+31773
+31774
+31775
+31776
+31777
+31778
+31779
+31780
+31781
+31782
+31783
+31784
+31785
+31786
+31787
+31788
+31789
+31790
+31791
+31792
+31793
+31794
+31795
+31796
+31797
+31798
+31799
+31800
+31801
+31802
+31803
+31804
+31805
+31806
+31807
+31808
+31809
+31810
+31811
+31812
+31813
+31814
+31815
+31816
+31817
+31818
+31819
+31820
+31821
+31822
+31823
+31824
+31825
+31826
+31827
+31828
+31829
+31830
+31831
+31832
+31833
+31834
+31835
+31836
+31837
+31838
+31839
+31840
+31841
+31842
+31843
+31844
+31845
+31846
+31847
+31848
+31849
+31850
+31851
+31852
+31853
+31854
+31855
+31856
+31857
+31858
+31859
+31860
+31861
+31862
+31863
+31864
+31865
+31866
+31867
+31868
+31869
+31870
+31871
+31872
+31873
+31874
+31875
+31876
+31877
+31878
+31879
+31880
+31881
+31882
+31883
+31884
+31885
+31886
+31887
+31888
+31889
+31890
+31891
+31892
+31893
+31894
+31895
+31896
+31897
+31898
+31899
+31900
+31901
+31902
+31903
+31904
+31905
+31906
+31907
+31908
+31909
+31910
+31911
+31912
+31913
+31914
+31915
+31916
+31917
+31918
+31919
+31920
+31921
+31922
+31923
+31924
+31925
+31926
+31927
+31928
+31929
+31930
+31931
+31932
+31933
+31934
+31935
+31936
+31937
+31938
+31939
+31940
+31941
+31942
+31943
+31944
+31945
+31946
+31947
+31948
+31949
+31950
+31951
+31952
+31953
+31954
+31955
+31956
+31957
+31958
+31959
+31960
+31961
+31962
+31963
+31964
+31965
+31966
+31967
+31968
+31969
+31970
+31971
+31972
+31973
+31974
+31975
+31976
+31977
+31978
+31979
+31980
+31981
+31982
+31983
+31984
+31985
+31986
+31987
+31988
+31989
+31990
+31991
+31992
+31993
+31994
+31995
+31996
+31997
+31998
+31999
+32000
+32001
+32002
+32003
+32004
+32005
+32006
+32007
+32008
+32009
+32010
+32011
+32012
+32013
+32014
+32015
+32016
+32017
+32018
+32019
+32020
+32021
+32022
+32023
+32024
+32025
+32026
+32027
+32028
+32029
+32030
+32031
+32032
+32033
+32034
+32035
+32036
+32037
+32038
+32039
+32040
+32041
+32042
+32043
+32044
+32045
+32046
+32047
+32048
+32049
+32050
+32051
+32052
+32053
+32054
+32055
+32056
+32057
+32058
+32059
+32060
+32061
+32062
+32063
+32064
+32065
+32066
+32067
+32068
+32069
+32070
+32071
+32072
+32073
+32074
+32075
+32076
+32077
+32078
+32079
+32080
+32081
+32082
+32083
+32084
+32085
+32086
+32087
+32088
+32089
+32090
+32091
+32092
+32093
+32094
+32095
+32096
+32097
+32098
+32099
+32100
+32101
+32102
+32103
+32104
+32105
+32106
+32107
+32108
+32109
+32110
+32111
+32112
+32113
+32114
+32115
+32116
+32117
+32118
+32119
+32120
+32121
+32122
+32123
+32124
+32125
+32126
+32127
+32128
+32129
+32130
+32131
+32132
+32133
+32134
+32135
+32136
+32137
+32138
+32139
+32140
+32141
+32142
+32143
+32144
+32145
+32146
+32147
+32148
+32149
+32150
+32151
+32152
+32153
+32154
+32155
+32156
+32157
+32158
+32159
+32160
+32161
+32162
+32163
+32164
+32165
+32166
+32167
+32168
+32169
+32170
+32171
+32172
+32173
+32174
+32175
+32176
+32177
+32178
+32179
+32180
+32181
+32182
+32183
+32184
+32185
+32186
+32187
+32188
+32189
+32190
+32191
+32192
+32193
+32194
+32195
+32196
+32197
+32198
+32199
+32200
+32201
+32202
+32203
+32204
+32205
+32206
+32207
+32208
+32209
+32210
+32211
+32212
+32213
+32214
+32215
+32216
+32217
+32218
+32219
+32220
+32221
+32222
+32223
+32224
+32225
+32226
+32227
+32228
+32229
+32230
+32231
+32232
+32233
+32234
+32235
+32236
+32237
+32238
+32239
+32240
+32241
+32242
+32243
+32244
+32245
+32246
+32247
+32248
+32249
+32250
+32251
+32252
+32253
+32254
+32255
+32256
+32257
+32258
+32259
+32260
+32261
+32262
+32263
+32264
+32265
+32266
+32267
+32268
+32269
+32270
+32271
+32272
+32273
+32274
+32275
+32276
+32277
+32278
+32279
+32280
+32281
+32282
+32283
+32284
+32285
+32286
+32287
+32288
+32289
+32290
+32291
+32292
+32293
+32294
+32295
+32296
+32297
+32298
+32299
+32300
+32301
+32302
+32303
+32304
+32305
+32306
+32307
+32308
+32309
+32310
+32311
+32312
+32313
+32314
+32315
+32316
+32317
+32318
+32319
+32320
+32321
+32322
+32323
+32324
+32325
+32326
+32327
+32328
+32329
+32330
+32331
+32332
+32333
+32334
+32335
+32336
+32337
+32338
+32339
+32340
+32341
+32342
+32343
+32344
+32345
+32346
+32347
+32348
+32349
+32350
+32351
+32352
+32353
+32354
+32355
+32356
+32357
+32358
+32359
+32360
+32361
+32362
+32363
+32364
+32365
+32366
+32367
+32368
+32369
+32370
+32371
+32372
+32373
+32374
+32375
+32376
+32377
+32378
+32379
+32380
+32381
+32382
+32383
+32384
+32385
+32386
+32387
+32388
+32389
+32390
+32391
+32392
+32393
+32394
+32395
+32396
+32397
+32398
+32399
+32400
+32401
+32402
+32403
+32404
+32405
+32406
+32407
+32408
+32409
+32410
+32411
+32412
+32413
+32414
+32415
+32416
+32417
+32418
+32419
+32420
+32421
+32422
+32423
+32424
+32425
+32426
+32427
+32428
+32429
+32430
+32431
+32432
+32433
+32434
+32435
+32436
+32437
+32438
+32439
+32440
+32441
+32442
+32443
+32444
+32445
+32446
+32447
+32448
+32449
+32450
+32451
+32452
+32453
+32454
+32455
+32456
+32457
+32458
+32459
+32460
+32461
+32462
+32463
+32464
+32465
+32466
+32467
+32468
+32469
+32470
+32471
+32472
+32473
+32474
+32475
+32476
+32477
+32478
+32479
+32480
+32481
+32482
+32483
+32484
+32485
+32486
+32487
+32488
+32489
+32490
+32491
+32492
+32493
+32494
+32495
+32496
+32497
+32498
+32499
+32500
+32501
+32502
+32503
+32504
+32505
+32506
+32507
+32508
+32509
+32510
+32511
+32512
+32513
+32514
+32515
+32516
+32517
+32518
+32519
+32520
+32521
+32522
+32523
+32524
+32525
+32526
+32527
+32528
+32529
+32530
+32531
+32532
+32533
+32534
+32535
+32536
+32537
+32538
+32539
+32540
+32541
+32542
+32543
+32544
+32545
+32546
+32547
+32548
+32549
+32550
+32551
+32552
+32553
+32554
+32555
+32556
+32557
+32558
+32559
+32560
+32561
+32562
+32563
+32564
+32565
+32566
+32567
+32568
+32569
+32570
+32571
+32572
+32573
+32574
+32575
+32576
+32577
+32578
+32579
+32580
+32581
+32582
+32583
+32584
+32585
+32586
+32587
+32588
+32589
+32590
+32591
+32592
+32593
+32594
+32595
+32596
+32597
+32598
+32599
+32600
+32601
+32602
+32603
+32604
+32605
+32606
+32607
+32608
+32609
+32610
+32611
+32612
+32613
+32614
+32615
+32616
+32617
+32618
+32619
+32620
+32621
+32622
+32623
+32624
+32625
+32626
+32627
+32628
+32629
+32630
+32631
+32632
+32633
+32634
+32635
+32636
+32637
+32638
+32639
+32640
+32641
+32642
+32643
+32644
+32645
+32646
+32647
+32648
+32649
+32650
+32651
+32652
+32653
+32654
+32655
+32656
+32657
+32658
+32659
+32660
+32661
+32662
+32663
+32664
+32665
+32666
+32667
+32668
+32669
+32670
+32671
+32672
+32673
+32674
+32675
+32676
+32677
+32678
+32679
+32680
+32681
+32682
+32683
+32684
+32685
+32686
+32687
+32688
+32689
+32690
+32691
+32692
+32693
+32694
+32695
+32696
+32697
+32698
+32699
+32700
+32701
+32702
+32703
+32704
+32705
+32706
+32707
+32708
+32709
+32710
+32711
+32712
+32713
+32714
+32715
+32716
+32717
+32718
+32719
+32720
+32721
+32722
+32723
+32724
+32725
+32726
+32727
+32728
+32729
+32730
+32731
+32732
+32733
+32734
+32735
+32736
+32737
+32738
+32739
+32740
+32741
+32742
+32743
+32744
+32745
+32746
+32747
+32748
+32749
+32750
+32751
+32752
+32753
+32754
+32755
+32756
+32757
+32758
+32759
+32760
+32761
+32762
+32763
+32764
+32765
+32766
+32767
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old
new file mode 100644
index 0000000000000000000000000000000000000000..e28610eeda927d09227498a77ec583d086216e02
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/polyMesh/sets/c0_old
@@ -0,0 +1,32789 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class topoSet;
+ object c0_old;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+32768
+(
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522
+523
+524
+525
+526
+527
+528
+529
+530
+531
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+543
+544
+545
+546
+547
+548
+549
+550
+551
+552
+553
+554
+555
+556
+557
+558
+559
+560
+561
+562
+563
+564
+565
+566
+567
+568
+569
+570
+571
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582
+583
+584
+585
+586
+587
+588
+589
+590
+591
+592
+593
+594
+595
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+607
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+620
+621
+622
+623
+624
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639
+640
+641
+642
+643
+644
+645
+646
+647
+648
+649
+650
+651
+652
+653
+654
+655
+656
+657
+658
+659
+660
+661
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688
+689
+690
+691
+692
+693
+694
+695
+696
+697
+698
+699
+700
+701
+702
+703
+704
+705
+706
+707
+708
+709
+710
+711
+712
+713
+714
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740
+741
+742
+743
+744
+745
+746
+747
+748
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+760
+761
+762
+763
+764
+765
+766
+767
+768
+769
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+793
+794
+795
+796
+797
+798
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+820
+821
+822
+823
+824
+825
+826
+827
+828
+829
+830
+831
+832
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846
+847
+848
+849
+850
+851
+852
+853
+854
+855
+856
+857
+858
+859
+860
+861
+862
+863
+864
+865
+866
+867
+868
+869
+870
+871
+872
+873
+874
+875
+876
+877
+878
+879
+880
+881
+882
+883
+884
+885
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+931
+932
+933
+934
+935
+936
+937
+938
+939
+940
+941
+942
+943
+944
+945
+946
+947
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982
+983
+984
+985
+986
+987
+988
+989
+990
+991
+992
+993
+994
+995
+996
+997
+998
+999
+1000
+1001
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013
+1014
+1015
+1016
+1017
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026
+1027
+1028
+1029
+1030
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047
+1048
+1049
+1050
+1051
+1052
+1053
+1054
+1055
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066
+1067
+1068
+1069
+1070
+1071
+1072
+1073
+1074
+1075
+1076
+1077
+1078
+1079
+1080
+1081
+1082
+1083
+1084
+1085
+1086
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096
+1097
+1098
+1099
+1100
+1101
+1102
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113
+1114
+1115
+1116
+1117
+1118
+1119
+1120
+1121
+1122
+1123
+1124
+1125
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134
+1135
+1136
+1137
+1138
+1139
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149
+1150
+1151
+1152
+1153
+1154
+1155
+1156
+1157
+1158
+1159
+1160
+1161
+1162
+1163
+1164
+1165
+1166
+1167
+1168
+1169
+1170
+1171
+1172
+1173
+1174
+1175
+1176
+1177
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1200
+1201
+1202
+1203
+1204
+1205
+1206
+1207
+1208
+1209
+1210
+1211
+1212
+1213
+1214
+1215
+1216
+1217
+1218
+1219
+1220
+1221
+1222
+1223
+1224
+1225
+1226
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294
+1295
+1296
+1297
+1298
+1299
+1300
+1301
+1302
+1303
+1304
+1305
+1306
+1307
+1308
+1309
+1310
+1311
+1312
+1313
+1314
+1315
+1316
+1317
+1318
+1319
+1320
+1321
+1322
+1323
+1324
+1325
+1326
+1327
+1328
+1329
+1330
+1331
+1332
+1333
+1334
+1335
+1336
+1337
+1338
+1339
+1340
+1341
+1342
+1343
+1344
+1345
+1346
+1347
+1348
+1349
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357
+1358
+1359
+1360
+1361
+1362
+1363
+1364
+1365
+1366
+1367
+1368
+1369
+1370
+1371
+1372
+1373
+1374
+1375
+1376
+1377
+1378
+1379
+1380
+1381
+1382
+1383
+1384
+1385
+1386
+1387
+1388
+1389
+1390
+1391
+1392
+1393
+1394
+1395
+1396
+1397
+1398
+1399
+1400
+1401
+1402
+1403
+1404
+1405
+1406
+1407
+1408
+1409
+1410
+1411
+1412
+1413
+1414
+1415
+1416
+1417
+1418
+1419
+1420
+1421
+1422
+1423
+1424
+1425
+1426
+1427
+1428
+1429
+1430
+1431
+1432
+1433
+1434
+1435
+1436
+1437
+1438
+1439
+1440
+1441
+1442
+1443
+1444
+1445
+1446
+1447
+1448
+1449
+1450
+1451
+1452
+1453
+1454
+1455
+1456
+1457
+1458
+1459
+1460
+1461
+1462
+1463
+1464
+1465
+1466
+1467
+1468
+1469
+1470
+1471
+1472
+1473
+1474
+1475
+1476
+1477
+1478
+1479
+1480
+1481
+1482
+1483
+1484
+1485
+1486
+1487
+1488
+1489
+1490
+1491
+1492
+1493
+1494
+1495
+1496
+1497
+1498
+1499
+1500
+1501
+1502
+1503
+1504
+1505
+1506
+1507
+1508
+1509
+1510
+1511
+1512
+1513
+1514
+1515
+1516
+1517
+1518
+1519
+1520
+1521
+1522
+1523
+1524
+1525
+1526
+1527
+1528
+1529
+1530
+1531
+1532
+1533
+1534
+1535
+1536
+1537
+1538
+1539
+1540
+1541
+1542
+1543
+1544
+1545
+1546
+1547
+1548
+1549
+1550
+1551
+1552
+1553
+1554
+1555
+1556
+1557
+1558
+1559
+1560
+1561
+1562
+1563
+1564
+1565
+1566
+1567
+1568
+1569
+1570
+1571
+1572
+1573
+1574
+1575
+1576
+1577
+1578
+1579
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+1600
+1601
+1602
+1603
+1604
+1605
+1606
+1607
+1608
+1609
+1610
+1611
+1612
+1613
+1614
+1615
+1616
+1617
+1618
+1619
+1620
+1621
+1622
+1623
+1624
+1625
+1626
+1627
+1628
+1629
+1630
+1631
+1632
+1633
+1634
+1635
+1636
+1637
+1638
+1639
+1640
+1641
+1642
+1643
+1644
+1645
+1646
+1647
+1648
+1649
+1650
+1651
+1652
+1653
+1654
+1655
+1656
+1657
+1658
+1659
+1660
+1661
+1662
+1663
+1664
+1665
+1666
+1667
+1668
+1669
+1670
+1671
+1672
+1673
+1674
+1675
+1676
+1677
+1678
+1679
+1680
+1681
+1682
+1683
+1684
+1685
+1686
+1687
+1688
+1689
+1690
+1691
+1692
+1693
+1694
+1695
+1696
+1697
+1698
+1699
+1700
+1701
+1702
+1703
+1704
+1705
+1706
+1707
+1708
+1709
+1710
+1711
+1712
+1713
+1714
+1715
+1716
+1717
+1718
+1719
+1720
+1721
+1722
+1723
+1724
+1725
+1726
+1727
+1728
+1729
+1730
+1731
+1732
+1733
+1734
+1735
+1736
+1737
+1738
+1739
+1740
+1741
+1742
+1743
+1744
+1745
+1746
+1747
+1748
+1749
+1750
+1751
+1752
+1753
+1754
+1755
+1756
+1757
+1758
+1759
+1760
+1761
+1762
+1763
+1764
+1765
+1766
+1767
+1768
+1769
+1770
+1771
+1772
+1773
+1774
+1775
+1776
+1777
+1778
+1779
+1780
+1781
+1782
+1783
+1784
+1785
+1786
+1787
+1788
+1789
+1790
+1791
+1792
+1793
+1794
+1795
+1796
+1797
+1798
+1799
+1800
+1801
+1802
+1803
+1804
+1805
+1806
+1807
+1808
+1809
+1810
+1811
+1812
+1813
+1814
+1815
+1816
+1817
+1818
+1819
+1820
+1821
+1822
+1823
+1824
+1825
+1826
+1827
+1828
+1829
+1830
+1831
+1832
+1833
+1834
+1835
+1836
+1837
+1838
+1839
+1840
+1841
+1842
+1843
+1844
+1845
+1846
+1847
+1848
+1849
+1850
+1851
+1852
+1853
+1854
+1855
+1856
+1857
+1858
+1859
+1860
+1861
+1862
+1863
+1864
+1865
+1866
+1867
+1868
+1869
+1870
+1871
+1872
+1873
+1874
+1875
+1876
+1877
+1878
+1879
+1880
+1881
+1882
+1883
+1884
+1885
+1886
+1887
+1888
+1889
+1890
+1891
+1892
+1893
+1894
+1895
+1896
+1897
+1898
+1899
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+2011
+2012
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+2024
+2025
+2026
+2027
+2028
+2029
+2030
+2031
+2032
+2033
+2034
+2035
+2036
+2037
+2038
+2039
+2040
+2041
+2042
+2043
+2044
+2045
+2046
+2047
+2048
+2049
+2050
+2051
+2052
+2053
+2054
+2055
+2056
+2057
+2058
+2059
+2060
+2061
+2062
+2063
+2064
+2065
+2066
+2067
+2068
+2069
+2070
+2071
+2072
+2073
+2074
+2075
+2076
+2077
+2078
+2079
+2080
+2081
+2082
+2083
+2084
+2085
+2086
+2087
+2088
+2089
+2090
+2091
+2092
+2093
+2094
+2095
+2096
+2097
+2098
+2099
+2100
+2101
+2102
+2103
+2104
+2105
+2106
+2107
+2108
+2109
+2110
+2111
+2112
+2113
+2114
+2115
+2116
+2117
+2118
+2119
+2120
+2121
+2122
+2123
+2124
+2125
+2126
+2127
+2128
+2129
+2130
+2131
+2132
+2133
+2134
+2135
+2136
+2137
+2138
+2139
+2140
+2141
+2142
+2143
+2144
+2145
+2146
+2147
+2148
+2149
+2150
+2151
+2152
+2153
+2154
+2155
+2156
+2157
+2158
+2159
+2160
+2161
+2162
+2163
+2164
+2165
+2166
+2167
+2168
+2169
+2170
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
+2186
+2187
+2188
+2189
+2190
+2191
+2192
+2193
+2194
+2195
+2196
+2197
+2198
+2199
+2200
+2201
+2202
+2203
+2204
+2205
+2206
+2207
+2208
+2209
+2210
+2211
+2212
+2213
+2214
+2215
+2216
+2217
+2218
+2219
+2220
+2221
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
+2232
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
+2246
+2247
+2248
+2249
+2250
+2251
+2252
+2253
+2254
+2255
+2256
+2257
+2258
+2259
+2260
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
+2281
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
+2303
+2304
+2305
+2306
+2307
+2308
+2309
+2310
+2311
+2312
+2313
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
+2344
+2345
+2346
+2347
+2348
+2349
+2350
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
+2373
+2374
+2375
+2376
+2377
+2378
+2379
+2380
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
+2390
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
+2400
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
+2422
+2423
+2424
+2425
+2426
+2427
+2428
+2429
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2444
+2445
+2446
+2447
+2448
+2449
+2450
+2451
+2452
+2453
+2454
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
+2471
+2472
+2473
+2474
+2475
+2476
+2477
+2478
+2479
+2480
+2481
+2482
+2483
+2484
+2485
+2486
+2487
+2488
+2489
+2490
+2491
+2492
+2493
+2494
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
+2507
+2508
+2509
+2510
+2511
+2512
+2513
+2514
+2515
+2516
+2517
+2518
+2519
+2520
+2521
+2522
+2523
+2524
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2540
+2541
+2542
+2543
+2544
+2545
+2546
+2547
+2548
+2549
+2550
+2551
+2552
+2553
+2554
+2555
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
+2572
+2573
+2574
+2575
+2576
+2577
+2578
+2579
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
+2588
+2589
+2590
+2591
+2592
+2593
+2594
+2595
+2596
+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2604
+2605
+2606
+2607
+2608
+2609
+2610
+2611
+2612
+2613
+2614
+2615
+2616
+2617
+2618
+2619
+2620
+2621
+2622
+2623
+2624
+2625
+2626
+2627
+2628
+2629
+2630
+2631
+2632
+2633
+2634
+2635
+2636
+2637
+2638
+2639
+2640
+2641
+2642
+2643
+2644
+2645
+2646
+2647
+2648
+2649
+2650
+2651
+2652
+2653
+2654
+2655
+2656
+2657
+2658
+2659
+2660
+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2668
+2669
+2670
+2671
+2672
+2673
+2674
+2675
+2676
+2677
+2678
+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691
+2692
+2693
+2694
+2695
+2696
+2697
+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716
+2717
+2718
+2719
+2720
+2721
+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745
+2746
+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759
+2760
+2761
+2762
+2763
+2764
+2765
+2766
+2767
+2768
+2769
+2770
+2771
+2772
+2773
+2774
+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783
+2784
+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811
+2812
+2813
+2814
+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844
+2845
+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860
+2861
+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872
+2873
+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888
+2889
+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903
+2904
+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914
+2915
+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930
+2931
+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942
+2943
+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964
+2965
+2966
+2967
+2968
+2969
+2970
+2971
+2972
+2973
+2974
+2975
+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983
+2984
+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997
+2998
+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009
+3010
+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018
+3019
+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037
+3038
+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061
+3062
+3063
+3064
+3065
+3066
+3067
+3068
+3069
+3070
+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086
+3087
+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096
+3097
+3098
+3099
+3100
+3101
+3102
+3103
+3104
+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120
+3121
+3122
+3123
+3124
+3125
+3126
+3127
+3128
+3129
+3130
+3131
+3132
+3133
+3134
+3135
+3136
+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145
+3146
+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154
+3155
+3156
+3157
+3158
+3159
+3160
+3161
+3162
+3163
+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174
+3175
+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187
+3188
+3189
+3190
+3191
+3192
+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204
+3205
+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227
+3228
+3229
+3230
+3231
+3232
+3233
+3234
+3235
+3236
+3237
+3238
+3239
+3240
+3241
+3242
+3243
+3244
+3245
+3246
+3247
+3248
+3249
+3250
+3251
+3252
+3253
+3254
+3255
+3256
+3257
+3258
+3259
+3260
+3261
+3262
+3263
+3264
+3265
+3266
+3267
+3268
+3269
+3270
+3271
+3272
+3273
+3274
+3275
+3276
+3277
+3278
+3279
+3280
+3281
+3282
+3283
+3284
+3285
+3286
+3287
+3288
+3289
+3290
+3291
+3292
+3293
+3294
+3295
+3296
+3297
+3298
+3299
+3300
+3301
+3302
+3303
+3304
+3305
+3306
+3307
+3308
+3309
+3310
+3311
+3312
+3313
+3314
+3315
+3316
+3317
+3318
+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348
+3349
+3350
+3351
+3352
+3353
+3354
+3355
+3356
+3357
+3358
+3359
+3360
+3361
+3362
+3363
+3364
+3365
+3366
+3367
+3368
+3369
+3370
+3371
+3372
+3373
+3374
+3375
+3376
+3377
+3378
+3379
+3380
+3381
+3382
+3383
+3384
+3385
+3386
+3387
+3388
+3389
+3390
+3391
+3392
+3393
+3394
+3395
+3396
+3397
+3398
+3399
+3400
+3401
+3402
+3403
+3404
+3405
+3406
+3407
+3408
+3409
+3410
+3411
+3412
+3413
+3414
+3415
+3416
+3417
+3418
+3419
+3420
+3421
+3422
+3423
+3424
+3425
+3426
+3427
+3428
+3429
+3430
+3431
+3432
+3433
+3434
+3435
+3436
+3437
+3438
+3439
+3440
+3441
+3442
+3443
+3444
+3445
+3446
+3447
+3448
+3449
+3450
+3451
+3452
+3453
+3454
+3455
+3456
+3457
+3458
+3459
+3460
+3461
+3462
+3463
+3464
+3465
+3466
+3467
+3468
+3469
+3470
+3471
+3472
+3473
+3474
+3475
+3476
+3477
+3478
+3479
+3480
+3481
+3482
+3483
+3484
+3485
+3486
+3487
+3488
+3489
+3490
+3491
+3492
+3493
+3494
+3495
+3496
+3497
+3498
+3499
+3500
+3501
+3502
+3503
+3504
+3505
+3506
+3507
+3508
+3509
+3510
+3511
+3512
+3513
+3514
+3515
+3516
+3517
+3518
+3519
+3520
+3521
+3522
+3523
+3524
+3525
+3526
+3527
+3528
+3529
+3530
+3531
+3532
+3533
+3534
+3535
+3536
+3537
+3538
+3539
+3540
+3541
+3542
+3543
+3544
+3545
+3546
+3547
+3548
+3549
+3550
+3551
+3552
+3553
+3554
+3555
+3556
+3557
+3558
+3559
+3560
+3561
+3562
+3563
+3564
+3565
+3566
+3567
+3568
+3569
+3570
+3571
+3572
+3573
+3574
+3575
+3576
+3577
+3578
+3579
+3580
+3581
+3582
+3583
+3584
+3585
+3586
+3587
+3588
+3589
+3590
+3591
+3592
+3593
+3594
+3595
+3596
+3597
+3598
+3599
+3600
+3601
+3602
+3603
+3604
+3605
+3606
+3607
+3608
+3609
+3610
+3611
+3612
+3613
+3614
+3615
+3616
+3617
+3618
+3619
+3620
+3621
+3622
+3623
+3624
+3625
+3626
+3627
+3628
+3629
+3630
+3631
+3632
+3633
+3634
+3635
+3636
+3637
+3638
+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3660
+3661
+3662
+3663
+3664
+3665
+3666
+3667
+3668
+3669
+3670
+3671
+3672
+3673
+3674
+3675
+3676
+3677
+3678
+3679
+3680
+3681
+3682
+3683
+3684
+3685
+3686
+3687
+3688
+3689
+3690
+3691
+3692
+3693
+3694
+3695
+3696
+3697
+3698
+3699
+3700
+3701
+3702
+3703
+3704
+3705
+3706
+3707
+3708
+3709
+3710
+3711
+3712
+3713
+3714
+3715
+3716
+3717
+3718
+3719
+3720
+3721
+3722
+3723
+3724
+3725
+3726
+3727
+3728
+3729
+3730
+3731
+3732
+3733
+3734
+3735
+3736
+3737
+3738
+3739
+3740
+3741
+3742
+3743
+3744
+3745
+3746
+3747
+3748
+3749
+3750
+3751
+3752
+3753
+3754
+3755
+3756
+3757
+3758
+3759
+3760
+3761
+3762
+3763
+3764
+3765
+3766
+3767
+3768
+3769
+3770
+3771
+3772
+3773
+3774
+3775
+3776
+3777
+3778
+3779
+3780
+3781
+3782
+3783
+3784
+3785
+3786
+3787
+3788
+3789
+3790
+3791
+3792
+3793
+3794
+3795
+3796
+3797
+3798
+3799
+3800
+3801
+3802
+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832
+3833
+3834
+3835
+3836
+3837
+3838
+3839
+3840
+3841
+3842
+3843
+3844
+3845
+3846
+3847
+3848
+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878
+3879
+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909
+3910
+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919
+3920
+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932
+3933
+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950
+3951
+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959
+3960
+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975
+3976
+3977
+3978
+3979
+3980
+3981
+3982
+3983
+3984
+3985
+3986
+3987
+3988
+3989
+3990
+3991
+3992
+3993
+3994
+3995
+3996
+3997
+3998
+3999
+4000
+4001
+4002
+4003
+4004
+4005
+4006
+4007
+4008
+4009
+4010
+4011
+4012
+4013
+4014
+4015
+4016
+4017
+4018
+4019
+4020
+4021
+4022
+4023
+4024
+4025
+4026
+4027
+4028
+4029
+4030
+4031
+4032
+4033
+4034
+4035
+4036
+4037
+4038
+4039
+4040
+4041
+4042
+4043
+4044
+4045
+4046
+4047
+4048
+4049
+4050
+4051
+4052
+4053
+4054
+4055
+4056
+4057
+4058
+4059
+4060
+4061
+4062
+4063
+4064
+4065
+4066
+4067
+4068
+4069
+4070
+4071
+4072
+4073
+4074
+4075
+4076
+4077
+4078
+4079
+4080
+4081
+4082
+4083
+4084
+4085
+4086
+4087
+4088
+4089
+4090
+4091
+4092
+4093
+4094
+4095
+4096
+4097
+4098
+4099
+4100
+4101
+4102
+4103
+4104
+4105
+4106
+4107
+4108
+4109
+4110
+4111
+4112
+4113
+4114
+4115
+4116
+4117
+4118
+4119
+4120
+4121
+4122
+4123
+4124
+4125
+4126
+4127
+4128
+4129
+4130
+4131
+4132
+4133
+4134
+4135
+4136
+4137
+4138
+4139
+4140
+4141
+4142
+4143
+4144
+4145
+4146
+4147
+4148
+4149
+4150
+4151
+4152
+4153
+4154
+4155
+4156
+4157
+4158
+4159
+4160
+4161
+4162
+4163
+4164
+4165
+4166
+4167
+4168
+4169
+4170
+4171
+4172
+4173
+4174
+4175
+4176
+4177
+4178
+4179
+4180
+4181
+4182
+4183
+4184
+4185
+4186
+4187
+4188
+4189
+4190
+4191
+4192
+4193
+4194
+4195
+4196
+4197
+4198
+4199
+4200
+4201
+4202
+4203
+4204
+4205
+4206
+4207
+4208
+4209
+4210
+4211
+4212
+4213
+4214
+4215
+4216
+4217
+4218
+4219
+4220
+4221
+4222
+4223
+4224
+4225
+4226
+4227
+4228
+4229
+4230
+4231
+4232
+4233
+4234
+4235
+4236
+4237
+4238
+4239
+4240
+4241
+4242
+4243
+4244
+4245
+4246
+4247
+4248
+4249
+4250
+4251
+4252
+4253
+4254
+4255
+4256
+4257
+4258
+4259
+4260
+4261
+4262
+4263
+4264
+4265
+4266
+4267
+4268
+4269
+4270
+4271
+4272
+4273
+4274
+4275
+4276
+4277
+4278
+4279
+4280
+4281
+4282
+4283
+4284
+4285
+4286
+4287
+4288
+4289
+4290
+4291
+4292
+4293
+4294
+4295
+4296
+4297
+4298
+4299
+4300
+4301
+4302
+4303
+4304
+4305
+4306
+4307
+4308
+4309
+4310
+4311
+4312
+4313
+4314
+4315
+4316
+4317
+4318
+4319
+4320
+4321
+4322
+4323
+4324
+4325
+4326
+4327
+4328
+4329
+4330
+4331
+4332
+4333
+4334
+4335
+4336
+4337
+4338
+4339
+4340
+4341
+4342
+4343
+4344
+4345
+4346
+4347
+4348
+4349
+4350
+4351
+4352
+4353
+4354
+4355
+4356
+4357
+4358
+4359
+4360
+4361
+4362
+4363
+4364
+4365
+4366
+4367
+4368
+4369
+4370
+4371
+4372
+4373
+4374
+4375
+4376
+4377
+4378
+4379
+4380
+4381
+4382
+4383
+4384
+4385
+4386
+4387
+4388
+4389
+4390
+4391
+4392
+4393
+4394
+4395
+4396
+4397
+4398
+4399
+4400
+4401
+4402
+4403
+4404
+4405
+4406
+4407
+4408
+4409
+4410
+4411
+4412
+4413
+4414
+4415
+4416
+4417
+4418
+4419
+4420
+4421
+4422
+4423
+4424
+4425
+4426
+4427
+4428
+4429
+4430
+4431
+4432
+4433
+4434
+4435
+4436
+4437
+4438
+4439
+4440
+4441
+4442
+4443
+4444
+4445
+4446
+4447
+4448
+4449
+4450
+4451
+4452
+4453
+4454
+4455
+4456
+4457
+4458
+4459
+4460
+4461
+4462
+4463
+4464
+4465
+4466
+4467
+4468
+4469
+4470
+4471
+4472
+4473
+4474
+4475
+4476
+4477
+4478
+4479
+4480
+4481
+4482
+4483
+4484
+4485
+4486
+4487
+4488
+4489
+4490
+4491
+4492
+4493
+4494
+4495
+4496
+4497
+4498
+4499
+4500
+4501
+4502
+4503
+4504
+4505
+4506
+4507
+4508
+4509
+4510
+4511
+4512
+4513
+4514
+4515
+4516
+4517
+4518
+4519
+4520
+4521
+4522
+4523
+4524
+4525
+4526
+4527
+4528
+4529
+4530
+4531
+4532
+4533
+4534
+4535
+4536
+4537
+4538
+4539
+4540
+4541
+4542
+4543
+4544
+4545
+4546
+4547
+4548
+4549
+4550
+4551
+4552
+4553
+4554
+4555
+4556
+4557
+4558
+4559
+4560
+4561
+4562
+4563
+4564
+4565
+4566
+4567
+4568
+4569
+4570
+4571
+4572
+4573
+4574
+4575
+4576
+4577
+4578
+4579
+4580
+4581
+4582
+4583
+4584
+4585
+4586
+4587
+4588
+4589
+4590
+4591
+4592
+4593
+4594
+4595
+4596
+4597
+4598
+4599
+4600
+4601
+4602
+4603
+4604
+4605
+4606
+4607
+4608
+4609
+4610
+4611
+4612
+4613
+4614
+4615
+4616
+4617
+4618
+4619
+4620
+4621
+4622
+4623
+4624
+4625
+4626
+4627
+4628
+4629
+4630
+4631
+4632
+4633
+4634
+4635
+4636
+4637
+4638
+4639
+4640
+4641
+4642
+4643
+4644
+4645
+4646
+4647
+4648
+4649
+4650
+4651
+4652
+4653
+4654
+4655
+4656
+4657
+4658
+4659
+4660
+4661
+4662
+4663
+4664
+4665
+4666
+4667
+4668
+4669
+4670
+4671
+4672
+4673
+4674
+4675
+4676
+4677
+4678
+4679
+4680
+4681
+4682
+4683
+4684
+4685
+4686
+4687
+4688
+4689
+4690
+4691
+4692
+4693
+4694
+4695
+4696
+4697
+4698
+4699
+4700
+4701
+4702
+4703
+4704
+4705
+4706
+4707
+4708
+4709
+4710
+4711
+4712
+4713
+4714
+4715
+4716
+4717
+4718
+4719
+4720
+4721
+4722
+4723
+4724
+4725
+4726
+4727
+4728
+4729
+4730
+4731
+4732
+4733
+4734
+4735
+4736
+4737
+4738
+4739
+4740
+4741
+4742
+4743
+4744
+4745
+4746
+4747
+4748
+4749
+4750
+4751
+4752
+4753
+4754
+4755
+4756
+4757
+4758
+4759
+4760
+4761
+4762
+4763
+4764
+4765
+4766
+4767
+4768
+4769
+4770
+4771
+4772
+4773
+4774
+4775
+4776
+4777
+4778
+4779
+4780
+4781
+4782
+4783
+4784
+4785
+4786
+4787
+4788
+4789
+4790
+4791
+4792
+4793
+4794
+4795
+4796
+4797
+4798
+4799
+4800
+4801
+4802
+4803
+4804
+4805
+4806
+4807
+4808
+4809
+4810
+4811
+4812
+4813
+4814
+4815
+4816
+4817
+4818
+4819
+4820
+4821
+4822
+4823
+4824
+4825
+4826
+4827
+4828
+4829
+4830
+4831
+4832
+4833
+4834
+4835
+4836
+4837
+4838
+4839
+4840
+4841
+4842
+4843
+4844
+4845
+4846
+4847
+4848
+4849
+4850
+4851
+4852
+4853
+4854
+4855
+4856
+4857
+4858
+4859
+4860
+4861
+4862
+4863
+4864
+4865
+4866
+4867
+4868
+4869
+4870
+4871
+4872
+4873
+4874
+4875
+4876
+4877
+4878
+4879
+4880
+4881
+4882
+4883
+4884
+4885
+4886
+4887
+4888
+4889
+4890
+4891
+4892
+4893
+4894
+4895
+4896
+4897
+4898
+4899
+4900
+4901
+4902
+4903
+4904
+4905
+4906
+4907
+4908
+4909
+4910
+4911
+4912
+4913
+4914
+4915
+4916
+4917
+4918
+4919
+4920
+4921
+4922
+4923
+4924
+4925
+4926
+4927
+4928
+4929
+4930
+4931
+4932
+4933
+4934
+4935
+4936
+4937
+4938
+4939
+4940
+4941
+4942
+4943
+4944
+4945
+4946
+4947
+4948
+4949
+4950
+4951
+4952
+4953
+4954
+4955
+4956
+4957
+4958
+4959
+4960
+4961
+4962
+4963
+4964
+4965
+4966
+4967
+4968
+4969
+4970
+4971
+4972
+4973
+4974
+4975
+4976
+4977
+4978
+4979
+4980
+4981
+4982
+4983
+4984
+4985
+4986
+4987
+4988
+4989
+4990
+4991
+4992
+4993
+4994
+4995
+4996
+4997
+4998
+4999
+5000
+5001
+5002
+5003
+5004
+5005
+5006
+5007
+5008
+5009
+5010
+5011
+5012
+5013
+5014
+5015
+5016
+5017
+5018
+5019
+5020
+5021
+5022
+5023
+5024
+5025
+5026
+5027
+5028
+5029
+5030
+5031
+5032
+5033
+5034
+5035
+5036
+5037
+5038
+5039
+5040
+5041
+5042
+5043
+5044
+5045
+5046
+5047
+5048
+5049
+5050
+5051
+5052
+5053
+5054
+5055
+5056
+5057
+5058
+5059
+5060
+5061
+5062
+5063
+5064
+5065
+5066
+5067
+5068
+5069
+5070
+5071
+5072
+5073
+5074
+5075
+5076
+5077
+5078
+5079
+5080
+5081
+5082
+5083
+5084
+5085
+5086
+5087
+5088
+5089
+5090
+5091
+5092
+5093
+5094
+5095
+5096
+5097
+5098
+5099
+5100
+5101
+5102
+5103
+5104
+5105
+5106
+5107
+5108
+5109
+5110
+5111
+5112
+5113
+5114
+5115
+5116
+5117
+5118
+5119
+5120
+5121
+5122
+5123
+5124
+5125
+5126
+5127
+5128
+5129
+5130
+5131
+5132
+5133
+5134
+5135
+5136
+5137
+5138
+5139
+5140
+5141
+5142
+5143
+5144
+5145
+5146
+5147
+5148
+5149
+5150
+5151
+5152
+5153
+5154
+5155
+5156
+5157
+5158
+5159
+5160
+5161
+5162
+5163
+5164
+5165
+5166
+5167
+5168
+5169
+5170
+5171
+5172
+5173
+5174
+5175
+5176
+5177
+5178
+5179
+5180
+5181
+5182
+5183
+5184
+5185
+5186
+5187
+5188
+5189
+5190
+5191
+5192
+5193
+5194
+5195
+5196
+5197
+5198
+5199
+5200
+5201
+5202
+5203
+5204
+5205
+5206
+5207
+5208
+5209
+5210
+5211
+5212
+5213
+5214
+5215
+5216
+5217
+5218
+5219
+5220
+5221
+5222
+5223
+5224
+5225
+5226
+5227
+5228
+5229
+5230
+5231
+5232
+5233
+5234
+5235
+5236
+5237
+5238
+5239
+5240
+5241
+5242
+5243
+5244
+5245
+5246
+5247
+5248
+5249
+5250
+5251
+5252
+5253
+5254
+5255
+5256
+5257
+5258
+5259
+5260
+5261
+5262
+5263
+5264
+5265
+5266
+5267
+5268
+5269
+5270
+5271
+5272
+5273
+5274
+5275
+5276
+5277
+5278
+5279
+5280
+5281
+5282
+5283
+5284
+5285
+5286
+5287
+5288
+5289
+5290
+5291
+5292
+5293
+5294
+5295
+5296
+5297
+5298
+5299
+5300
+5301
+5302
+5303
+5304
+5305
+5306
+5307
+5308
+5309
+5310
+5311
+5312
+5313
+5314
+5315
+5316
+5317
+5318
+5319
+5320
+5321
+5322
+5323
+5324
+5325
+5326
+5327
+5328
+5329
+5330
+5331
+5332
+5333
+5334
+5335
+5336
+5337
+5338
+5339
+5340
+5341
+5342
+5343
+5344
+5345
+5346
+5347
+5348
+5349
+5350
+5351
+5352
+5353
+5354
+5355
+5356
+5357
+5358
+5359
+5360
+5361
+5362
+5363
+5364
+5365
+5366
+5367
+5368
+5369
+5370
+5371
+5372
+5373
+5374
+5375
+5376
+5377
+5378
+5379
+5380
+5381
+5382
+5383
+5384
+5385
+5386
+5387
+5388
+5389
+5390
+5391
+5392
+5393
+5394
+5395
+5396
+5397
+5398
+5399
+5400
+5401
+5402
+5403
+5404
+5405
+5406
+5407
+5408
+5409
+5410
+5411
+5412
+5413
+5414
+5415
+5416
+5417
+5418
+5419
+5420
+5421
+5422
+5423
+5424
+5425
+5426
+5427
+5428
+5429
+5430
+5431
+5432
+5433
+5434
+5435
+5436
+5437
+5438
+5439
+5440
+5441
+5442
+5443
+5444
+5445
+5446
+5447
+5448
+5449
+5450
+5451
+5452
+5453
+5454
+5455
+5456
+5457
+5458
+5459
+5460
+5461
+5462
+5463
+5464
+5465
+5466
+5467
+5468
+5469
+5470
+5471
+5472
+5473
+5474
+5475
+5476
+5477
+5478
+5479
+5480
+5481
+5482
+5483
+5484
+5485
+5486
+5487
+5488
+5489
+5490
+5491
+5492
+5493
+5494
+5495
+5496
+5497
+5498
+5499
+5500
+5501
+5502
+5503
+5504
+5505
+5506
+5507
+5508
+5509
+5510
+5511
+5512
+5513
+5514
+5515
+5516
+5517
+5518
+5519
+5520
+5521
+5522
+5523
+5524
+5525
+5526
+5527
+5528
+5529
+5530
+5531
+5532
+5533
+5534
+5535
+5536
+5537
+5538
+5539
+5540
+5541
+5542
+5543
+5544
+5545
+5546
+5547
+5548
+5549
+5550
+5551
+5552
+5553
+5554
+5555
+5556
+5557
+5558
+5559
+5560
+5561
+5562
+5563
+5564
+5565
+5566
+5567
+5568
+5569
+5570
+5571
+5572
+5573
+5574
+5575
+5576
+5577
+5578
+5579
+5580
+5581
+5582
+5583
+5584
+5585
+5586
+5587
+5588
+5589
+5590
+5591
+5592
+5593
+5594
+5595
+5596
+5597
+5598
+5599
+5600
+5601
+5602
+5603
+5604
+5605
+5606
+5607
+5608
+5609
+5610
+5611
+5612
+5613
+5614
+5615
+5616
+5617
+5618
+5619
+5620
+5621
+5622
+5623
+5624
+5625
+5626
+5627
+5628
+5629
+5630
+5631
+5632
+5633
+5634
+5635
+5636
+5637
+5638
+5639
+5640
+5641
+5642
+5643
+5644
+5645
+5646
+5647
+5648
+5649
+5650
+5651
+5652
+5653
+5654
+5655
+5656
+5657
+5658
+5659
+5660
+5661
+5662
+5663
+5664
+5665
+5666
+5667
+5668
+5669
+5670
+5671
+5672
+5673
+5674
+5675
+5676
+5677
+5678
+5679
+5680
+5681
+5682
+5683
+5684
+5685
+5686
+5687
+5688
+5689
+5690
+5691
+5692
+5693
+5694
+5695
+5696
+5697
+5698
+5699
+5700
+5701
+5702
+5703
+5704
+5705
+5706
+5707
+5708
+5709
+5710
+5711
+5712
+5713
+5714
+5715
+5716
+5717
+5718
+5719
+5720
+5721
+5722
+5723
+5724
+5725
+5726
+5727
+5728
+5729
+5730
+5731
+5732
+5733
+5734
+5735
+5736
+5737
+5738
+5739
+5740
+5741
+5742
+5743
+5744
+5745
+5746
+5747
+5748
+5749
+5750
+5751
+5752
+5753
+5754
+5755
+5756
+5757
+5758
+5759
+5760
+5761
+5762
+5763
+5764
+5765
+5766
+5767
+5768
+5769
+5770
+5771
+5772
+5773
+5774
+5775
+5776
+5777
+5778
+5779
+5780
+5781
+5782
+5783
+5784
+5785
+5786
+5787
+5788
+5789
+5790
+5791
+5792
+5793
+5794
+5795
+5796
+5797
+5798
+5799
+5800
+5801
+5802
+5803
+5804
+5805
+5806
+5807
+5808
+5809
+5810
+5811
+5812
+5813
+5814
+5815
+5816
+5817
+5818
+5819
+5820
+5821
+5822
+5823
+5824
+5825
+5826
+5827
+5828
+5829
+5830
+5831
+5832
+5833
+5834
+5835
+5836
+5837
+5838
+5839
+5840
+5841
+5842
+5843
+5844
+5845
+5846
+5847
+5848
+5849
+5850
+5851
+5852
+5853
+5854
+5855
+5856
+5857
+5858
+5859
+5860
+5861
+5862
+5863
+5864
+5865
+5866
+5867
+5868
+5869
+5870
+5871
+5872
+5873
+5874
+5875
+5876
+5877
+5878
+5879
+5880
+5881
+5882
+5883
+5884
+5885
+5886
+5887
+5888
+5889
+5890
+5891
+5892
+5893
+5894
+5895
+5896
+5897
+5898
+5899
+5900
+5901
+5902
+5903
+5904
+5905
+5906
+5907
+5908
+5909
+5910
+5911
+5912
+5913
+5914
+5915
+5916
+5917
+5918
+5919
+5920
+5921
+5922
+5923
+5924
+5925
+5926
+5927
+5928
+5929
+5930
+5931
+5932
+5933
+5934
+5935
+5936
+5937
+5938
+5939
+5940
+5941
+5942
+5943
+5944
+5945
+5946
+5947
+5948
+5949
+5950
+5951
+5952
+5953
+5954
+5955
+5956
+5957
+5958
+5959
+5960
+5961
+5962
+5963
+5964
+5965
+5966
+5967
+5968
+5969
+5970
+5971
+5972
+5973
+5974
+5975
+5976
+5977
+5978
+5979
+5980
+5981
+5982
+5983
+5984
+5985
+5986
+5987
+5988
+5989
+5990
+5991
+5992
+5993
+5994
+5995
+5996
+5997
+5998
+5999
+6000
+6001
+6002
+6003
+6004
+6005
+6006
+6007
+6008
+6009
+6010
+6011
+6012
+6013
+6014
+6015
+6016
+6017
+6018
+6019
+6020
+6021
+6022
+6023
+6024
+6025
+6026
+6027
+6028
+6029
+6030
+6031
+6032
+6033
+6034
+6035
+6036
+6037
+6038
+6039
+6040
+6041
+6042
+6043
+6044
+6045
+6046
+6047
+6048
+6049
+6050
+6051
+6052
+6053
+6054
+6055
+6056
+6057
+6058
+6059
+6060
+6061
+6062
+6063
+6064
+6065
+6066
+6067
+6068
+6069
+6070
+6071
+6072
+6073
+6074
+6075
+6076
+6077
+6078
+6079
+6080
+6081
+6082
+6083
+6084
+6085
+6086
+6087
+6088
+6089
+6090
+6091
+6092
+6093
+6094
+6095
+6096
+6097
+6098
+6099
+6100
+6101
+6102
+6103
+6104
+6105
+6106
+6107
+6108
+6109
+6110
+6111
+6112
+6113
+6114
+6115
+6116
+6117
+6118
+6119
+6120
+6121
+6122
+6123
+6124
+6125
+6126
+6127
+6128
+6129
+6130
+6131
+6132
+6133
+6134
+6135
+6136
+6137
+6138
+6139
+6140
+6141
+6142
+6143
+6144
+6145
+6146
+6147
+6148
+6149
+6150
+6151
+6152
+6153
+6154
+6155
+6156
+6157
+6158
+6159
+6160
+6161
+6162
+6163
+6164
+6165
+6166
+6167
+6168
+6169
+6170
+6171
+6172
+6173
+6174
+6175
+6176
+6177
+6178
+6179
+6180
+6181
+6182
+6183
+6184
+6185
+6186
+6187
+6188
+6189
+6190
+6191
+6192
+6193
+6194
+6195
+6196
+6197
+6198
+6199
+6200
+6201
+6202
+6203
+6204
+6205
+6206
+6207
+6208
+6209
+6210
+6211
+6212
+6213
+6214
+6215
+6216
+6217
+6218
+6219
+6220
+6221
+6222
+6223
+6224
+6225
+6226
+6227
+6228
+6229
+6230
+6231
+6232
+6233
+6234
+6235
+6236
+6237
+6238
+6239
+6240
+6241
+6242
+6243
+6244
+6245
+6246
+6247
+6248
+6249
+6250
+6251
+6252
+6253
+6254
+6255
+6256
+6257
+6258
+6259
+6260
+6261
+6262
+6263
+6264
+6265
+6266
+6267
+6268
+6269
+6270
+6271
+6272
+6273
+6274
+6275
+6276
+6277
+6278
+6279
+6280
+6281
+6282
+6283
+6284
+6285
+6286
+6287
+6288
+6289
+6290
+6291
+6292
+6293
+6294
+6295
+6296
+6297
+6298
+6299
+6300
+6301
+6302
+6303
+6304
+6305
+6306
+6307
+6308
+6309
+6310
+6311
+6312
+6313
+6314
+6315
+6316
+6317
+6318
+6319
+6320
+6321
+6322
+6323
+6324
+6325
+6326
+6327
+6328
+6329
+6330
+6331
+6332
+6333
+6334
+6335
+6336
+6337
+6338
+6339
+6340
+6341
+6342
+6343
+6344
+6345
+6346
+6347
+6348
+6349
+6350
+6351
+6352
+6353
+6354
+6355
+6356
+6357
+6358
+6359
+6360
+6361
+6362
+6363
+6364
+6365
+6366
+6367
+6368
+6369
+6370
+6371
+6372
+6373
+6374
+6375
+6376
+6377
+6378
+6379
+6380
+6381
+6382
+6383
+6384
+6385
+6386
+6387
+6388
+6389
+6390
+6391
+6392
+6393
+6394
+6395
+6396
+6397
+6398
+6399
+6400
+6401
+6402
+6403
+6404
+6405
+6406
+6407
+6408
+6409
+6410
+6411
+6412
+6413
+6414
+6415
+6416
+6417
+6418
+6419
+6420
+6421
+6422
+6423
+6424
+6425
+6426
+6427
+6428
+6429
+6430
+6431
+6432
+6433
+6434
+6435
+6436
+6437
+6438
+6439
+6440
+6441
+6442
+6443
+6444
+6445
+6446
+6447
+6448
+6449
+6450
+6451
+6452
+6453
+6454
+6455
+6456
+6457
+6458
+6459
+6460
+6461
+6462
+6463
+6464
+6465
+6466
+6467
+6468
+6469
+6470
+6471
+6472
+6473
+6474
+6475
+6476
+6477
+6478
+6479
+6480
+6481
+6482
+6483
+6484
+6485
+6486
+6487
+6488
+6489
+6490
+6491
+6492
+6493
+6494
+6495
+6496
+6497
+6498
+6499
+6500
+6501
+6502
+6503
+6504
+6505
+6506
+6507
+6508
+6509
+6510
+6511
+6512
+6513
+6514
+6515
+6516
+6517
+6518
+6519
+6520
+6521
+6522
+6523
+6524
+6525
+6526
+6527
+6528
+6529
+6530
+6531
+6532
+6533
+6534
+6535
+6536
+6537
+6538
+6539
+6540
+6541
+6542
+6543
+6544
+6545
+6546
+6547
+6548
+6549
+6550
+6551
+6552
+6553
+6554
+6555
+6556
+6557
+6558
+6559
+6560
+6561
+6562
+6563
+6564
+6565
+6566
+6567
+6568
+6569
+6570
+6571
+6572
+6573
+6574
+6575
+6576
+6577
+6578
+6579
+6580
+6581
+6582
+6583
+6584
+6585
+6586
+6587
+6588
+6589
+6590
+6591
+6592
+6593
+6594
+6595
+6596
+6597
+6598
+6599
+6600
+6601
+6602
+6603
+6604
+6605
+6606
+6607
+6608
+6609
+6610
+6611
+6612
+6613
+6614
+6615
+6616
+6617
+6618
+6619
+6620
+6621
+6622
+6623
+6624
+6625
+6626
+6627
+6628
+6629
+6630
+6631
+6632
+6633
+6634
+6635
+6636
+6637
+6638
+6639
+6640
+6641
+6642
+6643
+6644
+6645
+6646
+6647
+6648
+6649
+6650
+6651
+6652
+6653
+6654
+6655
+6656
+6657
+6658
+6659
+6660
+6661
+6662
+6663
+6664
+6665
+6666
+6667
+6668
+6669
+6670
+6671
+6672
+6673
+6674
+6675
+6676
+6677
+6678
+6679
+6680
+6681
+6682
+6683
+6684
+6685
+6686
+6687
+6688
+6689
+6690
+6691
+6692
+6693
+6694
+6695
+6696
+6697
+6698
+6699
+6700
+6701
+6702
+6703
+6704
+6705
+6706
+6707
+6708
+6709
+6710
+6711
+6712
+6713
+6714
+6715
+6716
+6717
+6718
+6719
+6720
+6721
+6722
+6723
+6724
+6725
+6726
+6727
+6728
+6729
+6730
+6731
+6732
+6733
+6734
+6735
+6736
+6737
+6738
+6739
+6740
+6741
+6742
+6743
+6744
+6745
+6746
+6747
+6748
+6749
+6750
+6751
+6752
+6753
+6754
+6755
+6756
+6757
+6758
+6759
+6760
+6761
+6762
+6763
+6764
+6765
+6766
+6767
+6768
+6769
+6770
+6771
+6772
+6773
+6774
+6775
+6776
+6777
+6778
+6779
+6780
+6781
+6782
+6783
+6784
+6785
+6786
+6787
+6788
+6789
+6790
+6791
+6792
+6793
+6794
+6795
+6796
+6797
+6798
+6799
+6800
+6801
+6802
+6803
+6804
+6805
+6806
+6807
+6808
+6809
+6810
+6811
+6812
+6813
+6814
+6815
+6816
+6817
+6818
+6819
+6820
+6821
+6822
+6823
+6824
+6825
+6826
+6827
+6828
+6829
+6830
+6831
+6832
+6833
+6834
+6835
+6836
+6837
+6838
+6839
+6840
+6841
+6842
+6843
+6844
+6845
+6846
+6847
+6848
+6849
+6850
+6851
+6852
+6853
+6854
+6855
+6856
+6857
+6858
+6859
+6860
+6861
+6862
+6863
+6864
+6865
+6866
+6867
+6868
+6869
+6870
+6871
+6872
+6873
+6874
+6875
+6876
+6877
+6878
+6879
+6880
+6881
+6882
+6883
+6884
+6885
+6886
+6887
+6888
+6889
+6890
+6891
+6892
+6893
+6894
+6895
+6896
+6897
+6898
+6899
+6900
+6901
+6902
+6903
+6904
+6905
+6906
+6907
+6908
+6909
+6910
+6911
+6912
+6913
+6914
+6915
+6916
+6917
+6918
+6919
+6920
+6921
+6922
+6923
+6924
+6925
+6926
+6927
+6928
+6929
+6930
+6931
+6932
+6933
+6934
+6935
+6936
+6937
+6938
+6939
+6940
+6941
+6942
+6943
+6944
+6945
+6946
+6947
+6948
+6949
+6950
+6951
+6952
+6953
+6954
+6955
+6956
+6957
+6958
+6959
+6960
+6961
+6962
+6963
+6964
+6965
+6966
+6967
+6968
+6969
+6970
+6971
+6972
+6973
+6974
+6975
+6976
+6977
+6978
+6979
+6980
+6981
+6982
+6983
+6984
+6985
+6986
+6987
+6988
+6989
+6990
+6991
+6992
+6993
+6994
+6995
+6996
+6997
+6998
+6999
+7000
+7001
+7002
+7003
+7004
+7005
+7006
+7007
+7008
+7009
+7010
+7011
+7012
+7013
+7014
+7015
+7016
+7017
+7018
+7019
+7020
+7021
+7022
+7023
+7024
+7025
+7026
+7027
+7028
+7029
+7030
+7031
+7032
+7033
+7034
+7035
+7036
+7037
+7038
+7039
+7040
+7041
+7042
+7043
+7044
+7045
+7046
+7047
+7048
+7049
+7050
+7051
+7052
+7053
+7054
+7055
+7056
+7057
+7058
+7059
+7060
+7061
+7062
+7063
+7064
+7065
+7066
+7067
+7068
+7069
+7070
+7071
+7072
+7073
+7074
+7075
+7076
+7077
+7078
+7079
+7080
+7081
+7082
+7083
+7084
+7085
+7086
+7087
+7088
+7089
+7090
+7091
+7092
+7093
+7094
+7095
+7096
+7097
+7098
+7099
+7100
+7101
+7102
+7103
+7104
+7105
+7106
+7107
+7108
+7109
+7110
+7111
+7112
+7113
+7114
+7115
+7116
+7117
+7118
+7119
+7120
+7121
+7122
+7123
+7124
+7125
+7126
+7127
+7128
+7129
+7130
+7131
+7132
+7133
+7134
+7135
+7136
+7137
+7138
+7139
+7140
+7141
+7142
+7143
+7144
+7145
+7146
+7147
+7148
+7149
+7150
+7151
+7152
+7153
+7154
+7155
+7156
+7157
+7158
+7159
+7160
+7161
+7162
+7163
+7164
+7165
+7166
+7167
+7168
+7169
+7170
+7171
+7172
+7173
+7174
+7175
+7176
+7177
+7178
+7179
+7180
+7181
+7182
+7183
+7184
+7185
+7186
+7187
+7188
+7189
+7190
+7191
+7192
+7193
+7194
+7195
+7196
+7197
+7198
+7199
+7200
+7201
+7202
+7203
+7204
+7205
+7206
+7207
+7208
+7209
+7210
+7211
+7212
+7213
+7214
+7215
+7216
+7217
+7218
+7219
+7220
+7221
+7222
+7223
+7224
+7225
+7226
+7227
+7228
+7229
+7230
+7231
+7232
+7233
+7234
+7235
+7236
+7237
+7238
+7239
+7240
+7241
+7242
+7243
+7244
+7245
+7246
+7247
+7248
+7249
+7250
+7251
+7252
+7253
+7254
+7255
+7256
+7257
+7258
+7259
+7260
+7261
+7262
+7263
+7264
+7265
+7266
+7267
+7268
+7269
+7270
+7271
+7272
+7273
+7274
+7275
+7276
+7277
+7278
+7279
+7280
+7281
+7282
+7283
+7284
+7285
+7286
+7287
+7288
+7289
+7290
+7291
+7292
+7293
+7294
+7295
+7296
+7297
+7298
+7299
+7300
+7301
+7302
+7303
+7304
+7305
+7306
+7307
+7308
+7309
+7310
+7311
+7312
+7313
+7314
+7315
+7316
+7317
+7318
+7319
+7320
+7321
+7322
+7323
+7324
+7325
+7326
+7327
+7328
+7329
+7330
+7331
+7332
+7333
+7334
+7335
+7336
+7337
+7338
+7339
+7340
+7341
+7342
+7343
+7344
+7345
+7346
+7347
+7348
+7349
+7350
+7351
+7352
+7353
+7354
+7355
+7356
+7357
+7358
+7359
+7360
+7361
+7362
+7363
+7364
+7365
+7366
+7367
+7368
+7369
+7370
+7371
+7372
+7373
+7374
+7375
+7376
+7377
+7378
+7379
+7380
+7381
+7382
+7383
+7384
+7385
+7386
+7387
+7388
+7389
+7390
+7391
+7392
+7393
+7394
+7395
+7396
+7397
+7398
+7399
+7400
+7401
+7402
+7403
+7404
+7405
+7406
+7407
+7408
+7409
+7410
+7411
+7412
+7413
+7414
+7415
+7416
+7417
+7418
+7419
+7420
+7421
+7422
+7423
+7424
+7425
+7426
+7427
+7428
+7429
+7430
+7431
+7432
+7433
+7434
+7435
+7436
+7437
+7438
+7439
+7440
+7441
+7442
+7443
+7444
+7445
+7446
+7447
+7448
+7449
+7450
+7451
+7452
+7453
+7454
+7455
+7456
+7457
+7458
+7459
+7460
+7461
+7462
+7463
+7464
+7465
+7466
+7467
+7468
+7469
+7470
+7471
+7472
+7473
+7474
+7475
+7476
+7477
+7478
+7479
+7480
+7481
+7482
+7483
+7484
+7485
+7486
+7487
+7488
+7489
+7490
+7491
+7492
+7493
+7494
+7495
+7496
+7497
+7498
+7499
+7500
+7501
+7502
+7503
+7504
+7505
+7506
+7507
+7508
+7509
+7510
+7511
+7512
+7513
+7514
+7515
+7516
+7517
+7518
+7519
+7520
+7521
+7522
+7523
+7524
+7525
+7526
+7527
+7528
+7529
+7530
+7531
+7532
+7533
+7534
+7535
+7536
+7537
+7538
+7539
+7540
+7541
+7542
+7543
+7544
+7545
+7546
+7547
+7548
+7549
+7550
+7551
+7552
+7553
+7554
+7555
+7556
+7557
+7558
+7559
+7560
+7561
+7562
+7563
+7564
+7565
+7566
+7567
+7568
+7569
+7570
+7571
+7572
+7573
+7574
+7575
+7576
+7577
+7578
+7579
+7580
+7581
+7582
+7583
+7584
+7585
+7586
+7587
+7588
+7589
+7590
+7591
+7592
+7593
+7594
+7595
+7596
+7597
+7598
+7599
+7600
+7601
+7602
+7603
+7604
+7605
+7606
+7607
+7608
+7609
+7610
+7611
+7612
+7613
+7614
+7615
+7616
+7617
+7618
+7619
+7620
+7621
+7622
+7623
+7624
+7625
+7626
+7627
+7628
+7629
+7630
+7631
+7632
+7633
+7634
+7635
+7636
+7637
+7638
+7639
+7640
+7641
+7642
+7643
+7644
+7645
+7646
+7647
+7648
+7649
+7650
+7651
+7652
+7653
+7654
+7655
+7656
+7657
+7658
+7659
+7660
+7661
+7662
+7663
+7664
+7665
+7666
+7667
+7668
+7669
+7670
+7671
+7672
+7673
+7674
+7675
+7676
+7677
+7678
+7679
+7680
+7681
+7682
+7683
+7684
+7685
+7686
+7687
+7688
+7689
+7690
+7691
+7692
+7693
+7694
+7695
+7696
+7697
+7698
+7699
+7700
+7701
+7702
+7703
+7704
+7705
+7706
+7707
+7708
+7709
+7710
+7711
+7712
+7713
+7714
+7715
+7716
+7717
+7718
+7719
+7720
+7721
+7722
+7723
+7724
+7725
+7726
+7727
+7728
+7729
+7730
+7731
+7732
+7733
+7734
+7735
+7736
+7737
+7738
+7739
+7740
+7741
+7742
+7743
+7744
+7745
+7746
+7747
+7748
+7749
+7750
+7751
+7752
+7753
+7754
+7755
+7756
+7757
+7758
+7759
+7760
+7761
+7762
+7763
+7764
+7765
+7766
+7767
+7768
+7769
+7770
+7771
+7772
+7773
+7774
+7775
+7776
+7777
+7778
+7779
+7780
+7781
+7782
+7783
+7784
+7785
+7786
+7787
+7788
+7789
+7790
+7791
+7792
+7793
+7794
+7795
+7796
+7797
+7798
+7799
+7800
+7801
+7802
+7803
+7804
+7805
+7806
+7807
+7808
+7809
+7810
+7811
+7812
+7813
+7814
+7815
+7816
+7817
+7818
+7819
+7820
+7821
+7822
+7823
+7824
+7825
+7826
+7827
+7828
+7829
+7830
+7831
+7832
+7833
+7834
+7835
+7836
+7837
+7838
+7839
+7840
+7841
+7842
+7843
+7844
+7845
+7846
+7847
+7848
+7849
+7850
+7851
+7852
+7853
+7854
+7855
+7856
+7857
+7858
+7859
+7860
+7861
+7862
+7863
+7864
+7865
+7866
+7867
+7868
+7869
+7870
+7871
+7872
+7873
+7874
+7875
+7876
+7877
+7878
+7879
+7880
+7881
+7882
+7883
+7884
+7885
+7886
+7887
+7888
+7889
+7890
+7891
+7892
+7893
+7894
+7895
+7896
+7897
+7898
+7899
+7900
+7901
+7902
+7903
+7904
+7905
+7906
+7907
+7908
+7909
+7910
+7911
+7912
+7913
+7914
+7915
+7916
+7917
+7918
+7919
+7920
+7921
+7922
+7923
+7924
+7925
+7926
+7927
+7928
+7929
+7930
+7931
+7932
+7933
+7934
+7935
+7936
+7937
+7938
+7939
+7940
+7941
+7942
+7943
+7944
+7945
+7946
+7947
+7948
+7949
+7950
+7951
+7952
+7953
+7954
+7955
+7956
+7957
+7958
+7959
+7960
+7961
+7962
+7963
+7964
+7965
+7966
+7967
+7968
+7969
+7970
+7971
+7972
+7973
+7974
+7975
+7976
+7977
+7978
+7979
+7980
+7981
+7982
+7983
+7984
+7985
+7986
+7987
+7988
+7989
+7990
+7991
+7992
+7993
+7994
+7995
+7996
+7997
+7998
+7999
+8000
+8001
+8002
+8003
+8004
+8005
+8006
+8007
+8008
+8009
+8010
+8011
+8012
+8013
+8014
+8015
+8016
+8017
+8018
+8019
+8020
+8021
+8022
+8023
+8024
+8025
+8026
+8027
+8028
+8029
+8030
+8031
+8032
+8033
+8034
+8035
+8036
+8037
+8038
+8039
+8040
+8041
+8042
+8043
+8044
+8045
+8046
+8047
+8048
+8049
+8050
+8051
+8052
+8053
+8054
+8055
+8056
+8057
+8058
+8059
+8060
+8061
+8062
+8063
+8064
+8065
+8066
+8067
+8068
+8069
+8070
+8071
+8072
+8073
+8074
+8075
+8076
+8077
+8078
+8079
+8080
+8081
+8082
+8083
+8084
+8085
+8086
+8087
+8088
+8089
+8090
+8091
+8092
+8093
+8094
+8095
+8096
+8097
+8098
+8099
+8100
+8101
+8102
+8103
+8104
+8105
+8106
+8107
+8108
+8109
+8110
+8111
+8112
+8113
+8114
+8115
+8116
+8117
+8118
+8119
+8120
+8121
+8122
+8123
+8124
+8125
+8126
+8127
+8128
+8129
+8130
+8131
+8132
+8133
+8134
+8135
+8136
+8137
+8138
+8139
+8140
+8141
+8142
+8143
+8144
+8145
+8146
+8147
+8148
+8149
+8150
+8151
+8152
+8153
+8154
+8155
+8156
+8157
+8158
+8159
+8160
+8161
+8162
+8163
+8164
+8165
+8166
+8167
+8168
+8169
+8170
+8171
+8172
+8173
+8174
+8175
+8176
+8177
+8178
+8179
+8180
+8181
+8182
+8183
+8184
+8185
+8186
+8187
+8188
+8189
+8190
+8191
+8192
+8193
+8194
+8195
+8196
+8197
+8198
+8199
+8200
+8201
+8202
+8203
+8204
+8205
+8206
+8207
+8208
+8209
+8210
+8211
+8212
+8213
+8214
+8215
+8216
+8217
+8218
+8219
+8220
+8221
+8222
+8223
+8224
+8225
+8226
+8227
+8228
+8229
+8230
+8231
+8232
+8233
+8234
+8235
+8236
+8237
+8238
+8239
+8240
+8241
+8242
+8243
+8244
+8245
+8246
+8247
+8248
+8249
+8250
+8251
+8252
+8253
+8254
+8255
+8256
+8257
+8258
+8259
+8260
+8261
+8262
+8263
+8264
+8265
+8266
+8267
+8268
+8269
+8270
+8271
+8272
+8273
+8274
+8275
+8276
+8277
+8278
+8279
+8280
+8281
+8282
+8283
+8284
+8285
+8286
+8287
+8288
+8289
+8290
+8291
+8292
+8293
+8294
+8295
+8296
+8297
+8298
+8299
+8300
+8301
+8302
+8303
+8304
+8305
+8306
+8307
+8308
+8309
+8310
+8311
+8312
+8313
+8314
+8315
+8316
+8317
+8318
+8319
+8320
+8321
+8322
+8323
+8324
+8325
+8326
+8327
+8328
+8329
+8330
+8331
+8332
+8333
+8334
+8335
+8336
+8337
+8338
+8339
+8340
+8341
+8342
+8343
+8344
+8345
+8346
+8347
+8348
+8349
+8350
+8351
+8352
+8353
+8354
+8355
+8356
+8357
+8358
+8359
+8360
+8361
+8362
+8363
+8364
+8365
+8366
+8367
+8368
+8369
+8370
+8371
+8372
+8373
+8374
+8375
+8376
+8377
+8378
+8379
+8380
+8381
+8382
+8383
+8384
+8385
+8386
+8387
+8388
+8389
+8390
+8391
+8392
+8393
+8394
+8395
+8396
+8397
+8398
+8399
+8400
+8401
+8402
+8403
+8404
+8405
+8406
+8407
+8408
+8409
+8410
+8411
+8412
+8413
+8414
+8415
+8416
+8417
+8418
+8419
+8420
+8421
+8422
+8423
+8424
+8425
+8426
+8427
+8428
+8429
+8430
+8431
+8432
+8433
+8434
+8435
+8436
+8437
+8438
+8439
+8440
+8441
+8442
+8443
+8444
+8445
+8446
+8447
+8448
+8449
+8450
+8451
+8452
+8453
+8454
+8455
+8456
+8457
+8458
+8459
+8460
+8461
+8462
+8463
+8464
+8465
+8466
+8467
+8468
+8469
+8470
+8471
+8472
+8473
+8474
+8475
+8476
+8477
+8478
+8479
+8480
+8481
+8482
+8483
+8484
+8485
+8486
+8487
+8488
+8489
+8490
+8491
+8492
+8493
+8494
+8495
+8496
+8497
+8498
+8499
+8500
+8501
+8502
+8503
+8504
+8505
+8506
+8507
+8508
+8509
+8510
+8511
+8512
+8513
+8514
+8515
+8516
+8517
+8518
+8519
+8520
+8521
+8522
+8523
+8524
+8525
+8526
+8527
+8528
+8529
+8530
+8531
+8532
+8533
+8534
+8535
+8536
+8537
+8538
+8539
+8540
+8541
+8542
+8543
+8544
+8545
+8546
+8547
+8548
+8549
+8550
+8551
+8552
+8553
+8554
+8555
+8556
+8557
+8558
+8559
+8560
+8561
+8562
+8563
+8564
+8565
+8566
+8567
+8568
+8569
+8570
+8571
+8572
+8573
+8574
+8575
+8576
+8577
+8578
+8579
+8580
+8581
+8582
+8583
+8584
+8585
+8586
+8587
+8588
+8589
+8590
+8591
+8592
+8593
+8594
+8595
+8596
+8597
+8598
+8599
+8600
+8601
+8602
+8603
+8604
+8605
+8606
+8607
+8608
+8609
+8610
+8611
+8612
+8613
+8614
+8615
+8616
+8617
+8618
+8619
+8620
+8621
+8622
+8623
+8624
+8625
+8626
+8627
+8628
+8629
+8630
+8631
+8632
+8633
+8634
+8635
+8636
+8637
+8638
+8639
+8640
+8641
+8642
+8643
+8644
+8645
+8646
+8647
+8648
+8649
+8650
+8651
+8652
+8653
+8654
+8655
+8656
+8657
+8658
+8659
+8660
+8661
+8662
+8663
+8664
+8665
+8666
+8667
+8668
+8669
+8670
+8671
+8672
+8673
+8674
+8675
+8676
+8677
+8678
+8679
+8680
+8681
+8682
+8683
+8684
+8685
+8686
+8687
+8688
+8689
+8690
+8691
+8692
+8693
+8694
+8695
+8696
+8697
+8698
+8699
+8700
+8701
+8702
+8703
+8704
+8705
+8706
+8707
+8708
+8709
+8710
+8711
+8712
+8713
+8714
+8715
+8716
+8717
+8718
+8719
+8720
+8721
+8722
+8723
+8724
+8725
+8726
+8727
+8728
+8729
+8730
+8731
+8732
+8733
+8734
+8735
+8736
+8737
+8738
+8739
+8740
+8741
+8742
+8743
+8744
+8745
+8746
+8747
+8748
+8749
+8750
+8751
+8752
+8753
+8754
+8755
+8756
+8757
+8758
+8759
+8760
+8761
+8762
+8763
+8764
+8765
+8766
+8767
+8768
+8769
+8770
+8771
+8772
+8773
+8774
+8775
+8776
+8777
+8778
+8779
+8780
+8781
+8782
+8783
+8784
+8785
+8786
+8787
+8788
+8789
+8790
+8791
+8792
+8793
+8794
+8795
+8796
+8797
+8798
+8799
+8800
+8801
+8802
+8803
+8804
+8805
+8806
+8807
+8808
+8809
+8810
+8811
+8812
+8813
+8814
+8815
+8816
+8817
+8818
+8819
+8820
+8821
+8822
+8823
+8824
+8825
+8826
+8827
+8828
+8829
+8830
+8831
+8832
+8833
+8834
+8835
+8836
+8837
+8838
+8839
+8840
+8841
+8842
+8843
+8844
+8845
+8846
+8847
+8848
+8849
+8850
+8851
+8852
+8853
+8854
+8855
+8856
+8857
+8858
+8859
+8860
+8861
+8862
+8863
+8864
+8865
+8866
+8867
+8868
+8869
+8870
+8871
+8872
+8873
+8874
+8875
+8876
+8877
+8878
+8879
+8880
+8881
+8882
+8883
+8884
+8885
+8886
+8887
+8888
+8889
+8890
+8891
+8892
+8893
+8894
+8895
+8896
+8897
+8898
+8899
+8900
+8901
+8902
+8903
+8904
+8905
+8906
+8907
+8908
+8909
+8910
+8911
+8912
+8913
+8914
+8915
+8916
+8917
+8918
+8919
+8920
+8921
+8922
+8923
+8924
+8925
+8926
+8927
+8928
+8929
+8930
+8931
+8932
+8933
+8934
+8935
+8936
+8937
+8938
+8939
+8940
+8941
+8942
+8943
+8944
+8945
+8946
+8947
+8948
+8949
+8950
+8951
+8952
+8953
+8954
+8955
+8956
+8957
+8958
+8959
+8960
+8961
+8962
+8963
+8964
+8965
+8966
+8967
+8968
+8969
+8970
+8971
+8972
+8973
+8974
+8975
+8976
+8977
+8978
+8979
+8980
+8981
+8982
+8983
+8984
+8985
+8986
+8987
+8988
+8989
+8990
+8991
+8992
+8993
+8994
+8995
+8996
+8997
+8998
+8999
+9000
+9001
+9002
+9003
+9004
+9005
+9006
+9007
+9008
+9009
+9010
+9011
+9012
+9013
+9014
+9015
+9016
+9017
+9018
+9019
+9020
+9021
+9022
+9023
+9024
+9025
+9026
+9027
+9028
+9029
+9030
+9031
+9032
+9033
+9034
+9035
+9036
+9037
+9038
+9039
+9040
+9041
+9042
+9043
+9044
+9045
+9046
+9047
+9048
+9049
+9050
+9051
+9052
+9053
+9054
+9055
+9056
+9057
+9058
+9059
+9060
+9061
+9062
+9063
+9064
+9065
+9066
+9067
+9068
+9069
+9070
+9071
+9072
+9073
+9074
+9075
+9076
+9077
+9078
+9079
+9080
+9081
+9082
+9083
+9084
+9085
+9086
+9087
+9088
+9089
+9090
+9091
+9092
+9093
+9094
+9095
+9096
+9097
+9098
+9099
+9100
+9101
+9102
+9103
+9104
+9105
+9106
+9107
+9108
+9109
+9110
+9111
+9112
+9113
+9114
+9115
+9116
+9117
+9118
+9119
+9120
+9121
+9122
+9123
+9124
+9125
+9126
+9127
+9128
+9129
+9130
+9131
+9132
+9133
+9134
+9135
+9136
+9137
+9138
+9139
+9140
+9141
+9142
+9143
+9144
+9145
+9146
+9147
+9148
+9149
+9150
+9151
+9152
+9153
+9154
+9155
+9156
+9157
+9158
+9159
+9160
+9161
+9162
+9163
+9164
+9165
+9166
+9167
+9168
+9169
+9170
+9171
+9172
+9173
+9174
+9175
+9176
+9177
+9178
+9179
+9180
+9181
+9182
+9183
+9184
+9185
+9186
+9187
+9188
+9189
+9190
+9191
+9192
+9193
+9194
+9195
+9196
+9197
+9198
+9199
+9200
+9201
+9202
+9203
+9204
+9205
+9206
+9207
+9208
+9209
+9210
+9211
+9212
+9213
+9214
+9215
+9216
+9217
+9218
+9219
+9220
+9221
+9222
+9223
+9224
+9225
+9226
+9227
+9228
+9229
+9230
+9231
+9232
+9233
+9234
+9235
+9236
+9237
+9238
+9239
+9240
+9241
+9242
+9243
+9244
+9245
+9246
+9247
+9248
+9249
+9250
+9251
+9252
+9253
+9254
+9255
+9256
+9257
+9258
+9259
+9260
+9261
+9262
+9263
+9264
+9265
+9266
+9267
+9268
+9269
+9270
+9271
+9272
+9273
+9274
+9275
+9276
+9277
+9278
+9279
+9280
+9281
+9282
+9283
+9284
+9285
+9286
+9287
+9288
+9289
+9290
+9291
+9292
+9293
+9294
+9295
+9296
+9297
+9298
+9299
+9300
+9301
+9302
+9303
+9304
+9305
+9306
+9307
+9308
+9309
+9310
+9311
+9312
+9313
+9314
+9315
+9316
+9317
+9318
+9319
+9320
+9321
+9322
+9323
+9324
+9325
+9326
+9327
+9328
+9329
+9330
+9331
+9332
+9333
+9334
+9335
+9336
+9337
+9338
+9339
+9340
+9341
+9342
+9343
+9344
+9345
+9346
+9347
+9348
+9349
+9350
+9351
+9352
+9353
+9354
+9355
+9356
+9357
+9358
+9359
+9360
+9361
+9362
+9363
+9364
+9365
+9366
+9367
+9368
+9369
+9370
+9371
+9372
+9373
+9374
+9375
+9376
+9377
+9378
+9379
+9380
+9381
+9382
+9383
+9384
+9385
+9386
+9387
+9388
+9389
+9390
+9391
+9392
+9393
+9394
+9395
+9396
+9397
+9398
+9399
+9400
+9401
+9402
+9403
+9404
+9405
+9406
+9407
+9408
+9409
+9410
+9411
+9412
+9413
+9414
+9415
+9416
+9417
+9418
+9419
+9420
+9421
+9422
+9423
+9424
+9425
+9426
+9427
+9428
+9429
+9430
+9431
+9432
+9433
+9434
+9435
+9436
+9437
+9438
+9439
+9440
+9441
+9442
+9443
+9444
+9445
+9446
+9447
+9448
+9449
+9450
+9451
+9452
+9453
+9454
+9455
+9456
+9457
+9458
+9459
+9460
+9461
+9462
+9463
+9464
+9465
+9466
+9467
+9468
+9469
+9470
+9471
+9472
+9473
+9474
+9475
+9476
+9477
+9478
+9479
+9480
+9481
+9482
+9483
+9484
+9485
+9486
+9487
+9488
+9489
+9490
+9491
+9492
+9493
+9494
+9495
+9496
+9497
+9498
+9499
+9500
+9501
+9502
+9503
+9504
+9505
+9506
+9507
+9508
+9509
+9510
+9511
+9512
+9513
+9514
+9515
+9516
+9517
+9518
+9519
+9520
+9521
+9522
+9523
+9524
+9525
+9526
+9527
+9528
+9529
+9530
+9531
+9532
+9533
+9534
+9535
+9536
+9537
+9538
+9539
+9540
+9541
+9542
+9543
+9544
+9545
+9546
+9547
+9548
+9549
+9550
+9551
+9552
+9553
+9554
+9555
+9556
+9557
+9558
+9559
+9560
+9561
+9562
+9563
+9564
+9565
+9566
+9567
+9568
+9569
+9570
+9571
+9572
+9573
+9574
+9575
+9576
+9577
+9578
+9579
+9580
+9581
+9582
+9583
+9584
+9585
+9586
+9587
+9588
+9589
+9590
+9591
+9592
+9593
+9594
+9595
+9596
+9597
+9598
+9599
+9600
+9601
+9602
+9603
+9604
+9605
+9606
+9607
+9608
+9609
+9610
+9611
+9612
+9613
+9614
+9615
+9616
+9617
+9618
+9619
+9620
+9621
+9622
+9623
+9624
+9625
+9626
+9627
+9628
+9629
+9630
+9631
+9632
+9633
+9634
+9635
+9636
+9637
+9638
+9639
+9640
+9641
+9642
+9643
+9644
+9645
+9646
+9647
+9648
+9649
+9650
+9651
+9652
+9653
+9654
+9655
+9656
+9657
+9658
+9659
+9660
+9661
+9662
+9663
+9664
+9665
+9666
+9667
+9668
+9669
+9670
+9671
+9672
+9673
+9674
+9675
+9676
+9677
+9678
+9679
+9680
+9681
+9682
+9683
+9684
+9685
+9686
+9687
+9688
+9689
+9690
+9691
+9692
+9693
+9694
+9695
+9696
+9697
+9698
+9699
+9700
+9701
+9702
+9703
+9704
+9705
+9706
+9707
+9708
+9709
+9710
+9711
+9712
+9713
+9714
+9715
+9716
+9717
+9718
+9719
+9720
+9721
+9722
+9723
+9724
+9725
+9726
+9727
+9728
+9729
+9730
+9731
+9732
+9733
+9734
+9735
+9736
+9737
+9738
+9739
+9740
+9741
+9742
+9743
+9744
+9745
+9746
+9747
+9748
+9749
+9750
+9751
+9752
+9753
+9754
+9755
+9756
+9757
+9758
+9759
+9760
+9761
+9762
+9763
+9764
+9765
+9766
+9767
+9768
+9769
+9770
+9771
+9772
+9773
+9774
+9775
+9776
+9777
+9778
+9779
+9780
+9781
+9782
+9783
+9784
+9785
+9786
+9787
+9788
+9789
+9790
+9791
+9792
+9793
+9794
+9795
+9796
+9797
+9798
+9799
+9800
+9801
+9802
+9803
+9804
+9805
+9806
+9807
+9808
+9809
+9810
+9811
+9812
+9813
+9814
+9815
+9816
+9817
+9818
+9819
+9820
+9821
+9822
+9823
+9824
+9825
+9826
+9827
+9828
+9829
+9830
+9831
+9832
+9833
+9834
+9835
+9836
+9837
+9838
+9839
+9840
+9841
+9842
+9843
+9844
+9845
+9846
+9847
+9848
+9849
+9850
+9851
+9852
+9853
+9854
+9855
+9856
+9857
+9858
+9859
+9860
+9861
+9862
+9863
+9864
+9865
+9866
+9867
+9868
+9869
+9870
+9871
+9872
+9873
+9874
+9875
+9876
+9877
+9878
+9879
+9880
+9881
+9882
+9883
+9884
+9885
+9886
+9887
+9888
+9889
+9890
+9891
+9892
+9893
+9894
+9895
+9896
+9897
+9898
+9899
+9900
+9901
+9902
+9903
+9904
+9905
+9906
+9907
+9908
+9909
+9910
+9911
+9912
+9913
+9914
+9915
+9916
+9917
+9918
+9919
+9920
+9921
+9922
+9923
+9924
+9925
+9926
+9927
+9928
+9929
+9930
+9931
+9932
+9933
+9934
+9935
+9936
+9937
+9938
+9939
+9940
+9941
+9942
+9943
+9944
+9945
+9946
+9947
+9948
+9949
+9950
+9951
+9952
+9953
+9954
+9955
+9956
+9957
+9958
+9959
+9960
+9961
+9962
+9963
+9964
+9965
+9966
+9967
+9968
+9969
+9970
+9971
+9972
+9973
+9974
+9975
+9976
+9977
+9978
+9979
+9980
+9981
+9982
+9983
+9984
+9985
+9986
+9987
+9988
+9989
+9990
+9991
+9992
+9993
+9994
+9995
+9996
+9997
+9998
+9999
+10000
+10001
+10002
+10003
+10004
+10005
+10006
+10007
+10008
+10009
+10010
+10011
+10012
+10013
+10014
+10015
+10016
+10017
+10018
+10019
+10020
+10021
+10022
+10023
+10024
+10025
+10026
+10027
+10028
+10029
+10030
+10031
+10032
+10033
+10034
+10035
+10036
+10037
+10038
+10039
+10040
+10041
+10042
+10043
+10044
+10045
+10046
+10047
+10048
+10049
+10050
+10051
+10052
+10053
+10054
+10055
+10056
+10057
+10058
+10059
+10060
+10061
+10062
+10063
+10064
+10065
+10066
+10067
+10068
+10069
+10070
+10071
+10072
+10073
+10074
+10075
+10076
+10077
+10078
+10079
+10080
+10081
+10082
+10083
+10084
+10085
+10086
+10087
+10088
+10089
+10090
+10091
+10092
+10093
+10094
+10095
+10096
+10097
+10098
+10099
+10100
+10101
+10102
+10103
+10104
+10105
+10106
+10107
+10108
+10109
+10110
+10111
+10112
+10113
+10114
+10115
+10116
+10117
+10118
+10119
+10120
+10121
+10122
+10123
+10124
+10125
+10126
+10127
+10128
+10129
+10130
+10131
+10132
+10133
+10134
+10135
+10136
+10137
+10138
+10139
+10140
+10141
+10142
+10143
+10144
+10145
+10146
+10147
+10148
+10149
+10150
+10151
+10152
+10153
+10154
+10155
+10156
+10157
+10158
+10159
+10160
+10161
+10162
+10163
+10164
+10165
+10166
+10167
+10168
+10169
+10170
+10171
+10172
+10173
+10174
+10175
+10176
+10177
+10178
+10179
+10180
+10181
+10182
+10183
+10184
+10185
+10186
+10187
+10188
+10189
+10190
+10191
+10192
+10193
+10194
+10195
+10196
+10197
+10198
+10199
+10200
+10201
+10202
+10203
+10204
+10205
+10206
+10207
+10208
+10209
+10210
+10211
+10212
+10213
+10214
+10215
+10216
+10217
+10218
+10219
+10220
+10221
+10222
+10223
+10224
+10225
+10226
+10227
+10228
+10229
+10230
+10231
+10232
+10233
+10234
+10235
+10236
+10237
+10238
+10239
+10240
+10241
+10242
+10243
+10244
+10245
+10246
+10247
+10248
+10249
+10250
+10251
+10252
+10253
+10254
+10255
+10256
+10257
+10258
+10259
+10260
+10261
+10262
+10263
+10264
+10265
+10266
+10267
+10268
+10269
+10270
+10271
+10272
+10273
+10274
+10275
+10276
+10277
+10278
+10279
+10280
+10281
+10282
+10283
+10284
+10285
+10286
+10287
+10288
+10289
+10290
+10291
+10292
+10293
+10294
+10295
+10296
+10297
+10298
+10299
+10300
+10301
+10302
+10303
+10304
+10305
+10306
+10307
+10308
+10309
+10310
+10311
+10312
+10313
+10314
+10315
+10316
+10317
+10318
+10319
+10320
+10321
+10322
+10323
+10324
+10325
+10326
+10327
+10328
+10329
+10330
+10331
+10332
+10333
+10334
+10335
+10336
+10337
+10338
+10339
+10340
+10341
+10342
+10343
+10344
+10345
+10346
+10347
+10348
+10349
+10350
+10351
+10352
+10353
+10354
+10355
+10356
+10357
+10358
+10359
+10360
+10361
+10362
+10363
+10364
+10365
+10366
+10367
+10368
+10369
+10370
+10371
+10372
+10373
+10374
+10375
+10376
+10377
+10378
+10379
+10380
+10381
+10382
+10383
+10384
+10385
+10386
+10387
+10388
+10389
+10390
+10391
+10392
+10393
+10394
+10395
+10396
+10397
+10398
+10399
+10400
+10401
+10402
+10403
+10404
+10405
+10406
+10407
+10408
+10409
+10410
+10411
+10412
+10413
+10414
+10415
+10416
+10417
+10418
+10419
+10420
+10421
+10422
+10423
+10424
+10425
+10426
+10427
+10428
+10429
+10430
+10431
+10432
+10433
+10434
+10435
+10436
+10437
+10438
+10439
+10440
+10441
+10442
+10443
+10444
+10445
+10446
+10447
+10448
+10449
+10450
+10451
+10452
+10453
+10454
+10455
+10456
+10457
+10458
+10459
+10460
+10461
+10462
+10463
+10464
+10465
+10466
+10467
+10468
+10469
+10470
+10471
+10472
+10473
+10474
+10475
+10476
+10477
+10478
+10479
+10480
+10481
+10482
+10483
+10484
+10485
+10486
+10487
+10488
+10489
+10490
+10491
+10492
+10493
+10494
+10495
+10496
+10497
+10498
+10499
+10500
+10501
+10502
+10503
+10504
+10505
+10506
+10507
+10508
+10509
+10510
+10511
+10512
+10513
+10514
+10515
+10516
+10517
+10518
+10519
+10520
+10521
+10522
+10523
+10524
+10525
+10526
+10527
+10528
+10529
+10530
+10531
+10532
+10533
+10534
+10535
+10536
+10537
+10538
+10539
+10540
+10541
+10542
+10543
+10544
+10545
+10546
+10547
+10548
+10549
+10550
+10551
+10552
+10553
+10554
+10555
+10556
+10557
+10558
+10559
+10560
+10561
+10562
+10563
+10564
+10565
+10566
+10567
+10568
+10569
+10570
+10571
+10572
+10573
+10574
+10575
+10576
+10577
+10578
+10579
+10580
+10581
+10582
+10583
+10584
+10585
+10586
+10587
+10588
+10589
+10590
+10591
+10592
+10593
+10594
+10595
+10596
+10597
+10598
+10599
+10600
+10601
+10602
+10603
+10604
+10605
+10606
+10607
+10608
+10609
+10610
+10611
+10612
+10613
+10614
+10615
+10616
+10617
+10618
+10619
+10620
+10621
+10622
+10623
+10624
+10625
+10626
+10627
+10628
+10629
+10630
+10631
+10632
+10633
+10634
+10635
+10636
+10637
+10638
+10639
+10640
+10641
+10642
+10643
+10644
+10645
+10646
+10647
+10648
+10649
+10650
+10651
+10652
+10653
+10654
+10655
+10656
+10657
+10658
+10659
+10660
+10661
+10662
+10663
+10664
+10665
+10666
+10667
+10668
+10669
+10670
+10671
+10672
+10673
+10674
+10675
+10676
+10677
+10678
+10679
+10680
+10681
+10682
+10683
+10684
+10685
+10686
+10687
+10688
+10689
+10690
+10691
+10692
+10693
+10694
+10695
+10696
+10697
+10698
+10699
+10700
+10701
+10702
+10703
+10704
+10705
+10706
+10707
+10708
+10709
+10710
+10711
+10712
+10713
+10714
+10715
+10716
+10717
+10718
+10719
+10720
+10721
+10722
+10723
+10724
+10725
+10726
+10727
+10728
+10729
+10730
+10731
+10732
+10733
+10734
+10735
+10736
+10737
+10738
+10739
+10740
+10741
+10742
+10743
+10744
+10745
+10746
+10747
+10748
+10749
+10750
+10751
+10752
+10753
+10754
+10755
+10756
+10757
+10758
+10759
+10760
+10761
+10762
+10763
+10764
+10765
+10766
+10767
+10768
+10769
+10770
+10771
+10772
+10773
+10774
+10775
+10776
+10777
+10778
+10779
+10780
+10781
+10782
+10783
+10784
+10785
+10786
+10787
+10788
+10789
+10790
+10791
+10792
+10793
+10794
+10795
+10796
+10797
+10798
+10799
+10800
+10801
+10802
+10803
+10804
+10805
+10806
+10807
+10808
+10809
+10810
+10811
+10812
+10813
+10814
+10815
+10816
+10817
+10818
+10819
+10820
+10821
+10822
+10823
+10824
+10825
+10826
+10827
+10828
+10829
+10830
+10831
+10832
+10833
+10834
+10835
+10836
+10837
+10838
+10839
+10840
+10841
+10842
+10843
+10844
+10845
+10846
+10847
+10848
+10849
+10850
+10851
+10852
+10853
+10854
+10855
+10856
+10857
+10858
+10859
+10860
+10861
+10862
+10863
+10864
+10865
+10866
+10867
+10868
+10869
+10870
+10871
+10872
+10873
+10874
+10875
+10876
+10877
+10878
+10879
+10880
+10881
+10882
+10883
+10884
+10885
+10886
+10887
+10888
+10889
+10890
+10891
+10892
+10893
+10894
+10895
+10896
+10897
+10898
+10899
+10900
+10901
+10902
+10903
+10904
+10905
+10906
+10907
+10908
+10909
+10910
+10911
+10912
+10913
+10914
+10915
+10916
+10917
+10918
+10919
+10920
+10921
+10922
+10923
+10924
+10925
+10926
+10927
+10928
+10929
+10930
+10931
+10932
+10933
+10934
+10935
+10936
+10937
+10938
+10939
+10940
+10941
+10942
+10943
+10944
+10945
+10946
+10947
+10948
+10949
+10950
+10951
+10952
+10953
+10954
+10955
+10956
+10957
+10958
+10959
+10960
+10961
+10962
+10963
+10964
+10965
+10966
+10967
+10968
+10969
+10970
+10971
+10972
+10973
+10974
+10975
+10976
+10977
+10978
+10979
+10980
+10981
+10982
+10983
+10984
+10985
+10986
+10987
+10988
+10989
+10990
+10991
+10992
+10993
+10994
+10995
+10996
+10997
+10998
+10999
+11000
+11001
+11002
+11003
+11004
+11005
+11006
+11007
+11008
+11009
+11010
+11011
+11012
+11013
+11014
+11015
+11016
+11017
+11018
+11019
+11020
+11021
+11022
+11023
+11024
+11025
+11026
+11027
+11028
+11029
+11030
+11031
+11032
+11033
+11034
+11035
+11036
+11037
+11038
+11039
+11040
+11041
+11042
+11043
+11044
+11045
+11046
+11047
+11048
+11049
+11050
+11051
+11052
+11053
+11054
+11055
+11056
+11057
+11058
+11059
+11060
+11061
+11062
+11063
+11064
+11065
+11066
+11067
+11068
+11069
+11070
+11071
+11072
+11073
+11074
+11075
+11076
+11077
+11078
+11079
+11080
+11081
+11082
+11083
+11084
+11085
+11086
+11087
+11088
+11089
+11090
+11091
+11092
+11093
+11094
+11095
+11096
+11097
+11098
+11099
+11100
+11101
+11102
+11103
+11104
+11105
+11106
+11107
+11108
+11109
+11110
+11111
+11112
+11113
+11114
+11115
+11116
+11117
+11118
+11119
+11120
+11121
+11122
+11123
+11124
+11125
+11126
+11127
+11128
+11129
+11130
+11131
+11132
+11133
+11134
+11135
+11136
+11137
+11138
+11139
+11140
+11141
+11142
+11143
+11144
+11145
+11146
+11147
+11148
+11149
+11150
+11151
+11152
+11153
+11154
+11155
+11156
+11157
+11158
+11159
+11160
+11161
+11162
+11163
+11164
+11165
+11166
+11167
+11168
+11169
+11170
+11171
+11172
+11173
+11174
+11175
+11176
+11177
+11178
+11179
+11180
+11181
+11182
+11183
+11184
+11185
+11186
+11187
+11188
+11189
+11190
+11191
+11192
+11193
+11194
+11195
+11196
+11197
+11198
+11199
+11200
+11201
+11202
+11203
+11204
+11205
+11206
+11207
+11208
+11209
+11210
+11211
+11212
+11213
+11214
+11215
+11216
+11217
+11218
+11219
+11220
+11221
+11222
+11223
+11224
+11225
+11226
+11227
+11228
+11229
+11230
+11231
+11232
+11233
+11234
+11235
+11236
+11237
+11238
+11239
+11240
+11241
+11242
+11243
+11244
+11245
+11246
+11247
+11248
+11249
+11250
+11251
+11252
+11253
+11254
+11255
+11256
+11257
+11258
+11259
+11260
+11261
+11262
+11263
+11264
+11265
+11266
+11267
+11268
+11269
+11270
+11271
+11272
+11273
+11274
+11275
+11276
+11277
+11278
+11279
+11280
+11281
+11282
+11283
+11284
+11285
+11286
+11287
+11288
+11289
+11290
+11291
+11292
+11293
+11294
+11295
+11296
+11297
+11298
+11299
+11300
+11301
+11302
+11303
+11304
+11305
+11306
+11307
+11308
+11309
+11310
+11311
+11312
+11313
+11314
+11315
+11316
+11317
+11318
+11319
+11320
+11321
+11322
+11323
+11324
+11325
+11326
+11327
+11328
+11329
+11330
+11331
+11332
+11333
+11334
+11335
+11336
+11337
+11338
+11339
+11340
+11341
+11342
+11343
+11344
+11345
+11346
+11347
+11348
+11349
+11350
+11351
+11352
+11353
+11354
+11355
+11356
+11357
+11358
+11359
+11360
+11361
+11362
+11363
+11364
+11365
+11366
+11367
+11368
+11369
+11370
+11371
+11372
+11373
+11374
+11375
+11376
+11377
+11378
+11379
+11380
+11381
+11382
+11383
+11384
+11385
+11386
+11387
+11388
+11389
+11390
+11391
+11392
+11393
+11394
+11395
+11396
+11397
+11398
+11399
+11400
+11401
+11402
+11403
+11404
+11405
+11406
+11407
+11408
+11409
+11410
+11411
+11412
+11413
+11414
+11415
+11416
+11417
+11418
+11419
+11420
+11421
+11422
+11423
+11424
+11425
+11426
+11427
+11428
+11429
+11430
+11431
+11432
+11433
+11434
+11435
+11436
+11437
+11438
+11439
+11440
+11441
+11442
+11443
+11444
+11445
+11446
+11447
+11448
+11449
+11450
+11451
+11452
+11453
+11454
+11455
+11456
+11457
+11458
+11459
+11460
+11461
+11462
+11463
+11464
+11465
+11466
+11467
+11468
+11469
+11470
+11471
+11472
+11473
+11474
+11475
+11476
+11477
+11478
+11479
+11480
+11481
+11482
+11483
+11484
+11485
+11486
+11487
+11488
+11489
+11490
+11491
+11492
+11493
+11494
+11495
+11496
+11497
+11498
+11499
+11500
+11501
+11502
+11503
+11504
+11505
+11506
+11507
+11508
+11509
+11510
+11511
+11512
+11513
+11514
+11515
+11516
+11517
+11518
+11519
+11520
+11521
+11522
+11523
+11524
+11525
+11526
+11527
+11528
+11529
+11530
+11531
+11532
+11533
+11534
+11535
+11536
+11537
+11538
+11539
+11540
+11541
+11542
+11543
+11544
+11545
+11546
+11547
+11548
+11549
+11550
+11551
+11552
+11553
+11554
+11555
+11556
+11557
+11558
+11559
+11560
+11561
+11562
+11563
+11564
+11565
+11566
+11567
+11568
+11569
+11570
+11571
+11572
+11573
+11574
+11575
+11576
+11577
+11578
+11579
+11580
+11581
+11582
+11583
+11584
+11585
+11586
+11587
+11588
+11589
+11590
+11591
+11592
+11593
+11594
+11595
+11596
+11597
+11598
+11599
+11600
+11601
+11602
+11603
+11604
+11605
+11606
+11607
+11608
+11609
+11610
+11611
+11612
+11613
+11614
+11615
+11616
+11617
+11618
+11619
+11620
+11621
+11622
+11623
+11624
+11625
+11626
+11627
+11628
+11629
+11630
+11631
+11632
+11633
+11634
+11635
+11636
+11637
+11638
+11639
+11640
+11641
+11642
+11643
+11644
+11645
+11646
+11647
+11648
+11649
+11650
+11651
+11652
+11653
+11654
+11655
+11656
+11657
+11658
+11659
+11660
+11661
+11662
+11663
+11664
+11665
+11666
+11667
+11668
+11669
+11670
+11671
+11672
+11673
+11674
+11675
+11676
+11677
+11678
+11679
+11680
+11681
+11682
+11683
+11684
+11685
+11686
+11687
+11688
+11689
+11690
+11691
+11692
+11693
+11694
+11695
+11696
+11697
+11698
+11699
+11700
+11701
+11702
+11703
+11704
+11705
+11706
+11707
+11708
+11709
+11710
+11711
+11712
+11713
+11714
+11715
+11716
+11717
+11718
+11719
+11720
+11721
+11722
+11723
+11724
+11725
+11726
+11727
+11728
+11729
+11730
+11731
+11732
+11733
+11734
+11735
+11736
+11737
+11738
+11739
+11740
+11741
+11742
+11743
+11744
+11745
+11746
+11747
+11748
+11749
+11750
+11751
+11752
+11753
+11754
+11755
+11756
+11757
+11758
+11759
+11760
+11761
+11762
+11763
+11764
+11765
+11766
+11767
+11768
+11769
+11770
+11771
+11772
+11773
+11774
+11775
+11776
+11777
+11778
+11779
+11780
+11781
+11782
+11783
+11784
+11785
+11786
+11787
+11788
+11789
+11790
+11791
+11792
+11793
+11794
+11795
+11796
+11797
+11798
+11799
+11800
+11801
+11802
+11803
+11804
+11805
+11806
+11807
+11808
+11809
+11810
+11811
+11812
+11813
+11814
+11815
+11816
+11817
+11818
+11819
+11820
+11821
+11822
+11823
+11824
+11825
+11826
+11827
+11828
+11829
+11830
+11831
+11832
+11833
+11834
+11835
+11836
+11837
+11838
+11839
+11840
+11841
+11842
+11843
+11844
+11845
+11846
+11847
+11848
+11849
+11850
+11851
+11852
+11853
+11854
+11855
+11856
+11857
+11858
+11859
+11860
+11861
+11862
+11863
+11864
+11865
+11866
+11867
+11868
+11869
+11870
+11871
+11872
+11873
+11874
+11875
+11876
+11877
+11878
+11879
+11880
+11881
+11882
+11883
+11884
+11885
+11886
+11887
+11888
+11889
+11890
+11891
+11892
+11893
+11894
+11895
+11896
+11897
+11898
+11899
+11900
+11901
+11902
+11903
+11904
+11905
+11906
+11907
+11908
+11909
+11910
+11911
+11912
+11913
+11914
+11915
+11916
+11917
+11918
+11919
+11920
+11921
+11922
+11923
+11924
+11925
+11926
+11927
+11928
+11929
+11930
+11931
+11932
+11933
+11934
+11935
+11936
+11937
+11938
+11939
+11940
+11941
+11942
+11943
+11944
+11945
+11946
+11947
+11948
+11949
+11950
+11951
+11952
+11953
+11954
+11955
+11956
+11957
+11958
+11959
+11960
+11961
+11962
+11963
+11964
+11965
+11966
+11967
+11968
+11969
+11970
+11971
+11972
+11973
+11974
+11975
+11976
+11977
+11978
+11979
+11980
+11981
+11982
+11983
+11984
+11985
+11986
+11987
+11988
+11989
+11990
+11991
+11992
+11993
+11994
+11995
+11996
+11997
+11998
+11999
+12000
+12001
+12002
+12003
+12004
+12005
+12006
+12007
+12008
+12009
+12010
+12011
+12012
+12013
+12014
+12015
+12016
+12017
+12018
+12019
+12020
+12021
+12022
+12023
+12024
+12025
+12026
+12027
+12028
+12029
+12030
+12031
+12032
+12033
+12034
+12035
+12036
+12037
+12038
+12039
+12040
+12041
+12042
+12043
+12044
+12045
+12046
+12047
+12048
+12049
+12050
+12051
+12052
+12053
+12054
+12055
+12056
+12057
+12058
+12059
+12060
+12061
+12062
+12063
+12064
+12065
+12066
+12067
+12068
+12069
+12070
+12071
+12072
+12073
+12074
+12075
+12076
+12077
+12078
+12079
+12080
+12081
+12082
+12083
+12084
+12085
+12086
+12087
+12088
+12089
+12090
+12091
+12092
+12093
+12094
+12095
+12096
+12097
+12098
+12099
+12100
+12101
+12102
+12103
+12104
+12105
+12106
+12107
+12108
+12109
+12110
+12111
+12112
+12113
+12114
+12115
+12116
+12117
+12118
+12119
+12120
+12121
+12122
+12123
+12124
+12125
+12126
+12127
+12128
+12129
+12130
+12131
+12132
+12133
+12134
+12135
+12136
+12137
+12138
+12139
+12140
+12141
+12142
+12143
+12144
+12145
+12146
+12147
+12148
+12149
+12150
+12151
+12152
+12153
+12154
+12155
+12156
+12157
+12158
+12159
+12160
+12161
+12162
+12163
+12164
+12165
+12166
+12167
+12168
+12169
+12170
+12171
+12172
+12173
+12174
+12175
+12176
+12177
+12178
+12179
+12180
+12181
+12182
+12183
+12184
+12185
+12186
+12187
+12188
+12189
+12190
+12191
+12192
+12193
+12194
+12195
+12196
+12197
+12198
+12199
+12200
+12201
+12202
+12203
+12204
+12205
+12206
+12207
+12208
+12209
+12210
+12211
+12212
+12213
+12214
+12215
+12216
+12217
+12218
+12219
+12220
+12221
+12222
+12223
+12224
+12225
+12226
+12227
+12228
+12229
+12230
+12231
+12232
+12233
+12234
+12235
+12236
+12237
+12238
+12239
+12240
+12241
+12242
+12243
+12244
+12245
+12246
+12247
+12248
+12249
+12250
+12251
+12252
+12253
+12254
+12255
+12256
+12257
+12258
+12259
+12260
+12261
+12262
+12263
+12264
+12265
+12266
+12267
+12268
+12269
+12270
+12271
+12272
+12273
+12274
+12275
+12276
+12277
+12278
+12279
+12280
+12281
+12282
+12283
+12284
+12285
+12286
+12287
+12288
+12289
+12290
+12291
+12292
+12293
+12294
+12295
+12296
+12297
+12298
+12299
+12300
+12301
+12302
+12303
+12304
+12305
+12306
+12307
+12308
+12309
+12310
+12311
+12312
+12313
+12314
+12315
+12316
+12317
+12318
+12319
+12320
+12321
+12322
+12323
+12324
+12325
+12326
+12327
+12328
+12329
+12330
+12331
+12332
+12333
+12334
+12335
+12336
+12337
+12338
+12339
+12340
+12341
+12342
+12343
+12344
+12345
+12346
+12347
+12348
+12349
+12350
+12351
+12352
+12353
+12354
+12355
+12356
+12357
+12358
+12359
+12360
+12361
+12362
+12363
+12364
+12365
+12366
+12367
+12368
+12369
+12370
+12371
+12372
+12373
+12374
+12375
+12376
+12377
+12378
+12379
+12380
+12381
+12382
+12383
+12384
+12385
+12386
+12387
+12388
+12389
+12390
+12391
+12392
+12393
+12394
+12395
+12396
+12397
+12398
+12399
+12400
+12401
+12402
+12403
+12404
+12405
+12406
+12407
+12408
+12409
+12410
+12411
+12412
+12413
+12414
+12415
+12416
+12417
+12418
+12419
+12420
+12421
+12422
+12423
+12424
+12425
+12426
+12427
+12428
+12429
+12430
+12431
+12432
+12433
+12434
+12435
+12436
+12437
+12438
+12439
+12440
+12441
+12442
+12443
+12444
+12445
+12446
+12447
+12448
+12449
+12450
+12451
+12452
+12453
+12454
+12455
+12456
+12457
+12458
+12459
+12460
+12461
+12462
+12463
+12464
+12465
+12466
+12467
+12468
+12469
+12470
+12471
+12472
+12473
+12474
+12475
+12476
+12477
+12478
+12479
+12480
+12481
+12482
+12483
+12484
+12485
+12486
+12487
+12488
+12489
+12490
+12491
+12492
+12493
+12494
+12495
+12496
+12497
+12498
+12499
+12500
+12501
+12502
+12503
+12504
+12505
+12506
+12507
+12508
+12509
+12510
+12511
+12512
+12513
+12514
+12515
+12516
+12517
+12518
+12519
+12520
+12521
+12522
+12523
+12524
+12525
+12526
+12527
+12528
+12529
+12530
+12531
+12532
+12533
+12534
+12535
+12536
+12537
+12538
+12539
+12540
+12541
+12542
+12543
+12544
+12545
+12546
+12547
+12548
+12549
+12550
+12551
+12552
+12553
+12554
+12555
+12556
+12557
+12558
+12559
+12560
+12561
+12562
+12563
+12564
+12565
+12566
+12567
+12568
+12569
+12570
+12571
+12572
+12573
+12574
+12575
+12576
+12577
+12578
+12579
+12580
+12581
+12582
+12583
+12584
+12585
+12586
+12587
+12588
+12589
+12590
+12591
+12592
+12593
+12594
+12595
+12596
+12597
+12598
+12599
+12600
+12601
+12602
+12603
+12604
+12605
+12606
+12607
+12608
+12609
+12610
+12611
+12612
+12613
+12614
+12615
+12616
+12617
+12618
+12619
+12620
+12621
+12622
+12623
+12624
+12625
+12626
+12627
+12628
+12629
+12630
+12631
+12632
+12633
+12634
+12635
+12636
+12637
+12638
+12639
+12640
+12641
+12642
+12643
+12644
+12645
+12646
+12647
+12648
+12649
+12650
+12651
+12652
+12653
+12654
+12655
+12656
+12657
+12658
+12659
+12660
+12661
+12662
+12663
+12664
+12665
+12666
+12667
+12668
+12669
+12670
+12671
+12672
+12673
+12674
+12675
+12676
+12677
+12678
+12679
+12680
+12681
+12682
+12683
+12684
+12685
+12686
+12687
+12688
+12689
+12690
+12691
+12692
+12693
+12694
+12695
+12696
+12697
+12698
+12699
+12700
+12701
+12702
+12703
+12704
+12705
+12706
+12707
+12708
+12709
+12710
+12711
+12712
+12713
+12714
+12715
+12716
+12717
+12718
+12719
+12720
+12721
+12722
+12723
+12724
+12725
+12726
+12727
+12728
+12729
+12730
+12731
+12732
+12733
+12734
+12735
+12736
+12737
+12738
+12739
+12740
+12741
+12742
+12743
+12744
+12745
+12746
+12747
+12748
+12749
+12750
+12751
+12752
+12753
+12754
+12755
+12756
+12757
+12758
+12759
+12760
+12761
+12762
+12763
+12764
+12765
+12766
+12767
+12768
+12769
+12770
+12771
+12772
+12773
+12774
+12775
+12776
+12777
+12778
+12779
+12780
+12781
+12782
+12783
+12784
+12785
+12786
+12787
+12788
+12789
+12790
+12791
+12792
+12793
+12794
+12795
+12796
+12797
+12798
+12799
+12800
+12801
+12802
+12803
+12804
+12805
+12806
+12807
+12808
+12809
+12810
+12811
+12812
+12813
+12814
+12815
+12816
+12817
+12818
+12819
+12820
+12821
+12822
+12823
+12824
+12825
+12826
+12827
+12828
+12829
+12830
+12831
+12832
+12833
+12834
+12835
+12836
+12837
+12838
+12839
+12840
+12841
+12842
+12843
+12844
+12845
+12846
+12847
+12848
+12849
+12850
+12851
+12852
+12853
+12854
+12855
+12856
+12857
+12858
+12859
+12860
+12861
+12862
+12863
+12864
+12865
+12866
+12867
+12868
+12869
+12870
+12871
+12872
+12873
+12874
+12875
+12876
+12877
+12878
+12879
+12880
+12881
+12882
+12883
+12884
+12885
+12886
+12887
+12888
+12889
+12890
+12891
+12892
+12893
+12894
+12895
+12896
+12897
+12898
+12899
+12900
+12901
+12902
+12903
+12904
+12905
+12906
+12907
+12908
+12909
+12910
+12911
+12912
+12913
+12914
+12915
+12916
+12917
+12918
+12919
+12920
+12921
+12922
+12923
+12924
+12925
+12926
+12927
+12928
+12929
+12930
+12931
+12932
+12933
+12934
+12935
+12936
+12937
+12938
+12939
+12940
+12941
+12942
+12943
+12944
+12945
+12946
+12947
+12948
+12949
+12950
+12951
+12952
+12953
+12954
+12955
+12956
+12957
+12958
+12959
+12960
+12961
+12962
+12963
+12964
+12965
+12966
+12967
+12968
+12969
+12970
+12971
+12972
+12973
+12974
+12975
+12976
+12977
+12978
+12979
+12980
+12981
+12982
+12983
+12984
+12985
+12986
+12987
+12988
+12989
+12990
+12991
+12992
+12993
+12994
+12995
+12996
+12997
+12998
+12999
+13000
+13001
+13002
+13003
+13004
+13005
+13006
+13007
+13008
+13009
+13010
+13011
+13012
+13013
+13014
+13015
+13016
+13017
+13018
+13019
+13020
+13021
+13022
+13023
+13024
+13025
+13026
+13027
+13028
+13029
+13030
+13031
+13032
+13033
+13034
+13035
+13036
+13037
+13038
+13039
+13040
+13041
+13042
+13043
+13044
+13045
+13046
+13047
+13048
+13049
+13050
+13051
+13052
+13053
+13054
+13055
+13056
+13057
+13058
+13059
+13060
+13061
+13062
+13063
+13064
+13065
+13066
+13067
+13068
+13069
+13070
+13071
+13072
+13073
+13074
+13075
+13076
+13077
+13078
+13079
+13080
+13081
+13082
+13083
+13084
+13085
+13086
+13087
+13088
+13089
+13090
+13091
+13092
+13093
+13094
+13095
+13096
+13097
+13098
+13099
+13100
+13101
+13102
+13103
+13104
+13105
+13106
+13107
+13108
+13109
+13110
+13111
+13112
+13113
+13114
+13115
+13116
+13117
+13118
+13119
+13120
+13121
+13122
+13123
+13124
+13125
+13126
+13127
+13128
+13129
+13130
+13131
+13132
+13133
+13134
+13135
+13136
+13137
+13138
+13139
+13140
+13141
+13142
+13143
+13144
+13145
+13146
+13147
+13148
+13149
+13150
+13151
+13152
+13153
+13154
+13155
+13156
+13157
+13158
+13159
+13160
+13161
+13162
+13163
+13164
+13165
+13166
+13167
+13168
+13169
+13170
+13171
+13172
+13173
+13174
+13175
+13176
+13177
+13178
+13179
+13180
+13181
+13182
+13183
+13184
+13185
+13186
+13187
+13188
+13189
+13190
+13191
+13192
+13193
+13194
+13195
+13196
+13197
+13198
+13199
+13200
+13201
+13202
+13203
+13204
+13205
+13206
+13207
+13208
+13209
+13210
+13211
+13212
+13213
+13214
+13215
+13216
+13217
+13218
+13219
+13220
+13221
+13222
+13223
+13224
+13225
+13226
+13227
+13228
+13229
+13230
+13231
+13232
+13233
+13234
+13235
+13236
+13237
+13238
+13239
+13240
+13241
+13242
+13243
+13244
+13245
+13246
+13247
+13248
+13249
+13250
+13251
+13252
+13253
+13254
+13255
+13256
+13257
+13258
+13259
+13260
+13261
+13262
+13263
+13264
+13265
+13266
+13267
+13268
+13269
+13270
+13271
+13272
+13273
+13274
+13275
+13276
+13277
+13278
+13279
+13280
+13281
+13282
+13283
+13284
+13285
+13286
+13287
+13288
+13289
+13290
+13291
+13292
+13293
+13294
+13295
+13296
+13297
+13298
+13299
+13300
+13301
+13302
+13303
+13304
+13305
+13306
+13307
+13308
+13309
+13310
+13311
+13312
+13313
+13314
+13315
+13316
+13317
+13318
+13319
+13320
+13321
+13322
+13323
+13324
+13325
+13326
+13327
+13328
+13329
+13330
+13331
+13332
+13333
+13334
+13335
+13336
+13337
+13338
+13339
+13340
+13341
+13342
+13343
+13344
+13345
+13346
+13347
+13348
+13349
+13350
+13351
+13352
+13353
+13354
+13355
+13356
+13357
+13358
+13359
+13360
+13361
+13362
+13363
+13364
+13365
+13366
+13367
+13368
+13369
+13370
+13371
+13372
+13373
+13374
+13375
+13376
+13377
+13378
+13379
+13380
+13381
+13382
+13383
+13384
+13385
+13386
+13387
+13388
+13389
+13390
+13391
+13392
+13393
+13394
+13395
+13396
+13397
+13398
+13399
+13400
+13401
+13402
+13403
+13404
+13405
+13406
+13407
+13408
+13409
+13410
+13411
+13412
+13413
+13414
+13415
+13416
+13417
+13418
+13419
+13420
+13421
+13422
+13423
+13424
+13425
+13426
+13427
+13428
+13429
+13430
+13431
+13432
+13433
+13434
+13435
+13436
+13437
+13438
+13439
+13440
+13441
+13442
+13443
+13444
+13445
+13446
+13447
+13448
+13449
+13450
+13451
+13452
+13453
+13454
+13455
+13456
+13457
+13458
+13459
+13460
+13461
+13462
+13463
+13464
+13465
+13466
+13467
+13468
+13469
+13470
+13471
+13472
+13473
+13474
+13475
+13476
+13477
+13478
+13479
+13480
+13481
+13482
+13483
+13484
+13485
+13486
+13487
+13488
+13489
+13490
+13491
+13492
+13493
+13494
+13495
+13496
+13497
+13498
+13499
+13500
+13501
+13502
+13503
+13504
+13505
+13506
+13507
+13508
+13509
+13510
+13511
+13512
+13513
+13514
+13515
+13516
+13517
+13518
+13519
+13520
+13521
+13522
+13523
+13524
+13525
+13526
+13527
+13528
+13529
+13530
+13531
+13532
+13533
+13534
+13535
+13536
+13537
+13538
+13539
+13540
+13541
+13542
+13543
+13544
+13545
+13546
+13547
+13548
+13549
+13550
+13551
+13552
+13553
+13554
+13555
+13556
+13557
+13558
+13559
+13560
+13561
+13562
+13563
+13564
+13565
+13566
+13567
+13568
+13569
+13570
+13571
+13572
+13573
+13574
+13575
+13576
+13577
+13578
+13579
+13580
+13581
+13582
+13583
+13584
+13585
+13586
+13587
+13588
+13589
+13590
+13591
+13592
+13593
+13594
+13595
+13596
+13597
+13598
+13599
+13600
+13601
+13602
+13603
+13604
+13605
+13606
+13607
+13608
+13609
+13610
+13611
+13612
+13613
+13614
+13615
+13616
+13617
+13618
+13619
+13620
+13621
+13622
+13623
+13624
+13625
+13626
+13627
+13628
+13629
+13630
+13631
+13632
+13633
+13634
+13635
+13636
+13637
+13638
+13639
+13640
+13641
+13642
+13643
+13644
+13645
+13646
+13647
+13648
+13649
+13650
+13651
+13652
+13653
+13654
+13655
+13656
+13657
+13658
+13659
+13660
+13661
+13662
+13663
+13664
+13665
+13666
+13667
+13668
+13669
+13670
+13671
+13672
+13673
+13674
+13675
+13676
+13677
+13678
+13679
+13680
+13681
+13682
+13683
+13684
+13685
+13686
+13687
+13688
+13689
+13690
+13691
+13692
+13693
+13694
+13695
+13696
+13697
+13698
+13699
+13700
+13701
+13702
+13703
+13704
+13705
+13706
+13707
+13708
+13709
+13710
+13711
+13712
+13713
+13714
+13715
+13716
+13717
+13718
+13719
+13720
+13721
+13722
+13723
+13724
+13725
+13726
+13727
+13728
+13729
+13730
+13731
+13732
+13733
+13734
+13735
+13736
+13737
+13738
+13739
+13740
+13741
+13742
+13743
+13744
+13745
+13746
+13747
+13748
+13749
+13750
+13751
+13752
+13753
+13754
+13755
+13756
+13757
+13758
+13759
+13760
+13761
+13762
+13763
+13764
+13765
+13766
+13767
+13768
+13769
+13770
+13771
+13772
+13773
+13774
+13775
+13776
+13777
+13778
+13779
+13780
+13781
+13782
+13783
+13784
+13785
+13786
+13787
+13788
+13789
+13790
+13791
+13792
+13793
+13794
+13795
+13796
+13797
+13798
+13799
+13800
+13801
+13802
+13803
+13804
+13805
+13806
+13807
+13808
+13809
+13810
+13811
+13812
+13813
+13814
+13815
+13816
+13817
+13818
+13819
+13820
+13821
+13822
+13823
+13824
+13825
+13826
+13827
+13828
+13829
+13830
+13831
+13832
+13833
+13834
+13835
+13836
+13837
+13838
+13839
+13840
+13841
+13842
+13843
+13844
+13845
+13846
+13847
+13848
+13849
+13850
+13851
+13852
+13853
+13854
+13855
+13856
+13857
+13858
+13859
+13860
+13861
+13862
+13863
+13864
+13865
+13866
+13867
+13868
+13869
+13870
+13871
+13872
+13873
+13874
+13875
+13876
+13877
+13878
+13879
+13880
+13881
+13882
+13883
+13884
+13885
+13886
+13887
+13888
+13889
+13890
+13891
+13892
+13893
+13894
+13895
+13896
+13897
+13898
+13899
+13900
+13901
+13902
+13903
+13904
+13905
+13906
+13907
+13908
+13909
+13910
+13911
+13912
+13913
+13914
+13915
+13916
+13917
+13918
+13919
+13920
+13921
+13922
+13923
+13924
+13925
+13926
+13927
+13928
+13929
+13930
+13931
+13932
+13933
+13934
+13935
+13936
+13937
+13938
+13939
+13940
+13941
+13942
+13943
+13944
+13945
+13946
+13947
+13948
+13949
+13950
+13951
+13952
+13953
+13954
+13955
+13956
+13957
+13958
+13959
+13960
+13961
+13962
+13963
+13964
+13965
+13966
+13967
+13968
+13969
+13970
+13971
+13972
+13973
+13974
+13975
+13976
+13977
+13978
+13979
+13980
+13981
+13982
+13983
+13984
+13985
+13986
+13987
+13988
+13989
+13990
+13991
+13992
+13993
+13994
+13995
+13996
+13997
+13998
+13999
+14000
+14001
+14002
+14003
+14004
+14005
+14006
+14007
+14008
+14009
+14010
+14011
+14012
+14013
+14014
+14015
+14016
+14017
+14018
+14019
+14020
+14021
+14022
+14023
+14024
+14025
+14026
+14027
+14028
+14029
+14030
+14031
+14032
+14033
+14034
+14035
+14036
+14037
+14038
+14039
+14040
+14041
+14042
+14043
+14044
+14045
+14046
+14047
+14048
+14049
+14050
+14051
+14052
+14053
+14054
+14055
+14056
+14057
+14058
+14059
+14060
+14061
+14062
+14063
+14064
+14065
+14066
+14067
+14068
+14069
+14070
+14071
+14072
+14073
+14074
+14075
+14076
+14077
+14078
+14079
+14080
+14081
+14082
+14083
+14084
+14085
+14086
+14087
+14088
+14089
+14090
+14091
+14092
+14093
+14094
+14095
+14096
+14097
+14098
+14099
+14100
+14101
+14102
+14103
+14104
+14105
+14106
+14107
+14108
+14109
+14110
+14111
+14112
+14113
+14114
+14115
+14116
+14117
+14118
+14119
+14120
+14121
+14122
+14123
+14124
+14125
+14126
+14127
+14128
+14129
+14130
+14131
+14132
+14133
+14134
+14135
+14136
+14137
+14138
+14139
+14140
+14141
+14142
+14143
+14144
+14145
+14146
+14147
+14148
+14149
+14150
+14151
+14152
+14153
+14154
+14155
+14156
+14157
+14158
+14159
+14160
+14161
+14162
+14163
+14164
+14165
+14166
+14167
+14168
+14169
+14170
+14171
+14172
+14173
+14174
+14175
+14176
+14177
+14178
+14179
+14180
+14181
+14182
+14183
+14184
+14185
+14186
+14187
+14188
+14189
+14190
+14191
+14192
+14193
+14194
+14195
+14196
+14197
+14198
+14199
+14200
+14201
+14202
+14203
+14204
+14205
+14206
+14207
+14208
+14209
+14210
+14211
+14212
+14213
+14214
+14215
+14216
+14217
+14218
+14219
+14220
+14221
+14222
+14223
+14224
+14225
+14226
+14227
+14228
+14229
+14230
+14231
+14232
+14233
+14234
+14235
+14236
+14237
+14238
+14239
+14240
+14241
+14242
+14243
+14244
+14245
+14246
+14247
+14248
+14249
+14250
+14251
+14252
+14253
+14254
+14255
+14256
+14257
+14258
+14259
+14260
+14261
+14262
+14263
+14264
+14265
+14266
+14267
+14268
+14269
+14270
+14271
+14272
+14273
+14274
+14275
+14276
+14277
+14278
+14279
+14280
+14281
+14282
+14283
+14284
+14285
+14286
+14287
+14288
+14289
+14290
+14291
+14292
+14293
+14294
+14295
+14296
+14297
+14298
+14299
+14300
+14301
+14302
+14303
+14304
+14305
+14306
+14307
+14308
+14309
+14310
+14311
+14312
+14313
+14314
+14315
+14316
+14317
+14318
+14319
+14320
+14321
+14322
+14323
+14324
+14325
+14326
+14327
+14328
+14329
+14330
+14331
+14332
+14333
+14334
+14335
+14336
+14337
+14338
+14339
+14340
+14341
+14342
+14343
+14344
+14345
+14346
+14347
+14348
+14349
+14350
+14351
+14352
+14353
+14354
+14355
+14356
+14357
+14358
+14359
+14360
+14361
+14362
+14363
+14364
+14365
+14366
+14367
+14368
+14369
+14370
+14371
+14372
+14373
+14374
+14375
+14376
+14377
+14378
+14379
+14380
+14381
+14382
+14383
+14384
+14385
+14386
+14387
+14388
+14389
+14390
+14391
+14392
+14393
+14394
+14395
+14396
+14397
+14398
+14399
+14400
+14401
+14402
+14403
+14404
+14405
+14406
+14407
+14408
+14409
+14410
+14411
+14412
+14413
+14414
+14415
+14416
+14417
+14418
+14419
+14420
+14421
+14422
+14423
+14424
+14425
+14426
+14427
+14428
+14429
+14430
+14431
+14432
+14433
+14434
+14435
+14436
+14437
+14438
+14439
+14440
+14441
+14442
+14443
+14444
+14445
+14446
+14447
+14448
+14449
+14450
+14451
+14452
+14453
+14454
+14455
+14456
+14457
+14458
+14459
+14460
+14461
+14462
+14463
+14464
+14465
+14466
+14467
+14468
+14469
+14470
+14471
+14472
+14473
+14474
+14475
+14476
+14477
+14478
+14479
+14480
+14481
+14482
+14483
+14484
+14485
+14486
+14487
+14488
+14489
+14490
+14491
+14492
+14493
+14494
+14495
+14496
+14497
+14498
+14499
+14500
+14501
+14502
+14503
+14504
+14505
+14506
+14507
+14508
+14509
+14510
+14511
+14512
+14513
+14514
+14515
+14516
+14517
+14518
+14519
+14520
+14521
+14522
+14523
+14524
+14525
+14526
+14527
+14528
+14529
+14530
+14531
+14532
+14533
+14534
+14535
+14536
+14537
+14538
+14539
+14540
+14541
+14542
+14543
+14544
+14545
+14546
+14547
+14548
+14549
+14550
+14551
+14552
+14553
+14554
+14555
+14556
+14557
+14558
+14559
+14560
+14561
+14562
+14563
+14564
+14565
+14566
+14567
+14568
+14569
+14570
+14571
+14572
+14573
+14574
+14575
+14576
+14577
+14578
+14579
+14580
+14581
+14582
+14583
+14584
+14585
+14586
+14587
+14588
+14589
+14590
+14591
+14592
+14593
+14594
+14595
+14596
+14597
+14598
+14599
+14600
+14601
+14602
+14603
+14604
+14605
+14606
+14607
+14608
+14609
+14610
+14611
+14612
+14613
+14614
+14615
+14616
+14617
+14618
+14619
+14620
+14621
+14622
+14623
+14624
+14625
+14626
+14627
+14628
+14629
+14630
+14631
+14632
+14633
+14634
+14635
+14636
+14637
+14638
+14639
+14640
+14641
+14642
+14643
+14644
+14645
+14646
+14647
+14648
+14649
+14650
+14651
+14652
+14653
+14654
+14655
+14656
+14657
+14658
+14659
+14660
+14661
+14662
+14663
+14664
+14665
+14666
+14667
+14668
+14669
+14670
+14671
+14672
+14673
+14674
+14675
+14676
+14677
+14678
+14679
+14680
+14681
+14682
+14683
+14684
+14685
+14686
+14687
+14688
+14689
+14690
+14691
+14692
+14693
+14694
+14695
+14696
+14697
+14698
+14699
+14700
+14701
+14702
+14703
+14704
+14705
+14706
+14707
+14708
+14709
+14710
+14711
+14712
+14713
+14714
+14715
+14716
+14717
+14718
+14719
+14720
+14721
+14722
+14723
+14724
+14725
+14726
+14727
+14728
+14729
+14730
+14731
+14732
+14733
+14734
+14735
+14736
+14737
+14738
+14739
+14740
+14741
+14742
+14743
+14744
+14745
+14746
+14747
+14748
+14749
+14750
+14751
+14752
+14753
+14754
+14755
+14756
+14757
+14758
+14759
+14760
+14761
+14762
+14763
+14764
+14765
+14766
+14767
+14768
+14769
+14770
+14771
+14772
+14773
+14774
+14775
+14776
+14777
+14778
+14779
+14780
+14781
+14782
+14783
+14784
+14785
+14786
+14787
+14788
+14789
+14790
+14791
+14792
+14793
+14794
+14795
+14796
+14797
+14798
+14799
+14800
+14801
+14802
+14803
+14804
+14805
+14806
+14807
+14808
+14809
+14810
+14811
+14812
+14813
+14814
+14815
+14816
+14817
+14818
+14819
+14820
+14821
+14822
+14823
+14824
+14825
+14826
+14827
+14828
+14829
+14830
+14831
+14832
+14833
+14834
+14835
+14836
+14837
+14838
+14839
+14840
+14841
+14842
+14843
+14844
+14845
+14846
+14847
+14848
+14849
+14850
+14851
+14852
+14853
+14854
+14855
+14856
+14857
+14858
+14859
+14860
+14861
+14862
+14863
+14864
+14865
+14866
+14867
+14868
+14869
+14870
+14871
+14872
+14873
+14874
+14875
+14876
+14877
+14878
+14879
+14880
+14881
+14882
+14883
+14884
+14885
+14886
+14887
+14888
+14889
+14890
+14891
+14892
+14893
+14894
+14895
+14896
+14897
+14898
+14899
+14900
+14901
+14902
+14903
+14904
+14905
+14906
+14907
+14908
+14909
+14910
+14911
+14912
+14913
+14914
+14915
+14916
+14917
+14918
+14919
+14920
+14921
+14922
+14923
+14924
+14925
+14926
+14927
+14928
+14929
+14930
+14931
+14932
+14933
+14934
+14935
+14936
+14937
+14938
+14939
+14940
+14941
+14942
+14943
+14944
+14945
+14946
+14947
+14948
+14949
+14950
+14951
+14952
+14953
+14954
+14955
+14956
+14957
+14958
+14959
+14960
+14961
+14962
+14963
+14964
+14965
+14966
+14967
+14968
+14969
+14970
+14971
+14972
+14973
+14974
+14975
+14976
+14977
+14978
+14979
+14980
+14981
+14982
+14983
+14984
+14985
+14986
+14987
+14988
+14989
+14990
+14991
+14992
+14993
+14994
+14995
+14996
+14997
+14998
+14999
+15000
+15001
+15002
+15003
+15004
+15005
+15006
+15007
+15008
+15009
+15010
+15011
+15012
+15013
+15014
+15015
+15016
+15017
+15018
+15019
+15020
+15021
+15022
+15023
+15024
+15025
+15026
+15027
+15028
+15029
+15030
+15031
+15032
+15033
+15034
+15035
+15036
+15037
+15038
+15039
+15040
+15041
+15042
+15043
+15044
+15045
+15046
+15047
+15048
+15049
+15050
+15051
+15052
+15053
+15054
+15055
+15056
+15057
+15058
+15059
+15060
+15061
+15062
+15063
+15064
+15065
+15066
+15067
+15068
+15069
+15070
+15071
+15072
+15073
+15074
+15075
+15076
+15077
+15078
+15079
+15080
+15081
+15082
+15083
+15084
+15085
+15086
+15087
+15088
+15089
+15090
+15091
+15092
+15093
+15094
+15095
+15096
+15097
+15098
+15099
+15100
+15101
+15102
+15103
+15104
+15105
+15106
+15107
+15108
+15109
+15110
+15111
+15112
+15113
+15114
+15115
+15116
+15117
+15118
+15119
+15120
+15121
+15122
+15123
+15124
+15125
+15126
+15127
+15128
+15129
+15130
+15131
+15132
+15133
+15134
+15135
+15136
+15137
+15138
+15139
+15140
+15141
+15142
+15143
+15144
+15145
+15146
+15147
+15148
+15149
+15150
+15151
+15152
+15153
+15154
+15155
+15156
+15157
+15158
+15159
+15160
+15161
+15162
+15163
+15164
+15165
+15166
+15167
+15168
+15169
+15170
+15171
+15172
+15173
+15174
+15175
+15176
+15177
+15178
+15179
+15180
+15181
+15182
+15183
+15184
+15185
+15186
+15187
+15188
+15189
+15190
+15191
+15192
+15193
+15194
+15195
+15196
+15197
+15198
+15199
+15200
+15201
+15202
+15203
+15204
+15205
+15206
+15207
+15208
+15209
+15210
+15211
+15212
+15213
+15214
+15215
+15216
+15217
+15218
+15219
+15220
+15221
+15222
+15223
+15224
+15225
+15226
+15227
+15228
+15229
+15230
+15231
+15232
+15233
+15234
+15235
+15236
+15237
+15238
+15239
+15240
+15241
+15242
+15243
+15244
+15245
+15246
+15247
+15248
+15249
+15250
+15251
+15252
+15253
+15254
+15255
+15256
+15257
+15258
+15259
+15260
+15261
+15262
+15263
+15264
+15265
+15266
+15267
+15268
+15269
+15270
+15271
+15272
+15273
+15274
+15275
+15276
+15277
+15278
+15279
+15280
+15281
+15282
+15283
+15284
+15285
+15286
+15287
+15288
+15289
+15290
+15291
+15292
+15293
+15294
+15295
+15296
+15297
+15298
+15299
+15300
+15301
+15302
+15303
+15304
+15305
+15306
+15307
+15308
+15309
+15310
+15311
+15312
+15313
+15314
+15315
+15316
+15317
+15318
+15319
+15320
+15321
+15322
+15323
+15324
+15325
+15326
+15327
+15328
+15329
+15330
+15331
+15332
+15333
+15334
+15335
+15336
+15337
+15338
+15339
+15340
+15341
+15342
+15343
+15344
+15345
+15346
+15347
+15348
+15349
+15350
+15351
+15352
+15353
+15354
+15355
+15356
+15357
+15358
+15359
+15360
+15361
+15362
+15363
+15364
+15365
+15366
+15367
+15368
+15369
+15370
+15371
+15372
+15373
+15374
+15375
+15376
+15377
+15378
+15379
+15380
+15381
+15382
+15383
+15384
+15385
+15386
+15387
+15388
+15389
+15390
+15391
+15392
+15393
+15394
+15395
+15396
+15397
+15398
+15399
+15400
+15401
+15402
+15403
+15404
+15405
+15406
+15407
+15408
+15409
+15410
+15411
+15412
+15413
+15414
+15415
+15416
+15417
+15418
+15419
+15420
+15421
+15422
+15423
+15424
+15425
+15426
+15427
+15428
+15429
+15430
+15431
+15432
+15433
+15434
+15435
+15436
+15437
+15438
+15439
+15440
+15441
+15442
+15443
+15444
+15445
+15446
+15447
+15448
+15449
+15450
+15451
+15452
+15453
+15454
+15455
+15456
+15457
+15458
+15459
+15460
+15461
+15462
+15463
+15464
+15465
+15466
+15467
+15468
+15469
+15470
+15471
+15472
+15473
+15474
+15475
+15476
+15477
+15478
+15479
+15480
+15481
+15482
+15483
+15484
+15485
+15486
+15487
+15488
+15489
+15490
+15491
+15492
+15493
+15494
+15495
+15496
+15497
+15498
+15499
+15500
+15501
+15502
+15503
+15504
+15505
+15506
+15507
+15508
+15509
+15510
+15511
+15512
+15513
+15514
+15515
+15516
+15517
+15518
+15519
+15520
+15521
+15522
+15523
+15524
+15525
+15526
+15527
+15528
+15529
+15530
+15531
+15532
+15533
+15534
+15535
+15536
+15537
+15538
+15539
+15540
+15541
+15542
+15543
+15544
+15545
+15546
+15547
+15548
+15549
+15550
+15551
+15552
+15553
+15554
+15555
+15556
+15557
+15558
+15559
+15560
+15561
+15562
+15563
+15564
+15565
+15566
+15567
+15568
+15569
+15570
+15571
+15572
+15573
+15574
+15575
+15576
+15577
+15578
+15579
+15580
+15581
+15582
+15583
+15584
+15585
+15586
+15587
+15588
+15589
+15590
+15591
+15592
+15593
+15594
+15595
+15596
+15597
+15598
+15599
+15600
+15601
+15602
+15603
+15604
+15605
+15606
+15607
+15608
+15609
+15610
+15611
+15612
+15613
+15614
+15615
+15616
+15617
+15618
+15619
+15620
+15621
+15622
+15623
+15624
+15625
+15626
+15627
+15628
+15629
+15630
+15631
+15632
+15633
+15634
+15635
+15636
+15637
+15638
+15639
+15640
+15641
+15642
+15643
+15644
+15645
+15646
+15647
+15648
+15649
+15650
+15651
+15652
+15653
+15654
+15655
+15656
+15657
+15658
+15659
+15660
+15661
+15662
+15663
+15664
+15665
+15666
+15667
+15668
+15669
+15670
+15671
+15672
+15673
+15674
+15675
+15676
+15677
+15678
+15679
+15680
+15681
+15682
+15683
+15684
+15685
+15686
+15687
+15688
+15689
+15690
+15691
+15692
+15693
+15694
+15695
+15696
+15697
+15698
+15699
+15700
+15701
+15702
+15703
+15704
+15705
+15706
+15707
+15708
+15709
+15710
+15711
+15712
+15713
+15714
+15715
+15716
+15717
+15718
+15719
+15720
+15721
+15722
+15723
+15724
+15725
+15726
+15727
+15728
+15729
+15730
+15731
+15732
+15733
+15734
+15735
+15736
+15737
+15738
+15739
+15740
+15741
+15742
+15743
+15744
+15745
+15746
+15747
+15748
+15749
+15750
+15751
+15752
+15753
+15754
+15755
+15756
+15757
+15758
+15759
+15760
+15761
+15762
+15763
+15764
+15765
+15766
+15767
+15768
+15769
+15770
+15771
+15772
+15773
+15774
+15775
+15776
+15777
+15778
+15779
+15780
+15781
+15782
+15783
+15784
+15785
+15786
+15787
+15788
+15789
+15790
+15791
+15792
+15793
+15794
+15795
+15796
+15797
+15798
+15799
+15800
+15801
+15802
+15803
+15804
+15805
+15806
+15807
+15808
+15809
+15810
+15811
+15812
+15813
+15814
+15815
+15816
+15817
+15818
+15819
+15820
+15821
+15822
+15823
+15824
+15825
+15826
+15827
+15828
+15829
+15830
+15831
+15832
+15833
+15834
+15835
+15836
+15837
+15838
+15839
+15840
+15841
+15842
+15843
+15844
+15845
+15846
+15847
+15848
+15849
+15850
+15851
+15852
+15853
+15854
+15855
+15856
+15857
+15858
+15859
+15860
+15861
+15862
+15863
+15864
+15865
+15866
+15867
+15868
+15869
+15870
+15871
+15872
+15873
+15874
+15875
+15876
+15877
+15878
+15879
+15880
+15881
+15882
+15883
+15884
+15885
+15886
+15887
+15888
+15889
+15890
+15891
+15892
+15893
+15894
+15895
+15896
+15897
+15898
+15899
+15900
+15901
+15902
+15903
+15904
+15905
+15906
+15907
+15908
+15909
+15910
+15911
+15912
+15913
+15914
+15915
+15916
+15917
+15918
+15919
+15920
+15921
+15922
+15923
+15924
+15925
+15926
+15927
+15928
+15929
+15930
+15931
+15932
+15933
+15934
+15935
+15936
+15937
+15938
+15939
+15940
+15941
+15942
+15943
+15944
+15945
+15946
+15947
+15948
+15949
+15950
+15951
+15952
+15953
+15954
+15955
+15956
+15957
+15958
+15959
+15960
+15961
+15962
+15963
+15964
+15965
+15966
+15967
+15968
+15969
+15970
+15971
+15972
+15973
+15974
+15975
+15976
+15977
+15978
+15979
+15980
+15981
+15982
+15983
+15984
+15985
+15986
+15987
+15988
+15989
+15990
+15991
+15992
+15993
+15994
+15995
+15996
+15997
+15998
+15999
+16000
+16001
+16002
+16003
+16004
+16005
+16006
+16007
+16008
+16009
+16010
+16011
+16012
+16013
+16014
+16015
+16016
+16017
+16018
+16019
+16020
+16021
+16022
+16023
+16024
+16025
+16026
+16027
+16028
+16029
+16030
+16031
+16032
+16033
+16034
+16035
+16036
+16037
+16038
+16039
+16040
+16041
+16042
+16043
+16044
+16045
+16046
+16047
+16048
+16049
+16050
+16051
+16052
+16053
+16054
+16055
+16056
+16057
+16058
+16059
+16060
+16061
+16062
+16063
+16064
+16065
+16066
+16067
+16068
+16069
+16070
+16071
+16072
+16073
+16074
+16075
+16076
+16077
+16078
+16079
+16080
+16081
+16082
+16083
+16084
+16085
+16086
+16087
+16088
+16089
+16090
+16091
+16092
+16093
+16094
+16095
+16096
+16097
+16098
+16099
+16100
+16101
+16102
+16103
+16104
+16105
+16106
+16107
+16108
+16109
+16110
+16111
+16112
+16113
+16114
+16115
+16116
+16117
+16118
+16119
+16120
+16121
+16122
+16123
+16124
+16125
+16126
+16127
+16128
+16129
+16130
+16131
+16132
+16133
+16134
+16135
+16136
+16137
+16138
+16139
+16140
+16141
+16142
+16143
+16144
+16145
+16146
+16147
+16148
+16149
+16150
+16151
+16152
+16153
+16154
+16155
+16156
+16157
+16158
+16159
+16160
+16161
+16162
+16163
+16164
+16165
+16166
+16167
+16168
+16169
+16170
+16171
+16172
+16173
+16174
+16175
+16176
+16177
+16178
+16179
+16180
+16181
+16182
+16183
+16184
+16185
+16186
+16187
+16188
+16189
+16190
+16191
+16192
+16193
+16194
+16195
+16196
+16197
+16198
+16199
+16200
+16201
+16202
+16203
+16204
+16205
+16206
+16207
+16208
+16209
+16210
+16211
+16212
+16213
+16214
+16215
+16216
+16217
+16218
+16219
+16220
+16221
+16222
+16223
+16224
+16225
+16226
+16227
+16228
+16229
+16230
+16231
+16232
+16233
+16234
+16235
+16236
+16237
+16238
+16239
+16240
+16241
+16242
+16243
+16244
+16245
+16246
+16247
+16248
+16249
+16250
+16251
+16252
+16253
+16254
+16255
+16256
+16257
+16258
+16259
+16260
+16261
+16262
+16263
+16264
+16265
+16266
+16267
+16268
+16269
+16270
+16271
+16272
+16273
+16274
+16275
+16276
+16277
+16278
+16279
+16280
+16281
+16282
+16283
+16284
+16285
+16286
+16287
+16288
+16289
+16290
+16291
+16292
+16293
+16294
+16295
+16296
+16297
+16298
+16299
+16300
+16301
+16302
+16303
+16304
+16305
+16306
+16307
+16308
+16309
+16310
+16311
+16312
+16313
+16314
+16315
+16316
+16317
+16318
+16319
+16320
+16321
+16322
+16323
+16324
+16325
+16326
+16327
+16328
+16329
+16330
+16331
+16332
+16333
+16334
+16335
+16336
+16337
+16338
+16339
+16340
+16341
+16342
+16343
+16344
+16345
+16346
+16347
+16348
+16349
+16350
+16351
+16352
+16353
+16354
+16355
+16356
+16357
+16358
+16359
+16360
+16361
+16362
+16363
+16364
+16365
+16366
+16367
+16368
+16369
+16370
+16371
+16372
+16373
+16374
+16375
+16376
+16377
+16378
+16379
+16380
+16381
+16382
+16383
+16384
+16385
+16386
+16387
+16388
+16389
+16390
+16391
+16392
+16393
+16394
+16395
+16396
+16397
+16398
+16399
+16400
+16401
+16402
+16403
+16404
+16405
+16406
+16407
+16408
+16409
+16410
+16411
+16412
+16413
+16414
+16415
+16416
+16417
+16418
+16419
+16420
+16421
+16422
+16423
+16424
+16425
+16426
+16427
+16428
+16429
+16430
+16431
+16432
+16433
+16434
+16435
+16436
+16437
+16438
+16439
+16440
+16441
+16442
+16443
+16444
+16445
+16446
+16447
+16448
+16449
+16450
+16451
+16452
+16453
+16454
+16455
+16456
+16457
+16458
+16459
+16460
+16461
+16462
+16463
+16464
+16465
+16466
+16467
+16468
+16469
+16470
+16471
+16472
+16473
+16474
+16475
+16476
+16477
+16478
+16479
+16480
+16481
+16482
+16483
+16484
+16485
+16486
+16487
+16488
+16489
+16490
+16491
+16492
+16493
+16494
+16495
+16496
+16497
+16498
+16499
+16500
+16501
+16502
+16503
+16504
+16505
+16506
+16507
+16508
+16509
+16510
+16511
+16512
+16513
+16514
+16515
+16516
+16517
+16518
+16519
+16520
+16521
+16522
+16523
+16524
+16525
+16526
+16527
+16528
+16529
+16530
+16531
+16532
+16533
+16534
+16535
+16536
+16537
+16538
+16539
+16540
+16541
+16542
+16543
+16544
+16545
+16546
+16547
+16548
+16549
+16550
+16551
+16552
+16553
+16554
+16555
+16556
+16557
+16558
+16559
+16560
+16561
+16562
+16563
+16564
+16565
+16566
+16567
+16568
+16569
+16570
+16571
+16572
+16573
+16574
+16575
+16576
+16577
+16578
+16579
+16580
+16581
+16582
+16583
+16584
+16585
+16586
+16587
+16588
+16589
+16590
+16591
+16592
+16593
+16594
+16595
+16596
+16597
+16598
+16599
+16600
+16601
+16602
+16603
+16604
+16605
+16606
+16607
+16608
+16609
+16610
+16611
+16612
+16613
+16614
+16615
+16616
+16617
+16618
+16619
+16620
+16621
+16622
+16623
+16624
+16625
+16626
+16627
+16628
+16629
+16630
+16631
+16632
+16633
+16634
+16635
+16636
+16637
+16638
+16639
+16640
+16641
+16642
+16643
+16644
+16645
+16646
+16647
+16648
+16649
+16650
+16651
+16652
+16653
+16654
+16655
+16656
+16657
+16658
+16659
+16660
+16661
+16662
+16663
+16664
+16665
+16666
+16667
+16668
+16669
+16670
+16671
+16672
+16673
+16674
+16675
+16676
+16677
+16678
+16679
+16680
+16681
+16682
+16683
+16684
+16685
+16686
+16687
+16688
+16689
+16690
+16691
+16692
+16693
+16694
+16695
+16696
+16697
+16698
+16699
+16700
+16701
+16702
+16703
+16704
+16705
+16706
+16707
+16708
+16709
+16710
+16711
+16712
+16713
+16714
+16715
+16716
+16717
+16718
+16719
+16720
+16721
+16722
+16723
+16724
+16725
+16726
+16727
+16728
+16729
+16730
+16731
+16732
+16733
+16734
+16735
+16736
+16737
+16738
+16739
+16740
+16741
+16742
+16743
+16744
+16745
+16746
+16747
+16748
+16749
+16750
+16751
+16752
+16753
+16754
+16755
+16756
+16757
+16758
+16759
+16760
+16761
+16762
+16763
+16764
+16765
+16766
+16767
+16768
+16769
+16770
+16771
+16772
+16773
+16774
+16775
+16776
+16777
+16778
+16779
+16780
+16781
+16782
+16783
+16784
+16785
+16786
+16787
+16788
+16789
+16790
+16791
+16792
+16793
+16794
+16795
+16796
+16797
+16798
+16799
+16800
+16801
+16802
+16803
+16804
+16805
+16806
+16807
+16808
+16809
+16810
+16811
+16812
+16813
+16814
+16815
+16816
+16817
+16818
+16819
+16820
+16821
+16822
+16823
+16824
+16825
+16826
+16827
+16828
+16829
+16830
+16831
+16832
+16833
+16834
+16835
+16836
+16837
+16838
+16839
+16840
+16841
+16842
+16843
+16844
+16845
+16846
+16847
+16848
+16849
+16850
+16851
+16852
+16853
+16854
+16855
+16856
+16857
+16858
+16859
+16860
+16861
+16862
+16863
+16864
+16865
+16866
+16867
+16868
+16869
+16870
+16871
+16872
+16873
+16874
+16875
+16876
+16877
+16878
+16879
+16880
+16881
+16882
+16883
+16884
+16885
+16886
+16887
+16888
+16889
+16890
+16891
+16892
+16893
+16894
+16895
+16896
+16897
+16898
+16899
+16900
+16901
+16902
+16903
+16904
+16905
+16906
+16907
+16908
+16909
+16910
+16911
+16912
+16913
+16914
+16915
+16916
+16917
+16918
+16919
+16920
+16921
+16922
+16923
+16924
+16925
+16926
+16927
+16928
+16929
+16930
+16931
+16932
+16933
+16934
+16935
+16936
+16937
+16938
+16939
+16940
+16941
+16942
+16943
+16944
+16945
+16946
+16947
+16948
+16949
+16950
+16951
+16952
+16953
+16954
+16955
+16956
+16957
+16958
+16959
+16960
+16961
+16962
+16963
+16964
+16965
+16966
+16967
+16968
+16969
+16970
+16971
+16972
+16973
+16974
+16975
+16976
+16977
+16978
+16979
+16980
+16981
+16982
+16983
+16984
+16985
+16986
+16987
+16988
+16989
+16990
+16991
+16992
+16993
+16994
+16995
+16996
+16997
+16998
+16999
+17000
+17001
+17002
+17003
+17004
+17005
+17006
+17007
+17008
+17009
+17010
+17011
+17012
+17013
+17014
+17015
+17016
+17017
+17018
+17019
+17020
+17021
+17022
+17023
+17024
+17025
+17026
+17027
+17028
+17029
+17030
+17031
+17032
+17033
+17034
+17035
+17036
+17037
+17038
+17039
+17040
+17041
+17042
+17043
+17044
+17045
+17046
+17047
+17048
+17049
+17050
+17051
+17052
+17053
+17054
+17055
+17056
+17057
+17058
+17059
+17060
+17061
+17062
+17063
+17064
+17065
+17066
+17067
+17068
+17069
+17070
+17071
+17072
+17073
+17074
+17075
+17076
+17077
+17078
+17079
+17080
+17081
+17082
+17083
+17084
+17085
+17086
+17087
+17088
+17089
+17090
+17091
+17092
+17093
+17094
+17095
+17096
+17097
+17098
+17099
+17100
+17101
+17102
+17103
+17104
+17105
+17106
+17107
+17108
+17109
+17110
+17111
+17112
+17113
+17114
+17115
+17116
+17117
+17118
+17119
+17120
+17121
+17122
+17123
+17124
+17125
+17126
+17127
+17128
+17129
+17130
+17131
+17132
+17133
+17134
+17135
+17136
+17137
+17138
+17139
+17140
+17141
+17142
+17143
+17144
+17145
+17146
+17147
+17148
+17149
+17150
+17151
+17152
+17153
+17154
+17155
+17156
+17157
+17158
+17159
+17160
+17161
+17162
+17163
+17164
+17165
+17166
+17167
+17168
+17169
+17170
+17171
+17172
+17173
+17174
+17175
+17176
+17177
+17178
+17179
+17180
+17181
+17182
+17183
+17184
+17185
+17186
+17187
+17188
+17189
+17190
+17191
+17192
+17193
+17194
+17195
+17196
+17197
+17198
+17199
+17200
+17201
+17202
+17203
+17204
+17205
+17206
+17207
+17208
+17209
+17210
+17211
+17212
+17213
+17214
+17215
+17216
+17217
+17218
+17219
+17220
+17221
+17222
+17223
+17224
+17225
+17226
+17227
+17228
+17229
+17230
+17231
+17232
+17233
+17234
+17235
+17236
+17237
+17238
+17239
+17240
+17241
+17242
+17243
+17244
+17245
+17246
+17247
+17248
+17249
+17250
+17251
+17252
+17253
+17254
+17255
+17256
+17257
+17258
+17259
+17260
+17261
+17262
+17263
+17264
+17265
+17266
+17267
+17268
+17269
+17270
+17271
+17272
+17273
+17274
+17275
+17276
+17277
+17278
+17279
+17280
+17281
+17282
+17283
+17284
+17285
+17286
+17287
+17288
+17289
+17290
+17291
+17292
+17293
+17294
+17295
+17296
+17297
+17298
+17299
+17300
+17301
+17302
+17303
+17304
+17305
+17306
+17307
+17308
+17309
+17310
+17311
+17312
+17313
+17314
+17315
+17316
+17317
+17318
+17319
+17320
+17321
+17322
+17323
+17324
+17325
+17326
+17327
+17328
+17329
+17330
+17331
+17332
+17333
+17334
+17335
+17336
+17337
+17338
+17339
+17340
+17341
+17342
+17343
+17344
+17345
+17346
+17347
+17348
+17349
+17350
+17351
+17352
+17353
+17354
+17355
+17356
+17357
+17358
+17359
+17360
+17361
+17362
+17363
+17364
+17365
+17366
+17367
+17368
+17369
+17370
+17371
+17372
+17373
+17374
+17375
+17376
+17377
+17378
+17379
+17380
+17381
+17382
+17383
+17384
+17385
+17386
+17387
+17388
+17389
+17390
+17391
+17392
+17393
+17394
+17395
+17396
+17397
+17398
+17399
+17400
+17401
+17402
+17403
+17404
+17405
+17406
+17407
+17408
+17409
+17410
+17411
+17412
+17413
+17414
+17415
+17416
+17417
+17418
+17419
+17420
+17421
+17422
+17423
+17424
+17425
+17426
+17427
+17428
+17429
+17430
+17431
+17432
+17433
+17434
+17435
+17436
+17437
+17438
+17439
+17440
+17441
+17442
+17443
+17444
+17445
+17446
+17447
+17448
+17449
+17450
+17451
+17452
+17453
+17454
+17455
+17456
+17457
+17458
+17459
+17460
+17461
+17462
+17463
+17464
+17465
+17466
+17467
+17468
+17469
+17470
+17471
+17472
+17473
+17474
+17475
+17476
+17477
+17478
+17479
+17480
+17481
+17482
+17483
+17484
+17485
+17486
+17487
+17488
+17489
+17490
+17491
+17492
+17493
+17494
+17495
+17496
+17497
+17498
+17499
+17500
+17501
+17502
+17503
+17504
+17505
+17506
+17507
+17508
+17509
+17510
+17511
+17512
+17513
+17514
+17515
+17516
+17517
+17518
+17519
+17520
+17521
+17522
+17523
+17524
+17525
+17526
+17527
+17528
+17529
+17530
+17531
+17532
+17533
+17534
+17535
+17536
+17537
+17538
+17539
+17540
+17541
+17542
+17543
+17544
+17545
+17546
+17547
+17548
+17549
+17550
+17551
+17552
+17553
+17554
+17555
+17556
+17557
+17558
+17559
+17560
+17561
+17562
+17563
+17564
+17565
+17566
+17567
+17568
+17569
+17570
+17571
+17572
+17573
+17574
+17575
+17576
+17577
+17578
+17579
+17580
+17581
+17582
+17583
+17584
+17585
+17586
+17587
+17588
+17589
+17590
+17591
+17592
+17593
+17594
+17595
+17596
+17597
+17598
+17599
+17600
+17601
+17602
+17603
+17604
+17605
+17606
+17607
+17608
+17609
+17610
+17611
+17612
+17613
+17614
+17615
+17616
+17617
+17618
+17619
+17620
+17621
+17622
+17623
+17624
+17625
+17626
+17627
+17628
+17629
+17630
+17631
+17632
+17633
+17634
+17635
+17636
+17637
+17638
+17639
+17640
+17641
+17642
+17643
+17644
+17645
+17646
+17647
+17648
+17649
+17650
+17651
+17652
+17653
+17654
+17655
+17656
+17657
+17658
+17659
+17660
+17661
+17662
+17663
+17664
+17665
+17666
+17667
+17668
+17669
+17670
+17671
+17672
+17673
+17674
+17675
+17676
+17677
+17678
+17679
+17680
+17681
+17682
+17683
+17684
+17685
+17686
+17687
+17688
+17689
+17690
+17691
+17692
+17693
+17694
+17695
+17696
+17697
+17698
+17699
+17700
+17701
+17702
+17703
+17704
+17705
+17706
+17707
+17708
+17709
+17710
+17711
+17712
+17713
+17714
+17715
+17716
+17717
+17718
+17719
+17720
+17721
+17722
+17723
+17724
+17725
+17726
+17727
+17728
+17729
+17730
+17731
+17732
+17733
+17734
+17735
+17736
+17737
+17738
+17739
+17740
+17741
+17742
+17743
+17744
+17745
+17746
+17747
+17748
+17749
+17750
+17751
+17752
+17753
+17754
+17755
+17756
+17757
+17758
+17759
+17760
+17761
+17762
+17763
+17764
+17765
+17766
+17767
+17768
+17769
+17770
+17771
+17772
+17773
+17774
+17775
+17776
+17777
+17778
+17779
+17780
+17781
+17782
+17783
+17784
+17785
+17786
+17787
+17788
+17789
+17790
+17791
+17792
+17793
+17794
+17795
+17796
+17797
+17798
+17799
+17800
+17801
+17802
+17803
+17804
+17805
+17806
+17807
+17808
+17809
+17810
+17811
+17812
+17813
+17814
+17815
+17816
+17817
+17818
+17819
+17820
+17821
+17822
+17823
+17824
+17825
+17826
+17827
+17828
+17829
+17830
+17831
+17832
+17833
+17834
+17835
+17836
+17837
+17838
+17839
+17840
+17841
+17842
+17843
+17844
+17845
+17846
+17847
+17848
+17849
+17850
+17851
+17852
+17853
+17854
+17855
+17856
+17857
+17858
+17859
+17860
+17861
+17862
+17863
+17864
+17865
+17866
+17867
+17868
+17869
+17870
+17871
+17872
+17873
+17874
+17875
+17876
+17877
+17878
+17879
+17880
+17881
+17882
+17883
+17884
+17885
+17886
+17887
+17888
+17889
+17890
+17891
+17892
+17893
+17894
+17895
+17896
+17897
+17898
+17899
+17900
+17901
+17902
+17903
+17904
+17905
+17906
+17907
+17908
+17909
+17910
+17911
+17912
+17913
+17914
+17915
+17916
+17917
+17918
+17919
+17920
+17921
+17922
+17923
+17924
+17925
+17926
+17927
+17928
+17929
+17930
+17931
+17932
+17933
+17934
+17935
+17936
+17937
+17938
+17939
+17940
+17941
+17942
+17943
+17944
+17945
+17946
+17947
+17948
+17949
+17950
+17951
+17952
+17953
+17954
+17955
+17956
+17957
+17958
+17959
+17960
+17961
+17962
+17963
+17964
+17965
+17966
+17967
+17968
+17969
+17970
+17971
+17972
+17973
+17974
+17975
+17976
+17977
+17978
+17979
+17980
+17981
+17982
+17983
+17984
+17985
+17986
+17987
+17988
+17989
+17990
+17991
+17992
+17993
+17994
+17995
+17996
+17997
+17998
+17999
+18000
+18001
+18002
+18003
+18004
+18005
+18006
+18007
+18008
+18009
+18010
+18011
+18012
+18013
+18014
+18015
+18016
+18017
+18018
+18019
+18020
+18021
+18022
+18023
+18024
+18025
+18026
+18027
+18028
+18029
+18030
+18031
+18032
+18033
+18034
+18035
+18036
+18037
+18038
+18039
+18040
+18041
+18042
+18043
+18044
+18045
+18046
+18047
+18048
+18049
+18050
+18051
+18052
+18053
+18054
+18055
+18056
+18057
+18058
+18059
+18060
+18061
+18062
+18063
+18064
+18065
+18066
+18067
+18068
+18069
+18070
+18071
+18072
+18073
+18074
+18075
+18076
+18077
+18078
+18079
+18080
+18081
+18082
+18083
+18084
+18085
+18086
+18087
+18088
+18089
+18090
+18091
+18092
+18093
+18094
+18095
+18096
+18097
+18098
+18099
+18100
+18101
+18102
+18103
+18104
+18105
+18106
+18107
+18108
+18109
+18110
+18111
+18112
+18113
+18114
+18115
+18116
+18117
+18118
+18119
+18120
+18121
+18122
+18123
+18124
+18125
+18126
+18127
+18128
+18129
+18130
+18131
+18132
+18133
+18134
+18135
+18136
+18137
+18138
+18139
+18140
+18141
+18142
+18143
+18144
+18145
+18146
+18147
+18148
+18149
+18150
+18151
+18152
+18153
+18154
+18155
+18156
+18157
+18158
+18159
+18160
+18161
+18162
+18163
+18164
+18165
+18166
+18167
+18168
+18169
+18170
+18171
+18172
+18173
+18174
+18175
+18176
+18177
+18178
+18179
+18180
+18181
+18182
+18183
+18184
+18185
+18186
+18187
+18188
+18189
+18190
+18191
+18192
+18193
+18194
+18195
+18196
+18197
+18198
+18199
+18200
+18201
+18202
+18203
+18204
+18205
+18206
+18207
+18208
+18209
+18210
+18211
+18212
+18213
+18214
+18215
+18216
+18217
+18218
+18219
+18220
+18221
+18222
+18223
+18224
+18225
+18226
+18227
+18228
+18229
+18230
+18231
+18232
+18233
+18234
+18235
+18236
+18237
+18238
+18239
+18240
+18241
+18242
+18243
+18244
+18245
+18246
+18247
+18248
+18249
+18250
+18251
+18252
+18253
+18254
+18255
+18256
+18257
+18258
+18259
+18260
+18261
+18262
+18263
+18264
+18265
+18266
+18267
+18268
+18269
+18270
+18271
+18272
+18273
+18274
+18275
+18276
+18277
+18278
+18279
+18280
+18281
+18282
+18283
+18284
+18285
+18286
+18287
+18288
+18289
+18290
+18291
+18292
+18293
+18294
+18295
+18296
+18297
+18298
+18299
+18300
+18301
+18302
+18303
+18304
+18305
+18306
+18307
+18308
+18309
+18310
+18311
+18312
+18313
+18314
+18315
+18316
+18317
+18318
+18319
+18320
+18321
+18322
+18323
+18324
+18325
+18326
+18327
+18328
+18329
+18330
+18331
+18332
+18333
+18334
+18335
+18336
+18337
+18338
+18339
+18340
+18341
+18342
+18343
+18344
+18345
+18346
+18347
+18348
+18349
+18350
+18351
+18352
+18353
+18354
+18355
+18356
+18357
+18358
+18359
+18360
+18361
+18362
+18363
+18364
+18365
+18366
+18367
+18368
+18369
+18370
+18371
+18372
+18373
+18374
+18375
+18376
+18377
+18378
+18379
+18380
+18381
+18382
+18383
+18384
+18385
+18386
+18387
+18388
+18389
+18390
+18391
+18392
+18393
+18394
+18395
+18396
+18397
+18398
+18399
+18400
+18401
+18402
+18403
+18404
+18405
+18406
+18407
+18408
+18409
+18410
+18411
+18412
+18413
+18414
+18415
+18416
+18417
+18418
+18419
+18420
+18421
+18422
+18423
+18424
+18425
+18426
+18427
+18428
+18429
+18430
+18431
+18432
+18433
+18434
+18435
+18436
+18437
+18438
+18439
+18440
+18441
+18442
+18443
+18444
+18445
+18446
+18447
+18448
+18449
+18450
+18451
+18452
+18453
+18454
+18455
+18456
+18457
+18458
+18459
+18460
+18461
+18462
+18463
+18464
+18465
+18466
+18467
+18468
+18469
+18470
+18471
+18472
+18473
+18474
+18475
+18476
+18477
+18478
+18479
+18480
+18481
+18482
+18483
+18484
+18485
+18486
+18487
+18488
+18489
+18490
+18491
+18492
+18493
+18494
+18495
+18496
+18497
+18498
+18499
+18500
+18501
+18502
+18503
+18504
+18505
+18506
+18507
+18508
+18509
+18510
+18511
+18512
+18513
+18514
+18515
+18516
+18517
+18518
+18519
+18520
+18521
+18522
+18523
+18524
+18525
+18526
+18527
+18528
+18529
+18530
+18531
+18532
+18533
+18534
+18535
+18536
+18537
+18538
+18539
+18540
+18541
+18542
+18543
+18544
+18545
+18546
+18547
+18548
+18549
+18550
+18551
+18552
+18553
+18554
+18555
+18556
+18557
+18558
+18559
+18560
+18561
+18562
+18563
+18564
+18565
+18566
+18567
+18568
+18569
+18570
+18571
+18572
+18573
+18574
+18575
+18576
+18577
+18578
+18579
+18580
+18581
+18582
+18583
+18584
+18585
+18586
+18587
+18588
+18589
+18590
+18591
+18592
+18593
+18594
+18595
+18596
+18597
+18598
+18599
+18600
+18601
+18602
+18603
+18604
+18605
+18606
+18607
+18608
+18609
+18610
+18611
+18612
+18613
+18614
+18615
+18616
+18617
+18618
+18619
+18620
+18621
+18622
+18623
+18624
+18625
+18626
+18627
+18628
+18629
+18630
+18631
+18632
+18633
+18634
+18635
+18636
+18637
+18638
+18639
+18640
+18641
+18642
+18643
+18644
+18645
+18646
+18647
+18648
+18649
+18650
+18651
+18652
+18653
+18654
+18655
+18656
+18657
+18658
+18659
+18660
+18661
+18662
+18663
+18664
+18665
+18666
+18667
+18668
+18669
+18670
+18671
+18672
+18673
+18674
+18675
+18676
+18677
+18678
+18679
+18680
+18681
+18682
+18683
+18684
+18685
+18686
+18687
+18688
+18689
+18690
+18691
+18692
+18693
+18694
+18695
+18696
+18697
+18698
+18699
+18700
+18701
+18702
+18703
+18704
+18705
+18706
+18707
+18708
+18709
+18710
+18711
+18712
+18713
+18714
+18715
+18716
+18717
+18718
+18719
+18720
+18721
+18722
+18723
+18724
+18725
+18726
+18727
+18728
+18729
+18730
+18731
+18732
+18733
+18734
+18735
+18736
+18737
+18738
+18739
+18740
+18741
+18742
+18743
+18744
+18745
+18746
+18747
+18748
+18749
+18750
+18751
+18752
+18753
+18754
+18755
+18756
+18757
+18758
+18759
+18760
+18761
+18762
+18763
+18764
+18765
+18766
+18767
+18768
+18769
+18770
+18771
+18772
+18773
+18774
+18775
+18776
+18777
+18778
+18779
+18780
+18781
+18782
+18783
+18784
+18785
+18786
+18787
+18788
+18789
+18790
+18791
+18792
+18793
+18794
+18795
+18796
+18797
+18798
+18799
+18800
+18801
+18802
+18803
+18804
+18805
+18806
+18807
+18808
+18809
+18810
+18811
+18812
+18813
+18814
+18815
+18816
+18817
+18818
+18819
+18820
+18821
+18822
+18823
+18824
+18825
+18826
+18827
+18828
+18829
+18830
+18831
+18832
+18833
+18834
+18835
+18836
+18837
+18838
+18839
+18840
+18841
+18842
+18843
+18844
+18845
+18846
+18847
+18848
+18849
+18850
+18851
+18852
+18853
+18854
+18855
+18856
+18857
+18858
+18859
+18860
+18861
+18862
+18863
+18864
+18865
+18866
+18867
+18868
+18869
+18870
+18871
+18872
+18873
+18874
+18875
+18876
+18877
+18878
+18879
+18880
+18881
+18882
+18883
+18884
+18885
+18886
+18887
+18888
+18889
+18890
+18891
+18892
+18893
+18894
+18895
+18896
+18897
+18898
+18899
+18900
+18901
+18902
+18903
+18904
+18905
+18906
+18907
+18908
+18909
+18910
+18911
+18912
+18913
+18914
+18915
+18916
+18917
+18918
+18919
+18920
+18921
+18922
+18923
+18924
+18925
+18926
+18927
+18928
+18929
+18930
+18931
+18932
+18933
+18934
+18935
+18936
+18937
+18938
+18939
+18940
+18941
+18942
+18943
+18944
+18945
+18946
+18947
+18948
+18949
+18950
+18951
+18952
+18953
+18954
+18955
+18956
+18957
+18958
+18959
+18960
+18961
+18962
+18963
+18964
+18965
+18966
+18967
+18968
+18969
+18970
+18971
+18972
+18973
+18974
+18975
+18976
+18977
+18978
+18979
+18980
+18981
+18982
+18983
+18984
+18985
+18986
+18987
+18988
+18989
+18990
+18991
+18992
+18993
+18994
+18995
+18996
+18997
+18998
+18999
+19000
+19001
+19002
+19003
+19004
+19005
+19006
+19007
+19008
+19009
+19010
+19011
+19012
+19013
+19014
+19015
+19016
+19017
+19018
+19019
+19020
+19021
+19022
+19023
+19024
+19025
+19026
+19027
+19028
+19029
+19030
+19031
+19032
+19033
+19034
+19035
+19036
+19037
+19038
+19039
+19040
+19041
+19042
+19043
+19044
+19045
+19046
+19047
+19048
+19049
+19050
+19051
+19052
+19053
+19054
+19055
+19056
+19057
+19058
+19059
+19060
+19061
+19062
+19063
+19064
+19065
+19066
+19067
+19068
+19069
+19070
+19071
+19072
+19073
+19074
+19075
+19076
+19077
+19078
+19079
+19080
+19081
+19082
+19083
+19084
+19085
+19086
+19087
+19088
+19089
+19090
+19091
+19092
+19093
+19094
+19095
+19096
+19097
+19098
+19099
+19100
+19101
+19102
+19103
+19104
+19105
+19106
+19107
+19108
+19109
+19110
+19111
+19112
+19113
+19114
+19115
+19116
+19117
+19118
+19119
+19120
+19121
+19122
+19123
+19124
+19125
+19126
+19127
+19128
+19129
+19130
+19131
+19132
+19133
+19134
+19135
+19136
+19137
+19138
+19139
+19140
+19141
+19142
+19143
+19144
+19145
+19146
+19147
+19148
+19149
+19150
+19151
+19152
+19153
+19154
+19155
+19156
+19157
+19158
+19159
+19160
+19161
+19162
+19163
+19164
+19165
+19166
+19167
+19168
+19169
+19170
+19171
+19172
+19173
+19174
+19175
+19176
+19177
+19178
+19179
+19180
+19181
+19182
+19183
+19184
+19185
+19186
+19187
+19188
+19189
+19190
+19191
+19192
+19193
+19194
+19195
+19196
+19197
+19198
+19199
+19200
+19201
+19202
+19203
+19204
+19205
+19206
+19207
+19208
+19209
+19210
+19211
+19212
+19213
+19214
+19215
+19216
+19217
+19218
+19219
+19220
+19221
+19222
+19223
+19224
+19225
+19226
+19227
+19228
+19229
+19230
+19231
+19232
+19233
+19234
+19235
+19236
+19237
+19238
+19239
+19240
+19241
+19242
+19243
+19244
+19245
+19246
+19247
+19248
+19249
+19250
+19251
+19252
+19253
+19254
+19255
+19256
+19257
+19258
+19259
+19260
+19261
+19262
+19263
+19264
+19265
+19266
+19267
+19268
+19269
+19270
+19271
+19272
+19273
+19274
+19275
+19276
+19277
+19278
+19279
+19280
+19281
+19282
+19283
+19284
+19285
+19286
+19287
+19288
+19289
+19290
+19291
+19292
+19293
+19294
+19295
+19296
+19297
+19298
+19299
+19300
+19301
+19302
+19303
+19304
+19305
+19306
+19307
+19308
+19309
+19310
+19311
+19312
+19313
+19314
+19315
+19316
+19317
+19318
+19319
+19320
+19321
+19322
+19323
+19324
+19325
+19326
+19327
+19328
+19329
+19330
+19331
+19332
+19333
+19334
+19335
+19336
+19337
+19338
+19339
+19340
+19341
+19342
+19343
+19344
+19345
+19346
+19347
+19348
+19349
+19350
+19351
+19352
+19353
+19354
+19355
+19356
+19357
+19358
+19359
+19360
+19361
+19362
+19363
+19364
+19365
+19366
+19367
+19368
+19369
+19370
+19371
+19372
+19373
+19374
+19375
+19376
+19377
+19378
+19379
+19380
+19381
+19382
+19383
+19384
+19385
+19386
+19387
+19388
+19389
+19390
+19391
+19392
+19393
+19394
+19395
+19396
+19397
+19398
+19399
+19400
+19401
+19402
+19403
+19404
+19405
+19406
+19407
+19408
+19409
+19410
+19411
+19412
+19413
+19414
+19415
+19416
+19417
+19418
+19419
+19420
+19421
+19422
+19423
+19424
+19425
+19426
+19427
+19428
+19429
+19430
+19431
+19432
+19433
+19434
+19435
+19436
+19437
+19438
+19439
+19440
+19441
+19442
+19443
+19444
+19445
+19446
+19447
+19448
+19449
+19450
+19451
+19452
+19453
+19454
+19455
+19456
+19457
+19458
+19459
+19460
+19461
+19462
+19463
+19464
+19465
+19466
+19467
+19468
+19469
+19470
+19471
+19472
+19473
+19474
+19475
+19476
+19477
+19478
+19479
+19480
+19481
+19482
+19483
+19484
+19485
+19486
+19487
+19488
+19489
+19490
+19491
+19492
+19493
+19494
+19495
+19496
+19497
+19498
+19499
+19500
+19501
+19502
+19503
+19504
+19505
+19506
+19507
+19508
+19509
+19510
+19511
+19512
+19513
+19514
+19515
+19516
+19517
+19518
+19519
+19520
+19521
+19522
+19523
+19524
+19525
+19526
+19527
+19528
+19529
+19530
+19531
+19532
+19533
+19534
+19535
+19536
+19537
+19538
+19539
+19540
+19541
+19542
+19543
+19544
+19545
+19546
+19547
+19548
+19549
+19550
+19551
+19552
+19553
+19554
+19555
+19556
+19557
+19558
+19559
+19560
+19561
+19562
+19563
+19564
+19565
+19566
+19567
+19568
+19569
+19570
+19571
+19572
+19573
+19574
+19575
+19576
+19577
+19578
+19579
+19580
+19581
+19582
+19583
+19584
+19585
+19586
+19587
+19588
+19589
+19590
+19591
+19592
+19593
+19594
+19595
+19596
+19597
+19598
+19599
+19600
+19601
+19602
+19603
+19604
+19605
+19606
+19607
+19608
+19609
+19610
+19611
+19612
+19613
+19614
+19615
+19616
+19617
+19618
+19619
+19620
+19621
+19622
+19623
+19624
+19625
+19626
+19627
+19628
+19629
+19630
+19631
+19632
+19633
+19634
+19635
+19636
+19637
+19638
+19639
+19640
+19641
+19642
+19643
+19644
+19645
+19646
+19647
+19648
+19649
+19650
+19651
+19652
+19653
+19654
+19655
+19656
+19657
+19658
+19659
+19660
+19661
+19662
+19663
+19664
+19665
+19666
+19667
+19668
+19669
+19670
+19671
+19672
+19673
+19674
+19675
+19676
+19677
+19678
+19679
+19680
+19681
+19682
+19683
+19684
+19685
+19686
+19687
+19688
+19689
+19690
+19691
+19692
+19693
+19694
+19695
+19696
+19697
+19698
+19699
+19700
+19701
+19702
+19703
+19704
+19705
+19706
+19707
+19708
+19709
+19710
+19711
+19712
+19713
+19714
+19715
+19716
+19717
+19718
+19719
+19720
+19721
+19722
+19723
+19724
+19725
+19726
+19727
+19728
+19729
+19730
+19731
+19732
+19733
+19734
+19735
+19736
+19737
+19738
+19739
+19740
+19741
+19742
+19743
+19744
+19745
+19746
+19747
+19748
+19749
+19750
+19751
+19752
+19753
+19754
+19755
+19756
+19757
+19758
+19759
+19760
+19761
+19762
+19763
+19764
+19765
+19766
+19767
+19768
+19769
+19770
+19771
+19772
+19773
+19774
+19775
+19776
+19777
+19778
+19779
+19780
+19781
+19782
+19783
+19784
+19785
+19786
+19787
+19788
+19789
+19790
+19791
+19792
+19793
+19794
+19795
+19796
+19797
+19798
+19799
+19800
+19801
+19802
+19803
+19804
+19805
+19806
+19807
+19808
+19809
+19810
+19811
+19812
+19813
+19814
+19815
+19816
+19817
+19818
+19819
+19820
+19821
+19822
+19823
+19824
+19825
+19826
+19827
+19828
+19829
+19830
+19831
+19832
+19833
+19834
+19835
+19836
+19837
+19838
+19839
+19840
+19841
+19842
+19843
+19844
+19845
+19846
+19847
+19848
+19849
+19850
+19851
+19852
+19853
+19854
+19855
+19856
+19857
+19858
+19859
+19860
+19861
+19862
+19863
+19864
+19865
+19866
+19867
+19868
+19869
+19870
+19871
+19872
+19873
+19874
+19875
+19876
+19877
+19878
+19879
+19880
+19881
+19882
+19883
+19884
+19885
+19886
+19887
+19888
+19889
+19890
+19891
+19892
+19893
+19894
+19895
+19896
+19897
+19898
+19899
+19900
+19901
+19902
+19903
+19904
+19905
+19906
+19907
+19908
+19909
+19910
+19911
+19912
+19913
+19914
+19915
+19916
+19917
+19918
+19919
+19920
+19921
+19922
+19923
+19924
+19925
+19926
+19927
+19928
+19929
+19930
+19931
+19932
+19933
+19934
+19935
+19936
+19937
+19938
+19939
+19940
+19941
+19942
+19943
+19944
+19945
+19946
+19947
+19948
+19949
+19950
+19951
+19952
+19953
+19954
+19955
+19956
+19957
+19958
+19959
+19960
+19961
+19962
+19963
+19964
+19965
+19966
+19967
+19968
+19969
+19970
+19971
+19972
+19973
+19974
+19975
+19976
+19977
+19978
+19979
+19980
+19981
+19982
+19983
+19984
+19985
+19986
+19987
+19988
+19989
+19990
+19991
+19992
+19993
+19994
+19995
+19996
+19997
+19998
+19999
+20000
+20001
+20002
+20003
+20004
+20005
+20006
+20007
+20008
+20009
+20010
+20011
+20012
+20013
+20014
+20015
+20016
+20017
+20018
+20019
+20020
+20021
+20022
+20023
+20024
+20025
+20026
+20027
+20028
+20029
+20030
+20031
+20032
+20033
+20034
+20035
+20036
+20037
+20038
+20039
+20040
+20041
+20042
+20043
+20044
+20045
+20046
+20047
+20048
+20049
+20050
+20051
+20052
+20053
+20054
+20055
+20056
+20057
+20058
+20059
+20060
+20061
+20062
+20063
+20064
+20065
+20066
+20067
+20068
+20069
+20070
+20071
+20072
+20073
+20074
+20075
+20076
+20077
+20078
+20079
+20080
+20081
+20082
+20083
+20084
+20085
+20086
+20087
+20088
+20089
+20090
+20091
+20092
+20093
+20094
+20095
+20096
+20097
+20098
+20099
+20100
+20101
+20102
+20103
+20104
+20105
+20106
+20107
+20108
+20109
+20110
+20111
+20112
+20113
+20114
+20115
+20116
+20117
+20118
+20119
+20120
+20121
+20122
+20123
+20124
+20125
+20126
+20127
+20128
+20129
+20130
+20131
+20132
+20133
+20134
+20135
+20136
+20137
+20138
+20139
+20140
+20141
+20142
+20143
+20144
+20145
+20146
+20147
+20148
+20149
+20150
+20151
+20152
+20153
+20154
+20155
+20156
+20157
+20158
+20159
+20160
+20161
+20162
+20163
+20164
+20165
+20166
+20167
+20168
+20169
+20170
+20171
+20172
+20173
+20174
+20175
+20176
+20177
+20178
+20179
+20180
+20181
+20182
+20183
+20184
+20185
+20186
+20187
+20188
+20189
+20190
+20191
+20192
+20193
+20194
+20195
+20196
+20197
+20198
+20199
+20200
+20201
+20202
+20203
+20204
+20205
+20206
+20207
+20208
+20209
+20210
+20211
+20212
+20213
+20214
+20215
+20216
+20217
+20218
+20219
+20220
+20221
+20222
+20223
+20224
+20225
+20226
+20227
+20228
+20229
+20230
+20231
+20232
+20233
+20234
+20235
+20236
+20237
+20238
+20239
+20240
+20241
+20242
+20243
+20244
+20245
+20246
+20247
+20248
+20249
+20250
+20251
+20252
+20253
+20254
+20255
+20256
+20257
+20258
+20259
+20260
+20261
+20262
+20263
+20264
+20265
+20266
+20267
+20268
+20269
+20270
+20271
+20272
+20273
+20274
+20275
+20276
+20277
+20278
+20279
+20280
+20281
+20282
+20283
+20284
+20285
+20286
+20287
+20288
+20289
+20290
+20291
+20292
+20293
+20294
+20295
+20296
+20297
+20298
+20299
+20300
+20301
+20302
+20303
+20304
+20305
+20306
+20307
+20308
+20309
+20310
+20311
+20312
+20313
+20314
+20315
+20316
+20317
+20318
+20319
+20320
+20321
+20322
+20323
+20324
+20325
+20326
+20327
+20328
+20329
+20330
+20331
+20332
+20333
+20334
+20335
+20336
+20337
+20338
+20339
+20340
+20341
+20342
+20343
+20344
+20345
+20346
+20347
+20348
+20349
+20350
+20351
+20352
+20353
+20354
+20355
+20356
+20357
+20358
+20359
+20360
+20361
+20362
+20363
+20364
+20365
+20366
+20367
+20368
+20369
+20370
+20371
+20372
+20373
+20374
+20375
+20376
+20377
+20378
+20379
+20380
+20381
+20382
+20383
+20384
+20385
+20386
+20387
+20388
+20389
+20390
+20391
+20392
+20393
+20394
+20395
+20396
+20397
+20398
+20399
+20400
+20401
+20402
+20403
+20404
+20405
+20406
+20407
+20408
+20409
+20410
+20411
+20412
+20413
+20414
+20415
+20416
+20417
+20418
+20419
+20420
+20421
+20422
+20423
+20424
+20425
+20426
+20427
+20428
+20429
+20430
+20431
+20432
+20433
+20434
+20435
+20436
+20437
+20438
+20439
+20440
+20441
+20442
+20443
+20444
+20445
+20446
+20447
+20448
+20449
+20450
+20451
+20452
+20453
+20454
+20455
+20456
+20457
+20458
+20459
+20460
+20461
+20462
+20463
+20464
+20465
+20466
+20467
+20468
+20469
+20470
+20471
+20472
+20473
+20474
+20475
+20476
+20477
+20478
+20479
+20480
+20481
+20482
+20483
+20484
+20485
+20486
+20487
+20488
+20489
+20490
+20491
+20492
+20493
+20494
+20495
+20496
+20497
+20498
+20499
+20500
+20501
+20502
+20503
+20504
+20505
+20506
+20507
+20508
+20509
+20510
+20511
+20512
+20513
+20514
+20515
+20516
+20517
+20518
+20519
+20520
+20521
+20522
+20523
+20524
+20525
+20526
+20527
+20528
+20529
+20530
+20531
+20532
+20533
+20534
+20535
+20536
+20537
+20538
+20539
+20540
+20541
+20542
+20543
+20544
+20545
+20546
+20547
+20548
+20549
+20550
+20551
+20552
+20553
+20554
+20555
+20556
+20557
+20558
+20559
+20560
+20561
+20562
+20563
+20564
+20565
+20566
+20567
+20568
+20569
+20570
+20571
+20572
+20573
+20574
+20575
+20576
+20577
+20578
+20579
+20580
+20581
+20582
+20583
+20584
+20585
+20586
+20587
+20588
+20589
+20590
+20591
+20592
+20593
+20594
+20595
+20596
+20597
+20598
+20599
+20600
+20601
+20602
+20603
+20604
+20605
+20606
+20607
+20608
+20609
+20610
+20611
+20612
+20613
+20614
+20615
+20616
+20617
+20618
+20619
+20620
+20621
+20622
+20623
+20624
+20625
+20626
+20627
+20628
+20629
+20630
+20631
+20632
+20633
+20634
+20635
+20636
+20637
+20638
+20639
+20640
+20641
+20642
+20643
+20644
+20645
+20646
+20647
+20648
+20649
+20650
+20651
+20652
+20653
+20654
+20655
+20656
+20657
+20658
+20659
+20660
+20661
+20662
+20663
+20664
+20665
+20666
+20667
+20668
+20669
+20670
+20671
+20672
+20673
+20674
+20675
+20676
+20677
+20678
+20679
+20680
+20681
+20682
+20683
+20684
+20685
+20686
+20687
+20688
+20689
+20690
+20691
+20692
+20693
+20694
+20695
+20696
+20697
+20698
+20699
+20700
+20701
+20702
+20703
+20704
+20705
+20706
+20707
+20708
+20709
+20710
+20711
+20712
+20713
+20714
+20715
+20716
+20717
+20718
+20719
+20720
+20721
+20722
+20723
+20724
+20725
+20726
+20727
+20728
+20729
+20730
+20731
+20732
+20733
+20734
+20735
+20736
+20737
+20738
+20739
+20740
+20741
+20742
+20743
+20744
+20745
+20746
+20747
+20748
+20749
+20750
+20751
+20752
+20753
+20754
+20755
+20756
+20757
+20758
+20759
+20760
+20761
+20762
+20763
+20764
+20765
+20766
+20767
+20768
+20769
+20770
+20771
+20772
+20773
+20774
+20775
+20776
+20777
+20778
+20779
+20780
+20781
+20782
+20783
+20784
+20785
+20786
+20787
+20788
+20789
+20790
+20791
+20792
+20793
+20794
+20795
+20796
+20797
+20798
+20799
+20800
+20801
+20802
+20803
+20804
+20805
+20806
+20807
+20808
+20809
+20810
+20811
+20812
+20813
+20814
+20815
+20816
+20817
+20818
+20819
+20820
+20821
+20822
+20823
+20824
+20825
+20826
+20827
+20828
+20829
+20830
+20831
+20832
+20833
+20834
+20835
+20836
+20837
+20838
+20839
+20840
+20841
+20842
+20843
+20844
+20845
+20846
+20847
+20848
+20849
+20850
+20851
+20852
+20853
+20854
+20855
+20856
+20857
+20858
+20859
+20860
+20861
+20862
+20863
+20864
+20865
+20866
+20867
+20868
+20869
+20870
+20871
+20872
+20873
+20874
+20875
+20876
+20877
+20878
+20879
+20880
+20881
+20882
+20883
+20884
+20885
+20886
+20887
+20888
+20889
+20890
+20891
+20892
+20893
+20894
+20895
+20896
+20897
+20898
+20899
+20900
+20901
+20902
+20903
+20904
+20905
+20906
+20907
+20908
+20909
+20910
+20911
+20912
+20913
+20914
+20915
+20916
+20917
+20918
+20919
+20920
+20921
+20922
+20923
+20924
+20925
+20926
+20927
+20928
+20929
+20930
+20931
+20932
+20933
+20934
+20935
+20936
+20937
+20938
+20939
+20940
+20941
+20942
+20943
+20944
+20945
+20946
+20947
+20948
+20949
+20950
+20951
+20952
+20953
+20954
+20955
+20956
+20957
+20958
+20959
+20960
+20961
+20962
+20963
+20964
+20965
+20966
+20967
+20968
+20969
+20970
+20971
+20972
+20973
+20974
+20975
+20976
+20977
+20978
+20979
+20980
+20981
+20982
+20983
+20984
+20985
+20986
+20987
+20988
+20989
+20990
+20991
+20992
+20993
+20994
+20995
+20996
+20997
+20998
+20999
+21000
+21001
+21002
+21003
+21004
+21005
+21006
+21007
+21008
+21009
+21010
+21011
+21012
+21013
+21014
+21015
+21016
+21017
+21018
+21019
+21020
+21021
+21022
+21023
+21024
+21025
+21026
+21027
+21028
+21029
+21030
+21031
+21032
+21033
+21034
+21035
+21036
+21037
+21038
+21039
+21040
+21041
+21042
+21043
+21044
+21045
+21046
+21047
+21048
+21049
+21050
+21051
+21052
+21053
+21054
+21055
+21056
+21057
+21058
+21059
+21060
+21061
+21062
+21063
+21064
+21065
+21066
+21067
+21068
+21069
+21070
+21071
+21072
+21073
+21074
+21075
+21076
+21077
+21078
+21079
+21080
+21081
+21082
+21083
+21084
+21085
+21086
+21087
+21088
+21089
+21090
+21091
+21092
+21093
+21094
+21095
+21096
+21097
+21098
+21099
+21100
+21101
+21102
+21103
+21104
+21105
+21106
+21107
+21108
+21109
+21110
+21111
+21112
+21113
+21114
+21115
+21116
+21117
+21118
+21119
+21120
+21121
+21122
+21123
+21124
+21125
+21126
+21127
+21128
+21129
+21130
+21131
+21132
+21133
+21134
+21135
+21136
+21137
+21138
+21139
+21140
+21141
+21142
+21143
+21144
+21145
+21146
+21147
+21148
+21149
+21150
+21151
+21152
+21153
+21154
+21155
+21156
+21157
+21158
+21159
+21160
+21161
+21162
+21163
+21164
+21165
+21166
+21167
+21168
+21169
+21170
+21171
+21172
+21173
+21174
+21175
+21176
+21177
+21178
+21179
+21180
+21181
+21182
+21183
+21184
+21185
+21186
+21187
+21188
+21189
+21190
+21191
+21192
+21193
+21194
+21195
+21196
+21197
+21198
+21199
+21200
+21201
+21202
+21203
+21204
+21205
+21206
+21207
+21208
+21209
+21210
+21211
+21212
+21213
+21214
+21215
+21216
+21217
+21218
+21219
+21220
+21221
+21222
+21223
+21224
+21225
+21226
+21227
+21228
+21229
+21230
+21231
+21232
+21233
+21234
+21235
+21236
+21237
+21238
+21239
+21240
+21241
+21242
+21243
+21244
+21245
+21246
+21247
+21248
+21249
+21250
+21251
+21252
+21253
+21254
+21255
+21256
+21257
+21258
+21259
+21260
+21261
+21262
+21263
+21264
+21265
+21266
+21267
+21268
+21269
+21270
+21271
+21272
+21273
+21274
+21275
+21276
+21277
+21278
+21279
+21280
+21281
+21282
+21283
+21284
+21285
+21286
+21287
+21288
+21289
+21290
+21291
+21292
+21293
+21294
+21295
+21296
+21297
+21298
+21299
+21300
+21301
+21302
+21303
+21304
+21305
+21306
+21307
+21308
+21309
+21310
+21311
+21312
+21313
+21314
+21315
+21316
+21317
+21318
+21319
+21320
+21321
+21322
+21323
+21324
+21325
+21326
+21327
+21328
+21329
+21330
+21331
+21332
+21333
+21334
+21335
+21336
+21337
+21338
+21339
+21340
+21341
+21342
+21343
+21344
+21345
+21346
+21347
+21348
+21349
+21350
+21351
+21352
+21353
+21354
+21355
+21356
+21357
+21358
+21359
+21360
+21361
+21362
+21363
+21364
+21365
+21366
+21367
+21368
+21369
+21370
+21371
+21372
+21373
+21374
+21375
+21376
+21377
+21378
+21379
+21380
+21381
+21382
+21383
+21384
+21385
+21386
+21387
+21388
+21389
+21390
+21391
+21392
+21393
+21394
+21395
+21396
+21397
+21398
+21399
+21400
+21401
+21402
+21403
+21404
+21405
+21406
+21407
+21408
+21409
+21410
+21411
+21412
+21413
+21414
+21415
+21416
+21417
+21418
+21419
+21420
+21421
+21422
+21423
+21424
+21425
+21426
+21427
+21428
+21429
+21430
+21431
+21432
+21433
+21434
+21435
+21436
+21437
+21438
+21439
+21440
+21441
+21442
+21443
+21444
+21445
+21446
+21447
+21448
+21449
+21450
+21451
+21452
+21453
+21454
+21455
+21456
+21457
+21458
+21459
+21460
+21461
+21462
+21463
+21464
+21465
+21466
+21467
+21468
+21469
+21470
+21471
+21472
+21473
+21474
+21475
+21476
+21477
+21478
+21479
+21480
+21481
+21482
+21483
+21484
+21485
+21486
+21487
+21488
+21489
+21490
+21491
+21492
+21493
+21494
+21495
+21496
+21497
+21498
+21499
+21500
+21501
+21502
+21503
+21504
+21505
+21506
+21507
+21508
+21509
+21510
+21511
+21512
+21513
+21514
+21515
+21516
+21517
+21518
+21519
+21520
+21521
+21522
+21523
+21524
+21525
+21526
+21527
+21528
+21529
+21530
+21531
+21532
+21533
+21534
+21535
+21536
+21537
+21538
+21539
+21540
+21541
+21542
+21543
+21544
+21545
+21546
+21547
+21548
+21549
+21550
+21551
+21552
+21553
+21554
+21555
+21556
+21557
+21558
+21559
+21560
+21561
+21562
+21563
+21564
+21565
+21566
+21567
+21568
+21569
+21570
+21571
+21572
+21573
+21574
+21575
+21576
+21577
+21578
+21579
+21580
+21581
+21582
+21583
+21584
+21585
+21586
+21587
+21588
+21589
+21590
+21591
+21592
+21593
+21594
+21595
+21596
+21597
+21598
+21599
+21600
+21601
+21602
+21603
+21604
+21605
+21606
+21607
+21608
+21609
+21610
+21611
+21612
+21613
+21614
+21615
+21616
+21617
+21618
+21619
+21620
+21621
+21622
+21623
+21624
+21625
+21626
+21627
+21628
+21629
+21630
+21631
+21632
+21633
+21634
+21635
+21636
+21637
+21638
+21639
+21640
+21641
+21642
+21643
+21644
+21645
+21646
+21647
+21648
+21649
+21650
+21651
+21652
+21653
+21654
+21655
+21656
+21657
+21658
+21659
+21660
+21661
+21662
+21663
+21664
+21665
+21666
+21667
+21668
+21669
+21670
+21671
+21672
+21673
+21674
+21675
+21676
+21677
+21678
+21679
+21680
+21681
+21682
+21683
+21684
+21685
+21686
+21687
+21688
+21689
+21690
+21691
+21692
+21693
+21694
+21695
+21696
+21697
+21698
+21699
+21700
+21701
+21702
+21703
+21704
+21705
+21706
+21707
+21708
+21709
+21710
+21711
+21712
+21713
+21714
+21715
+21716
+21717
+21718
+21719
+21720
+21721
+21722
+21723
+21724
+21725
+21726
+21727
+21728
+21729
+21730
+21731
+21732
+21733
+21734
+21735
+21736
+21737
+21738
+21739
+21740
+21741
+21742
+21743
+21744
+21745
+21746
+21747
+21748
+21749
+21750
+21751
+21752
+21753
+21754
+21755
+21756
+21757
+21758
+21759
+21760
+21761
+21762
+21763
+21764
+21765
+21766
+21767
+21768
+21769
+21770
+21771
+21772
+21773
+21774
+21775
+21776
+21777
+21778
+21779
+21780
+21781
+21782
+21783
+21784
+21785
+21786
+21787
+21788
+21789
+21790
+21791
+21792
+21793
+21794
+21795
+21796
+21797
+21798
+21799
+21800
+21801
+21802
+21803
+21804
+21805
+21806
+21807
+21808
+21809
+21810
+21811
+21812
+21813
+21814
+21815
+21816
+21817
+21818
+21819
+21820
+21821
+21822
+21823
+21824
+21825
+21826
+21827
+21828
+21829
+21830
+21831
+21832
+21833
+21834
+21835
+21836
+21837
+21838
+21839
+21840
+21841
+21842
+21843
+21844
+21845
+21846
+21847
+21848
+21849
+21850
+21851
+21852
+21853
+21854
+21855
+21856
+21857
+21858
+21859
+21860
+21861
+21862
+21863
+21864
+21865
+21866
+21867
+21868
+21869
+21870
+21871
+21872
+21873
+21874
+21875
+21876
+21877
+21878
+21879
+21880
+21881
+21882
+21883
+21884
+21885
+21886
+21887
+21888
+21889
+21890
+21891
+21892
+21893
+21894
+21895
+21896
+21897
+21898
+21899
+21900
+21901
+21902
+21903
+21904
+21905
+21906
+21907
+21908
+21909
+21910
+21911
+21912
+21913
+21914
+21915
+21916
+21917
+21918
+21919
+21920
+21921
+21922
+21923
+21924
+21925
+21926
+21927
+21928
+21929
+21930
+21931
+21932
+21933
+21934
+21935
+21936
+21937
+21938
+21939
+21940
+21941
+21942
+21943
+21944
+21945
+21946
+21947
+21948
+21949
+21950
+21951
+21952
+21953
+21954
+21955
+21956
+21957
+21958
+21959
+21960
+21961
+21962
+21963
+21964
+21965
+21966
+21967
+21968
+21969
+21970
+21971
+21972
+21973
+21974
+21975
+21976
+21977
+21978
+21979
+21980
+21981
+21982
+21983
+21984
+21985
+21986
+21987
+21988
+21989
+21990
+21991
+21992
+21993
+21994
+21995
+21996
+21997
+21998
+21999
+22000
+22001
+22002
+22003
+22004
+22005
+22006
+22007
+22008
+22009
+22010
+22011
+22012
+22013
+22014
+22015
+22016
+22017
+22018
+22019
+22020
+22021
+22022
+22023
+22024
+22025
+22026
+22027
+22028
+22029
+22030
+22031
+22032
+22033
+22034
+22035
+22036
+22037
+22038
+22039
+22040
+22041
+22042
+22043
+22044
+22045
+22046
+22047
+22048
+22049
+22050
+22051
+22052
+22053
+22054
+22055
+22056
+22057
+22058
+22059
+22060
+22061
+22062
+22063
+22064
+22065
+22066
+22067
+22068
+22069
+22070
+22071
+22072
+22073
+22074
+22075
+22076
+22077
+22078
+22079
+22080
+22081
+22082
+22083
+22084
+22085
+22086
+22087
+22088
+22089
+22090
+22091
+22092
+22093
+22094
+22095
+22096
+22097
+22098
+22099
+22100
+22101
+22102
+22103
+22104
+22105
+22106
+22107
+22108
+22109
+22110
+22111
+22112
+22113
+22114
+22115
+22116
+22117
+22118
+22119
+22120
+22121
+22122
+22123
+22124
+22125
+22126
+22127
+22128
+22129
+22130
+22131
+22132
+22133
+22134
+22135
+22136
+22137
+22138
+22139
+22140
+22141
+22142
+22143
+22144
+22145
+22146
+22147
+22148
+22149
+22150
+22151
+22152
+22153
+22154
+22155
+22156
+22157
+22158
+22159
+22160
+22161
+22162
+22163
+22164
+22165
+22166
+22167
+22168
+22169
+22170
+22171
+22172
+22173
+22174
+22175
+22176
+22177
+22178
+22179
+22180
+22181
+22182
+22183
+22184
+22185
+22186
+22187
+22188
+22189
+22190
+22191
+22192
+22193
+22194
+22195
+22196
+22197
+22198
+22199
+22200
+22201
+22202
+22203
+22204
+22205
+22206
+22207
+22208
+22209
+22210
+22211
+22212
+22213
+22214
+22215
+22216
+22217
+22218
+22219
+22220
+22221
+22222
+22223
+22224
+22225
+22226
+22227
+22228
+22229
+22230
+22231
+22232
+22233
+22234
+22235
+22236
+22237
+22238
+22239
+22240
+22241
+22242
+22243
+22244
+22245
+22246
+22247
+22248
+22249
+22250
+22251
+22252
+22253
+22254
+22255
+22256
+22257
+22258
+22259
+22260
+22261
+22262
+22263
+22264
+22265
+22266
+22267
+22268
+22269
+22270
+22271
+22272
+22273
+22274
+22275
+22276
+22277
+22278
+22279
+22280
+22281
+22282
+22283
+22284
+22285
+22286
+22287
+22288
+22289
+22290
+22291
+22292
+22293
+22294
+22295
+22296
+22297
+22298
+22299
+22300
+22301
+22302
+22303
+22304
+22305
+22306
+22307
+22308
+22309
+22310
+22311
+22312
+22313
+22314
+22315
+22316
+22317
+22318
+22319
+22320
+22321
+22322
+22323
+22324
+22325
+22326
+22327
+22328
+22329
+22330
+22331
+22332
+22333
+22334
+22335
+22336
+22337
+22338
+22339
+22340
+22341
+22342
+22343
+22344
+22345
+22346
+22347
+22348
+22349
+22350
+22351
+22352
+22353
+22354
+22355
+22356
+22357
+22358
+22359
+22360
+22361
+22362
+22363
+22364
+22365
+22366
+22367
+22368
+22369
+22370
+22371
+22372
+22373
+22374
+22375
+22376
+22377
+22378
+22379
+22380
+22381
+22382
+22383
+22384
+22385
+22386
+22387
+22388
+22389
+22390
+22391
+22392
+22393
+22394
+22395
+22396
+22397
+22398
+22399
+22400
+22401
+22402
+22403
+22404
+22405
+22406
+22407
+22408
+22409
+22410
+22411
+22412
+22413
+22414
+22415
+22416
+22417
+22418
+22419
+22420
+22421
+22422
+22423
+22424
+22425
+22426
+22427
+22428
+22429
+22430
+22431
+22432
+22433
+22434
+22435
+22436
+22437
+22438
+22439
+22440
+22441
+22442
+22443
+22444
+22445
+22446
+22447
+22448
+22449
+22450
+22451
+22452
+22453
+22454
+22455
+22456
+22457
+22458
+22459
+22460
+22461
+22462
+22463
+22464
+22465
+22466
+22467
+22468
+22469
+22470
+22471
+22472
+22473
+22474
+22475
+22476
+22477
+22478
+22479
+22480
+22481
+22482
+22483
+22484
+22485
+22486
+22487
+22488
+22489
+22490
+22491
+22492
+22493
+22494
+22495
+22496
+22497
+22498
+22499
+22500
+22501
+22502
+22503
+22504
+22505
+22506
+22507
+22508
+22509
+22510
+22511
+22512
+22513
+22514
+22515
+22516
+22517
+22518
+22519
+22520
+22521
+22522
+22523
+22524
+22525
+22526
+22527
+22528
+22529
+22530
+22531
+22532
+22533
+22534
+22535
+22536
+22537
+22538
+22539
+22540
+22541
+22542
+22543
+22544
+22545
+22546
+22547
+22548
+22549
+22550
+22551
+22552
+22553
+22554
+22555
+22556
+22557
+22558
+22559
+22560
+22561
+22562
+22563
+22564
+22565
+22566
+22567
+22568
+22569
+22570
+22571
+22572
+22573
+22574
+22575
+22576
+22577
+22578
+22579
+22580
+22581
+22582
+22583
+22584
+22585
+22586
+22587
+22588
+22589
+22590
+22591
+22592
+22593
+22594
+22595
+22596
+22597
+22598
+22599
+22600
+22601
+22602
+22603
+22604
+22605
+22606
+22607
+22608
+22609
+22610
+22611
+22612
+22613
+22614
+22615
+22616
+22617
+22618
+22619
+22620
+22621
+22622
+22623
+22624
+22625
+22626
+22627
+22628
+22629
+22630
+22631
+22632
+22633
+22634
+22635
+22636
+22637
+22638
+22639
+22640
+22641
+22642
+22643
+22644
+22645
+22646
+22647
+22648
+22649
+22650
+22651
+22652
+22653
+22654
+22655
+22656
+22657
+22658
+22659
+22660
+22661
+22662
+22663
+22664
+22665
+22666
+22667
+22668
+22669
+22670
+22671
+22672
+22673
+22674
+22675
+22676
+22677
+22678
+22679
+22680
+22681
+22682
+22683
+22684
+22685
+22686
+22687
+22688
+22689
+22690
+22691
+22692
+22693
+22694
+22695
+22696
+22697
+22698
+22699
+22700
+22701
+22702
+22703
+22704
+22705
+22706
+22707
+22708
+22709
+22710
+22711
+22712
+22713
+22714
+22715
+22716
+22717
+22718
+22719
+22720
+22721
+22722
+22723
+22724
+22725
+22726
+22727
+22728
+22729
+22730
+22731
+22732
+22733
+22734
+22735
+22736
+22737
+22738
+22739
+22740
+22741
+22742
+22743
+22744
+22745
+22746
+22747
+22748
+22749
+22750
+22751
+22752
+22753
+22754
+22755
+22756
+22757
+22758
+22759
+22760
+22761
+22762
+22763
+22764
+22765
+22766
+22767
+22768
+22769
+22770
+22771
+22772
+22773
+22774
+22775
+22776
+22777
+22778
+22779
+22780
+22781
+22782
+22783
+22784
+22785
+22786
+22787
+22788
+22789
+22790
+22791
+22792
+22793
+22794
+22795
+22796
+22797
+22798
+22799
+22800
+22801
+22802
+22803
+22804
+22805
+22806
+22807
+22808
+22809
+22810
+22811
+22812
+22813
+22814
+22815
+22816
+22817
+22818
+22819
+22820
+22821
+22822
+22823
+22824
+22825
+22826
+22827
+22828
+22829
+22830
+22831
+22832
+22833
+22834
+22835
+22836
+22837
+22838
+22839
+22840
+22841
+22842
+22843
+22844
+22845
+22846
+22847
+22848
+22849
+22850
+22851
+22852
+22853
+22854
+22855
+22856
+22857
+22858
+22859
+22860
+22861
+22862
+22863
+22864
+22865
+22866
+22867
+22868
+22869
+22870
+22871
+22872
+22873
+22874
+22875
+22876
+22877
+22878
+22879
+22880
+22881
+22882
+22883
+22884
+22885
+22886
+22887
+22888
+22889
+22890
+22891
+22892
+22893
+22894
+22895
+22896
+22897
+22898
+22899
+22900
+22901
+22902
+22903
+22904
+22905
+22906
+22907
+22908
+22909
+22910
+22911
+22912
+22913
+22914
+22915
+22916
+22917
+22918
+22919
+22920
+22921
+22922
+22923
+22924
+22925
+22926
+22927
+22928
+22929
+22930
+22931
+22932
+22933
+22934
+22935
+22936
+22937
+22938
+22939
+22940
+22941
+22942
+22943
+22944
+22945
+22946
+22947
+22948
+22949
+22950
+22951
+22952
+22953
+22954
+22955
+22956
+22957
+22958
+22959
+22960
+22961
+22962
+22963
+22964
+22965
+22966
+22967
+22968
+22969
+22970
+22971
+22972
+22973
+22974
+22975
+22976
+22977
+22978
+22979
+22980
+22981
+22982
+22983
+22984
+22985
+22986
+22987
+22988
+22989
+22990
+22991
+22992
+22993
+22994
+22995
+22996
+22997
+22998
+22999
+23000
+23001
+23002
+23003
+23004
+23005
+23006
+23007
+23008
+23009
+23010
+23011
+23012
+23013
+23014
+23015
+23016
+23017
+23018
+23019
+23020
+23021
+23022
+23023
+23024
+23025
+23026
+23027
+23028
+23029
+23030
+23031
+23032
+23033
+23034
+23035
+23036
+23037
+23038
+23039
+23040
+23041
+23042
+23043
+23044
+23045
+23046
+23047
+23048
+23049
+23050
+23051
+23052
+23053
+23054
+23055
+23056
+23057
+23058
+23059
+23060
+23061
+23062
+23063
+23064
+23065
+23066
+23067
+23068
+23069
+23070
+23071
+23072
+23073
+23074
+23075
+23076
+23077
+23078
+23079
+23080
+23081
+23082
+23083
+23084
+23085
+23086
+23087
+23088
+23089
+23090
+23091
+23092
+23093
+23094
+23095
+23096
+23097
+23098
+23099
+23100
+23101
+23102
+23103
+23104
+23105
+23106
+23107
+23108
+23109
+23110
+23111
+23112
+23113
+23114
+23115
+23116
+23117
+23118
+23119
+23120
+23121
+23122
+23123
+23124
+23125
+23126
+23127
+23128
+23129
+23130
+23131
+23132
+23133
+23134
+23135
+23136
+23137
+23138
+23139
+23140
+23141
+23142
+23143
+23144
+23145
+23146
+23147
+23148
+23149
+23150
+23151
+23152
+23153
+23154
+23155
+23156
+23157
+23158
+23159
+23160
+23161
+23162
+23163
+23164
+23165
+23166
+23167
+23168
+23169
+23170
+23171
+23172
+23173
+23174
+23175
+23176
+23177
+23178
+23179
+23180
+23181
+23182
+23183
+23184
+23185
+23186
+23187
+23188
+23189
+23190
+23191
+23192
+23193
+23194
+23195
+23196
+23197
+23198
+23199
+23200
+23201
+23202
+23203
+23204
+23205
+23206
+23207
+23208
+23209
+23210
+23211
+23212
+23213
+23214
+23215
+23216
+23217
+23218
+23219
+23220
+23221
+23222
+23223
+23224
+23225
+23226
+23227
+23228
+23229
+23230
+23231
+23232
+23233
+23234
+23235
+23236
+23237
+23238
+23239
+23240
+23241
+23242
+23243
+23244
+23245
+23246
+23247
+23248
+23249
+23250
+23251
+23252
+23253
+23254
+23255
+23256
+23257
+23258
+23259
+23260
+23261
+23262
+23263
+23264
+23265
+23266
+23267
+23268
+23269
+23270
+23271
+23272
+23273
+23274
+23275
+23276
+23277
+23278
+23279
+23280
+23281
+23282
+23283
+23284
+23285
+23286
+23287
+23288
+23289
+23290
+23291
+23292
+23293
+23294
+23295
+23296
+23297
+23298
+23299
+23300
+23301
+23302
+23303
+23304
+23305
+23306
+23307
+23308
+23309
+23310
+23311
+23312
+23313
+23314
+23315
+23316
+23317
+23318
+23319
+23320
+23321
+23322
+23323
+23324
+23325
+23326
+23327
+23328
+23329
+23330
+23331
+23332
+23333
+23334
+23335
+23336
+23337
+23338
+23339
+23340
+23341
+23342
+23343
+23344
+23345
+23346
+23347
+23348
+23349
+23350
+23351
+23352
+23353
+23354
+23355
+23356
+23357
+23358
+23359
+23360
+23361
+23362
+23363
+23364
+23365
+23366
+23367
+23368
+23369
+23370
+23371
+23372
+23373
+23374
+23375
+23376
+23377
+23378
+23379
+23380
+23381
+23382
+23383
+23384
+23385
+23386
+23387
+23388
+23389
+23390
+23391
+23392
+23393
+23394
+23395
+23396
+23397
+23398
+23399
+23400
+23401
+23402
+23403
+23404
+23405
+23406
+23407
+23408
+23409
+23410
+23411
+23412
+23413
+23414
+23415
+23416
+23417
+23418
+23419
+23420
+23421
+23422
+23423
+23424
+23425
+23426
+23427
+23428
+23429
+23430
+23431
+23432
+23433
+23434
+23435
+23436
+23437
+23438
+23439
+23440
+23441
+23442
+23443
+23444
+23445
+23446
+23447
+23448
+23449
+23450
+23451
+23452
+23453
+23454
+23455
+23456
+23457
+23458
+23459
+23460
+23461
+23462
+23463
+23464
+23465
+23466
+23467
+23468
+23469
+23470
+23471
+23472
+23473
+23474
+23475
+23476
+23477
+23478
+23479
+23480
+23481
+23482
+23483
+23484
+23485
+23486
+23487
+23488
+23489
+23490
+23491
+23492
+23493
+23494
+23495
+23496
+23497
+23498
+23499
+23500
+23501
+23502
+23503
+23504
+23505
+23506
+23507
+23508
+23509
+23510
+23511
+23512
+23513
+23514
+23515
+23516
+23517
+23518
+23519
+23520
+23521
+23522
+23523
+23524
+23525
+23526
+23527
+23528
+23529
+23530
+23531
+23532
+23533
+23534
+23535
+23536
+23537
+23538
+23539
+23540
+23541
+23542
+23543
+23544
+23545
+23546
+23547
+23548
+23549
+23550
+23551
+23552
+23553
+23554
+23555
+23556
+23557
+23558
+23559
+23560
+23561
+23562
+23563
+23564
+23565
+23566
+23567
+23568
+23569
+23570
+23571
+23572
+23573
+23574
+23575
+23576
+23577
+23578
+23579
+23580
+23581
+23582
+23583
+23584
+23585
+23586
+23587
+23588
+23589
+23590
+23591
+23592
+23593
+23594
+23595
+23596
+23597
+23598
+23599
+23600
+23601
+23602
+23603
+23604
+23605
+23606
+23607
+23608
+23609
+23610
+23611
+23612
+23613
+23614
+23615
+23616
+23617
+23618
+23619
+23620
+23621
+23622
+23623
+23624
+23625
+23626
+23627
+23628
+23629
+23630
+23631
+23632
+23633
+23634
+23635
+23636
+23637
+23638
+23639
+23640
+23641
+23642
+23643
+23644
+23645
+23646
+23647
+23648
+23649
+23650
+23651
+23652
+23653
+23654
+23655
+23656
+23657
+23658
+23659
+23660
+23661
+23662
+23663
+23664
+23665
+23666
+23667
+23668
+23669
+23670
+23671
+23672
+23673
+23674
+23675
+23676
+23677
+23678
+23679
+23680
+23681
+23682
+23683
+23684
+23685
+23686
+23687
+23688
+23689
+23690
+23691
+23692
+23693
+23694
+23695
+23696
+23697
+23698
+23699
+23700
+23701
+23702
+23703
+23704
+23705
+23706
+23707
+23708
+23709
+23710
+23711
+23712
+23713
+23714
+23715
+23716
+23717
+23718
+23719
+23720
+23721
+23722
+23723
+23724
+23725
+23726
+23727
+23728
+23729
+23730
+23731
+23732
+23733
+23734
+23735
+23736
+23737
+23738
+23739
+23740
+23741
+23742
+23743
+23744
+23745
+23746
+23747
+23748
+23749
+23750
+23751
+23752
+23753
+23754
+23755
+23756
+23757
+23758
+23759
+23760
+23761
+23762
+23763
+23764
+23765
+23766
+23767
+23768
+23769
+23770
+23771
+23772
+23773
+23774
+23775
+23776
+23777
+23778
+23779
+23780
+23781
+23782
+23783
+23784
+23785
+23786
+23787
+23788
+23789
+23790
+23791
+23792
+23793
+23794
+23795
+23796
+23797
+23798
+23799
+23800
+23801
+23802
+23803
+23804
+23805
+23806
+23807
+23808
+23809
+23810
+23811
+23812
+23813
+23814
+23815
+23816
+23817
+23818
+23819
+23820
+23821
+23822
+23823
+23824
+23825
+23826
+23827
+23828
+23829
+23830
+23831
+23832
+23833
+23834
+23835
+23836
+23837
+23838
+23839
+23840
+23841
+23842
+23843
+23844
+23845
+23846
+23847
+23848
+23849
+23850
+23851
+23852
+23853
+23854
+23855
+23856
+23857
+23858
+23859
+23860
+23861
+23862
+23863
+23864
+23865
+23866
+23867
+23868
+23869
+23870
+23871
+23872
+23873
+23874
+23875
+23876
+23877
+23878
+23879
+23880
+23881
+23882
+23883
+23884
+23885
+23886
+23887
+23888
+23889
+23890
+23891
+23892
+23893
+23894
+23895
+23896
+23897
+23898
+23899
+23900
+23901
+23902
+23903
+23904
+23905
+23906
+23907
+23908
+23909
+23910
+23911
+23912
+23913
+23914
+23915
+23916
+23917
+23918
+23919
+23920
+23921
+23922
+23923
+23924
+23925
+23926
+23927
+23928
+23929
+23930
+23931
+23932
+23933
+23934
+23935
+23936
+23937
+23938
+23939
+23940
+23941
+23942
+23943
+23944
+23945
+23946
+23947
+23948
+23949
+23950
+23951
+23952
+23953
+23954
+23955
+23956
+23957
+23958
+23959
+23960
+23961
+23962
+23963
+23964
+23965
+23966
+23967
+23968
+23969
+23970
+23971
+23972
+23973
+23974
+23975
+23976
+23977
+23978
+23979
+23980
+23981
+23982
+23983
+23984
+23985
+23986
+23987
+23988
+23989
+23990
+23991
+23992
+23993
+23994
+23995
+23996
+23997
+23998
+23999
+24000
+24001
+24002
+24003
+24004
+24005
+24006
+24007
+24008
+24009
+24010
+24011
+24012
+24013
+24014
+24015
+24016
+24017
+24018
+24019
+24020
+24021
+24022
+24023
+24024
+24025
+24026
+24027
+24028
+24029
+24030
+24031
+24032
+24033
+24034
+24035
+24036
+24037
+24038
+24039
+24040
+24041
+24042
+24043
+24044
+24045
+24046
+24047
+24048
+24049
+24050
+24051
+24052
+24053
+24054
+24055
+24056
+24057
+24058
+24059
+24060
+24061
+24062
+24063
+24064
+24065
+24066
+24067
+24068
+24069
+24070
+24071
+24072
+24073
+24074
+24075
+24076
+24077
+24078
+24079
+24080
+24081
+24082
+24083
+24084
+24085
+24086
+24087
+24088
+24089
+24090
+24091
+24092
+24093
+24094
+24095
+24096
+24097
+24098
+24099
+24100
+24101
+24102
+24103
+24104
+24105
+24106
+24107
+24108
+24109
+24110
+24111
+24112
+24113
+24114
+24115
+24116
+24117
+24118
+24119
+24120
+24121
+24122
+24123
+24124
+24125
+24126
+24127
+24128
+24129
+24130
+24131
+24132
+24133
+24134
+24135
+24136
+24137
+24138
+24139
+24140
+24141
+24142
+24143
+24144
+24145
+24146
+24147
+24148
+24149
+24150
+24151
+24152
+24153
+24154
+24155
+24156
+24157
+24158
+24159
+24160
+24161
+24162
+24163
+24164
+24165
+24166
+24167
+24168
+24169
+24170
+24171
+24172
+24173
+24174
+24175
+24176
+24177
+24178
+24179
+24180
+24181
+24182
+24183
+24184
+24185
+24186
+24187
+24188
+24189
+24190
+24191
+24192
+24193
+24194
+24195
+24196
+24197
+24198
+24199
+24200
+24201
+24202
+24203
+24204
+24205
+24206
+24207
+24208
+24209
+24210
+24211
+24212
+24213
+24214
+24215
+24216
+24217
+24218
+24219
+24220
+24221
+24222
+24223
+24224
+24225
+24226
+24227
+24228
+24229
+24230
+24231
+24232
+24233
+24234
+24235
+24236
+24237
+24238
+24239
+24240
+24241
+24242
+24243
+24244
+24245
+24246
+24247
+24248
+24249
+24250
+24251
+24252
+24253
+24254
+24255
+24256
+24257
+24258
+24259
+24260
+24261
+24262
+24263
+24264
+24265
+24266
+24267
+24268
+24269
+24270
+24271
+24272
+24273
+24274
+24275
+24276
+24277
+24278
+24279
+24280
+24281
+24282
+24283
+24284
+24285
+24286
+24287
+24288
+24289
+24290
+24291
+24292
+24293
+24294
+24295
+24296
+24297
+24298
+24299
+24300
+24301
+24302
+24303
+24304
+24305
+24306
+24307
+24308
+24309
+24310
+24311
+24312
+24313
+24314
+24315
+24316
+24317
+24318
+24319
+24320
+24321
+24322
+24323
+24324
+24325
+24326
+24327
+24328
+24329
+24330
+24331
+24332
+24333
+24334
+24335
+24336
+24337
+24338
+24339
+24340
+24341
+24342
+24343
+24344
+24345
+24346
+24347
+24348
+24349
+24350
+24351
+24352
+24353
+24354
+24355
+24356
+24357
+24358
+24359
+24360
+24361
+24362
+24363
+24364
+24365
+24366
+24367
+24368
+24369
+24370
+24371
+24372
+24373
+24374
+24375
+24376
+24377
+24378
+24379
+24380
+24381
+24382
+24383
+24384
+24385
+24386
+24387
+24388
+24389
+24390
+24391
+24392
+24393
+24394
+24395
+24396
+24397
+24398
+24399
+24400
+24401
+24402
+24403
+24404
+24405
+24406
+24407
+24408
+24409
+24410
+24411
+24412
+24413
+24414
+24415
+24416
+24417
+24418
+24419
+24420
+24421
+24422
+24423
+24424
+24425
+24426
+24427
+24428
+24429
+24430
+24431
+24432
+24433
+24434
+24435
+24436
+24437
+24438
+24439
+24440
+24441
+24442
+24443
+24444
+24445
+24446
+24447
+24448
+24449
+24450
+24451
+24452
+24453
+24454
+24455
+24456
+24457
+24458
+24459
+24460
+24461
+24462
+24463
+24464
+24465
+24466
+24467
+24468
+24469
+24470
+24471
+24472
+24473
+24474
+24475
+24476
+24477
+24478
+24479
+24480
+24481
+24482
+24483
+24484
+24485
+24486
+24487
+24488
+24489
+24490
+24491
+24492
+24493
+24494
+24495
+24496
+24497
+24498
+24499
+24500
+24501
+24502
+24503
+24504
+24505
+24506
+24507
+24508
+24509
+24510
+24511
+24512
+24513
+24514
+24515
+24516
+24517
+24518
+24519
+24520
+24521
+24522
+24523
+24524
+24525
+24526
+24527
+24528
+24529
+24530
+24531
+24532
+24533
+24534
+24535
+24536
+24537
+24538
+24539
+24540
+24541
+24542
+24543
+24544
+24545
+24546
+24547
+24548
+24549
+24550
+24551
+24552
+24553
+24554
+24555
+24556
+24557
+24558
+24559
+24560
+24561
+24562
+24563
+24564
+24565
+24566
+24567
+24568
+24569
+24570
+24571
+24572
+24573
+24574
+24575
+24576
+24577
+24578
+24579
+24580
+24581
+24582
+24583
+24584
+24585
+24586
+24587
+24588
+24589
+24590
+24591
+24592
+24593
+24594
+24595
+24596
+24597
+24598
+24599
+24600
+24601
+24602
+24603
+24604
+24605
+24606
+24607
+24608
+24609
+24610
+24611
+24612
+24613
+24614
+24615
+24616
+24617
+24618
+24619
+24620
+24621
+24622
+24623
+24624
+24625
+24626
+24627
+24628
+24629
+24630
+24631
+24632
+24633
+24634
+24635
+24636
+24637
+24638
+24639
+24640
+24641
+24642
+24643
+24644
+24645
+24646
+24647
+24648
+24649
+24650
+24651
+24652
+24653
+24654
+24655
+24656
+24657
+24658
+24659
+24660
+24661
+24662
+24663
+24664
+24665
+24666
+24667
+24668
+24669
+24670
+24671
+24672
+24673
+24674
+24675
+24676
+24677
+24678
+24679
+24680
+24681
+24682
+24683
+24684
+24685
+24686
+24687
+24688
+24689
+24690
+24691
+24692
+24693
+24694
+24695
+24696
+24697
+24698
+24699
+24700
+24701
+24702
+24703
+24704
+24705
+24706
+24707
+24708
+24709
+24710
+24711
+24712
+24713
+24714
+24715
+24716
+24717
+24718
+24719
+24720
+24721
+24722
+24723
+24724
+24725
+24726
+24727
+24728
+24729
+24730
+24731
+24732
+24733
+24734
+24735
+24736
+24737
+24738
+24739
+24740
+24741
+24742
+24743
+24744
+24745
+24746
+24747
+24748
+24749
+24750
+24751
+24752
+24753
+24754
+24755
+24756
+24757
+24758
+24759
+24760
+24761
+24762
+24763
+24764
+24765
+24766
+24767
+24768
+24769
+24770
+24771
+24772
+24773
+24774
+24775
+24776
+24777
+24778
+24779
+24780
+24781
+24782
+24783
+24784
+24785
+24786
+24787
+24788
+24789
+24790
+24791
+24792
+24793
+24794
+24795
+24796
+24797
+24798
+24799
+24800
+24801
+24802
+24803
+24804
+24805
+24806
+24807
+24808
+24809
+24810
+24811
+24812
+24813
+24814
+24815
+24816
+24817
+24818
+24819
+24820
+24821
+24822
+24823
+24824
+24825
+24826
+24827
+24828
+24829
+24830
+24831
+24832
+24833
+24834
+24835
+24836
+24837
+24838
+24839
+24840
+24841
+24842
+24843
+24844
+24845
+24846
+24847
+24848
+24849
+24850
+24851
+24852
+24853
+24854
+24855
+24856
+24857
+24858
+24859
+24860
+24861
+24862
+24863
+24864
+24865
+24866
+24867
+24868
+24869
+24870
+24871
+24872
+24873
+24874
+24875
+24876
+24877
+24878
+24879
+24880
+24881
+24882
+24883
+24884
+24885
+24886
+24887
+24888
+24889
+24890
+24891
+24892
+24893
+24894
+24895
+24896
+24897
+24898
+24899
+24900
+24901
+24902
+24903
+24904
+24905
+24906
+24907
+24908
+24909
+24910
+24911
+24912
+24913
+24914
+24915
+24916
+24917
+24918
+24919
+24920
+24921
+24922
+24923
+24924
+24925
+24926
+24927
+24928
+24929
+24930
+24931
+24932
+24933
+24934
+24935
+24936
+24937
+24938
+24939
+24940
+24941
+24942
+24943
+24944
+24945
+24946
+24947
+24948
+24949
+24950
+24951
+24952
+24953
+24954
+24955
+24956
+24957
+24958
+24959
+24960
+24961
+24962
+24963
+24964
+24965
+24966
+24967
+24968
+24969
+24970
+24971
+24972
+24973
+24974
+24975
+24976
+24977
+24978
+24979
+24980
+24981
+24982
+24983
+24984
+24985
+24986
+24987
+24988
+24989
+24990
+24991
+24992
+24993
+24994
+24995
+24996
+24997
+24998
+24999
+25000
+25001
+25002
+25003
+25004
+25005
+25006
+25007
+25008
+25009
+25010
+25011
+25012
+25013
+25014
+25015
+25016
+25017
+25018
+25019
+25020
+25021
+25022
+25023
+25024
+25025
+25026
+25027
+25028
+25029
+25030
+25031
+25032
+25033
+25034
+25035
+25036
+25037
+25038
+25039
+25040
+25041
+25042
+25043
+25044
+25045
+25046
+25047
+25048
+25049
+25050
+25051
+25052
+25053
+25054
+25055
+25056
+25057
+25058
+25059
+25060
+25061
+25062
+25063
+25064
+25065
+25066
+25067
+25068
+25069
+25070
+25071
+25072
+25073
+25074
+25075
+25076
+25077
+25078
+25079
+25080
+25081
+25082
+25083
+25084
+25085
+25086
+25087
+25088
+25089
+25090
+25091
+25092
+25093
+25094
+25095
+25096
+25097
+25098
+25099
+25100
+25101
+25102
+25103
+25104
+25105
+25106
+25107
+25108
+25109
+25110
+25111
+25112
+25113
+25114
+25115
+25116
+25117
+25118
+25119
+25120
+25121
+25122
+25123
+25124
+25125
+25126
+25127
+25128
+25129
+25130
+25131
+25132
+25133
+25134
+25135
+25136
+25137
+25138
+25139
+25140
+25141
+25142
+25143
+25144
+25145
+25146
+25147
+25148
+25149
+25150
+25151
+25152
+25153
+25154
+25155
+25156
+25157
+25158
+25159
+25160
+25161
+25162
+25163
+25164
+25165
+25166
+25167
+25168
+25169
+25170
+25171
+25172
+25173
+25174
+25175
+25176
+25177
+25178
+25179
+25180
+25181
+25182
+25183
+25184
+25185
+25186
+25187
+25188
+25189
+25190
+25191
+25192
+25193
+25194
+25195
+25196
+25197
+25198
+25199
+25200
+25201
+25202
+25203
+25204
+25205
+25206
+25207
+25208
+25209
+25210
+25211
+25212
+25213
+25214
+25215
+25216
+25217
+25218
+25219
+25220
+25221
+25222
+25223
+25224
+25225
+25226
+25227
+25228
+25229
+25230
+25231
+25232
+25233
+25234
+25235
+25236
+25237
+25238
+25239
+25240
+25241
+25242
+25243
+25244
+25245
+25246
+25247
+25248
+25249
+25250
+25251
+25252
+25253
+25254
+25255
+25256
+25257
+25258
+25259
+25260
+25261
+25262
+25263
+25264
+25265
+25266
+25267
+25268
+25269
+25270
+25271
+25272
+25273
+25274
+25275
+25276
+25277
+25278
+25279
+25280
+25281
+25282
+25283
+25284
+25285
+25286
+25287
+25288
+25289
+25290
+25291
+25292
+25293
+25294
+25295
+25296
+25297
+25298
+25299
+25300
+25301
+25302
+25303
+25304
+25305
+25306
+25307
+25308
+25309
+25310
+25311
+25312
+25313
+25314
+25315
+25316
+25317
+25318
+25319
+25320
+25321
+25322
+25323
+25324
+25325
+25326
+25327
+25328
+25329
+25330
+25331
+25332
+25333
+25334
+25335
+25336
+25337
+25338
+25339
+25340
+25341
+25342
+25343
+25344
+25345
+25346
+25347
+25348
+25349
+25350
+25351
+25352
+25353
+25354
+25355
+25356
+25357
+25358
+25359
+25360
+25361
+25362
+25363
+25364
+25365
+25366
+25367
+25368
+25369
+25370
+25371
+25372
+25373
+25374
+25375
+25376
+25377
+25378
+25379
+25380
+25381
+25382
+25383
+25384
+25385
+25386
+25387
+25388
+25389
+25390
+25391
+25392
+25393
+25394
+25395
+25396
+25397
+25398
+25399
+25400
+25401
+25402
+25403
+25404
+25405
+25406
+25407
+25408
+25409
+25410
+25411
+25412
+25413
+25414
+25415
+25416
+25417
+25418
+25419
+25420
+25421
+25422
+25423
+25424
+25425
+25426
+25427
+25428
+25429
+25430
+25431
+25432
+25433
+25434
+25435
+25436
+25437
+25438
+25439
+25440
+25441
+25442
+25443
+25444
+25445
+25446
+25447
+25448
+25449
+25450
+25451
+25452
+25453
+25454
+25455
+25456
+25457
+25458
+25459
+25460
+25461
+25462
+25463
+25464
+25465
+25466
+25467
+25468
+25469
+25470
+25471
+25472
+25473
+25474
+25475
+25476
+25477
+25478
+25479
+25480
+25481
+25482
+25483
+25484
+25485
+25486
+25487
+25488
+25489
+25490
+25491
+25492
+25493
+25494
+25495
+25496
+25497
+25498
+25499
+25500
+25501
+25502
+25503
+25504
+25505
+25506
+25507
+25508
+25509
+25510
+25511
+25512
+25513
+25514
+25515
+25516
+25517
+25518
+25519
+25520
+25521
+25522
+25523
+25524
+25525
+25526
+25527
+25528
+25529
+25530
+25531
+25532
+25533
+25534
+25535
+25536
+25537
+25538
+25539
+25540
+25541
+25542
+25543
+25544
+25545
+25546
+25547
+25548
+25549
+25550
+25551
+25552
+25553
+25554
+25555
+25556
+25557
+25558
+25559
+25560
+25561
+25562
+25563
+25564
+25565
+25566
+25567
+25568
+25569
+25570
+25571
+25572
+25573
+25574
+25575
+25576
+25577
+25578
+25579
+25580
+25581
+25582
+25583
+25584
+25585
+25586
+25587
+25588
+25589
+25590
+25591
+25592
+25593
+25594
+25595
+25596
+25597
+25598
+25599
+25600
+25601
+25602
+25603
+25604
+25605
+25606
+25607
+25608
+25609
+25610
+25611
+25612
+25613
+25614
+25615
+25616
+25617
+25618
+25619
+25620
+25621
+25622
+25623
+25624
+25625
+25626
+25627
+25628
+25629
+25630
+25631
+25632
+25633
+25634
+25635
+25636
+25637
+25638
+25639
+25640
+25641
+25642
+25643
+25644
+25645
+25646
+25647
+25648
+25649
+25650
+25651
+25652
+25653
+25654
+25655
+25656
+25657
+25658
+25659
+25660
+25661
+25662
+25663
+25664
+25665
+25666
+25667
+25668
+25669
+25670
+25671
+25672
+25673
+25674
+25675
+25676
+25677
+25678
+25679
+25680
+25681
+25682
+25683
+25684
+25685
+25686
+25687
+25688
+25689
+25690
+25691
+25692
+25693
+25694
+25695
+25696
+25697
+25698
+25699
+25700
+25701
+25702
+25703
+25704
+25705
+25706
+25707
+25708
+25709
+25710
+25711
+25712
+25713
+25714
+25715
+25716
+25717
+25718
+25719
+25720
+25721
+25722
+25723
+25724
+25725
+25726
+25727
+25728
+25729
+25730
+25731
+25732
+25733
+25734
+25735
+25736
+25737
+25738
+25739
+25740
+25741
+25742
+25743
+25744
+25745
+25746
+25747
+25748
+25749
+25750
+25751
+25752
+25753
+25754
+25755
+25756
+25757
+25758
+25759
+25760
+25761
+25762
+25763
+25764
+25765
+25766
+25767
+25768
+25769
+25770
+25771
+25772
+25773
+25774
+25775
+25776
+25777
+25778
+25779
+25780
+25781
+25782
+25783
+25784
+25785
+25786
+25787
+25788
+25789
+25790
+25791
+25792
+25793
+25794
+25795
+25796
+25797
+25798
+25799
+25800
+25801
+25802
+25803
+25804
+25805
+25806
+25807
+25808
+25809
+25810
+25811
+25812
+25813
+25814
+25815
+25816
+25817
+25818
+25819
+25820
+25821
+25822
+25823
+25824
+25825
+25826
+25827
+25828
+25829
+25830
+25831
+25832
+25833
+25834
+25835
+25836
+25837
+25838
+25839
+25840
+25841
+25842
+25843
+25844
+25845
+25846
+25847
+25848
+25849
+25850
+25851
+25852
+25853
+25854
+25855
+25856
+25857
+25858
+25859
+25860
+25861
+25862
+25863
+25864
+25865
+25866
+25867
+25868
+25869
+25870
+25871
+25872
+25873
+25874
+25875
+25876
+25877
+25878
+25879
+25880
+25881
+25882
+25883
+25884
+25885
+25886
+25887
+25888
+25889
+25890
+25891
+25892
+25893
+25894
+25895
+25896
+25897
+25898
+25899
+25900
+25901
+25902
+25903
+25904
+25905
+25906
+25907
+25908
+25909
+25910
+25911
+25912
+25913
+25914
+25915
+25916
+25917
+25918
+25919
+25920
+25921
+25922
+25923
+25924
+25925
+25926
+25927
+25928
+25929
+25930
+25931
+25932
+25933
+25934
+25935
+25936
+25937
+25938
+25939
+25940
+25941
+25942
+25943
+25944
+25945
+25946
+25947
+25948
+25949
+25950
+25951
+25952
+25953
+25954
+25955
+25956
+25957
+25958
+25959
+25960
+25961
+25962
+25963
+25964
+25965
+25966
+25967
+25968
+25969
+25970
+25971
+25972
+25973
+25974
+25975
+25976
+25977
+25978
+25979
+25980
+25981
+25982
+25983
+25984
+25985
+25986
+25987
+25988
+25989
+25990
+25991
+25992
+25993
+25994
+25995
+25996
+25997
+25998
+25999
+26000
+26001
+26002
+26003
+26004
+26005
+26006
+26007
+26008
+26009
+26010
+26011
+26012
+26013
+26014
+26015
+26016
+26017
+26018
+26019
+26020
+26021
+26022
+26023
+26024
+26025
+26026
+26027
+26028
+26029
+26030
+26031
+26032
+26033
+26034
+26035
+26036
+26037
+26038
+26039
+26040
+26041
+26042
+26043
+26044
+26045
+26046
+26047
+26048
+26049
+26050
+26051
+26052
+26053
+26054
+26055
+26056
+26057
+26058
+26059
+26060
+26061
+26062
+26063
+26064
+26065
+26066
+26067
+26068
+26069
+26070
+26071
+26072
+26073
+26074
+26075
+26076
+26077
+26078
+26079
+26080
+26081
+26082
+26083
+26084
+26085
+26086
+26087
+26088
+26089
+26090
+26091
+26092
+26093
+26094
+26095
+26096
+26097
+26098
+26099
+26100
+26101
+26102
+26103
+26104
+26105
+26106
+26107
+26108
+26109
+26110
+26111
+26112
+26113
+26114
+26115
+26116
+26117
+26118
+26119
+26120
+26121
+26122
+26123
+26124
+26125
+26126
+26127
+26128
+26129
+26130
+26131
+26132
+26133
+26134
+26135
+26136
+26137
+26138
+26139
+26140
+26141
+26142
+26143
+26144
+26145
+26146
+26147
+26148
+26149
+26150
+26151
+26152
+26153
+26154
+26155
+26156
+26157
+26158
+26159
+26160
+26161
+26162
+26163
+26164
+26165
+26166
+26167
+26168
+26169
+26170
+26171
+26172
+26173
+26174
+26175
+26176
+26177
+26178
+26179
+26180
+26181
+26182
+26183
+26184
+26185
+26186
+26187
+26188
+26189
+26190
+26191
+26192
+26193
+26194
+26195
+26196
+26197
+26198
+26199
+26200
+26201
+26202
+26203
+26204
+26205
+26206
+26207
+26208
+26209
+26210
+26211
+26212
+26213
+26214
+26215
+26216
+26217
+26218
+26219
+26220
+26221
+26222
+26223
+26224
+26225
+26226
+26227
+26228
+26229
+26230
+26231
+26232
+26233
+26234
+26235
+26236
+26237
+26238
+26239
+26240
+26241
+26242
+26243
+26244
+26245
+26246
+26247
+26248
+26249
+26250
+26251
+26252
+26253
+26254
+26255
+26256
+26257
+26258
+26259
+26260
+26261
+26262
+26263
+26264
+26265
+26266
+26267
+26268
+26269
+26270
+26271
+26272
+26273
+26274
+26275
+26276
+26277
+26278
+26279
+26280
+26281
+26282
+26283
+26284
+26285
+26286
+26287
+26288
+26289
+26290
+26291
+26292
+26293
+26294
+26295
+26296
+26297
+26298
+26299
+26300
+26301
+26302
+26303
+26304
+26305
+26306
+26307
+26308
+26309
+26310
+26311
+26312
+26313
+26314
+26315
+26316
+26317
+26318
+26319
+26320
+26321
+26322
+26323
+26324
+26325
+26326
+26327
+26328
+26329
+26330
+26331
+26332
+26333
+26334
+26335
+26336
+26337
+26338
+26339
+26340
+26341
+26342
+26343
+26344
+26345
+26346
+26347
+26348
+26349
+26350
+26351
+26352
+26353
+26354
+26355
+26356
+26357
+26358
+26359
+26360
+26361
+26362
+26363
+26364
+26365
+26366
+26367
+26368
+26369
+26370
+26371
+26372
+26373
+26374
+26375
+26376
+26377
+26378
+26379
+26380
+26381
+26382
+26383
+26384
+26385
+26386
+26387
+26388
+26389
+26390
+26391
+26392
+26393
+26394
+26395
+26396
+26397
+26398
+26399
+26400
+26401
+26402
+26403
+26404
+26405
+26406
+26407
+26408
+26409
+26410
+26411
+26412
+26413
+26414
+26415
+26416
+26417
+26418
+26419
+26420
+26421
+26422
+26423
+26424
+26425
+26426
+26427
+26428
+26429
+26430
+26431
+26432
+26433
+26434
+26435
+26436
+26437
+26438
+26439
+26440
+26441
+26442
+26443
+26444
+26445
+26446
+26447
+26448
+26449
+26450
+26451
+26452
+26453
+26454
+26455
+26456
+26457
+26458
+26459
+26460
+26461
+26462
+26463
+26464
+26465
+26466
+26467
+26468
+26469
+26470
+26471
+26472
+26473
+26474
+26475
+26476
+26477
+26478
+26479
+26480
+26481
+26482
+26483
+26484
+26485
+26486
+26487
+26488
+26489
+26490
+26491
+26492
+26493
+26494
+26495
+26496
+26497
+26498
+26499
+26500
+26501
+26502
+26503
+26504
+26505
+26506
+26507
+26508
+26509
+26510
+26511
+26512
+26513
+26514
+26515
+26516
+26517
+26518
+26519
+26520
+26521
+26522
+26523
+26524
+26525
+26526
+26527
+26528
+26529
+26530
+26531
+26532
+26533
+26534
+26535
+26536
+26537
+26538
+26539
+26540
+26541
+26542
+26543
+26544
+26545
+26546
+26547
+26548
+26549
+26550
+26551
+26552
+26553
+26554
+26555
+26556
+26557
+26558
+26559
+26560
+26561
+26562
+26563
+26564
+26565
+26566
+26567
+26568
+26569
+26570
+26571
+26572
+26573
+26574
+26575
+26576
+26577
+26578
+26579
+26580
+26581
+26582
+26583
+26584
+26585
+26586
+26587
+26588
+26589
+26590
+26591
+26592
+26593
+26594
+26595
+26596
+26597
+26598
+26599
+26600
+26601
+26602
+26603
+26604
+26605
+26606
+26607
+26608
+26609
+26610
+26611
+26612
+26613
+26614
+26615
+26616
+26617
+26618
+26619
+26620
+26621
+26622
+26623
+26624
+26625
+26626
+26627
+26628
+26629
+26630
+26631
+26632
+26633
+26634
+26635
+26636
+26637
+26638
+26639
+26640
+26641
+26642
+26643
+26644
+26645
+26646
+26647
+26648
+26649
+26650
+26651
+26652
+26653
+26654
+26655
+26656
+26657
+26658
+26659
+26660
+26661
+26662
+26663
+26664
+26665
+26666
+26667
+26668
+26669
+26670
+26671
+26672
+26673
+26674
+26675
+26676
+26677
+26678
+26679
+26680
+26681
+26682
+26683
+26684
+26685
+26686
+26687
+26688
+26689
+26690
+26691
+26692
+26693
+26694
+26695
+26696
+26697
+26698
+26699
+26700
+26701
+26702
+26703
+26704
+26705
+26706
+26707
+26708
+26709
+26710
+26711
+26712
+26713
+26714
+26715
+26716
+26717
+26718
+26719
+26720
+26721
+26722
+26723
+26724
+26725
+26726
+26727
+26728
+26729
+26730
+26731
+26732
+26733
+26734
+26735
+26736
+26737
+26738
+26739
+26740
+26741
+26742
+26743
+26744
+26745
+26746
+26747
+26748
+26749
+26750
+26751
+26752
+26753
+26754
+26755
+26756
+26757
+26758
+26759
+26760
+26761
+26762
+26763
+26764
+26765
+26766
+26767
+26768
+26769
+26770
+26771
+26772
+26773
+26774
+26775
+26776
+26777
+26778
+26779
+26780
+26781
+26782
+26783
+26784
+26785
+26786
+26787
+26788
+26789
+26790
+26791
+26792
+26793
+26794
+26795
+26796
+26797
+26798
+26799
+26800
+26801
+26802
+26803
+26804
+26805
+26806
+26807
+26808
+26809
+26810
+26811
+26812
+26813
+26814
+26815
+26816
+26817
+26818
+26819
+26820
+26821
+26822
+26823
+26824
+26825
+26826
+26827
+26828
+26829
+26830
+26831
+26832
+26833
+26834
+26835
+26836
+26837
+26838
+26839
+26840
+26841
+26842
+26843
+26844
+26845
+26846
+26847
+26848
+26849
+26850
+26851
+26852
+26853
+26854
+26855
+26856
+26857
+26858
+26859
+26860
+26861
+26862
+26863
+26864
+26865
+26866
+26867
+26868
+26869
+26870
+26871
+26872
+26873
+26874
+26875
+26876
+26877
+26878
+26879
+26880
+26881
+26882
+26883
+26884
+26885
+26886
+26887
+26888
+26889
+26890
+26891
+26892
+26893
+26894
+26895
+26896
+26897
+26898
+26899
+26900
+26901
+26902
+26903
+26904
+26905
+26906
+26907
+26908
+26909
+26910
+26911
+26912
+26913
+26914
+26915
+26916
+26917
+26918
+26919
+26920
+26921
+26922
+26923
+26924
+26925
+26926
+26927
+26928
+26929
+26930
+26931
+26932
+26933
+26934
+26935
+26936
+26937
+26938
+26939
+26940
+26941
+26942
+26943
+26944
+26945
+26946
+26947
+26948
+26949
+26950
+26951
+26952
+26953
+26954
+26955
+26956
+26957
+26958
+26959
+26960
+26961
+26962
+26963
+26964
+26965
+26966
+26967
+26968
+26969
+26970
+26971
+26972
+26973
+26974
+26975
+26976
+26977
+26978
+26979
+26980
+26981
+26982
+26983
+26984
+26985
+26986
+26987
+26988
+26989
+26990
+26991
+26992
+26993
+26994
+26995
+26996
+26997
+26998
+26999
+27000
+27001
+27002
+27003
+27004
+27005
+27006
+27007
+27008
+27009
+27010
+27011
+27012
+27013
+27014
+27015
+27016
+27017
+27018
+27019
+27020
+27021
+27022
+27023
+27024
+27025
+27026
+27027
+27028
+27029
+27030
+27031
+27032
+27033
+27034
+27035
+27036
+27037
+27038
+27039
+27040
+27041
+27042
+27043
+27044
+27045
+27046
+27047
+27048
+27049
+27050
+27051
+27052
+27053
+27054
+27055
+27056
+27057
+27058
+27059
+27060
+27061
+27062
+27063
+27064
+27065
+27066
+27067
+27068
+27069
+27070
+27071
+27072
+27073
+27074
+27075
+27076
+27077
+27078
+27079
+27080
+27081
+27082
+27083
+27084
+27085
+27086
+27087
+27088
+27089
+27090
+27091
+27092
+27093
+27094
+27095
+27096
+27097
+27098
+27099
+27100
+27101
+27102
+27103
+27104
+27105
+27106
+27107
+27108
+27109
+27110
+27111
+27112
+27113
+27114
+27115
+27116
+27117
+27118
+27119
+27120
+27121
+27122
+27123
+27124
+27125
+27126
+27127
+27128
+27129
+27130
+27131
+27132
+27133
+27134
+27135
+27136
+27137
+27138
+27139
+27140
+27141
+27142
+27143
+27144
+27145
+27146
+27147
+27148
+27149
+27150
+27151
+27152
+27153
+27154
+27155
+27156
+27157
+27158
+27159
+27160
+27161
+27162
+27163
+27164
+27165
+27166
+27167
+27168
+27169
+27170
+27171
+27172
+27173
+27174
+27175
+27176
+27177
+27178
+27179
+27180
+27181
+27182
+27183
+27184
+27185
+27186
+27187
+27188
+27189
+27190
+27191
+27192
+27193
+27194
+27195
+27196
+27197
+27198
+27199
+27200
+27201
+27202
+27203
+27204
+27205
+27206
+27207
+27208
+27209
+27210
+27211
+27212
+27213
+27214
+27215
+27216
+27217
+27218
+27219
+27220
+27221
+27222
+27223
+27224
+27225
+27226
+27227
+27228
+27229
+27230
+27231
+27232
+27233
+27234
+27235
+27236
+27237
+27238
+27239
+27240
+27241
+27242
+27243
+27244
+27245
+27246
+27247
+27248
+27249
+27250
+27251
+27252
+27253
+27254
+27255
+27256
+27257
+27258
+27259
+27260
+27261
+27262
+27263
+27264
+27265
+27266
+27267
+27268
+27269
+27270
+27271
+27272
+27273
+27274
+27275
+27276
+27277
+27278
+27279
+27280
+27281
+27282
+27283
+27284
+27285
+27286
+27287
+27288
+27289
+27290
+27291
+27292
+27293
+27294
+27295
+27296
+27297
+27298
+27299
+27300
+27301
+27302
+27303
+27304
+27305
+27306
+27307
+27308
+27309
+27310
+27311
+27312
+27313
+27314
+27315
+27316
+27317
+27318
+27319
+27320
+27321
+27322
+27323
+27324
+27325
+27326
+27327
+27328
+27329
+27330
+27331
+27332
+27333
+27334
+27335
+27336
+27337
+27338
+27339
+27340
+27341
+27342
+27343
+27344
+27345
+27346
+27347
+27348
+27349
+27350
+27351
+27352
+27353
+27354
+27355
+27356
+27357
+27358
+27359
+27360
+27361
+27362
+27363
+27364
+27365
+27366
+27367
+27368
+27369
+27370
+27371
+27372
+27373
+27374
+27375
+27376
+27377
+27378
+27379
+27380
+27381
+27382
+27383
+27384
+27385
+27386
+27387
+27388
+27389
+27390
+27391
+27392
+27393
+27394
+27395
+27396
+27397
+27398
+27399
+27400
+27401
+27402
+27403
+27404
+27405
+27406
+27407
+27408
+27409
+27410
+27411
+27412
+27413
+27414
+27415
+27416
+27417
+27418
+27419
+27420
+27421
+27422
+27423
+27424
+27425
+27426
+27427
+27428
+27429
+27430
+27431
+27432
+27433
+27434
+27435
+27436
+27437
+27438
+27439
+27440
+27441
+27442
+27443
+27444
+27445
+27446
+27447
+27448
+27449
+27450
+27451
+27452
+27453
+27454
+27455
+27456
+27457
+27458
+27459
+27460
+27461
+27462
+27463
+27464
+27465
+27466
+27467
+27468
+27469
+27470
+27471
+27472
+27473
+27474
+27475
+27476
+27477
+27478
+27479
+27480
+27481
+27482
+27483
+27484
+27485
+27486
+27487
+27488
+27489
+27490
+27491
+27492
+27493
+27494
+27495
+27496
+27497
+27498
+27499
+27500
+27501
+27502
+27503
+27504
+27505
+27506
+27507
+27508
+27509
+27510
+27511
+27512
+27513
+27514
+27515
+27516
+27517
+27518
+27519
+27520
+27521
+27522
+27523
+27524
+27525
+27526
+27527
+27528
+27529
+27530
+27531
+27532
+27533
+27534
+27535
+27536
+27537
+27538
+27539
+27540
+27541
+27542
+27543
+27544
+27545
+27546
+27547
+27548
+27549
+27550
+27551
+27552
+27553
+27554
+27555
+27556
+27557
+27558
+27559
+27560
+27561
+27562
+27563
+27564
+27565
+27566
+27567
+27568
+27569
+27570
+27571
+27572
+27573
+27574
+27575
+27576
+27577
+27578
+27579
+27580
+27581
+27582
+27583
+27584
+27585
+27586
+27587
+27588
+27589
+27590
+27591
+27592
+27593
+27594
+27595
+27596
+27597
+27598
+27599
+27600
+27601
+27602
+27603
+27604
+27605
+27606
+27607
+27608
+27609
+27610
+27611
+27612
+27613
+27614
+27615
+27616
+27617
+27618
+27619
+27620
+27621
+27622
+27623
+27624
+27625
+27626
+27627
+27628
+27629
+27630
+27631
+27632
+27633
+27634
+27635
+27636
+27637
+27638
+27639
+27640
+27641
+27642
+27643
+27644
+27645
+27646
+27647
+27648
+27649
+27650
+27651
+27652
+27653
+27654
+27655
+27656
+27657
+27658
+27659
+27660
+27661
+27662
+27663
+27664
+27665
+27666
+27667
+27668
+27669
+27670
+27671
+27672
+27673
+27674
+27675
+27676
+27677
+27678
+27679
+27680
+27681
+27682
+27683
+27684
+27685
+27686
+27687
+27688
+27689
+27690
+27691
+27692
+27693
+27694
+27695
+27696
+27697
+27698
+27699
+27700
+27701
+27702
+27703
+27704
+27705
+27706
+27707
+27708
+27709
+27710
+27711
+27712
+27713
+27714
+27715
+27716
+27717
+27718
+27719
+27720
+27721
+27722
+27723
+27724
+27725
+27726
+27727
+27728
+27729
+27730
+27731
+27732
+27733
+27734
+27735
+27736
+27737
+27738
+27739
+27740
+27741
+27742
+27743
+27744
+27745
+27746
+27747
+27748
+27749
+27750
+27751
+27752
+27753
+27754
+27755
+27756
+27757
+27758
+27759
+27760
+27761
+27762
+27763
+27764
+27765
+27766
+27767
+27768
+27769
+27770
+27771
+27772
+27773
+27774
+27775
+27776
+27777
+27778
+27779
+27780
+27781
+27782
+27783
+27784
+27785
+27786
+27787
+27788
+27789
+27790
+27791
+27792
+27793
+27794
+27795
+27796
+27797
+27798
+27799
+27800
+27801
+27802
+27803
+27804
+27805
+27806
+27807
+27808
+27809
+27810
+27811
+27812
+27813
+27814
+27815
+27816
+27817
+27818
+27819
+27820
+27821
+27822
+27823
+27824
+27825
+27826
+27827
+27828
+27829
+27830
+27831
+27832
+27833
+27834
+27835
+27836
+27837
+27838
+27839
+27840
+27841
+27842
+27843
+27844
+27845
+27846
+27847
+27848
+27849
+27850
+27851
+27852
+27853
+27854
+27855
+27856
+27857
+27858
+27859
+27860
+27861
+27862
+27863
+27864
+27865
+27866
+27867
+27868
+27869
+27870
+27871
+27872
+27873
+27874
+27875
+27876
+27877
+27878
+27879
+27880
+27881
+27882
+27883
+27884
+27885
+27886
+27887
+27888
+27889
+27890
+27891
+27892
+27893
+27894
+27895
+27896
+27897
+27898
+27899
+27900
+27901
+27902
+27903
+27904
+27905
+27906
+27907
+27908
+27909
+27910
+27911
+27912
+27913
+27914
+27915
+27916
+27917
+27918
+27919
+27920
+27921
+27922
+27923
+27924
+27925
+27926
+27927
+27928
+27929
+27930
+27931
+27932
+27933
+27934
+27935
+27936
+27937
+27938
+27939
+27940
+27941
+27942
+27943
+27944
+27945
+27946
+27947
+27948
+27949
+27950
+27951
+27952
+27953
+27954
+27955
+27956
+27957
+27958
+27959
+27960
+27961
+27962
+27963
+27964
+27965
+27966
+27967
+27968
+27969
+27970
+27971
+27972
+27973
+27974
+27975
+27976
+27977
+27978
+27979
+27980
+27981
+27982
+27983
+27984
+27985
+27986
+27987
+27988
+27989
+27990
+27991
+27992
+27993
+27994
+27995
+27996
+27997
+27998
+27999
+28000
+28001
+28002
+28003
+28004
+28005
+28006
+28007
+28008
+28009
+28010
+28011
+28012
+28013
+28014
+28015
+28016
+28017
+28018
+28019
+28020
+28021
+28022
+28023
+28024
+28025
+28026
+28027
+28028
+28029
+28030
+28031
+28032
+28033
+28034
+28035
+28036
+28037
+28038
+28039
+28040
+28041
+28042
+28043
+28044
+28045
+28046
+28047
+28048
+28049
+28050
+28051
+28052
+28053
+28054
+28055
+28056
+28057
+28058
+28059
+28060
+28061
+28062
+28063
+28064
+28065
+28066
+28067
+28068
+28069
+28070
+28071
+28072
+28073
+28074
+28075
+28076
+28077
+28078
+28079
+28080
+28081
+28082
+28083
+28084
+28085
+28086
+28087
+28088
+28089
+28090
+28091
+28092
+28093
+28094
+28095
+28096
+28097
+28098
+28099
+28100
+28101
+28102
+28103
+28104
+28105
+28106
+28107
+28108
+28109
+28110
+28111
+28112
+28113
+28114
+28115
+28116
+28117
+28118
+28119
+28120
+28121
+28122
+28123
+28124
+28125
+28126
+28127
+28128
+28129
+28130
+28131
+28132
+28133
+28134
+28135
+28136
+28137
+28138
+28139
+28140
+28141
+28142
+28143
+28144
+28145
+28146
+28147
+28148
+28149
+28150
+28151
+28152
+28153
+28154
+28155
+28156
+28157
+28158
+28159
+28160
+28161
+28162
+28163
+28164
+28165
+28166
+28167
+28168
+28169
+28170
+28171
+28172
+28173
+28174
+28175
+28176
+28177
+28178
+28179
+28180
+28181
+28182
+28183
+28184
+28185
+28186
+28187
+28188
+28189
+28190
+28191
+28192
+28193
+28194
+28195
+28196
+28197
+28198
+28199
+28200
+28201
+28202
+28203
+28204
+28205
+28206
+28207
+28208
+28209
+28210
+28211
+28212
+28213
+28214
+28215
+28216
+28217
+28218
+28219
+28220
+28221
+28222
+28223
+28224
+28225
+28226
+28227
+28228
+28229
+28230
+28231
+28232
+28233
+28234
+28235
+28236
+28237
+28238
+28239
+28240
+28241
+28242
+28243
+28244
+28245
+28246
+28247
+28248
+28249
+28250
+28251
+28252
+28253
+28254
+28255
+28256
+28257
+28258
+28259
+28260
+28261
+28262
+28263
+28264
+28265
+28266
+28267
+28268
+28269
+28270
+28271
+28272
+28273
+28274
+28275
+28276
+28277
+28278
+28279
+28280
+28281
+28282
+28283
+28284
+28285
+28286
+28287
+28288
+28289
+28290
+28291
+28292
+28293
+28294
+28295
+28296
+28297
+28298
+28299
+28300
+28301
+28302
+28303
+28304
+28305
+28306
+28307
+28308
+28309
+28310
+28311
+28312
+28313
+28314
+28315
+28316
+28317
+28318
+28319
+28320
+28321
+28322
+28323
+28324
+28325
+28326
+28327
+28328
+28329
+28330
+28331
+28332
+28333
+28334
+28335
+28336
+28337
+28338
+28339
+28340
+28341
+28342
+28343
+28344
+28345
+28346
+28347
+28348
+28349
+28350
+28351
+28352
+28353
+28354
+28355
+28356
+28357
+28358
+28359
+28360
+28361
+28362
+28363
+28364
+28365
+28366
+28367
+28368
+28369
+28370
+28371
+28372
+28373
+28374
+28375
+28376
+28377
+28378
+28379
+28380
+28381
+28382
+28383
+28384
+28385
+28386
+28387
+28388
+28389
+28390
+28391
+28392
+28393
+28394
+28395
+28396
+28397
+28398
+28399
+28400
+28401
+28402
+28403
+28404
+28405
+28406
+28407
+28408
+28409
+28410
+28411
+28412
+28413
+28414
+28415
+28416
+28417
+28418
+28419
+28420
+28421
+28422
+28423
+28424
+28425
+28426
+28427
+28428
+28429
+28430
+28431
+28432
+28433
+28434
+28435
+28436
+28437
+28438
+28439
+28440
+28441
+28442
+28443
+28444
+28445
+28446
+28447
+28448
+28449
+28450
+28451
+28452
+28453
+28454
+28455
+28456
+28457
+28458
+28459
+28460
+28461
+28462
+28463
+28464
+28465
+28466
+28467
+28468
+28469
+28470
+28471
+28472
+28473
+28474
+28475
+28476
+28477
+28478
+28479
+28480
+28481
+28482
+28483
+28484
+28485
+28486
+28487
+28488
+28489
+28490
+28491
+28492
+28493
+28494
+28495
+28496
+28497
+28498
+28499
+28500
+28501
+28502
+28503
+28504
+28505
+28506
+28507
+28508
+28509
+28510
+28511
+28512
+28513
+28514
+28515
+28516
+28517
+28518
+28519
+28520
+28521
+28522
+28523
+28524
+28525
+28526
+28527
+28528
+28529
+28530
+28531
+28532
+28533
+28534
+28535
+28536
+28537
+28538
+28539
+28540
+28541
+28542
+28543
+28544
+28545
+28546
+28547
+28548
+28549
+28550
+28551
+28552
+28553
+28554
+28555
+28556
+28557
+28558
+28559
+28560
+28561
+28562
+28563
+28564
+28565
+28566
+28567
+28568
+28569
+28570
+28571
+28572
+28573
+28574
+28575
+28576
+28577
+28578
+28579
+28580
+28581
+28582
+28583
+28584
+28585
+28586
+28587
+28588
+28589
+28590
+28591
+28592
+28593
+28594
+28595
+28596
+28597
+28598
+28599
+28600
+28601
+28602
+28603
+28604
+28605
+28606
+28607
+28608
+28609
+28610
+28611
+28612
+28613
+28614
+28615
+28616
+28617
+28618
+28619
+28620
+28621
+28622
+28623
+28624
+28625
+28626
+28627
+28628
+28629
+28630
+28631
+28632
+28633
+28634
+28635
+28636
+28637
+28638
+28639
+28640
+28641
+28642
+28643
+28644
+28645
+28646
+28647
+28648
+28649
+28650
+28651
+28652
+28653
+28654
+28655
+28656
+28657
+28658
+28659
+28660
+28661
+28662
+28663
+28664
+28665
+28666
+28667
+28668
+28669
+28670
+28671
+28672
+28673
+28674
+28675
+28676
+28677
+28678
+28679
+28680
+28681
+28682
+28683
+28684
+28685
+28686
+28687
+28688
+28689
+28690
+28691
+28692
+28693
+28694
+28695
+28696
+28697
+28698
+28699
+28700
+28701
+28702
+28703
+28704
+28705
+28706
+28707
+28708
+28709
+28710
+28711
+28712
+28713
+28714
+28715
+28716
+28717
+28718
+28719
+28720
+28721
+28722
+28723
+28724
+28725
+28726
+28727
+28728
+28729
+28730
+28731
+28732
+28733
+28734
+28735
+28736
+28737
+28738
+28739
+28740
+28741
+28742
+28743
+28744
+28745
+28746
+28747
+28748
+28749
+28750
+28751
+28752
+28753
+28754
+28755
+28756
+28757
+28758
+28759
+28760
+28761
+28762
+28763
+28764
+28765
+28766
+28767
+28768
+28769
+28770
+28771
+28772
+28773
+28774
+28775
+28776
+28777
+28778
+28779
+28780
+28781
+28782
+28783
+28784
+28785
+28786
+28787
+28788
+28789
+28790
+28791
+28792
+28793
+28794
+28795
+28796
+28797
+28798
+28799
+28800
+28801
+28802
+28803
+28804
+28805
+28806
+28807
+28808
+28809
+28810
+28811
+28812
+28813
+28814
+28815
+28816
+28817
+28818
+28819
+28820
+28821
+28822
+28823
+28824
+28825
+28826
+28827
+28828
+28829
+28830
+28831
+28832
+28833
+28834
+28835
+28836
+28837
+28838
+28839
+28840
+28841
+28842
+28843
+28844
+28845
+28846
+28847
+28848
+28849
+28850
+28851
+28852
+28853
+28854
+28855
+28856
+28857
+28858
+28859
+28860
+28861
+28862
+28863
+28864
+28865
+28866
+28867
+28868
+28869
+28870
+28871
+28872
+28873
+28874
+28875
+28876
+28877
+28878
+28879
+28880
+28881
+28882
+28883
+28884
+28885
+28886
+28887
+28888
+28889
+28890
+28891
+28892
+28893
+28894
+28895
+28896
+28897
+28898
+28899
+28900
+28901
+28902
+28903
+28904
+28905
+28906
+28907
+28908
+28909
+28910
+28911
+28912
+28913
+28914
+28915
+28916
+28917
+28918
+28919
+28920
+28921
+28922
+28923
+28924
+28925
+28926
+28927
+28928
+28929
+28930
+28931
+28932
+28933
+28934
+28935
+28936
+28937
+28938
+28939
+28940
+28941
+28942
+28943
+28944
+28945
+28946
+28947
+28948
+28949
+28950
+28951
+28952
+28953
+28954
+28955
+28956
+28957
+28958
+28959
+28960
+28961
+28962
+28963
+28964
+28965
+28966
+28967
+28968
+28969
+28970
+28971
+28972
+28973
+28974
+28975
+28976
+28977
+28978
+28979
+28980
+28981
+28982
+28983
+28984
+28985
+28986
+28987
+28988
+28989
+28990
+28991
+28992
+28993
+28994
+28995
+28996
+28997
+28998
+28999
+29000
+29001
+29002
+29003
+29004
+29005
+29006
+29007
+29008
+29009
+29010
+29011
+29012
+29013
+29014
+29015
+29016
+29017
+29018
+29019
+29020
+29021
+29022
+29023
+29024
+29025
+29026
+29027
+29028
+29029
+29030
+29031
+29032
+29033
+29034
+29035
+29036
+29037
+29038
+29039
+29040
+29041
+29042
+29043
+29044
+29045
+29046
+29047
+29048
+29049
+29050
+29051
+29052
+29053
+29054
+29055
+29056
+29057
+29058
+29059
+29060
+29061
+29062
+29063
+29064
+29065
+29066
+29067
+29068
+29069
+29070
+29071
+29072
+29073
+29074
+29075
+29076
+29077
+29078
+29079
+29080
+29081
+29082
+29083
+29084
+29085
+29086
+29087
+29088
+29089
+29090
+29091
+29092
+29093
+29094
+29095
+29096
+29097
+29098
+29099
+29100
+29101
+29102
+29103
+29104
+29105
+29106
+29107
+29108
+29109
+29110
+29111
+29112
+29113
+29114
+29115
+29116
+29117
+29118
+29119
+29120
+29121
+29122
+29123
+29124
+29125
+29126
+29127
+29128
+29129
+29130
+29131
+29132
+29133
+29134
+29135
+29136
+29137
+29138
+29139
+29140
+29141
+29142
+29143
+29144
+29145
+29146
+29147
+29148
+29149
+29150
+29151
+29152
+29153
+29154
+29155
+29156
+29157
+29158
+29159
+29160
+29161
+29162
+29163
+29164
+29165
+29166
+29167
+29168
+29169
+29170
+29171
+29172
+29173
+29174
+29175
+29176
+29177
+29178
+29179
+29180
+29181
+29182
+29183
+29184
+29185
+29186
+29187
+29188
+29189
+29190
+29191
+29192
+29193
+29194
+29195
+29196
+29197
+29198
+29199
+29200
+29201
+29202
+29203
+29204
+29205
+29206
+29207
+29208
+29209
+29210
+29211
+29212
+29213
+29214
+29215
+29216
+29217
+29218
+29219
+29220
+29221
+29222
+29223
+29224
+29225
+29226
+29227
+29228
+29229
+29230
+29231
+29232
+29233
+29234
+29235
+29236
+29237
+29238
+29239
+29240
+29241
+29242
+29243
+29244
+29245
+29246
+29247
+29248
+29249
+29250
+29251
+29252
+29253
+29254
+29255
+29256
+29257
+29258
+29259
+29260
+29261
+29262
+29263
+29264
+29265
+29266
+29267
+29268
+29269
+29270
+29271
+29272
+29273
+29274
+29275
+29276
+29277
+29278
+29279
+29280
+29281
+29282
+29283
+29284
+29285
+29286
+29287
+29288
+29289
+29290
+29291
+29292
+29293
+29294
+29295
+29296
+29297
+29298
+29299
+29300
+29301
+29302
+29303
+29304
+29305
+29306
+29307
+29308
+29309
+29310
+29311
+29312
+29313
+29314
+29315
+29316
+29317
+29318
+29319
+29320
+29321
+29322
+29323
+29324
+29325
+29326
+29327
+29328
+29329
+29330
+29331
+29332
+29333
+29334
+29335
+29336
+29337
+29338
+29339
+29340
+29341
+29342
+29343
+29344
+29345
+29346
+29347
+29348
+29349
+29350
+29351
+29352
+29353
+29354
+29355
+29356
+29357
+29358
+29359
+29360
+29361
+29362
+29363
+29364
+29365
+29366
+29367
+29368
+29369
+29370
+29371
+29372
+29373
+29374
+29375
+29376
+29377
+29378
+29379
+29380
+29381
+29382
+29383
+29384
+29385
+29386
+29387
+29388
+29389
+29390
+29391
+29392
+29393
+29394
+29395
+29396
+29397
+29398
+29399
+29400
+29401
+29402
+29403
+29404
+29405
+29406
+29407
+29408
+29409
+29410
+29411
+29412
+29413
+29414
+29415
+29416
+29417
+29418
+29419
+29420
+29421
+29422
+29423
+29424
+29425
+29426
+29427
+29428
+29429
+29430
+29431
+29432
+29433
+29434
+29435
+29436
+29437
+29438
+29439
+29440
+29441
+29442
+29443
+29444
+29445
+29446
+29447
+29448
+29449
+29450
+29451
+29452
+29453
+29454
+29455
+29456
+29457
+29458
+29459
+29460
+29461
+29462
+29463
+29464
+29465
+29466
+29467
+29468
+29469
+29470
+29471
+29472
+29473
+29474
+29475
+29476
+29477
+29478
+29479
+29480
+29481
+29482
+29483
+29484
+29485
+29486
+29487
+29488
+29489
+29490
+29491
+29492
+29493
+29494
+29495
+29496
+29497
+29498
+29499
+29500
+29501
+29502
+29503
+29504
+29505
+29506
+29507
+29508
+29509
+29510
+29511
+29512
+29513
+29514
+29515
+29516
+29517
+29518
+29519
+29520
+29521
+29522
+29523
+29524
+29525
+29526
+29527
+29528
+29529
+29530
+29531
+29532
+29533
+29534
+29535
+29536
+29537
+29538
+29539
+29540
+29541
+29542
+29543
+29544
+29545
+29546
+29547
+29548
+29549
+29550
+29551
+29552
+29553
+29554
+29555
+29556
+29557
+29558
+29559
+29560
+29561
+29562
+29563
+29564
+29565
+29566
+29567
+29568
+29569
+29570
+29571
+29572
+29573
+29574
+29575
+29576
+29577
+29578
+29579
+29580
+29581
+29582
+29583
+29584
+29585
+29586
+29587
+29588
+29589
+29590
+29591
+29592
+29593
+29594
+29595
+29596
+29597
+29598
+29599
+29600
+29601
+29602
+29603
+29604
+29605
+29606
+29607
+29608
+29609
+29610
+29611
+29612
+29613
+29614
+29615
+29616
+29617
+29618
+29619
+29620
+29621
+29622
+29623
+29624
+29625
+29626
+29627
+29628
+29629
+29630
+29631
+29632
+29633
+29634
+29635
+29636
+29637
+29638
+29639
+29640
+29641
+29642
+29643
+29644
+29645
+29646
+29647
+29648
+29649
+29650
+29651
+29652
+29653
+29654
+29655
+29656
+29657
+29658
+29659
+29660
+29661
+29662
+29663
+29664
+29665
+29666
+29667
+29668
+29669
+29670
+29671
+29672
+29673
+29674
+29675
+29676
+29677
+29678
+29679
+29680
+29681
+29682
+29683
+29684
+29685
+29686
+29687
+29688
+29689
+29690
+29691
+29692
+29693
+29694
+29695
+29696
+29697
+29698
+29699
+29700
+29701
+29702
+29703
+29704
+29705
+29706
+29707
+29708
+29709
+29710
+29711
+29712
+29713
+29714
+29715
+29716
+29717
+29718
+29719
+29720
+29721
+29722
+29723
+29724
+29725
+29726
+29727
+29728
+29729
+29730
+29731
+29732
+29733
+29734
+29735
+29736
+29737
+29738
+29739
+29740
+29741
+29742
+29743
+29744
+29745
+29746
+29747
+29748
+29749
+29750
+29751
+29752
+29753
+29754
+29755
+29756
+29757
+29758
+29759
+29760
+29761
+29762
+29763
+29764
+29765
+29766
+29767
+29768
+29769
+29770
+29771
+29772
+29773
+29774
+29775
+29776
+29777
+29778
+29779
+29780
+29781
+29782
+29783
+29784
+29785
+29786
+29787
+29788
+29789
+29790
+29791
+29792
+29793
+29794
+29795
+29796
+29797
+29798
+29799
+29800
+29801
+29802
+29803
+29804
+29805
+29806
+29807
+29808
+29809
+29810
+29811
+29812
+29813
+29814
+29815
+29816
+29817
+29818
+29819
+29820
+29821
+29822
+29823
+29824
+29825
+29826
+29827
+29828
+29829
+29830
+29831
+29832
+29833
+29834
+29835
+29836
+29837
+29838
+29839
+29840
+29841
+29842
+29843
+29844
+29845
+29846
+29847
+29848
+29849
+29850
+29851
+29852
+29853
+29854
+29855
+29856
+29857
+29858
+29859
+29860
+29861
+29862
+29863
+29864
+29865
+29866
+29867
+29868
+29869
+29870
+29871
+29872
+29873
+29874
+29875
+29876
+29877
+29878
+29879
+29880
+29881
+29882
+29883
+29884
+29885
+29886
+29887
+29888
+29889
+29890
+29891
+29892
+29893
+29894
+29895
+29896
+29897
+29898
+29899
+29900
+29901
+29902
+29903
+29904
+29905
+29906
+29907
+29908
+29909
+29910
+29911
+29912
+29913
+29914
+29915
+29916
+29917
+29918
+29919
+29920
+29921
+29922
+29923
+29924
+29925
+29926
+29927
+29928
+29929
+29930
+29931
+29932
+29933
+29934
+29935
+29936
+29937
+29938
+29939
+29940
+29941
+29942
+29943
+29944
+29945
+29946
+29947
+29948
+29949
+29950
+29951
+29952
+29953
+29954
+29955
+29956
+29957
+29958
+29959
+29960
+29961
+29962
+29963
+29964
+29965
+29966
+29967
+29968
+29969
+29970
+29971
+29972
+29973
+29974
+29975
+29976
+29977
+29978
+29979
+29980
+29981
+29982
+29983
+29984
+29985
+29986
+29987
+29988
+29989
+29990
+29991
+29992
+29993
+29994
+29995
+29996
+29997
+29998
+29999
+30000
+30001
+30002
+30003
+30004
+30005
+30006
+30007
+30008
+30009
+30010
+30011
+30012
+30013
+30014
+30015
+30016
+30017
+30018
+30019
+30020
+30021
+30022
+30023
+30024
+30025
+30026
+30027
+30028
+30029
+30030
+30031
+30032
+30033
+30034
+30035
+30036
+30037
+30038
+30039
+30040
+30041
+30042
+30043
+30044
+30045
+30046
+30047
+30048
+30049
+30050
+30051
+30052
+30053
+30054
+30055
+30056
+30057
+30058
+30059
+30060
+30061
+30062
+30063
+30064
+30065
+30066
+30067
+30068
+30069
+30070
+30071
+30072
+30073
+30074
+30075
+30076
+30077
+30078
+30079
+30080
+30081
+30082
+30083
+30084
+30085
+30086
+30087
+30088
+30089
+30090
+30091
+30092
+30093
+30094
+30095
+30096
+30097
+30098
+30099
+30100
+30101
+30102
+30103
+30104
+30105
+30106
+30107
+30108
+30109
+30110
+30111
+30112
+30113
+30114
+30115
+30116
+30117
+30118
+30119
+30120
+30121
+30122
+30123
+30124
+30125
+30126
+30127
+30128
+30129
+30130
+30131
+30132
+30133
+30134
+30135
+30136
+30137
+30138
+30139
+30140
+30141
+30142
+30143
+30144
+30145
+30146
+30147
+30148
+30149
+30150
+30151
+30152
+30153
+30154
+30155
+30156
+30157
+30158
+30159
+30160
+30161
+30162
+30163
+30164
+30165
+30166
+30167
+30168
+30169
+30170
+30171
+30172
+30173
+30174
+30175
+30176
+30177
+30178
+30179
+30180
+30181
+30182
+30183
+30184
+30185
+30186
+30187
+30188
+30189
+30190
+30191
+30192
+30193
+30194
+30195
+30196
+30197
+30198
+30199
+30200
+30201
+30202
+30203
+30204
+30205
+30206
+30207
+30208
+30209
+30210
+30211
+30212
+30213
+30214
+30215
+30216
+30217
+30218
+30219
+30220
+30221
+30222
+30223
+30224
+30225
+30226
+30227
+30228
+30229
+30230
+30231
+30232
+30233
+30234
+30235
+30236
+30237
+30238
+30239
+30240
+30241
+30242
+30243
+30244
+30245
+30246
+30247
+30248
+30249
+30250
+30251
+30252
+30253
+30254
+30255
+30256
+30257
+30258
+30259
+30260
+30261
+30262
+30263
+30264
+30265
+30266
+30267
+30268
+30269
+30270
+30271
+30272
+30273
+30274
+30275
+30276
+30277
+30278
+30279
+30280
+30281
+30282
+30283
+30284
+30285
+30286
+30287
+30288
+30289
+30290
+30291
+30292
+30293
+30294
+30295
+30296
+30297
+30298
+30299
+30300
+30301
+30302
+30303
+30304
+30305
+30306
+30307
+30308
+30309
+30310
+30311
+30312
+30313
+30314
+30315
+30316
+30317
+30318
+30319
+30320
+30321
+30322
+30323
+30324
+30325
+30326
+30327
+30328
+30329
+30330
+30331
+30332
+30333
+30334
+30335
+30336
+30337
+30338
+30339
+30340
+30341
+30342
+30343
+30344
+30345
+30346
+30347
+30348
+30349
+30350
+30351
+30352
+30353
+30354
+30355
+30356
+30357
+30358
+30359
+30360
+30361
+30362
+30363
+30364
+30365
+30366
+30367
+30368
+30369
+30370
+30371
+30372
+30373
+30374
+30375
+30376
+30377
+30378
+30379
+30380
+30381
+30382
+30383
+30384
+30385
+30386
+30387
+30388
+30389
+30390
+30391
+30392
+30393
+30394
+30395
+30396
+30397
+30398
+30399
+30400
+30401
+30402
+30403
+30404
+30405
+30406
+30407
+30408
+30409
+30410
+30411
+30412
+30413
+30414
+30415
+30416
+30417
+30418
+30419
+30420
+30421
+30422
+30423
+30424
+30425
+30426
+30427
+30428
+30429
+30430
+30431
+30432
+30433
+30434
+30435
+30436
+30437
+30438
+30439
+30440
+30441
+30442
+30443
+30444
+30445
+30446
+30447
+30448
+30449
+30450
+30451
+30452
+30453
+30454
+30455
+30456
+30457
+30458
+30459
+30460
+30461
+30462
+30463
+30464
+30465
+30466
+30467
+30468
+30469
+30470
+30471
+30472
+30473
+30474
+30475
+30476
+30477
+30478
+30479
+30480
+30481
+30482
+30483
+30484
+30485
+30486
+30487
+30488
+30489
+30490
+30491
+30492
+30493
+30494
+30495
+30496
+30497
+30498
+30499
+30500
+30501
+30502
+30503
+30504
+30505
+30506
+30507
+30508
+30509
+30510
+30511
+30512
+30513
+30514
+30515
+30516
+30517
+30518
+30519
+30520
+30521
+30522
+30523
+30524
+30525
+30526
+30527
+30528
+30529
+30530
+30531
+30532
+30533
+30534
+30535
+30536
+30537
+30538
+30539
+30540
+30541
+30542
+30543
+30544
+30545
+30546
+30547
+30548
+30549
+30550
+30551
+30552
+30553
+30554
+30555
+30556
+30557
+30558
+30559
+30560
+30561
+30562
+30563
+30564
+30565
+30566
+30567
+30568
+30569
+30570
+30571
+30572
+30573
+30574
+30575
+30576
+30577
+30578
+30579
+30580
+30581
+30582
+30583
+30584
+30585
+30586
+30587
+30588
+30589
+30590
+30591
+30592
+30593
+30594
+30595
+30596
+30597
+30598
+30599
+30600
+30601
+30602
+30603
+30604
+30605
+30606
+30607
+30608
+30609
+30610
+30611
+30612
+30613
+30614
+30615
+30616
+30617
+30618
+30619
+30620
+30621
+30622
+30623
+30624
+30625
+30626
+30627
+30628
+30629
+30630
+30631
+30632
+30633
+30634
+30635
+30636
+30637
+30638
+30639
+30640
+30641
+30642
+30643
+30644
+30645
+30646
+30647
+30648
+30649
+30650
+30651
+30652
+30653
+30654
+30655
+30656
+30657
+30658
+30659
+30660
+30661
+30662
+30663
+30664
+30665
+30666
+30667
+30668
+30669
+30670
+30671
+30672
+30673
+30674
+30675
+30676
+30677
+30678
+30679
+30680
+30681
+30682
+30683
+30684
+30685
+30686
+30687
+30688
+30689
+30690
+30691
+30692
+30693
+30694
+30695
+30696
+30697
+30698
+30699
+30700
+30701
+30702
+30703
+30704
+30705
+30706
+30707
+30708
+30709
+30710
+30711
+30712
+30713
+30714
+30715
+30716
+30717
+30718
+30719
+30720
+30721
+30722
+30723
+30724
+30725
+30726
+30727
+30728
+30729
+30730
+30731
+30732
+30733
+30734
+30735
+30736
+30737
+30738
+30739
+30740
+30741
+30742
+30743
+30744
+30745
+30746
+30747
+30748
+30749
+30750
+30751
+30752
+30753
+30754
+30755
+30756
+30757
+30758
+30759
+30760
+30761
+30762
+30763
+30764
+30765
+30766
+30767
+30768
+30769
+30770
+30771
+30772
+30773
+30774
+30775
+30776
+30777
+30778
+30779
+30780
+30781
+30782
+30783
+30784
+30785
+30786
+30787
+30788
+30789
+30790
+30791
+30792
+30793
+30794
+30795
+30796
+30797
+30798
+30799
+30800
+30801
+30802
+30803
+30804
+30805
+30806
+30807
+30808
+30809
+30810
+30811
+30812
+30813
+30814
+30815
+30816
+30817
+30818
+30819
+30820
+30821
+30822
+30823
+30824
+30825
+30826
+30827
+30828
+30829
+30830
+30831
+30832
+30833
+30834
+30835
+30836
+30837
+30838
+30839
+30840
+30841
+30842
+30843
+30844
+30845
+30846
+30847
+30848
+30849
+30850
+30851
+30852
+30853
+30854
+30855
+30856
+30857
+30858
+30859
+30860
+30861
+30862
+30863
+30864
+30865
+30866
+30867
+30868
+30869
+30870
+30871
+30872
+30873
+30874
+30875
+30876
+30877
+30878
+30879
+30880
+30881
+30882
+30883
+30884
+30885
+30886
+30887
+30888
+30889
+30890
+30891
+30892
+30893
+30894
+30895
+30896
+30897
+30898
+30899
+30900
+30901
+30902
+30903
+30904
+30905
+30906
+30907
+30908
+30909
+30910
+30911
+30912
+30913
+30914
+30915
+30916
+30917
+30918
+30919
+30920
+30921
+30922
+30923
+30924
+30925
+30926
+30927
+30928
+30929
+30930
+30931
+30932
+30933
+30934
+30935
+30936
+30937
+30938
+30939
+30940
+30941
+30942
+30943
+30944
+30945
+30946
+30947
+30948
+30949
+30950
+30951
+30952
+30953
+30954
+30955
+30956
+30957
+30958
+30959
+30960
+30961
+30962
+30963
+30964
+30965
+30966
+30967
+30968
+30969
+30970
+30971
+30972
+30973
+30974
+30975
+30976
+30977
+30978
+30979
+30980
+30981
+30982
+30983
+30984
+30985
+30986
+30987
+30988
+30989
+30990
+30991
+30992
+30993
+30994
+30995
+30996
+30997
+30998
+30999
+31000
+31001
+31002
+31003
+31004
+31005
+31006
+31007
+31008
+31009
+31010
+31011
+31012
+31013
+31014
+31015
+31016
+31017
+31018
+31019
+31020
+31021
+31022
+31023
+31024
+31025
+31026
+31027
+31028
+31029
+31030
+31031
+31032
+31033
+31034
+31035
+31036
+31037
+31038
+31039
+31040
+31041
+31042
+31043
+31044
+31045
+31046
+31047
+31048
+31049
+31050
+31051
+31052
+31053
+31054
+31055
+31056
+31057
+31058
+31059
+31060
+31061
+31062
+31063
+31064
+31065
+31066
+31067
+31068
+31069
+31070
+31071
+31072
+31073
+31074
+31075
+31076
+31077
+31078
+31079
+31080
+31081
+31082
+31083
+31084
+31085
+31086
+31087
+31088
+31089
+31090
+31091
+31092
+31093
+31094
+31095
+31096
+31097
+31098
+31099
+31100
+31101
+31102
+31103
+31104
+31105
+31106
+31107
+31108
+31109
+31110
+31111
+31112
+31113
+31114
+31115
+31116
+31117
+31118
+31119
+31120
+31121
+31122
+31123
+31124
+31125
+31126
+31127
+31128
+31129
+31130
+31131
+31132
+31133
+31134
+31135
+31136
+31137
+31138
+31139
+31140
+31141
+31142
+31143
+31144
+31145
+31146
+31147
+31148
+31149
+31150
+31151
+31152
+31153
+31154
+31155
+31156
+31157
+31158
+31159
+31160
+31161
+31162
+31163
+31164
+31165
+31166
+31167
+31168
+31169
+31170
+31171
+31172
+31173
+31174
+31175
+31176
+31177
+31178
+31179
+31180
+31181
+31182
+31183
+31184
+31185
+31186
+31187
+31188
+31189
+31190
+31191
+31192
+31193
+31194
+31195
+31196
+31197
+31198
+31199
+31200
+31201
+31202
+31203
+31204
+31205
+31206
+31207
+31208
+31209
+31210
+31211
+31212
+31213
+31214
+31215
+31216
+31217
+31218
+31219
+31220
+31221
+31222
+31223
+31224
+31225
+31226
+31227
+31228
+31229
+31230
+31231
+31232
+31233
+31234
+31235
+31236
+31237
+31238
+31239
+31240
+31241
+31242
+31243
+31244
+31245
+31246
+31247
+31248
+31249
+31250
+31251
+31252
+31253
+31254
+31255
+31256
+31257
+31258
+31259
+31260
+31261
+31262
+31263
+31264
+31265
+31266
+31267
+31268
+31269
+31270
+31271
+31272
+31273
+31274
+31275
+31276
+31277
+31278
+31279
+31280
+31281
+31282
+31283
+31284
+31285
+31286
+31287
+31288
+31289
+31290
+31291
+31292
+31293
+31294
+31295
+31296
+31297
+31298
+31299
+31300
+31301
+31302
+31303
+31304
+31305
+31306
+31307
+31308
+31309
+31310
+31311
+31312
+31313
+31314
+31315
+31316
+31317
+31318
+31319
+31320
+31321
+31322
+31323
+31324
+31325
+31326
+31327
+31328
+31329
+31330
+31331
+31332
+31333
+31334
+31335
+31336
+31337
+31338
+31339
+31340
+31341
+31342
+31343
+31344
+31345
+31346
+31347
+31348
+31349
+31350
+31351
+31352
+31353
+31354
+31355
+31356
+31357
+31358
+31359
+31360
+31361
+31362
+31363
+31364
+31365
+31366
+31367
+31368
+31369
+31370
+31371
+31372
+31373
+31374
+31375
+31376
+31377
+31378
+31379
+31380
+31381
+31382
+31383
+31384
+31385
+31386
+31387
+31388
+31389
+31390
+31391
+31392
+31393
+31394
+31395
+31396
+31397
+31398
+31399
+31400
+31401
+31402
+31403
+31404
+31405
+31406
+31407
+31408
+31409
+31410
+31411
+31412
+31413
+31414
+31415
+31416
+31417
+31418
+31419
+31420
+31421
+31422
+31423
+31424
+31425
+31426
+31427
+31428
+31429
+31430
+31431
+31432
+31433
+31434
+31435
+31436
+31437
+31438
+31439
+31440
+31441
+31442
+31443
+31444
+31445
+31446
+31447
+31448
+31449
+31450
+31451
+31452
+31453
+31454
+31455
+31456
+31457
+31458
+31459
+31460
+31461
+31462
+31463
+31464
+31465
+31466
+31467
+31468
+31469
+31470
+31471
+31472
+31473
+31474
+31475
+31476
+31477
+31478
+31479
+31480
+31481
+31482
+31483
+31484
+31485
+31486
+31487
+31488
+31489
+31490
+31491
+31492
+31493
+31494
+31495
+31496
+31497
+31498
+31499
+31500
+31501
+31502
+31503
+31504
+31505
+31506
+31507
+31508
+31509
+31510
+31511
+31512
+31513
+31514
+31515
+31516
+31517
+31518
+31519
+31520
+31521
+31522
+31523
+31524
+31525
+31526
+31527
+31528
+31529
+31530
+31531
+31532
+31533
+31534
+31535
+31536
+31537
+31538
+31539
+31540
+31541
+31542
+31543
+31544
+31545
+31546
+31547
+31548
+31549
+31550
+31551
+31552
+31553
+31554
+31555
+31556
+31557
+31558
+31559
+31560
+31561
+31562
+31563
+31564
+31565
+31566
+31567
+31568
+31569
+31570
+31571
+31572
+31573
+31574
+31575
+31576
+31577
+31578
+31579
+31580
+31581
+31582
+31583
+31584
+31585
+31586
+31587
+31588
+31589
+31590
+31591
+31592
+31593
+31594
+31595
+31596
+31597
+31598
+31599
+31600
+31601
+31602
+31603
+31604
+31605
+31606
+31607
+31608
+31609
+31610
+31611
+31612
+31613
+31614
+31615
+31616
+31617
+31618
+31619
+31620
+31621
+31622
+31623
+31624
+31625
+31626
+31627
+31628
+31629
+31630
+31631
+31632
+31633
+31634
+31635
+31636
+31637
+31638
+31639
+31640
+31641
+31642
+31643
+31644
+31645
+31646
+31647
+31648
+31649
+31650
+31651
+31652
+31653
+31654
+31655
+31656
+31657
+31658
+31659
+31660
+31661
+31662
+31663
+31664
+31665
+31666
+31667
+31668
+31669
+31670
+31671
+31672
+31673
+31674
+31675
+31676
+31677
+31678
+31679
+31680
+31681
+31682
+31683
+31684
+31685
+31686
+31687
+31688
+31689
+31690
+31691
+31692
+31693
+31694
+31695
+31696
+31697
+31698
+31699
+31700
+31701
+31702
+31703
+31704
+31705
+31706
+31707
+31708
+31709
+31710
+31711
+31712
+31713
+31714
+31715
+31716
+31717
+31718
+31719
+31720
+31721
+31722
+31723
+31724
+31725
+31726
+31727
+31728
+31729
+31730
+31731
+31732
+31733
+31734
+31735
+31736
+31737
+31738
+31739
+31740
+31741
+31742
+31743
+31744
+31745
+31746
+31747
+31748
+31749
+31750
+31751
+31752
+31753
+31754
+31755
+31756
+31757
+31758
+31759
+31760
+31761
+31762
+31763
+31764
+31765
+31766
+31767
+31768
+31769
+31770
+31771
+31772
+31773
+31774
+31775
+31776
+31777
+31778
+31779
+31780
+31781
+31782
+31783
+31784
+31785
+31786
+31787
+31788
+31789
+31790
+31791
+31792
+31793
+31794
+31795
+31796
+31797
+31798
+31799
+31800
+31801
+31802
+31803
+31804
+31805
+31806
+31807
+31808
+31809
+31810
+31811
+31812
+31813
+31814
+31815
+31816
+31817
+31818
+31819
+31820
+31821
+31822
+31823
+31824
+31825
+31826
+31827
+31828
+31829
+31830
+31831
+31832
+31833
+31834
+31835
+31836
+31837
+31838
+31839
+31840
+31841
+31842
+31843
+31844
+31845
+31846
+31847
+31848
+31849
+31850
+31851
+31852
+31853
+31854
+31855
+31856
+31857
+31858
+31859
+31860
+31861
+31862
+31863
+31864
+31865
+31866
+31867
+31868
+31869
+31870
+31871
+31872
+31873
+31874
+31875
+31876
+31877
+31878
+31879
+31880
+31881
+31882
+31883
+31884
+31885
+31886
+31887
+31888
+31889
+31890
+31891
+31892
+31893
+31894
+31895
+31896
+31897
+31898
+31899
+31900
+31901
+31902
+31903
+31904
+31905
+31906
+31907
+31908
+31909
+31910
+31911
+31912
+31913
+31914
+31915
+31916
+31917
+31918
+31919
+31920
+31921
+31922
+31923
+31924
+31925
+31926
+31927
+31928
+31929
+31930
+31931
+31932
+31933
+31934
+31935
+31936
+31937
+31938
+31939
+31940
+31941
+31942
+31943
+31944
+31945
+31946
+31947
+31948
+31949
+31950
+31951
+31952
+31953
+31954
+31955
+31956
+31957
+31958
+31959
+31960
+31961
+31962
+31963
+31964
+31965
+31966
+31967
+31968
+31969
+31970
+31971
+31972
+31973
+31974
+31975
+31976
+31977
+31978
+31979
+31980
+31981
+31982
+31983
+31984
+31985
+31986
+31987
+31988
+31989
+31990
+31991
+31992
+31993
+31994
+31995
+31996
+31997
+31998
+31999
+32000
+32001
+32002
+32003
+32004
+32005
+32006
+32007
+32008
+32009
+32010
+32011
+32012
+32013
+32014
+32015
+32016
+32017
+32018
+32019
+32020
+32021
+32022
+32023
+32024
+32025
+32026
+32027
+32028
+32029
+32030
+32031
+32032
+32033
+32034
+32035
+32036
+32037
+32038
+32039
+32040
+32041
+32042
+32043
+32044
+32045
+32046
+32047
+32048
+32049
+32050
+32051
+32052
+32053
+32054
+32055
+32056
+32057
+32058
+32059
+32060
+32061
+32062
+32063
+32064
+32065
+32066
+32067
+32068
+32069
+32070
+32071
+32072
+32073
+32074
+32075
+32076
+32077
+32078
+32079
+32080
+32081
+32082
+32083
+32084
+32085
+32086
+32087
+32088
+32089
+32090
+32091
+32092
+32093
+32094
+32095
+32096
+32097
+32098
+32099
+32100
+32101
+32102
+32103
+32104
+32105
+32106
+32107
+32108
+32109
+32110
+32111
+32112
+32113
+32114
+32115
+32116
+32117
+32118
+32119
+32120
+32121
+32122
+32123
+32124
+32125
+32126
+32127
+32128
+32129
+32130
+32131
+32132
+32133
+32134
+32135
+32136
+32137
+32138
+32139
+32140
+32141
+32142
+32143
+32144
+32145
+32146
+32147
+32148
+32149
+32150
+32151
+32152
+32153
+32154
+32155
+32156
+32157
+32158
+32159
+32160
+32161
+32162
+32163
+32164
+32165
+32166
+32167
+32168
+32169
+32170
+32171
+32172
+32173
+32174
+32175
+32176
+32177
+32178
+32179
+32180
+32181
+32182
+32183
+32184
+32185
+32186
+32187
+32188
+32189
+32190
+32191
+32192
+32193
+32194
+32195
+32196
+32197
+32198
+32199
+32200
+32201
+32202
+32203
+32204
+32205
+32206
+32207
+32208
+32209
+32210
+32211
+32212
+32213
+32214
+32215
+32216
+32217
+32218
+32219
+32220
+32221
+32222
+32223
+32224
+32225
+32226
+32227
+32228
+32229
+32230
+32231
+32232
+32233
+32234
+32235
+32236
+32237
+32238
+32239
+32240
+32241
+32242
+32243
+32244
+32245
+32246
+32247
+32248
+32249
+32250
+32251
+32252
+32253
+32254
+32255
+32256
+32257
+32258
+32259
+32260
+32261
+32262
+32263
+32264
+32265
+32266
+32267
+32268
+32269
+32270
+32271
+32272
+32273
+32274
+32275
+32276
+32277
+32278
+32279
+32280
+32281
+32282
+32283
+32284
+32285
+32286
+32287
+32288
+32289
+32290
+32291
+32292
+32293
+32294
+32295
+32296
+32297
+32298
+32299
+32300
+32301
+32302
+32303
+32304
+32305
+32306
+32307
+32308
+32309
+32310
+32311
+32312
+32313
+32314
+32315
+32316
+32317
+32318
+32319
+32320
+32321
+32322
+32323
+32324
+32325
+32326
+32327
+32328
+32329
+32330
+32331
+32332
+32333
+32334
+32335
+32336
+32337
+32338
+32339
+32340
+32341
+32342
+32343
+32344
+32345
+32346
+32347
+32348
+32349
+32350
+32351
+32352
+32353
+32354
+32355
+32356
+32357
+32358
+32359
+32360
+32361
+32362
+32363
+32364
+32365
+32366
+32367
+32368
+32369
+32370
+32371
+32372
+32373
+32374
+32375
+32376
+32377
+32378
+32379
+32380
+32381
+32382
+32383
+32384
+32385
+32386
+32387
+32388
+32389
+32390
+32391
+32392
+32393
+32394
+32395
+32396
+32397
+32398
+32399
+32400
+32401
+32402
+32403
+32404
+32405
+32406
+32407
+32408
+32409
+32410
+32411
+32412
+32413
+32414
+32415
+32416
+32417
+32418
+32419
+32420
+32421
+32422
+32423
+32424
+32425
+32426
+32427
+32428
+32429
+32430
+32431
+32432
+32433
+32434
+32435
+32436
+32437
+32438
+32439
+32440
+32441
+32442
+32443
+32444
+32445
+32446
+32447
+32448
+32449
+32450
+32451
+32452
+32453
+32454
+32455
+32456
+32457
+32458
+32459
+32460
+32461
+32462
+32463
+32464
+32465
+32466
+32467
+32468
+32469
+32470
+32471
+32472
+32473
+32474
+32475
+32476
+32477
+32478
+32479
+32480
+32481
+32482
+32483
+32484
+32485
+32486
+32487
+32488
+32489
+32490
+32491
+32492
+32493
+32494
+32495
+32496
+32497
+32498
+32499
+32500
+32501
+32502
+32503
+32504
+32505
+32506
+32507
+32508
+32509
+32510
+32511
+32512
+32513
+32514
+32515
+32516
+32517
+32518
+32519
+32520
+32521
+32522
+32523
+32524
+32525
+32526
+32527
+32528
+32529
+32530
+32531
+32532
+32533
+32534
+32535
+32536
+32537
+32538
+32539
+32540
+32541
+32542
+32543
+32544
+32545
+32546
+32547
+32548
+32549
+32550
+32551
+32552
+32553
+32554
+32555
+32556
+32557
+32558
+32559
+32560
+32561
+32562
+32563
+32564
+32565
+32566
+32567
+32568
+32569
+32570
+32571
+32572
+32573
+32574
+32575
+32576
+32577
+32578
+32579
+32580
+32581
+32582
+32583
+32584
+32585
+32586
+32587
+32588
+32589
+32590
+32591
+32592
+32593
+32594
+32595
+32596
+32597
+32598
+32599
+32600
+32601
+32602
+32603
+32604
+32605
+32606
+32607
+32608
+32609
+32610
+32611
+32612
+32613
+32614
+32615
+32616
+32617
+32618
+32619
+32620
+32621
+32622
+32623
+32624
+32625
+32626
+32627
+32628
+32629
+32630
+32631
+32632
+32633
+32634
+32635
+32636
+32637
+32638
+32639
+32640
+32641
+32642
+32643
+32644
+32645
+32646
+32647
+32648
+32649
+32650
+32651
+32652
+32653
+32654
+32655
+32656
+32657
+32658
+32659
+32660
+32661
+32662
+32663
+32664
+32665
+32666
+32667
+32668
+32669
+32670
+32671
+32672
+32673
+32674
+32675
+32676
+32677
+32678
+32679
+32680
+32681
+32682
+32683
+32684
+32685
+32686
+32687
+32688
+32689
+32690
+32691
+32692
+32693
+32694
+32695
+32696
+32697
+32698
+32699
+32700
+32701
+32702
+32703
+32704
+32705
+32706
+32707
+32708
+32709
+32710
+32711
+32712
+32713
+32714
+32715
+32716
+32717
+32718
+32719
+32720
+32721
+32722
+32723
+32724
+32725
+32726
+32727
+32728
+32729
+32730
+32731
+32732
+32733
+32734
+32735
+32736
+32737
+32738
+32739
+32740
+32741
+32742
+32743
+32744
+32745
+32746
+32747
+32748
+32749
+32750
+32751
+32752
+32753
+32754
+32755
+32756
+32757
+32758
+32759
+32760
+32761
+32762
+32763
+32764
+32765
+32766
+32767
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b8f03496c1493693d3994a211ffaed9fb15b1027
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/transportProperties
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties
similarity index 86%
rename from tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties
index 3d7edb19ec66c1c26b6664664224c0f170d99c91..886d34bdef135c39216d342240a96bf0530bdd62 100644
--- a/tutorials/dieselFoam/aachenBomb/constant/turbulenceProperties
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/constant/turbulenceProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-simulationType RASModel;
+simulationType laminar;
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/createObstacle.setSet b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/createObstacle.setSet
similarity index 100%
rename from tutorials/interDyMFoam/damBreakWithObstacle/createObstacle.setSet
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/createObstacle.setSet
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..4790e5fc3f0a9c5f4f1f6ec30951a8552fd6ebaf
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 2;
+
+deltaT 0.001;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.02;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.1;
+
+maxDeltaT 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict
similarity index 79%
rename from tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict
index b7f14f71546ee6876e32c3b8e21d538dce935530..d4601d33a257b924355555355b99293a7f1ddb61 100644
--- a/tutorials/interDyMFoam/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/decomposeParDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,23 +18,23 @@ FoamFile
numberOfSubdomains 6;
method metis;
-//method hierarchical;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
order xyz;
}
metisCoeffs
-{}
+{
+}
manualCoeffs
{
@@ -42,8 +43,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..c563a4cd8fe840a8bbabf755739cbf83ae20fff5
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+ grad(U) Gauss linear;
+ grad(alpha) Gauss linear;
+}
+
+divSchemes
+{
+ div(rho*phi,U) Gauss upwind;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss interfaceCompression;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ pd ;
+ pcorr ;
+ alpha ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..36d56bb947117523daaeaf8e09654f575b3981db
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSolution
@@ -0,0 +1,134 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 0.001;
+ relTol 0;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 0.0001;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.05;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ nVcycles 2;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-08;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 3;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1;
+ pdRefCell 0;
+ pdRefValue 0;
+ pRefProbe
+ {
+ fields ( pd );
+ probeLocations ( ( 0.51 0.51 0.51 ) );
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
similarity index 82%
rename from tutorials/interFoam/laminar/damBreak/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
index 8e031272ac37ad56d3e3282004fd2f3ee8a87366..52522fe9a992927d452a9da9c006fd0ec42fbfaa 100644
--- a/tutorials/interFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,20 +18,20 @@ FoamFile
defaultFieldValues
(
volScalarFieldValue alpha1 0
- volVectorFieldValue U (0 0 0)
+ volVectorFieldValue U ( 0 0 0 )
);
regions
(
boxToCell
{
- box (0 0 -1) (0.1461 0.292 1);
-
- fieldValues
+ box ( 0 0 0 ) ( 0.6 0.1875 0.75 );
+ fieldValues
(
volScalarFieldValue alpha1 1
);
}
-);
+ );
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U
similarity index 94%
rename from tutorials/interDyMFoam/sloshingTank2D/0/U
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U
index ae062bdf0d1fa6458df95c93f8ffeb9d7df188be..bf28b4a48e82189066d43e58a30ef9db69891aab 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/0/U
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1
similarity index 91%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1
index 2711563003114c5f54dc987dbeca328598f590e8..8e28c332b7e7f109d001bb341f718c6495a7d660 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1.org
similarity index 91%
rename from tutorials/interDyMFoam/sloshingTank2D/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1.org
index 2711563003114c5f54dc987dbeca328598f590e8..8e28c332b7e7f109d001bb341f718c6495a7d660 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd
similarity index 94%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/0/pd
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd
index cefcbb7d442aad8e22f25fbaedbfbb0e68eed4b7..020ff7cc00a27e6b27aed9640ba406c34958cb98 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/0/pd
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..20c2a63671cad1633195e872d98b63d22c2cd156
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+foamCleanTutorials cases
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank2D/Allrun
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun
index df799d7732174c55cd675c8ed99294bf8c4a4897..0d2a8c82229717af79be19a0037784058a171958 100755
--- a/tutorials/interDyMFoam/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun
@@ -4,6 +4,6 @@
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
runApplication setFields
runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ac647d46427282fac607f94584e78ca379f120a8
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/RASProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel laminar;
+
+turbulence off;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..f8a9a9bd8b3dd8cd97772d60b537574b1f46ea6c
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/dynamicMeshDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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 "constant";
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh solidBodyMotionFvMesh;
+
+solidBodyMotionFvMeshCoeffs
+{
+ solidBodyMotionFunction SDA;
+ SDACoeffs
+ {
+ CofG ( 0 0 0 );
+ lamda 50;
+ rollAmax 0.22654;
+ rollAmin 0.10472;
+ heaveA 3.79;
+ swayA 2.34;
+ Q 2;
+ Tp 13.93;
+ Tpn 11.93;
+ dTi 0.059;
+ dTp -0.001;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties
similarity index 84%
rename from tutorials/interDyMFoam/sloshingTank2D/constant/environmentalProperties
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties
index 40232c0c406c02d21a4ae29a31f702bbf84c6214..9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/environmentalProperties
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict
index 3c52247aa29f0cb0eeb549c39a24a6e11a8f3391..c7d3ee2dcd51f0c5fa1b35f42cdbcc6d79e30493 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
index b6c1cdd4ad9b1d6ba5fd81e26deeeb626cee8b8f..b56cbe4342576c10393d6eb995d49acc0925e240 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary
index 57267e87f7e42310c06882be5d8864dc3c77adc2..53b37c41f6d9efc89d3a51c6c2425a165026e2dc 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties
similarity index 72%
rename from tutorials/interDyMFoam/sloshingTank2D/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties
index c20854a9031a956ad8bc154b0a4ae87375add730..02287f422b58ea20261ee3a90e0012076a3fb490 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,17 +18,18 @@ FoamFile
phase1
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 998.2;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
phase2
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
}
-sigma sigma [1 0 -2 0 0 0 0] 0.0;
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
similarity index 72%
rename from tutorials/interDyMFoam/sloshingTank2D/system/controlDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
index a4d077ea1919324987eb0d533fdc4615840f0eef..f533a54408a008a373e38f555a3d71a7e37b351b 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -53,24 +53,15 @@ functions
(
probes
{
- // Type of functionObject
type probes;
-
- // Output every
outputControl timeStep;
outputInterval 1;
-
- // Name of the directory for the probe data
name probes;
-
- // Locations to be probed. runTime modifiable!
probeLocations
(
- (0 9.95 19.77)
- (0 -9.95 19.77)
+ ( 0 9.95 19.77 )
+ ( 0 -9.95 19.77 )
);
-
- // Fields to be probed. runTime modifiable!
fields
(
p
@@ -79,18 +70,11 @@ functions
wallPressure
{
- // Type of functionObject
type surfaces;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
- // Output every
+ functionObjectLibs ( "libsampling.so" );
outputControl timeStep;
outputInterval 10;
-
surfaceFormat raw;
-
fields
(
p
@@ -100,12 +84,13 @@ functions
(
walls
{
- type patch;
- patchName walls;
- triangulate false;
+ type patch;
+ patchName walls;
+ triangulate false;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict
similarity index 82%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict
index d4594e09475d920c6ca71413fa457c4ec15810ac..fa967d3199a414ba839010517229d0ab3089cf07 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method hierarchical;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (4 2 2);
+ n ( 4 2 2 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes
new file mode 100644
index 0000000000000000000000000000000000000000..3a940dbe40590b8a3661aaa877dc5c159edb986e
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes
@@ -0,0 +1,61 @@
+/*--------------------------------*- 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 fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+ default Euler;
+}
+
+gradSchemes
+{
+ default Gauss linear;
+ grad(U) Gauss linear;
+ grad(alpha1) Gauss linear;
+}
+
+divSchemes
+{
+ div(rho*phi,U) Gauss vanLeerV;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss vanLeer;
+}
+
+laplacianSchemes
+{
+ default Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+ default linear;
+}
+
+snGradSchemes
+{
+ default corrected;
+}
+
+fluxRequired
+{
+ default no;
+ pd ;
+ pcorr ;
+ alpha ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..2688ec1f985053188ce72b6adff9feb6dfe38aad
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution
@@ -0,0 +1,122 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 2e-09;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 2e-09;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ correctPhi no;
+ pRefProbe
+ {
+ fields
+ (
+ p
+ );
+ probeLocations
+ (
+ ( 0 0 0.15 )
+ );
+ }
+
+ pRefValue 100000;
+}
+
+relaxationFactors
+{
+ U 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict
index 2c881a7ba48d03bc05de5c2d82ab02c90c1928ef..7ff571c6d130cf0424493bcc96a52251eedc746a 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,26 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
defaultFieldValues
(
- volScalarFieldValue gamma 0
+ volScalarFieldValue alpha1 0
);
regions
(
boxToCell
{
- box (-100 -100 -100) (100 100 0);
-
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
+ box ( -100 -100 -100 ) ( 100 100 0 );
+ fieldValues ( volScalarFieldValue alpha1 1 );
}
);
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U
similarity index 94%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/0/U
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U
index ae062bdf0d1fa6458df95c93f8ffeb9d7df188be..bf28b4a48e82189066d43e58a30ef9db69891aab 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1 b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1
new file mode 100644
index 0000000000000000000000000000000000000000..8e28c332b7e7f109d001bb341f718c6495a7d660
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ front
+ {
+ type empty;
+ }
+ back
+ {
+ type empty;
+ }
+ walls
+ {
+ type zeroGradient;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org
new file mode 100644
index 0000000000000000000000000000000000000000..8e28c332b7e7f109d001bb341f718c6495a7d660
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ object alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 0 0 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ front
+ {
+ type empty;
+ }
+ back
+ {
+ type empty;
+ }
+ walls
+ {
+ type zeroGradient;
+ }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd
similarity index 94%
rename from tutorials/interDyMFoam/sloshingTank2D/0/pd
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd
index cefcbb7d442aad8e22f25fbaedbfbb0e68eed4b7..020ff7cc00a27e6b27aed9640ba406c34958cb98 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/0/pd
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..20c2a63671cad1633195e872d98b63d22c2cd156
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+foamCleanTutorials cases
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/Allrun
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun
index df799d7732174c55cd675c8ed99294bf8c4a4897..0d2a8c82229717af79be19a0037784058a171958 100755
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun
@@ -4,6 +4,6 @@
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
runApplication setFields
runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ac647d46427282fac607f94584e78ca379f120a8
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/RASProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel laminar;
+
+turbulence off;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..e9ca15c3386a6ef33ee07505fd6f82015a9183a2
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/dynamicMeshDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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 "constant";
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh solidBodyMotionFvMesh;
+
+solidBodyMotionFvMeshCoeffs
+{
+ solidBodyMotionFunction SDA;
+ SDACoeffs
+ {
+ CofG ( 0 0 0 );
+ lamda 50;
+ rollAmax 0.2;
+ rollAmin 0.1;
+ heaveA 4;
+ swayA 2.4;
+ Q 2;
+ Tp 14;
+ Tpn 12;
+ dTi 0.06;
+ dTp -0.001;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
index 3c52247aa29f0cb0eeb549c39a24a6e11a8f3391..c7d3ee2dcd51f0c5fa1b35f42cdbcc6d79e30493 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
index b6c1cdd4ad9b1d6ba5fd81e26deeeb626cee8b8f..b56cbe4342576c10393d6eb995d49acc0925e240 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary
similarity index 94%
rename from tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary
index 57267e87f7e42310c06882be5d8864dc3c77adc2..53b37c41f6d9efc89d3a51c6c2425a165026e2dc 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties
similarity index 72%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties
index c20854a9031a956ad8bc154b0a4ae87375add730..02287f422b58ea20261ee3a90e0012076a3fb490 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,17 +18,18 @@ FoamFile
phase1
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 998.2;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
phase2
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
}
-sigma sigma [1 0 -2 0 0 0 0] 0.0;
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
similarity index 71%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/system/controlDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
index 0bacce4c995976475551971d1842b33a846c1d20..a4e44f2de3153e8998fc44a13ff9793f9a52e513 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -53,24 +53,15 @@ functions
(
probes
{
- // Type of functionObject
type probes;
-
- // Output every 10th time step
outputControl timeStep;
outputInterval 10;
-
- // Name of the directory for the probe data
name probes;
-
- // Locations to be probed. runTime modifiable!
probeLocations
(
- (0 9.95 19.77)
- (0 -9.95 19.77)
+ ( 0 9.95 19.77 )
+ ( 0 -9.95 19.77 )
);
-
- // Fields to be probed. runTime modifiable!
fields
(
p
@@ -79,33 +70,26 @@ functions
wallPressure
{
- // Type of functionObject
type surfaces;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
- // Output every 10th time step
+ functionObjectLibs ( "libsampling.so" );
outputControl timeStep;
outputInterval 10;
-
surfaceFormat raw;
-
fields
(
p
);
-
surfaces
(
walls
{
- type patch;
- patchName walls;
- triangulate false;
+ type patch;
+ patchName walls;
+ triangulate false;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict
similarity index 82%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict
index d4594e09475d920c6ca71413fa457c4ec15810ac..fa967d3199a414ba839010517229d0ab3089cf07 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method hierarchical;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (4 2 2);
+ n ( 4 2 2 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank3D/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
index f089e4e5e6a14300b65f1deeeda14777be255c0c..d4eb5a19662e68864722f579d30296c6d4fbfd87 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
- grad(gamma) Gauss linear;
+ grad(alpha) Gauss linear;
}
divSchemes
{
div(rho*phi,U) Gauss vanLeerV;
- div(phi,gamma) Gauss vanLeer;
- div(phirb,gamma) Gauss vanLeer;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss vanLeer;
}
laplacianSchemes
@@ -51,9 +52,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ alpha ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ce22769b821733c857d6f80b3a0ffa627ae0ec80
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
@@ -0,0 +1,122 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 2e-09;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 2e-09;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ correctPhi no;
+ pRefProbe
+ {
+ fields
+ (
+ p
+ );
+ probeLocations
+ (
+ ( 0 0 0.15 )
+ );
+ }
+
+ pRefValue 100000;
+}
+
+relaxationFactors
+{
+ U 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank2D/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
index 2c881a7ba48d03bc05de5c2d82ab02c90c1928ef..7ff571c6d130cf0424493bcc96a52251eedc746a 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,26 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
defaultFieldValues
(
- volScalarFieldValue gamma 0
+ volScalarFieldValue alpha1 0
);
regions
(
boxToCell
{
- box (-100 -100 -100) (100 100 0);
-
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
+ box ( -100 -100 -100 ) ( 100 100 0 );
+ fieldValues ( volScalarFieldValue alpha1 1 );
}
);
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/0/U
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U
index df1f4c5a6cac4fec14e0fe27b4ce52192bbb8588..da644fd824cc6e5940268c434025786c3fe29e9e 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/alpha1.org
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/0/alpha1.org
index 85902dcba56932d63c672f60079995cbf927b363..4bf9e5b1712646191103e4755800567d16275735 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/0/pd
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd
index 25379b239c07f497fa0d81af72650ff736e464f2..ac7e49da81a5ead98e613c5891faccae05ef2629 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/0/pd
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..20c2a63671cad1633195e872d98b63d22c2cd156
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+foamCleanTutorials cases
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank3D/Allrun
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun
index df799d7732174c55cd675c8ed99294bf8c4a4897..0d2a8c82229717af79be19a0037784058a171958 100755
--- a/tutorials/interDyMFoam/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun
@@ -4,6 +4,6 @@
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
runApplication setFields
runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ac647d46427282fac607f94584e78ca379f120a8
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/RASProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel laminar;
+
+turbulence off;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..f8a9a9bd8b3dd8cd97772d60b537574b1f46ea6c
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/dynamicMeshDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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 "constant";
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh solidBodyMotionFvMesh;
+
+solidBodyMotionFvMeshCoeffs
+{
+ solidBodyMotionFunction SDA;
+ SDACoeffs
+ {
+ CofG ( 0 0 0 );
+ lamda 50;
+ rollAmax 0.22654;
+ rollAmin 0.10472;
+ heaveA 3.79;
+ swayA 2.34;
+ Q 2;
+ Tp 13.93;
+ Tpn 11.93;
+ dTi 0.059;
+ dTp -0.001;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict
similarity index 97%
rename from tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict
index 0d21d111481f4479c9f59f540e7962d4a65e3e4c..98820d1a0069d2fb15abd412722b3b18d51be5f1 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
index f97859e6bffaa7c864e14cd5f5c62968652fc03f..4d323b9c9706530c88d5784599b330afd50b13b0 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary
index 28068f37d475c1adafedec2ee7c20e8de8d7df32..31c74e19c2e09fdc21361f3b94abc32f9b151784 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties
similarity index 72%
rename from tutorials/interDyMFoam/sloshingTank3D/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties
index c20854a9031a956ad8bc154b0a4ae87375add730..02287f422b58ea20261ee3a90e0012076a3fb490 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,17 +18,18 @@ FoamFile
phase1
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 998.2;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
phase2
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
}
-sigma sigma [1 0 -2 0 0 0 0] 0.0;
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..1b122632d3a10a68a5acb3c0a015f737076e0fcf
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
@@ -0,0 +1,73 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 40;
+
+deltaT 0.01;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.05;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression compressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.5;
+
+maxDeltaT 1;
+
+functions
+(
+ probes
+ {
+ type probes;
+ outputControl timeStep;
+ outputInterval 1;
+ name probes;
+ probeLocations
+ (
+ ( 0 9.95 19.77 )
+ ( 0 -9.95 19.77 )
+ );
+ fields
+ (
+ p
+ );
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict
similarity index 82%
rename from tutorials/interDyMFoam/sloshingTank2D/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict
index d4594e09475d920c6ca71413fa457c4ec15810ac..fa967d3199a414ba839010517229d0ab3089cf07 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method hierarchical;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (4 2 2);
+ n ( 4 2 2 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes
index f089e4e5e6a14300b65f1deeeda14777be255c0c..d4eb5a19662e68864722f579d30296c6d4fbfd87 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
- grad(gamma) Gauss linear;
+ grad(alpha) Gauss linear;
}
divSchemes
{
div(rho*phi,U) Gauss vanLeerV;
- div(phi,gamma) Gauss vanLeer;
- div(phirb,gamma) Gauss vanLeer;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss vanLeer;
}
laplacianSchemes
@@ -51,9 +52,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ alpha ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ce22769b821733c857d6f80b3a0ffa627ae0ec80
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution
@@ -0,0 +1,122 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 2e-09;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 2e-09;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ correctPhi no;
+ pRefProbe
+ {
+ fields
+ (
+ p
+ );
+ probeLocations
+ (
+ ( 0 0 0.15 )
+ );
+ }
+
+ pRefValue 100000;
+}
+
+relaxationFactors
+{
+ U 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..2f947e62416f71a3ff19b87376388cab9269939a
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict
@@ -0,0 +1,33 @@
+/*--------------------------------*- 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 setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+ volScalarFieldValue alpha1 0
+);
+
+regions
+(
+ boxToCell
+ {
+ box ( -100 -100 -100 ) ( 100 100 0 );
+ fieldValues ( volScalarFieldValue alpha1 1 );
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D/0/U
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U
index df1f4c5a6cac4fec14e0fe27b4ce52192bbb8588..da644fd824cc6e5940268c434025786c3fe29e9e 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/0/U
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/alpha1.org
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank3D/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/alpha1.org
index 85902dcba56932d63c672f60079995cbf927b363..4bf9e5b1712646191103e4755800567d16275735 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/0/pd
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd
index 25379b239c07f497fa0d81af72650ff736e464f2..ac7e49da81a5ead98e613c5891faccae05ef2629 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/0/pd
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..20c2a63671cad1633195e872d98b63d22c2cd156
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+foamCleanTutorials cases
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/Allrun
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun
index df799d7732174c55cd675c8ed99294bf8c4a4897..0d2a8c82229717af79be19a0037784058a171958 100755
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun
@@ -4,6 +4,6 @@
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
runApplication setFields
runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ac647d46427282fac607f94584e78ca379f120a8
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/RASProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel laminar;
+
+turbulence off;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..e9ca15c3386a6ef33ee07505fd6f82015a9183a2
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/dynamicMeshDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- 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 "constant";
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh solidBodyMotionFvMesh;
+
+solidBodyMotionFvMeshCoeffs
+{
+ solidBodyMotionFunction SDA;
+ SDACoeffs
+ {
+ CofG ( 0 0 0 );
+ lamda 50;
+ rollAmax 0.2;
+ rollAmin 0.1;
+ heaveA 4;
+ swayA 2.4;
+ Q 2;
+ Tp 14;
+ Tpn 12;
+ dTi 0.06;
+ dTp -0.001;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
similarity index 97%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
index 0d21d111481f4479c9f59f540e7962d4a65e3e4c..98820d1a0069d2fb15abd412722b3b18d51be5f1 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
index f97859e6bffaa7c864e14cd5f5c62968652fc03f..4d323b9c9706530c88d5784599b330afd50b13b0 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary
index 28068f37d475c1adafedec2ee7c20e8de8d7df32..31c74e19c2e09fdc21361f3b94abc32f9b151784 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties
similarity index 72%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties
index c20854a9031a956ad8bc154b0a4ae87375add730..02287f422b58ea20261ee3a90e0012076a3fb490 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -17,17 +18,18 @@ FoamFile
phase1
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-6;
- rho rho [1 -3 0 0 0 0 0] 998.2;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
}
phase2
{
transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
}
-sigma sigma [1 0 -2 0 0 0 0] 0.0;
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0;
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..1b122632d3a10a68a5acb3c0a015f737076e0fcf
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
@@ -0,0 +1,73 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 40;
+
+deltaT 0.01;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.05;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression compressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.5;
+
+maxDeltaT 1;
+
+functions
+(
+ probes
+ {
+ type probes;
+ outputControl timeStep;
+ outputInterval 1;
+ name probes;
+ probeLocations
+ (
+ ( 0 9.95 19.77 )
+ ( 0 -9.95 19.77 )
+ );
+ fields
+ (
+ p
+ );
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict
similarity index 82%
rename from tutorials/interDyMFoam/sloshingTank3D/system/decomposeParDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict
index d4594e09475d920c6ca71413fa457c4ec15810ac..fa967d3199a414ba839010517229d0ab3089cf07 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/system/decomposeParDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method hierarchical;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (4 2 2);
+ n ( 4 2 2 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank2D/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
index f089e4e5e6a14300b65f1deeeda14777be255c0c..d4eb5a19662e68864722f579d30296c6d4fbfd87 100644
--- a/tutorials/interDyMFoam/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
- grad(gamma) Gauss linear;
+ grad(alpha) Gauss linear;
}
divSchemes
{
div(rho*phi,U) Gauss vanLeerV;
- div(phi,gamma) Gauss vanLeer;
- div(phirb,gamma) Gauss vanLeer;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss vanLeer;
}
laplacianSchemes
@@ -51,9 +52,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ alpha ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ce22769b821733c857d6f80b3a0ffa627ae0ec80
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
@@ -0,0 +1,122 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 2e-09;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 2e-09;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ correctPhi no;
+ pRefProbe
+ {
+ fields
+ (
+ p
+ );
+ probeLocations
+ (
+ ( 0 0 0.15 )
+ );
+ }
+
+ pRefValue 100000;
+}
+
+relaxationFactors
+{
+ U 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
index 2c881a7ba48d03bc05de5c2d82ab02c90c1928ef..7ff571c6d130cf0424493bcc96a52251eedc746a 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,26 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
defaultFieldValues
(
- volScalarFieldValue gamma 0
+ volScalarFieldValue alpha1 0
);
regions
(
boxToCell
{
- box (-100 -100 -100) (100 100 0);
-
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
+ box ( -100 -100 -100 ) ( 100 100 0 );
+ fieldValues ( volScalarFieldValue alpha1 1 );
}
);
+
// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/0/U b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/0/U
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U
index df1f4c5a6cac4fec14e0fe27b4ce52192bbb8588..da644fd824cc6e5940268c434025786c3fe29e9e 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/0/U
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/alpha1.org
similarity index 90%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/alpha1.org
index 85902dcba56932d63c672f60079995cbf927b363..4bf9e5b1712646191103e4755800567d16275735 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/alpha1.org
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object gamma;
+ object alpha1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/0/pd b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D/0/pd
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd
index 25379b239c07f497fa0d81af72650ff736e464f2..ac7e49da81a5ead98e613c5891faccae05ef2629 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/0/pd
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/pd
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..20c2a63671cad1633195e872d98b63d22c2cd156
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+foamCleanTutorials cases
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..0d2a8c82229717af79be19a0037784058a171958
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
+runApplication blockMesh
+cp 0/alpha1.org 0/alpha1
+runApplication setFields
+runApplication interDyMFoam
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/6DoF.dat b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/6DoF.dat
similarity index 100%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/constant/6DoF.dat
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/6DoF.dat
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ac647d46427282fac607f94584e78ca379f120a8
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/RASProperties
@@ -0,0 +1,174 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel laminar;
+
+turbulence off;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
similarity index 73%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
index 639bcd053b70dd7fedda1aab03e6b236353794a6..caba842ea5626377f2f14efa09f192710ee25b78 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,24 +10,22 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object motionProperties;
+ location "constant";
+ object dynamicMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dynamicFvMesh solidBodyMotionFvMesh;
+dynamicFvMesh solidBodyMotionFvMesh;
solidBodyMotionFvMeshCoeffs
{
solidBodyMotionFunction SKA;
-
SKACoeffs
{
- // Centre of gravity
- CofG (0 0 0);
-
- // Time data file name
+ CofG ( 0 0 0 );
timeDataFileName "constant/6DoF.dat";
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9fd11e4ef267ca5f4cd3c6432b6e2075f5655e88
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
similarity index 97%
rename from tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
index 0d21d111481f4479c9f59f540e7962d4a65e3e4c..98820d1a0069d2fb15abd412722b3b18d51be5f1 100644
--- a/tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4 b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
similarity index 98%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
index f97859e6bffaa7c864e14cd5f5c62968652fc03f..4d323b9c9706530c88d5784599b330afd50b13b0 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary
similarity index 93%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary
index 28068f37d475c1adafedec2ee7c20e8de8d7df32..31c74e19c2e09fdc21361f3b94abc32f9b151784 100644
--- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..02287f422b58ea20261ee3a90e0012076a3fb490
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/transportProperties
@@ -0,0 +1,35 @@
+/*--------------------------------*- 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 "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 998.2;
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+}
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/files b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/files
similarity index 100%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/files
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/files
diff --git a/tutorials/potentialFoam/cylinder/analyticalCylinder/Make/options b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/options
similarity index 100%
rename from tutorials/potentialFoam/cylinder/analyticalCylinder/Make/options
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/gen6DoF/Make/options
diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/gen6DoF/gen6DoF.C b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
similarity index 100%
rename from tutorials/interDyMFoam/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/gen6DoF/gen6DoF.C
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..1b122632d3a10a68a5acb3c0a015f737076e0fcf
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
@@ -0,0 +1,73 @@
+/*--------------------------------*- 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;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 40;
+
+deltaT 0.01;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.05;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression compressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.5;
+
+maxDeltaT 1;
+
+functions
+(
+ probes
+ {
+ type probes;
+ outputControl timeStep;
+ outputInterval 1;
+ name probes;
+ probeLocations
+ (
+ ( 0 9.95 19.77 )
+ ( 0 -9.95 19.77 )
+ );
+ fields
+ (
+ p
+ );
+ }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict
new file mode 100644
index 0000000000000000000000000000000000000000..fa967d3199a414ba839010517229d0ab3089cf07
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/decomposeParDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- 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 decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 16;
+
+method hierarchical;
+
+simpleCoeffs
+{
+ n ( 2 2 1 );
+ delta 0.001;
+}
+
+hierarchicalCoeffs
+{
+ n ( 4 2 2 );
+ delta 0.001;
+ order xyz;
+}
+
+metisCoeffs
+{
+ processorWeights ( 1 1 1 1 );
+}
+
+manualCoeffs
+{
+ dataFile "";
+}
+
+distributed no;
+
+roots ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
index f089e4e5e6a14300b65f1deeeda14777be255c0c..d4eb5a19662e68864722f579d30296c6d4fbfd87 100644
--- a/tutorials/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,28 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
- grad(gamma) Gauss linear;
+ grad(alpha) Gauss linear;
}
divSchemes
{
div(rho*phi,U) Gauss vanLeerV;
- div(phi,gamma) Gauss vanLeer;
- div(phirb,gamma) Gauss vanLeer;
+ div(phi,alpha) Gauss vanLeer;
+ div(phirb,alpha) Gauss vanLeer;
}
laplacianSchemes
@@ -51,9 +52,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ alpha ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ce22769b821733c857d6f80b3a0ffa627ae0ec80
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
@@ -0,0 +1,122 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 2e-09;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 2e-09;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 1;
+ nAlphaSubCycles 3;
+ cAlpha 1.5;
+ correctPhi no;
+ pRefProbe
+ {
+ fields
+ (
+ p
+ );
+ probeLocations
+ (
+ ( 0 0 0.15 )
+ );
+ }
+
+ pRefValue 100000;
+}
+
+relaxationFactors
+{
+ U 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/interDyMFoam/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
similarity index 79%
rename from tutorials/interDyMFoam/sloshingTank3D/system/setFieldsDict
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
index 2c881a7ba48d03bc05de5c2d82ab02c90c1928ef..7ff571c6d130cf0424493bcc96a52251eedc746a 100644
--- a/tutorials/interDyMFoam/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,26 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
defaultFieldValues
(
- volScalarFieldValue gamma 0
+ volScalarFieldValue alpha1 0
);
regions
(
boxToCell
{
- box (-100 -100 -100) (100 100 0);
-
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
+ box ( -100 -100 -100 ) ( 100 100 0 );
+ fieldValues ( volScalarFieldValue alpha1 1 );
}
);
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/Allrun b/tutorials/multiphase/interFoam/Allrun
similarity index 100%
rename from tutorials/interFoam/Allrun
rename to tutorials/multiphase/interFoam/Allrun
diff --git a/tutorials/interFoam/laminar/Allclean b/tutorials/multiphase/interFoam/laminar/Allclean
similarity index 100%
rename from tutorials/interFoam/laminar/Allclean
rename to tutorials/multiphase/interFoam/laminar/Allclean
diff --git a/tutorials/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
similarity index 100%
rename from tutorials/interFoam/laminar/Allrun
rename to tutorials/multiphase/interFoam/laminar/Allrun
diff --git a/tutorials/interFoam/laminar/damBreak/0/U b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
similarity index 95%
rename from tutorials/interFoam/laminar/damBreak/0/U
rename to tutorials/multiphase/interFoam/laminar/damBreak/0/U
index 9dcf5eae9a46f2cf8d1f2c50e4d67549358bb667..dca001ffb0c4ba0fca9465b634dad5f4dae3b8a9 100644
--- a/tutorials/interFoam/laminar/damBreak/0/U
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interFoam/laminar/damBreak/0/alpha1 b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1
similarity index 100%
rename from tutorials/interFoam/laminar/damBreak/0/alpha1
rename to tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1
diff --git a/tutorials/interFoam/laminar/damBreak/0/alpha1.org b/tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
similarity index 100%
rename from tutorials/interFoam/laminar/damBreak/0/alpha1.org
rename to tutorials/multiphase/interFoam/laminar/damBreak/0/alpha1.org
diff --git a/tutorials/interFoam/laminar/damBreak/0/pd b/tutorials/multiphase/interFoam/laminar/damBreak/0/pd
similarity index 100%
rename from tutorials/interFoam/laminar/damBreak/0/pd
rename to tutorials/multiphase/interFoam/laminar/damBreak/0/pd
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict
new file mode 100644
index 0000000000000000000000000000000000000000..cea5c19ae6aa26eb604192e6db563a0fa9fd93b3
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/dynamicMeshDict
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object dynamicMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dynamicFvMesh staticFvMesh;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/blockMeshDict
diff --git a/tutorials/interFoam/laminar/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/interFoam/laminar/damBreak/constant/polyMesh/boundary
rename to tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
index eb22ec5273f7a92f89eb73ad1d24ffcbf3235cda..3a6342293a65ea0926ba2905f85f1d656a0d0064 100644
--- a/tutorials/interFoam/laminar/damBreak/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b8f03496c1493693d3994a211ffaed9fb15b1027
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
similarity index 92%
rename from tutorials/interFoam/laminar/damBreak/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
index 8415c7bc8498b6f83bbbe706963987ae7210136c..5546d05292ba0b8c758f2994d21d04aa71d38cfc 100644
--- a/tutorials/interFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -49,4 +49,5 @@ maxCo 0.5;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
similarity index 83%
rename from tutorials/cavitatingFoam/les/throttle3D/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
index 30bfe19d72448cf87690f42caaddeac137600b1a..bf8dffb737c91db0646cde4bd56a4fd0629c82b9 100644
--- a/tutorials/cavitatingFoam/les/throttle3D/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method simple;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (1 1 1);
+ n ( 1 1 1 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
similarity index 87%
rename from tutorials/interFoam/laminar/damBreak/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
index 6b8e4385b40a677ca15c2384a98c7d710a29a4b7..d242b76b754914e7115105855ad61600253674b9 100644
--- a/tutorials/interFoam/laminar/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -51,9 +52,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- alpha1;
+ pd ;
+ pcorr ;
+ alpha1 ;
}
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
similarity index 60%
rename from tutorials/interFoam/laminar/damBreak/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index 57f829277796a6f17ec77d5965259173a400a546..b1b00223fcd0bbe688671476a0173185fb0313f5 100644
--- a/tutorials/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,36 +10,44 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- pcorr PCG
+ pcorr
{
- preconditioner DIC;
- tolerance 1e-10;
- relTol 0;
- };
- pd PCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ pd
{
- preconditioner DIC;
- tolerance 1e-7;
- relTol 0.05;
- };
- pdFinal PCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0.05;
+ }
+
+ pdFinal
{
- preconditioner DIC;
- tolerance 1e-7;
- relTol 0;
- };
- U PBiCG
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ U
{
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
}
PISO
@@ -52,4 +60,5 @@ PISO
cAlpha 1;
}
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
similarity index 71%
rename from tutorials/interFoam/ras/damBreak/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
index e7666438bbe4735aecd12f49030731efacc13b68..21e4416d79807159d602cdb72a0f9df7367950ea 100644
--- a/tutorials/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,27 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-defaultFieldValues
-(
- volScalarFieldValue gamma 0
- volVectorFieldValue U (0 0 0)
-);
+defaultFieldValues ( volScalarFieldValue alpha1 0 volVectorFieldValue U ( 0 0 0 ) );
-regions
-(
- boxToCell
- {
- box (0 0 -1) (0.1461 0.292 1);
+regions ( boxToCell { box ( 0 0 -1 ) ( 0.1461 0.292 1 ) ; fieldValues ( volScalarFieldValue alpha1 1 ) ; } );
- fieldValues
- (
- volScalarFieldValue gamma 1
- );
- }
-);
// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/B b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/B
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/B
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/B
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/U b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/U
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/U
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/alpha1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/alpha1
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/data/Ubulk b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/Ubulk
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/data/Ubulk
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/Ubulk
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/data/ptrace b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/ptrace
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/data/ptrace
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/data/ptrace
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/k b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/k
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/k
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/nuSgs b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/nuSgs
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/nuTilda b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/nuTilda
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
diff --git a/tutorials/interFoam/les/nozzleFlow2D/0/pd b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/0/pd
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd
diff --git a/tutorials/interFoam/les/nozzleFlow2D/Allclean b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/Allclean
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/Allclean
diff --git a/tutorials/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/Allrun
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
diff --git a/tutorials/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
similarity index 62%
rename from tutorials/cavitatingFoam/les/throttle3D/constant/LESProperties
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
index 86f1040611b61575a7159ed3fd9907dd8e31a62a..1d34e2477f47060c279bf8bfc559ec77f7861540 100644
--- a/tutorials/cavitatingFoam/les/throttle3D/constant/LESProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,110 +10,109 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object LESProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-LESModel devOneEqEddy;
+LESModel oneEqEddy;
+
+turbulence on;
delta smooth;
-laminarCoeffs
-{
-}
+printCoeffs on;
-devOneEqEddyCoeffs
+laminarCoeffs
{
- ck 0.07;
- ce 1.05;
}
oneEqEddyCoeffs
{
- ck 0.07;
- ce 1.05;
+ ck 0.07;
+ ce 1.05;
}
dynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
locDynOneEqEddyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
SmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
}
Smagorinsky2Coeffs
{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
+ ce 1.05;
+ ck 0.07;
+ cD2 0.02;
}
spectEddyViscCoeffs
{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
+ ce 1.05;
+ cB 8.22;
+ cK1 0.83;
+ cK2 1.03;
+ cK3 4.75;
+ cK4 2.55;
}
dynSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
mixedSmagorinskyCoeffs
{
- ce 1.05;
- ck 0.07;
+ ce 1.05;
+ ck 0.07;
filter simple;
}
dynMixedSmagorinskyCoeffs
{
- ce 1.05;
+ ce 1.05;
filter simple;
}
LRRDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
+ ce 1.05;
+ ck 0.09;
+ c1 1.8;
+ c2 0.6;
}
DeardorffDiffStressCoeffs
{
- ce 1.05;
- ck 0.09;
- cm 4.13;
+ ce 1.05;
+ ck 0.09;
+ cm 4.13;
}
SpalartAllmarasCoeffs
{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
- CDES 0.65;
- ck 0.07;
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+ CDES 0.65;
+ ck 0.07;
}
cubeRootVolCoeffs
@@ -128,6 +127,7 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -135,9 +135,11 @@ PrandtlCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Cdelta 0.158;
+
+ Cdelta 0.158;
}
vanDriestCoeffs
@@ -147,6 +149,7 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
smoothCoeffs
{
delta cubeRootVol;
@@ -154,10 +157,12 @@ vanDriestCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
- Aplus 26;
- Cdelta 0.158;
+
+ Aplus 26;
+ Cdelta 0.158;
}
smoothCoeffs
@@ -167,14 +172,16 @@ smoothCoeffs
{
deltaCoeff 1;
}
+
maxDeltaRatio 1.1;
}
-kappa 0.4187;
+kappa 0.4187;
wallFunctionCoeffs
{
- E 9;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/buoyantFoam/hotRoom/constant/environmentalProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
similarity index 84%
rename from tutorials/buoyantFoam/hotRoom/constant/environmentalProperties
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..645c9af09920faa00dce17c1d3a52689e877a1f0 100644
--- a/tutorials/buoyantFoam/hotRoom/constant/environmentalProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
+g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/blockMeshDict
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
similarity index 100%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/boundary.org
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0
similarity index 99%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0
index e2320b01cffac5dba8a064c7cd470a4318a69e18..04d478574abae87d7877c2a6465c449190ebb533 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old
similarity index 92%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old
index 250a0c6d5311f65c0531e1d54e5983c45a167d73..5fbe1c4c4b15e3608a0e45519f8bea631f0e42ec 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/c0_old
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells
similarity index 99%
rename from tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells
index 383d411db8a9cd0c0991719605d49a17e0930791..276e2ccb5f5c8196dc1021dedc004f9e6a72ee1c 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/polyMesh/sets/refinedCells
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..295d67f64414b13d387f6f08ccae4fa0762155af
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+twoPhase
+{
+ transportModel twoPhase;
+ phase1 phase1;
+ phase2 phase2;
+}
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 5.952e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 840;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 8.5e-07;
+ rho rho [ 1 -3 0 0 0 0 0 ] 20;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0.0261;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..2e42797ca9558f9a6c4c3b2195313dda5504598a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/cellSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
similarity index 78%
rename from tutorials/cavitatingFoam/les/throttle/system/cellSetDict.1
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
index 9dc6572157363a81371dd84e0eb1e9371d758ce7..cc4838bb42562f758f1e7ef0527ecc2453c61256 100644
--- a/tutorials/cavitatingFoam/les/throttle/system/cellSetDict.1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object cellSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name c0;
-action new;
+action new;
+
+topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 ) ; } );
-topoSetSources
-(
- boxToCell
- {
- box (4e-03 -1e-03 -1) (12e-3 1e-03 1);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1
new file mode 100644
index 0000000000000000000000000000000000000000..b2294190d0a022d264dd7c29c993921ede635b0f
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.1
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object cellSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+name c0;
+
+action new;
+
+topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0008 4e-05 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.2 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2
similarity index 75%
rename from tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.2
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2
index 0eb66c8739bf5aaa726844faa441413d623c17cd..e5e1a3c5c9d5594271ca38de4824d3f4de481778 100644
--- a/tutorials/cavitatingFoam/ras/throttle/system/cellSetDict.2
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict.2
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,20 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object cellSetDict;
+ location "system";
+ object cellSetDict.2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-name c0;
+name c0;
-action new;
+action new;
+
+topoSetSources ( boxToCell { box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 ) ; } );
-topoSetSources
-(
- boxToCell
- {
- box (4.5e-03 -0.75e-03 -1) (9.5e-3 0.75e-03 1);
- }
-);
// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
similarity index 92%
rename from tutorials/interFoam/les/nozzleFlow2D/system/controlDict
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
index e7a4ac1b84c109aceed597154e81ba5c9dcc3648..58243b4b8d07d004055110f6c6ab589ceb2d50d6 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -49,4 +49,5 @@ maxCo 0.5;
maxDeltaT 1e-08;
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
similarity index 88%
rename from tutorials/interFoam/les/nozzleFlow2D/system/fvSchemes
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
index 2d28e02de03ea0463ec4c7e251fa88b5f2cca6f5..2a273c5e51cb5bcdaf8b079c33459db6568e75a2 100644
--- a/tutorials/interFoam/les/nozzleFlow2D/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -55,9 +56,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- alpha1;
+ pd ;
+ pcorr ;
+ alpha1 ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..660482ad377d9745a5a8fd4b6fc67486640c3726
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -0,0 +1,127 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother DICGaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration false;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-07;
+ relTol 0.01;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-07;
+ relTol 0;
+ nVcycles 2;
+ smoother DICGaussSeidel;
+ nPreSweeps 2;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-07;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-06;
+ relTol 0;
+ nSweeps 1;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ B
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 1;
+ nAlphaCorr 1;
+ nAlphaSubCycles 4;
+ cAlpha 2;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/refineMeshDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
similarity index 70%
rename from tutorials/cavitatingFoam/ras/throttle/system/refineMeshDict
rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
index 12b021090d69400d48f6bbf58b910e002a9d80da..d4922505f77bf842bd015c48086b902352d03f43 100644
--- a/tutorials/cavitatingFoam/ras/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,34 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object refineMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-set c0;
+set c0;
coordinateSystem global;
globalCoeffs
{
- tan1 (1 0 0);
- tan2 (0 1 0);
+ tan1 ( 1 0 0 );
+ tan2 ( 0 1 0 );
}
-directions
-(
- tan1
- tan2
-);
+patchLocalCoeffs
+{
+ patch outside;
+ tan1 ( 1 0 0 );
+}
+
+directions ( tan1 );
+
+useHexTopology no;
-useHexTopology yes;
+geometricCut yes;
-geometricCut no;
+writeMesh no;
-writeMesh no;
// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
similarity index 100%
rename from tutorials/interFoam/ras/Allclean
rename to tutorials/multiphase/interFoam/ras/Allclean
diff --git a/tutorials/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
similarity index 100%
rename from tutorials/interFoam/ras/Allrun
rename to tutorials/multiphase/interFoam/ras/Allrun
diff --git a/tutorials/interFoam/ras/damBreak/0/R b/tutorials/multiphase/interFoam/ras/damBreak/0/R
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/R
rename to tutorials/multiphase/interFoam/ras/damBreak/0/R
diff --git a/tutorials/interFoam/ras/damBreak/0/U b/tutorials/multiphase/interFoam/ras/damBreak/0/U
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/U
rename to tutorials/multiphase/interFoam/ras/damBreak/0/U
diff --git a/tutorials/interFoam/ras/damBreak/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/epsilon
rename to tutorials/multiphase/interFoam/ras/damBreak/0/epsilon
diff --git a/tutorials/interFoam/ras/damBreak/0/gamma b/tutorials/multiphase/interFoam/ras/damBreak/0/gamma
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/gamma
rename to tutorials/multiphase/interFoam/ras/damBreak/0/gamma
diff --git a/tutorials/interFoam/ras/damBreak/0/gamma.org b/tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/gamma.org
rename to tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org
diff --git a/tutorials/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/0/k
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/k
rename to tutorials/multiphase/interFoam/ras/damBreak/0/k
diff --git a/tutorials/interFoam/ras/damBreak/0/nuTilda b/tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/nuTilda
rename to tutorials/multiphase/interFoam/ras/damBreak/0/nuTilda
diff --git a/tutorials/interFoam/ras/damBreak/0/pd b/tutorials/multiphase/interFoam/ras/damBreak/0/pd
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/0/pd
rename to tutorials/multiphase/interFoam/ras/damBreak/0/pd
diff --git a/tutorials/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/Allrun
rename to tutorials/multiphase/interFoam/ras/damBreak/Allrun
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ce5406cd7aadd133ad41d268c5e2771a33d1c979
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/RASProperties
@@ -0,0 +1,185 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+RNGkEpsilonCoeffs
+{
+ Cmu 0.0845;
+ C1 1.42;
+ C2 1.68;
+ alphak 1.39;
+ alphaEps 1.39;
+ eta0 4.38;
+ beta 0.012;
+}
+
+realizableKECoeffs
+{
+ Cmu 0.09;
+ A0 4;
+ C2 1.9;
+ alphak 1;
+ alphaEps 0.833333;
+}
+
+NonlinearKEShihCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76932;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+LienCubicKECoeffs
+{
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+}
+
+QZetaCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaZeta 0.76923;
+ anisotropic no;
+}
+
+LaunderSharmaKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LamBremhorstKECoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphaEps 0.76923;
+}
+
+LienCubicKELowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ A1 1.25;
+ A2 1000;
+ Ctau1 -4;
+ Ctau2 13;
+ Ctau3 -2;
+ alphaKsi 0.9;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LienLeschzinerLowReCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
+ Am 0.016;
+ Aepsilon 0.263;
+ Amu 0.00222;
+}
+
+LRRCoeffs
+{
+ Cmu 0.09;
+ Clrr1 1.8;
+ Clrr2 0.6;
+ C1 1.44;
+ C2 1.92;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+}
+
+LaunderGibsonRSTMCoeffs
+{
+ Cmu 0.09;
+ Clg1 1.8;
+ Clg2 0.6;
+ C1 1.44;
+ C2 1.92;
+ C1Ref 0.5;
+ C2Ref 0.3;
+ Cs 0.25;
+ Ceps 0.15;
+ alphaEps 0.76923;
+ alphaR 1.22;
+}
+
+SpalartAllmarasCoeffs
+{
+ alphaNut 1.5;
+ Cb1 0.1355;
+ Cb2 0.622;
+ Cw2 0.3;
+ Cw3 2;
+ Cv1 7.1;
+ Cv2 5;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/blockMeshDict
diff --git a/tutorials/interFoam/ras/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/interFoam/ras/damBreak/constant/polyMesh/boundary
rename to tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..79161dad1bf1ba36f93f50e1414341ae43b4a685
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+twoPhase
+{
+ transportModel twoPhase;
+ phase1 phase1;
+ phase2 phase2;
+}
+
+phase1
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+phase2
+{
+ transportModel Newtonian;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ CrossPowerLawCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ m m [ 0 0 1 0 0 0 0 ] 1;
+ n n [ 0 0 0 0 0 0 0 ] 0;
+ }
+
+ BirdCarreauCoeffs
+ {
+ nu0 nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
+ nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+ k k [ 0 0 1 0 0 0 0 ] 99.6;
+ n n [ 0 0 0 0 0 0 0 ] 0.1003;
+ }
+}
+
+sigma sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..b70f6702e4ef7644c20687bce6536c6690720da9
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
similarity index 92%
rename from tutorials/interFoam/ras/damBreak/system/controlDict
rename to tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
index 92227befc184c30b09f90bbd20d1b2f01bd82570..e2b799e52f41a455f50c3e6531af5d352485ba56 100644
--- a/tutorials/interFoam/ras/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -49,4 +49,5 @@ maxCo 0.2;
maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
similarity index 82%
rename from tutorials/interFoam/ras/damBreak/system/decomposeParDict
rename to tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
index cf0067afd3c7bf4315a46cf427fc9aa763511c0f..bf8dffb737c91db0646cde4bd56a4fd0629c82b9 100644
--- a/tutorials/interFoam/ras/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method simple;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (1 1 1);
+ n ( 1 1 1 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
similarity index 88%
rename from tutorials/interFoam/ras/damBreak/system/fvSchemes
rename to tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
index fd4e9a351974d4cc32f8627f4a583e92d71fc175..499ad01e5c625d5e9cb16c5f3693f73f17a84206 100644
--- a/tutorials/interFoam/ras/damBreak/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -34,7 +35,6 @@ divSchemes
div(phi,R) Gauss upwind;
div(R) Gauss linear;
div(phi,nuTilda) Gauss upwind;
-
div((nuEff*dev(grad(U).T()))) Gauss linear;
}
@@ -57,9 +57,10 @@ snGradSchemes
fluxRequired
{
default no;
- pd;
- pcorr;
- gamma;
+ pd ;
+ pcorr ;
+ gamma ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..ea7bd97c27c3f83f3dd9ab1b2c0da77625af3bd2
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -0,0 +1,96 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ pd
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0.05;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-06;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ R
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+
+ nuTilda
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-08;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ momentumPredictor no;
+ nCorrectors 3;
+ nNonOrthogonalCorrectors 0;
+ nGammaCorr 1;
+ nGammaSubCycles 4;
+ cGamma 2;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
new file mode 100644
index 0000000000000000000000000000000000000000..bafb3a32c09ce67dbcbe79d8e1b4e566f2a991dd
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@@ -0,0 +1,23 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues ( volScalarFieldValue gamma 0 volVectorFieldValue U ( 0 0 0 ) );
+
+regions ( boxToCell { box ( 0 0 -1 ) ( 0.1461 0.292 1 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/U b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/U
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/U
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/U
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaair
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphaair
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaair
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphamercury
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphamercury
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphamercury
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaoil
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphaoil
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphaoil
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas
similarity index 98%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphas
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas
index cf02a7c7467cf0e8529a3f10c790328e637e5adc..4d7076770a7025f7837ad1500ca81c8e271eda52 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object alphas;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -2314,4 +2315,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphawater
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/alphawater
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphawater
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/0/pd b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/0/pd
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/pd
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/constant/dynamicMeshDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties
similarity index 86%
rename from tutorials/interFoam/laminar/damBreak/constant/dynamicMeshDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties
index c87164cda226aff4d98a827f4c84ac33c3b1ecd8..f1a454040c4da03e5310c473b4862d238833bef5 100644
--- a/tutorials/interFoam/laminar/damBreak/constant/dynamicMeshDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object motionProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dynamicFvMesh staticFvMesh;
+movingFvMesh staticFvMesh;
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/blockMeshDict
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/polyMesh/boundary
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..99ccf063b9584fc87a83bd29545df931da6c3baa
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
+
+refPhase air;
+
+sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict
similarity index 91%
rename from tutorials/multiphaseInterFoam/damBreak4phase/system/controlDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict
index 03b8dd3beff45c667bb1a783d63fbfaf32a68bbd..7a68f62840fc3469c7daaffe83a5ce55646eedc2 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -47,6 +47,7 @@ adjustTimeStep yes;
maxCo 0.5;
-maxDeltaT 1.0;
+maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/interFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
similarity index 82%
rename from tutorials/interFoam/laminar/damBreak/system/decomposeParDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
index cf0067afd3c7bf4315a46cf427fc9aa763511c0f..bf8dffb737c91db0646cde4bd56a4fd0629c82b9 100644
--- a/tutorials/interFoam/laminar/damBreak/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method simple;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (1 1 1);
+ n ( 1 1 1 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes
similarity index 84%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes
index ace8adce3fe0e6e58b6a29268ab7099f15640aae..6443d5f3d91082796c7598307c797a684f63ac54 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -28,8 +29,8 @@ gradSchemes
divSchemes
{
- div(rho*phi,U) Gauss upwind; //limitedLinearV 1.0;
- div(phi,alpha) Gauss limitedLimitedLinear 1.0 -0.00001 1.00001;
+ div(rho*phi,U) Gauss upwind;
+ div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001;
div(phic,alpha) Gauss interfaceCompression;
}
@@ -53,4 +54,5 @@ fluxRequired
default yes;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..8c303f95402ad22e64766b3e454753746a7c68cf
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution
@@ -0,0 +1,112 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration off;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 2;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-07;
+ relTol 0.05;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration on;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-07;
+ relTol 0;
+ nVcycles 2;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration on;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-07;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-08;
+ relTol 0;
+ nSweeps 1;
+ }
+
+ alpha
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-08;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ nCorrectors 4;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 4;
+ nAlphaSubCycles 4;
+ cycleAlpha yes;
+ cAlpha 4;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
similarity index 86%
rename from tutorials/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
index 664126f092c7b7d65ee78f497379aec83ebe10ef..45ec79a508cbb3346bdc486d8e79a2faedebc0d8 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +21,14 @@ defaultFieldValues
volScalarFieldValue alphaWater 0
volScalarFieldValue alphaOil 0
volScalarFieldValue alphaMercury 0
- volVectorFieldValue U (0 0 0)
+ volVectorFieldValue U ( 0 0 0 )
);
regions
(
boxToCell
{
- box (0 0 -1) (0.1461 0.292 1);
-
+ box ( 0 0 -1 ) ( 0.1461 0.292 1 );
fieldValues
(
volScalarFieldValue alphaWater 1
@@ -37,11 +37,9 @@ regions
volScalarFieldValue alphaAir 0
);
}
-
boxToCell
{
- box (0.1461 0 -1) (0.2922 0.292 1);
-
+ box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
fieldValues
(
volScalarFieldValue alphaWater 0
@@ -50,11 +48,9 @@ regions
volScalarFieldValue alphaAir 0
);
}
-
boxToCell
{
- box (0 0 -1) (0.1461 0.1 1);
-
+ box ( 0 0 -1 ) ( 0.1461 0.1 1 );
fieldValues
(
volScalarFieldValue alphaWater 0
@@ -65,4 +61,5 @@ regions
}
);
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/U b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/U
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/U
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/U
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaair b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaair
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaair
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaair
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphamercury
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphaoil
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas
similarity index 99%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphas
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas
index 2e89a3f6143db8ca6b7ec62bdb31c205de098fcb..99b42c75e49ba5edd07719ba748e7a3ae1647807 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object alphas;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34246,4 +34247,5 @@ boundaryField
}
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphawater b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphawater
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/alphawater
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphawater
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/0/pd b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/0/pd
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/pd
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties
new file mode 100644
index 0000000000000000000000000000000000000000..f1a454040c4da03e5310c473b4862d238833bef5
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object motionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+movingFvMesh staticFvMesh;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/blockMeshDict
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..04429b16df52a30539b01ed1deef6ba5f46a118b
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
@@ -0,0 +1,52 @@
+/*--------------------------------*- 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 polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+ leftWall
+ {
+ type wall;
+ nFaces 195;
+ startFace 68014;
+ }
+ rightWall
+ {
+ type wall;
+ nFaces 195;
+ startFace 68209;
+ }
+ lowerWall
+ {
+ type wall;
+ nFaces 206;
+ startFace 68404;
+ }
+ atmosphere
+ {
+ type patch;
+ nFaces 176;
+ startFace 68610;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 68400;
+ startFace 68786;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..99ccf063b9584fc87a83bd29545df931da6c3baa
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
+
+refPhase air;
+
+sigmas ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties
new file mode 100644
index 0000000000000000000000000000000000000000..886d34bdef135c39216d342240a96bf0530bdd62
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
similarity index 91%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
index 03b8dd3beff45c667bb1a783d63fbfaf32a68bbd..7a68f62840fc3469c7daaffe83a5ce55646eedc2 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -47,6 +47,7 @@ adjustTimeStep yes;
maxCo 0.5;
-maxDeltaT 1.0;
+maxDeltaT 1;
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
similarity index 82%
rename from tutorials/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
index cf0067afd3c7bf4315a46cf427fc9aa763511c0f..bf8dffb737c91db0646cde4bd56a4fd0629c82b9 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method simple;
simpleCoeffs
{
- n (2 2 1);
+ n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
- n (1 1 1);
+ n ( 1 1 1 );
delta 0.001;
order xyz;
}
metisCoeffs
{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
+ processorWeights ( 1 1 1 1 );
}
manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
distributed no;
-roots
-(
-);
+roots ( );
+
// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
similarity index 83%
rename from tutorials/multiphaseInterFoam/damBreak4phase/system/fvSchemes
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
index 8f44bf9fcd53367b5bee2a00b30ad4a13dd859b6..6443d5f3d91082796c7598307c797a684f63ac54 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -29,8 +30,8 @@ gradSchemes
divSchemes
{
div(rho*phi,U) Gauss upwind;
- div(phi,alpha) Gauss limitedLimitedLinear 1.0 -0.00001 1.00001;
- div(phic,alpha) Gauss interfaceCompression; //upwind;
+ div(phi,alpha) Gauss limitedLimitedLinear 1 -1e-05 1.00001;
+ div(phic,alpha) Gauss interfaceCompression;
}
laplacianSchemes
@@ -53,4 +54,5 @@ fluxRequired
default yes;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..8c303f95402ad22e64766b3e454753746a7c68cf
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
@@ -0,0 +1,112 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ pcorr
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-05;
+ relTol 0;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nBottomSweeps 2;
+ cacheAgglomeration off;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 2;
+ }
+
+ tolerance 1e-05;
+ relTol 0;
+ maxIter 100;
+ }
+
+ pd
+ {
+ solver GAMG;
+ tolerance 1e-07;
+ relTol 0.05;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration on;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ pdFinal
+ {
+ solver PCG;
+ preconditioner
+ {
+ preconditioner GAMG;
+ tolerance 1e-07;
+ relTol 0;
+ nVcycles 2;
+ smoother GaussSeidel;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration on;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ tolerance 1e-07;
+ relTol 0;
+ maxIter 20;
+ }
+
+ U
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-08;
+ relTol 0;
+ nSweeps 1;
+ }
+
+ alpha
+ {
+ solver smoothSolver;
+ smoother GaussSeidel;
+ tolerance 1e-08;
+ relTol 0;
+ nSweeps 1;
+ }
+}
+
+PISO
+{
+ nCorrectors 4;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 4;
+ nAlphaSubCycles 4;
+ cycleAlpha yes;
+ cAlpha 4;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
similarity index 86%
rename from tutorials/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
rename to tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
index 664126f092c7b7d65ee78f497379aec83ebe10ef..94f35f9d93402dcbb0f5bae4398ff892ae6ae608 100644
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +21,14 @@ defaultFieldValues
volScalarFieldValue alphaWater 0
volScalarFieldValue alphaOil 0
volScalarFieldValue alphaMercury 0
- volVectorFieldValue U (0 0 0)
+ volVectorFieldValue U ( 0 0 0 )
);
regions
(
boxToCell
{
- box (0 0 -1) (0.1461 0.292 1);
-
+ box ( 0 0 -1 ) ( 0.1461 0.292 1 );
fieldValues
(
volScalarFieldValue alphaWater 1
@@ -37,11 +37,9 @@ regions
volScalarFieldValue alphaAir 0
);
}
-
boxToCell
{
- box (0.1461 0 -1) (0.2922 0.292 1);
-
+ box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
fieldValues
(
volScalarFieldValue alphaWater 0
@@ -50,11 +48,9 @@ regions
volScalarFieldValue alphaAir 0
);
}
-
boxToCell
{
- box (0 0 -1) (0.1461 0.1 1);
-
+ box ( 0 0 -1 ) ( 0.1461 0.1 1 );
fieldValues
(
volScalarFieldValue alphaWater 0
@@ -63,6 +59,7 @@ regions
volScalarFieldValue alphaAir 0
);
}
-);
+ );
+
// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/0/U b/tutorials/multiphase/settlingFoam/dahl/0/U
similarity index 100%
rename from tutorials/settlingFoam/dahl/0/U
rename to tutorials/multiphase/settlingFoam/dahl/0/U
diff --git a/tutorials/settlingFoam/dahl/0/alpha b/tutorials/multiphase/settlingFoam/dahl/0/alpha
similarity index 100%
rename from tutorials/settlingFoam/dahl/0/alpha
rename to tutorials/multiphase/settlingFoam/dahl/0/alpha
diff --git a/tutorials/settlingFoam/dahl/0/epsilon b/tutorials/multiphase/settlingFoam/dahl/0/epsilon
similarity index 100%
rename from tutorials/settlingFoam/dahl/0/epsilon
rename to tutorials/multiphase/settlingFoam/dahl/0/epsilon
diff --git a/tutorials/settlingFoam/dahl/0/k b/tutorials/multiphase/settlingFoam/dahl/0/k
similarity index 100%
rename from tutorials/settlingFoam/dahl/0/k
rename to tutorials/multiphase/settlingFoam/dahl/0/k
diff --git a/tutorials/settlingFoam/dahl/0/p b/tutorials/multiphase/settlingFoam/dahl/0/p
similarity index 100%
rename from tutorials/settlingFoam/dahl/0/p
rename to tutorials/multiphase/settlingFoam/dahl/0/p
diff --git a/tutorials/settlingFoam/tank3D/constant/RASProperties b/tutorials/multiphase/settlingFoam/dahl/constant/RASProperties
similarity index 69%
rename from tutorials/settlingFoam/tank3D/constant/RASProperties
rename to tutorials/multiphase/settlingFoam/dahl/constant/RASProperties
index 808b6f2aea1bf05ecdb24185abb8fc89d544d5ab..7d55e238e459fd3486cc80530d7f34fd00c7d15e 100644
--- a/tutorials/settlingFoam/tank3D/constant/RASProperties
+++ b/tutorials/multiphase/settlingFoam/dahl/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,15 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel kEpsilon;
+RASModel kEpsilon;
-turbulence on;
+turbulence on;
-printCoeffs on;
+printCoeffs on;
laminarCoeffs
{
@@ -26,18 +27,19 @@ laminarCoeffs
kEpsilonCoeffs
{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0.85;
- alphak 1;
- alphaEps 0.76923;
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0.85;
+ alphak 1;
+ alphaEps 0.76923;
}
wallFunctionCoeffs
{
- kappa 0.4187;
- E 9;
+ kappa 0.4187;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/dahl/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/settlingFoam/dahl/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/blockMeshDict
diff --git a/tutorials/settlingFoam/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/settlingFoam/dahl/constant/polyMesh/boundary
rename to tutorials/multiphase/settlingFoam/dahl/constant/polyMesh/boundary
diff --git a/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties b/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..db12081a215ccd890265f58d0fa3c57f36b39381
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/dahl/constant/transportProperties
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+muc muc [ 1 -1 -1 0 0 0 0 ] 0.00178;
+
+plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143;
+
+plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 179.26;
+
+BinghamPlastic on;
+
+yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 0.00042189;
+
+yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 1050.8;
+
+yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
+
+rhoc rhoc [ 1 -3 0 0 0 0 0 ] 996;
+
+rhod rhod [ 1 -3 0 0 0 0 0 ] 1996;
+
+VdjModel simple;
+
+simpleCoeffs
+{
+ V0 V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
+ a a [ 0 0 0 0 0 0 0 ] 285.84;
+ a1 a1 [ 0 0 0 0 0 0 0 ] 0;
+ alphaMin alphaMin [ 0 0 0 0 0 0 0 ] 0;
+}
+
+generalCoeffs
+{
+ V0 V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.0018 0 );
+ a a [ 0 0 0 0 0 0 0 ] 1e-05;
+ a1 a1 [ 0 0 0 0 0 0 0 ] 0.1;
+ alphaMin alphaMin [ 0 0 0 0 0 0 0 ] 2e-05;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/dahl/system/controlDict
similarity index 92%
rename from tutorials/settlingFoam/dahl/system/controlDict
rename to tutorials/multiphase/settlingFoam/dahl/system/controlDict
index 7b2093120b87fed8c8d2c2ea24d24331d2f63597..e4ca7a80493988339ac0e316a0f75f5cc0aeb6bd 100644
--- a/tutorials/settlingFoam/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/dahl/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/system/fvSchemes b/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes
similarity index 91%
rename from tutorials/settlingFoam/tank3D/system/fvSchemes
rename to tutorials/multiphase/settlingFoam/dahl/system/fvSchemes
index 0eb0bf6badc3d7a3b2a7d5e403455a0130e840b0..bf1fbc9a82cc67cf7726cc6eae00880cd4306060 100644
--- a/tutorials/settlingFoam/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/settlingFoam/dahl/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -57,7 +58,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/dahl/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..04bab7f93fdbb7238f45b4b8228be622ee02ebc0
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/dahl/system/fvSolution
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ Alpha
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/0/U b/tutorials/multiphase/settlingFoam/tank3D/0/U
similarity index 100%
rename from tutorials/settlingFoam/tank3D/0/U
rename to tutorials/multiphase/settlingFoam/tank3D/0/U
diff --git a/tutorials/settlingFoam/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/tank3D/0/alpha
similarity index 100%
rename from tutorials/settlingFoam/tank3D/0/alpha
rename to tutorials/multiphase/settlingFoam/tank3D/0/alpha
diff --git a/tutorials/settlingFoam/tank3D/0/epsilon b/tutorials/multiphase/settlingFoam/tank3D/0/epsilon
similarity index 100%
rename from tutorials/settlingFoam/tank3D/0/epsilon
rename to tutorials/multiphase/settlingFoam/tank3D/0/epsilon
diff --git a/tutorials/settlingFoam/tank3D/0/k b/tutorials/multiphase/settlingFoam/tank3D/0/k
similarity index 100%
rename from tutorials/settlingFoam/tank3D/0/k
rename to tutorials/multiphase/settlingFoam/tank3D/0/k
diff --git a/tutorials/settlingFoam/tank3D/0/p b/tutorials/multiphase/settlingFoam/tank3D/0/p
similarity index 100%
rename from tutorials/settlingFoam/tank3D/0/p
rename to tutorials/multiphase/settlingFoam/tank3D/0/p
diff --git a/tutorials/simpleFoam/airFoil2D/Allclean b/tutorials/multiphase/settlingFoam/tank3D/Allclean
similarity index 100%
rename from tutorials/simpleFoam/airFoil2D/Allclean
rename to tutorials/multiphase/settlingFoam/tank3D/Allclean
diff --git a/tutorials/settlingFoam/tank3D/Allrun b/tutorials/multiphase/settlingFoam/tank3D/Allrun
similarity index 100%
rename from tutorials/settlingFoam/tank3D/Allrun
rename to tutorials/multiphase/settlingFoam/tank3D/Allrun
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties b/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a19f0292e20c63566acdb0e9a8dd8bb9a1ff4589
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/tank3D/constant/RASProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- 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 "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel kEpsilon;
+
+turbulence on;
+
+printCoeffs on;
+
+laminarCoeffs
+{
+}
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 0.85;
+ alphak 1;
+ alphaEps 0.76923;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..938322374a12738e1c9fd6b846c4b8187e6177df
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/tank3D/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- 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 "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/settlingFoam/tank3D/constant/polyMesh/boundary
rename to tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/boundary
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/cells.gz b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/cells.gz
new file mode 100644
index 0000000000000000000000000000000000000000..24502150fa84e42595a7bcc6bb4186dc60ff78af
Binary files /dev/null and b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/cells.gz differ
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/faces.gz b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/faces.gz
new file mode 100644
index 0000000000000000000000000000000000000000..f3128af86b4107a2b258540d697dfe1f5a5bea25
Binary files /dev/null and b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/faces.gz differ
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/neighbour.gz b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/neighbour.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ac50368238da84d7235b9865d21ff672fa37a472
Binary files /dev/null and b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/neighbour.gz differ
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/owner.gz b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/owner.gz
new file mode 100644
index 0000000000000000000000000000000000000000..740055841e59021ec14a89e05d9c674b00d829af
Binary files /dev/null and b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/owner.gz differ
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/points.gz b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/points.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2b3d5650453edeead430211ea93d48b937b80230
Binary files /dev/null and b/tutorials/multiphase/settlingFoam/tank3D/constant/polyMesh/points.gz differ
diff --git a/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties b/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..559067579f0557be925920f8b6d4a783926a1b7a
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/tank3D/constant/transportProperties
@@ -0,0 +1,55 @@
+/*--------------------------------*- 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 "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+muc muc [ 1 -1 -1 0 0 0 0 ] 0.00178;
+
+plasticViscosityCoeff plasticViscosityCoeff [ 1 -1 -1 0 0 0 0 ] 0.00023143;
+
+plasticViscosityExponent plasticViscosityExponent [ 0 0 0 0 0 0 0 ] 0.17926;
+
+BinghamPlastic on;
+
+yieldStressCoeff yieldStressCoeff [ 1 -1 -2 0 0 0 0 ] 5.5469e-07;
+
+yieldStressExponent yieldStressExponent [ 0 0 0 0 0 0 0 ] 95.25;
+
+yieldStressOffset yieldStressOffset [ 0 0 0 0 0 0 0 ] 0;
+
+rhoc rhoc [ 1 -3 0 0 0 0 0 ] 1000;
+
+rhod rhod [ 1 -3 0 0 0 0 0 ] 1042;
+
+VdjModel simple;
+
+simpleCoeffs
+{
+ V0 V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.002198 0 );
+ a a [ 0 0 0 0 0 0 0 ] 8.84;
+ a1 a1 [ 0 0 0 0 0 0 0 ] 0;
+ alphaMin alphaMin [ 0 0 0 0 0 0 0 ] 0;
+}
+
+generalCoeffs
+{
+ V0 V0 [ 0 1 -1 0 0 0 0 ] ( 0 -0.0018 0 );
+ a a [ 0 0 0 0 0 0 0 ] 1e-05;
+ a1 a1 [ 0 0 0 0 0 0 0 ] 0.1;
+ alphaMin alphaMin [ 0 0 0 0 0 0 0 ] 2e-05;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/tank3D/system/controlDict
similarity index 87%
rename from tutorials/settlingFoam/tank3D/system/controlDict
rename to tutorials/multiphase/settlingFoam/tank3D/system/controlDict
index f7c7ecd1d65dbf11ff2c06511f1b752f58f2b183..1adf79151c0e8e126f99987d2ae62fe2a324f030 100644
--- a/tutorials/settlingFoam/tank3D/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/tank3D/system/controlDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,4 +43,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/system/fvSchemes b/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes
similarity index 87%
rename from tutorials/settlingFoam/dahl/system/fvSchemes
rename to tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes
index 0eb0bf6badc3d7a3b2a7d5e403455a0130e840b0..5b0849d52babb4965de36826635f4d3513bac257 100644
--- a/tutorials/settlingFoam/dahl/system/fvSchemes
+++ b/tutorials/multiphase/settlingFoam/tank3D/system/fvSchemes
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -57,7 +58,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..8c14a9fae9f2e4d91e7d31e2053a125c45cff565
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/tank3D/system/fvSolution
@@ -0,0 +1,76 @@
+/*--------------------------------*- 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 fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ U
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ rho
+ {
+ solver PCG;
+ preconditioner DIC;
+ tolerance 1e-07;
+ relTol 0;
+ }
+
+ Alpha
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-07;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/Theta
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/Theta
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/Ua
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ua
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/Ub
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/Ub
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/alpha
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/alpha
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/epsilon
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/epsilon
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/k
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/k
diff --git a/tutorials/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/0/p
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties
new file mode 100644
index 0000000000000000000000000000000000000000..530659456503c852fcdd3b45b7f60d014b64063f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+turbulence on;
+
+printCoeffs on;
+
+kEpsilonCoeffs
+{
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.375;
+ alphak 1;
+ alphaEps 0.82142;
+}
+
+wallFunctionCoeffs
+{
+ kappa 0.4187;
+ E 9;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..d1abb1921fca674416ed8e44ebca7cd1c9d3cbd3
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 ] ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties
new file mode 100644
index 0000000000000000000000000000000000000000..2c236c7d44fd299e3f7952394e625ba719646891
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object filterProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+filter off;
+
+filterNormal ( 0 0 1 );
+
+filterPosition filterPosition [ 0 1 0 0 0 ] ( 0 0 0.02 );
+
+filterThickness filterThickness [ 0 1 0 0 0 ] 1e-06;
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties
similarity index 77%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties
index 9c1430c9f1fe540fe6c44a74ddce9eadc7d6f37e..800dbd9adc92424ffac797e042ee3ce0b796f855 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties
@@ -2,21 +2,24 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "constant";
object interfacialProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dragModela SchillerNaumann;
-dragModelb SchillerNaumann;
+dragModela GidaspowSchillerNaumann;
+
+dragModelb GidaspowSchillerNaumann;
+
+dragPhase a;
-dragPhase blended;
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
new file mode 100644
index 0000000000000000000000000000000000000000..ba6ef530f14039ac0b8ee2485cdcc3c89c2e39a3
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object kineticTheoryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+kineticTheory off;
+
+equilibrium on;
+
+e e [ 0 0 0 0 0 0 0 ] 0.9;
+
+alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
+
+alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
+
+Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
+
+eta eta [ 0 0 0 0 0 0 0 ] 2;
+
+p p [ 0 0 0 0 0 0 0 ] 5;
+
+phi phi [ 0 0 0 0 0 0 0 ] 25;
+
+viscosityModel Syamlal;
+
+conductivityModel HrenyaSinclair;
+
+granularPressureModel Lun;
+
+frictionalStressModel JohnsonJackson;
+
+radialModel Gidaspow;
+
+HrenyaSinclairCoeffs
+{
+ L L [ 0 1 0 0 0 0 0 ] 0.0005;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/blockMeshDict
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties
similarity index 75%
rename from tutorials/twoPhaseEulerFoam/bed2/constant/ppProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties
index 1a484d0b9ce82f096aedff643d43bdcebd627c7e..73ff7f8d0920b41cd9ebcc416516ad60fed9071e 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/ppProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties
@@ -2,26 +2,28 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "constant";
object ppProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-preAlphaExp 500;
+preAlphaExp 500;
-expMax 1.0e+3;
+expMax 1000;
-alphaMax 0.62;
+alphaMax 0.6;
-g0 g0 [ 1 -1 -2 0 0 0 0 ] 0 ;
+g0 g0 [ 1 -1 -2 0 0 0 0 ] 1000;
+
+packingLimiter no;
-packingLimiter no;
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..9a08405bdb3ac65e961d519368750c72b7fb3eba
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phasea
+{
+ rho rho [ 1 -3 0 0 0 ] 2640;
+ nu nu [ 0 2 -1 0 0 ] 1e-06;
+ d d [ 0 1 0 0 0 0 0 ] 0.00048;
+}
+
+phaseb
+{
+ rho rho [ 1 -3 0 0 0 ] 1.28;
+ nu nu [ 0 2 -1 0 0 ] 1.328e-05;
+ d d [ 0 1 0 0 0 0 0 ] 1;
+}
+
+Cvm Cvm [ 0 0 0 0 0 ] 0;
+
+Cl Cl [ 0 0 0 0 0 ] 0;
+
+Ct Ct [ 0 0 0 0 0 ] 0;
+
+alphaAlpha alphaAlpha [ 0 0 0 0 0 ] 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
similarity index 63%
rename from tutorials/twoPhaseEulerFoam/bed/system/controlDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 026a5ed2a4e4b19322ba7bbe6c32418ebb797ff2..766cb8759599c14c35ac8a001d02aeeeb71684aa 100644
--- a/tutorials/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -2,19 +2,19 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -23,7 +23,7 @@ stopAt endTime;
endTime 10;
-deltaT 1e-3;
+deltaT 0.001;
writeControl adjustableRunTime;
@@ -41,53 +41,50 @@ timeFormat general;
timePrecision 6;
-runTimeModifiable on;
+runTimeModifiable on;
adjustTimeStep yes;
maxCo 0.5;
-maxDeltaT 1;
+maxDeltaT 1;
functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
- // Fields to be averaged - runTime modifiable
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
+ outputControl outputTime;
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
);
+
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
similarity index 89%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
index 520b6d769f8b35b9fd95dd6919c23ed104f69079..1e881ca7e568902f1f3448eb5b67053c9c2fce3a 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes
@@ -2,21 +2,22 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -29,7 +30,7 @@ divSchemes
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
- div(phib,k) Gauss limitedLinear 1;
+ div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
@@ -45,8 +46,8 @@ laplacianSchemes
laplacian(nuEffb,Ub) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaPpMag,alpha) Gauss linear corrected;
- laplacian((alphak*nuEffb),k) Gauss linear corrected;
laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected;
+ laplacian((alphak*nuEffb),k) Gauss linear corrected;
}
interpolationSchemes
@@ -62,7 +63,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..7b4017d70c84517fc1c1633f02e3b743e01d1c41
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSolution
@@ -0,0 +1,103 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ Ua
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Ub
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ alpha
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ beta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ Theta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 2;
+ correctAlpha yes;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/Theta
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/Ua
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/Ub
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/alpha
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/alpha
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/epsilon
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/k
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k
diff --git a/tutorials/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/0/p
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties
similarity index 70%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties
index 63f3e2fac1193adda3d64a41d37f66a9b72f92c7..803255b5a016ac955f309243d387795460ff0030 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,29 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel kEpsilon;
+turbulence on;
-turbulence off;
-
-printCoeffs off;
+printCoeffs on;
kEpsilonCoeffs
{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ C3 -0.375;
+ alphak 1;
+ alphaEps 0.82142;
}
wallFunctionCoeffs
{
- kappa 0.4187;
- E 9;
+ kappa 0.4187;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/XiFoam/moriyoshiHomogeneous/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
similarity index 84%
rename from tutorials/XiFoam/moriyoshiHomogeneous/constant/environmentalProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
index ca80af21ee6180ad2667f0efe40c92ac5df7ee7a..6a8eb74fb89ac0cc0bb440deb759d62087efe497 100644
--- a/tutorials/XiFoam/moriyoshiHomogeneous/constant/environmentalProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,10 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object environmentalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 0);
+g g [ 0 1 -2 0 0 ] ( 0 -9.81 0 );
+
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties
similarity index 72%
rename from tutorials/cavitatingFoam/les/throttle/system/refineMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties
index 12b021090d69400d48f6bbf58b910e002a9d80da..2ab1a87e808dd7a2ad1297964fc18d01df6a2743 100644
--- a/tutorials/cavitatingFoam/les/throttle/system/refineMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/filterProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object refineMeshDict;
+ location "constant";
+ object filterProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-set c0;
+filter off;
-coordinateSystem global;
+filterNormal ( 0 0 1 );
-globalCoeffs
-{
- tan1 (1 0 0);
- tan2 (0 1 0);
-}
-
-directions
-(
- tan1
- tan2
-);
-
-useHexTopology yes;
+filterPosition filterPosition [ 0 1 0 0 0 ] ( 0 0 0.02 );
-geometricCut no;
+filterThickness filterThickness [ 0 1 0 0 0 ] 1e-06;
-writeMesh no;
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties
similarity index 90%
rename from tutorials/twoPhaseEulerFoam/bed2/constant/interfacialProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties
index e321ce4023dfdae0f079b4aa3db7cf74b09926e0..8b6c5044c944f19c6e642e7c382cbb80c3731b26 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/interfacialProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/interfacialProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object interfacialProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dragModela GidaspowErgunWenYu;
+
dragModelb GidaspowErgunWenYu;
dragPhase a;
+
// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
similarity index 51%
rename from tutorials/cavitatingFoam/ras/throttle/system/controlDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
index 04b11dbad0dd36b9db7faa1a4201e085b5450be6..cd52e8b208e6984a7ec4cd0d6aa2ff6c187e4263 100644
--- a/tutorials/cavitatingFoam/ras/throttle/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,40 +10,43 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object controlDict;
+ location "constant";
+ object kineticTheoryProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-startFrom latestTime;
+kineticTheory on;
-startTime 0;
+equilibrium on;
-stopAt endTime;
+e e [ 0 0 0 0 0 0 0 ] 0.8;
-endTime 2e-3;
+alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62;
-deltaT 1e-8;
+alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65;
-writeControl adjustableRunTime;
+Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
-writeInterval 1e-4;
+eta eta [ 0 0 0 0 0 0 0 ] 2;
-purgeWrite 0;
+p p [ 0 0 0 0 0 0 0 ] 5;
-writeFormat ascii;
+phi phi [ 0 0 0 0 0 0 0 ] 0;
-writePrecision 6;
+viscosityModel Gidaspow;
-writeCompression uncompressed;
+conductivityModel Gidaspow;
-timeFormat general;
+granularPressureModel Lun;
-runTimeModifiable yes;
+frictionalStressModel JohnsonJackson;
-adjustTimeStep on;
+radialModel Gidaspow;
-maxCo 0.5;
+HrenyaSinclairCoeffs
+{
+ L L [ 0 1 0 0 0 0 0 ] 0.0005;
+}
-maxAcousticCo 50.0;
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/blockMeshDict
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
similarity index 95%
rename from tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
index e2e0e3a9f23e9f26addc8bba6e079d4e67c0de81..a861e9875c9bd40ca9e83718ce5708062aa4f382 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev-8cbffd16687e |
+| \\ / O peration | Version: 1.5-8cbffd16687e |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties
similarity index 77%
rename from tutorials/twoPhaseEulerFoam/bed/constant/ppProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties
index 67edcc1047c477b4ccbb221232599ba08f0291c2..cb6ac970f0fd55b306efc58eb2bcbd18721e8e6b 100644
--- a/tutorials/twoPhaseEulerFoam/bed/constant/ppProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/ppProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object ppProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-preAlphaExp 500;
+preAlphaExp 500;
-expMax 1.0e+3;
+expMax 1000;
-alphaMax 0.6;
+alphaMax 0.62;
-g0 g0 [1 -1 -2 0 0 0 0 ] 1000 ;
+g0 g0 [ 1 -1 -2 0 0 0 0 ] 0;
+
+packingLimiter no;
-packingLimiter no;
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
new file mode 100644
index 0000000000000000000000000000000000000000..c58d767175b91be126623ce99c1ddae7e9c06adf
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/transportProperties
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phasea
+{
+ rho rho [ 1 -3 0 0 0 ] 2500;
+ nu nu [ 0 2 -1 0 0 ] 1e-06;
+ d d [ 0 1 0 0 0 0 0 ] 0.0003;
+}
+
+phaseb
+{
+ rho rho [ 1 -3 0 0 0 ] 1.2;
+ nu nu [ 0 2 -1 0 0 ] 1.5e-05;
+ d d [ 0 1 0 0 0 0 0 ] 1;
+}
+
+Cvm Cvm [ 0 0 0 0 0 ] 0;
+
+Cl Cl [ 0 0 0 0 0 ] 0;
+
+Ct Ct [ 0 0 0 0 0 ] 0;
+
+alphaAlpha alphaAlpha [ 0 0 0 0 0 ] 0;
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
similarity index 64%
rename from tutorials/twoPhaseEulerFoam/bed2/system/controlDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index df4a5a205e8138e14ff465ba229bbd829e1f8478..e4d35359ada3e29b1e1dc0d7db8658c0664278dc 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom latestTime;
startTime 0;
@@ -23,7 +23,7 @@ stopAt endTime;
endTime 2;
-deltaT 5e-4;
+deltaT 0.0005;
writeControl adjustableRunTime;
@@ -47,46 +47,40 @@ adjustTimeStep no;
maxCo 0.9;
-maxDeltaT 1e-5;
+maxDeltaT 1e-05;
functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
- outputControl outputTime;
-
- // Fields to be averaged - runTime modifiable
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
+ outputControl outputTime;
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
similarity index 85%
rename from tutorials/twoPhaseEulerFoam/bed2/system/fvSchemes
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
index e175e1530e1a54352771efd1782535f783711a68..d007d55f784a4b6daad339d280ddc3c25a47e786 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
- default Euler;
+ default Euler;
}
gradSchemes
@@ -29,13 +30,13 @@ divSchemes
default none;
div(phia,Ua) Gauss limitedLinearV 1;
div(phib,Ub) Gauss limitedLinearV 1;
- div(phib,k) Gauss limitedLinear 1;
+ div(phib,k) Gauss limitedLinear 1;
div(phib,epsilon) Gauss limitedLinear 1;
div(phi,alpha) Gauss limitedLinear01 1;
div(phir,alpha) Gauss limitedLinear01 1;
- div(phi,Theta) Gauss limitedLinear 1;
- div(Rca) Gauss linear;
- div(Rcb) Gauss linear;
+ div(phi,Theta) Gauss limitedLinear 1;
+ div(Rca) Gauss linear;
+ div(Rcb) Gauss linear;
}
laplacianSchemes
@@ -64,7 +65,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..3c5f789ef5988943e2d3af12fa54288198e49e08
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/fvSolution
@@ -0,0 +1,114 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ Ua
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Ub
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ alpha
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ beta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ Theta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 2;
+ correctAlpha yes;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+relaxationFactors
+{
+ Ua 1;
+ Ub 1;
+ alpha 1;
+ beta 1;
+ Theta 1;
+ k 1;
+ epsilon 1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict
similarity index 73%
rename from tutorials/twoPhaseEulerFoam/bed2/system/setFieldsDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict
index 6ea881e1f610336cbfe8af534c684cfdeadb8578..a25df870f69f806af3e1da2d519c3f9da9be5202 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/setFieldsDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,26 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object setFieldsDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-defaultFieldValues
-(
- volScalarFieldValue alpha 0.0
-);
+defaultFieldValues ( volScalarFieldValue alpha 0 );
-regions
-(
- boxToCell
- {
- box (0 0 -0.1) (0.15 0.5 0.1);
+regions ( boxToCell { box ( 0 0 -0.1 ) ( 0.15 0.5 0.1 ) ; fieldValues ( volScalarFieldValue alpha 0.55 ) ; } );
- fieldValues
- (
- volScalarFieldValue alpha 0.55
- );
- }
-);
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/Theta
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Theta
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/Ua
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ua
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/Ub
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/Ub
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/alpha b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/alpha
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/alpha
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/epsilon
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/epsilon
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/k
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/k
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/0/p
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
diff --git a/tutorials/settlingFoam/dahl/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
similarity index 68%
rename from tutorials/settlingFoam/dahl/constant/RASProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
index 808b6f2aea1bf05ecdb24185abb8fc89d544d5ab..b84915eafc5afd9f32c3e7585564fb023a24c077 100644
--- a/tutorials/settlingFoam/dahl/constant/RASProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/RASProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,34 +10,31 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object RASProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-RASModel kEpsilon;
+RASModel kEpsilon;
-turbulence on;
+turbulence off;
-printCoeffs on;
-
-laminarCoeffs
-{
-}
+printCoeffs off;
kEpsilonCoeffs
{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 0.85;
- alphak 1;
- alphaEps 0.76923;
+ Cmu 0.09;
+ C1 1.44;
+ C2 1.92;
+ alphak 1;
+ alphaEps 0.76923;
}
wallFunctionCoeffs
{
- kappa 0.4187;
- E 9;
+ kappa 0.4187;
+ E 9;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..a866ff549fd799e63d2d6946a66cf3da14d092bd
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
similarity index 80%
rename from tutorials/twoPhaseEulerFoam/bed/constant/interfacialProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
index c7f7b93365c8abe3df07baad21968fcc1ba5712a..28e9538668fea1158a209296e3d8e512bcd60950 100644
--- a/tutorials/twoPhaseEulerFoam/bed/constant/interfacialProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/interfacialProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,16 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object interfacialProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dragModela GidaspowSchillerNaumann;
-dragModelb GidaspowSchillerNaumann;
+dragModela SchillerNaumann;
+
+dragModelb SchillerNaumann;
+
+dragPhase blended;
-dragPhase a;
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
new file mode 100644
index 0000000000000000000000000000000000000000..3ac1fd2b3048ffa48740d38b7a75f2a3293184eb
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object kineticTheoryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+kineticTheory off;
+
+equilibrium on;
+
+e e [ 0 0 0 0 0 0 0 ] 0.9;
+
+alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6;
+
+alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5;
+
+Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05;
+
+eta eta [ 0 0 0 0 0 0 0 ] 2;
+
+p p [ 0 0 0 0 0 0 0 ] 5;
+
+phi phi [ 0 0 0 0 0 0 0 ] 25;
+
+viscosityModel Syamlal;
+
+conductivityModel HrenyaSinclair;
+
+granularPressureModel Lun;
+
+frictionalStressModel JohnsonJackson;
+
+radialModel Gidaspow;
+
+HrenyaSinclairCoeffs
+{
+ L L [ 0 1 0 0 0 0 0 ] 0.0005;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
similarity index 78%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
index 9829a5d8d020387d58c05de5bb4a8aadbea626da..30e82b6435c681b947c3578f7846566ddc41dd88 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/ppProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,18 +10,20 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object ppProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-preAlphaExp 300;
+preAlphaExp 300;
-expMax 10.0;
+expMax 10;
-alphaMax 0.6;
+alphaMax 0.6;
-g0 g0 [ 1 -1 -2 0 0 0 0 ] 0 ;
+g0 g0 [ 1 -1 -2 0 0 0 0 ] 0;
+
+packingLimiter off;
-packingLimiter off;
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
similarity index 61%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
index a8b0138b70e506305ea0df45fbf596908546b6ab..fbea88e14421d00668501673102c81b1b1f591f1 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,30 +10,30 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// water
phaseb
{
- nu nu [0 2 -1 0 0 0 0] 1.0e-06;
- rho rho [1 -3 0 0 0 0 0] 1000.0;
- d d [0 1 0 0 0 0 0] 0.0001;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+ d d [ 0 1 0 0 0 0 0 ] 0.0001;
}
-// air
phasea
{
- nu nu [0 2 -1 0 0 0 0] 1.6e-05;
- rho rho [1 -3 0 0 0 0 0] 1.0;
- d d [0 1 0 0 0 0 0] 0.003;
+ nu nu [ 0 2 -1 0 0 0 0 ] 1.6e-05;
+ rho rho [ 1 -3 0 0 0 0 0 ] 1;
+ d d [ 0 1 0 0 0 0 0 ] 0.003;
}
-Cvm Cvm [0 0 0 0 0 0 0] 0.5;
+Cvm Cvm [ 0 0 0 0 0 0 0 ] 0.5;
-Cl Cl [0 0 0 0 0 0 0] 0;
+Cl Cl [ 0 0 0 0 0 0 0 ] 0;
+
+Ct Ct [ 0 0 0 0 0 0 0 ] 1;
-Ct Ct [0 0 0 0 0 0 0] 1.0;
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
similarity index 64%
rename from tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index c2e280e5dc8b2c2fda7c06bb32dad2889a449fbd..d0f78bb5059ae0162712f1cc913a6ad02608881d 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -43,48 +43,44 @@ timePrecision 6;
runTimeModifiable yes;
-adjustTimeStep no;
+adjustTimeStep no;
-maxCo 0.5;
+maxCo 0.5;
-maxDeltaT 1;
+maxDeltaT 1;
functions
(
fieldAverage1
{
- // Type of functionObject
type fieldAverage;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libfieldFunctionObjects.so");
-
- // Fields to be averaged - runTime modifiable
+ functionObjectLibs ( "libfieldFunctionObjects.so" );
+ outputControl outputTime;
fields
(
Ua
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
Ub
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
alpha
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
p
{
- mean on;
- prime2Mean off;
- base time;
+ mean on;
+ prime2Mean off;
+ base time;
}
);
}
diff --git a/tutorials/twoPhaseEulerFoam/bed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
similarity index 94%
rename from tutorials/twoPhaseEulerFoam/bed/system/fvSchemes
rename to tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
index e9a33d28eea7c8f77a2103c5c983139c0082ab9a..ab97d5edfd6479b251fba71422949278ef5212db 100644
--- a/tutorials/twoPhaseEulerFoam/bed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,8 +46,8 @@ laplacianSchemes
laplacian(nuEffb,Ub) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
laplacian(alphaPpMag,alpha) Gauss linear corrected;
- laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected;
laplacian((alphak*nuEffb),k) Gauss linear corrected;
+ laplacian((alphaEps*nuEffb),epsilon) Gauss linear corrected;
}
interpolationSchemes
@@ -62,7 +63,8 @@ snGradSchemes
fluxRequired
{
default no;
- p;
+ p ;
}
+
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
new file mode 100644
index 0000000000000000000000000000000000000000..2bc97a6bde222c607741bfb736988f0392a9a7e7
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
@@ -0,0 +1,103 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+ p
+ {
+ solver GAMG;
+ tolerance 1e-08;
+ relTol 0;
+ smoother DIC;
+ nPreSweeps 0;
+ nPostSweeps 2;
+ nFinestSweeps 2;
+ cacheAgglomeration true;
+ nCellsInCoarsestLevel 10;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
+
+ Ua
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ Ub
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ alpha
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ beta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-10;
+ relTol 0;
+ }
+
+ Theta
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ k
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+
+ epsilon
+ {
+ solver PBiCG;
+ preconditioner DILU;
+ tolerance 1e-05;
+ relTol 0;
+ }
+}
+
+PISO
+{
+ nCorrectors 2;
+ nNonOrthogonalCorrectors 0;
+ nAlphaCorr 2;
+ correctAlpha no;
+ pRefCell 0;
+ pRefValue 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz b/tutorials/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz
deleted file mode 100644
index 31adad952e844b111b333a99dde33c8526515d6c..0000000000000000000000000000000000000000
Binary files a/tutorials/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz and /dev/null differ
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz b/tutorials/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz
deleted file mode 100644
index 9a00803de5076734e3004994938dd844e9e67365..0000000000000000000000000000000000000000
Binary files a/tutorials/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz and /dev/null differ
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphaseInterFoam/damBreak4phase/constant/transportProperties
deleted file mode 100644
index a9fcefae0da32bf947798edd7ea30cf4c03c26d6..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phase/constant/transportProperties
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phases
-(
- water
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 1000;
- }
-
- oil
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 500;
- }
-
- mercury
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 0.1125e-06;
- rho rho [1 -3 0 0 0 0 0] 13529;
- }
-
- air
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
- }
-);
-
-refPhase air;
-
-sigmas
-(
- (air water) 0.07
- (air oil) 0.07
- (air mercury) 0.07
- (water oil) 0.07
- (water mercury) 0.07
- (oil mercury) 0.07
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSolution b/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSolution
deleted file mode 100644
index 78c0ce45be48f991e7951028f48b16b9b0712b3b..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phase/system/fvSolution
+++ /dev/null
@@ -1,102 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration off;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 2;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-7;
- relTol 0.05;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration on;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-7;
- relTol 0;
-
- nVcycles 2;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration on;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-7;
- relTol 0;
- maxIter 20;
- };
-
- alpha smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-8;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- nCorrectors 4;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 4;
- nAlphaSubCycles 4;
- cycleAlpha yes;
- cAlpha 4;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz b/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz
deleted file mode 100644
index 6453a0d982a113f7bc9d762741d6959824aae3bd..0000000000000000000000000000000000000000
Binary files a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz and /dev/null differ
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz b/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz
deleted file mode 100644
index 32e8c0015a4e4735b3242dd2249e4ade10ce2207..0000000000000000000000000000000000000000
Binary files a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz and /dev/null differ
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
deleted file mode 100644
index aed2dc205528b9a48175e0f52e129fa9eefefbf3..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class polyBoundaryMesh;
- object boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-leftWall
-{
- type wall;
- nFaces 195;
- startFace 68014;
-}
-
-rightWall
-{
- type wall;
- nFaces 195;
- startFace 68209;
-}
-
-lowerWall
-{
- type wall;
- nFaces 206;
- startFace 68404;
-}
-
-atmosphere
-{
- type patch;
- nFaces 176;
- startFace 68610;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 68400;
- startFace 68786;
-}
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
deleted file mode 100644
index a9fcefae0da32bf947798edd7ea30cf4c03c26d6..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-phases
-(
- water
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 1000;
- }
-
- oil
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1e-06;
- rho rho [1 -3 0 0 0 0 0] 500;
- }
-
- mercury
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 0.1125e-06;
- rho rho [1 -3 0 0 0 0 0] 13529;
- }
-
- air
- {
- transportModel Newtonian;
- nu nu [0 2 -1 0 0 0 0] 1.48e-05;
- rho rho [1 -3 0 0 0 0 0] 1;
- }
-);
-
-refPhase air;
-
-sigmas
-(
- (air water) 0.07
- (air oil) 0.07
- (air mercury) 0.07
- (water oil) 0.07
- (water mercury) 0.07
- (oil mercury) 0.07
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
deleted file mode 100644
index cf0067afd3c7bf4315a46cf427fc9aa763511c0f..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 4;
-
-method simple;
-
-simpleCoeffs
-{
- n (2 2 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (1 1 1);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
-}
-
-manualCoeffs
-{
- dataFile "";
-}
-
-distributed no;
-
-roots
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
deleted file mode 100644
index 78c0ce45be48f991e7951028f48b16b9b0712b3b..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
+++ /dev/null
@@ -1,102 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration off;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 2;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd GAMG
- {
- tolerance 1e-7;
- relTol 0.05;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration on;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- pdFinal PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-7;
- relTol 0;
-
- nVcycles 2;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration on;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- tolerance 1e-7;
- relTol 0;
- maxIter 20;
- };
-
- alpha smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-8;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- nCorrectors 4;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 4;
- nAlphaSubCycles 4;
- cycleAlpha yes;
- cAlpha 4;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par b/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par
deleted file mode 100644
index 2e036f4cadc52687aaf8496a23feb6c7df290ab0..0000000000000000000000000000000000000000
--- a/tutorials/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- pcorr PCG
- {
- preconditioner GAMG
- {
- tolerance 1e-5;
- relTol 0;
-
- smoother GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nBottomSweeps 2;
-
- cacheAgglomeration off;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 2;
- };
-
- tolerance 1e-5;
- relTol 0;
- maxIter 100;
- };
-
- pd PCG
- {
- preconditioner DIC;
- tolerance 1e-7;
- relTol 0.05;
- };
-
- pdFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-7;
- relTol 0;
- };
-
- alpha smoothSolver
- {
- smoother GaussSeidel;
- tolerance 1e-8;
- relTol 0;
- nSweeps 1;
- };
-}
-
-PISO
-{
- nCorrectors 4;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 4;
- nAlphaSubCycles 4;
- cycleAlpha yes;
- cAlpha 4;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pimpleFoam/t-junction/constant/RASProperties b/tutorials/pimpleFoam/t-junction/constant/RASProperties
deleted file mode 100644
index e46e0a858b12c777bb11bc364b144cd6feb2b1da..0000000000000000000000000000000000000000
--- a/tutorials/pimpleFoam/t-junction/constant/RASProperties
+++ /dev/null
@@ -1,200 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-realizableKECoeffs
-{
- Cmu 0.09;
- A0 4.0;
- C2 1.9;
- alphak 1;
- alphaEps 0.833333;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pimpleFoam/t-junction/system/controlDict b/tutorials/pimpleFoam/t-junction/system/controlDict
deleted file mode 100644
index ca979c4a6b9dea96ecead463ee5c8b5067bac38a..0000000000000000000000000000000000000000
--- a/tutorials/pimpleFoam/t-junction/system/controlDict
+++ /dev/null
@@ -1,81 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 1;
-
-deltaT 0.001;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.1;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep yes;
-maxCo 5;
-
-functions
-(
- probes
- {
- // Type of functionObject
- type probes;
-
- // Where to load it from (if not already in solver)
- functionObjectLibs ("libsampling.so");
-
- // Name of the directory for the probe data
- name probes;
-
- // Locations to be probed. runTime modifiable!
- probeLocations
- (
- (1E-6 0 0.01) // at inlet
- (0.21 -0.20999 0.01) // at outlet1
- (0.21 0.20999 0.01) // at outlet2
- (0.21 0 0.01) // at central block
- );
-
- // Fields to be probed. runTime modifiable!
- fields
- (
- p
- U
- );
- }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDaily/system/fvSolution b/tutorials/pisoFoam/les/pitzDaily/system/fvSolution
deleted file mode 100644
index f2a22c6fa4d443d2f63237158eda0baf0a069919..0000000000000000000000000000000000000000
--- a/tutorials/pisoFoam/les/pitzDaily/system/fvSolution
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.05;
- };
- pFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties b/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
deleted file mode 100644
index 336220cfbb49c0b792f2e7ec104a60ca04ad55ad..0000000000000000000000000000000000000000
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
+++ /dev/null
@@ -1,178 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulence on;
-
-LESModel oneEqEddy;
-
-delta cubeRootVol;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-oneEqEddyCoeffs
-{
- ck 0.07;
- ce 1.05;
-}
-
-dynOneEqEddyCoeffs
-{
- ce 1.05;
- filter simple;
-}
-
-locDynOneEqEddyCoeffs
-{
- ce 1.05;
- filter simple;
-}
-
-SmagorinskyCoeffs
-{
- ce 1.05;
- ck 0.07;
-}
-
-Smagorinsky2Coeffs
-{
- ce 1.05;
- ck 0.07;
- cD2 0.02;
-}
-
-spectEddyViscCoeffs
-{
- ce 1.05;
- cB 8.22;
- cK1 0.83;
- cK2 1.03;
- cK3 4.75;
- cK4 2.55;
-}
-
-dynSmagorinskyCoeffs
-{
- ce 1.05;
- filter simple;
-}
-
-mixedSmagorinskyCoeffs
-{
- ce 1.05;
- ck 0.07;
- filter simple;
-}
-
-dynMixedSmagorinskyCoeffs
-{
- ce 1.05;
- filter simple;
-}
-
-LRRDiffStressCoeffs
-{
- ce 1.05;
- ck 0.09;
- c1 1.8;
- c2 0.6;
-}
-
-DeardorffDiffStressCoeffs
-{
- ce 1.05;
- ck 0.09;
- cm 4.13;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
- CDES 0.65;
- ck 0.07;
-}
-
-cubeRootVolCoeffs
-{
- deltaCoeff 1;
-}
-
-PrandtlCoeffs
-{
- delta cubeRootVol;
- cubeRootVolCoeffs
- {
- deltaCoeff 1;
- }
- smoothCoeffs
- {
- delta cubeRootVol;
- cubeRootVolCoeffs
- {
- deltaCoeff 1;
- }
- maxDeltaRatio 1.1;
- }
- Cdelta 0.158;
-}
-
-vanDriestCoeffs
-{
- delta cubeRootVol;
- cubeRootVolCoeffs
- {
- deltaCoeff 1;
- }
- smoothCoeffs
- {
- delta cubeRootVol;
- cubeRootVolCoeffs
- {
- deltaCoeff 1;
- }
- maxDeltaRatio 1.1;
- }
- Aplus 26;
- Cdelta 0.158;
-}
-
-smoothCoeffs
-{
- delta cubeRootVol;
- cubeRootVolCoeffs
- {
- deltaCoeff 1;
- }
- maxDeltaRatio 1.1;
-}
-
-kappa 0.4187;
-
-wallFunctionCoeffs
-{
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution b/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
deleted file mode 100644
index f2a22c6fa4d443d2f63237158eda0baf0a069919..0000000000000000000000000000000000000000
--- a/tutorials/pisoFoam/les/pitzDailyDirectMapped/system/fvSolution
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.05;
- };
- pFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/constant/RASProperties b/tutorials/pisoFoam/ras/cavity/constant/RASProperties
deleted file mode 100644
index e46e0a858b12c777bb11bc364b144cd6feb2b1da..0000000000000000000000000000000000000000
--- a/tutorials/pisoFoam/ras/cavity/constant/RASProperties
+++ /dev/null
@@ -1,200 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-realizableKECoeffs
-{
- Cmu 0.09;
- A0 4.0;
- C2 1.9;
- alphak 1;
- alphaEps 0.833333;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/constant/transportProperties b/tutorials/pisoFoam/ras/cavity/constant/transportProperties
deleted file mode 100644
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..0000000000000000000000000000000000000000
--- a/tutorials/pisoFoam/ras/cavity/constant/transportProperties
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-transportModel Newtonian;
-
-nu nu [0 2 -1 0 0 0 0] 1e-05;
-
-CrossPowerLawCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-BirdCarreauCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/pisoFoam/ras/cavity/system/fvSolution b/tutorials/pisoFoam/ras/cavity/system/fvSolution
deleted file mode 100644
index 0da9f4a3b69b072a2c8a103884a0777a1e05effd..0000000000000000000000000000000000000000
--- a/tutorials/pisoFoam/ras/cavity/system/fvSolution
+++ /dev/null
@@ -1,71 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.1;
- };
- pFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- pRefCell 0;
- pRefValue 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict b/tutorials/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
deleted file mode 100644
index 136e30e842934411390dfbfdf320947543e3ed2d..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/decomposeParDict
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 8;
-//numberOfSubdomains 16;
-
-method simple;
-
-simpleCoeffs
-{
- n (8 1 1);
-// n (16 1 1);
- delta 0.001;
-}
-
-hierarchicalCoeffs
-{
- n (1 1 1);
- delta 0.001;
- order xyz;
-}
-
-metisCoeffs
-{
- processorWeights
- (
- 1
- 1
- 1
- 1
- );
-}
-
-manualCoeffs
-{
- dataFile "";
-}
-
-distributed no;
-
-roots
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/fvSolution b/tutorials/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
deleted file mode 100644
index 2724db01971b9a2a3e0b902c1396d190b6728433..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/fvSolution
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho diagonal {};
- rhoU diagonal {};
- rhoE diagonal {};
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-10;
- relTol 0;
- };
-
- h smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-10
- relTol 0;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/sampleDict b/tutorials/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
deleted file mode 100644
index ac12dd2d470d13603368991d223a1136836b682b..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/LadenburgJet60psi/system/sampleDict
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object sampleDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-interpolationScheme cellPointFace;
-
-writeFormat raw;
-
-sampleSets
-(
- face
- {
- name cone25;
- axis x;
- start ( 0.0 0.0 0.0);
- end ( 92.08087e-03 42.939e-03 0.0);
- nPoints 92;
- }
-
- face
- {
- name cone55;
- axis x;
- start ( 92.08087e-03 42.939e-03 0.0);
- end ( 153.6830e-03 130.92e-03 0.0);
- nPoints 61;
- }
-
- face
- {
- name base;
- axis x;
- start ( 153.6830e-03 130.92e-03 0.0);
- end ( 193.6750e-03 130.92e-03 0.0);
- nPoints 40;
- }
-);
-
-fields
-(
- p
- wallHeatTransRate
-);
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
deleted file mode 100644
index 9aba58cb038b8ccbbf93515944784dd7df4d2639..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Pr Pr [0 0 0 0 0 0 0] 0.72;
-
-thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
-//thermoType hThermo<pureMixture<blottnerTransport<specieThermo<janafThermo<perfectGas>>>>>;
-
-// Replacates constThermo (Cp = const)
-/*
-mixture N2
- 1 28.01348
- 0 10000 1000
- 3.5 0 0 0 0 0 0
- 3.5 0 0 0 0 0 0
-// 3.5 0 0 0 0 -1043.52 0
-// 3.5 0 0 0 0 -1043.52 0
-// 0.0268142 0.3177838 -11.3155513; // Blottner
- 1.458e-06 110; // Sutherland
-*/
-// janafThermo
-
-mixture N2
- 1 28.01348
- 100 10000 1000
- 2.9525407 0.0013968838 -4.9262577e-07 7.8600091e-11 -4.6074978e-15
- -923.93753 5.8718221
- 3.5309628 -0.0001236595 -5.0299339e-07 2.4352768e-09 -1.4087954e-12
- -1046.9637 2.9674391
-// 0.0268142 0.3177838 -11.3155513; // Blottner
- 1.458e-06 110; // Sutherland
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/system/fvSchemes b/tutorials/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
deleted file mode 100644
index feda8725dbfb40e30a2cc15a3d033e728d5d453b..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/biconic25-55Run35/system/fvSchemes
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//fluxScheme Tadmor; // KT
-fluxScheme Kurganov; // KNP
-
-ddtSchemes
-{
- default Euler;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-divSchemes
-{
- default none;
- div(tauMC) Gauss linear;
-}
-
-laplacianSchemes
-{
- default Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
- reconstruct(rho) vanLeer;
- reconstruct(U) vanLeerV;
- reconstruct(T) vanLeer;
-// reconstruct(rho) upwind;
-// reconstruct(U) upwind;
-// reconstruct(T) upwind;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/system/fvSolution b/tutorials/rhoCentralFoam/biconic25-55Run35/system/fvSolution
deleted file mode 100644
index c2802217add0d6d447e6f8cf5db13b3d75cdd839..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/biconic25-55Run35/system/fvSolution
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho diagonal {};
- rhoU diagonal {};
- rhoE diagonal {};
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-09;
- relTol 0.01;
- };
-
- h smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-09
- relTol 0.1;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/biconic25-55Run35/system/sampleDict b/tutorials/rhoCentralFoam/biconic25-55Run35/system/sampleDict
deleted file mode 100644
index f8a45e93a247fb6a930232d2b75c40298ee24ff8..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/biconic25-55Run35/system/sampleDict
+++ /dev/null
@@ -1,59 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object sampleDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-interpolationScheme cellPointFace;
-setFormat raw;
-surfaceFormat vtk;
-
-sets
-(
- cone25
- {
- type face;
- axis x;
- start ( 0.0 0.0 0.0);
- end ( 92.08087e-03 42.939e-03 0.0);
- nPoints 92;
- }
-
- cone55
- {
- type face;
- axis x;
- start ( 92.08087e-03 42.939e-03 0.0);
- end ( 153.6830e-03 130.92e-03 0.0);
- nPoints 61;
- }
-
- base
- {
- type face;
- axis x;
- start ( 153.6830e-03 130.92e-03 0.0);
- end ( 193.6750e-03 130.92e-03 0.0);
- nPoints 40;
- }
-);
-
-surfaces ();
-
-fields
-(
- p
- wallHeatTransRate
-);
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/forwardStep/system/fvSchemes b/tutorials/rhoCentralFoam/forwardStep/system/fvSchemes
deleted file mode 100644
index eb9e787aef58f1aa73259c7252c6786c2ef7fa68..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/forwardStep/system/fvSchemes
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//fluxScheme Tadmor; // KT
-fluxScheme Kurganov; // KNP
-
-ddtSchemes
-{
- default Euler;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-divSchemes
-{
- default none;
- div(tauMC) Gauss linear;
-}
-
-laplacianSchemes
-{
- default Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
- reconstruct(rho) vanLeer;
- reconstruct(U) vanLeerV;
- reconstruct(T) vanLeer;
-// reconstruct(rho) upwind;
-// reconstruct(U) upwind;
-// reconstruct(T) upwind;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/forwardStep/system/fvSolution b/tutorials/rhoCentralFoam/forwardStep/system/fvSolution
deleted file mode 100644
index 19baedc7b222ac2c0ad111907257688caba2cbc6..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/forwardStep/system/fvSolution
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho diagonal {};
- rhoU diagonal {};
- rhoE diagonal {};
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-09;
- relTol 0.01;
- };
-
- h smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-10
- relTol 0;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
deleted file mode 100644
index 86b760a58ee443d41c085e19a5d33049cd8f8937..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
-mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/obliqueShock/system/fvSchemes b/tutorials/rhoCentralFoam/obliqueShock/system/fvSchemes
deleted file mode 100644
index eb9e787aef58f1aa73259c7252c6786c2ef7fa68..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/obliqueShock/system/fvSchemes
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//fluxScheme Tadmor; // KT
-fluxScheme Kurganov; // KNP
-
-ddtSchemes
-{
- default Euler;
-}
-
-gradSchemes
-{
- default Gauss linear;
-}
-
-divSchemes
-{
- default none;
- div(tauMC) Gauss linear;
-}
-
-laplacianSchemes
-{
- default Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
- reconstruct(rho) vanLeer;
- reconstruct(U) vanLeerV;
- reconstruct(T) vanLeer;
-// reconstruct(rho) upwind;
-// reconstruct(U) upwind;
-// reconstruct(T) upwind;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/obliqueShock/system/fvSolution b/tutorials/rhoCentralFoam/obliqueShock/system/fvSolution
deleted file mode 100644
index 19baedc7b222ac2c0ad111907257688caba2cbc6..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/obliqueShock/system/fvSolution
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho diagonal {};
- rhoU diagonal {};
- rhoE diagonal {};
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-09;
- relTol 0.01;
- };
-
- h smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-10
- relTol 0;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/rhoCentralFoam/shockTube/constant/thermophysicalProperties
deleted file mode 100644
index 32f2bf50c61523cbc92cd9afc1ade2baa43b4817..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
-mixture air 1 28.96 1004.5 2.544e+06 0.0 1.0;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/system/controlDict b/tutorials/rhoCentralFoam/shockTube/system/controlDict
deleted file mode 100644
index 38434ebd6fbf28789e6116d60a0ad349eee12ff4..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/shockTube/system/controlDict
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 0.007;
-
-deltaT 1e-06;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.001;
-
-cycleWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep yes;
-
-maxCo 0.2;
-
-maxDeltaT 1;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/system/fvSolution b/tutorials/rhoCentralFoam/shockTube/system/fvSolution
deleted file mode 100644
index 19baedc7b222ac2c0ad111907257688caba2cbc6..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/shockTube/system/fvSolution
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho diagonal {};
- rhoU diagonal {};
- rhoE diagonal {};
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-09;
- relTol 0.01;
- };
-
- h smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-10
- relTol 0;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/rhoCentralFoam/shockTube/system/setFieldsDict
deleted file mode 100644
index 83d5d1949f882e06edebc5978d5fd1e41b8a95e1..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/shockTube/system/setFieldsDict
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volVectorFieldValue U (0 0 0)
- volScalarFieldValue T 348.43206
- volScalarFieldValue p 1.0e+5
-);
-
-regions
-(
- boxToCell
- {
- box (0 -1 -1) (5 1 1);
-
- fieldValues
- (
- volScalarFieldValue T 278.74564
- volScalarFieldValue p 1.0e+4
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
deleted file mode 100644
index 86b760a58ee443d41c085e19a5d33049cd8f8937..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
-mixture normalisedGas 1 11640.3 2.5 0.0 0.0 1.0;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoCentralFoam/wedge15Ma5/system/fvSolution b/tutorials/rhoCentralFoam/wedge15Ma5/system/fvSolution
deleted file mode 100644
index 19baedc7b222ac2c0ad111907257688caba2cbc6..0000000000000000000000000000000000000000
--- a/tutorials/rhoCentralFoam/wedge15Ma5/system/fvSolution
+++ /dev/null
@@ -1,40 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho diagonal {};
- rhoU diagonal {};
- rhoE diagonal {};
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-09;
- relTol 0.01;
- };
-
- h smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-10
- relTol 0;
- };
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/constant/RASProperties b/tutorials/rhoPimpleFoam/angledDuct/constant/RASProperties
deleted file mode 100644
index 1af73fab26762603c5d1b4ed7a2d9cb5212a7290..0000000000000000000000000000000000000000
--- a/tutorials/rhoPimpleFoam/angledDuct/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPimpleFoam/angledDuct/system/fvSolution b/tutorials/rhoPimpleFoam/angledDuct/system/fvSolution
deleted file mode 100644
index bdf27a66c4598d19e4eca414f5864c1394b13907..0000000000000000000000000000000000000000
--- a/tutorials/rhoPimpleFoam/angledDuct/system/fvSolution
+++ /dev/null
@@ -1,107 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- UFinal PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0.01;
- };
- pFinal PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0.1;
- };
- hFinal PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- omega PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PIMPLE
-{
- nOuterCorrectors 50;
- nCorrectors 1;
- nNonOrthogonalCorrectors 0;
- momentumPredictor yes;
-
- pMin pMin [1 -1 -2 0 0 0 0] 1000;
-}
-
-relaxationFactors
-{
- U 0.7;
- p 0.3;
- rho 0.05;
- h 0.7;
- k 0.7;
- omega 0.7;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/les/pitzDaily/system/fvSolution b/tutorials/rhoPisoFoam/les/pitzDaily/system/fvSolution
deleted file mode 100644
index 7eb6ca186d85ff5c654dc3a9b2a26b2b3a47bbcb..0000000000000000000000000000000000000000
--- a/tutorials/rhoPisoFoam/les/pitzDaily/system/fvSolution
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-6;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-6;
- relTol 0;
- };
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- B PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- nuTilda PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/0/omega b/tutorials/rhoPisoFoam/ras/cavity/0/omega
deleted file mode 100644
index ff76e682e34b9db5c4924f8fca32c6d512e738b9..0000000000000000000000000000000000000000
--- a/tutorials/rhoPisoFoam/ras/cavity/0/omega
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 -1 0 0 0 0];
-
-internalField uniform 2.6;
-
-boundaryField
-{
- movingWall
- {
- type zeroGradient;
- }
-
- fixedWalls
- {
- type zeroGradient;
- }
-
- frontAndBack
- {
- type empty;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/constant/RASProperties b/tutorials/rhoPisoFoam/ras/cavity/constant/RASProperties
deleted file mode 100644
index 00297d2d13ed93d7bd8a09a3e4a0843189b3cc65..0000000000000000000000000000000000000000
--- a/tutorials/rhoPisoFoam/ras/cavity/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Turbulence model selection
-RASModel kOmegaSST; //kEpsilon;
-
-// Do you wish to calculate turbulence?
-turbulence on;
-
-printCoeffs on;
-
-// Laminar model coefficients
-laminarCoeffs
-{
-}
-
-// Standard k-epsilon model coefficients
-kEpsilonCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C3
- C3 -0.33;
- // alphah
- alphah 1;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// RNG k-epsilon model coefficients
-RNGkEpsilonCoeffs
-{
- // Cmu
- Cmu 0.0845;
- // C1
- C1 1.42;
- // C2
- C2 1.68;
- // C3
- C3 -0.33;
- // alphah
- alphah 1;
- // alphak
- alphak 1.39;
- // alphaEps
- alphaEps 1.39;
- // eta0
- eta0 4.38;
- // beta
- beta 0.012;
-}
-
-// Launder-Sharma low Reynolds number k-epsilon model coefficients
-LaunderSharmaKECoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C3
- C3 -0.33;
- // alphah
- alphah 1;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// Launder-Reece-Rodi RSTM with wall functions model coefficients
-LRRCoeffs
-{
- // Cmu
- Cmu 0.09;
- // Clrr1
- Clrr1 1.8;
- // Clrr2
- Clrr2 0.6;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // Cs
- Cs 0.25;
- // Ceps
- Ceps 0.15;
- // alphah
- alphah 1;
- // alphaEps
- alphaEps 0.76923;
- // alphaR
- alphaR 1.22;
-}
-
-// Launder-Gibson RSTM with wall reflection and wall functions model coefficients
-LaunderGibsonRSTMCoeffs
-{
- // Cmu
- Cmu 0.09;
- // Clg1
- Clg1 1.8;
- // Clg2
- Clg2 0.6;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C1Ref
- C1Ref 0.5;
- // C2Ref
- C2Ref 0.3;
- // Cs
- Cs 0.25;
- // Ceps
- Ceps 0.15;
- // alphah
- alphah 1;
- // alphaEps
- alphaEps 0.76923;
- // alphaR
- alphaR 1.22;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-
- alphah 1;
-}
-
-// Wall function coefficients
-wallFunctionCoeffs
-{
- // kappa
- kappa 0.4187;
- // E
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/rhoPisoFoam/ras/cavity/system/controlDict
deleted file mode 100644
index be7feda05dc9a744cf538743ec7aedc6df1a31df..0000000000000000000000000000000000000000
--- a/tutorials/rhoPisoFoam/ras/cavity/system/controlDict
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Foam Application Class
-
-// Start point of run
-startFrom startTime;
-
-// Calculation start time
-startTime 0;
-
-// End point of run
-stopAt endTime;
-
-// Calculation end time
-endTime 1;
-
-// Calculation time step
-deltaT 0.01;
-
-// Type of write output control
-writeControl runTime;
-
-// Interval with which the results are output
-writeInterval 0.1;
-
-// Limits number of time directories before overwriting
-purgeWrite 0;
-
-// Write Format
-writeFormat ascii;
-
-// Significant figures of written ASCII data
-writePrecision 6;
-
-// Write Compression
-writeCompression uncompressed;
-
-// Time directories name format
-timeFormat general;
-
-// Decimal precision of time directory names
-timePrecision 6;
-
-// Can parameters be modified during run time?
-runTimeModifiable yes;
-
-// Automatic adjustment of time step?
-adjustTimeStep no;
-
-// maxCo
-maxCo 0.3;
-
-// maxDeltaT
-maxDeltaT 1;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPisoFoam/ras/cavity/system/fvSolution b/tutorials/rhoPisoFoam/ras/cavity/system/fvSolution
deleted file mode 100644
index d362358b0266145382eeff3d80dd181473f38dd9..0000000000000000000000000000000000000000
--- a/tutorials/rhoPisoFoam/ras/cavity/system/fvSolution
+++ /dev/null
@@ -1,87 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- // Solver for the rho equation
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the U equation
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the p equation
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-06;
- relTol 0;
- };
- // Solver for the h equation
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the R equation
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the k equation
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the epsilon equation
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the omega equation
- omega PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- // Number of PISO correctors
- nCorrectors 2;
- // Number of non-orthogonal correctors
- nNonOrthogonalCorrectors 0;
- // momentumPredictor?
- momentumPredictor yes;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
deleted file mode 100644
index 049181279310db33fc6dd5c9507bfdb8f4b501e4..0000000000000000000000000000000000000000
--- a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ /dev/null
@@ -1,89 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default steadyState;
-}
-
-gradSchemes
-{
- default Gauss linear;
- // UEqn
- grad(U) Gauss linear;
- grad(p) Gauss linear;
-}
-
-divSchemes
-{
- //- default Gauss upwind;
- // UEqn
- div(phi,U) Gauss upwind;
- div((muEff*dev2(grad(U).T()))) Gauss linear;
- // hEqn
- div(phi,h) Gauss upwind;
- // epsilonEqn
- div(phi,epsilon) Gauss upwind;
- // kEqn
- div(phi,k) Gauss upwind;
-
- // experimental
- div(phid,p) Gauss linear;
-}
-
-laplacianSchemes
-{
- //- default Gauss linear corrected;
- // UEqn
- laplacian(muEff,U) Gauss linear corrected;
-
- // hEqn
- laplacian(alphaEff,h) Gauss linear corrected;
-
- // pCorrect
- laplacian((rho|A(U)),p) Gauss linear corrected;
-
- laplacian((rho*rAU),p) Gauss linear corrected;
-
- // epsilonEqn
- laplacian(DepsilonEff,epsilon) Gauss linear corrected;
-
- // kEqn
- laplacian(DkEff,k) Gauss linear corrected;
-
- // potential
- laplacian(1,p) Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
- // default upwind phi;
- div(U,p) upwind phi;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-fluxRequired
-{
- default no;
- p;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
deleted file mode 100644
index 83ed3bd9a98d69e76ef4a4891e3148eb1608b08d..0000000000000000000000000000000000000000
--- a/tutorials/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ /dev/null
@@ -1,82 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p GAMG
- {
- tolerance 1e-8;
- relTol 0.05;
-
- smoother GaussSeidel;
-
- cacheAgglomeration off;
-
- nCellsInCoarsestLevel 20;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- U smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-6;
- relTol 0.1;
- };
-
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-6;
- relTol 0.1;
- };
-
- k smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
-
- epsilon smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
-}
-
-SIMPLE
-{
- // nUCorrectors 0;
- nNonOrthogonalCorrectors 0;
- pMin pMin [1 -1 -2 0 0 0 0] 100;
-}
-
-relaxationFactors
-{
- p 0.3;
- rho 0.05;
- U 0.7;
- k 0.7;
- epsilon 0.7;
- h 0.5;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
deleted file mode 100644
index 1af73fab26762603c5d1b4ed7a2d9cb5212a7290..0000000000000000000000000000000000000000
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
deleted file mode 100644
index c38497facbe89fb9aafe6aa6309fe10dd752c5b4..0000000000000000000000000000000000000000
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
-mixture
- air 1 28.9 // specieThermo
- 1007 0 // hConstThermo
-// 1.84766e-05 0.7 // constTransport - 300K
-// 2.68477e-05 0.7 // constTransport - 500K
-// 3.93094e-05 0.7 // constTransport - 900K
- 1.4792e-06 116 // sutherlandTransport (Star-CD)
-// 1.4584e-06 110.33 // sutherlandTransport (European Space Agency)
-;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
deleted file mode 100644
index 1ba8b44722ebc60127039d7bccef2584cdb6c245..0000000000000000000000000000000000000000
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ /dev/null
@@ -1,87 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
- default steadyState;
-}
-
-gradSchemes
-{
- default Gauss linear;
- // UEqn
- grad(U) Gauss linear;
- grad(p) Gauss linear;
-}
-
-divSchemes
-{
- //- default Gauss upwind;
- // UEqn
- div(phi,U) Gauss upwind;
- div((muEff*dev2(grad(U).T()))) Gauss linear;
- // hEqn
- div(phi,h) Gauss upwind;
- // epsilonEqn
- div(phi,epsilon) Gauss upwind;
- // kEqn
- div(phi,k) Gauss upwind;
-
- // experimental
- div(phid,p) Gauss linear;
-}
-
-laplacianSchemes
-{
- //- default Gauss linear corrected;
- // UEqn
- laplacian(muEff,U) Gauss linear corrected;
-
- // hEqn
- laplacian(alphaEff,h) Gauss linear corrected;
-
- // pCorrect
- laplacian((rho*rAU),p) Gauss linear corrected;
-
- // epsilonEqn
- laplacian(DepsilonEff,epsilon) Gauss linear corrected;
-
- // kEqn
- laplacian(DkEff,k) Gauss linear corrected;
-
- // potential
- laplacian(1,p) Gauss linear corrected;
-}
-
-interpolationSchemes
-{
- default linear;
- // default upwind phi;
- div(U,p) upwind phi;
-}
-
-snGradSchemes
-{
- default corrected;
-}
-
-fluxRequired
-{
- default no;
- p;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
deleted file mode 100644
index 4a459767507a99fe629411e9834e513d57a5890b..0000000000000000000000000000000000000000
--- a/tutorials/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution
+++ /dev/null
@@ -1,74 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p GAMG
- {
- tolerance 1e-8;
- relTol 0.05;
-
- smoother GaussSeidel;
-
- cacheAgglomeration off;
-
- nCellsInCoarsestLevel 20;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-6;
- relTol 0.1;
- };
-
- k smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
-
- epsilon smoothSolver
- {
- smoother GaussSeidel;
- nSweeps 2;
- tolerance 1e-7;
- relTol 0.1;
- };
-}
-
-SIMPLE
-{
- nUCorrectors 2;
- nNonOrthogonalCorrectors 0;
- pMin pMin [1 -1 -2 0 0 0 0] 100;
-}
-
-relaxationFactors
-{
- p 0.3;
- rho 1;
- U 0.7;
- k 0.9;
- epsilon 0.9;
- h 0.9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoSonicFoam/shockTube/system/setFieldsDict b/tutorials/rhoSonicFoam/shockTube/system/setFieldsDict
deleted file mode 100644
index 83d5d1949f882e06edebc5978d5fd1e41b8a95e1..0000000000000000000000000000000000000000
--- a/tutorials/rhoSonicFoam/shockTube/system/setFieldsDict
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volVectorFieldValue U (0 0 0)
- volScalarFieldValue T 348.43206
- volScalarFieldValue p 1.0e+5
-);
-
-regions
-(
- boxToCell
- {
- box (0 -1 -1) (5 1 1);
-
- fieldValues
- (
- volScalarFieldValue T 278.74564
- volScalarFieldValue p 1.0e+4
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/files b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/files
deleted file mode 100644
index b11cae03a931a88a5d305111b38cce5ce25e7bed..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rhoTurbTwinParcelFoam.C
-
-EXE = $(FOAM_USER_APPBIN)/rhoTurbTwinParcelFoam
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties
deleted file mode 100644
index 677850a27085cf68ceba7b2810b9149848acd177..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/RASProperties
+++ /dev/null
@@ -1,154 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Turbulence model selection
-RASModel kEpsilon;
-
-// Do you wish to calculate turbulence?
-turbulence on;
-
-printCoeffs on;
-
-// Laminar model coefficients
-laminarCoeffs
-{
-}
-
-// Standard k-epsilon model coefficients
-kEpsilonCoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C3
- C3 -0.33;
- // alphah
- alphah 1;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// RNG k-epsilon model coefficients
-RNGkEpsilonCoeffs
-{
- // Cmu
- Cmu 0.0845;
- // C1
- C1 1.42;
- // C2
- C2 1.68;
- // C3
- C3 -0.33;
- // alphah
- alphah 1;
- // alphak
- alphak 1.39;
- // alphaEps
- alphaEps 1.39;
- // eta0
- eta0 4.38;
- // beta
- beta 0.012;
-}
-
-// Launder-Sharma low Reynolds number k-epsilon model coefficients
-LaunderSharmaKECoeffs
-{
- // Cmu
- Cmu 0.09;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C3
- C3 -0.33;
- // alphah
- alphah 1;
- // alphak
- alphak 1;
- // alphaEps
- alphaEps 0.76923;
-}
-
-// Launder-Reece-Rodi RSTM with wall functions model coefficients
-LRRCoeffs
-{
- // Cmu
- Cmu 0.09;
- // Clrr1
- Clrr1 1.8;
- // Clrr2
- Clrr2 0.6;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // Cs
- Cs 0.25;
- // Ceps
- Ceps 0.15;
- // alphah
- alphah 1;
- // alphaEps
- alphaEps 0.76923;
- // alphaR
- alphaR 1.22;
-}
-
-// Launder-Gibson RSTM with wall reflection and wall functions model coefficients
-LaunderGibsonRSTMCoeffs
-{
- // Cmu
- Cmu 0.09;
- // Clg1
- Clg1 1.8;
- // Clg2
- Clg2 0.6;
- // C1
- C1 1.44;
- // C2
- C2 1.92;
- // C1Ref
- C1Ref 0.5;
- // C2Ref
- C2Ref 0.3;
- // Cs
- Cs 0.25;
- // Ceps
- Ceps 0.15;
- // alphah
- alphah 1;
- // alphaEps
- alphaEps 0.76923;
- // alphaR
- alphaR 1.22;
-}
-
-// Wall function coefficients
-wallFunctionCoeffs
-{
- // kappa
- kappa 0.4187;
- // E
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
deleted file mode 100644
index d883b02f398eba97138b752952c0146f9c1bdc7f..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ /dev/null
@@ -1,117 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object kinematicCloud1Properties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Particle sub-models
-InjectionModel ManualInjection;
-DragModel SphereDrag;
-DispersionModel StochasticDispersionRAS;
-WallInteractionModel StandardWallInteraction;
-
-// Minimum particle mass
-minParticleMass minParticleMass [ 1 0 0 0 0] 1.0e-15;
-
-// Parcel thermo properties
-rho0 rho0 [ 1 -3 0 0 0] 5000;
-
-// Coupling between particles and carrier phase via source terms
-coupled true;
-
-// Integer used to identify different parcel types
-parcelTypeId 2;
-
-interpolationSchemes
-{
- rho cell;
- U cellPointFace;
- mu cell;
-}
-
-integrationSchemes
-{
- U Euler;
-}
-
-ManualInjectionCoeffs
-{
- // Parcel basis type
- parcelBasisType mass;
-
- // Total mass to inject
- massTotal massTotal [ 1 0 0 0 0] 2.0e-4;
-
- SOI 0.0;
- positionsFile kinematicCloud1Positions;
- U0 (0 0 0);
- parcelPDF
- {
- pdfType RosinRammler;
- RosinRammlerPDF
- {
- minValue 50.0e-06;
- maxValue 100.0e-06;
- d (75.0e-06);
- n (0.5);
- }
- }
-}
-
-ConeInjectionCoeffs
-{
- SOI 0.001;
- duration 0.005;
- position (0.25 0.25 0.05);
- direction (0 -1 0);
- parcelsPerSecond 10000;
- volumeFlowRate Constant;
- volumeFlowRateCoeffs
- {
- value 0.01;
- }
- Umag Constant;
- UmagCoeffs
- {
- value 50.0;
- }
- thetaInner Constant;
- thetaInnerCoeffs
- {
- value 0.0;
- }
- thetaOuter Constant;
- thetaOuterCoeffs
- {
- value 30.0;
- }
- parcelPDF
- {
- pdfType RosinRammler;
- RosinRammlerPDF
- {
- minValue 50.0e-06;
- maxValue 100.0e-06;
- d (75.0e-06);
- n (0.5);
- }
- }
-}
-
-StandardWallInteractionCoeffs
-{
- e e [ 0 0 0 0 0] 1;
- mu mu [ 0 0 0 0 0] 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
deleted file mode 100644
index 795aeda2cdef76f183e59a7ae53a07aa0f1d7008..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ /dev/null
@@ -1,92 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermoCloud1Properties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Particle sub-models
-InjectionModel ManualInjection;
-DragModel SphereDrag;
-DispersionModel StochasticDispersionRAS;
-WallInteractionModel StandardWallInteraction;
-HeatTransferModel RanzMarshall;
-
-radiation off;
-
-// Minimum particle mass
-minParticleMass minParticleMass [ 1 0 0 0 0] 1.0e-15;
-
-// Parcel thermo properties
-rho0 rho0 [ 1 -3 0 0 0] 2500;
-T0 T0 [ 0 0 0 1 0] 300;
-cp0 cp0 [ 0 2 -2 -1 0] 900;
-epsilon0 epsilon0 [ 0 0 0 0 0] 1;
-f0 f0 [ 0 0 0 0 0] 0.5;
-
-// Coupling between particles and carrier phase via source terms
-coupled true;
-
-// Integer used to identify different parcel types
-parcelTypeId 1;
-
-interpolationSchemes
-{
- rho cell;
- U cellPointFace;
- mu cell;
- T cell;
- Cp cell;
-}
-
-integrationSchemes
-{
- U Euler;
- T Analytical;
-}
-
-ManualInjectionCoeffs
-{
- // Total mass to inject
- massTotal massTotal [ 1 0 0 0 0] 1e-4;
-
- // Parcel basis type
- parcelBasisType mass;
-
- SOI 0.0;
- positionsFile thermoCloud1Positions;
- U0 (0 0 0);
- parcelPDF
- {
- pdfType RosinRammler;
- RosinRammlerPDF
- {
- minValue 5.0e-06;
- maxValue 500.0e-06;
- d (50.0e-06);
- n (0.5);
- }
- }
-}
-
-StandardWallInteractionCoeffs
-{
- e e [ 0 0 0 0 0] 1;
- mu mu [ 0 0 0 0 0] 0;
-}
-
-RanzMarshallCoeffs
-{
- Pr Pr [ 0 0 0 0 0] 0.7;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict
deleted file mode 100644
index 02438600d45b5de30a38cabe9c62bb3cdda06ebe..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/controlDict
+++ /dev/null
@@ -1,70 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Foam Application Class
-
-// Start point of run
-startFrom latestTime;
-
-// Calculation start time
-startTime 0;
-
-// End point of run
-stopAt endTime;
-
-// Calculation end time
-endTime 0.5;
-
-// Calculation time step
-deltaT 1.0e-4;
-
-// Type of write output control
-writeControl adjustableRunTime;
-
-// Interval with which the results are output
-writeInterval 0.01;
-
-// Limits number of time directories before overwriting
-purgeWrite 0;
-
-// Write Format
-writeFormat ascii;
-
-// Significant figures of written ASCII data
-writePrecision 10;
-
-// Write Compression
-writeCompression uncompressed;
-
-// Time directories name format
-timeFormat general;
-
-// Decimal precision of time directory names
-timePrecision 6;
-
-// Can parameters be modified during run time?
-runTimeModifiable yes;
-
-// Automatic adjustment of time step?
-adjustTimeStep yes;
-
-// maxCo
-maxCo 0.2;
-
-// maxDeltaT
-maxDeltaT 1;
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes
deleted file mode 100644
index 9f6d1424511d6dae84c429b4c92ba7aef10a003d..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSchemes
+++ /dev/null
@@ -1,84 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Time derivative discretisation schemes
-ddtSchemes
-{
- // Default scheme
- default Euler;
-}
-
-// Gradient discretisation schemes
-gradSchemes
-{
- // Default gradient scheme
- default Gauss linear;
- grad(p) Gauss linear;
-}
-
-// Convection discretisation schemes
-divSchemes
-{
- // Default scheme
- default none;
- div(phi,U) Gauss upwind;
- div(phid,p) Gauss upwind;
- div(phiU,p) Gauss linear;
- div(phi,h) Gauss upwind;
- div(phi,k) Gauss upwind;
- div(phi,epsilon) Gauss upwind;
- div(U) Gauss linear;
- div((muEff*dev2(grad(U).T()))) Gauss linear;
- div(phi,Yi_h) Gauss upwind;
-}
-
-// Laplacian discretisation schemes
-laplacianSchemes
-{
- // Default scheme
- default Gauss linear corrected;
- laplacian(muEff,U) Gauss linear corrected;
- laplacian(mut,U) Gauss linear corrected;
- laplacian(DkEff,k) Gauss linear corrected;
- laplacian(DepsilonEff,epsilon) Gauss linear corrected;
- laplacian(DREff,R) Gauss linear corrected;
- laplacian((rho*(1|A(U))),p) Gauss linear corrected;
- laplacian(alphaEff,h) Gauss linear corrected;
-}
-
-// Interpolation schemes
-interpolationSchemes
-{
- // Default scheme
- default linear;
-}
-
-// Surface normal gradient schemes
-snGradSchemes
-{
- // Default scheme
- default corrected;
-}
-
-// Calculation of flux
-fluxRequired
-{
- // Create storage for flux for all solved variables?
- default no;
- p;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution b/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution
deleted file mode 100644
index 699b805794a5fd554d31b4138cf34bae58ffaf6a..0000000000000000000000000000000000000000
--- a/tutorials/rhoTurbTwinParcelFoam/simplifiedSiwek/system/fvSolution
+++ /dev/null
@@ -1,137 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- // Solver for the rho equation
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the U equation
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the p equation
- p PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- G PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- Yi PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- CO2 PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- O2 PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- N2 PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- CH4 PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- H2 PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- H2O PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
- CO PBiCG
- {
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- };
-
- // Solver for the h equation
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the R equation
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the k equation
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- // Solver for the epsilon equation
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- // Transonic?
- transonic yes;
- // Number of PISO correctors
- nCorrectors 2;
- // Number of non-orthogonal correctors
- nNonOrthogonalCorrectors 0;
- // momentumPredictor?
- momentumPredictor yes;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/shockTube/system/controlDict b/tutorials/rhopSonicFoam/shockTube/system/controlDict
deleted file mode 100644
index dae184a1a5d92b54a7e69c641a1a7db17b3eb1f7..0000000000000000000000000000000000000000
--- a/tutorials/rhopSonicFoam/shockTube/system/controlDict
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom startTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 0.007;
-
-deltaT 2e-05;
-
-writeControl runTime;
-
-writeInterval 0.001;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep no;
-
-maxCo 0.05;
-
-maxDeltaT 1;
-
-// ************************************************************************* //
diff --git a/tutorials/rhopSonicFoam/shockTube/system/setFieldsDict b/tutorials/rhopSonicFoam/shockTube/system/setFieldsDict
deleted file mode 100644
index 83d5d1949f882e06edebc5978d5fd1e41b8a95e1..0000000000000000000000000000000000000000
--- a/tutorials/rhopSonicFoam/shockTube/system/setFieldsDict
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volVectorFieldValue U (0 0 0)
- volScalarFieldValue T 348.43206
- volScalarFieldValue p 1.0e+5
-);
-
-regions
-(
- boxToCell
- {
- box (0 -1 -1) (5 1 1);
-
- fieldValues
- (
- volScalarFieldValue T 278.74564
- volScalarFieldValue p 1.0e+4
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/scalarTransportFoam/pitzDaily/constant/transportProperties b/tutorials/scalarTransportFoam/pitzDaily/constant/transportProperties
deleted file mode 100644
index 0621796365600d4d996ed9c0b67daedba279a998..0000000000000000000000000000000000000000
--- a/tutorials/scalarTransportFoam/pitzDaily/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-DT DT [0 2 -1 0 0 0 0] 0.01;
-
-// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/constant/environmentalProperties b/tutorials/settlingFoam/dahl/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/settlingFoam/dahl/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/constant/transportProperties b/tutorials/settlingFoam/dahl/constant/transportProperties
deleted file mode 100644
index 9614962b90f139b967f2cda367884a44fb8553f2..0000000000000000000000000000000000000000
--- a/tutorials/settlingFoam/dahl/constant/transportProperties
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-muc muc [1 -1 -1 0 0 0 0] 0.00178;
-
-plasticViscosityCoeff plasticViscosityCoeff [1 -1 -1 0 0 0 0] 0.00023143;
-
-plasticViscosityExponent plasticViscosityExponent [0 0 0 0 0 0 0] 179.26;
-
-BinghamPlastic on;
-
-yieldStressCoeff yieldStressCoeff [1 -1 -2 0 0 0 0] 0.00042189;
-
-yieldStressExponent yieldStressExponent [0 0 0 0 0 0 0] 1050.8;
-
-yieldStressOffset yieldStressOffset [0 0 0 0 0 0 0] 0;
-
-rhoc rhoc [1 -3 0 0 0 0 0] 996;
-
-rhod rhod [1 -3 0 0 0 0 0] 1996;
-
-VdjModel simple;
-
-simpleCoeffs
-{
- V0 V0 [0 1 -1 0 0 0 0] (0 -0.002198 0);
- a a [0 0 0 0 0 0 0] 285.84;
- a1 a1 [0 0 0 0 0 0 0] 0;
- alphaMin alphaMin [0 0 0 0 0 0 0] 0;
-}
-
-generalCoeffs
-{
- V0 V0 [0 1 -1 0 0 0 0] (0 -0.0018 0);
- a a [0 0 0 0 0 0 0] 1e-05;
- a1 a1 [0 0 0 0 0 0 0] 0.1;
- alphaMin alphaMin [0 0 0 0 0 0 0] 2e-05;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/settlingFoam/dahl/system/fvSolution b/tutorials/settlingFoam/dahl/system/fvSolution
deleted file mode 100644
index 994dcde6c912e7dc15e1283680d28b7161ac39e9..0000000000000000000000000000000000000000
--- a/tutorials/settlingFoam/dahl/system/fvSolution
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-07;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-07;
- relTol 0;
- };
- Alpha PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/constant/environmentalProperties b/tutorials/settlingFoam/tank3D/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/settlingFoam/tank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/constant/transportProperties b/tutorials/settlingFoam/tank3D/constant/transportProperties
deleted file mode 100644
index 1d92419af461960f17092422aed1d4c5ec7d7a8f..0000000000000000000000000000000000000000
--- a/tutorials/settlingFoam/tank3D/constant/transportProperties
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-muc muc [1 -1 -1 0 0 0 0] 0.00178;
-
-plasticViscosityCoeff plasticViscosityCoeff [1 -1 -1 0 0 0 0] 0.00023143;
-
-plasticViscosityExponent plasticViscosityExponent [0 0 0 0 0 0 0] 0.17926;
-
-BinghamPlastic on;
-
-yieldStressCoeff yieldStressCoeff [1 -1 -2 0 0 0 0] 5.5469e-07;
-
-yieldStressExponent yieldStressExponent [0 0 0 0 0 0 0] 95.25;
-
-yieldStressOffset yieldStressOffset [0 0 0 0 0 0 0] 0;
-
-rhoc rhoc [1 -3 0 0 0 0 0] 1000;
-
-rhod rhod [1 -3 0 0 0 0 0] 1042;
-
-VdjModel simple;
-
-simpleCoeffs
-{
- V0 V0 [0 1 -1 0 0 0 0] (0 -0.002198 0);
- a a [0 0 0 0 0 0 0] 8.84;
- a1 a1 [0 0 0 0 0 0 0] 0;
- alphaMin alphaMin [0 0 0 0 0 0 0] 0;
-}
-
-generalCoeffs
-{
- V0 V0 [0 1 -1 0 0 0 0] (0 -0.0018 0);
- a a [0 0 0 0 0 0 0] 1e-05;
- a1 a1 [0 0 0 0 0 0 0] 0.1;
- alphaMin alphaMin [0 0 0 0 0 0 0] 2e-05;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/settlingFoam/tank3D/system/fvSolution b/tutorials/settlingFoam/tank3D/system/fvSolution
deleted file mode 100644
index 994dcde6c912e7dc15e1283680d28b7161ac39e9..0000000000000000000000000000000000000000
--- a/tutorials/settlingFoam/tank3D/system/fvSolution
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PCG
- {
- preconditioner DIC;
- tolerance 1e-07;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-07;
- relTol 0;
- };
- Alpha PBiCG
- {
- preconditioner DILU;
- tolerance 1e-07;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/constant/RASProperties b/tutorials/simpleFoam/airFoil2D/constant/RASProperties
deleted file mode 100644
index ee57789589c4c2ddd9e1b234241ae7c763faf265..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/airFoil2D/constant/RASProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel SpalartAllmaras; //kEpsilon;
-
-turbulence on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- //Next line Modified vorticity factor by Ashford 1996
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/constant/transportProperties b/tutorials/simpleFoam/airFoil2D/constant/transportProperties
deleted file mode 100644
index 66348678a3538f4f98f911cb4e79726833692374..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/airFoil2D/constant/transportProperties
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-transportModel Newtonian;
-
-rho rho [1 -3 0 0 0 0 0] 1.0;
-nu nu [0 2 -1 0 0 0 0] 1e-05;
-
-CrossPowerLawCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-BirdCarreauCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/simpleFoam/airFoil2D/constant/turbulenceProperties
deleted file mode 100644
index 5c7e116a09e3fae704f6008617d69f2d357d6ade..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/airFoil2D/constant/turbulenceProperties
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-turbulenceModel SpalartAllmaras; //kEpsilon;
-
-turbulence on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.0845;
- C1 C1 [0 0 0 0 0 0 0] 1.42;
- C2 C2 [0 0 0 0 0 0 0] 1.68;
- alphak alphaK [0 0 0 0 0 0 0] 1.39;
- alphaEps alphaEps [0 0 0 0 0 0 0] 1.39;
- eta0 eta0 [0 0 0 0 0 0 0] 4.38;
- beta beta [0 0 0 0 0 0 0] 0.012;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphak alphak [0 0 0 0 0 0 0] 1;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932;
- A1 A1 [0 0 0 0 0 0 0] 1.25;
- A2 A2 [0 0 0 0 0 0 0] 1000;
- Ctau1 Ctau1 [0 0 0 0 0 0 0] -4;
- Ctau2 Ctau2 [0 0 0 0 0 0 0] 13;
- Ctau3 Ctau3 [0 0 0 0 0 0 0] -2;
- alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphak alphak [0 0 0 0 0 0 0] 1;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
- A1 A1 [0 0 0 0 0 0 0] 1.25;
- A2 A2 [0 0 0 0 0 0 0] 1000;
- Ctau1 Ctau1 [0 0 0 0 0 0 0] -4;
- Ctau2 Ctau2 [0 0 0 0 0 0 0] 13;
- Ctau3 Ctau3 [0 0 0 0 0 0 0] -2;
- alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphak alphak [0 0 0 0 0 0 0] 1;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
- A1 A1 [0 0 0 0 0 0 0] 1.25;
- A2 A2 [0 0 0 0 0 0 0] 1000;
- Ctau1 Ctau1 [0 0 0 0 0 0 0] -4;
- Ctau2 Ctau2 [0 0 0 0 0 0 0] 13;
- Ctau3 Ctau3 [0 0 0 0 0 0 0] -2;
- alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9;
- Am Am [0 0 0 0 0 0 0] 0.016;
- Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263;
- Amu Amu [0 0 0 0 0 0 0] 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- alphak alphak [0 0 0 0 0 0 0] 1;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
- Am Am [0 0 0 0 0 0 0] 0.016;
- Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263;
- Amu Amu [0 0 0 0 0 0 0] 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8;
- Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- Cs Cs [0 0 0 0 0 0 0] 0.25;
- Ceps Ceps [0 0 0 0 0 0 0] 0.15;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu Cmu [0 0 0 0 0 0 0] 0.09;
- Clg1 Clg1 [0 0 0 0 0 0 0] 1.8;
- Clg2 Clg2 [0 0 0 0 0 0 0] 0.6;
- C1 C1 [0 0 0 0 0 0 0] 1.44;
- C2 C2 [0 0 0 0 0 0 0] 1.92;
- C1Ref C1Ref [0 0 0 0 0 0 0] 0.5;
- C2Ref C2Ref [0 0 0 0 0 0 0] 0.3;
- Cs Cs [0 0 0 0 0 0 0] 0.25;
- Ceps Ceps [0 0 0 0 0 0 0] 0.15;
- alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
- alphaR alphaR [0 0 0 0 0 0 0] 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut alphaNut [0 0 0 0 0 0 0] 1.5;
- Cb1 Cb1 [0 0 0 0 0 0 0] 0.1355;
- Cb2 Cb2 [0 0 0 0 0 0 0] 0.622;
- Cw2 Cw2 [0 0 0 0 0 0 0] 0.3;
- Cw3 Cw3 [0 0 0 0 0 0 0] 2;
- Cv1 Cv1 [0 0 0 0 0 0 0] 7.1;
- //Next line Modified vorticity factor by Ashford 1996
- Cv2 Cv2 [0 0 0 0 0 0 0] 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa kappa [0 0 0 0 0 0 0] 0.4187;
- E E [0 0 0 0 0 0 0] 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/airFoil2D/system/controlDict b/tutorials/simpleFoam/airFoil2D/system/controlDict
deleted file mode 100644
index 3b6e0b2a477c6f7cc7897a8cd0a353c2c438e97e..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/airFoil2D/system/controlDict
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 500;
-
-deltaT 1;
-
-writeControl timeStep;
-
-writeInterval 50;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/constant/RASProperties b/tutorials/simpleFoam/pitzDaily/constant/RASProperties
deleted file mode 100644
index e46e0a858b12c777bb11bc364b144cd6feb2b1da..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/pitzDaily/constant/RASProperties
+++ /dev/null
@@ -1,200 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-realizableKECoeffs
-{
- Cmu 0.09;
- A0 4.0;
- C2 1.9;
- alphak 1;
- alphaEps 0.833333;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDaily/constant/transportProperties b/tutorials/simpleFoam/pitzDaily/constant/transportProperties
deleted file mode 100644
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/pitzDaily/constant/transportProperties
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-transportModel Newtonian;
-
-nu nu [0 2 -1 0 0 0 0] 1e-05;
-
-CrossPowerLawCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-BirdCarreauCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/RASProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/RASProperties
deleted file mode 100644
index e46e0a858b12c777bb11bc364b144cd6feb2b1da..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/RASProperties
+++ /dev/null
@@ -1,200 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-realizableKECoeffs
-{
- Cmu 0.09;
- A0 4.0;
- C2 1.9;
- alphak 1;
- alphaEps 0.833333;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleFoam/pitzDailyExptInlet/constant/transportProperties b/tutorials/simpleFoam/pitzDailyExptInlet/constant/transportProperties
deleted file mode 100644
index fd5fc94660c15bb124be01fc5bfb49f4e27dde73..0000000000000000000000000000000000000000
--- a/tutorials/simpleFoam/pitzDailyExptInlet/constant/transportProperties
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-transportModel Newtonian;
-
-nu nu [0 2 -1 0 0 0 0] 1e-05;
-
-CrossPowerLawCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-BirdCarreauCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/constant/RASProperties b/tutorials/simpleSRFFoam/mixer/constant/RASProperties
deleted file mode 100644
index 892738ac369e5e6e9736738e72e3ac7b5ed7dfc0..0000000000000000000000000000000000000000
--- a/tutorials/simpleSRFFoam/mixer/constant/RASProperties
+++ /dev/null
@@ -1,191 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kOmegaSST;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-kOmegaSSTCoeffs
-{
- alphaK1 0.85034;
- alphaK2 1.0;
- alphaOmega1 0.5;
- alphaOmega2 0.85616;
- gamma1 0.5532;
- gamma2 0.4403;
- beta1 0.0750;
- beta2 0.0828;
- betaStar 0.09;
- a1 0.31;
- c1 10;
-
- Cmu 0.09;
-}
-
-NonlinearKEShihCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76932;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-LienCubicKECoeffs
-{
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
-}
-
-QZetaCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaZeta 0.76923;
- anisotropic no;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LamBremhorstKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphaEps 0.76923;
-}
-
-LienCubicKELowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- A1 1.25;
- A2 1000;
- Ctau1 -4;
- Ctau2 13;
- Ctau3 -2;
- alphaKsi 0.9;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LienLeschzinerLowReCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- alphak 1;
- alphaEps 0.76923;
- Am 0.016;
- Aepsilon 0.263;
- Amu 0.00222;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-SpalartAllmarasCoeffs
-{
- alphaNut 1.5;
- Cb1 0.1355;
- Cb2 0.622;
- Cw2 0.3;
- Cw3 2;
- Cv1 7.1;
- Cv2 5.0;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/mixer/constant/transportProperties b/tutorials/simpleSRFFoam/mixer/constant/transportProperties
deleted file mode 100644
index db1e716f78f8e4627d26a2c95cb00439981205f4..0000000000000000000000000000000000000000
--- a/tutorials/simpleSRFFoam/mixer/constant/transportProperties
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-transportModel Newtonian;
-
-nu nu [0 2 -1 0 0 0 0] 1.5e-05;
-
-CrossPowerLawCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- m m [0 0 1 0 0 0 0] 1;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-BirdCarreauCoeffs
-{
- nu0 nu0 [0 2 -1 0 0 0 0] 1e-06;
- nuInf nuInf [0 2 -1 0 0 0 0] 1e-06;
- k k [0 0 1 0 0 0 0] 0;
- n n [0 0 0 0 0 0 0] 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
deleted file mode 100644
index 8a31f7e5abb705153daf5f003b320fbee11cdf32..0000000000000000000000000000000000000000
--- a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options
+++ /dev/null
@@ -1,10 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/transportModels
-
-EXE_LIBS = \
- -lincompressibleRASModels \
- -lincompressibleTransportModels \
- -lfiniteVolume \
- -lmeshTools
diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict b/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
deleted file mode 100644
index 4b547f7a5137e62caa5a2c6571cd56635c9f5d6c..0000000000000000000000000000000000000000
--- a/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict
+++ /dev/null
@@ -1,330 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object autoHexMeshDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Which of the steps to run
-castellatedMesh true;
-snap true;
-addLayers true;
-
-
-// Geometry. Definition of all surfaces. All surfaces are of class
-// searchableSurface.
-// Surfaces are used
-// - to specify refinement for any mesh cell intersecting it
-// - to specify refinement for any mesh cell inside/outside/near
-// - to 'snap' the mesh boundary to the surface
-geometry
-{
- fridgeA
- {
- type searchableBox;
- min (2 2 0);
- max (3 3 2);
- }
-
- fridgeB
- {
- type searchableBox;
- min (3.5 3 0);
- max (4.3 3.8 1.8);
- }
-
- igloo
- {
- type searchableSphere;
- centre (3 3 0);
- radius 4;
- }
-};
-
-
-
-// Settings for the castellatedMesh generation.
-castellatedMeshControls
-{
-
- // Refinement parameters
- // ~~~~~~~~~~~~~~~~~~~~~
-
- // While refining maximum number of cells per processor. This is basically
- // the number of cells that fit on a processor. If you choose this too small
- // it will do just more refinement iterations to obtain a similar mesh.
- maxLocalCells 1000000;
-
- // Overall cell limit (approximately). Refinement will stop immediately
- // upon reaching this number so a refinement level might not complete.
- // Note that this is the number of cells before removing the part which
- // is not 'visible' from the keepPoint. The final number of cells might
- // actually be a lot less.
- maxGlobalCells 2000000;
-
- // The surface refinement loop might spend lots of iterations refining just a
- // few cells. This setting will cause refinement to stop if <= minimumRefine
- // are selected for refinement. Note: it will at least do one iteration
- // (unless the number of cells to refine is 0)
- minRefinementCells 0;
-
- // Number of buffer layers between different levels.
- // 1 means normal 2:1 refinement restriction, larger means slower
- // refinement.
- nCellsBetweenLevels 1;
-
-
-
- // Explicit feature edge refinement
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- // Specifies a level for any cell intersected by its edges.
- // This is a featureEdgeMesh, read from constant/triSurface for now.
- features
- (
- //{
- // file "someLine.eMesh";
- // level 2;
- //}
- );
-
-
-
- // Surface based refinement
- // ~~~~~~~~~~~~~~~~~~~~~~~~
-
- // Specifies two levels for every surface. The first is the minimum level,
- // every cell intersecting a surface gets refined up to the minimum level.
- // The second level is the maximum level. Cells that 'see' multiple
- // intersections where the intersections make an
- // angle > resolveFeatureAngle get refined up to the maximum level.
-
- refinementSurfaces
- {
- fridgeA
- {
- // Surface-wise min and max refinement level
- level (2 2);
- }
- fridgeB
- {
- // Surface-wise min and max refinement level
- level (2 2);
- }
- igloo
- {
- // Surface-wise min and max refinement level
- level (1 1);
- }
- }
-
- // Resolve sharp angles on fridges
- resolveFeatureAngle 60;
-
-
- // Region-wise refinement
- // ~~~~~~~~~~~~~~~~~~~~~~
-
- // Specifies refinement level for cells in relation to a surface. One of
- // three modes
- // - distance. 'levels' specifies per distance to the surface the
- // wanted refinement level. The distances need to be specified in
- // descending order.
- // - inside. 'levels' is only one entry and only the level is used. All
- // cells inside the surface get refined up to the level. The surface
- // needs to be closed for this to be possible.
- // - outside. Same but cells outside.
-
- refinementRegions
- {
- }
-
-
- // Mesh selection
- // ~~~~~~~~~~~~~~
-
- // After refinement patches get added for all refinementSurfaces and
- // all cells intersecting the surfaces get put into these patches. The
- // section reachable from the locationInMesh is kept.
- // NOTE: This point should never be on a face, always inside a cell, even
- // after refinement.
- locationInMesh (3 0.28 0.43);
-}
-
-
-
-// Settings for the snapping.
-snapControls
-{
- //- Number of patch smoothing iterations before finding correspondence
- // to surface
- nSmoothPatch 3;
-
- //- Relative distance for points to be attracted by surface feature point
- // or edge. True distance is this factor times local
- // maximum edge length.
- tolerance 4.0;
-
- //- Number of mesh displacement relaxation iterations.
- nSolveIter 30;
-
- //- Maximum number of snapping relaxation iterations. Should stop
- // before upon reaching a correct mesh.
- nRelaxIter 5;
-}
-
-
-
-// Settings for the layer addition.
-addLayersControls
-{
- // Per final patch (so not geometry!) the layer information
- layers
- {
- fridgeA_region0
- {
- nSurfaceLayers 1;
- }
- fridgeB_region0
- {
- nSurfaceLayers 1;
- }
- igloo_region0
- {
- nSurfaceLayers 1;
- }
- }
-
- // Expansion factor for layer mesh
- expansionRatio 1.0;
-
- //- Wanted thickness of final added cell layer. If multiple layers
- // is the
- // thickness of the layer furthest away from the wall.
- // Relative to undistorted size of cell outside layer.
- finalLayerRatio 0.5;
-
- //- Minimum thickness of cell layer. If for any reason layer
- // cannot be above minThickness do not add layer.
- // Relative to undistorted size of cell outside layer.
- minThickness 0.25;
-
- //- If points get not extruded do nGrow layers of connected faces that are
- // also not grown. This helps convergence of the layer addition process
- // close to features.
- nGrow 0;
-
-
- // Advanced settings
-
- //- When not to extrude surface. 0 is flat surface, 90 is when two faces
- // make straight angle.
- featureAngle 60;
-
- //- Maximum number of snapping relaxation iterations. Should stop
- // before upon reaching a correct mesh.
- nRelaxIter 5;
-
- // Number of smoothing iterations of surface normals
- nSmoothSurfaceNormals 1;
-
- // Number of smoothing iterations of interior mesh movement direction
- nSmoothNormals 3;
-
- // Smooth layer thickness over surface patches
- nSmoothThickness 10;
-
- // Stop layer growth on highly warped cells
- maxFaceThicknessRatio 0.5;
-
- // Reduce layer growth where ratio thickness to medial
- // distance is large
- maxThicknessToMedialRatio 0.3;
-
- // Angle used to pick up medial axis points
- minMedianAxisAngle 130;
-
- // Create buffer region for new layer terminations
- nBufferCellsNoExtrude 0;
-}
-
-
-
-// Generic mesh quality settings. At any undoable phase these determine
-// where to undo.
-meshQualityControls
-{
- //- Maximum non-orthogonality allowed. Set to 180 to disable.
- maxNonOrtho 65;
-
- //- Max skewness allowed. Set to <0 to disable.
- maxBoundarySkewness 20;
- maxInternalSkewness 4;
-
- //- Max concaveness allowed. Is angle (in degrees) below which concavity
- // is allowed. 0 is straight face, <0 would be convex face.
- // Set to 180 to disable.
- maxConcave 80;
-
- //- Minimum projected area v.s. actual area. Set to -1 to disable.
- minFlatness 0.5;
-
- //- Minimum pyramid volume. Is absolute volume of cell pyramid.
- // Set to very negative number (e.g. -1E30) to disable.
- minVol 1e-13;
-
- //- Minimum face area. Set to <0 to disable.
- minArea -1;
-
- //- Minimum face twist. Set to <-1 to disable. dot product of face normal
- //- and face centre triangles normal
- minTwist 0.05;
-
- //- minimum normalised cell determinant
- //- 1 = hex, <= 0 = folded or flattened illegal cell
- minDeterminant 0.001;
-
- //- minFaceWeight (0 -> 0.5)
- minFaceWeight 0.05;
-
- //- minVolRatio (0 -> 1)
- minVolRatio 0.01;
-
- //must be >0 for Fluent compatibility
- minTriangleTwist -1;
-
-
- // Advanced
-
- //- Number of error distribution iterations
- nSmoothScale 4;
- //- amount to scale back displacement at error points
- errorReduction 0.75;
-}
-
-
-// Advanced
-
-// Flags for optional output
-// 0 : only write final meshes
-// 1 : write intermediate meshes
-// 2 : write volScalarField with cellLevel for postprocessing
-// 4 : write current intersections as .obj files
-debug 0;
-
-
-// Merge tolerance. Is fraction of overall bounding box of initial mesh.
-// Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
-
-// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/system/fvSolution b/tutorials/snappyHexMesh/motorBike/system/fvSolution
deleted file mode 100644
index 242f5524a281abb08f508c60ce47a0b3d4624647..0000000000000000000000000000000000000000
--- a/tutorials/snappyHexMesh/motorBike/system/fvSolution
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- //p ICCG 1e-06 0;
- p AMG 1e-06 0 10;
- U BICCG 1e-05 0;
-
- // Meshmotion
- cellMotionU ICCG 1e-6 0.0;
- cellMotionUx ICCG 1e-6 0.0;
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- pRefCell 0;
- pRefValue 0;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict b/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict
deleted file mode 100644
index e3d24a69219cfb53bbcb51cb9d2e02bc7ed434f5..0000000000000000000000000000000000000000
--- a/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict
+++ /dev/null
@@ -1,577 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object autoHexMeshDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Which of the steps to run
-castellatedMesh true;
-snap true;
-addLayers true;
-
-
-// Geometry. Definition of all surfaces. All surfaces are of class
-// searchableSurface.
-// Surfaces are used
-// - to specify refinement for any mesh cell intersecting it
-// - to specify refinement for any mesh cell inside/outside/near
-// - to 'snap' the mesh boundary to the surface
-geometry
-{
- motorBike.stl
- {
- type triSurfaceMesh;
- name motorBike;
- }
-
- refinementBox
- {
- type searchableBox;
- min (-0.3 -0.4 -0.1);
- max ( 3.0 0.4 1.4);
- }
-};
-
-
-
-// Settings for the castellatedMesh generation.
-castellatedMeshControls
-{
-
- // Refinement parameters
- // ~~~~~~~~~~~~~~~~~~~~~
-
- // While refining maximum number of cells per processor. This is basically
- // the number of cells that fit on a processor. If you choose this too small
- // it will do just more refinement iterations to obtain a similar mesh.
- maxLocalCells 1000000;
-
- // Overall cell limit (approximately). Refinement will stop immediately
- // upon reaching this number so a refinement level might not complete.
- // Note that this is the number of cells before removing the part which
- // is not 'visible' from the keepPoint. The final number of cells might
- // actually be a lot less.
- maxGlobalCells 2000000;
-
- // The surface refinement loop might spend lots of iterations refining just a
- // few cells. This setting will cause refinement to stop if <= minimumRefine
- // are selected for refinement. Note: it will at least do one iteration
- // (unless the number of cells to refine is 0)
- minRefinementCells 10;
-
- // Number of buffer layers between different levels.
- // 1 means normal 2:1 refinement restriction, larger means slower
- // refinement.
- nCellsBetweenLevels 2;
-
-
-
- // Explicit feature edge refinement
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- // Specifies a level for any cell intersected by its edges.
- // This is a featureEdgeMesh, read from constant/triSurface for now.
- features
- (
- //{
- // file "someLine.eMesh";
- // level 2;
- //}
- );
-
-
-
- // Surface based refinement
- // ~~~~~~~~~~~~~~~~~~~~~~~~
-
- // Specifies two levels for every surface. The first is the minimum level,
- // every cell intersecting a surface gets refined up to the minimum level.
- // The second level is the maximum level. Cells that 'see' multiple
- // intersections where the intersections make an
- // angle > resolveFeatureAngle get refined up to the maximum level.
-
- refinementSurfaces
- {
- motorBike
- {
- // Surface-wise min and max refinement level
- level (5 6);
- }
- }
-
- // Resolve sharp angles
- resolveFeatureAngle 30;
-
-
- // Region-wise refinement
- // ~~~~~~~~~~~~~~~~~~~~~~
-
- // Specifies refinement level for cells in relation to a surface. One of
- // three modes
- // - distance. 'levels' specifies per distance to the surface the
- // wanted refinement level. The distances need to be specified in
- // descending order.
- // - inside. 'levels' is only one entry and only the level is used. All
- // cells inside the surface get refined up to the level. The surface
- // needs to be closed for this to be possible.
- // - outside. Same but cells outside.
-
- refinementRegions
- {
- refinementBox
- {
- mode inside;
- levels ((1E15 4));
- }
- }
-
-
- // Mesh selection
- // ~~~~~~~~~~~~~~
-
- // After refinement patches get added for all refinementSurfaces and
- // all cells intersecting the surfaces get put into these patches. The
- // section reachable from the locationInMesh is kept.
- // NOTE: This point should never be on a face, always inside a cell, even
- // after refinement.
- locationInMesh (3 3 0.43);
-}
-
-
-
-// Settings for the snapping.
-snapControls
-{
- //- Number of patch smoothing iterations before finding correspondence
- // to surface
- nSmoothPatch 3;
-
- //- Relative distance for points to be attracted by surface feature point
- // or edge. True distance is this factor times local
- // maximum edge length.
- tolerance 4.0;
-
- //- Number of mesh displacement relaxation iterations.
- nSolveIter 30;
-
- //- Maximum number of snapping relaxation iterations. Should stop
- // before upon reaching a correct mesh.
- nRelaxIter 5;
-}
-
-
-
-// Settings for the layer addition.
-addLayersControls
-{
- // Per final patch (so not geometry!) the layer information
- layers
- {
- minZ
- {
- nSurfaceLayers 1;
- }
- motorBike_frt-fairing:001%1
- {
- nSurfaceLayers 1;
- }
- motorBike_windshield:002%2
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-rim:005%5
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-rim:010%10
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-wh-rim:011%11
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-wh-brake-disk:012%12
- {
- nSurfaceLayers 1;
- }
- motorBike_frame:016-shadow%13
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-susp:014%14
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-susp:014-shadow%15
- {
- nSurfaceLayers 1;
- }
- motorBike_frame:016%16
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-rim:005-shadow%17
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-chain-hub:022%22
- {
- nSurfaceLayers 1;
- }
- motorBike_rearseat%24
- {
- nSurfaceLayers 1;
- }
- motorBike_frt-fairing%25
- {
- nSurfaceLayers 1;
- }
- motorBike_windshield%26
- {
- nSurfaceLayers 1;
- }
- motorBike_headlights%27
- {
- nSurfaceLayers 1;
- }
- motorBike_driversseat%28
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-body%29
- {
- nSurfaceLayers 1;
- }
- motorBike_fuel-tank%30
- {
- nSurfaceLayers 1;
- }
- motorBike_exhaust%31
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-rim%32
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-mud-guard%33
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-wh-rim%34
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-wh-brake-disk%35
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-brake-caliper%36
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-wh-tyre%37
- {
- nSurfaceLayers 1;
- }
- motorBike_hbars%38
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-forks%39
- {
- nSurfaceLayers 1;
- }
- motorBike_chain%40
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-tyre%41
- {
- nSurfaceLayers 1;
- }
- motorBike_square-dial%42
- {
- nSurfaceLayers 1;
- }
- motorBike_round-dial%43
- {
- nSurfaceLayers 1;
- }
- motorBike_dial-holder%44
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-susp%45
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-brake-lights%46
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-light-bracket%47
- {
- nSurfaceLayers 1;
- }
- motorBike_frame%48
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-mud-guard%49
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-susp-spring-damp%50
- {
- nSurfaceLayers 1;
- }
- motorBike_fairing-inner-plate%51
- {
- nSurfaceLayers 1;
- }
- motorBike_clutch-housing%52
- {
- nSurfaceLayers 1;
- }
- motorBike_radiator%53
- {
- nSurfaceLayers 1;
- }
- motorBike_water-pipe%54
- {
- nSurfaceLayers 1;
- }
- motorBike_water-pump%55
- {
- nSurfaceLayers 1;
- }
- motorBike_engine%56
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-shock-link%57
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-brake-fluid-pot-bracket%58
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-brake-fluid-pot%59
- {
- nSurfaceLayers 1;
- }
- motorBike_footpeg%60
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-chain-hub%61
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-brake-caliper%62
- {
- nSurfaceLayers 1;
- }
- motorBike_rider-helmet%65
- {
- nSurfaceLayers 1;
- }
- motorBike_rider-visor%66
- {
- nSurfaceLayers 1;
- }
- motorBike_rider-boots%67
- {
- nSurfaceLayers 1;
- }
- motorBike_rider-gloves%68
- {
- nSurfaceLayers 1;
- }
- motorBike_rider-body%69
- {
- nSurfaceLayers 1;
- }
- motorBike_frame:0%70
- {
- nSurfaceLayers 1;
- }
- motorBike_frt-fairing:001-shadow%74
- {
- nSurfaceLayers 1;
- }
- motorBike_windshield-shadow%75
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-mud-guard-shadow%81
- {
- nSurfaceLayers 1;
- }
- motorBike_fr-wh-brake-disk-shadow%83
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-mud-guard-shadow%84
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-susp-spring-damp-shadow%85
- {
- nSurfaceLayers 1;
- }
- motorBike_radiator-shadow%86
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-shock-link-shadow%87
- {
- nSurfaceLayers 1;
- }
- motorBike_rear-brake-fluid-pot-bracket-shadow%88
- {
- nSurfaceLayers 1;
- }
- motorBike_rr-wh-chain-hub-shadow%89
- {
- nSurfaceLayers 1;
- }
- }
-
- // Expansion factor for layer mesh
- expansionRatio 1.0;
-
- //- Wanted thickness of final added cell layer. If multiple layers
- // is the
- // thickness of the layer furthest away from the wall.
- // Relative to undistorted size of cell outside layer.
- finalLayerRatio 0.3;
-
- //- Minimum thickness of cell layer. If for any reason layer
- // cannot be above minThickness do not add layer.
- // Relative to undistorted size of cell outside layer.
- minThickness 0.1;
-
- //- If points get not extruded do nGrow layers of connected faces that are
- // also not grown. This helps convergence of the layer addition process
- // close to features.
- nGrow 1;
-
-
- // Advanced settings
-
- //- When not to extrude surface. 0 is flat surface, 90 is when two faces
- // make straight angle.
- featureAngle 30;
-
- //- Maximum number of snapping relaxation iterations. Should stop
- // before upon reaching a correct mesh.
- nRelaxIter 3;
-
- // Number of smoothing iterations of surface normals
- nSmoothSurfaceNormals 1;
-
- // Number of smoothing iterations of interior mesh movement direction
- nSmoothNormals 3;
-
- // Smooth layer thickness over surface patches
- nSmoothThickness 10;
-
- // Stop layer growth on highly warped cells
- maxFaceThicknessRatio 0.5;
-
- // Reduce layer growth where ratio thickness to medial
- // distance is large
- maxThicknessToMedialRatio 0.3;
-
- // Angle used to pick up medial axis points
- minMedianAxisAngle 130;
-
- // Create buffer region for new layer terminations
- nBufferCellsNoExtrude 0;
-}
-
-
-
-// Generic mesh quality settings. At any undoable phase these determine
-// where to undo.
-meshQualityControls
-{
- //- Maximum non-orthogonality allowed. Set to 180 to disable.
- maxNonOrtho 65;
-
- //- Max skewness allowed. Set to <0 to disable.
- maxBoundarySkewness 20;
- maxInternalSkewness 4;
-
- //- Max concaveness allowed. Is angle (in degrees) below which concavity
- // is allowed. 0 is straight face, <0 would be convex face.
- // Set to 180 to disable.
- maxConcave 80;
-
- //- Minimum projected area v.s. actual area. Set to -1 to disable.
- minFlatness 0.5;
-
- //- Minimum pyramid volume. Is absolute volume of cell pyramid.
- // Set to very negative number (e.g. -1E30) to disable.
- minVol 1e-13;
-
- //- Minimum face area. Set to <0 to disable.
- minArea -1;
-
- //- Minimum face twist. Set to <-1 to disable. dot product of face normal
- //- and face centre triangles normal
- minTwist 0.02;
-
- //- minimum normalised cell determinant
- //- 1 = hex, <= 0 = folded or flattened illegal cell
- minDeterminant 0.001;
-
- //- minFaceWeight (0 -> 0.5)
- minFaceWeight 0.02;
-
- //- minVolRatio (0 -> 1)
- minVolRatio 0.01;
-
- //must be >0 for Fluent compatibility
- minTriangleTwist -1;
-
-
- // Advanced
-
- //- Number of error distribution iterations
- nSmoothScale 4;
- //- amount to scale back displacement at error points
- errorReduction 0.75;
-}
-
-
-// Advanced
-
-// Flags for optional output
-// 0 : only write final meshes
-// 1 : write intermediate meshes
-// 2 : write volScalarField with cellLevel for postprocessing
-// 4 : write current intersections as .obj files
-debug 0;
-
-
-// Merge tolerance. Is fraction of overall bounding box of initial mesh.
-// Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
-
-// ************************************************************************* //
diff --git a/tutorials/sonicFoam/forwardStep/constant/thermodynamicProperties b/tutorials/sonicFoam/forwardStep/constant/thermodynamicProperties
deleted file mode 100644
index 06d85de3fda58355e45f9eabd319f9f2d651c046..0000000000000000000000000000000000000000
--- a/tutorials/sonicFoam/forwardStep/constant/thermodynamicProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermodynamicProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Cv Cv [0 2 -2 -1 0 0 0] 1.78571;
-
-R R [0 2 -2 -1 0 0 0] 0.714286;
-
-// ************************************************************************* //
diff --git a/tutorials/sonicFoam/forwardStep/constant/transportProperties b/tutorials/sonicFoam/forwardStep/constant/transportProperties
deleted file mode 100644
index d6a0c72beb79a6e3582b1d20a89231d32b1000e4..0000000000000000000000000000000000000000
--- a/tutorials/sonicFoam/forwardStep/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mu mu [1 -1 -1 0 0 0 0] 0;
-
-// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/constant/thermodynamicProperties b/tutorials/sonicFoam/shockTube/constant/thermodynamicProperties
deleted file mode 100644
index 059e9ca5da5a9c48fadead26dd23cc1f173de03a..0000000000000000000000000000000000000000
--- a/tutorials/sonicFoam/shockTube/constant/thermodynamicProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object thermodynamicProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Cv Cv [0 2 -2 -1 0 0 0] 717.5;
-
-R R [0 2 -2 -1 0 0 0] 287;
-
-// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/constant/transportProperties b/tutorials/sonicFoam/shockTube/constant/transportProperties
deleted file mode 100644
index d6a0c72beb79a6e3582b1d20a89231d32b1000e4..0000000000000000000000000000000000000000
--- a/tutorials/sonicFoam/shockTube/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mu mu [1 -1 -1 0 0 0 0] 0;
-
-// ************************************************************************* //
diff --git a/tutorials/sonicFoam/shockTube/system/setFieldsDict b/tutorials/sonicFoam/shockTube/system/setFieldsDict
deleted file mode 100644
index 83d5d1949f882e06edebc5978d5fd1e41b8a95e1..0000000000000000000000000000000000000000
--- a/tutorials/sonicFoam/shockTube/system/setFieldsDict
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
- volVectorFieldValue U (0 0 0)
- volScalarFieldValue T 348.43206
- volScalarFieldValue p 1.0e+5
-);
-
-regions
-(
- boxToCell
- {
- box (0 -1 -1) (5 1 1);
-
- fieldValues
- (
- volScalarFieldValue T 278.74564
- volScalarFieldValue p 1.0e+4
- );
- }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/sonicLiquidFoam/decompressionTank/constant/transportProperties
deleted file mode 100644
index 56a02ffaf9f039e3bef4320a1cbed5078f910aa5..0000000000000000000000000000000000000000
--- a/tutorials/sonicLiquidFoam/decompressionTank/constant/transportProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mu mu [1 -1 -1 0 0 0 0] 0.001;
-
-// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/constant/RASProperties b/tutorials/sonicTurbFoam/nacaAirfoil/constant/RASProperties
deleted file mode 100644
index 2a25f1c02aec638b149a209f3c58ddefc4f0206e..0000000000000000000000000000000000000000
--- a/tutorials/sonicTurbFoam/nacaAirfoil/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel LaunderSharmaKE;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/system/controlDict b/tutorials/sonicTurbFoam/nacaAirfoil/system/controlDict
deleted file mode 100644
index 41047af140f30e70db37ba7d6b0e667058ac49cd..0000000000000000000000000000000000000000
--- a/tutorials/sonicTurbFoam/nacaAirfoil/system/controlDict
+++ /dev/null
@@ -1,99 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 0.03;
-
-deltaT 4e-08;
-
-writeControl runTime;
-
-writeInterval 1e-05;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression compressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-functions
-(
- //forces
- //{
- // type forces;
- // functionObjectLibs ("libforces.so");
- //
- // // Patches to sample
- // patches (WALL10);
- // // Name of fields
- // pName p;
- // UName U;
- // // Dump to file
- // log true;
- // // Density
- // rhoInf 1;
- // // Centre of rotation
- // CofR (0 0 0);
- //}
-
- forces
- {
- type forceCoeffs;
- functionObjectLibs ("libforces.so");
-
- // Patches to sample
- patches (WALL10);
- // Name of fields
- pName p;
- UName U;
- // Dump to file
- log true;
- // Density
- rhoInf 1;
- // Centre of rotation
- CofR (0 0 0);
-
- // Direction for lift
- liftDir (-0.239733 0.970839 0);
- // Direction for drag
- dragDir ( 0.970839 0.239733 0);
-
- // Pitching axis
- pitchAxis (0 0 1);
-
- magUInf 618.022;
-
- lRef 1.0;
- Aref 1.0;
- }
-
-);
-
-// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/nacaAirfoil/system/fvSolution b/tutorials/sonicTurbFoam/nacaAirfoil/system/fvSolution
deleted file mode 100644
index 53380b09c0c4bac36694d4ecbf32bf82761528e7..0000000000000000000000000000000000000000
--- a/tutorials/sonicTurbFoam/nacaAirfoil/system/fvSolution
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PBiCG
- {
- preconditioner DILU;
- tolerance 1e-12;
- relTol 0;
- };
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-08;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 2;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/prism/constant/RASProperties b/tutorials/sonicTurbFoam/prism/constant/RASProperties
deleted file mode 100644
index 1af73fab26762603c5d1b4ed7a2d9cb5212a7290..0000000000000000000000000000000000000000
--- a/tutorials/sonicTurbFoam/prism/constant/RASProperties
+++ /dev/null
@@ -1,98 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-RASModel kEpsilon;
-
-turbulence on;
-
-printCoeffs on;
-
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
- Cmu 0.0845;
- C1 1.42;
- C2 1.68;
- C3 -0.33;
- alphah 1;
- alphak 1.39;
- alphaEps 1.39;
- eta0 4.38;
- beta 0.012;
-}
-
-LaunderSharmaKECoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-LRRCoeffs
-{
- Cmu 0.09;
- Clrr1 1.8;
- Clrr2 0.6;
- C1 1.44;
- C2 1.92;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-LaunderGibsonRSTMCoeffs
-{
- Cmu 0.09;
- Clg1 1.8;
- Clg2 0.6;
- C1 1.44;
- C2 1.92;
- C1Ref 0.5;
- C2Ref 0.3;
- Cs 0.25;
- Ceps 0.15;
- alphah 1;
- alphaEps 0.76923;
- alphaR 1.22;
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/sonicTurbFoam/prism/system/fvSolution b/tutorials/sonicTurbFoam/prism/system/fvSolution
deleted file mode 100644
index 2e14267da5dcd436bc2b66d27ad5925b22e7eab5..0000000000000000000000000000000000000000
--- a/tutorials/sonicTurbFoam/prism/system/fvSolution
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- rho PCG
- {
- preconditioner DIC;
- tolerance 1e-05;
- relTol 0;
- };
- U PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- h PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-08;
- relTol 0;
- };
- R PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 2;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/0/D b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
similarity index 100%
rename from tutorials/solidDisplacementFoam/plateHole/0/D
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/D
diff --git a/tutorials/solidDisplacementFoam/plateHole/0/T b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
similarity index 100%
rename from tutorials/solidDisplacementFoam/plateHole/0/T
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/0/T
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
similarity index 74%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
index 247cf4f822ef80e7bdd56c98ea2be3ca11adad9e..3cfd7ac9ea8c7e56ec2e38b7dffb7ab28d547efa 100644
--- a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/mechanicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,14 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object mechanicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rho rho [1 -3 0 0 0 0 0] 7854;
-E E [1 -1 -2 0 0 0 0] 2e+11;
-nu nu [0 0 0 0 0 0 0] 0.0;
-planeStress yes;
+rho rho [ 1 -3 0 0 0 0 0 ] 7854;
-// ************************************************************************* //
+nu nu [ 0 0 0 0 0 0 0 ] 0.3;
+
+E E [ 1 -1 -2 0 0 0 0 ] 2e+11;
+
+planeStress yes;
+
+// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/blockMeshDict
diff --git a/tutorials/solidDisplacementFoam/plateHole/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
diff --git a/tutorials/solidDisplacementFoam/plateHole/constant/thermalProperties b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
similarity index 77%
rename from tutorials/solidDisplacementFoam/plateHole/constant/thermalProperties
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
index 697653844566102223cde17a4113857b1a0be883..cc2766f73fc0fda6cd81ef814e30b59a71186501 100644
--- a/tutorials/solidDisplacementFoam/plateHole/constant/thermalProperties
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/thermalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-C C [0 2 -2 -1 0 0 0] 434;
+C C [ 0 2 -2 -1 0 0 0 ] 434;
-k k [1 1 -3 -1 0 0 0] 60.5;
+k k [ 1 1 -3 -1 0 0 0 ] 60.5;
-alpha alpha [0 0 0 -1 0 0 0] 1.1e-05;
+alpha alpha [ 0 0 0 -1 0 0 0 ] 1.1e-05;
thermalStress no;
+
// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
similarity index 92%
rename from tutorials/solidDisplacementFoam/plateHole/system/controlDict
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
index 14218ed2cf9afeb4868b3cca87a9fcdc7541d715..a6c2f2ec34b806dbfd3a94ac05d1f6b10681b075 100644
--- a/tutorials/solidDisplacementFoam/plateHole/system/controlDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
startFrom startTime;
startTime 0;
@@ -45,4 +45,5 @@ graphFormat raw;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/system/fvSchemes b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
similarity index 91%
rename from tutorials/solidDisplacementFoam/plateHole/system/fvSchemes
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
index 80a280328fb8493b3c2eb7198aafcfd02975d6ee..04aadf324474aa05a22d2ef2037a8fb82e45acab 100644
--- a/tutorials/solidDisplacementFoam/plateHole/system/fvSchemes
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
d2dt2Schemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
@@ -56,4 +57,5 @@ fluxRequired
T no;
}
+
// ************************************************************************* //
diff --git a/tutorials/solidDisplacementFoam/plateHole/system/fvSolution b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
similarity index 67%
rename from tutorials/solidDisplacementFoam/plateHole/system/fvSolution
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
index 322eae255971126c2f65dcb06da72a6e1364e40b..e940f183e123b55b68513af723914e92065a0ae2 100644
--- a/tutorials/solidDisplacementFoam/plateHole/system/fvSolution
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,41 +10,36 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- D GAMG
+ D
{
- tolerance 1e-06;
- relTol 0.9;
-
- smoother GaussSeidel;
-
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0.9;
+ smoother GaussSeidel;
cacheAgglomeration true;
-
nCellsInCoarsestLevel 20;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- T GAMG
+ T
{
- tolerance 1e-06;
- relTol 0.9;
-
- smoother GaussSeidel;
-
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0.9;
+ smoother GaussSeidel;
cacheAgglomeration true;
-
nCellsInCoarsestLevel 20;
-
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
}
stressAnalysis
@@ -54,4 +49,5 @@ stressAnalysis
D 1e-06;
}
+
// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
new file mode 100644
index 0000000000000000000000000000000000000000..db2a9715f298a40a8e7d5d702733d50106ef7592
--- /dev/null
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
@@ -0,0 +1,29 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object sampleDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+interpolationScheme cellPoint;
+
+setFormat raw;
+
+sets ( leftPatch { type uniform ; axis y ; start ( 0 0.5 0.25 ) ; end ( 0 2 0.25 ) ; nPoints 100 ; } );
+
+surfaces ( );
+
+fields ( sigmaxx );
+
+
+// ************************************************************************* //
diff --git a/tutorials/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
similarity index 70%
rename from tutorials/cavitatingFoam/les/throttle3D/system/refineMeshDict
rename to tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
index 91dd88b58aa8c81804ffa4576073666631fb6dd8..71e26c183797fb3b13f1f3b41ed06bf30015e6f3 100644
--- a/tutorials/cavitatingFoam/les/throttle3D/system/refineMeshDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,32 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object refineMeshDict;
+ location "system";
+ object sampleSurfaceDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-set c0;
+interpolationScheme cellPoint;
-coordinateSystem global;
+surfaceFormat dx;
-globalCoeffs
-{
- tan1 (1 0 0);
- tan2 (0 1 0);
- tan3 (0 0 1);
-}
-
-directions
-(
- tan1
- tan2
- tan3
-);
-
-useHexTopology yes;
+surfaces ( constantPlane { name plate ; basePoint ( 0 0 0.25 ) ; normalVector ( 0 0 1 ) ; } );
-geometricCut no;
+fields ( sigmaxx );
-writeMesh no;
// ************************************************************************* //
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/0/D b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
similarity index 100%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/0/p b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
similarity index 100%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
diff --git a/tutorials/solidDisplacementFoam/plateHole/constant/mechanicalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
similarity index 78%
rename from tutorials/solidDisplacementFoam/plateHole/constant/mechanicalProperties
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
index e3320fa73f7afc1758dfae8c9b1689dc8db3131b..fa331e2c1d0f0ff151759d50215cbb65945fc606 100644
--- a/tutorials/solidDisplacementFoam/plateHole/constant/mechanicalProperties
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/mechanicalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object mechanicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-rho rho [1 -3 0 0 0 0 0] 7854;
+rho rho [ 1 -3 0 0 0 0 0 ] 7854;
-nu nu [0 0 0 0 0 0 0] 0.3;
+E E [ 1 -1 -2 0 0 0 0 ] 2e+11;
-E E [1 -1 -2 0 0 0 0] 2e+11;
+nu nu [ 0 0 0 0 0 0 0 ] 0;
planeStress yes;
+
// ************************************************************************* //
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/blockMeshDict
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
similarity index 77%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
index 697653844566102223cde17a4113857b1a0be883..cc2766f73fc0fda6cd81ef814e30b59a71186501 100644
--- a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/thermalProperties
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,16 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "constant";
object thermalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-C C [0 2 -2 -1 0 0 0] 434;
+C C [ 0 2 -2 -1 0 0 0 ] 434;
-k k [1 1 -3 -1 0 0 0] 60.5;
+k k [ 1 1 -3 -1 0 0 0 ] 60.5;
-alpha alpha [0 0 0 -1 0 0 0] 1.1e-05;
+alpha alpha [ 0 0 0 -1 0 0 0 ] 1.1e-05;
thermalStress no;
+
// ************************************************************************* //
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
similarity index 92%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
index a4cb735f882ce260afca0512db40e8b2087e249b..70865b72da752836df8bc02216e167b06b599cd0 100644
--- a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,4 +41,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
similarity index 87%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
index 40023235e70c56fc9053d8534eb1b8ea955ebfcc..4118e538da1612cb06abdb8a787e6834d20a0835 100644
--- a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,7 +10,8 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object controlDict;
+ location "system";
+ object controlDict.org;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,7 +27,7 @@ deltaT 2e-05;
writeControl runTime;
-writeInterval 2.5e-02;
+writeInterval 0.025;
purgeWrite 0;
@@ -40,4 +41,5 @@ timePrecision 6;
runTimeModifiable yes;
+
// ************************************************************************* //
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
similarity index 82%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
index 46da299431b31a316c493ec90a615be71b0e15f9..8a9bcb77cfdd053b601a0208621f7084016e7262 100644
--- a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSchemes
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,23 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
d2dt2Schemes
{
- default steadyState;
+ default steadyState;
}
gradSchemes
{
- default Gauss cubic; //fourth; //Gauss linear;
+ default Gauss cubic;
}
divSchemes
{
- default Gauss cubic; //Gauss linear;
+ default Gauss cubic;
}
laplacianSchemes
@@ -47,7 +48,8 @@ snGradSchemes
fluxRequired
{
default no;
- D;
+ D ;
}
+
// ************************************************************************* //
diff --git a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
similarity index 63%
rename from tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
rename to tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
index 1263539c228358f5735efe4153c5b09f957c40da..eef2e5a2dbf5ab259e2e1ccac8803a6c49353894 100644
--- a/tutorials/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/fvSolution
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,48 +10,44 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
+ location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
- D GAMG
+ D
{
- tolerance 1e-06;
- relTol 0.99;
-
- smoother GaussSeidel;
-
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0.99;
+ smoother GaussSeidel;
cacheAgglomeration true;
-
nCellsInCoarsestLevel 6;
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
-
- Dcorr GAMG
+ Dcorr
{
- tolerance 1e-06;
- relTol 0.99;
-
- smoother GaussSeidel;
-
+ solver GAMG;
+ tolerance 1e-06;
+ relTol 0.99;
+ smoother GaussSeidel;
cacheAgglomeration true;
-
nCellsInCoarsestLevel 6;
-
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
+ agglomerator faceAreaPair;
+ mergeLevels 1;
+ }
}
stressAnalysis
{
- nCorrectors 1;
- D 1e-10;
+ nCorrectors 1;
+ D 1e-10;
accelerationFactor 2;
}
+
// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/RASProperties b/tutorials/twoPhaseEulerFoam/bed/constant/RASProperties
deleted file mode 100644
index 9a6e83d8dee458d7c68b400aaa2f7132f75b65a6..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed/constant/RASProperties
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Switch turbulence model on or off
-
-turbulence on;
-
-printCoeffs on;
-
-// Standard k-epsilon model coefficients
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.375;
-
- alphak 1.0;
- alphaEps 0.82142;
-}
-
-// Wall function coefficients
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/environmentalProperties b/tutorials/twoPhaseEulerFoam/bed/constant/environmentalProperties
deleted file mode 100644
index bf423d1c51d003e026a3fb610e45ee7332f073ef..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0] (0 0 -9.81);
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/filterProperties b/tutorials/twoPhaseEulerFoam/bed/constant/filterProperties
deleted file mode 100644
index 79c0a96d7142ca06a862e1b620c232f9643f2bdc..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed/constant/filterProperties
+++ /dev/null
@@ -1,26 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object filterProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-filter off;
-
-// filterNormal has to be in the direction of trapped particles
-filterNormal (0 0 1);
-
-filterPosition filterPosition [0 1 0 0 0] (0 0 0.02);
-
-filterThickness filterThickness [0 1 0 0 0] 1.0e-6;
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
deleted file mode 100644
index 54773983962ab22f55e77ffa8874148f58fc26ff..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object kineticTheoryProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-kineticTheory off;
-
-equilibrium on;
-
-e e [ 0 0 0 0 0 0 0 ] 0.9 ;
-
-alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6 ;
-
-alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5 ;
-
-Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ;
-
-eta eta [ 0 0 0 0 0 0 0 ] 2.0 ;
-
-p p [ 0 0 0 0 0 0 0 ] 5.0 ;
-
-phi phi [ 0 0 0 0 0 0 0 ] 25.0 ;
-
-viscosityModel Syamlal;
-
-conductivityModel HrenyaSinclair;
-
-granularPressureModel Lun;
-
-frictionalStressModel JohnsonJackson;
-
-radialModel Gidaspow;
-
-HrenyaSinclairCoeffs
-{
- L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/constant/transportProperties b/tutorials/twoPhaseEulerFoam/bed/constant/transportProperties
deleted file mode 100644
index 657b38074edb24a6e0e29e67ea561547926d8a4e..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed/constant/transportProperties
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// a is the discrete phase and
-// b is the continuous phase
-
-// sand
-phasea
-{
- rho rho [1 -3 0 0 0] 2640;
- nu nu [0 2 -1 0 0] 1.0e-6;
- d d [0 1 0 0 0 0 0] 480.0e-6;
-}
-
-// air
-phaseb
-{
- rho rho [1 -3 0 0 0] 1.28;
- nu nu [0 2 -1 0 0] 1.328e-5;
- d d [0 1 0 0 0 0 0] 1.0;
-}
-
-Cvm Cvm [0 0 0 0 0] 0.0;
-Cl Cl [0 0 0 0 0] 0.0;
-Ct Ct [0 0 0 0 0] 0.0;
-alphaAlpha alphaAlpha [0 0 0 0 0] 0.0;
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed/system/fvSolution b/tutorials/twoPhaseEulerFoam/bed/system/fvSolution
deleted file mode 100644
index 2cd36751bdcc0663497ff79cdc21af464b4f9ab7..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed/system/fvSolution
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- smoother DIC; //GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
- Ua PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Ub PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- alpha PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- beta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- Theta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 2;
- correctAlpha yes;
- pRefCell 0;
- pRefValue 0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/RASProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/RASProperties
deleted file mode 100644
index 9a6e83d8dee458d7c68b400aaa2f7132f75b65a6..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/RASProperties
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object RASProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Switch turbulence model on or off
-
-turbulence on;
-
-printCoeffs on;
-
-// Standard k-epsilon model coefficients
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.375;
-
- alphak 1.0;
- alphaEps 0.82142;
-}
-
-// Wall function coefficients
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9.0;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/environmentalProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/environmentalProperties
deleted file mode 100644
index d7a56e9b2f62f49753030db15895bf067dd344cb..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/filterProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/filterProperties
deleted file mode 100644
index 79c0a96d7142ca06a862e1b620c232f9643f2bdc..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/filterProperties
+++ /dev/null
@@ -1,26 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object filterProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-filter off;
-
-// filterNormal has to be in the direction of trapped particles
-filterNormal (0 0 1);
-
-filterPosition filterPosition [0 1 0 0 0] (0 0 0.02);
-
-filterThickness filterThickness [0 1 0 0 0] 1.0e-6;
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
deleted file mode 100644
index 88224645ce0552b167893610c133f8284b69f007..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/kineticTheoryProperties
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object kineticTheoryProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-kineticTheory on;
-
-equilibrium on;
-
-e e [ 0 0 0 0 0 0 0 ] 0.8 ;
-
-alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.62 ;
-
-alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.65 ;
-
-Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ;
-
-eta eta [ 0 0 0 0 0 0 0 ] 2.0 ;
-
-p p [ 0 0 0 0 0 0 0 ] 5.0 ;
-
-phi phi [ 0 0 0 0 0 0 0 ] 0.0 ;
-
-viscosityModel Gidaspow;
-
-conductivityModel Gidaspow;
-
-granularPressureModel Lun;
-
-frictionalStressModel JohnsonJackson;
-
-radialModel Gidaspow;
-
-HrenyaSinclairCoeffs
-{
- L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/constant/transportProperties b/tutorials/twoPhaseEulerFoam/bed2/constant/transportProperties
deleted file mode 100644
index 02e67fa12aa89f67c4d303381b35ceb487a84a12..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed2/constant/transportProperties
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// a is the discrete phase and
-// b is the continuous phase
-
-// sand
-phasea
-{
- rho rho [1 -3 0 0 0] 2500;
- nu nu [0 2 -1 0 0] 1.0e-6;
- d d [0 1 0 0 0 0 0] 300.0e-6;
-}
-
-// air
-phaseb
-{
- rho rho [1 -3 0 0 0] 1.2;
- nu nu [0 2 -1 0 0] 1.5e-5;
- d d [0 1 0 0 0 0 0] 1.0;
-}
-
-Cvm Cvm [0 0 0 0 0] 0.0;
-Cl Cl [0 0 0 0 0] 0.0;
-Ct Ct [0 0 0 0 0] 0.0;
-alphaAlpha alphaAlpha [0 0 0 0 0] 0.0;
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/fvSolution b/tutorials/twoPhaseEulerFoam/bed2/system/fvSolution
deleted file mode 100644
index 9fb3867d9344f38c63f25185d8bb5122d66d8ddb..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bed2/system/fvSolution
+++ /dev/null
@@ -1,99 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- smoother DIC;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
- Ua PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Ub PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- alpha PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- beta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- Theta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 2;
- correctAlpha yes;
- pRefCell 0;
- pRefValue 0;
-}
-
-relaxationFactors
-{
- Ua 1;
- Ub 1;
- alpha 1;
- beta 1;
- Theta 1;
- k 1;
- epsilon 1;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index 03e0adce892c8e4fdd83c43484578d4bb486aca3..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties b/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
deleted file mode 100644
index 54773983962ab22f55e77ffa8874148f58fc26ff..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/constant/kineticTheoryProperties
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object kineticTheoryProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-kineticTheory off;
-
-equilibrium on;
-
-e e [ 0 0 0 0 0 0 0 ] 0.9 ;
-
-alphaMax alphaMax [ 0 0 0 0 0 0 0 ] 0.6 ;
-
-alphaMinFriction alphaMinFriction [ 0 0 0 0 0 0 0 ] 0.5 ;
-
-Fr Fr [ 1 -1 -2 0 0 0 0 ] 0.05 ;
-
-eta eta [ 0 0 0 0 0 0 0 ] 2.0 ;
-
-p p [ 0 0 0 0 0 0 0 ] 5.0 ;
-
-phi phi [ 0 0 0 0 0 0 0 ] 25.0 ;
-
-viscosityModel Syamlal;
-
-conductivityModel HrenyaSinclair;
-
-granularPressureModel Lun;
-
-frictionalStressModel JohnsonJackson;
-
-radialModel Gidaspow;
-
-HrenyaSinclairCoeffs
-{
- L L [ 0 1 0 0 0 0 0 ] 5.0e-4 ;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
deleted file mode 100644
index 9e338073203e9014de7f445b7ec3555a1659ed06..0000000000000000000000000000000000000000
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/fvSolution
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
- p GAMG
- {
- tolerance 1e-8;
- relTol 0;
-
- smoother DIC; //GaussSeidel;
- nPreSweeps 0;
- nPostSweeps 2;
- nFinestSweeps 2;
-
- cacheAgglomeration true;
- nCellsInCoarsestLevel 10;
- agglomerator faceAreaPair;
- mergeLevels 1;
- };
- Ua PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- Ub PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- alpha PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- beta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-10;
- relTol 0;
- };
- Theta PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- k PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
- epsilon PBiCG
- {
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- };
-}
-
-PISO
-{
- nCorrectors 2;
- nNonOrthogonalCorrectors 0;
- nAlphaCorr 2;
- correctAlpha no;
- pRefCell 0;
- pRefValue 0;
-}
-
-// ************************************************************************* //