From e2c4472ab6d9e4717819b50e4f9f679c9bff97a5 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 19 Sep 2017 17:01:54 +0100 Subject: [PATCH] STYLE: engineFoam: Renamed engineFoam -> XiEngineFoam and sprayEngineFoam -> engineFoam XiEngineFoam is a premixed/partially-premixed combustion engine solver which exclusively uses the Xi flamelet combustion model. engineFoam is a general engine solver for inhomogeneous combustion with or without spray supporting run-time selection of the chemistry-based combustion model. --- .../combustion/XiFoam/XiDyMFoam/XiDyMFoam.C | 1 - .../XiFoam/XiEngineFoam/XiEngineFoam.C | 7 +- .../XiFoam/XiEngineFoam/logSummary.H | 35 +++----- .../coldEngineFoam/readEngineTimeControls.H | 3 - .../sprayFoam/engineFoam/engineFoam.C | 8 +- .../sprayFoam/engineFoam/startSummary.H | 11 --- .../combustion/XiEngineFoam/kivaTest/-180/Su | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/T | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/Tu | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/U | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/Xi | 4 +- .../XiEngineFoam/kivaTest/-180/alphat | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/b | 4 +- .../XiEngineFoam/kivaTest/-180/epsilon | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/ft | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/fu | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/k | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/nut | 4 +- .../combustion/XiEngineFoam/kivaTest/-180/p | 4 +- .../combustion/XiEngineFoam/kivaTest/Allclean | 12 ++- .../combustion/XiEngineFoam/kivaTest/Allrun | 12 ++- .../kivaTest/constant/combustionProperties | 4 +- .../kivaTest/constant/engineGeometry | 4 +- .../constant/thermophysicalProperties | 4 +- .../kivaTest/constant/turbulenceProperties | 4 +- .../XiEngineFoam/kivaTest/system/controlDict | 20 ++--- .../XiEngineFoam/kivaTest/system/fvSchemes | 4 +- .../XiEngineFoam/kivaTest/system/fvSolution | 4 +- .../combustion/engineFoam/freePiston/0/T | 53 ----------- .../combustion/engineFoam/freePiston/0/U | 53 ----------- .../combustion/engineFoam/freePiston/0/air | 53 ----------- .../combustion/engineFoam/freePiston/0/alphat | 38 -------- .../engineFoam/freePiston/0/epsilon | 53 ----------- .../freePiston/0/include/boundaryConditions | 70 --------------- .../freePiston/0/include/caseSettings | 28 ------ .../combustion/engineFoam/freePiston/0/k | 53 ----------- .../combustion/engineFoam/freePiston/0/nut | 38 -------- .../combustion/engineFoam/freePiston/0/p | 53 ----------- .../freePiston/constant/engineGeometry | 29 ------- .../engineFoam/freePiston/constant/g | 21 ----- .../freePiston/constant/include/reactions.air | 8 -- .../freePiston/constant/include/thermo.air | 21 ----- .../constant/thermophysicalProperties | 38 -------- .../freePiston/constant/turbulenceProperties | 29 ------- .../freePiston/system/blockMeshDict | 87 ------------------- .../engineFoam/freePiston/system/controlDict | 51 ----------- .../engineFoam/freePiston/system/fvSchemes | 66 -------------- .../engineFoam/freePiston/system/fvSolution | 62 ------------- 48 files changed, 84 insertions(+), 1005 deletions(-) delete mode 100644 applications/solvers/combustion/coldEngineFoam/readEngineTimeControls.H delete mode 100644 applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/T delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/U delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/air delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/alphat delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/epsilon delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/include/boundaryConditions delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/include/caseSettings delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/k delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/nut delete mode 100644 tutorials/combustion/engineFoam/freePiston/0/p delete mode 100644 tutorials/combustion/engineFoam/freePiston/constant/engineGeometry delete mode 100644 tutorials/combustion/engineFoam/freePiston/constant/g delete mode 100644 tutorials/combustion/engineFoam/freePiston/constant/include/reactions.air delete mode 100644 tutorials/combustion/engineFoam/freePiston/constant/include/thermo.air delete mode 100644 tutorials/combustion/engineFoam/freePiston/constant/thermophysicalProperties delete mode 100644 tutorials/combustion/engineFoam/freePiston/constant/turbulenceProperties delete mode 100644 tutorials/combustion/engineFoam/freePiston/system/blockMeshDict delete mode 100644 tutorials/combustion/engineFoam/freePiston/system/controlDict delete mode 100644 tutorials/combustion/engineFoam/freePiston/system/fvSchemes delete mode 100644 tutorials/combustion/engineFoam/freePiston/system/fvSolution diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C index 22ee548456..b6fda29be3 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/XiDyMFoam.C @@ -77,7 +77,6 @@ int main(int argc, char *argv[]) #include "readGravitationalAcceleration.H" #include "createFields.H" #include "createFieldRefs.H" - #include "createFvOptions.H" #include "initContinuityErrs.H" #include "createRhoUf.H" #include "createControls.H" diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index 89b6370dca..6ac9443f4c 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C @@ -24,9 +24,6 @@ License Application XiEngineFoam -Group - grpCombustionSolvers - Description Solver for internal combustion engines. @@ -139,7 +136,9 @@ int main(int argc, char *argv[]) runTime.write(); - runTime.printExecutionTime(Info); + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" + << nl << endl; } Info<< "End\n" << endl; diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H index 181fd0b4b9..c243b889ae 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H @@ -1,22 +1,15 @@ -{ - const scalar meanp = p.weightedAverage(mesh.V()).value(); - const scalar meanT = thermo.T().weightedAverage(mesh.V()).value(); - const scalar meanup = - (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value(); - const scalar meanc = 1 - b.weightedAverage(mesh.V()).value(); +Info<< "Mean pressure:" << p.weightedAverage(mesh.V()).value() << endl; +Info<< "Mean temperature:" << thermo.T().weightedAverage(mesh.V()).value() + << endl; +Info<< "Mean u':" + << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() + << endl; - if (Pstream::master()) - { - Info<< "Mean pressure:" << meanp << endl; - Info<< "Mean temperature:" << meanT << endl; - Info<< "Mean u':" << meanup << endl; - - logSummaryFile() - << runTime.theta() << tab - << meanp << tab - << meanT << tab - << meanup << tab - << meanc - << endl; - } -} +logSummaryFile + << runTime.theta() << tab + << p.weightedAverage(mesh.V()).value() << tab + << thermo.T().weightedAverage(mesh.V()).value() << tab + << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() + << tab + << 1 - b.weightedAverage(mesh.V()).value() + << endl; diff --git a/applications/solvers/combustion/coldEngineFoam/readEngineTimeControls.H b/applications/solvers/combustion/coldEngineFoam/readEngineTimeControls.H deleted file mode 100644 index cccee289dd..0000000000 --- a/applications/solvers/combustion/coldEngineFoam/readEngineTimeControls.H +++ /dev/null @@ -1,3 +0,0 @@ - #include "createTimeControls.H" - - maxDeltaT = runTime.userTimeToTime(maxDeltaT); diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 489c233148..38032cf67e 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C @@ -24,9 +24,6 @@ License Application engineFoam -Group - grpLagrangianSolvers grpMovingMeshSolvers - Description Transient solver for compressible, turbulent engine flow with a spray particle cloud. @@ -59,6 +56,7 @@ int main(int argc, char *argv[]) #include "readEngineTimeControls.H" #include "createFields.H" #include "createFieldRefs.H" + #include "createFvOptions.H" #include "createRhoUf.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" @@ -115,7 +113,9 @@ int main(int argc, char *argv[]) combustion->Qdot()().write(); } - runTime.printExecutionTime(Info); + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" + << nl << endl; } Info<< "End\n" << endl; diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H b/applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H deleted file mode 100644 index 3ee56bcfa8..0000000000 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H +++ /dev/null @@ -1,11 +0,0 @@ -Info<< "Total cylinder mass: " << fvc::domainIntegrate(rho).value() << endl; -//Info<< "Total fuel mass: " -// << fvc::domainIntegrate(rho*compostion.ft()).value() << endl; - -OFstream logSummaryFile -( - runTime.path()/("logSummary." + runTime.timeName() + ".dat") -); - -logSummaryFile - << "# CA" << " p" << " T" << " u'" << endl; diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su index 6e6b9819b1..8fbe60a5ee 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Su @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/T b/tutorials/combustion/XiEngineFoam/kivaTest/-180/T index 3a70bccb8b..0397020c77 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/T +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/T @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu index e4cfafc512..39095fd4f7 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Tu @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/U b/tutorials/combustion/XiEngineFoam/kivaTest/-180/U index d71d6e4511..d04fb3bf94 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/U +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi index deda54e8d2..1afe3e8df2 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/Xi @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat b/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat index 7c319823b1..65c47ed499 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/alphat @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/b b/tutorials/combustion/XiEngineFoam/kivaTest/-180/b index 04cb475b02..05bd8baf48 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/b +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/b @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon b/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon index 1e1b56ad8a..9cb713ec95 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft b/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft index c15b9a1804..af31f925db 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/ft @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu b/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu index a7bd98f14c..f089ac7071 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/fu @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/k b/tutorials/combustion/XiEngineFoam/kivaTest/-180/k index c0947a6dd0..fb951423a9 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/k +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut b/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut index c5ca5b971c..68a368eb00 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/nut @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/-180/p b/tutorials/combustion/XiEngineFoam/kivaTest/-180/p index 6a4bf2620e..aacee2544a 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/-180/p +++ b/tutorials/combustion/XiEngineFoam/kivaTest/-180/p @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean index 71df6ecdbb..6904a7f0e6 100755 --- a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean +++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean @@ -1,11 +1,15 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions +cd ${0%/*} || exit 1 # Run from this directory + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions mv ./-180 temp180 +cleanCase -cleanCase0 +rm -rf 0 > /dev/null 2>&1 +rm -f constant/polyMesh/boundary > /dev/null 2>&1 mv temp180 ./-180 -#------------------------------------------------------------------------------ +#------------------------------------------------------------------------------ \ No newline at end of file diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun index 80677173bd..e51b7da7c0 100755 --- a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun +++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun @@ -1,8 +1,14 @@ #!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory -. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions +cd ${0%/*} || exit 1 # Run from this directory + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name +application=`getApplication` runApplication kivaToFoam -file otape17 -runApplication $(getApplication) + +runApplication $application #------------------------------------------------------------------------------ diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties index 0b38d8ff8a..c0de6fda5d 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties +++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/combustionProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry index 2b5872062c..1c21d87a30 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry +++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/engineGeometry @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties index 2077c45e90..b64b041ab3 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties +++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/thermophysicalProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties index 4a352b58ab..68e1d58bc5 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict index bd92c36a9b..94459c4653 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/controlDict @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -55,9 +55,13 @@ functions { timeStep { - type coded; + type coded; libs ("libutilityFunctionObjects.so"); - name setDeltaT; + name setDeltaT; + + code + #{ + #}; codeExecute #{ @@ -71,14 +75,6 @@ functions } #}; } - - fieldMinMax - { - type fieldMinMax; - libs ("libfieldFunctionObjects.so"); - fields (p); - } } - // ************************************************************************* // diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes index 5cbf7482fd..1e0ebc519b 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes +++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSchemes @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution index dc32468b7a..64ba5515ca 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution +++ b/tutorials/combustion/XiEngineFoam/kivaTest/system/fvSolution @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/combustion/engineFoam/freePiston/0/T b/tutorials/combustion/engineFoam/freePiston/0/T deleted file mode 100644 index 097e61c6a7..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/T +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform $:internalField.T; - -boundaryField -{ - back - { - type wedge; - } - - front - { - $back; - } - - liner - { - $:wall.T; - } - - cylinderHead - { - $liner; - } - - piston - { - $liner; - } -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/U b/tutorials/combustion/engineFoam/freePiston/0/U deleted file mode 100644 index 81c314be05..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/U +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM:.Uhe Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volVectorField; - location "0"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform $:internalField.U; - -boundaryField -{ - back - { - type wedge; - } - - front - { - $back; - } - - liner - { - $:wall.U; - } - - cylinderHead - { - $liner; - } - - piston - { - $:piston.U; - } -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/air b/tutorials/combustion/engineFoam/freePiston/0/air deleted file mode 100644 index 61bd8112ae..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/air +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - back - { - type wedge; - } - - front - { - $back; - } - - liner - { - $:wall.p; - } - - cylinderHead - { - $liner; - } - - piston - { - $liner; - } -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/alphat b/tutorials/combustion/engineFoam/freePiston/0/alphat deleted file mode 100644 index 6d96c7f481..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/alphat +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object alphat; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - back - { - type wedge; - } - front { $back; } - liner { $:wall.alphat; } - cylinderHead { $liner; } - piston { $liner; } -} -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/epsilon b/tutorials/combustion/engineFoam/freePiston/0/epsilon deleted file mode 100644 index c51e83baa5..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/epsilon +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform $:internalField.epsilon; - -boundaryField -{ - back - { - type wedge; - } - - front - { - $back; - } - - liner - { - $:wall.epsilon; - } - - cylinderHead - { - $liner; - } - - piston - { - $liner; - } -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/include/boundaryConditions b/tutorials/combustion/engineFoam/freePiston/0/include/boundaryConditions deleted file mode 100644 index d49dedb7c8..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/include/boundaryConditions +++ /dev/null @@ -1,70 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object boundaryConditions; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -wall -{ - p - { - type zeroGradient; - } - - U - { - type fixedValue; - value uniform (0 0 0); - } - - T - { - type zeroGradient; - } - - k - { - type kqRWallFunction; - value uniform $:internalField.k; - } - - epsilon - { - type epsilonWallFunction; - value uniform $:internalField.epsilon; - } - - nut - { - type nutkWallFunction; - value uniform 0; - } - - alphat - { - type compressible::alphatWallFunction; - Prt 0.85; - value uniform 0; - } -} - -piston -{ - U - { - type movingWallVelocity; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/include/caseSettings b/tutorials/combustion/engineFoam/freePiston/0/include/caseSettings deleted file mode 100644 index fd4fc84c88..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/include/caseSettings +++ /dev/null @@ -1,28 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object caseSettings; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -internalField -{ - U (0 0 0); - epsilon 5.70e-5; - k 2.40e-5; - T 350; - p 1e5; -} - -#include "boundaryConditions" - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/k b/tutorials/combustion/engineFoam/freePiston/0/k deleted file mode 100644 index b428f1080b..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/k +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM:.khe Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform $:internalField.k; - -boundaryField -{ - back - { - type wedge; - } - - front - { - $back; - } - - liner - { - $:wall.k; - } - - cylinderHead - { - $liner; - } - - piston - { - $liner; - } -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/nut b/tutorials/combustion/engineFoam/freePiston/0/nut deleted file mode 100644 index 2d3213ce17..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/nut +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - back - { - type wedge; - } - front { $back; } - liner { $:wall.nut; } - cylinderHead { $liner; } - piston { $liner; } -} -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/0/p b/tutorials/combustion/engineFoam/freePiston/0/p deleted file mode 100644 index 6676f4e209..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/0/p +++ /dev/null @@ -1,53 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM:.phe Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/caseSettings" - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform $:internalField.p; - -boundaryField -{ - back - { - type wedge; - } - - front - { - $back; - } - - liner - { - $:wall.p; - } - - cylinderHead - { - $liner; - } - - piston - { - $liner; - } -} - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/constant/engineGeometry b/tutorials/combustion/engineFoam/freePiston/constant/engineGeometry deleted file mode 100644 index 62371d9779..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/constant/engineGeometry +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object engineGeometry; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -engineMesh layered; - -engineType freePiston; - -pistonPositionTime table -( - (0 0.13) - (0.020 0.013) -); - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/constant/g b/tutorials/combustion/engineFoam/freePiston/constant/g deleted file mode 100644 index d182180d95..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/constant/g +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value (0 0 0); - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/constant/include/reactions.air b/tutorials/combustion/engineFoam/freePiston/constant/include/reactions.air deleted file mode 100644 index 5bb714747f..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/constant/include/reactions.air +++ /dev/null @@ -1,8 +0,0 @@ -species -( - air -); - -reactions -{ -} diff --git a/tutorials/combustion/engineFoam/freePiston/constant/include/thermo.air b/tutorials/combustion/engineFoam/freePiston/constant/include/thermo.air deleted file mode 100644 index f2dad8a6c0..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/constant/include/thermo.air +++ /dev/null @@ -1,21 +0,0 @@ -air -{ - specie - { - nMoles 1; - molWeight 28.9596; - } - thermodynamics - { - Tlow 200; - Thigh 3500; - Tcommon 1000; - highCpCoeffs ( 3.57304 -7.24383e-04 1.67022e-06 -1.26501e-10 -4.20580e-13 -1047.41 3.12431 ); - lowCpCoeffs ( 3.09589 1.22835e-03 -4.14267e-07 6.56910e-11 -3.87021e-15 -983.191 5.34161 ); - } - transport - { - As 1.67212e-06; - Ts 170.672; - } -} diff --git a/tutorials/combustion/engineFoam/freePiston/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/freePiston/constant/thermophysicalProperties deleted file mode 100644 index 15a3d8ab51..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/constant/thermophysicalProperties +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type hePsiThermo; - mixture reactingMixture; - transport sutherland; - thermo janaf; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -inertSpecie air; - -chemistryReader foamChemistryReader; - -foamChemistryFile "$FOAM_CASE/constant/include/reactions.air"; - -foamChemistryThermoFile "$FOAM_CASE/constant/include/thermo.air"; - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/constant/turbulenceProperties b/tutorials/combustion/engineFoam/freePiston/constant/turbulenceProperties deleted file mode 100644 index d587253c9a..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/constant/turbulenceProperties +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - RASModel kEpsilon; - - turbulence on; - - printCoeffs on; -} - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/system/blockMeshDict b/tutorials/combustion/engineFoam/freePiston/system/blockMeshDict deleted file mode 100644 index 434e1c2f47..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/system/blockMeshDict +++ /dev/null @@ -1,87 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 1; - -vertices -( - (0 0 0) - (0.05 -0.000872753 0) - (0.05 0.000872753 0) - (0 0 0.13) - (0.05 -0.000872753 0.13) - (0.05 0.000872753 0.13) -); - -blocks -( - hex (0 1 2 0 3 4 5 3) (50 1 130) simpleGrading (1 1 1) -); - -boundary -( - front - { - type wedge; - faces - ( - (0 1 4 3) - ); - } - back - { - type wedge; - faces - ( - (0 3 5 2) - ); - } - piston - { - type wall; - faces - ( - (0 2 1 0) - ); - } - cylinderHead - { - type wall; - faces - ( - (3 4 5 3) - ); - } - axis - { - type empty; - faces - ( - (0 3 3 0) - ); - } - liner - { - type wall; - faces - ( - (1 2 5 4) - ); - } -); - - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/system/controlDict b/tutorials/combustion/engineFoam/freePiston/system/controlDict deleted file mode 100644 index 08ccfa4cf3..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/system/controlDict +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application coldEngineFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 0.03; - -deltaT 5.0e-7; - -writeControl adjustableRunTime; - -writeInterval 0.001; - -purgeWrite 0; - -writeFormat binary; - -writePrecision 6; - -writeCompression off; - -timeFormat general; - -timePrecision 8; - -runTimeModifiable true; - -adjustTimeStep yes; - -maxCo 0.25; - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/system/fvSchemes b/tutorials/combustion/engineFoam/freePiston/system/fvSchemes deleted file mode 100644 index a3bc2848d7..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/system/fvSchemes +++ /dev/null @@ -1,66 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - - div(phi,U) Gauss linearUpwind grad(U); - div(phi,e) Gauss linearUpwind grad(e); - - div(phiv,p) Gauss linear; - div(phi,K) Gauss linear; - div(meshPhi,p) Gauss linear; - - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; - - div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default corrected; -} - -fluxRequired -{ - default no; - p; -} - -// ************************************************************************* // diff --git a/tutorials/combustion/engineFoam/freePiston/system/fvSolution b/tutorials/combustion/engineFoam/freePiston/system/fvSolution deleted file mode 100644 index a9e1486f35..0000000000 --- a/tutorials/combustion/engineFoam/freePiston/system/fvSolution +++ /dev/null @@ -1,62 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - "rho.*" - { - solver diagonal; - } - - p - { - solver PCG; - preconditioner DIC; - tolerance 1e-6; - relTol 0.1; - } - - pFinal - { - $p; - relTol 0; - } - - "(U|e|k|epsilon)" - { - solver PBiCGStab; - preconditioner DILU; - tolerance 1e-5; - relTol 0.1; - } - - "(U|e|k|epsilon)Final" - { - $U; - relTol 0; - } -} - -PIMPLE -{ - nCorrectors 2; - nNonOrthogonalCorrectors 1; - momentumPredictor yes; -} - - -// ************************************************************************* //