From 5dc9b66ba366725e6edeb18f6dc86ab5cf70c98e Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 13 Oct 2010 13:09:24 +0100 Subject: [PATCH 1/4] New Courant number now implemented in most solvers CHT solvers still to do --- .../solvers/combustion/PDRFoam/StCourantNo.H | 13 ++++------ .../adjointContinuityErrs.H | 4 ++-- .../shallowWaterFoam/CourantNo.H | 24 +++++++++---------- .../multiphase/cavitatingFoam/CourantNo.H | 20 +++++++++------- .../multiphase/interFoam/alphaCourantNo.H | 4 ++-- .../solvers/multiphase/interFoam/setDeltaT.H | 4 ++-- .../interMixingFoam/alphaCourantNo.H | 18 ++++++-------- .../multiphaseInterFoam/alphaCourantNo.H | 13 +++++----- .../multiphaseMixture/multiphaseMixture.C | 9 ++++--- .../multiphaseMixture/multiphaseMixture.H | 2 +- .../multiphase/twoPhaseEulerFoam/CourantNos.H | 7 +++--- src/dynamicFvMesh/include/meshCourantNo.H | 11 ++++----- .../compressible/compressibleCourantNo.H | 4 ++-- .../cfdTools/incompressible/CourantNo.H | 4 ++-- 14 files changed, 64 insertions(+), 73 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/StCourantNo.H b/applications/solvers/combustion/PDRFoam/StCourantNo.H index f755bb217b..8fac05d81c 100644 --- a/applications/solvers/combustion/PDRFoam/StCourantNo.H +++ b/applications/solvers/combustion/PDRFoam/StCourantNo.H @@ -34,17 +34,14 @@ Description if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs() - *mag(phiSt/fvc::interpolate(rho)); + scalarField sumPhi = + fvc::surfaceSum(mag(phiSt))().internalField() + /rho.internalField(); - StCoNum = - max(SfUfbyDelta/mesh.magSf()).value() - *runTime.deltaTValue(); + StCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); meanStCoNum = - (sum(SfUfbyDelta)/sum(mesh.magSf())).value() - *runTime.deltaTValue(); + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "St courant Number mean: " << meanStCoNum diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H index 1023a26c70..d4d72cf6ef 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H @@ -30,10 +30,10 @@ Description \*---------------------------------------------------------------------------*/ { - scalar sumLocalContErr = runTime.deltaT().value()* + scalar sumLocalContErr = runTime.deltaTValue()* mag(fvc::div(phia))().weightedAverage(mesh.V()).value(); - scalar globalContErr = runTime.deltaT().value()* + scalar globalContErr = runTime.deltaTValue()* fvc::div(phia)().weightedAverage(mesh.V()).value(); cumulativeContErr += globalContErr; diff --git a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H index 65cd8e02cc..0dfa24316f 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H +++ b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H @@ -36,23 +36,23 @@ scalar waveCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs() - *mag(phi)/fvc::interpolate(h); + scalarField sumPhi = + fvc::surfaceSum(mag(phi))().internalField() + /h.internalField(); - CoNum = max(SfUfbyDelta/mesh.magSf()) - .value()*runTime.deltaTValue(); + CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf())) - .value()*runTime.deltaTValue(); + meanCoNum = + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); // Gravity wave Courant number - waveCoNum = - 0.5*max + waveCoNum = 0.25*gMax + ( + fvc::surfaceSum ( - mesh.surfaceInterpolation::deltaCoeffs() - *sqrt(fvc::interpolate(h)) - ).value()*sqrt(magg).value()*runTime.deltaTValue(); + fvc::interpolate(sqrt(h))*mesh.magSf() + )().internalField()/mesh.V().field() + )*sqrt(magg).value()*runTime.deltaTValue(); } Info<< "Courant number mean: " << meanCoNum diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H index d5c5c53cc6..8b26ba033e 100644 --- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H +++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H @@ -35,19 +35,21 @@ scalar acousticCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs()*mag(phiv); + scalarField sumPhi = + fvc::surfaceSum(mag(phiv))().internalField(); - CoNum = max(SfUfbyDelta/mesh.magSf()) - .value()*runTime.deltaTValue(); + CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf())) - .value()*runTime.deltaTValue(); + meanCoNum = + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); - acousticCoNum = max + acousticCoNum = 0.5*gMax ( - mesh.surfaceInterpolation::deltaCoeffs()/sqrt(fvc::interpolate(psi)) - ).value()*runTime.deltaTValue(); + fvc::surfaceSum + ( + fvc::interpolate(scalar(1)/sqrt(psi))*mesh.magSf() + )().internalField()/mesh.V().field() + )*runTime.deltaTValue(); } Info<< "phiv Courant Number mean: " << meanCoNum diff --git a/applications/solvers/multiphase/interFoam/alphaCourantNo.H b/applications/solvers/multiphase/interFoam/alphaCourantNo.H index 12d1b933d4..e5edfc76ca 100644 --- a/applications/solvers/multiphase/interFoam/alphaCourantNo.H +++ b/applications/solvers/multiphase/interFoam/alphaCourantNo.H @@ -43,10 +43,10 @@ if (mesh.nInternalFaces()) pos(alpha1 - 0.01)*pos(0.99 - alpha1) *fvc::surfaceSum(mag(phi))().internalField(); - alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaT().value(); + alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); meanAlphaCoNum = - 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaT().value(); + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "Interface Courant Number mean: " << meanAlphaCoNum diff --git a/applications/solvers/multiphase/interFoam/setDeltaT.H b/applications/solvers/multiphase/interFoam/setDeltaT.H index b315dcd1a0..b619ed90f9 100644 --- a/applications/solvers/multiphase/interFoam/setDeltaT.H +++ b/applications/solvers/multiphase/interFoam/setDeltaT.H @@ -42,12 +42,12 @@ if (adjustTimeStep) ( min ( - deltaTFact*runTime.deltaT().value(), + deltaTFact*runTime.deltaTValue(), maxDeltaT ) ); - Info<< "deltaT = " << runTime.deltaT().value() << endl; + Info<< "deltaT = " << runTime.deltaTValue() << endl; } // ************************************************************************* // diff --git a/applications/solvers/multiphase/interMixingFoam/alphaCourantNo.H b/applications/solvers/multiphase/interMixingFoam/alphaCourantNo.H index a560a60d27..105149f87e 100644 --- a/applications/solvers/multiphase/interMixingFoam/alphaCourantNo.H +++ b/applications/solvers/multiphase/interMixingFoam/alphaCourantNo.H @@ -39,20 +39,16 @@ scalar meanAlphaCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField alpha1f = fvc::interpolate(alpha1); - surfaceScalarField alpha2f = fvc::interpolate(alpha2); - - surfaceScalarField SfUfbyDelta = max + scalarField sumPhi = max ( - pos(alpha1f - 0.01)*pos(0.99 - alpha1f), - pos(alpha2f - 0.01)*pos(0.99 - alpha2f) - )*mesh.surfaceInterpolation::deltaCoeffs()*mag(phi); + pos(alpha1 - 0.01)*pos(0.99 - alpha1), + pos(alpha2 - 0.01)*pos(0.99 - alpha2) + )*fvc::surfaceSum(mag(phi))().internalField(); - alphaCoNum = max(SfUfbyDelta/mesh.magSf()) - .value()*runTime.deltaT().value(); + alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - meanAlphaCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf())) - .value()*runTime.deltaT().value(); + meanAlphaCoNum = + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "Interface Courant Number mean: " << meanAlphaCoNum diff --git a/applications/solvers/multiphase/multiphaseInterFoam/alphaCourantNo.H b/applications/solvers/multiphase/multiphaseInterFoam/alphaCourantNo.H index 50e64f5f51..a63ab62103 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/alphaCourantNo.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/alphaCourantNo.H @@ -39,15 +39,14 @@ scalar meanAlphaCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = - mixture.nearInterface() - *mesh.surfaceInterpolation::deltaCoeffs()*mag(phi); + scalarField sumPhi = + mixture.nearInterface()().internalField() + *fvc::surfaceSum(mag(phi))().internalField(); - alphaCoNum = max(SfUfbyDelta/mesh.magSf()) - .value()*runTime.deltaT().value(); + alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - meanAlphaCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf())) - .value()*runTime.deltaT().value(); + meanAlphaCoNum = + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "Interface Courant Number mean: " << meanAlphaCoNum diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index c0582b5c13..22c45bad71 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -457,12 +457,12 @@ Foam::tmp Foam::multiphaseMixture::K } -Foam::tmp +Foam::tmp Foam::multiphaseMixture::nearInterface() const { - tmp tnearInt + tmp tnearInt ( - new surfaceScalarField + new volScalarField ( IOobject ( @@ -477,8 +477,7 @@ Foam::multiphaseMixture::nearInterface() const forAllConstIter(PtrDictionary, phases_, iter) { - surfaceScalarField alphaf = fvc::interpolate(iter()); - tnearInt() = max(tnearInt(), pos(alphaf - 0.01)*pos(0.99 - alphaf)); + tnearInt() = max(tnearInt(), pos(iter() - 0.01)*pos(0.99 - iter())); } return tnearInt; diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H index 32a7f10118..6a58813e54 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H @@ -258,7 +258,7 @@ public: //- Indicator of the proximity of the interface // Field values are 1 near and 0 away for the interface. - tmp nearInterface() const; + tmp nearInterface() const; //- Solve for the mixture phase-fractions void solve(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H index 75dcd68c7f..ae6a13feb0 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H @@ -1,11 +1,10 @@ # include "CourantNo.H" { - scalar UrCoNum = max + scalar UrCoNum = 0.5*gMax ( - mesh.surfaceInterpolation::deltaCoeffs()*mag(phia - phib) - /mesh.magSf() - ).value()*runTime.deltaT().value(); + fvc::surfaceSum(mag(phia - phib))().internalField()/mesh.V().field() + )*runTime.deltaTValue(); Info<< "Max Ur Courant Number = " << UrCoNum << endl; diff --git a/src/dynamicFvMesh/include/meshCourantNo.H b/src/dynamicFvMesh/include/meshCourantNo.H index 9ac0cb482f..501611db18 100644 --- a/src/dynamicFvMesh/include/meshCourantNo.H +++ b/src/dynamicFvMesh/include/meshCourantNo.H @@ -34,14 +34,13 @@ scalar meanMeshCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs()*mag(mesh.phi()); + scalarField sumPhi = + fvc::surfaceSum(mag(mesh.phi()))().internalField(); - meshCoNum = max(SfUfbyDelta/mesh.magSf()) - .value()*runTime.deltaTValue(); + meshCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - meanMeshCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf())) - .value()*runTime.deltaTValue(); + meanMeshCoNum = + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "Mesh Courant Number mean: " << meanMeshCoNum diff --git a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H index 73da862406..c96ddeb22f 100644 --- a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H +++ b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H @@ -38,10 +38,10 @@ if (mesh.nInternalFaces()) fvc::surfaceSum(mag(phi))().internalField() /rho.internalField(); - CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaT().value(); + CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); meanCoNum = - 0.5*(gSum(sumPhi)/sum(mesh.V().field()))*runTime.deltaT().value(); + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "Courant Number mean: " << meanCoNum diff --git a/src/finiteVolume/cfdTools/incompressible/CourantNo.H b/src/finiteVolume/cfdTools/incompressible/CourantNo.H index caef48a396..8b917e1f89 100644 --- a/src/finiteVolume/cfdTools/incompressible/CourantNo.H +++ b/src/finiteVolume/cfdTools/incompressible/CourantNo.H @@ -37,10 +37,10 @@ if (mesh.nInternalFaces()) scalarField sumPhi = fvc::surfaceSum(mag(phi))().internalField(); - CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaT().value(); + CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); meanCoNum = - 0.5*(gSum(sumPhi)/sum(mesh.V().field()))*runTime.deltaT().value(); + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } Info<< "Courant Number mean: " << meanCoNum From ba75d925eba653a855e926bb8b11dea6afc9ed01 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 13 Oct 2010 17:06:08 +0100 Subject: [PATCH 2/4] cavitatingFoam tutorial: Reorganised run and clean scripts so that the cases can be run individually --- .../cavitatingFoam/les/throttle/Allclean | 12 +++++++ .../cavitatingFoam/les/throttle/Allrun | 28 +++++++++++++++ .../cavitatingFoam/les/throttle3D/Allclean | 14 ++++++++ .../cavitatingFoam/les/throttle3D/Allrun | 36 +++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100755 tutorials/multiphase/cavitatingFoam/les/throttle/Allclean create mode 100755 tutorials/multiphase/cavitatingFoam/les/throttle/Allrun create mode 100755 tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean create mode 100755 tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean b/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean new file mode 100755 index 0000000000..70b255f01d --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allclean @@ -0,0 +1,12 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +rm -rf constant/polyMesh/sets > /dev/null 2>&1 +rm -rf 0/polyMesh > /dev/null 2>&1 +rm system/topoSetDict > /dev/null 2>&1 +cleanCase + +# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun new file mode 100755 index 0000000000..7b19d67145 --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun @@ -0,0 +1,28 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Set application name +application="cavitatingFoam" + +refineMeshByCellSet() +{ + while [ $# -ge 1 ] + do + echo "creating cell set for primary zone - $1" + cp system/topoSetDict.$1 system/topoSetDict + topoSet > log.topoSet.$1 2>&1 + + echo "refining primary zone - $1" + refineMesh -dict -overwrite > log.refineMesh.$1 2>&1 + shift + done +} + +runApplication blockMesh +refineMeshByCellSet 1 2 3 +runApplication $application + +# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean new file mode 100755 index 0000000000..b5c25b61f8 --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean @@ -0,0 +1,14 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +rm -rf constant/polyMesh/sets > /dev/null 2>&1 +rm -rf 0 > /dev/null 2>&1 +cp -r 0.org 0 +rm system/topoSetDict > /dev/null 2>&1 +rm -rf processor[0-9] > /dev/null 2>&1 +cleanCase + +# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun new file mode 100755 index 0000000000..e93a056053 --- /dev/null +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun @@ -0,0 +1,36 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Set application name +application="cavitatingFoam" + +refineMeshByCellSet() +{ + while [ $# -ge 1 ] + do + echo "creating cell set for primary zone - $1" + cp system/topoSetDict.$1 system/topoSetDict + topoSet > log.topoSet.$1 2>&1 + + echo "refining primary zone - $1" + refineMesh -dict -overwrite > log.refineMesh.$1 2>&1 + shift + done +} + +cp -r 0.org 0 + +runApplication blockMesh +refineMeshByCellSet 1 2 3 + +echo "mapping fields from 2D throttle case" +mapFields ../throttle -sourceTime latestTime > log.mapFields 2>&1 + +runApplication decomposePar +runParallel $application 4 +runApplication reconstructPar + +# ----------------------------------------------------------------- end-of-file From c078ab9dee082ca414b2ad52f1c510796e43a9f9 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 13 Oct 2010 17:08:10 +0100 Subject: [PATCH 3/4] DSMC tutorials: remove temporary files --- .../cavitatingFoam/cavitatingFoam.C | 2 +- .../lagrangian/dsmc/particleProperties | 24 ----------- .../lagrangian/dsmc/particleProperties | 24 ----------- .../multiphase/cavitatingFoam/les/Allclean | 30 -------------- .../multiphase/cavitatingFoam/les/Allrun | 40 +------------------ 5 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties delete mode 100755 tutorials/multiphase/cavitatingFoam/les/Allclean diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index 42543b3c37..38ea48ea25 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info<< "\n end \n"; + Info<< "End\n" << endl; return 0; } diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties deleted file mode 100644 index 5a73d67b46..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "0/uniform/lagrangian/dsmc"; - object particleProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -processor0 -{ - particleCount 63978; -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties deleted file mode 100644 index 5a73d67b46..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "0/uniform/lagrangian/dsmc"; - object particleProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -processor0 -{ - particleCount 63978; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/Allclean b/tutorials/multiphase/cavitatingFoam/les/Allclean deleted file mode 100755 index 68db65d125..0000000000 --- a/tutorials/multiphase/cavitatingFoam/les/Allclean +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -( - cd throttle || exit - - rm -rf constant/polyMesh/sets > /dev/null 2>&1 - rm -rf 0/polyMesh > /dev/null 2>&1 - rm system/topoSetDict > /dev/null 2>&1 - - cleanCase -) - - -( - cd throttle3D || exit - - rm -rf constant/polyMesh/sets > /dev/null 2>&1 - rm -rf 0 > /dev/null 2>&1 - cp -r 0.org 0 - rm system/topoSetDict > /dev/null 2>&1 - rm -rf processor[0-9] > /dev/null 2>&1 - - cleanCase -) - -# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun index 9fe67390bd..41c1dd5368 100755 --- a/tutorials/multiphase/cavitatingFoam/les/Allrun +++ b/tutorials/multiphase/cavitatingFoam/les/Allrun @@ -1,50 +1,14 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -# Set application name -application="cavitatingFoam" - -refineMeshByCellSet() -{ - while [ $# -ge 1 ] - do - echo "creating cell set for primary zone - $1" - cp system/topoSetDict.$1 system/topoSetDict - topoSet > log.topoSet.$1 2>&1 - - echo "refining primary zone - $1" - refineMesh -dict -overwrite > log.refineMesh.$1 2>&1 - shift - done -} - - ( cd throttle || exit - - runApplication blockMesh - refineMeshByCellSet 1 2 3 - runApplication $application + ./Allrun ) - ( cd throttle3D || exit - - cp -r 0.org 0 - - runApplication blockMesh - refineMeshByCellSet 1 2 3 - - echo "mapping fields from 2D throttle case" - mapFields ../throttle -sourceTime latestTime > log.mapFields 2>&1 - - runApplication decomposePar - runParallel $application 4 - runApplication reconstructPar + ./Allrun ) # ----------------------------------------------------------------- end-of-file From afe4814d83a08d40f050c5b8521d630610258477 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 13 Oct 2010 17:08:41 +0100 Subject: [PATCH 4/4] boundary: updated --- .../les/throttle/constant/polyMesh/boundary | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary index 999c16bc8e..4732ca525c 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary @@ -21,25 +21,25 @@ FoamFile { type patch; nFaces 51; - startFace 15151; + startFace 35380; } outlet { type patch; nFaces 51; - startFace 15202; + startFace 35431; } walls { type wall; - nFaces 436; - startFace 15253; + nFaces 640; + startFace 35482; } frontBack { type empty; - nFaces 15420; - startFace 15689; + nFaces 35580; + startFace 36122; } )