From 052c2a6532d700fb24e6b753918561880ca3fdf4 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 26 Sep 2014 15:09:58 +0100 Subject: [PATCH 1/8] Compilation of Isentropic total pressure bc --- src/thermophysicalModels/basic/Make/files | 1 + 1 file changed, 1 insertion(+) diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files index b1d247f4d..80bd1f7cf 100644 --- a/src/thermophysicalModels/basic/Make/files +++ b/src/thermophysicalModels/basic/Make/files @@ -25,6 +25,7 @@ derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C derivedFvPatchFields/temperatureDirectedInletOutletVelocity/temperatureDirectedInletOutletVelocityFvPatchVectorField.C +derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.C derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C LIB = $(FOAM_LIBBIN)/libbasicThermophysicalModels From a854351f62c1148276081308b9713fb431913f1b Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 26 Sep 2014 15:04:25 +0100 Subject: [PATCH 2/8] Update time loop format --- .../steadyCompressibleFoam/steadyCompressibleFoam.C | 2 +- .../steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C | 2 +- .../steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C b/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C index cb52ca57f..bc3e59981 100644 --- a/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C +++ b/applications/solvers/compressible/steadyCompressibleFoam/steadyCompressibleFoam.C @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; - for (runTime++; !runTime.end(); runTime++) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C b/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C index d54a4f48b..3fcf12795 100644 --- a/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C +++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/steadyCompressibleMRFFoam.C @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; - for (runTime++; !runTime.end(); runTime++) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C b/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C index d818ea7af..8857f5eec 100644 --- a/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C +++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; - for (runTime++; !runTime.end(); runTime++) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; From 6c18df843a0f6ae2fb9604cb641599eb034cd3f1 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 26 Sep 2014 15:03:45 +0100 Subject: [PATCH 3/8] Clean-up: p0 not needed Conflicts: src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C --- ...tropicTotalTemperatureFvPatchScalarField.C | 88 +++++++++---------- ...tropicTotalTemperatureFvPatchScalarField.H | 4 +- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C index e2a972e7b..9ae104711 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.C @@ -26,10 +26,8 @@ License #include "isentropicTotalTemperatureFvPatchScalarField.H" #include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" -#include "volFields.H" -#include "surfaceFields.H" - #include "basicThermo.H" +#include "isentropicTotalPressureFvPatchScalarField.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -41,25 +39,8 @@ isentropicTotalTemperatureFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), - pName_("Undefined"), - T0_(p.size(), 0.0), - p0_(p.size(), 0.0) -{} - - -Foam::isentropicTotalTemperatureFvPatchScalarField:: -isentropicTotalTemperatureFvPatchScalarField -( - const isentropicTotalTemperatureFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchScalarField(ptf, p, iF, mapper), - pName_(ptf.pName_), - T0_(ptf.T0_, mapper), - p0_(ptf.p0_, mapper) + pName_("p"), + T0_(p.size(), 0.0) {} @@ -72,9 +53,8 @@ isentropicTotalTemperatureFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), - pName_(dict.lookup("p")), - T0_("T0", dict, p.size()), - p0_("p0", dict, p.size()) + pName_(dict.lookupOrDefault("p", "p")), + T0_("T0", dict, p.size()) { if (dict.found("value")) { @@ -93,27 +73,40 @@ isentropicTotalTemperatureFvPatchScalarField Foam::isentropicTotalTemperatureFvPatchScalarField:: isentropicTotalTemperatureFvPatchScalarField ( - const isentropicTotalTemperatureFvPatchScalarField& tppsf + const isentropicTotalTemperatureFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper ) : - fixedValueFvPatchScalarField(tppsf), - pName_(tppsf.pName_), - T0_(tppsf.T0_), - p0_(tppsf.p0_) + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + pName_(ptf.pName_), + T0_(ptf.T0_, mapper) {} Foam::isentropicTotalTemperatureFvPatchScalarField:: isentropicTotalTemperatureFvPatchScalarField ( - const isentropicTotalTemperatureFvPatchScalarField& tppsf, + const isentropicTotalTemperatureFvPatchScalarField& ptf +) +: + fixedValueFvPatchScalarField(ptf), + pName_(ptf.pName_), + T0_(ptf.T0_) +{} + + +Foam::isentropicTotalTemperatureFvPatchScalarField:: +isentropicTotalTemperatureFvPatchScalarField +( + const isentropicTotalTemperatureFvPatchScalarField& ptf, const DimensionedField& iF ) : - fixedValueFvPatchScalarField(tppsf, iF), - pName_(tppsf.pName_), - T0_(tppsf.T0_), - p0_(tppsf.p0_) + fixedValueFvPatchScalarField(ptf, iF), + pName_(ptf.pName_), + T0_(ptf.T0_) {} @@ -126,7 +119,6 @@ void Foam::isentropicTotalTemperatureFvPatchScalarField::autoMap { fixedValueFvPatchScalarField::autoMap(m); T0_.autoMap(m); - p0_.autoMap(m); } @@ -142,7 +134,6 @@ void Foam::isentropicTotalTemperatureFvPatchScalarField::rmap refCast(ptf); T0_.rmap(tiptf.T0_, addr); - p0_.rmap(tiptf.p0_, addr); } @@ -152,24 +143,28 @@ void Foam::isentropicTotalTemperatureFvPatchScalarField::updateCoeffs() { return; } - const fvPatchField& p = + + // Get pressure and temperature + const scalarField& T = *this; + + const fvPatchScalarField& pp = patch().lookupPatchField(pName_); + const isentropicTotalPressureFvPatchScalarField& p = + refCast(pp); + const basicThermo& thermo = db().lookupObject("thermophysicalProperties"); - volScalarField gamma = thermo.Cp()/thermo.Cv(); + scalarField gamma = + thermo.Cp(T, patch().index())/thermo.Cv(T, patch().index()); - const fvPatchField& gammap = - patch().patchField(gamma); - - scalarField gM1ByG = (gammap - 1.0)/gammap; - - operator==(T0_*pow(p/p0_,gM1ByG)); + operator==(T0_*pow(p/p.p0(), (gamma - 1)/gamma)); fixedValueFvPatchScalarField::updateCoeffs(); } + void Foam::isentropicTotalTemperatureFvPatchScalarField::updateCoeffs ( const vectorField& Up @@ -185,9 +180,8 @@ void Foam::isentropicTotalTemperatureFvPatchScalarField::write ) const { fixedValueFvPatchScalarField::write(os); - os.writeKeyword("p") << pName_ << token::END_STATEMENT << nl; + writeEntryIfDifferent(os, "p", "p", pName_); T0_.writeEntry("T0", os); - p0_.writeEntry("p0", os); } diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.H index f8e4a21f7..6ae762f4a 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.H +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature/isentropicTotalTemperatureFvPatchScalarField.H @@ -43,7 +43,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class isentropicTotalTemperatureFvPatch Declaration + Class isentropicTotalTemperatureFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ class isentropicTotalTemperatureFvPatchScalarField @@ -58,8 +58,6 @@ class isentropicTotalTemperatureFvPatchScalarField //- Total temperature field scalarField T0_; - //- Total pressure field - scalarField p0_; public: From 0c1ad0a78ea625d38fb61d14b475233d45dda511 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 26 Sep 2014 15:02:23 +0100 Subject: [PATCH 4/8] Tutorial clean-up Conflicts: tutorials/mesh/cfMesh/Allclean --- .../bentRotorStator/system/fvSolution | 11 ++- .../turboPassageRotating/system/controlDict | 24 +++++++ .../system/decomposeParDict | 35 +-------- .../turboPassageRotating/system/fvSchemes | 7 +- .../simpleFoam/mixingPlaneAxial/0/U | 71 +++++++++++++++++++ .../simpleFoam/mixingPlaneAxial/0/epsilon | 68 ++++++++++++++++++ .../simpleFoam/mixingPlaneAxial/0/k | 69 ++++++++++++++++++ .../simpleFoam/mixingPlaneAxial/0/p | 68 ++++++++++++++++++ .../simpleFoam/mixingPlaneAxial/Allclean | 2 +- .../simpleFoam/mixingPlaneAxial/Allrun | 4 -- .../system/decomposeParDict | 5 +- 11 files changed, 311 insertions(+), 53 deletions(-) create mode 100644 tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/U create mode 100644 tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/epsilon create mode 100644 tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/k create mode 100644 tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/p diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSolution b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSolution index 9b985f11f..4b82cca5e 100644 --- a/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSolution +++ b/tutorials/compressible/steadyCompressibleMRFFoam/bentRotorStator/system/fvSolution @@ -25,7 +25,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.001; - }; + } U { solver BiCGStab; @@ -78,14 +78,13 @@ PIMPLE relaxationFactors { // Note: under-relaxation factors used in wave-transmissive schemes - U 0.5; - p 0.2; + U 0.7; + p 1; i 0.1; - h 0.5; rho 0.25; - k 0.2; - epsilon 0.2; + k 0.5; + epsilon 0.5; } fieldBounds diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict index 9628e5593..9ac14a7d7 100644 --- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict +++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/controlDict @@ -50,4 +50,28 @@ maxCo 0.8; maxDeltaT 0.01; + +functions +( + minMaxU + { + type minMaxField; + + // Where to load it from (if not already in solver) + functionObjectLibs (/*"libsampling.so"*/ "libfieldFunctionObjects.so"); + + name U; + } + minMaxP + { + type minMaxField; + + // Where to load it from (if not already in solver) + functionObjectLibs ("libfieldFunctionObjects.so"); + + name p; + } +); + + // ************************************************************************* // diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/decomposeParDict b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/decomposeParDict index 30d891a20..4b1faa378 100644 --- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/decomposeParDict +++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/decomposeParDict @@ -14,12 +14,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//- Keep owner and neighbour on same processor for faces in zones: -// preserveFaceZones ( interface1_faces interface2_faces ); - -//- Keep owner and neighbour on same processor for faces in patches: -// preservePatches ( interface1 interface2 ); - globalFaceZones ( interface1_faces @@ -28,10 +22,9 @@ globalFaceZones rotor_cyclic_lower_faces ); // Those are the names of the face zones created previously -numberOfSubdomains 4; // The problem will be decomposed in 4 different processors +numberOfSubdomains 4; method scotch; -// method metis; simpleCoeffs { @@ -39,32 +32,6 @@ simpleCoeffs delta 0.001; } -metisCoeffs -{ -/* - processorWeights - ( - 1 - 1 - 1 - 1 - ); -*/ -} - -scotchCoeffs -{ - //processorWeights - //( - // 1 - // 1 - // 1 - // 1 - //); - //writeGraph true; - //strategy "b"; -} - distributed no; roots diff --git a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes index 1650e3534..2bcdf4a03 100644 --- a/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes +++ b/tutorials/incompressible/icoDyMFoam/turboPassageRotating/system/fvSchemes @@ -33,12 +33,7 @@ divSchemes laplacianSchemes { - default none; - laplacian(nu,U) Gauss linear corrected; - laplacian(rAU,pcorr) Gauss linear corrected; - laplacian(rAU,p) Gauss linear corrected; - - laplacian((1|A(U)),p) Gauss linear corrected; + default Gauss linear corrected; } interpolationSchemes diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/U b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/U new file mode 100644 index 000000000..07e9283c3 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/U @@ -0,0 +1,71 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 3.1 | +| \\ / A nd | Web: http://www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + location "0"; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + upstreamMixingPlanePatch + { + type mixingPlane; + } + downstreamMixingPlanePatch + { + type mixingPlane; + } + upstreamPerio1 + { + type cyclicGgi; + } + upstreamPerio2 + { + type cyclicGgi; + } + downstreamPerio1 + { + type cyclicGgi; + } + downstreamPerio2 + { + type cyclicGgi; + } + downstreamWall + { + type symmetryPlane; + } + upstreamWall + { + type symmetryPlane; + } + inflow + { + type surfaceNormalFixedValue; + refValue uniform -10; + value uniform (0 0 0); + } + outflow + { + type inletOutlet; + inletValue uniform (0 0 0); + value uniform (0 0 0); + } +} + +// ************************************************************************* // + diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/epsilon b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/epsilon new file mode 100644 index 000000000..09404a324 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/epsilon @@ -0,0 +1,68 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 3.1 | +| \\ / A nd | Web: http://www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -3 0 0 0 0 ]; + +internalField uniform 0.1; + +boundaryField +{ + downstreamMixingPlanePatch + { + type mixingPlane; + } + upstreamMixingPlanePatch + { + type mixingPlane; + } + downstreamWall + { + type symmetryPlane; + } + upstreamWall + { + type symmetryPlane; + } + downstreamPerio1 + { + type cyclicGgi; + } + downstreamPerio2 + { + type cyclicGgi; + } + upstreamPerio1 + { + type cyclicGgi; + } + upstreamPerio2 + { + type cyclicGgi; + } + inflow + { + type fixedValue; + value uniform 0.1; + } + outflow + { + type zeroGradient; + } +} + +// ************************************************************************* // + diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/k b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/k new file mode 100644 index 000000000..19d4fd141 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/k @@ -0,0 +1,69 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 3.1 | +| \\ / A nd | Web: http://www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -2 0 0 0 0 ]; + +internalField uniform 0.01; + +boundaryField +{ + downstreamPerio1 + { + type cyclicGgi; + } + downstreamPerio2 + { + type cyclicGgi; + } + upstreamPerio1 + { + type cyclicGgi; + } + upstreamPerio2 + { + type cyclicGgi; + } + downstreamWall + { + type symmetryPlane; + } + upstreamWall + { + type symmetryPlane; + } + downstreamMixingPlanePatch + { + type mixingPlane; + } + upstreamMixingPlanePatch + { + type mixingPlane; + } + inflow + { + type fixedValue; + value uniform 0.01; + } + outflow + { + type zeroGradient; + } + +} + +// ************************************************************************* // + diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/p b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/p new file mode 100644 index 000000000..ba4e1b07e --- /dev/null +++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/0/p @@ -0,0 +1,68 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | foam-extend: Open Source CFD | +| \\ / O peration | Version: 3.1 | +| \\ / A nd | Web: http://www.extend-project.de | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [ 0 2 -2 0 0 0 0 ]; + +internalField uniform 0; + +boundaryField +{ + downstreamMixingPlanePatch + { + type mixingPlane; + } + upstreamMixingPlanePatch + { + type mixingPlane; + } + downstreamWall + { + type symmetryPlane; + } + upstreamWall + { + type symmetryPlane; + } + upstreamPerio1 + { + type cyclicGgi; + } + upstreamPerio2 + { + type cyclicGgi; + } + downstreamPerio1 + { + type cyclicGgi; + } + downstreamPerio2 + { + type cyclicGgi; + } + inflow + { + type zeroGradient; + } + outflow + { + type fixedValue; + value uniform 0; + } +} + +// ************************************************************************* // + diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allclean b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allclean index 7a6f8eb4a..1be212c5c 100755 --- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allclean +++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allclean @@ -5,4 +5,4 @@ cleanCase \rm constant/polyMesh/blockMeshDict constant/polyMesh/boundary -\rm -r 0 +\rm -rf 0 ; cp -r save 0 diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allrun b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allrun index d4262da46..71cb3b184 100755 --- a/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allrun +++ b/tutorials/incompressible/simpleFoam/mixingPlaneAxial/Allrun @@ -9,11 +9,7 @@ runApplication blockMesh runApplication setSet -batch setBatch.batch runApplication setsToZones -noFlipMap - -cp -r save 0 - runApplication potentialFoam - runApplication simpleFoam diff --git a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict index 44da178ca..46cf9d521 100644 --- a/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict +++ b/tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/decomposeParDict @@ -14,9 +14,10 @@ FoamFile } numberOfSubdomains 4; -method manual; //metis; //simple; +method metis; //metis; //simple; -globalFaceZones ( +globalFaceZones +( ggi1DomBZone ggi1DomAZone ggi2DomBZone From fd2c3bc91491432db466b924a1b9caee8fc8afd0 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 2 Sep 2014 12:39:34 +0100 Subject: [PATCH 5/8] Updated transonic tutorial --- .../steadyCompressibleFoam/bumpBlockMesh/0/T | 79 ------------- .../constant/polyMesh/blockMeshDict | 86 -------------- .../bumpBlockMesh/system/fvSolution | 76 ------------- .../steadyCompressibleFoam/bumpFine05/0/T | 74 ------------ .../steadyCompressibleFoam/bumpFine05/0/U | 65 ----------- .../steadyCompressibleFoam/bumpFine05/0/p | 74 ------------ .../bumpFine05/Allclean | 7 -- .../steadyCompressibleFoam/bumpFine05/Allrun | 8 -- .../bumpFine05/constant/RASProperties | 32 ------ .../constant/thermophysicalProperties | 22 ---- .../bumpFine05/system/controlDict | 106 ------------------ .../bumpFine05/system/fvSchemes | 83 -------------- .../polyMesh/boundary => transonicBump/0/T} | 44 ++++---- .../{bumpBlockMesh => transonicBump}/0/U | 32 ++---- .../{bumpBlockMesh => transonicBump}/0/p | 45 ++------ .../{bumpBlockMesh => transonicBump}/Allclean | 0 .../{bumpBlockMesh => transonicBump}/Allrun | 0 .../constant/RASProperties | 0 .../constant/polyMesh/blockMeshDict | 22 ++-- .../constant/polyMesh/boundary | 20 ++-- .../constant/thermophysicalProperties | 0 .../system/controlDict | 4 +- .../system/fvSchemes | 20 ++-- .../system/fvSolution | 35 ++++-- 24 files changed, 98 insertions(+), 836 deletions(-) delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/T delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/blockMeshDict delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSolution delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/T delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/U delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/p delete mode 100755 tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allclean delete mode 100755 tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allrun delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/RASProperties delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/thermophysicalProperties delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/controlDict delete mode 100644 tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSchemes rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh/constant/polyMesh/boundary => transonicBump/0/T} (63%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/0/U (70%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/0/p (57%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/Allclean (100%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/Allrun (100%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/constant/RASProperties (100%) rename tutorials/compressible/steadyCompressibleFoam/{bumpFine05 => transonicBump}/constant/polyMesh/blockMeshDict (80%) rename tutorials/compressible/steadyCompressibleFoam/{bumpFine05 => transonicBump}/constant/polyMesh/boundary (78%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/constant/thermophysicalProperties (100%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/system/controlDict (97%) rename tutorials/compressible/steadyCompressibleFoam/{bumpBlockMesh => transonicBump}/system/fvSchemes (76%) rename tutorials/compressible/steadyCompressibleFoam/{bumpFine05 => transonicBump}/system/fvSolution (81%) diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/T b/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/T deleted file mode 100644 index 82410a04d..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/T +++ /dev/null @@ -1,79 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - INLE1 - { - type fixedValue; - value $internalField; - -// type waveTransmissiveInlet; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical false; -// lInf 0.01;//HJ -// fieldInf 300; -// value $internalField; - } - - PRES2 - { - type zeroGradient; - -// type waveTransmissive; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet true; -// correctSupercritical false; -// lInf 0.0; -// fieldInf 300; -// value $internalField; - } - - WALL3 - { - type zeroGradient; - } - - SYMP5 - { - type empty; - } - - SYMP6 - { - type empty; - } - - WALL4 - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/blockMeshDict b/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/blockMeshDict deleted file mode 100644 index 946ff8635..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/blockMeshDict +++ /dev/null @@ -1,86 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 1; - -vertices -( - (-1.5 0 -0.1) - (-0.5 0 -0.1) - ( 0.5 0 -0.1) - ( 1.5 0 -0.1) - - (-1.5 1 -0.1) - (-0.5 1 -0.1) - ( 0.5 1 -0.1) - ( 1.5 1 -0.1) - - (-1.5 0 0.1) - (-0.5 0 0.1) - ( 0.5 0 0.1) - ( 1.5 0 0.1) - - (-1.5 1 0.1) - (-0.5 1 0.1) - ( 0.5 1 0.1) - ( 1.5 1 0.1) -); - -blocks -( - hex (0 1 5 4 8 9 13 12) (160 160 1) simpleGrading (1 1 1) - hex (1 2 6 5 9 10 14 13) (160 160 1) simpleGrading (1 1 1) - hex (2 3 7 6 10 11 15 14) (160 160 1) simpleGrading (1 1 1) -); - -edges -( - arc 1 2 (0 0.1 -0.1) - arc 9 10 (0 0.1 0.1) -); - -patches -( - patch INLE1 - ( - (0 8 12 4) - ) - - patch PRES2 - ( - (3 7 15 11) - ) - - wall WALL3 - ( - (4 12 13 5) - (5 13 14 6) - (6 14 15 7) - ) - - wall WALL4 - ( - (0 1 9 8) - (1 2 10 9) - (2 3 11 10) - ) -); - -mergePatchPairs -( -); - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSolution b/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSolution deleted file mode 100644 index 93587664c..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSolution +++ /dev/null @@ -1,76 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - p - { - solver BiCGStab; - preconditioner DILU; - - minIter 0; - maxIter 1000; - tolerance 1e-8; - relTol 0.0; - }; - U - { - solver BiCGStab; - preconditioner DILU; - - minIter 0; - maxIter 1000; - tolerance 1e-8; - relTol 0.0; - }; - h - { - solver BiCGStab; - preconditioner DILU; - - minIter 0; - maxIter 1000; - tolerance 1e-8; - relTol 0.0; - }; -} - -PIMPLE -{ - nOuterCorrectors 1; - nCorrectors 3; - nNonOrthogonalCorrectors 0; -} - -relaxationFactors -{ - // Note: under-relaxation factors used in wave-transmissive schemes - U 0.4; - p 0.2; - h 0.5; - rho 0.5; - T 1; -} - -fieldBounds -{ - // With bounding - p 50 1e6; - T 20 3000; - U 1000; -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/T b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/T deleted file mode 100644 index b187b1b53..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/T +++ /dev/null @@ -1,74 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - INLE1 - { - type fixedValue; - value $internalField; - -// type waveTransmissiveInlet; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical false; -// lInf 0.01;//HJ -// fieldInf 300; -// value $internalField; - } - - PRES2 - { -// type zeroGradient; - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U U; - gamma 1.4; - inletOutlet true; - correctSupercritical false; - lInf 0.5; - fieldInf 300; - value $internalField; - } - - WALL3 - { - type zeroGradient; - } - - WALL4 - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/U b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/U deleted file mode 100644 index 19bb71a87..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/U +++ /dev/null @@ -1,65 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (173 0 0); - -boundaryField -{ - INLE1 - { - type fixedValue; - value uniform (173 0 0); - } - - PRES2 - { -// type inletOutlet; -// inletValue uniform (0 0 0); - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U U; - gamma 1.4; - inletOutlet true; - correctSupercritical false; - lInf 0.5; - fieldInf (0 0 0); - value $internalField; - } - - WALL3 - { - type fixedValue; - value uniform (0 0 0); - } - - WALL4 - { - type fixedValue; - value uniform (0 0 0); - } - - defaultFaces - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/p b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/p deleted file mode 100644 index c184a2d75..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/0/p +++ /dev/null @@ -1,74 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 101325; - -boundaryField -{ - INLE1 - { - type zeroGradient; - -// type waveTransmissiveInlet; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical false; -// lInf 0.0; -// fieldInf 101325; -// value uniform 101325; - } - - PRES2 - { -// type fixedValue; -// value uniform 101325; - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U U; - gamma 1.4; - inletOutlet false; - correctSupercritical true; - lInf 0.5; - fieldInf 101325; - value uniform 101325; - } - - WALL3 - { - type zeroGradient; - } - - WALL4 - { - type zeroGradient; - } - - defaultFaces - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allclean b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allclean deleted file mode 100755 index 50c7da05e..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase -\rm -rf VTK diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allrun b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allrun deleted file mode 100755 index 755e74c2d..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/Allrun +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -application="steadyCompressibleFoam" - -runApplication blockMesh -runApplication $application diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/RASProperties b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/RASProperties deleted file mode 100644 index 9ba515372..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/RASProperties +++ /dev/null @@ -1,32 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object RASProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -RASModel laminar; - -turbulence on; - -printCoeffs on; - -laminarCoeffs -{} - -wallFunctionCoeffs -{ - kappa 0.4187; - E 9; -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/thermophysicalProperties b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/thermophysicalProperties deleted file mode 100644 index e6ed7ccdf..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/thermophysicalProperties +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object thermophysicalProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType hPsiThermo>>>>; - -// name, nMoles, mol weight, CP, Hf, mu, Pr; -mixture air 1 28.9 1007 0 0 0.7; - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/controlDict b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/controlDict deleted file mode 100644 index 1d7b53b7c..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/controlDict +++ /dev/null @@ -1,106 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 10000; - -deltaT 1; - -writeControl timeStep; - -writeInterval 50; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression uncompressed; - -timeFormat general; - -timePrecision 6; - -graphFormat raw; - -runTimeModifiable yes; - -functions -( - flux - { - type divFlux; - phiName phi; - - functionObjectLibs ("libutilityFunctionObjects.so"); - } - - Mach - { - type MachNumber; - UName U; - - functionObjectLibs ("libutilityFunctionObjects.so"); - } - - minMaxU - { - type minMaxField; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - name U; - } - - minMaxP - { - type minMaxField; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - name p; - } - - minMaxRho - { - type minMaxField; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - name rho; - } - - minMaxT - { - type minMaxField; - - // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); - - name T; - } -); - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSchemes b/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSchemes deleted file mode 100644 index 461d5acfa..000000000 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSchemes +++ /dev/null @@ -1,83 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.1 | -| \\ / A nd | Web: http://www.extend-project.de | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default none; - -// ddt(rho,U) steadyInertial phi rho 1; - ddt(rho,U) steadyState; -// ddt(rho,h) steadyState; - ddt(rho,h) steadyInertial phi rho 1; - ddt(psi,p) steadyInertial phi rho 1; - - U steadyState; - T steadyState; - p steadyState; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - - div(phi,U) Gauss upwind; -// div(phi,U) Gauss linearUpwind faceLimited Gauss linear 1.0; -// div(phi,U) Gauss blended 0.9; -// div(phi,U) Gauss vanLeerDC; -// div(phi,U) Gauss SuperBeeDC; -// div(phi,U) Gauss GammaVDC 0.5; - -// div(phi,h) Gauss upwind; -// div(phi,h) Gauss GammaDC 0.5; - div(phi,h) Gauss vanLeerDC; - -// div(phid,p) Gauss upwind; - div(phid,p) Gauss vanLeerDC; - - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; - div((muEff*dev2(grad(U).T()))) Gauss linear; - - div(U,p) Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - -// ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleFoam/transonicBump/0/T similarity index 63% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/boundary rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/0/T index 5696110d1..6ff08d0bd 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/polyMesh/boundary +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/0/T @@ -9,44 +9,48 @@ FoamFile { version 2.0; format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; + class volScalarField; + object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -5 -( +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 300; + +boundaryField +{ INLE1 { - type patch; - nFaces 160; - startFace 152960; + type isentropicTotalTemperature; + phi phi; + rho none; + psi psi; + p p; + T0 uniform 327.335857; + value uniform 300; } + PRES2 { - type patch; - nFaces 160; - startFace 153120; + type zeroGradient; } + WALL3 { - type wall; - nFaces 480; - startFace 153280; + type zeroGradient; } + WALL4 { - type wall; - nFaces 480; - startFace 153760; + type zeroGradient; } + defaultFaces { type empty; - nFaces 153600; - startFace 154240; } -) +} + // ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/U b/tutorials/compressible/steadyCompressibleFoam/transonicBump/0/U similarity index 70% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/U rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/0/U index bf2b8441f..462cfbf4e 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/U +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/0/U @@ -16,32 +16,20 @@ FoamFile dimensions [0 1 -1 0 0 0 0]; -internalField uniform (234 0 0); +internalField uniform (234.636777 0 0); boundaryField { INLE1 { type fixedValue; - value uniform (234 0 0); + value uniform (234.636777 0 0); } PRES2 { type inletOutlet; inletValue uniform (0 0 0); - -// type waveTransmissive; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet true; -// correctSupercritical false; -// lInf 0; -// fieldInf (0 0 0); -// value $internalField; } WALL3 @@ -50,21 +38,17 @@ boundaryField value uniform (0 0 0); } - SYMP5 - { - type empty; - } - - SYMP6 - { - type empty; - } - WALL4 { type fixedValue; value uniform (0 0 0); } + + defaultFaces + { + type empty; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/p b/tutorials/compressible/steadyCompressibleFoam/transonicBump/0/p similarity index 57% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/p rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/0/p index d7d0fbdb3..da5444239 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/0/p +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/0/p @@ -22,37 +22,16 @@ boundaryField { INLE1 { - type zeroGradient; - -// type waveTransmissiveInlet; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical false; -// lInf 0.0; -// fieldInf 101325; -// value uniform 101325; + type isentropicTotalPressure; + U U; + p0 uniform 137491.986; + value uniform 101325; } PRES2 { type fixedValue; value uniform 101325; - -// type waveTransmissive; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical true; -// lInf 0.1; -// fieldInf 101325; -// value uniform 101325; } WALL3 @@ -60,20 +39,16 @@ boundaryField type zeroGradient; } - SYMP5 - { - type empty; - } - - SYMP6 - { - type empty; - } - WALL4 { type zeroGradient; } + + defaultFaces + { + type empty; + } } + // ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/Allclean b/tutorials/compressible/steadyCompressibleFoam/transonicBump/Allclean similarity index 100% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/Allclean rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/Allclean diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/Allrun b/tutorials/compressible/steadyCompressibleFoam/transonicBump/Allrun similarity index 100% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/Allrun rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/Allrun diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/RASProperties b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/RASProperties similarity index 100% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/RASProperties rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/RASProperties diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/polyMesh/blockMeshDict b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/blockMeshDict similarity index 80% rename from tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/polyMesh/blockMeshDict rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/blockMeshDict index 57b17c7a1..a2d4ebfa2 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/polyMesh/blockMeshDict +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/blockMeshDict @@ -23,27 +23,27 @@ vertices ( 0.5 0 -0.1) ( 1.5 0 -0.1) - (-1.5 1 -0.1) - (-0.5 1 -0.1) - ( 0.5 1 -0.1) - ( 1.5 1 -0.1) + (-1.5 1.5 -0.1) + (-0.5 1.5 -0.1) + ( 0.5 1.5 -0.1) + ( 1.5 1.5 -0.1) (-1.5 0 0.1) (-0.5 0 0.1) ( 0.5 0 0.1) ( 1.5 0 0.1) - (-1.5 1 0.1) - (-0.5 1 0.1) - ( 0.5 1 0.1) - ( 1.5 1 0.1) + (-1.5 1.5 0.1) + (-0.5 1.5 0.1) + ( 0.5 1.5 0.1) + ( 1.5 1.5 0.1) ); blocks ( - hex (0 1 5 4 8 9 13 12) (110 160 1) simpleGrading (1 1 1) - hex (1 2 6 5 9 10 14 13) (110 160 1) simpleGrading (1 1 1) - hex (2 3 7 6 10 11 15 14) (110 160 1) simpleGrading (1 1 1) + hex (0 1 5 4 8 9 13 12) (50 75 1) simpleGrading (1 1 1) + hex (1 2 6 5 9 10 14 13) (50 75 1) simpleGrading (1 1 1) + hex (2 3 7 6 10 11 15 14) (50 75 1) simpleGrading (1 1 1) ); edges diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/polyMesh/boundary b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary similarity index 78% rename from tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/polyMesh/boundary rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary index 4c2b6ed0a..465a8aca5 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/constant/polyMesh/boundary +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/polyMesh/boundary @@ -20,32 +20,32 @@ FoamFile INLE1 { type patch; - nFaces 160; - startFace 105110; + nFaces 75; + startFace 22275; } PRES2 { type patch; - nFaces 160; - startFace 105270; + nFaces 75; + startFace 22350; } WALL3 { type wall; - nFaces 330; - startFace 105430; + nFaces 150; + startFace 22425; } WALL4 { type wall; - nFaces 330; - startFace 105760; + nFaces 150; + startFace 22575; } defaultFaces { type empty; - nFaces 105600; - startFace 106090; + nFaces 22500; + startFace 22725; } ) diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/thermophysicalProperties b/tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/thermophysicalProperties similarity index 100% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/constant/thermophysicalProperties rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/constant/thermophysicalProperties diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/controlDict b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/controlDict similarity index 97% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/controlDict rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/system/controlDict index ce75cc8ab..6bcb0149d 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/controlDict +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/controlDict @@ -20,7 +20,7 @@ startTime 0; stopAt endTime; -endTime 2000; +endTime 3000; deltaT 1; @@ -34,7 +34,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression compressed; timeFormat general; diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSchemes b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes similarity index 76% rename from tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSchemes rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes index 461d5acfa..c5e079b42 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpBlockMesh/system/fvSchemes +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSchemes @@ -18,11 +18,9 @@ ddtSchemes { default none; -// ddt(rho,U) steadyInertial phi rho 1; ddt(rho,U) steadyState; -// ddt(rho,h) steadyState; - ddt(rho,h) steadyInertial phi rho 1; - ddt(psi,p) steadyInertial phi rho 1; + ddt(rho,h) steadyState; + ddt(psi,p) steadyInertial phi rho 0.5; U steadyState; T steadyState; @@ -40,23 +38,21 @@ divSchemes div(phi,U) Gauss upwind; // div(phi,U) Gauss linearUpwind faceLimited Gauss linear 1.0; -// div(phi,U) Gauss blended 0.9; // div(phi,U) Gauss vanLeerDC; -// div(phi,U) Gauss SuperBeeDC; -// div(phi,U) Gauss GammaVDC 0.5; -// div(phi,h) Gauss upwind; -// div(phi,h) Gauss GammaDC 0.5; - div(phi,h) Gauss vanLeerDC; + div(phi,h) Gauss upwind; +// div(phi,h) Gauss vanLeerDC; -// div(phid,p) Gauss upwind; - div(phid,p) Gauss vanLeerDC; + div(phid,p) Gauss upwind; +// div(phid,p) Gauss vanLeerDC; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div((muEff*dev2(grad(U).T()))) Gauss linear; div(U,p) Gauss linear; + + div(U) Gauss linear; } laplacianSchemes diff --git a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSolution b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSolution similarity index 81% rename from tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSolution rename to tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSolution index 93587664c..4df2fd9b2 100644 --- a/tutorials/compressible/steadyCompressibleFoam/bumpFine05/system/fvSolution +++ b/tutorials/compressible/steadyCompressibleFoam/transonicBump/system/fvSolution @@ -16,6 +16,20 @@ FoamFile solvers { + // Coupled + Up + { + solver BiCGStab; + preconditioner Cholesky; + + tolerance 1e-09; + relTol 0.0; + + minIter 1; + maxIter 500; + } + + // Segregated p { solver BiCGStab; @@ -25,7 +39,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.0; - }; + } U { solver BiCGStab; @@ -35,7 +49,8 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.0; - }; + } + h { solver BiCGStab; @@ -45,7 +60,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.0; - }; + } } PIMPLE @@ -58,19 +73,19 @@ PIMPLE relaxationFactors { // Note: under-relaxation factors used in wave-transmissive schemes - U 0.4; - p 0.2; - h 0.5; + U 0.1; + p 0.25; + h 0.1; rho 0.5; - T 1; + T 0.5; } fieldBounds { // With bounding - p 50 1e6; - T 20 3000; - U 1000; + p 5e4 3e5; + T 230 500; + U 500; } // ************************************************************************* // From e7794e0559db295392fbf371b3b0f209b3c5cdd8 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 2 Sep 2014 12:07:27 +0100 Subject: [PATCH 6/8] Isentropic total pressure, initial version --- ...sentropicTotalPressureFvPatchScalarField.C | 212 ++++++++++++++++++ ...sentropicTotalPressureFvPatchScalarField.H | 189 ++++++++++++++++ 2 files changed, 401 insertions(+) create mode 100644 src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.C create mode 100644 src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.H diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.C new file mode 100644 index 000000000..4453a39db --- /dev/null +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.C @@ -0,0 +1,212 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | + \\ / A nd | For copyright notice see file Copyright + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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 3 of the License, or (at your + option) any later version. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "isentropicTotalPressureFvPatchScalarField.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "basicThermo.H" +#include "isentropicTotalTemperatureFvPatchScalarField.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::isentropicTotalPressureFvPatchScalarField:: +isentropicTotalPressureFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF +) +: + fixedValueFvPatchScalarField(p, iF), + UName_("U"), + TName_("T"), + p0_(p.size(), 0.0) +{} + + +Foam::isentropicTotalPressureFvPatchScalarField:: +isentropicTotalPressureFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchScalarField(p, iF), + UName_(dict.lookupOrDefault("U", "U")), + TName_(dict.lookupOrDefault("T", "T")), + p0_("p0", dict, p.size()) +{ + if (dict.found("value")) + { + fvPatchField::operator= + ( + scalarField("value", dict, p.size()) + ); + } + else + { + fvPatchField::operator=(p0_); + } +} + + +Foam::isentropicTotalPressureFvPatchScalarField:: +isentropicTotalPressureFvPatchScalarField +( + const isentropicTotalPressureFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + UName_(ptf.UName_), + TName_(ptf.TName_), + p0_(ptf.p0_, mapper) +{} + + +Foam::isentropicTotalPressureFvPatchScalarField:: +isentropicTotalPressureFvPatchScalarField +( + const isentropicTotalPressureFvPatchScalarField& ptf +) +: + fixedValueFvPatchScalarField(ptf), + UName_(ptf.UName_), + TName_(ptf.TName_), + p0_(ptf.p0_) +{} + + +Foam::isentropicTotalPressureFvPatchScalarField:: +isentropicTotalPressureFvPatchScalarField +( + const isentropicTotalPressureFvPatchScalarField& ptf, + const DimensionedField& iF +) +: + fixedValueFvPatchScalarField(ptf, iF), + UName_(ptf.UName_), + TName_(ptf.TName_), + p0_(ptf.p0_) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::isentropicTotalPressureFvPatchScalarField::autoMap +( + const fvPatchFieldMapper& m +) +{ + fixedValueFvPatchScalarField::autoMap(m); + p0_.autoMap(m); +} + + +void Foam::isentropicTotalPressureFvPatchScalarField::rmap +( + const fvPatchScalarField& ptf, + const labelList& addr +) +{ + fixedValueFvPatchScalarField::rmap(ptf, addr); + + const isentropicTotalPressureFvPatchScalarField& tiptf = + refCast(ptf); + + p0_.rmap(tiptf.p0_, addr); +} + + +void Foam::isentropicTotalPressureFvPatchScalarField::updateCoeffs() +{ + if (updated()) + { + return; + } + + // Get velocity + const fvPatchVectorField& U = + patch().lookupPatchField(UName_); + + // Get temperature + const fvPatchScalarField& T = + patch().lookupPatchField(TName_); + + const basicThermo& thermo = + db().lookupObject("thermophysicalProperties"); + + scalarField Cp = thermo.Cp(T, patch().index()); + scalarField Cv = thermo.Cv(T, patch().index()); + + scalarField gamma = Cp/Cv; + scalarField R = Cp - Cv; + + scalarField Ma = -(patch().nf() & U)/sqrt(gamma*R*T); + + scalarField a = 1 + 0.5*(gamma - 1)*sqr(Ma); + + operator==(p0_*pow(a, -gamma/(gamma - 1))); + + fixedValueFvPatchScalarField::updateCoeffs(); +} + +void Foam::isentropicTotalPressureFvPatchScalarField::updateCoeffs +( + const vectorField& Up +) +{ + updateCoeffs(); +} + + +void Foam::isentropicTotalPressureFvPatchScalarField::write +( + Ostream& os +) const +{ + fixedValueFvPatchScalarField::write(os); + writeEntryIfDifferent(os, "T", "T", TName_); + p0_.writeEntry("p0", os); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +makePatchTypeField +( + fvPatchScalarField, + isentropicTotalPressureFvPatchScalarField +); + +} // End namespace Foam + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.H new file mode 100644 index 000000000..bdcdcdb28 --- /dev/null +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalPressure/isentropicTotalPressureFvPatchScalarField.H @@ -0,0 +1,189 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | + \\ / A nd | For copyright notice see file Copyright + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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 3 of the License, or (at your + option) any later version. + + foam-extend 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 foam-extend. If not, see . + +Class + Foam::isentropicTotalPressureFvPatchScalarField + +Description + Foam::isentropicTotalPressureFvPatchScalarField + +SourceFiles + isentropicTotalPressureFvPatchScalarField.C + +\*---------------------------------------------------------------------------*/ + +#ifndef isentropicTotalPressureFvPatchScalarField_H +#define isentropicTotalPressureFvPatchScalarField_H + +#include "fixedValueFvPatchFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class isentropicTotalPressureFvPatchScalarField Declaration +\*---------------------------------------------------------------------------*/ + +class isentropicTotalPressureFvPatchScalarField +: + public fixedValueFvPatchScalarField +{ + // Private data + + //- Name of the velocity field + word UName_; + + //- Name of the static temperature field + word TName_; + + //- Total pressure field + scalarField p0_; + + +public: + + //- Runtime type information + TypeName("isentropicTotalPressure"); + + + // Constructors + + //- Construct from patch and internal field + isentropicTotalPressureFvPatchScalarField + ( + const fvPatch&, + const DimensionedField& + ); + + //- Construct from patch, internal field and dictionary + isentropicTotalPressureFvPatchScalarField + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct by mapping given + // isentropicTotalPressureFvPatchScalarField onto a new patch + isentropicTotalPressureFvPatchScalarField + ( + const isentropicTotalPressureFvPatchScalarField&, + const fvPatch&, + const DimensionedField&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + isentropicTotalPressureFvPatchScalarField + ( + const isentropicTotalPressureFvPatchScalarField& + ); + + //- Construct and return a clone + virtual tmp clone() const + { + return tmp + ( + new isentropicTotalPressureFvPatchScalarField(*this) + ); + } + + //- Construct as copy setting internal field reference + isentropicTotalPressureFvPatchScalarField + ( + const isentropicTotalPressureFvPatchScalarField&, + const DimensionedField& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp clone + ( + const DimensionedField& iF + ) const + { + return tmp + ( + new isentropicTotalPressureFvPatchScalarField(*this, iF) + ); + } + + + // Member functions + + // Access + + //- Return the total pressure + const scalarField& p0() const + { + return p0_; + } + + //- Return reference to the total pressure to allow adjustment + scalarField& p0() + { + return p0_; + } + + + // Mapping functions + + //- Map (and resize as needed) from self given a mapping object + virtual void autoMap + ( + const fvPatchFieldMapper& + ); + + //- Reverse map the given fvPatchField onto this fvPatchField + virtual void rmap + ( + const fvPatchScalarField&, + const labelList& + ); + + + // Evaluation functions + + //- Update the coefficients associated with the patch field + // using the given patch velocity field + virtual void updateCoeffs(const vectorField& Up); + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); + + + //- Write + virtual void write(Ostream&) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // From dc6d3f61dc7e445a548421045cd92a995cba2dbf Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 21 Aug 2014 19:25:05 +0100 Subject: [PATCH 7/8] Fix compilation error Conflicts: applications/solvers/compressible/steadyCompressibleFoam/hEqn.H --- .../solvers/compressible/steadyCompressibleFoam/hEqn.H | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H index 2999ca645..780c9401d 100644 --- a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H +++ b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H @@ -2,17 +2,21 @@ // Solve the enthalpy equation T.storePrevIter(); - surfaceScalarField faceU = phi/fvc::interpolate(rho); + // Calculate face velocity from flux + surfaceScalarField faceU + ( + "faceU", + phi/fvc::interpolate(rho) + ); fvScalarMatrix hEqn ( fvm::ddt(rho, h) + fvm::div(phi, h) - fvm::laplacian(turbulence->alphaEff(), h) + + fvm::SuSp((fvc::div(faceU, p, "div(U,p)") - p*fvc::div(faceU))/h, h) == // ddt(p) term removed: steady-state. HJ, 27/Apr/2010 - fvc::div(faceU, p, "div(U,p)") - - p*fvc::div(faceU) // Viscous heating: note sign (devRhoReff has a minus in it) - (turbulence->devRhoReff() && fvc::grad(U)) ); From 8e56da00415c8d46bdd5b43f5d79eb03acec6b5e Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 15 Aug 2014 16:39:30 +0100 Subject: [PATCH 8/8] Updates to compressible SRF and MRF enthalpy equation Conflicts: applications/solvers/compressible/steadyCompressibleFoam/hEqn.H --- .../steadyCompressibleMRFFoam/iEqn.H | 14 + .../steadyCompressibleSRFFoam/createFields.H | 15 + .../steadyCompressibleSRFFoam/hEqn.H | 33 - .../steadyCompressibleSRFFoam/iEqn.H | 47 + .../steadyCompressibleSRFFoam.C | 3 +- .../general/SRF/SRFModel/SRFModel/SRFModel.C | 20 + .../general/SRF/SRFModel/SRFModel/SRFModel.H | 3 + .../simpleRotorStator/system/controlDict | 2 +- .../simpleRotorStator/system/fvSchemes | 4 - .../simpleRotorStator/system/fvSolution | 9 +- .../steadyCompressibleSRFFoam/bentBlade/0/T | 21 +- .../bentBlade/0/Urel | 20 +- .../bentBlade/0/alphat | 1 - .../bentBlade/0/epsilon | 2205 ----------------- .../steadyCompressibleSRFFoam/bentBlade/0/k | 2205 ----------------- .../steadyCompressibleSRFFoam/bentBlade/0/mut | 1 - .../steadyCompressibleSRFFoam/bentBlade/0/p | 36 +- .../bentBlade/constant/SRFProperties | 2 - .../constant/thermophysicalProperties | 1 + .../bentBlade/system/controlDict | 4 +- .../bentBlade/system/fvSchemes | 15 +- .../bentBlade/system/fvSolution | 37 +- .../steadyCompressibleSRFFoam/simpleBlade/0/T | 21 +- .../simpleBlade/0/Urel | 20 +- .../simpleBlade/0/alphat | 1 - .../simpleBlade/0/epsilon | 1 - .../steadyCompressibleSRFFoam/simpleBlade/0/k | 2205 ----------------- .../simpleBlade/0/mut | 1 - .../steadyCompressibleSRFFoam/simpleBlade/0/p | 36 +- .../simpleBlade/constant/SRFProperties | 1 - .../simpleBlade/system/controlDict | 2 +- .../simpleBlade/system/fvSchemes | 7 +- .../simpleBlade/system/fvSolution | 31 +- 33 files changed, 186 insertions(+), 6838 deletions(-) delete mode 100644 applications/solvers/compressible/steadyCompressibleSRFFoam/hEqn.H create mode 100644 applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H diff --git a/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H b/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H index eadd3889c..e00b3fbf6 100644 --- a/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H +++ b/applications/solvers/compressible/steadyCompressibleMRFFoam/iEqn.H @@ -9,11 +9,25 @@ // Create rotational velocity (= omega x r) Urot = U - Urel; + // Calculate face velocity from absolute flux + surfaceScalarField rhof = fvc::interpolate(rho); + + surfaceScalarField phiAbs + ( + "phiAbs", + phi + ); + mrfZones.absoluteFlux(rhof, phiAbs); + + surfaceScalarField faceU("faceU", phiAbs/rhof); + fvScalarMatrix iEqn ( fvm::ddt(rho, i) + fvm::div(phi, i) - fvm::laplacian(turbulence->alphaEff(), i) + // u & gradP term (steady-state formulation) + + fvm::SuSp((fvc::div(faceU, p, "div(U,p)") - fvc::div(faceU)*p)/i, i) == // Viscous heating: note sign (devRhoReff has a minus in it) - (turbulence->devRhoReff() && fvc::grad(Urel)) diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H index 5e89417fb..49b4b0b97 100644 --- a/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H +++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/createFields.H @@ -85,3 +85,18 @@ ), Urel + SRF->U() ); + + // Create rothalpy, in two steps to preserve boundary conditions + volScalarField i + ( + IOobject + ( + "i", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + h + ); + i -= 0.5*magSqr(SRF->U()); diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/hEqn.H deleted file mode 100644 index 401355567..000000000 --- a/applications/solvers/compressible/steadyCompressibleSRFFoam/hEqn.H +++ /dev/null @@ -1,33 +0,0 @@ -{ - // Solve the enthalpy equation - T.storePrevIter(); - - surfaceScalarField faceU = phi/fvc::interpolate(rho); - - fvScalarMatrix hEqn - ( - fvm::ddt(rho, h) - + fvm::div(phi, h) - - fvm::laplacian(turbulence->alphaEff(), h) - == - // ddt(p) term removed: steady-state. HJ, 27/Apr/2010 - fvc::div(faceU, p, "div(U,p)") - - p*fvc::div(faceU) - // Viscous heating: note sign (devRhoReff has a minus in it) - - (turbulence->devRhoReff() && fvc::grad(Urel)) - ); - - hEqn.relax(); - - eqnResidual = hEqn.solve().initialResidual(); - maxResidual = max(eqnResidual, maxResidual); - - // Bound the enthalpy using TMin and TMax - volScalarField Cp = thermo.Cp(); - - h = Foam::min(h, TMax*Cp); - h = Foam::max(h, TMin*Cp); - h.correctBoundaryConditions(); - - thermo.correct(); -} diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H b/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H new file mode 100644 index 000000000..c80d715ca --- /dev/null +++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/iEqn.H @@ -0,0 +1,47 @@ +{ + // Solve the enthalpy equation + T.storePrevIter(); + + // Calculate face velocity from flux + surfaceScalarField faceU + ( + "faceU", + phi/fvc::interpolate(rho) + (SRF->faceU() & mesh.Sf()) + ); + + fvScalarMatrix iEqn + ( + fvm::ddt(rho, i) + + fvm::div(phi, i) + - fvm::laplacian(turbulence->alphaEff(), i) + // u & gradP term (steady-state formulation) + + fvm::SuSp((fvc::div(faceU, p, "div(U,p)") - p*fvc::div(faceU))/i, i) + == + // ddt(p) term removed: steady-state. HJ, 27/Apr/2010 + // Viscous heating: note sign (devRhoReff has a minus in it) + - (turbulence->devRhoReff() && fvc::grad(Urel)) + ); + + iEqn.relax(); + + eqnResidual = iEqn.solve().initialResidual(); + maxResidual = max(eqnResidual, maxResidual); + + // Calculate enthalpy out of rothalpy + volVectorField Urot("Urot", SRF->U()); + + h = i + 0.5*magSqr(Urot); + h.correctBoundaryConditions(); + + // Bound the enthalpy using TMin and TMax + volScalarField Cp = thermo.Cp(); + + h = Foam::min(h, TMax*Cp); + h = Foam::max(h, TMin*Cp); + h.correctBoundaryConditions(); + + // Re-initialise rothalpy based on limited enthalpy + i = h - 0.5*magSqr(Urot); + + thermo.correct(); +} diff --git a/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C b/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C index 8857f5eec..2a91dafda 100644 --- a/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C +++ b/applications/solvers/compressible/steadyCompressibleSRFFoam/steadyCompressibleSRFFoam.C @@ -65,10 +65,9 @@ int main(int argc, char *argv[]) # include "initConvergenceCheck.H" # include "UEqn.H" +# include "iEqn.H" # include "pEqn.H" -# include "hEqn.H" - # include "rhoFromP.H" // Correct turbulence diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C index 36ea6b076..b8a6ccc5d 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C @@ -208,6 +208,26 @@ Foam::tmp Foam::SRF::SRFModel::U() const } +Foam::tmp Foam::SRF::SRFModel::faceU() const +{ + return tmp + ( + new surfaceVectorField + ( + IOobject + ( + "faceUsrf", + mesh_.time().timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + omega_ ^ (mesh_.Cf() - axis_*(axis_ & mesh_.Cf())) + ) + ); +} + + Foam::tmp Foam::SRF::SRFModel::Uabs() const { const volVectorField Usrf = U(); diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H index fba0518c1..c689578f6 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H @@ -171,6 +171,9 @@ public: //- Return velocity of SRF for complete mesh tmp U() const; + //- Return face velocity of SRF for complete mesh + tmp faceU() const; + //- Return absolute velocity for complete mesh tmp Uabs() const; }; diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/controlDict b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/controlDict index d923236ab..c0429b0b3 100644 --- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/controlDict +++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/controlDict @@ -27,7 +27,7 @@ deltaT 1; writeControl timeStep; -writeInterval 50; +writeInterval 200; purgeWrite 0; diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes index 8ad87aa1a..15028f32b 100644 --- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes +++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSchemes @@ -42,10 +42,6 @@ divSchemes div(phi,i) Gauss upwind; div(phid,p) Gauss upwind; -// div(phi,U) Gauss vanLeerDC; -// div(phi,h) Gauss vanLeerDC; -// div(phid,p) Gauss vanLeerDC; - div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div((muEff*dev2(grad(U).T()))) Gauss linear; diff --git a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSolution b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSolution index 9b985f11f..5be661c97 100644 --- a/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSolution +++ b/tutorials/compressible/steadyCompressibleMRFFoam/simpleRotorStator/system/fvSolution @@ -24,8 +24,8 @@ solvers minIter 0; maxIter 1000; tolerance 1e-8; - relTol 0.001; - }; + relTol 0.01; + } U { solver BiCGStab; @@ -90,11 +90,6 @@ relaxationFactors fieldBounds { - // No bounding -// p 0 1e7; -// T 0 10000; -// U 1e6; - // With bounding p 2e4 1e6; T 200 500; diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/T b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/T index 31d2c3af4..67854f805 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/T +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/T @@ -22,24 +22,19 @@ boundaryField { inlet { - type fixedValue; + type totalTemperature; + phi phi; + rho none; + psi psi; + U Uabs; + gamma 1.4; + T0 uniform 300; value $internalField; } outlet { -// type zeroGradient; - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U Urel; - gamma 1.4; - inletOutlet true; - correctSupercritical false; - lInf 0.0; - fieldInf 300; + type zeroGradient; value $internalField; } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/Urel b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/Urel index 202ff7026..50e2ad68f 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/Urel +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/Urel @@ -16,34 +16,20 @@ FoamFile dimensions [0 1 -1 0 0 0 0]; -internalField uniform (234 0 0); +internalField uniform (100 0 0); boundaryField { inlet { - type SRFVelocity; - relative yes; - inletValue uniform (234 0 0); - value uniform (234 0 0); + type pressureInletVelocity; + value uniform (100 0 0); } outlet { type inletOutlet; inletValue uniform (0 0 0); - -// type waveTransmissive; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet true; -// correctSupercritical false; -// lInf 0; -// fieldInf (0 0 0); -// value $internalField; } blade diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/alphat b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/alphat index 59dff4e92..6d4331e73 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/alphat +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/alphat @@ -52,7 +52,6 @@ boundaryField frontAndBack { type cyclic; - value uniform 0; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/epsilon b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/epsilon index 337d9e797..dbd8c8698 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/epsilon +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/epsilon @@ -65,2211 +65,6 @@ boundaryField frontAndBack { type cyclic; - value nonuniform List -2200 -( -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -100 -) -; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/k b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/k index 831afc460..59306c55a 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/k +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/k @@ -50,2211 +50,6 @@ boundaryField frontAndBack { type cyclic; - value nonuniform List -2200 -( -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -) -; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/mut b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/mut index d97f4644f..bc30c25e6 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/mut +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/mut @@ -58,7 +58,6 @@ boundaryField frontAndBack { type cyclic; - value uniform 0; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/p b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/p index 92d4eede6..d7a1a5f0b 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/p +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/0/p @@ -22,36 +22,20 @@ boundaryField { inlet { - type zeroGradient; - -// type waveTransmissiveInlet; -// phi phi; -// rho rho; -// psi psi; -// U Urel; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical false; -// lInf 0.0; -// fieldInf 101325; -// value uniform 101325; + type totalPressure; + phi phi; + rho none; + psi psi; + U Uabs; + gamma 1.4; + p0 uniform 1.4e5; + value $internalField; } outlet { -// type fixedValue; - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U Urel; - gamma 1.4; - inletOutlet false; - correctSupercritical true; - lInf 0.1; - fieldInf 101325; - value uniform 101325; + type fixedValue; + value $internalField; } blade diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/SRFProperties b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/SRFProperties index 01107028b..ab20d4b06 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/SRFProperties +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/SRFProperties @@ -17,12 +17,10 @@ FoamFile SRFModel rpm; axis (1 0 0); -// axis (-1 0 0); rpmCoeffs { rpm 30000; -// rpm 9600; } // ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/thermophysicalProperties b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/thermophysicalProperties index 081e4e4bc..5b276946f 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/thermophysicalProperties +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/constant/thermophysicalProperties @@ -16,6 +16,7 @@ FoamFile thermoType hPsiThermo>>>>; +// name, nMoles, mol weight, CP, Hf, mu, Pr; mixture air 1 28.9 1007 0 1.48e-5 0.7; // ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/controlDict b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/controlDict index 122ad3cb6..1a637004c 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/controlDict +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/controlDict @@ -20,13 +20,13 @@ startTime 0; stopAt endTime; -endTime 1500; +endTime 2000; deltaT 1; writeControl timeStep; -writeInterval 50; +writeInterval 200; purgeWrite 0; diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes index 7be8ac789..9653ee43d 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSchemes @@ -19,9 +19,8 @@ ddtSchemes default none; ddt(rho,Urel) steadyState; - ddt(rho,h) steadyState; -// ddt(rho,h) steadyInertial phi rho 1; - ddt(psi,p) steadyInertial phi rho 0.7; + ddt(rho,i) steadyState; + ddt(psi,p) steadyInertial phi rho 0.25; ddt(rho,k) steadyState; ddt(rho,epsilon) steadyState; @@ -39,13 +38,9 @@ gradSchemes divSchemes { default none; -// div(phi,Urel) Gauss upwind; -// div(phi,h) Gauss upwind; -// div(phid,p) Gauss upwind; - - div(phi,Urel) Gauss vanLeerDC; - div(phi,h) Gauss vanLeerDC; - div(phid,p) Gauss vanLeerDC; + div(phi,Urel) Gauss upwind; + div(phi,i) Gauss upwind; + div(phid,p) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSolution b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSolution index ce0a268fb..d9f36e615 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSolution +++ b/tutorials/compressible/steadyCompressibleSRFFoam/bentBlade/system/fvSolution @@ -24,8 +24,8 @@ solvers minIter 0; maxIter 1000; tolerance 1e-8; - relTol 0.001; - }; + relTol 0.01; + } Urel { solver BiCGStab; @@ -35,8 +35,8 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.01; - }; - h + } + i { solver BiCGStab; preconditioner DILU; @@ -45,7 +45,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.01; - }; + } k { solver BiCGStab; @@ -54,8 +54,8 @@ solvers minIter 0; maxIter 1000; tolerance 1e-8; - relTol 0.01; - }; + relTol 0.0; + } epsilon { solver BiCGStab; @@ -64,14 +64,14 @@ solvers minIter 0; maxIter 1000; tolerance 1e-8; - relTol 0.01; - }; + relTol 0.0; + } } PIMPLE { nOuterCorrectors 1; - nCorrectors 3; + nCorrectors 2; nNonOrthogonalCorrectors 0; } @@ -80,24 +80,19 @@ relaxationFactors // Note: under-relaxation factors used in wave-transmissive schemes Urel 0.5; p 0.2; - h 0.5; + i 0.1; rho 0.5; - k 0.3; - epsilon 0.3; + k 0.2; + epsilon 0.2; } fieldBounds { - // No bounding -// p 0 1e7; -// T 0 10000; -// Urel 1e6; - // With bounding - p 50 1e6; - T 20 3000; - Urel 1000; + p 2e4 1e6; + T 200 500; + Urel 500; } // ************************************************************************* // diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/T b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/T index 31d2c3af4..67854f805 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/T +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/T @@ -22,24 +22,19 @@ boundaryField { inlet { - type fixedValue; + type totalTemperature; + phi phi; + rho none; + psi psi; + U Uabs; + gamma 1.4; + T0 uniform 300; value $internalField; } outlet { -// type zeroGradient; - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U Urel; - gamma 1.4; - inletOutlet true; - correctSupercritical false; - lInf 0.0; - fieldInf 300; + type zeroGradient; value $internalField; } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/Urel b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/Urel index 202ff7026..50e2ad68f 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/Urel +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/Urel @@ -16,34 +16,20 @@ FoamFile dimensions [0 1 -1 0 0 0 0]; -internalField uniform (234 0 0); +internalField uniform (100 0 0); boundaryField { inlet { - type SRFVelocity; - relative yes; - inletValue uniform (234 0 0); - value uniform (234 0 0); + type pressureInletVelocity; + value uniform (100 0 0); } outlet { type inletOutlet; inletValue uniform (0 0 0); - -// type waveTransmissive; -// phi phi; -// rho rho; -// psi psi; -// U U; -// gamma 1.4; -// inletOutlet true; -// correctSupercritical false; -// lInf 0; -// fieldInf (0 0 0); -// value $internalField; } blade diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/alphat b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/alphat index 59dff4e92..6d4331e73 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/alphat +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/alphat @@ -52,7 +52,6 @@ boundaryField frontAndBack { type cyclic; - value uniform 0; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/epsilon b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/epsilon index 8d5335c26..dbd8c8698 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/epsilon +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/epsilon @@ -65,7 +65,6 @@ boundaryField frontAndBack { type cyclic; - value uniform 100; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/k b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/k index 831afc460..59306c55a 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/k +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/k @@ -50,2211 +50,6 @@ boundaryField frontAndBack { type cyclic; - value nonuniform List -2200 -( -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -4.86 -) -; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/mut b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/mut index d97f4644f..bc30c25e6 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/mut +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/mut @@ -58,7 +58,6 @@ boundaryField frontAndBack { type cyclic; - value uniform 0; } } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/p b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/p index 92d4eede6..d7a1a5f0b 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/p +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/0/p @@ -22,36 +22,20 @@ boundaryField { inlet { - type zeroGradient; - -// type waveTransmissiveInlet; -// phi phi; -// rho rho; -// psi psi; -// U Urel; -// gamma 1.4; -// inletOutlet false; -// correctSupercritical false; -// lInf 0.0; -// fieldInf 101325; -// value uniform 101325; + type totalPressure; + phi phi; + rho none; + psi psi; + U Uabs; + gamma 1.4; + p0 uniform 1.4e5; + value $internalField; } outlet { -// type fixedValue; - - type waveTransmissive; - phi phi; - rho rho; - psi psi; - U Urel; - gamma 1.4; - inletOutlet false; - correctSupercritical true; - lInf 0.1; - fieldInf 101325; - value uniform 101325; + type fixedValue; + value $internalField; } blade diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/SRFProperties b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/SRFProperties index 1f63d75cf..e4a6ca430 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/SRFProperties +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/constant/SRFProperties @@ -20,7 +20,6 @@ axis (-1 0 0); rpmCoeffs { -// rpm 15000; rpm 20000; } diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/controlDict b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/controlDict index a266d152b..1a637004c 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/controlDict +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/controlDict @@ -26,7 +26,7 @@ deltaT 1; writeControl timeStep; -writeInterval 50; +writeInterval 200; purgeWrite 0; diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes index 393a0cf60..9653ee43d 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSchemes @@ -19,9 +19,8 @@ ddtSchemes default none; ddt(rho,Urel) steadyState; - ddt(rho,h) steadyState; -// ddt(rho,h) steadyInertial phi rho 1; - ddt(psi,p) steadyInertial phi rho 0.8; + ddt(rho,i) steadyState; + ddt(psi,p) steadyInertial phi rho 0.25; ddt(rho,k) steadyState; ddt(rho,epsilon) steadyState; @@ -40,7 +39,7 @@ divSchemes { default none; div(phi,Urel) Gauss upwind; - div(phi,h) Gauss upwind; + div(phi,i) Gauss upwind; div(phid,p) Gauss upwind; div(phi,k) Gauss upwind; diff --git a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSolution b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSolution index a70859619..d9f36e615 100644 --- a/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSolution +++ b/tutorials/compressible/steadyCompressibleSRFFoam/simpleBlade/system/fvSolution @@ -25,7 +25,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.01; - }; + } Urel { solver BiCGStab; @@ -35,8 +35,8 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.01; - }; - h + } + i { solver BiCGStab; preconditioner DILU; @@ -45,7 +45,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.01; - }; + } k { solver BiCGStab; @@ -55,7 +55,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.0; - }; + } epsilon { solver BiCGStab; @@ -65,7 +65,7 @@ solvers maxIter 1000; tolerance 1e-8; relTol 0.0; - }; + } } PIMPLE @@ -79,25 +79,20 @@ relaxationFactors { // Note: under-relaxation factors used in wave-transmissive schemes Urel 0.5; - p 0.3; - h 0.5; + p 0.2; + i 0.1; rho 0.5; - k 0.5; - epsilon 0.5; + k 0.2; + epsilon 0.2; } fieldBounds { - // No bounding -// p 0 1e7; -// T 0 10000; -// Urel 1e6; - // With bounding - p 50 1e6; - T 20 3000; - Urel 1000; + p 2e4 1e6; + T 200 500; + Urel 500; } // ************************************************************************* //