From 6400a2a484d99968f4364aa0d81ae89a345a1b34 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Nov 2011 15:54:06 +0000 Subject: [PATCH 1/5] ENH: Improved code comments for triangle intersection area calc --- .../faceAreaIntersect/faceAreaIntersect.C | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C index 953e1d4afa..218c41afbf 100644 --- a/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C +++ b/src/meshTools/AMIInterpolation/faceAreaIntersect/faceAreaIntersect.C @@ -53,9 +53,9 @@ void Foam::faceAreaIntersect::triSliceWithPlane if (mag(d[i]) < matchTol*len) { - d[i] = 0.0; nCoPlanar++; copI = i; + d[i] = 0.0; } else { @@ -71,6 +71,9 @@ void Foam::faceAreaIntersect::triSliceWithPlane } } + + // Determine triangle area contribution + if ( (nPos == 3) @@ -78,6 +81,12 @@ void Foam::faceAreaIntersect::triSliceWithPlane || ((nPos == 1) && (nCoPlanar == 2))) { // all points above cutting plane - add triangle to list + + // /\ _____ + // / \ \ / /\ + // /____\ \ / / \ + // __________ ____v____ __/____\__ + tris[nTris++] = tri; } else if ((nPos == 2) && (nCoPlanar == 0)) @@ -85,6 +94,12 @@ void Foam::faceAreaIntersect::triSliceWithPlane // 2 points above plane, 1 below // resulting quad above plane split into 2 triangles + // ________ + // \ / + // --\----/-- + // \ / + // \/ + // point under the plane label i0 = negI; @@ -110,6 +125,11 @@ void Foam::faceAreaIntersect::triSliceWithPlane { // 1 point above plane, 2 below + // /\ + // / \ + // --/----\-- + // /______\ + // indices of remaining points label i1 = d.fcIndex(i0); label i2 = d.fcIndex(i1); @@ -126,6 +146,13 @@ void Foam::faceAreaIntersect::triSliceWithPlane { // 1 point above plane, 1 on plane, 1 below + // |\ + // | \ + // __|__\__ + // | / + // | / + // |/ + // point indices label i1 = negI; label i2 = copI; @@ -147,6 +174,13 @@ void Foam::faceAreaIntersect::triSliceWithPlane else { // all points below cutting plane - forget + + // _________ __________ ___________ + // /\ \ / + // /\ / \ \ / + // / \ /____\ \/ + // /____\ + } } From 627991bfc4f485006f50aeaf9d312d4bad3458c6 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Nov 2011 16:18:59 +0000 Subject: [PATCH 2/5] ENH: deprecated dieselSpray library and related solvers/deps --- .../combustion/dieselEngineFoam/Make/files | 3 - .../combustion/dieselEngineFoam/Make/options | 40 - .../combustion/dieselEngineFoam/UEqn.H | 14 - .../combustion/dieselEngineFoam/YEqn.H | 48 -- .../dieselEngineFoam/createFields.H | 104 --- .../combustion/dieselEngineFoam/createSpray.H | 37 - .../dieselEngineFoam/dieselEngineFoam.C | 122 ---- .../combustion/dieselEngineFoam/hsEqn.H | 21 - .../combustion/dieselEngineFoam/logSummary.H | 12 - .../combustion/dieselEngineFoam/pEqn.H | 65 -- .../combustion/dieselEngineFoam/rhoEqn.H | 64 -- .../dieselEngineFoam/spraySummary.H | 30 - .../dieselEngineFoam/startSummary.H | 11 - .../solvers/combustion/dieselFoam/Make/files | 3 - .../combustion/dieselFoam/Make/options | 38 - .../combustion/dieselFoam/dieselFoam.C | 118 --- .../solvers/combustion/dieselFoam/pEqn.H | 72 -- .../foamDebugSwitches/Make/options | 1 - .../dataConversion/foamToGMV/Make/options | 3 +- src/lagrangian/Allwmake | 1 - src/lagrangian/dieselSpray/Make/files | 95 --- src/lagrangian/dieselSpray/Make/options | 29 - .../commonRailInjector/commonRailInjector.C | 436 ----------- .../commonRailInjector/commonRailInjector.H | 235 ------ .../definedInjector/definedInjector.C | 399 ---------- .../definedInjector/definedInjector.H | 240 ------ .../dieselSpray/injector/injector/injector.C | 41 -- .../dieselSpray/injector/injector/injector.H | 115 --- .../dieselSpray/injector/injector/injectorI.H | 47 -- .../injector/injector/injectorIO.C | 56 -- .../injector/injectorType/injectorType.C | 176 ----- .../injector/injectorType/injectorType.H | 235 ------ .../multiHoleInjector/multiHoleInjector.C | 452 ------------ .../multiHoleInjector/multiHoleInjector.H | 245 ------- .../injector/swirlInjector/swirlInjector.C | 447 ------------ .../injector/swirlInjector/swirlInjector.H | 254 ------- .../injector/unitInjector/unitInjector.C | 390 ---------- .../injector/unitInjector/unitInjector.H | 234 ------ .../dieselSpray/parcel/boundaryTreatment.H | 54 -- src/lagrangian/dieselSpray/parcel/parcel.C | 685 ------------------ src/lagrangian/dieselSpray/parcel/parcel.H | 432 ----------- .../dieselSpray/parcel/parcelFunctions.C | 115 --- src/lagrangian/dieselSpray/parcel/parcelI.H | 232 ------ src/lagrangian/dieselSpray/parcel/parcelIO.C | 337 --------- .../dieselSpray/parcel/setRelaxationTimes.C | 306 -------- .../dieselSpray/spray/findInjectorCell.H | 82 --- src/lagrangian/dieselSpray/spray/spray.C | 364 ---------- src/lagrangian/dieselSpray/spray/spray.H | 356 --------- .../dieselSpray/spray/sprayFunctions.C | 398 ---------- src/lagrangian/dieselSpray/spray/sprayI.H | 382 ---------- .../dieselSpray/spray/sprayInject.C | 185 ----- src/lagrangian/dieselSpray/spray/sprayOps.C | 144 ---- .../atomizationModel/LISA/LISA.C | 375 ---------- .../atomizationModel/LISA/LISA.H | 113 --- .../atomizationModel/atomizationModel.C | 58 -- .../atomizationModel/atomizationModel.H | 121 ---- .../atomizationModel/atomizationModelNew.C | 63 -- .../blobsSheetAtomization.C | 140 ---- .../blobsSheetAtomization.H | 108 --- .../noAtomization/noAtomization.C | 79 -- .../noAtomization/noAtomization.H | 87 --- .../spraySubModels/breakupModel/ETAB/ETAB.C | 191 ----- .../spraySubModels/breakupModel/ETAB/ETAB.H | 127 ---- .../spraySubModels/breakupModel/SHF/SHF.C | 262 ------- .../spraySubModels/breakupModel/SHF/SHF.H | 149 ---- .../spraySubModels/breakupModel/TAB/TAB.C | 208 ------ .../spraySubModels/breakupModel/TAB/TAB.H | 124 ---- .../breakupModel/breakupModel/breakupModel.C | 141 ---- .../breakupModel/breakupModel/breakupModel.H | 151 ---- .../breakupModel/breakupModelNew.C | 61 -- .../breakupModel/noBreakup/noBreakup.C | 79 -- .../breakupModel/noBreakup/noBreakup.H | 91 --- .../breakupModel/reitzDiwakar/reitzDiwakar.C | 146 ---- .../breakupModel/reitzDiwakar/reitzDiwakar.H | 103 --- .../breakupModel/reitzKHRT/reitzKHRT.C | 229 ------ .../breakupModel/reitzKHRT/reitzKHRT.H | 107 --- .../ORourke/ORourkeCollisionModel.C | 126 ---- .../ORourke/ORourkeCollisionModel.H | 100 --- .../collisionModel/ORourke/sameCell.H | 160 ---- .../collisionModel/collisionModel.C | 60 -- .../collisionModel/collisionModel.H | 124 ---- .../collisionModel/collisionModelNew.C | 66 -- .../collisionModel/noCollision/noCollision.C | 73 -- .../collisionModel/noCollision/noCollision.H | 86 --- .../trajectoryModel/trajectoryCM.H | 205 ------ .../trajectoryModel/trajectoryModel.C | 120 --- .../trajectoryModel/trajectoryModel.H | 103 --- .../dispersionLESModel/dispersionLESModel.C | 60 -- .../dispersionLESModel/dispersionLESModel.H | 91 --- .../dispersionModel/dispersionModel.C | 58 -- .../dispersionModel/dispersionModel.H | 114 --- .../dispersionModel/dispersionModelNew.C | 62 -- .../dispersionRASModel/dispersionRASModel.C | 60 -- .../dispersionRASModel/dispersionRASModel.H | 92 --- .../gradientDispersionRAS.C | 137 ---- .../gradientDispersionRAS.H | 83 --- .../noDispersion/noDispersion.C | 68 -- .../noDispersion/noDispersion.H | 81 --- .../stochasticDispersionRAS.C | 129 ---- .../stochasticDispersionRAS.H | 83 --- .../dragModel/dragModel/dragModel.C | 54 -- .../dragModel/dragModel/dragModel.H | 124 ---- .../dragModel/dragModel/dragModelNew.C | 56 -- .../dragModel/noDragModel/noDragModel.C | 86 --- .../dragModel/noDragModel/noDragModel.H | 94 --- .../standardDragModel/standardDragModel.C | 119 --- .../standardDragModel/standardDragModel.H | 106 --- .../RutlandFlashBoil/RutlandFlashBoil.C | 356 --------- .../RutlandFlashBoil/RutlandFlashBoil.H | 153 ---- .../evaporationModel/evaporationModel.C | 51 -- .../evaporationModel/evaporationModel.H | 155 ---- .../evaporationModel/evaporationModelNew.C | 59 -- .../noEvaporation/noEvaporation.C | 121 ---- .../noEvaporation/noEvaporation.H | 129 ---- .../saturateEvaporationModel.C | 141 ---- .../saturateEvaporationModel.H | 142 ---- .../standardEvaporationModel.C | 206 ------ .../standardEvaporationModel.H | 144 ---- .../RanzMarshall/RanzMarshall.C | 132 ---- .../RanzMarshall/RanzMarshall.H | 108 --- .../heatTransferModel/heatTransferModel.C | 48 -- .../heatTransferModel/heatTransferModel.H | 132 ---- .../heatTransferModel/heatTransferModelNew.C | 60 -- .../noHeatTransfer/noHeatTransfer.C | 92 --- .../noHeatTransfer/noHeatTransfer.H | 101 --- .../injectorModel/Chomiak/Chomiak.C | 197 ----- .../injectorModel/Chomiak/Chomiak.H | 121 ---- .../blobsSwirl/blobsSwirlInjector.C | 294 -------- .../blobsSwirl/blobsSwirlInjector.H | 160 ---- .../injectorModel/constant/constInjector.C | 211 ------ .../injectorModel/constant/constInjector.H | 106 --- .../definedHollowCone/definedHollowCone.C | 237 ------ .../definedHollowCone/definedHollowCone.H | 115 --- .../definedPressureSwirl.C | 343 --------- .../definedPressureSwirl.H | 132 ---- .../injectorModel/hollowCone/hollowCone.C | 202 ------ .../injectorModel/hollowCone/hollowCone.H | 110 --- .../injectorModel/injectorModel.C | 61 -- .../injectorModel/injectorModel.H | 135 ---- .../injectorModel/injectorModelNew.C | 61 -- .../pressureSwirl/pressureSwirlInjector.C | 261 ------- .../pressureSwirl/pressureSwirlInjector.H | 128 ---- .../wallModel/reflectParcel/reflectParcel.C | 186 ----- .../wallModel/reflectParcel/reflectParcel.H | 102 --- .../wallModel/removeParcel/removeParcel.C | 75 -- .../wallModel/removeParcel/removeParcel.H | 88 --- .../wallModel/wallModel/wallModel.C | 58 -- .../wallModel/wallModel/wallModel.H | 134 ---- .../wallModel/wallModel/wallModelNew.C | 60 -- .../combustion/dieselFoam/aachenBomb/0/N2 | 29 - .../combustion/dieselFoam/aachenBomb/0/O2 | 29 - .../combustion/dieselFoam/aachenBomb/0/T | 29 - .../combustion/dieselFoam/aachenBomb/0/U | 30 - .../dieselFoam/aachenBomb/0/Ydefault | 29 - .../combustion/dieselFoam/aachenBomb/0/alphat | 32 - .../dieselFoam/aachenBomb/0/epsilon | 32 - .../combustion/dieselFoam/aachenBomb/0/ft | 29 - .../combustion/dieselFoam/aachenBomb/0/fu | 29 - .../combustion/dieselFoam/aachenBomb/0/k | 32 - .../combustion/dieselFoam/aachenBomb/0/mut | 32 - .../combustion/dieselFoam/aachenBomb/0/p | 29 - .../dieselFoam/aachenBomb/chemkin/chem.inp | 11 - .../dieselFoam/aachenBomb/chemkin/chem.inp.1 | 11 - .../aachenBomb/chemkin/chem.inp.full | 370 ---------- .../dieselFoam/aachenBomb/chemkin/chem.inp_15 | 60 -- .../aachenBomb/constant/RASProperties | 25 - .../aachenBomb/constant/chemistryProperties | 45 -- .../aachenBomb/constant/combustionProperties | 30 - .../dieselFoam/aachenBomb/constant/g | 22 - .../aachenBomb/constant/injectorProperties | 139 ---- .../constant/polyMesh/blockMeshDict | 61 -- .../aachenBomb/constant/polyMesh/boundary | 28 - .../aachenBomb/constant/sprayProperties | 152 ---- .../constant/thermophysicalProperties | 37 - .../aachenBomb/constant/turbulenceProperties | 21 - .../dieselFoam/aachenBomb/system/controlDict | 53 -- .../dieselFoam/aachenBomb/system/fvSchemes | 77 -- .../dieselFoam/aachenBomb/system/fvSolution | 79 -- 178 files changed, 1 insertion(+), 22786 deletions(-) delete mode 100644 applications/solvers/combustion/dieselEngineFoam/Make/files delete mode 100644 applications/solvers/combustion/dieselEngineFoam/Make/options delete mode 100644 applications/solvers/combustion/dieselEngineFoam/UEqn.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/YEqn.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/createFields.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/createSpray.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C delete mode 100644 applications/solvers/combustion/dieselEngineFoam/hsEqn.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/logSummary.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/pEqn.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/rhoEqn.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/spraySummary.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/startSummary.H delete mode 100644 applications/solvers/combustion/dieselFoam/Make/files delete mode 100644 applications/solvers/combustion/dieselFoam/Make/options delete mode 100644 applications/solvers/combustion/dieselFoam/dieselFoam.C delete mode 100644 applications/solvers/combustion/dieselFoam/pEqn.H delete mode 100644 src/lagrangian/dieselSpray/Make/files delete mode 100644 src/lagrangian/dieselSpray/Make/options delete mode 100644 src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C delete mode 100644 src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H delete mode 100644 src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C delete mode 100644 src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H delete mode 100644 src/lagrangian/dieselSpray/injector/injector/injector.C delete mode 100644 src/lagrangian/dieselSpray/injector/injector/injector.H delete mode 100644 src/lagrangian/dieselSpray/injector/injector/injectorI.H delete mode 100644 src/lagrangian/dieselSpray/injector/injector/injectorIO.C delete mode 100644 src/lagrangian/dieselSpray/injector/injectorType/injectorType.C delete mode 100644 src/lagrangian/dieselSpray/injector/injectorType/injectorType.H delete mode 100644 src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C delete mode 100644 src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H delete mode 100644 src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C delete mode 100644 src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H delete mode 100644 src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C delete mode 100644 src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H delete mode 100644 src/lagrangian/dieselSpray/parcel/boundaryTreatment.H delete mode 100644 src/lagrangian/dieselSpray/parcel/parcel.C delete mode 100644 src/lagrangian/dieselSpray/parcel/parcel.H delete mode 100644 src/lagrangian/dieselSpray/parcel/parcelFunctions.C delete mode 100644 src/lagrangian/dieselSpray/parcel/parcelI.H delete mode 100644 src/lagrangian/dieselSpray/parcel/parcelIO.C delete mode 100644 src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C delete mode 100644 src/lagrangian/dieselSpray/spray/findInjectorCell.H delete mode 100644 src/lagrangian/dieselSpray/spray/spray.C delete mode 100644 src/lagrangian/dieselSpray/spray/spray.H delete mode 100644 src/lagrangian/dieselSpray/spray/sprayFunctions.C delete mode 100644 src/lagrangian/dieselSpray/spray/sprayI.H delete mode 100644 src/lagrangian/dieselSpray/spray/sprayInject.C delete mode 100644 src/lagrangian/dieselSpray/spray/sprayOps.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/sameCell.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H delete mode 100644 src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/N2 delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/O2 delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/T delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/U delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/Ydefault delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/alphat delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/epsilon delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/ft delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/fu delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/k delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/mut delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/0/p delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp.1 delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp.full delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/chemkin/chem.inp_15 delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/g delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/injectorProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/blockMeshDict delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/system/controlDict delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes delete mode 100644 tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/files b/applications/solvers/combustion/dieselEngineFoam/Make/files deleted file mode 100644 index f643bc9144..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -dieselEngineFoam.C - -EXE = $(FOAM_APPBIN)/dieselEngineFoam diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options deleted file mode 100644 index 8fdb0c5c33..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/Make/options +++ /dev/null @@ -1,40 +0,0 @@ -EXE_INC = \ - -I../engineFoam \ - -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ - -I$(LIB_SRC)/../applications/solvers/reactionThermo/XiFoam \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/engine/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude - -EXE_LIBS = \ - -lengine \ - -lcompressibleTurbulenceModel \ - -lcompressibleRASModels \ - -lcompressibleLESModels \ - -lreactionThermophysicalModels \ - -lfiniteVolume \ - -llagrangian \ - -lmeshTools \ - -ldieselSpray \ - -lliquidProperties \ - -lliquidMixtureProperties \ - -lthermophysicalFunctions \ - -lspecie \ - -lbasicThermophysicalModels \ - -llaminarFlameSpeedModels \ - -lchemistryModel \ - -lODE \ - -ldistributionModels \ - -lcombustionModels diff --git a/applications/solvers/combustion/dieselEngineFoam/UEqn.H b/applications/solvers/combustion/dieselEngineFoam/UEqn.H deleted file mode 100644 index c6caf5989c..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/UEqn.H +++ /dev/null @@ -1,14 +0,0 @@ - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) - == - rho*g - + dieselSpray.momentumSource() - ); - - if (pimple.momentumPredictor()) - { - solve(UEqn == -fvc::grad(p)); - } diff --git a/applications/solvers/combustion/dieselEngineFoam/YEqn.H b/applications/solvers/combustion/dieselEngineFoam/YEqn.H deleted file mode 100644 index 46d0f364e6..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/YEqn.H +++ /dev/null @@ -1,48 +0,0 @@ -tmp > mvConvection -( - fv::convectionScheme::New - ( - mesh, - fields, - phi, - mesh.divScheme("div(phi,Yi_h)") - ) -); - -{ - combustion->correct(); - dQ = combustion->dQ(); - label inertIndex = -1; - volScalarField Yt(0.0*Y[0]); - - forAll(Y, i) - { - if (Y[i].name() != inertSpecie) - { - volScalarField& Yi = Y[i]; - - fvScalarMatrix YiEqn - ( - fvm::ddt(rho, Yi) - + mvConvection->fvmDiv(phi, Yi) - - fvm::laplacian(turbulence->muEff(), Yi) - == - dieselSpray.evaporationSource(i) - + combustion->R(Yi) - ); - - YiEqn.relax(); - YiEqn.solve(mesh.solver("Yi")); - - Yi.max(0.0); - Yt += Yi; - } - else - { - inertIndex = i; - } - } - - Y[inertIndex] = scalar(1) - Yt; - Y[inertIndex].max(0.0); -} diff --git a/applications/solvers/combustion/dieselEngineFoam/createFields.H b/applications/solvers/combustion/dieselEngineFoam/createFields.H deleted file mode 100644 index bbb9000943..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/createFields.H +++ /dev/null @@ -1,104 +0,0 @@ -Info<< "Creating combustion model\n" << endl; - -autoPtr combustion -( - combustionModels::psiChemistryCombustionModel::New - ( - mesh - ) -); - -psiChemistryModel& chemistry = combustion->pChemistry(); - -hsCombustionThermo& thermo = chemistry.thermo(); - -basicMultiComponentMixture& composition = thermo.composition(); -PtrList& Y = composition.Y(); - -word inertSpecie(thermo.lookup("inertSpecie")); - -if (!composition.contains(inertSpecie)) -{ - FatalErrorIn(args.executable()) - << "Specified inert specie '" << inertSpecie << "' not found in " - << "species list. Available species:" << composition.species() - << exit(FatalError); -} - -volScalarField rho -( - IOobject - ( - "rho", - runTime.timeName(), - mesh - ), - thermo.rho() -); - -Info<< "Reading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - - -volScalarField& p = thermo.p(); -const volScalarField& psi = thermo.psi(); -const volScalarField& T = thermo.T(); -volScalarField& hs = thermo.hs(); - - -#include "compressibleCreatePhi.H" - -Info << "Creating turbulence model.\n" << nl; -autoPtr turbulence -( - compressible::turbulenceModel::New - ( - rho, - U, - phi, - thermo - ) -); - -// Set the turbulence into the combustion model -combustion->setTurbulence(turbulence()); - -Info<< "Creating field DpDt\n" << endl; -volScalarField DpDt -( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) -); - - -multivariateSurfaceInterpolationScheme::fieldTable fields; - -forAll(Y, i) -{ - fields.add(Y[i]); -} -fields.add(hs); - -volScalarField dQ -( - IOobject - ( - "dQ", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) -); diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H deleted file mode 100644 index 8c6706e0ba..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H +++ /dev/null @@ -1,37 +0,0 @@ -Info << "Constructing Spray" << endl; - -PtrList gasProperties(Y.size()); -forAll(gasProperties, i) -{ - gasProperties.set - ( - i, - new gasThermoPhysics - ( - dynamic_cast&> - (thermo).speciesData()[i] - ) - ); -} - -spray dieselSpray -( - U, - rho, - p, - T, - composition, - gasProperties, - thermo, - g -); - -scalar gasMass0 = fvc::domainIntegrate(rho).value(); - -if (dieselSpray.twoD()) -{ - gasMass0 *= constant::mathematical::twoPi/dieselSpray.angleOfWedge(); -} - -gasMass0 -= - dieselSpray.injectedMass(runTime.value()) - dieselSpray.liquidMass(); diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C deleted file mode 100644 index 3c60e9c9ea..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C +++ /dev/null @@ -1,122 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - dieselEngineFoam - -Description - Solver for diesel engine spray and combustion. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "engineTime.H" -#include "engineMesh.H" -#include "turbulenceModel.H" -#include "psiChemistryCombustionModel.H" -#include "spray.H" -#include "psiChemistryModel.H" -#include "chemistrySolver.H" -#include "multivariateScheme.H" -#include "Switch.H" -#include "OFstream.H" -#include "volPointInterpolation.H" -#include "thermoPhysicsTypes.H" -#include "mathematicalConstants.H" -#include "pimpleControl.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createEngineTime.H" - #include "createEngineMesh.H" - #include "createFields.H" - #include "readGravitationalAcceleration.H" - #include "createSpray.H" - #include "initContinuityErrs.H" - #include "readEngineTimeControls.H" - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" - #include "startSummary.H" - - pimpleControl pimple(mesh); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readEngineTimeControls.H" - #include "compressibleCourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl; - - mesh.move(); - - dieselSpray.evolve(); - - #include "rhoEqn.H" - - while (pimple.loop()) - { - #include "UEqn.H" - #include "YEqn.H" - #include "hsEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - } - } - - #include "logSummary.H" - #include "spraySummary.H" - - rho = thermo.rho(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/combustion/dieselEngineFoam/hsEqn.H b/applications/solvers/combustion/dieselEngineFoam/hsEqn.H deleted file mode 100644 index 7c0b7f9dc3..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/hsEqn.H +++ /dev/null @@ -1,21 +0,0 @@ -{ - fvScalarMatrix hsEqn - ( - fvm::ddt(rho, hs) - + mvConvection->fvmDiv(phi, hs) - - fvm::laplacian(turbulence->alphaEff(), hs) - == - DpDt - + combustion->Sh() - + dieselSpray.heatTransferSource()() - - ); - - hsEqn.relax(); - hsEqn.solve(); - - thermo.correct(); - - Info<< "min/max(T) = " - << min(T).value() << ", " << max(T).value() << endl; -} diff --git a/applications/solvers/combustion/dieselEngineFoam/logSummary.H b/applications/solvers/combustion/dieselEngineFoam/logSummary.H deleted file mode 100644 index 5a33f48764..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/logSummary.H +++ /dev/null @@ -1,12 +0,0 @@ -Info<< "Mean pressure:" << p.weightedAverage(mesh.V()).value() << endl; -Info<< "Mean temperature:" << T.weightedAverage(mesh.V()).value() << endl; -Info<< "Mean u':" - << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() - << endl; - -logSummaryFile - << runTime.theta() << tab - << p.weightedAverage(mesh.V()).value() << tab - << T.weightedAverage(mesh.V()).value() << tab - << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() - << endl; diff --git a/applications/solvers/combustion/dieselEngineFoam/pEqn.H b/applications/solvers/combustion/dieselEngineFoam/pEqn.H deleted file mode 100644 index 0493a1ff6c..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/pEqn.H +++ /dev/null @@ -1,65 +0,0 @@ -rho = thermo.rho(); - -volScalarField A(UEqn.A()); -U = UEqn.H()/A; - -if (pimple.transonic()) -{ - surfaceScalarField phid - ( - "phid", - fvc::interpolate(psi) - *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) - ); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvm::div(phid, p) - - fvm::laplacian(rho/A, p) - == - Sevap - ); - - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); - - if (pimple.finalNonOrthogonalIter()) - { - phi == pEqn.flux(); - } - } -} -else -{ - phi = fvc::interpolate(rho) - *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); - - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix pEqn - ( - fvm::ddt(psi, p) - + fvc::div(phi) - - fvm::laplacian(rho/A, p) - == - Sevap - ); - - pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter()))); - - if (pimple.finalNonOrthogonalIter()) - { - phi += pEqn.flux(); - } - } -} - -#include "rhoEqn.H" -#include "compressibleContinuityErrs.H" - -U -= fvc::grad(p)/A; -U.correctBoundaryConditions(); - -DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); diff --git a/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H b/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H deleted file mode 100644 index ff594d40b4..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H +++ /dev/null @@ -1,64 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Global - rhoEqn - -Description - Solve the continuity for density. - -\*---------------------------------------------------------------------------*/ - -volScalarField Sevap -( - IOobject - ( - "Sevap", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0.0) -); - -forAll(Y, i) -{ - if (dieselSpray.isLiquidFuel()[i]) - { - Sevap += dieselSpray.evaporationSource(i); - } -} - -{ - solve - ( - fvm::ddt(rho) - + fvc::div(phi) - == - Sevap - ); -} - -// ************************************************************************* // diff --git a/applications/solvers/combustion/dieselEngineFoam/spraySummary.H b/applications/solvers/combustion/dieselEngineFoam/spraySummary.H deleted file mode 100644 index 5c1e43dc99..0000000000 --- a/applications/solvers/combustion/dieselEngineFoam/spraySummary.H +++ /dev/null @@ -1,30 +0,0 @@ - label Nparcels = dieselSpray.size(); - reduce(Nparcels, sumOp