From 5226480f2c0a8f25c4af24a8ce8b9d04d78ef177 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 26 Aug 2010 15:22:03 +0100 Subject: [PATCH] Ready for compilation --- applications/solvers/DNS/dnsFoam/dnsFoam.C | 31 +- .../basic/laplacianFoam/laplacianFoam.C | 4 +- .../basic/potentialFoam/potentialFoam.C | 4 +- .../scalarTransportFoam/scalarTransportFoam.C | 4 +- .../solvers/combustion/PDRFoam/Make/options | 10 +- .../solvers/combustion/PDRFoam/PDRFoam.C | 13 +- .../combustion/PDRFoam/PDRFoamAutoRefine.C | 15 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 67 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.H | 36 +- .../solvers/combustion/PDRFoam/StCourantNo.H | 28 +- .../SCOPEBlendXiEq/SCOPEBlendXiEq.H | 4 +- .../instabilityXiEq/instabilityXiEq.H | 5 +- .../solvers/combustion/PDRFoam/bEqn.H | 4 +- .../solvers/combustion/PDRFoam/createFields.H | 17 +- .../solvers/combustion/PDRFoam/hEqn.H | 2 +- .../solvers/combustion/PDRFoam/huEqn.H | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.H | 1 - .../solvers/combustion/PDRFoam/pEqn.H | 6 +- .../solvers/combustion/XiFoam/Make/options | 22 +- applications/solvers/combustion/XiFoam/UEqn.H | 2 + .../solvers/combustion/XiFoam/XiFoam.C | 25 +- applications/solvers/combustion/XiFoam/bEqn.H | 19 +- .../solvers/combustion/XiFoam/createFields.H | 23 +- .../solvers/combustion/XiFoam/ftEqn.H | 4 +- applications/solvers/combustion/XiFoam/hEqn.H | 7 +- .../solvers/combustion/XiFoam/huEqn.H | 2 +- applications/solvers/combustion/XiFoam/pEqn.H | 6 +- .../solvers/combustion/Xoodles/Make/files | 3 - .../solvers/combustion/Xoodles/Make/options | 23 - .../solvers/combustion/Xoodles/createFields.H | 124 -- .../combustion/coldEngineFoam/Make/options | 12 +- .../coldEngineFoam/coldEngineFoam.C | 6 +- .../combustion/coldEngineFoam/createFields.H | 21 +- .../solvers/combustion/coldEngineFoam/hEqn.H | 2 +- .../combustion/dieselEngineFoam/Make/options | 16 +- .../combustion/dieselEngineFoam/YEqn.H | 5 +- .../dieselEngineFoam/createFields.H | 60 +- .../combustion/dieselEngineFoam/createSpray.H | 13 +- .../dieselEngineFoam/dieselEngineFoam.C | 36 +- .../combustion/dieselEngineFoam/hEqn.H | 40 - .../combustion/dieselEngineFoam/hsEqn.H | 14 + .../combustion/dieselEngineFoam/pEqn.H | 4 +- .../combustion/dieselEngineFoam/rhoEqn.H | 2 +- .../dieselEngineFoam/spraySummary.H | 48 +- .../combustion/dieselFoam/Make/options | 14 +- .../combustion/dieselFoam/dieselFoam.C | 28 +- .../solvers/combustion/dieselFoam/pEqn.H | 6 +- .../combustion/engineFoam/Make/options | 16 +- .../combustion/engineFoam/engineFoam.C | 7 +- .../solvers/combustion/engineFoam/pEqn.H | 6 +- .../engineFoam/readEngineTimeControls.H | 2 +- .../solvers/combustion/fireFoam/Allwclean | 8 + .../solvers/combustion/fireFoam/Allwmake | 8 + .../solvers/combustion/fireFoam/Make/files | 4 + .../solvers/combustion/fireFoam/Make/options | 19 + .../solvers/combustion/fireFoam/UEqn.H | 36 + .../fireFoam/combustionModels/Make/files | 9 + .../fireFoam/combustionModels/Make/options | 9 + .../combustionModel/combustionModel.C | 109 ++ .../combustionModel/combustionModel.H | 210 +++ .../combustionModel/newCombustionModel.C | 67 + .../infinitelyFastChemistry.C | 94 ++ .../infinitelyFastChemistry.H | 119 ++ .../noCombustion/noCombustion.C | 103 ++ .../noCombustion/noCombustion.H | 113 ++ .../combustion/fireFoam/createFields.H | 130 ++ .../solvers/combustion/fireFoam/fireFoam.C | 103 ++ .../solvers/combustion/fireFoam/ftEqn.H | 25 + .../solvers/combustion/fireFoam/fuhsEqn.H | 47 + .../solvers/combustion/fireFoam/pEqn.H | 64 + .../combustion/reactingFoam/Make/options | 17 +- .../reactingFoam}/UEqn.H | 4 + .../solvers/combustion/reactingFoam/YEqn.H | 2 +- .../combustion/reactingFoam/chemistry.H | 4 +- .../combustion/reactingFoam/createFields.H | 47 +- .../solvers/combustion/reactingFoam/hsEqn.H | 20 + .../reactingFoam}/pEqn.H | 10 +- .../combustion/reactingFoam/reactingFoam.C | 21 +- .../reactingFoam/readChemistryProperties.H | 3 +- .../combustion/rhoReactingFoam/Make/files | 3 + .../combustion/rhoReactingFoam/Make/options | 18 + .../rhoReactingFoam}/UEqn.H | 9 +- .../solvers/combustion/rhoReactingFoam/YEqn.H | 43 + .../combustion/rhoReactingFoam/chemistry.H | 26 + .../combustion/rhoReactingFoam/createFields.H | 99 ++ .../combustion/rhoReactingFoam/hsEqn.H | 19 + .../solvers/combustion/rhoReactingFoam/pEqn.H | 93 ++ .../rhoReactingFoam/readChemistryProperties.H | 23 + .../rhoReactingFoam/rhoReactingFoam.C | 106 ++ .../solvers/compressible/coodles/Make/files | 3 - .../compressible/coodles/createFields.H | 50 - .../compressible/rhoCentralFoam/Allwclean | 3 + .../compressible/rhoCentralFoam/Allwmake | 3 + .../T/smoluchowskiJumpTFvPatchScalarField.C | 16 +- .../compressible/rhoCentralFoam/Make/options | 5 +- .../rhoCentralFoam/compressibleCourantNo.H | 8 +- .../rhoCentralFoam/createFields.H | 19 +- .../rhoCentralFoam/rhoBoundaryTypes.H | 5 +- .../rhoCentralFoam/rhoCentralFoam.C | 62 +- .../compressible/rhoPimpleFoam/Make/options | 13 +- .../solvers/compressible/rhoPimpleFoam/UEqn.H | 49 +- .../compressible/rhoPimpleFoam/createFields.H | 21 +- .../solvers/compressible/rhoPimpleFoam/hEqn.H | 2 +- .../solvers/compressible/rhoPimpleFoam/pEqn.H | 29 +- .../rhoPimpleFoam/rhoPimpleFoam.C | 24 +- .../compressible/rhoPisoFoam/Make/files | 3 + .../{coodles => rhoPisoFoam}/Make/options | 6 +- .../{coodles => rhoPisoFoam}/UEqn.H | 0 .../createFields.H | 25 +- .../{coodles => rhoPisoFoam}/hEqn.H | 2 +- .../{rhoTurbFoam => rhoPisoFoam}/pEqn.H | 4 +- .../coodles.C => rhoPisoFoam/rhoPisoFoam.C} | 30 +- .../rhoPorousMRFPimpleFoam/Make/files | 4 + .../rhoPorousMRFPimpleFoam/Make/options | 15 + .../rhoPorousMRFPimpleFoam/UEqn.H | 39 + .../rhoPorousMRFPimpleFoam/createFields.H | 70 + .../rhoPorousMRFPimpleFoam/pEqn.H | 123 ++ .../rhoPorousMRFPimpleFoam.C | 105 ++ .../rhoPorousSimpleFoam/Make/options | 13 +- .../compressible/rhoPorousSimpleFoam/UEqn.H | 1 - .../rhoPorousSimpleFoam/createFields.H | 16 +- .../compressible/rhoPorousSimpleFoam/hEqn.H | 2 +- .../compressible/rhoPorousSimpleFoam/pEqn.H | 6 +- .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 33 +- .../compressible/rhoSimpleFoam/Make/options | 12 +- .../solvers/compressible/rhoSimpleFoam/UEqn.H | 1 - .../compressible/rhoSimpleFoam/createFields.H | 24 +- .../solvers/compressible/rhoSimpleFoam/hEqn.H | 6 +- .../solvers/compressible/rhoSimpleFoam/pEqn.H | 105 +- .../rhoSimpleFoam/rhoSimpleFoam.C | 35 +- .../compressible/rhoSonicFoam/rhoSonicFoam.C | 6 +- .../compressible/rhoTurbFoam/Make/files | 3 - .../compressible/rhoTurbFoam/Make/options | 12 - .../compressible/rhopSonicFoam/Allwmake | 3 + .../rhopSonicFoam/rhopSonicFoam.C | 8 +- .../compressible/sonicFoam/Make/options | 10 +- .../sonicFoam/compressibleContinuityErrs.H | 12 - .../compressible/sonicFoam/createFields.H | 91 +- .../solvers/compressible/sonicFoam/eEqn.H | 12 + .../solvers/compressible/sonicFoam/pEqn.H | 37 + .../sonicFoam/readThermodynamicProperties.H | 23 - .../sonicFoam/readTransportProperties.H | 18 - .../compressible/sonicFoam/sonicFoam.C | 72 +- .../sonicLiquidFoam/sonicLiquidFoam.C | 5 +- .../compressible/sonicTurbFoam/Make/files | 3 - .../compressible/sonicTurbFoam/Make/options | 12 - .../solvers/compressible/sonicTurbFoam/hEqn.H | 12 - .../sonicTurbFoam/sonicTurbFoam.C | 135 -- .../discreteMethods/dsmc/dsmcFoam/Make/files | 3 + .../dsmc/dsmcFoam/Make/options | 12 + .../discreteMethods/dsmc/dsmcFoam/dsmcFoam.C | 74 ++ .../mdEquilibrationFoam/Make/files | 0 .../mdEquilibrationFoam}/Make/options | 5 +- .../mdEquilibrationFoam/mdEquilibrationFoam.C | 15 +- .../readmdEquilibrationDict.H | 4 +- .../molecularDynamics/mdFoam/Make/files | 3 + .../molecularDynamics/mdFoam}/Make/options | 5 +- .../molecularDynamics/mdFoam/mdFoam.C} | 23 +- .../electrostaticFoam/electrostaticFoam.C | 5 +- .../electromagnetics/mhdFoam/createFields.H | 14 +- .../electromagnetics/mhdFoam/mhdFoam.C | 9 +- .../financial/financialFoam/financialFoam.C | 13 +- .../boussinesqBuoyantFoam.C | 2 +- .../buoyantBoussinesqPisoFoam/Make/files | 3 + .../buoyantBoussinesqPisoFoam/Make/options | 13 + .../buoyantBoussinesqPisoFoam/TEqn.H | 20 + .../buoyantBoussinesqPisoFoam/UEqn.H | 26 + .../buoyantBoussinesqPisoFoam.C} | 54 +- .../buoyantBoussinesqPisoFoam/createFields.H | 76 ++ .../buoyantBoussinesqPisoFoam/pEqn.H | 41 + .../buoyantBoussinesqSimpleFoam/Make/files | 3 + .../buoyantBoussinesqSimpleFoam/Make/options | 12 + .../buoyantBoussinesqSimpleFoam/TEqn.H | 21 + .../buoyantBoussinesqSimpleFoam/UEqn.H | 24 + .../buoyantBoussinesqSimpleFoam.C | 101 ++ .../convergenceCheck.H | 0 .../createFields.H | 79 ++ .../initConvergenceCheck.H | 0 .../buoyantBoussinesqSimpleFoam/pEqn.H | 51 + .../readTransportProperties.H | 13 + .../heatTransfer/buoyantFoam/Make/files | 3 - .../heatTransfer/buoyantFoam/Make/options | 12 - .../heatTransfer/buoyantFoam/createFields.H | 80 -- .../solvers/heatTransfer/buoyantFoam/hEqn.H | 17 - .../solvers/heatTransfer/buoyantFoam/pEqn.H | 59 - .../heatTransfer/buoyantPisoFoam/Make/files | 3 + .../heatTransfer/buoyantPisoFoam/Make/options | 12 + .../heatTransfer/buoyantPisoFoam/UEqn.H | 24 + .../buoyantPisoFoam.C} | 51 +- .../buoyantPisoFoam}/createFields.H | 41 +- .../buoyantPisoFoam}/hEqn.H | 7 +- .../heatTransfer/buoyantPisoFoam/pEqn.H | 71 + .../buoyantSimpleFoam/Make/options | 11 +- .../heatTransfer/buoyantSimpleFoam/UEqn.H | 10 +- .../buoyantSimpleFoam/buoyantSimpleFoam.C | 35 +- .../buoyantSimpleFoam/createFields.H | 49 +- .../heatTransfer/buoyantSimpleFoam/hEqn.H | 2 +- .../buoyantSimpleFoam/initConvergenceCheck.H | 2 +- .../heatTransfer/buoyantSimpleFoam/pEqn.H | 107 +- .../buoyantSimpleRadiationFoam/Make/options | 15 +- .../buoyantSimpleRadiationFoam.C | 36 +- .../buoyantSimpleRadiationFoam/createFields.H | 96 -- .../buoyantSimpleRadiationFoam/hEqn.H | 4 +- .../buoyantSimpleRadiationFoam/pEqn.H | 53 - .../chtMultiRegionFoam/Make/files | 7 +- .../chtMultiRegionFoam/Make/options | 12 +- .../chtMultiRegionFoam/chtMultiRegionFoam.C | 93 +- .../coupleManager/coupleManager.C | 186 --- .../coupleManager/coupleManager.H | 170 --- .../coupleManager/coupleManagerI.H | 98 -- ...allHeatFluxTemperatureFvPatchScalarField.C | 72 +- ...allHeatFluxTemperatureFvPatchScalarField.H | 16 +- ...ixedTemperatureCoupledFvPatchScalarField.C | 234 ++-- ...ixedTemperatureCoupledFvPatchScalarField.H | 43 +- ...WallTemperatureCoupledFvPatchScalarField.C | 156 --- ...WallTemperatureCoupledFvPatchScalarField.H | 160 --- .../chtMultiRegionFoam/fluid/UEqn.H | 29 +- .../fluid/compressibleContinuityErrors.H | 21 + .../fluid/compressibleCourantNo.C | 12 +- ...alpyEquation.C => compressibleCourantNo.H} | 41 +- .../fluid/compressibleMultiRegionCourantNo.H | 5 +- .../fluid/createFluidFields.H | 139 +- .../fluid/createFluidMeshes.H | 23 - .../chtMultiRegionFoam/fluid/hEqn.H | 28 +- .../fluid/initContinuityErrs.H | 1 + .../chtMultiRegionFoam/fluid/pEqn.H | 95 +- .../chtMultiRegionFoam/fluid/pdEqn.H | 14 - .../readFluidMultiRegionPIMPLEControls.H | 9 + .../chtMultiRegionFoam/fluid/rhoEqn.H | 1 - .../fluid/setInitialDeltaT.H | 15 - .../fluid/setRegionFluidFields.H | 17 + .../chtMultiRegionFoam/fluid/solveFluid.H | 27 +- .../fluid/solvePressureDifferenceEquation.C | 73 -- .../fluid/storeOldFluidFields.H | 2 + .../include/setInitialMultiRegionDeltaT.H | 60 + .../include/setMultiRegionDeltaT.H} | 63 +- .../chtMultiRegionFoam/readPIMPLEControls.H | 7 + .../readSolidMultiRegionPIMPLEControls.H | 4 + .../solid/readSolidMultiRegionPISOControls.H | 2 +- .../solid/readSolidTimeControls.H | 34 + .../solid/setRegionSolidFields.H | 6 + .../solid/solidRegionDiffNo.C | 60 + .../solid/solidRegionDiffNo.H | 48 + .../solid/solidRegionDiffusionNo.H | 16 + .../chtMultiRegionFoam/solid/solveSolid.H | 10 +- .../chtMultiRegionSimpleFoam/Make/files | 5 + .../chtMultiRegionSimpleFoam/Make/options | 16 + .../chtMultiRegionSimpleFoam.C | 99 ++ ...llHeatFluxTemperatureFvPatchScalarField.C} | 125 +- ...llHeatFluxTemperatureFvPatchScalarField.H} | 98 +- .../fluid}/UEqn.H | 12 +- .../fluid/compressibleContinuityErrors.H | 21 + .../fluid/compressibleCourantNo.C} | 54 +- .../fluid/compressibleCourantNo.H} | 42 +- .../fluid/compressibleMultiRegionCourantNo.H | 15 + .../fluid/convergenceCheck.H | 12 + .../fluid/createFluidFields.H | 144 +++ .../fluid/createFluidMeshes.H | 22 + .../chtMultiRegionSimpleFoam/fluid/hEqn.H | 21 + .../fluid/initConvergenceCheck.H | 7 + .../chtMultiRegionSimpleFoam/fluid/pEqn.H | 74 ++ .../readFluidMultiRegionSIMPLEControls.H | 25 + .../fluid/setRegionFluidFields.H | 24 + .../fluid/solveFluid.H | 11 + .../solid/createSolidFields.H | 91 ++ .../solid/createSolidMeshes.H | 27 + .../readSolidMultiRegionSIMPLEControls.H | 7 + .../solid/setRegionSolidFields.H | 6 + .../solid/solveSolid.H | 16 + .../heatTransfer/lesBuoyantFoam/Make/files | 3 - .../heatTransfer/lesBuoyantFoam/Make/options | 13 - .../lesBuoyantFoam/createFields.H | 75 -- .../incompressible/boundaryFoam/Make/options | 6 +- .../boundaryFoam/boundaryFoam.C | 20 +- .../boundaryFoam/createFields.H | 2 +- .../incompressible/channelFoam/Make/files | 3 + .../Make/options | 8 +- .../channelFoam.C} | 10 +- .../createFields.H | 0 .../createGradP.H | 2 +- .../readTransportProperties.H | 3 +- .../writeGradP.H | 4 +- .../incompressible/channelOodles/Make/files | 3 - .../incompressible/channelOodles/Make/options | 13 - .../incompressible/icoDyMFoam/Make/files | 3 - .../incompressible/icoDyMFoam/Make/options | 13 - .../solvers/incompressible/icoDyMFoam/UEqn.H | 11 - .../incompressible/icoDyMFoam/correctPhi.H | 47 - .../incompressible/icoDyMFoam/createFields.H | 90 -- .../incompressible/icoDyMFoam/icoDyMFoam.C | 144 --- .../incompressible/icoDyMFoam/readControls.H | 14 - .../solvers/incompressible/icoFoam/icoFoam.C | 7 +- .../nonNewtonianIcoFoam/Make/options | 3 +- .../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 7 +- .../solvers/incompressible/oodles/Make/files | 3 - .../incompressible/oodles/Make/options | 14 - .../incompressible/oodles/createFields.H | 43 - .../incompressible/pimpleDyMFoam/Make/files | 3 + .../Make/options | 11 +- .../{turbDyMFoam => pimpleDyMFoam}/UEqn.H | 0 .../correctPhi.H | 28 +- .../createFields.H | 7 +- .../pimpleDyMFoam.C} | 40 +- .../pimpleDyMFoam/readControls.H | 14 + .../incompressible/pimpleFoam/Make/files | 3 + .../{turbFoam => pimpleFoam}/Make/options | 6 +- .../solvers/incompressible/pimpleFoam/UEqn.H | 36 + .../incompressible/pimpleFoam/createFields.H | 42 + .../solvers/incompressible/pimpleFoam/pEqn.H | 53 + .../incompressible/pimpleFoam/pimpleFoam.C | 95 ++ .../incompressible/pisoFoam/Make/files | 3 + .../incompressible/pisoFoam/Make/options | 12 + .../createFields.H | 5 +- .../turbFoam.C => pisoFoam/pisoFoam.C} | 33 +- .../porousSimpleFoam/Make/files | 3 + .../porousSimpleFoam/Make/options | 14 + .../incompressible/porousSimpleFoam/UEqn.H | 46 + .../createFields.H | 24 +- .../incompressible/porousSimpleFoam/pEqn.H | 59 + .../porousSimpleFoam/porousSimpleFoam.C} | 57 +- .../shallowWaterFoam/CourantNo.H} | 58 +- .../shallowWaterFoam/Make/files | 3 + .../shallowWaterFoam/Make/options | 5 + .../shallowWaterFoam/createFields.H | 74 ++ .../shallowWaterFoam/createPhi.H} | 35 +- .../readGravitationalAcceleration.H | 21 + .../shallowWaterFoam/shallowWaterFoam.C | 164 +++ .../incompressible/simpleFoam/Make/options | 13 +- .../incompressible/simpleFoam/simpleFoam.C | 9 +- .../transientSimpleFoam/Make/files | 3 - .../transientSimpleFoam/Make/options | 12 - .../transientSimpleFoam/transientSimpleFoam.C | 129 -- .../transientSimpleOodles/Make/files | 3 - .../readTransportProperties.H | 18 - .../transientSimpleOodles.C | 129 -- .../writeNaveragingSteps.H | 19 - .../incompressible/turbDyMFoam/Make/files | 3 - .../incompressible/turbDyMFoam/readControls.H | 14 - .../incompressible/turbFoam/Make/files | 3 - .../incompressible/turbFoam/createFields.H | 42 - .../lagrangian/coalChemistryFoam/Make/files | 3 + .../lagrangian/coalChemistryFoam/Make/options | 39 + .../lagrangian/coalChemistryFoam/UEqn.H | 17 + .../lagrangian/coalChemistryFoam/YEqn.H | 43 + .../lagrangian/coalChemistryFoam/chemistry.H | 27 + .../coalChemistryFoam/coalChemistryFoam.C} | 118 +- .../coalChemistryFoam/createClouds.H | 19 + .../coalChemistryFoam/createFields.H | 151 +++ .../lagrangian/coalChemistryFoam/hsEqn.H | 26 + .../lagrangian/coalChemistryFoam/pEqn.H | 72 ++ .../readChemistryProperties.H | 23 + .../lagrangian/coalChemistryFoam/rhoEqn.H | 43 + .../Make/files | 3 + .../Make/options | 38 + .../UEqn.H | 19 + .../YEqn.H | 46 + .../chemistry.H | 27 + .../createClouds.H | 9 + .../createExplicitSources.H | 27 + .../createFields.H | 105 ++ .../createPorousZones.H | 3 + .../hsEqn.H | 53 + .../pEqn.H | 61 + .../porousExplicitSourceReactingParcelFoam.C} | 102 +- .../readAdditionalSolutionControls.H | 5 + .../readChemistryProperties.H | 23 + .../rhoEqn.H | 48 + .../lagrangian/reactingParcelFoam/Make/files | 3 + .../reactingParcelFoam/Make/options | 37 + .../lagrangian/reactingParcelFoam/UEqn.H | 16 + .../lagrangian/reactingParcelFoam/YEqn.H | 44 + .../lagrangian/reactingParcelFoam/chemistry.H | 27 + .../reactingParcelFoam/createClouds.H | 9 + .../reactingParcelFoam/createFields.H | 111 ++ .../lagrangian/reactingParcelFoam/hsEqn.H | 24 + .../lagrangian/reactingParcelFoam/pEqn.H | 72 ++ .../reactingParcelFoam/reactingParcelFoam.C | 114 ++ .../readChemistryProperties.H | 23 + .../reactingParcelFoam/rhoEqn.H} | 20 +- .../uncoupledKinematicParcelFoam/Make/files | 3 + .../uncoupledKinematicParcelFoam/Make/options | 22 + .../createFields.H | 61 + .../uncoupledKinematicParcelFoam.C | 79 ++ .../molecularDynamics/gnemdFoam/Make/files | 3 - .../solidDisplacementFoam.C | 7 +- .../solidEquilibriumDisplacementFoam.C | 4 +- .../decomposePar/Make/options | 3 +- .../decomposePar/decomposeMesh.C | 6 +- .../decomposePar/decomposePar.C | 184 ++- .../decomposePar/decomposeParDict | 41 +- .../decomposePar/distributeCells.C | 14 +- .../decomposePar/domainDecomposition.C | 36 +- .../decomposePar/domainDecomposition.H | 2 +- ...lagrangianFieldDecomposerDecomposeFields.C | 2 +- .../reconstructPar/reconstructLagrangian.H | 1 + .../reconstructLagrangianFields.C | 6 +- .../reconstructPar/reconstructPar.C | 271 ++-- .../reconstructParMesh/Make/options | 1 + .../reconstructParMesh/reconstructParMesh.C | 173 ++- .../redistributeMeshPar/Make/options | 5 +- .../redistributeMeshPar/redistributeMeshPar.C | 176 +-- .../dataConversion/foamToEnsight/checkData.H | 27 +- .../foamToEnsight/checkMeshMoving.H | 26 +- .../foamToEnsight/ensightCaseHeader.H | 5 - .../foamToEnsight/ensightCloudField.H | 1 + .../foamToEnsight/ensightField.C | 155 +-- .../foamToEnsight/ensightMesh.C | 1145 +++++++++++------ .../foamToEnsight/ensightMesh.H | 131 +- .../foamToEnsight/ensightWriteBinary.C | 2 +- .../foamToEnsight/foamToEnsight.C | 267 ++-- .../foamToEnsightParts/checkHasLagrangian.H | 19 - .../foamToEnsightParts/checkHasMovingMesh.H | 6 +- .../foamToEnsightParts/checkHasSprayField.H | 15 - .../foamToEnsightParts/checkHasValidField.H | 23 - .../foamToEnsightParts/ensightCaseTimes.H | 91 -- .../foamToEnsightParts/ensightOutputCase.H | 224 ++++ .../ensightOutputFunctions.C | 64 +- .../ensightOutputFunctions.H | 21 +- .../foamToEnsightParts/foamToEnsightParts.C | 547 ++++---- .../foamToEnsightParts/getTimeIndex.H | 25 +- .../foamToEnsightParts/moveMesh.H | 26 +- .../dataConversion/foamToGMV/foamToGMV.C | 21 +- .../dataConversion/foamToGMV/gmvOutput.H | 42 +- .../foamToGMV/gmvOutputLagrangian.H | 37 +- .../dataConversion/foamToGMV/gmvOutputSpray.H | 11 +- .../dataConversion/foamToVTK/foamToVTK.C | 241 ++-- .../dataConversion/foamToVTK/internalWriter.C | 4 +- .../dataConversion/foamToVTK/internalWriter.H | 2 + .../foamToVTK/lagrangianWriter.C | 38 +- .../foamToVTK/lagrangianWriter.H | 6 +- .../foamToVTK/lagrangianWriterTemplates.C | 2 +- .../dataConversion/foamToVTK/patchWriter.C | 3 +- .../dataConversion/foamToVTK/patchWriter.H | 3 + .../dataConversion/foamToVTK/readFields.C | 45 +- .../dataConversion/foamToVTK/readFields.H | 11 - .../dataConversion/foamToVTK/vtkMesh.C | 4 +- .../dataConversion/foamToVTK/vtkMesh.H | 25 +- .../dataConversion/foamToVTK/writePatchGeom.C | 1 + .../dataConversion/foamToVTK/writePointSet.C | 5 +- .../dataConversion/smapToFoam/smapToFoam.C | 8 +- .../postProcessing/foamCalc/foamCalc.C | 2 + .../PV3FoamReader/vtkPV3Foam/Make/files | 19 +- ...tchFaceField.H => vtkOpenFOAMTupleRemap.H} | 72 +- .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 974 ++++++-------- .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H | 500 ++++--- .../vtkPV3Foam/vtkPV3FoamAddFields.H | 96 -- .../vtkPV3Foam/vtkPV3FoamAddToSelection.H | 46 +- .../vtkPV3Foam/vtkPV3FoamConvertMesh.C | 672 ---------- .../vtkPV3Foam/vtkPV3FoamConvertPointFields.H | 237 ---- .../vtkPV3Foam/vtkPV3FoamConvertVolFields.H | 424 ------ ...nvertFaceField.H => vtkPV3FoamFaceField.H} | 109 +- .../vtkPV3Foam/vtkPV3FoamFields.C | 322 +++++ .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamI.H | 2 +- ...nFields.H => vtkPV3FoamLagrangianFields.H} | 93 +- .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C | 619 +++++++++ ...ngianMesh.C => vtkPV3FoamMeshLagrangian.C} | 90 +- ...amAddPatchMesh.C => vtkPV3FoamMeshPatch.C} | 25 +- ...amAddFaceSetMesh.C => vtkPV3FoamMeshSet.C} | 75 +- ...AddVolumeMesh.C => vtkPV3FoamMeshVolume.C} | 84 +- ...AddFaceZoneMesh.C => vtkPV3FoamMeshZone.C} | 79 +- .../vtkPV3Foam/vtkPV3FoamPatchField.H | 130 ++ .../vtkPV3Foam/vtkPV3FoamPointFields.H | 285 ++++ ...rtPatchPointField.H => vtkPV3FoamPoints.H} | 72 +- .../vtkPV3Foam/vtkPV3FoamUpdate.C | 291 ----- .../vtkPV3Foam/vtkPV3FoamUpdateInfo.C | 523 ++++++++ ...nFields.H => vtkPV3FoamUpdateInfoFields.H} | 74 +- .../vtkPV3Foam/vtkPV3FoamUpdateInformation.C | 498 ------- .../vtkPV3Foam/vtkPV3FoamUtilities.C | 342 +++++ .../vtkPV3Foam/vtkPV3FoamVolFields.H | 378 ++++++ .../graphics/ensightFoamReader/Allwmake | 5 + .../USERD_get_gold_part_build_info.H | 11 +- .../USERD_get_maxsize_info.H | 21 +- .../ensightFoamReader/USERD_get_sol_times.H | 14 +- .../USERD_get_timeset_description.H | 10 +- .../ensightFoamReader/USERD_set_filenames.H | 26 +- .../USERD_set_time_set_and_step.H | 18 +- .../ensightFoamReader/getLagrangianScalar.H | 15 +- .../ensightFoamReader/getLagrangianVector.H | 15 +- .../graphics/ensightFoamReader/globalFoam.H | 3 +- .../graphics/ensightFoamReader/libuserd.C | 5 +- .../fieldview9Reader/fieldview9Reader.C | 2 +- .../fieldview9Reader/readerDatabase.H | 5 +- .../writeCellCentres/writeCellCentres.C | 25 +- .../patch/patchIntegrate/patchIntegrate.C | 83 +- .../sampling/probeLocations/probeLocations.C | 4 +- .../sampling/sample/Make/options | 2 + .../postProcessing/sampling/sample/sample.C | 4 +- .../postProcessing/sampling/sample/sampleDict | 95 +- .../scalarField/pPrime2/pPrime2.C | 19 +- .../postProcessing/velocityField/Co/Co.C | 70 +- .../velocityField/Co/Make/options | 2 +- .../velocityField/Lambda2/Lambda2.C | 3 + .../velocityField/Lambda2/Make/options | 2 +- .../postProcessing/velocityField/Mach/Mach.C | 17 +- .../velocityField/Mach/Make/options | 3 +- .../velocityField/Mach/thermophysicalMach.H | 4 +- .../velocityField/Pe/Make/options | 19 +- .../postProcessing/velocityField/Pe/Pe.C | 20 +- .../velocityField/Q/Make/options | 2 +- .../postProcessing/velocityField/Q/Q.C | 6 +- .../velocityField/enstrophy/Make/options | 2 +- .../velocityField/enstrophy/enstrophy.C | 5 +- .../velocityField/flowType/Make/options | 2 +- .../velocityField/flowType/flowType.C | 3 + .../streamFunction/streamFunction.C | 19 +- .../velocityField/uprime/Make/options | 2 +- .../velocityField/uprime/uprime.C | 6 +- .../velocityField/vorticity/Make/options | 2 +- .../velocityField/vorticity/vorticity.C | 6 +- doc/Guides-usletter/ProgrammersGuide.pdf | Bin 1788007 -> 0 bytes doc/Guides-usletter/UserGuide.pdf | Bin 3733364 -> 0 bytes 512 files changed, 14647 insertions(+), 9847 deletions(-) delete mode 100644 applications/solvers/combustion/Xoodles/Make/files delete mode 100644 applications/solvers/combustion/Xoodles/Make/options delete mode 100644 applications/solvers/combustion/Xoodles/createFields.H delete mode 100644 applications/solvers/combustion/dieselEngineFoam/hEqn.H create mode 100644 applications/solvers/combustion/dieselEngineFoam/hsEqn.H create mode 100755 applications/solvers/combustion/fireFoam/Allwclean create mode 100755 applications/solvers/combustion/fireFoam/Allwmake create mode 100644 applications/solvers/combustion/fireFoam/Make/files create mode 100644 applications/solvers/combustion/fireFoam/Make/options create mode 100644 applications/solvers/combustion/fireFoam/UEqn.H create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/Make/files create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/Make/options create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModel.C create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModel.H create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/combustionModel/newCombustionModel.C create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.C create mode 100644 applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H create mode 100644 applications/solvers/combustion/fireFoam/createFields.H create mode 100644 applications/solvers/combustion/fireFoam/fireFoam.C create mode 100644 applications/solvers/combustion/fireFoam/ftEqn.H create mode 100644 applications/solvers/combustion/fireFoam/fuhsEqn.H create mode 100644 applications/solvers/combustion/fireFoam/pEqn.H rename applications/solvers/{compressible/rhoTurbFoam => combustion/reactingFoam}/UEqn.H (83%) create mode 100644 applications/solvers/combustion/reactingFoam/hsEqn.H rename applications/solvers/{compressible/coodles => combustion/reactingFoam}/pEqn.H (91%) create mode 100644 applications/solvers/combustion/rhoReactingFoam/Make/files create mode 100644 applications/solvers/combustion/rhoReactingFoam/Make/options rename applications/solvers/{heatTransfer/buoyantFoam => combustion/rhoReactingFoam}/UEqn.H (59%) create mode 100644 applications/solvers/combustion/rhoReactingFoam/YEqn.H create mode 100644 applications/solvers/combustion/rhoReactingFoam/chemistry.H create mode 100644 applications/solvers/combustion/rhoReactingFoam/createFields.H create mode 100644 applications/solvers/combustion/rhoReactingFoam/hsEqn.H create mode 100644 applications/solvers/combustion/rhoReactingFoam/pEqn.H create mode 100644 applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H create mode 100644 applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C delete mode 100644 applications/solvers/compressible/coodles/Make/files delete mode 100644 applications/solvers/compressible/coodles/createFields.H create mode 100644 applications/solvers/compressible/rhoPisoFoam/Make/files rename applications/solvers/compressible/{coodles => rhoPisoFoam}/Make/options (64%) rename applications/solvers/compressible/{coodles => rhoPisoFoam}/UEqn.H (100%) rename applications/solvers/compressible/{rhoTurbFoam => rhoPisoFoam}/createFields.H (67%) rename applications/solvers/compressible/{coodles => rhoPisoFoam}/hEqn.H (86%) rename applications/solvers/compressible/{rhoTurbFoam => rhoPisoFoam}/pEqn.H (95%) rename applications/solvers/compressible/{coodles/coodles.C => rhoPisoFoam/rhoPisoFoam.C} (82%) create mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/files create mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options create mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H create mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H create mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H create mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C delete mode 100644 applications/solvers/compressible/rhoTurbFoam/Make/files delete mode 100644 applications/solvers/compressible/rhoTurbFoam/Make/options delete mode 100644 applications/solvers/compressible/sonicFoam/compressibleContinuityErrs.H create mode 100644 applications/solvers/compressible/sonicFoam/eEqn.H create mode 100644 applications/solvers/compressible/sonicFoam/pEqn.H delete mode 100644 applications/solvers/compressible/sonicFoam/readThermodynamicProperties.H delete mode 100644 applications/solvers/compressible/sonicFoam/readTransportProperties.H delete mode 100644 applications/solvers/compressible/sonicTurbFoam/Make/files delete mode 100644 applications/solvers/compressible/sonicTurbFoam/Make/options delete mode 100644 applications/solvers/compressible/sonicTurbFoam/hEqn.H delete mode 100644 applications/solvers/compressible/sonicTurbFoam/sonicTurbFoam.C create mode 100644 applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/files create mode 100644 applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options create mode 100644 applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C rename applications/solvers/{ => discreteMethods}/molecularDynamics/mdEquilibrationFoam/Make/files (100%) mode change 100755 => 100644 rename applications/solvers/{molecularDynamics/gnemdFoam => discreteMethods/molecularDynamics/mdEquilibrationFoam}/Make/options (73%) mode change 100755 => 100644 rename applications/solvers/{ => discreteMethods}/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C (89%) rename applications/solvers/{ => discreteMethods}/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H (65%) create mode 100644 applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/files rename applications/solvers/{molecularDynamics/mdEquilibrationFoam => discreteMethods/molecularDynamics/mdFoam}/Make/options (73%) mode change 100755 => 100644 rename applications/solvers/{molecularDynamics/gnemdFoam/gnemdFoam.C => discreteMethods/molecularDynamics/mdFoam/mdFoam.C} (83%) create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/files create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/options create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/TEqn.H create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H rename applications/solvers/heatTransfer/{lesBuoyantFoam/lesBuoyantFoam.C => buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C} (77%) create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/createFields.H create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/pEqn.H create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/files create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/Make/options create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/TEqn.H create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C rename applications/solvers/heatTransfer/{buoyantSimpleRadiationFoam => buoyantBoussinesqSimpleFoam}/convergenceCheck.H (100%) create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H rename applications/solvers/heatTransfer/{buoyantSimpleRadiationFoam => buoyantBoussinesqSimpleFoam}/initConvergenceCheck.H (100%) create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H create mode 100644 applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H delete mode 100644 applications/solvers/heatTransfer/buoyantFoam/Make/files delete mode 100644 applications/solvers/heatTransfer/buoyantFoam/Make/options delete mode 100644 applications/solvers/heatTransfer/buoyantFoam/createFields.H delete mode 100644 applications/solvers/heatTransfer/buoyantFoam/hEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantFoam/pEqn.H create mode 100644 applications/solvers/heatTransfer/buoyantPisoFoam/Make/files create mode 100644 applications/solvers/heatTransfer/buoyantPisoFoam/Make/options create mode 100644 applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H rename applications/solvers/heatTransfer/{buoyantFoam/buoyantFoam.C => buoyantPisoFoam/buoyantPisoFoam.C} (69%) rename applications/solvers/{compressible/sonicTurbFoam => heatTransfer/buoyantPisoFoam}/createFields.H (50%) rename applications/solvers/{compressible/rhoTurbFoam => heatTransfer/buoyantPisoFoam}/hEqn.H (62%) create mode 100644 applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H delete mode 100644 applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createFields.H delete mode 100644 applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/pEqn.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.C delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManager.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/coupleManager/coupleManagerI.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallTemperatureCoupled/solidWallTemperatureCoupledFvPatchScalarField.C delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/derivedFvPatchFields/solidWallTemperatureCoupled/solidWallTemperatureCoupledFvPatchScalarField.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleContinuityErrors.H rename applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/{solveEnthalpyEquation.C => compressibleCourantNo.H} (69%) create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pdEqn.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/rhoEqn.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setInitialDeltaT.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solvePressureDifferenceEquation.C create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/storeOldFluidFields.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H rename applications/{utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C => solvers/heatTransfer/chtMultiRegionFoam/include/setMultiRegionDeltaT.H} (61%) create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidTimeControls.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H create mode 100755 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/Make/files create mode 100755 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/Make/options create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C rename applications/solvers/heatTransfer/{chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperatureCoupled/solidWallHeatFluxTemperatureCoupledFvPatchScalarField.C => chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.C} (53%) rename applications/solvers/heatTransfer/{chtMultiRegionFoam/derivedFvPatchFields/solidWallHeatFluxTemperatureCoupled/solidWallHeatFluxTemperatureCoupledFvPatchScalarField.H => chtMultiRegionSimpleFoam/derivedFvPatchFields/solidWallHeatFluxTemperature/solidWallHeatFluxTemperatureFvPatchScalarField.H} (59%) rename applications/solvers/heatTransfer/{buoyantSimpleRadiationFoam => chtMultiRegionSimpleFoam/fluid}/UEqn.H (58%) create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/compressibleContinuityErrors.H rename applications/{utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C => solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/compressibleCourantNo.C} (62%) rename applications/solvers/heatTransfer/{chtMultiRegionFoam/fluid/solveMomentumEquation.C => chtMultiRegionSimpleFoam/fluid/compressibleCourantNo.H} (66%) create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/compressibleMultiRegionCourantNo.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/convergenceCheck.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/hEqn.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/initConvergenceCheck.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/pEqn.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/solveFluid.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/createSolidFields.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/createSolidMeshes.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H create mode 100644 applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/solid/solveSolid.H delete mode 100644 applications/solvers/heatTransfer/lesBuoyantFoam/Make/files delete mode 100644 applications/solvers/heatTransfer/lesBuoyantFoam/Make/options delete mode 100644 applications/solvers/heatTransfer/lesBuoyantFoam/createFields.H create mode 100644 applications/solvers/incompressible/channelFoam/Make/files rename applications/solvers/incompressible/{transientSimpleOodles => channelFoam}/Make/options (60%) rename applications/solvers/incompressible/{channelOodles/channelOodles.C => channelFoam/channelFoam.C} (95%) rename applications/solvers/incompressible/{channelOodles => channelFoam}/createFields.H (100%) rename applications/solvers/incompressible/{channelOodles => channelFoam}/createGradP.H (86%) rename applications/solvers/incompressible/{channelOodles => channelFoam}/readTransportProperties.H (92%) rename applications/solvers/incompressible/{channelOodles => channelFoam}/writeGradP.H (70%) delete mode 100644 applications/solvers/incompressible/channelOodles/Make/files delete mode 100644 applications/solvers/incompressible/channelOodles/Make/options delete mode 100644 applications/solvers/incompressible/icoDyMFoam/Make/files delete mode 100644 applications/solvers/incompressible/icoDyMFoam/Make/options delete mode 100644 applications/solvers/incompressible/icoDyMFoam/UEqn.H delete mode 100644 applications/solvers/incompressible/icoDyMFoam/correctPhi.H delete mode 100644 applications/solvers/incompressible/icoDyMFoam/createFields.H delete mode 100644 applications/solvers/incompressible/icoDyMFoam/icoDyMFoam.C delete mode 100644 applications/solvers/incompressible/icoDyMFoam/readControls.H delete mode 100644 applications/solvers/incompressible/oodles/Make/files delete mode 100644 applications/solvers/incompressible/oodles/Make/options delete mode 100644 applications/solvers/incompressible/oodles/createFields.H create mode 100644 applications/solvers/incompressible/pimpleDyMFoam/Make/files rename applications/solvers/incompressible/{turbDyMFoam => pimpleDyMFoam}/Make/options (61%) rename applications/solvers/incompressible/{turbDyMFoam => pimpleDyMFoam}/UEqn.H (100%) rename applications/solvers/incompressible/{turbDyMFoam => pimpleDyMFoam}/correctPhi.H (56%) rename applications/solvers/incompressible/{turbDyMFoam => pimpleDyMFoam}/createFields.H (83%) rename applications/solvers/incompressible/{turbDyMFoam/turbDyMFoam.C => pimpleDyMFoam/pimpleDyMFoam.C} (85%) create mode 100644 applications/solvers/incompressible/pimpleDyMFoam/readControls.H create mode 100644 applications/solvers/incompressible/pimpleFoam/Make/files rename applications/solvers/incompressible/{turbFoam => pimpleFoam}/Make/options (54%) create mode 100644 applications/solvers/incompressible/pimpleFoam/UEqn.H create mode 100644 applications/solvers/incompressible/pimpleFoam/createFields.H create mode 100644 applications/solvers/incompressible/pimpleFoam/pEqn.H create mode 100644 applications/solvers/incompressible/pimpleFoam/pimpleFoam.C create mode 100644 applications/solvers/incompressible/pisoFoam/Make/files create mode 100644 applications/solvers/incompressible/pisoFoam/Make/options rename applications/solvers/incompressible/{transientSimpleOodles => pisoFoam}/createFields.H (85%) rename applications/solvers/incompressible/{turbFoam/turbFoam.C => pisoFoam/pisoFoam.C} (83%) create mode 100644 applications/solvers/incompressible/porousSimpleFoam/Make/files create mode 100644 applications/solvers/incompressible/porousSimpleFoam/Make/options create mode 100644 applications/solvers/incompressible/porousSimpleFoam/UEqn.H rename applications/solvers/incompressible/{transientSimpleFoam => porousSimpleFoam}/createFields.H (57%) create mode 100644 applications/solvers/incompressible/porousSimpleFoam/pEqn.H rename applications/solvers/{compressible/rhoTurbFoam/rhoTurbFoam.C => incompressible/porousSimpleFoam/porousSimpleFoam.C} (67%) rename applications/solvers/{heatTransfer/chtMultiRegionFoam/fluid/compressibleContinuityErrors.C => incompressible/shallowWaterFoam/CourantNo.H} (56%) create mode 100644 applications/solvers/incompressible/shallowWaterFoam/Make/files create mode 100644 applications/solvers/incompressible/shallowWaterFoam/Make/options create mode 100644 applications/solvers/incompressible/shallowWaterFoam/createFields.H rename applications/{utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamInsertNextPoint.H => solvers/incompressible/shallowWaterFoam/createPhi.H} (78%) create mode 100644 applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H create mode 100644 applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C delete mode 100644 applications/solvers/incompressible/transientSimpleFoam/Make/files delete mode 100644 applications/solvers/incompressible/transientSimpleFoam/Make/options delete mode 100644 applications/solvers/incompressible/transientSimpleFoam/transientSimpleFoam.C delete mode 100644 applications/solvers/incompressible/transientSimpleOodles/Make/files delete mode 100644 applications/solvers/incompressible/transientSimpleOodles/readTransportProperties.H delete mode 100644 applications/solvers/incompressible/transientSimpleOodles/transientSimpleOodles.C delete mode 100644 applications/solvers/incompressible/transientSimpleOodles/writeNaveragingSteps.H delete mode 100644 applications/solvers/incompressible/turbDyMFoam/Make/files delete mode 100644 applications/solvers/incompressible/turbDyMFoam/readControls.H delete mode 100644 applications/solvers/incompressible/turbFoam/Make/files delete mode 100644 applications/solvers/incompressible/turbFoam/createFields.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/Make/files create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/Make/options create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/UEqn.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/YEqn.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/chemistry.H rename applications/solvers/{incompressible/oodles/oodles.C => lagrangian/coalChemistryFoam/coalChemistryFoam.C} (54%) create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/createClouds.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/createFields.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/pEqn.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H create mode 100644 applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/files create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H rename applications/solvers/{combustion/Xoodles/Xoodles.C => lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C} (53%) create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readAdditionalSolutionControls.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/Make/files create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/Make/options create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/UEqn.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/YEqn.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/chemistry.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/createClouds.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/createFields.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/hsEqn.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/pEqn.H create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H rename applications/solvers/{heatTransfer/chtMultiRegionFoam/fluid/solveContinuityEquation.C => lagrangian/reactingParcelFoam/rhoEqn.H} (83%) create mode 100644 applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/files create mode 100644 applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options create mode 100644 applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H create mode 100644 applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C delete mode 100755 applications/solvers/molecularDynamics/gnemdFoam/Make/files delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseHeader.H delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasLagrangian.H delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasSprayField.H delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasValidField.H delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightCaseTimes.H create mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamConvertPatchFaceField.H => vtkOpenFOAMTupleRemap.H} (58%) delete mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H delete mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C delete mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H delete mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamConvertFaceField.H => vtkPV3FoamFaceField.H} (72%) create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamConvertLagrangianFields.H => vtkPV3FoamLagrangianFields.H} (56%) create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamAddLagrangianMesh.C => vtkPV3FoamMeshLagrangian.C} (55%) rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamAddPatchMesh.C => vtkPV3FoamMeshPatch.C} (83%) rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamAddFaceSetMesh.C => vtkPV3FoamMeshSet.C} (64%) rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamAddVolumeMesh.C => vtkPV3FoamMeshVolume.C} (81%) rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamAddFaceZoneMesh.C => vtkPV3FoamMeshZone.C} (62%) create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPatchField.H create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamConvertPatchPointField.H => vtkPV3FoamPoints.H} (60%) delete mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C rename applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/{vtkPV3FoamUpdateInformationFields.H => vtkPV3FoamUpdateInfoFields.H} (63%) delete mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C create mode 100644 applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H delete mode 100644 doc/Guides-usletter/ProgrammersGuide.pdf delete mode 100644 doc/Guides-usletter/UserGuide.pdf diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index dda0fc435..704d969dc 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -41,25 +41,24 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" -# include "setRootCase.H" + #include "createTime.H" + #include "createMeshNoClear.H" + #include "readTransportProperties.H" + #include "createFields.H" + #include "readTurbulenceProperties.H" + #include "initContinuityErrs.H" -# include "createTime.H" -# include "createMeshNoClear.H" -# include "readTransportProperties.H" -# include "createFields.H" -# include "readTurbulenceProperties.H" -# include "initContinuityErrs.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< nl << "Starting time loop" << endl; - for (runTime++; !runTime.end(); runTime++) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; -# include "readPISOControls.H" + #include "readPISOControls.H" force.internalField() = ReImSum ( @@ -69,12 +68,12 @@ int main(int argc, char *argv[]) ) ); -# include "globalProperties.H" + #include "globalProperties.H" fvVectorMatrix UEqn ( - fvm::ddt(U) - + fvm::div(phi, U) + fvm::ddt(U) + + fvm::div(phi, U) - fvm::laplacian(nu, U) == force @@ -90,7 +89,7 @@ int main(int argc, char *argv[]) volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); - phi = (fvc::interpolate(U) & mesh.Sf()) + phi = (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, U, phi); fvScalarMatrix pEqn @@ -122,7 +121,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C index 2a9402926..6a037d73c 100644 --- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C +++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) Info<< "\nCalculating temperature distribution\n" << endl; - for (runTime++; !runTime.end(); runTime++) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index 34410e3a0..136b8542a 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) U.write(); phi.write(); - if (args.options().found("writep")) + if (args.optionFound("writep")) { p.write(); } @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C index 397aa3a26..bc7b793d9 100644 --- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C +++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) # include "CourantNo.H" - for (runTime++; !runTime.end(); runTime++) + while (runTime.loop()) { Info<< "Time = " << runTime.timeName() << nl << endl; @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 9f019439a..8a563c4ea 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -8,8 +8,9 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/turbulenceModels \ + -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -22,8 +23,9 @@ EXE_LIBS = \ -lmeshTools \ -lcompressibleRASModels \ -lbasicThermophysicalModels \ - -lcombustionThermophysicalModels \ + -lreactionThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ -lfiniteVolume \ - -ldynamicFvMesh + -ldynamicFvMesh \ + -llduSolvers diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index eff0c8999..7e5ed7371 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -26,8 +26,8 @@ Application PDRFoam Description - Compressible premixed/partially-premixed combustion solver with turbulence - modelling. + Solver for compressible premixed/partially-premixed combustion with + turbulence modelling. Combusting RANS code using the b-Xi two-equation model. Xi may be obtained by either the solution of the Xi transport @@ -36,7 +36,7 @@ Description to be appropriate by comparison with the results from the spectral model. - Strain effects are encorporated directly into the Xi equation + Strain effects are incorporated directly into the Xi equation but not in the algebraic approximation. Further work need to be done on this issue, particularly regarding the enhanced removal rate caused by flame compression. Analysis using results of the spectral @@ -75,15 +75,14 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" # include "readCombustionProperties.H" -# include "readEnvironmentalProperties.H" +# include "readGravitationalAcceleration.H" # include "createFields.H" -# include "readPISOControls.H" # include "initContinuityErrs.H" # include "readTimeControls.H" # include "CourantNo.H" # include "setInitialDeltaT.H" -scalar StCoNum = 0.0; + scalar StCoNum = 0.0; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -130,7 +129,7 @@ scalar StCoNum = 0.0; Info<< "\n end\n"; - return(0); + return 0; } diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C index e61168d49..7c88c3e75 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C @@ -26,7 +26,7 @@ Application PDRFoam Description - Compressible premixed/partially-premixed combustion solver with turbulence + Compressible premixed/partially-premixed combustion solver with turbulence modelling. Combusting RANS code using the b-Xi two-equation model. @@ -77,14 +77,14 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createDynamicFvMesh.H" # include "readCombustionProperties.H" -# include "readEnvironmentalProperties.H" +# include "readGravitationalAcceleration.H" # include "createFields.H" # include "readPISOControls.H" # include "initContinuityErrs.H" # include "readTimeControls.H" # include "setInitialDeltaT.H" -scalar StCoNum = 0.0; + scalar StCoNum = 0.0; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -119,9 +119,10 @@ scalar StCoNum = 0.0; fvc::makeAbsolute(phi, rho, U); // Test : disable refinement for some cells - PackedList<1>& protectedCell = + PackedBoolList& protectedCell = refCast(mesh).protectedCell(); - if (protectedCell.size() == 0) + + if (protectedCell.empty()) { protectedCell.setSize(mesh.nCells()); protectedCell = 0; @@ -135,7 +136,7 @@ scalar StCoNum = 0.0; } } - //volScalarField pIndicator("pIndicator", + //volScalarField pIndicator("pIndicator", // p*(fvc::laplacian(p)) // / ( // magSqr(fvc::grad(p)) @@ -194,7 +195,7 @@ scalar StCoNum = 0.0; Info<< "\n end\n"; - return(0); + return 0; } diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 2626d69c3..9d17001ca 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -25,10 +25,11 @@ License \*---------------------------------------------------------------------------*/ #include "PDRkEpsilon.H" -#include "wallFvPatch.H" #include "PDRDragModel.H" #include "addToRunTimeSelectionTable.H" +#include "backwardsCompatibilityWallFunctions.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -50,7 +51,7 @@ PDRkEpsilon::PDRkEpsilon const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - basicThermo& thermophysicalModel + const basicThermo& thermophysicalModel ) : RASModel(typeName, rho, U, phi, thermophysicalModel), @@ -82,29 +83,29 @@ PDRkEpsilon::PDRkEpsilon 1.92 ) ), - alphak_ + sigmak_ ( dimensioned::lookupOrAddToDict ( - "alphak", + "sigmak", coeffDict_, 1.0 ) ), - alphaEps_ + sigmaEps_ ( dimensioned::lookupOrAddToDict ( - "alphaEps", + "sigmaEps", coeffDict_, - 0.76923 + 1.3 ) ), - alphah_ + Prt_ ( dimensioned::lookupOrAddToDict ( - "alphah", + "Prt", coeffDict_, 1.0 ) @@ -147,9 +148,26 @@ PDRkEpsilon::PDRkEpsilon IOobject::NO_WRITE ), Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_) + ), + + alphat_ + ( + IOobject + ( + "alphat", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateAlphat("alphat", mesh_) ) { -# include "wallViscosityI.H" + mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); + mut_.correctBoundaryConditions(); + + alphat_ = mut_/Prt_; + alphat_.correctBoundaryConditions(); printCoeffs(); } @@ -214,9 +232,9 @@ bool PDRkEpsilon::read() Cmu_.readIfPresent(coeffDict_); C1_.readIfPresent(coeffDict_); C2_.readIfPresent(coeffDict_); - alphak_.readIfPresent(coeffDict_); - alphaEps_.readIfPresent(coeffDict_); - alphah_.readIfPresent(coeffDict_); + sigmak_.readIfPresent(coeffDict()); + sigmaEps_.readIfPresent(coeffDict()); + Prt_.readIfPresent(coeffDict()); return true; } @@ -233,7 +251,12 @@ void PDRkEpsilon::correct() { // Re-calculate viscosity mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_); -# include "wallViscosityI.H" + mut_.correctBoundaryConditions(); + + // Re-calculate thermal diffusivity + alphat_ = mut_/Prt_; + alphat_.correctBoundaryConditions(); + return; } @@ -250,6 +273,9 @@ void PDRkEpsilon::correct() volScalarField G = 2*mut_*(tgradU() && dev(symm(tgradU()))); tgradU.clear(); + // Update espsilon and G at the wall + epsilon_.boundaryField().updateCoeffs(); + // Add the blockage generation term so that it is included consistently // in both the k and epsilon equations const volScalarField& betav = U_.db().lookupObject("betav"); @@ -259,8 +285,6 @@ void PDRkEpsilon::correct() volScalarField GR = drag.Gk(); -# include "wallFunctionsI.H" - // Dissipation equation tmp epsEqn ( @@ -273,10 +297,10 @@ void PDRkEpsilon::correct() - fvm::Sp(C2_*betav*rho_*epsilon_/k_, epsilon_) ); -# include "wallDissipationI.H" - epsEqn().relax(); + epsEqn().boundaryManipulate(epsilon_.boundaryField()); + solve(epsEqn); bound(epsilon_, epsilon0_); @@ -298,12 +322,13 @@ void PDRkEpsilon::correct() solve(kEqn); bound(k_, k0_); - // Re-calculate viscosity mut_ = rho_*Cmu_*sqr(k_)/epsilon_; + mut_.correctBoundaryConditions(); -# include "wallViscosityI.H" - + // Re-calculate thermal diffusivity + alphat_ = mut_/Prt_; + alphat_.correctBoundaryConditions(); } diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 28e39f251..69eb74a3d 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -29,6 +29,20 @@ Description Standard k-epsilon turbulence model with additional source terms corresponding to PDR basic drag model (\link basic.H \endlink) + The default model coefficients correspond to the following: + @verbatim + kEpsilonCoeffs + { + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; // only for compressible + sigmak 1.0; // only for compressible + sigmaEps 1.3; + Prt 1.0; // only for compressible + } + @endverbatim + The turbulence source term \f$ G_{R} \f$ appears in the \f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to interaction with unresolved obstacles. @@ -68,16 +82,21 @@ class PDRkEpsilon { // Private data + // Model coefficients + dimensionedScalar Cmu_; dimensionedScalar C1_; dimensionedScalar C2_; - dimensionedScalar alphak_; - dimensionedScalar alphaEps_; - dimensionedScalar alphah_; + dimensionedScalar sigmak_; + dimensionedScalar sigmaEps_; + dimensionedScalar Prt_; + + // Fields volScalarField k_; volScalarField epsilon_; volScalarField mut_; + volScalarField alphat_; public: @@ -85,6 +104,7 @@ public: //- Runtime type information TypeName("PDRkEpsilon"); + // Constructors //- Construct from components @@ -93,11 +113,11 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - basicThermo& thermophysicalModel + const basicThermo& thermophysicalModel ); - // Destructor + //- Destructor virtual ~PDRkEpsilon() {} @@ -114,7 +134,7 @@ public: { return tmp ( - new volScalarField("DkEff", alphak_*mut_ + mu()) + new volScalarField("DkEff", mut_/sigmak_ + mu()) ); } @@ -123,7 +143,7 @@ public: { return tmp ( - new volScalarField("DepsilonEff", alphaEps_*mut_ + mu()) + new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu()) ); } @@ -132,7 +152,7 @@ public: { return tmp ( - new volScalarField("alphaEff", alphah_*mut_ + alpha()) + new volScalarField("alphaEff", alphat_ + alpha()) ); } diff --git a/applications/solvers/combustion/PDRFoam/StCourantNo.H b/applications/solvers/combustion/PDRFoam/StCourantNo.H index bd1dd434e..db933e2bb 100644 --- a/applications/solvers/combustion/PDRFoam/StCourantNo.H +++ b/applications/solvers/combustion/PDRFoam/StCourantNo.H @@ -31,23 +31,25 @@ Description \*---------------------------------------------------------------------------*/ { -scalar meanStCoNum = 0.0; + scalar meanStCoNum = 0.0; -if (mesh.nInternalFaces()) -{ - surfaceScalarField SfUfbyDelta = - mesh.surfaceInterpolation::deltaCoeffs() - *mag(phiSt/fvc::interpolate(rho)); + if (mesh.nInternalFaces()) + { + surfaceScalarField SfUfbyDelta = + mesh.surfaceInterpolation::deltaCoeffs() + *mag(phiSt/fvc::interpolate(rho)); - StCoNum = max(SfUfbyDelta/mesh.magSf()) - .value()*runTime.deltaT().value(); + StCoNum = + max(SfUfbyDelta/mesh.magSf()).value() + *runTime.deltaT().value(); - meanStCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf())) - .value()*runTime.deltaT().value(); -} + meanStCoNum = + (sum(SfUfbyDelta)/sum(mesh.magSf())).value() + *runTime.deltaT().value(); + } -Info<< "St courant Number mean: " << meanStCoNum - << " max: " << StCoNum << endl; + Info<< "St courant Number mean: " << meanStCoNum + << " max: " << StCoNum << endl; } // ************************************************************************* // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H index 9b2174e29..20a135df9 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H @@ -28,8 +28,8 @@ Class Description Simple SCOPEBlendXiEq model for XiEq based on SCOPEXiEqs correlation with a linear correction function to give a plausible profile for XiEq. - See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE laminar - flame speed model. + See @link SCOPELaminarFlameSpeed.H @endlink for details on the SCOPE + laminar flame speed model. SourceFiles SCOPEBlend.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H index 509410c30..dcc53ec79 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H @@ -26,10 +26,9 @@ Class Foam::XiEqModels::instability Description - This is the equilibrium level of the flame wrinkling generated by - inestability. It is a constant (default 2.5). It is used in - \link XiModel.H \endlink. + instability. It is a constant (default 2.5). It is used in + @link XiModel.H @endlink. SourceFiles instability.C diff --git a/applications/solvers/combustion/PDRFoam/bEqn.H b/applications/solvers/combustion/PDRFoam/bEqn.H index 3fd99b65e..cb4493154 100644 --- a/applications/solvers/combustion/PDRFoam/bEqn.H +++ b/applications/solvers/combustion/PDRFoam/bEqn.H @@ -1,7 +1,7 @@ tmp > mvConvection ( fv::convectionScheme::New - ( + ( mesh, fields, phi, @@ -25,7 +25,7 @@ if (ign.ignited()) // Unburnt gas density // ~~~~~~~~~~~~~~~~~~~ - volScalarField rhou = thermo->rhou(); + volScalarField rhou = thermo.rhou(); // Calculate flame normal etc. // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index ba07a6dd4..74a18ab6f 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -1,10 +1,11 @@ Info<< "Reading thermophysical properties\n" << endl; - autoPtr thermo + autoPtr pThermo ( hhuCombustionThermo::New(mesh) ); - combustionMixture& composition = thermo->composition(); + hhuCombustionThermo& thermo = pThermo(); + basicMultiComponentMixture& composition = thermo.composition(); volScalarField rho ( @@ -16,13 +17,13 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - thermo->rho() + thermo.rho() ); - volScalarField& p = thermo->p(); - const volScalarField& psi = thermo->psi(); - volScalarField& h = thermo->h(); - volScalarField& hu = thermo->hu(); + volScalarField& p = thermo.p(); + const volScalarField& psi = thermo.psi(); + volScalarField& h = thermo.h(); + volScalarField& hu = thermo.hu(); volScalarField& b = composition.Y("b"); Info<< "min(b) = " << min(b).value() << endl; @@ -54,7 +55,7 @@ rho, U, phi, - thermo() + thermo ) ); diff --git a/applications/solvers/combustion/PDRFoam/hEqn.H b/applications/solvers/combustion/PDRFoam/hEqn.H index 807792948..7f5292d01 100644 --- a/applications/solvers/combustion/PDRFoam/hEqn.H +++ b/applications/solvers/combustion/PDRFoam/hEqn.H @@ -8,5 +8,5 @@ betav*DpDt ); - thermo->correct(); + thermo.correct(); } diff --git a/applications/solvers/combustion/PDRFoam/huEqn.H b/applications/solvers/combustion/PDRFoam/huEqn.H index 462f271f4..3467bc6b7 100644 --- a/applications/solvers/combustion/PDRFoam/huEqn.H +++ b/applications/solvers/combustion/PDRFoam/huEqn.H @@ -13,6 +13,6 @@ if (ign.ignited()) //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu) == - betav*DpDt*rho/thermo->rhou() + betav*DpDt*rho/thermo.rhou() ); } diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 232904480..cb67681f0 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -395,7 +395,7 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const ( "Ma", mesh.time().timeName(), - mesh.db(), + mesh, IOobject::NO_READ, IOobject::NO_WRITE ), diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H index 99d08b5cb..74cfba120 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H @@ -196,7 +196,6 @@ public: // Destructor - ~SCOPE(); diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H index 312de8301..524c8eac7 100644 --- a/applications/solvers/combustion/PDRFoam/pEqn.H +++ b/applications/solvers/combustion/PDRFoam/pEqn.H @@ -1,4 +1,4 @@ -rho = thermo->rho(); +rho = thermo.rho(); volScalarField rUA = 1.0/UEqn.A(); U = invA & UEqn.H(); @@ -8,7 +8,7 @@ if (transonic) surfaceScalarField phid ( "phid", - fvc::interpolate(thermo->psi()) + fvc::interpolate(psi) *( (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) @@ -34,7 +34,7 @@ if (transonic) } else { - phi = + phi = fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 69ded9ae5..ab0a94372 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -1,19 +1,21 @@ EXE_INC = \ -I$(LIB_SRC)/engine/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/RAS \ - -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -lengine \ + -lcompressibleRASModels \ + -lcompressibleLESModels \ + -lbasicThermophysicalModels \ + -lreactionThermophysicalModels \ + -lspecie \ + -llaminarFlameSpeedModels \ -lfiniteVolume \ -lmeshTools \ - -lcompressibleRASModels \ - -lbasicThermophysicalModels \ - -lcombustionThermophysicalModels \ - -lspecie \ - -llaminarFlameSpeedModels + -llduSolvers diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H index 2a7753e14..9697c6e1e 100644 --- a/applications/solvers/combustion/XiFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/UEqn.H @@ -7,6 +7,8 @@ rho*g ); + UEqn.relax(); + if (momentumPredictor) { solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 5eac705ba..b5c2b2e61 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -26,8 +26,8 @@ Application XiFoam Description - Compressible premixed/partially-premixed combustion solver with turbulence - modelling. + Solver for compressible premixed/partially-premixed combustion with + turbulence modelling. Combusting RANS code using the b-Xi two-equation model. Xi may be obtained by either the solution of the Xi transport @@ -52,7 +52,7 @@ Description #include "fvCFD.H" #include "hhuCombustionThermo.H" -#include "compressible/RASModel/RASModel.H" +#include "turbulenceModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" #include "Switch.H" @@ -66,9 +66,8 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" # include "readCombustionProperties.H" -# include "readEnvironmentalProperties.H" +# include "readGravitationalAcceleration.H" # include "createFields.H" -# include "readPISOControls.H" # include "initContinuityErrs.H" # include "readTimeControls.H" # include "compressibleCourantNo.H" @@ -88,12 +87,12 @@ int main(int argc, char *argv[]) runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; + // --- Pressure-velocity PIMPLE corrector loop + for (int oCorr=0; oCorrcorrect(); + turbulence->correct(); + } - rho = thermo->rho(); + rho = thermo.rho(); runTime.write(); @@ -120,7 +123,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H index 739d6987e..74ba01501 100644 --- a/applications/solvers/combustion/XiFoam/bEqn.H +++ b/applications/solvers/combustion/XiFoam/bEqn.H @@ -6,7 +6,7 @@ if (ign.ignited()) // Unburnt gas density // ~~~~~~~~~~~~~~~~~~~ - volScalarField rhou = thermo->rhou(); + volScalarField rhou = thermo.rhou(); // Calculate flame normal etc. // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -52,7 +52,7 @@ if (ign.ignited()) + mvConvection->fvmDiv(phi, b) + fvm::div(phiSt, b, "div(phiSt,b)") - fvm::Sp(fvc::div(phiSt), b) - - fvm::laplacian(turbulence->muEff(), b) + - fvm::laplacian(turbulence->alphaEff(), b) ); @@ -76,7 +76,7 @@ if (ign.ignited()) volScalarField epsilon = pow(uPrimeCoef, 3)*turbulence->epsilon(); - volScalarField tauEta = sqrt(thermo->muu()/(rhou*epsilon)); + volScalarField tauEta = sqrt(thermo.muu()/(rhou*epsilon)); volScalarField Reta = up/ ( @@ -90,7 +90,7 @@ if (ign.ignited()) // ~~~~~~~~~~~~~~~~~ surfaceScalarField phiXi = phiSt - - fvc::interpolate(fvc::laplacian(turbulence->muEff(), b)/mgb)*nf + - fvc::interpolate(fvc::laplacian(turbulence->alphaEff(), b)/mgb)*nf + fvc::interpolate(rho)*fvc::interpolate(Su*(1.0/Xi - Xi))*nf; @@ -134,7 +134,7 @@ if (ign.ignited()) (sigmas*SuInf*(Su0 - SuInf) + sqr(SuMin)*sigmaExt) /(sqr(Su0 - SuInf) + sqr(SuMin)); - solve + fvScalarMatrix SuEqn ( fvm::ddt(rho, Su) + fvm::div(phi + phiXi, Su, "div(phiXi,Su)") @@ -144,6 +144,9 @@ if (ign.ignited()) - fvm::SuSp(rho*(sigmas + Rc), Su) ); + SuEqn.relax(); + SuEqn.solve(); + // Limit the maximum Su // ~~~~~~~~~~~~~~~~~~~~ Su.min(SuMax); @@ -180,7 +183,7 @@ if (ign.ignited()) // with a linear correction function to give a plausible profile for Xi // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - volScalarField XiEqStar = + volScalarField XiEqStar = scalar(1.001) + XiCoef*sqrt(up/(Su + SuMin))*Reta; volScalarField XiEq = @@ -196,7 +199,7 @@ if (ign.ignited()) // Solve for the flame wrinkling // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - solve + fvScalarMatrix XiEqn ( fvm::ddt(rho, Xi) + fvm::div(phi + phiXi, Xi, "div(phiXi,Xi)") @@ -215,6 +218,8 @@ if (ign.ignited()) ) ); + XiEqn.relax(); + XiEqn.solve(); // Correct boundedness of Xi // ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 6ceabb991..ef16bd615 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -1,10 +1,11 @@ Info<< "Reading thermophysical properties\n" << endl; - autoPtr thermo + autoPtr pThermo ( hhuCombustionThermo::New(mesh) ); - combustionMixture& composition = thermo->composition(); + hhuCombustionThermo& thermo = pThermo(); + basicMultiComponentMixture& composition = thermo.composition(); volScalarField rho ( @@ -16,18 +17,18 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - thermo->rho() + thermo.rho() ); - volScalarField& p = thermo->p(); - const volScalarField& psi = thermo->psi(); - volScalarField& h = thermo->h(); - volScalarField& hu = thermo->hu(); + volScalarField& p = thermo.p(); + const volScalarField& psi = thermo.psi(); + volScalarField& h = thermo.h(); + volScalarField& hu = thermo.hu(); volScalarField& b = composition.Y("b"); Info<< "min(b) = " << min(b).value() << endl; - const volScalarField& T = thermo->T(); + const volScalarField& T = thermo.T(); Info<< "\nReading field U\n" << endl; @@ -48,14 +49,14 @@ Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence + autoPtr turbulence ( - compressible::RASModel::New + compressible::turbulenceModel::New ( rho, U, phi, - thermo() + thermo ) ); diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H index 519cbd7cb..46d7aeae8 100644 --- a/applications/solvers/combustion/XiFoam/ftEqn.H +++ b/applications/solvers/combustion/XiFoam/ftEqn.H @@ -1,7 +1,7 @@ tmp > mvConvection ( fv::convectionScheme::New - ( + ( mesh, fields, phi, @@ -17,6 +17,6 @@ if (composition.contains("ft")) ( fvm::ddt(rho, ft) + mvConvection->fvmDiv(phi, ft) - - fvm::laplacian(turbulence->muEff(), ft) + - fvm::laplacian(turbulence->alphaEff(), ft) ); } diff --git a/applications/solvers/combustion/XiFoam/hEqn.H b/applications/solvers/combustion/XiFoam/hEqn.H index 2a5204aa8..513ae6044 100644 --- a/applications/solvers/combustion/XiFoam/hEqn.H +++ b/applications/solvers/combustion/XiFoam/hEqn.H @@ -1,5 +1,5 @@ { - solve + fvScalarMatrix hEqn ( fvm::ddt(rho, h) + mvConvection->fvmDiv(phi, h) @@ -8,5 +8,8 @@ DpDt ); - thermo->correct(); + hEqn.relax(); + hEqn.solve(); + + thermo.correct(); } diff --git a/applications/solvers/combustion/XiFoam/huEqn.H b/applications/solvers/combustion/XiFoam/huEqn.H index 2f001b003..0b4068344 100644 --- a/applications/solvers/combustion/XiFoam/huEqn.H +++ b/applications/solvers/combustion/XiFoam/huEqn.H @@ -13,6 +13,6 @@ if (ign.ignited()) //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu) == - DpDt*rho/thermo->rhou() + DpDt*rho/thermo.rhou() ); } diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H index 05db89627..280842ecc 100644 --- a/applications/solvers/combustion/XiFoam/pEqn.H +++ b/applications/solvers/combustion/XiFoam/pEqn.H @@ -1,4 +1,4 @@ -rho = thermo->rho(); +rho = thermo.rho(); volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); @@ -8,7 +8,7 @@ if (transonic) surfaceScalarField phid ( "phid", - fvc::interpolate(thermo->psi()) + fvc::interpolate(psi) *( (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) @@ -34,7 +34,7 @@ if (transonic) } else { - phi = + phi = fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) diff --git a/applications/solvers/combustion/Xoodles/Make/files b/applications/solvers/combustion/Xoodles/Make/files deleted file mode 100644 index 3db9275c3..000000000 --- a/applications/solvers/combustion/Xoodles/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -Xoodles.C - -EXE = $(FOAM_APPBIN)/Xoodles diff --git a/applications/solvers/combustion/Xoodles/Make/options b/applications/solvers/combustion/Xoodles/Make/options deleted file mode 100644 index 92932f16d..000000000 --- a/applications/solvers/combustion/Xoodles/Make/options +++ /dev/null @@ -1,23 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/engine/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/LES \ - -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ - -I../XiFoam - - -EXE_LIBS = \ - -lengine \ - -lfiniteVolume \ - -lmeshTools \ - -lbasicThermophysicalModels \ - -lcombustionThermophysicalModels \ - -lspecie \ - -lcompressibleLESModels \ - -llaminarFlameSpeedModels diff --git a/applications/solvers/combustion/Xoodles/createFields.H b/applications/solvers/combustion/Xoodles/createFields.H deleted file mode 100644 index 8a12db6f1..000000000 --- a/applications/solvers/combustion/Xoodles/createFields.H +++ /dev/null @@ -1,124 +0,0 @@ - Info<< "Reading thermophysical properties\n" << endl; - - autoPtr thermo - ( - hhuCombustionThermo::New(mesh) - ); - combustionMixture& composition = thermo->composition(); - - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - thermo->rho() - ); - - volScalarField& p = thermo->p(); - const volScalarField& psi = thermo->psi(); - volScalarField& h = thermo->h(); - volScalarField& hu = thermo->hu(); - - volScalarField& b = composition.Y("b"); - Info<< "min(b) = " << min(b).value() << endl; - - const volScalarField& T = thermo->T(); - - - Info<< "\nReading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - -# include "compressibleCreatePhi.H" - - - Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence - ( - compressible::LESModel::New(rho, U, phi, thermo()) - ); - - - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt = - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); - - Info<< "Creating field Xi\n" << endl; - volScalarField Xi - ( - IOobject - ( - "Xi", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - - Info<< "Creating the unstrained laminar flame speed\n" << endl; - autoPtr unstrainedLaminarFlameSpeed - ( - laminarFlameSpeed::New(thermo) - ); - - - Info<< "Reading strained laminar flame speed field Su\n" << endl; - volScalarField Su - ( - IOobject - ( - "Su", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - dimensionedScalar SuMin = 0.01*Su.average(); - dimensionedScalar SuMax = 4*Su.average(); - - Info<< "Calculating turbulent flame speed field St\n" << endl; - volScalarField St - ( - IOobject - ( - "St", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - Xi*Su - ); - - - multivariateSurfaceInterpolationScheme::fieldTable fields; - - if (composition.contains("ft")) - { - fields.add(composition.Y("ft")); - } - - fields.add(b); - fields.add(h); - fields.add(hu); diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index fef39c4af..1c0375771 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -2,15 +2,17 @@ EXE_INC = \ -I../engineFoam \ -I../XiFoam \ -I$(LIB_SRC)/engine/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -lengine \ - -lfiniteVolume \ -lcompressibleRASModels \ + -lcompressibleLESModels \ -lbasicThermophysicalModels \ - -lspecie + -lspecie \ + -lfiniteVolume \ + -llduSolvers diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index ca77e5f30..206fbb229 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -33,8 +33,8 @@ Description #include "fvCFD.H" #include "engineTime.H" #include "engineMesh.H" -#include "basicThermo.H" -#include "RASModel.H" +#include "basicPsiThermo.H" +#include "turbulenceModel.H" #include "OFstream.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index ed7c012d5..7b1c086df 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -1,9 +1,10 @@ Info<< "Reading thermophysical properties\n" << endl; - autoPtr thermo + autoPtr pThermo ( - basicThermo::New(mesh) + basicPsiThermo::New(mesh) ); + basicPsiThermo& thermo = pThermo(); volScalarField rho ( @@ -15,13 +16,13 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - thermo->rho() + thermo.rho() ); - volScalarField& p = thermo->p(); - const volScalarField& psi = thermo->psi(); - volScalarField& h = thermo->h(); - const volScalarField& T = thermo->T(); + volScalarField& p = thermo.p(); + const volScalarField& psi = thermo.psi(); + volScalarField& h = thermo.h(); + const volScalarField& T = thermo.T(); Info<< "\nReading field U\n" << endl; @@ -42,14 +43,14 @@ Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence + autoPtr turbulence ( - compressible::RASModel::New + compressible::turbulenceModel::New ( rho, U, phi, - thermo() + thermo ) ); diff --git a/applications/solvers/combustion/coldEngineFoam/hEqn.H b/applications/solvers/combustion/coldEngineFoam/hEqn.H index f72ef0c89..ae60d3316 100644 --- a/applications/solvers/combustion/coldEngineFoam/hEqn.H +++ b/applications/solvers/combustion/coldEngineFoam/hEqn.H @@ -8,5 +8,5 @@ DpDt ); - thermo->correct(); + thermo.correct(); } diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index a5cbe01e3..6829b6828 100644 --- a/applications/solvers/combustion/dieselEngineFoam/Make/options +++ b/applications/solvers/combustion/dieselEngineFoam/Make/options @@ -1,25 +1,26 @@ EXE_INC = \ -I../engineFoam \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/RAS \ + -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ - -I$(LIB_SRC)/../applications/solvers/combustion/XiFoam \ + -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)/engine/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ EXE_LIBS = \ -lengine \ -lcompressibleRASModels \ - -lcombustionThermophysicalModels \ + -lcompressibleLESModels \ + -lreactionThermophysicalModels \ -lfiniteVolume \ -llagrangian \ -ldieselSpray \ @@ -31,4 +32,5 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lchemistryModel \ -lODE \ - -lpdf + -lpdf \ + -llduSolvers diff --git a/applications/solvers/combustion/dieselEngineFoam/YEqn.H b/applications/solvers/combustion/dieselEngineFoam/YEqn.H index 2f74884bb..589e9fce6 100644 --- a/applications/solvers/combustion/dieselEngineFoam/YEqn.H +++ b/applications/solvers/combustion/dieselEngineFoam/YEqn.H @@ -14,7 +14,7 @@ tmp > mvConvection label inertIndex = -1; volScalarField Yt = 0.0*Y[0]; - for(label i=0; i > mvConvection 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 index c07aa63cd..37aeca4c0 100644 --- a/applications/solvers/combustion/dieselEngineFoam/createFields.H +++ b/applications/solvers/combustion/dieselEngineFoam/createFields.H @@ -1,13 +1,25 @@ Info<< nl << "Reading thermophysicalProperties" << endl; -autoPtr thermo -( - hCombustionThermo::New(mesh) -); -combustionMixture& composition = thermo->composition(); +autoPtr pChemistry +( + psiChemistryModel::New(mesh) +); +psiChemistryModel& chemistry = pChemistry(); + +hsCombustionThermo& thermo = chemistry.thermo(); + +basicMultiComponentMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); -word inertSpecie(thermo->lookup("inertSpecie")); +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 ( @@ -17,7 +29,7 @@ volScalarField rho runTime.timeName(), mesh ), - thermo->rho() + thermo.rho() ); Info<< "Reading field U\n" << endl; @@ -35,10 +47,10 @@ volVectorField U ); -volScalarField& p = thermo->p(); -const volScalarField& psi = thermo->psi(); -const volScalarField& T = thermo->T(); -volScalarField& h = thermo->h(); +volScalarField& p = thermo.p(); +const volScalarField& psi = thermo.psi(); +const volScalarField& T = thermo.T(); +volScalarField& hs = thermo.hs(); #include "compressibleCreatePhi.H" @@ -58,46 +70,40 @@ volScalarField kappa ); Info << "Creating turbulence model.\n" << nl; -autoPtr turbulence +autoPtr turbulence ( - compressible::RASModel::New + compressible::turbulenceModel::New ( rho, U, phi, - thermo() + thermo ) ); Info<< "Creating field DpDt\n" << endl; -volScalarField DpDt = +volScalarField DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); -Info << "Constructing chemical mechanism" << endl; -chemistryModel chemistry -( - thermo(), - rho -); multivariateSurfaceInterpolationScheme::fieldTable fields; -for(label i=0; i chemistrySh ( IOobject ( - "dQ", + "chemistry::Sh", runTime.timeName(), mesh, IOobject::NO_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE ), mesh, - dimensionedScalar("zero", dimensionSet(1,-3,-1,0,0,0,0), 0.0) + dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0) ); diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H index afa2f1ded..ea4d0121b 100644 --- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H +++ b/applications/solvers/combustion/dieselEngineFoam/createSpray.H @@ -1,24 +1,21 @@ Info << "Constructing Spray" << endl; -pointMesh pMesh(mesh); -volPointInterpolation vpi(mesh, pMesh); - -PtrList gasProperties(Y.size()); +PtrList gasProperties(Y.size()); forAll(gasProperties, i) { gasProperties.set ( i, - new specieProperties + new gasThermoPhysics ( - dynamic_cast(thermo()).speciesData()[i] + dynamic_cast&> + (thermo).speciesData()[i] ) ); } spray dieselSpray ( - vpi, U, rho, p, @@ -26,7 +23,7 @@ spray dieselSpray composition, gasProperties, thermo, - environmentalProperties + g ); scalar gasMass0 = fvc::domainIntegrate(rho).value(); diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C index ad90aae7d..bb76f0ce9 100644 --- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C +++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C @@ -23,10 +23,10 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Application - dieselFoam + dieselEngineFoam Description - Diesel engine spray and combustion code. + Solver for diesel engine spray and combustion. \*---------------------------------------------------------------------------*/ @@ -34,13 +34,15 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "hCombustionThermo.H" -#include "compressible/RASModel/RASModel.H" +#include "turbulenceModel.H" #include "spray.H" -#include "chemistryModel.H" +#include "psiChemistryModel.H" #include "chemistrySolver.H" #include "multivariateScheme.H" #include "Switch.H" #include "OFstream.H" +#include "volPointInterpolation.H" +#include "thermoPhysicsTypes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,7 +52,7 @@ int main(int argc, char *argv[]) # include "createEngineTime.H" # include "createEngineMesh.H" # include "createFields.H" -# include "readEnvironmentalProperties.H" +# include "readGravitationalAcceleration.H" # include "readCombustionProperties.H" # include "createSpray.H" # include "initContinuityErrs.H" @@ -61,7 +63,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { @@ -75,11 +77,16 @@ int main(int argc, char *argv[]) Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl; mesh.move(); - vpi.updateMesh(); + Check that this is unnecessary. HJ + // 1.6.x merge. HJ, 26/Aug/2010 + const_cast + ( + volPointInterpolation::New(mesh) + ).updateMesh(); dieselSpray.evolve(); - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( @@ -97,13 +104,15 @@ int main(int argc, char *argv[]) kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk); } + chemistrySh = kappa*chemistry.Sh()(); + # include "rhoEqn.H" # include "UEqn.H" for (label ocorr=1; ocorr <= nOuterCorr; ocorr++) { # include "YEqn.H" -# include "hEqn.H" +# include "hsEqn.H" // --- PISO loop for (int corr=1; corr<=nCorr; corr++) @@ -117,9 +126,12 @@ int main(int argc, char *argv[]) # include "logSummary.H" # include "spraySummary.H" - rho = thermo->rho(); + rho = thermo.rho(); - runTime.write(); + if (runTime.write()) + { + chemistry.dQ()().write(); + } Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" @@ -128,7 +140,7 @@ int main(int argc, char *argv[]) Info<< "End\n" << endl; - return(0); + return 0; } diff --git a/applications/solvers/combustion/dieselEngineFoam/hEqn.H b/applications/solvers/combustion/dieselEngineFoam/hEqn.H deleted file mode 100644 index 347fef1a9..000000000 --- a/applications/solvers/combustion/dieselEngineFoam/hEqn.H +++ /dev/null @@ -1,40 +0,0 @@ -{ - solve - ( - fvm::ddt(rho, h) - + mvConvection->fvmDiv(phi, h) - - fvm::laplacian(turbulence->alphaEff(), h) - == - DpDt - + dieselSpray.heatTransferSource() - ); - - thermo->correct(); - - forAll(dQ, i) - { - dQ[i] = 0.0; - } - - scalarField cp(dQ.size(), 0.0); - - forAll(Y, i) - { - volScalarField RRi = chemistry.RR(i); - - forAll(h, celli) - { - scalar Ti = T[celli]; - cp[celli] += Y[i][celli]*chemistry.specieThermo()[i].Cp(Ti); - scalar hi = chemistry.specieThermo()[i].h(Ti); - scalar RR = RRi[celli]; - dQ[celli] -= hi*RR; - } - - } - - forAll(dQ, celli) - { - dQ[celli] /= cp[celli]; - } -} diff --git a/applications/solvers/combustion/dieselEngineFoam/hsEqn.H b/applications/solvers/combustion/dieselEngineFoam/hsEqn.H new file mode 100644 index 000000000..7ae59feb8 --- /dev/null +++ b/applications/solvers/combustion/dieselEngineFoam/hsEqn.H @@ -0,0 +1,14 @@ +{ + solve + ( + fvm::ddt(rho, hs) + + mvConvection->fvmDiv(phi, hs) + - fvm::laplacian(turbulence->alphaEff(), hs) + == + DpDt + + dieselSpray.heatTransferSource()().dimensionedInternalField() + + chemistrySh + ); + + thermo.correct(); +} diff --git a/applications/solvers/combustion/dieselEngineFoam/pEqn.H b/applications/solvers/combustion/dieselEngineFoam/pEqn.H index 0324a47ce..b68ae7329 100644 --- a/applications/solvers/combustion/dieselEngineFoam/pEqn.H +++ b/applications/solvers/combustion/dieselEngineFoam/pEqn.H @@ -1,4 +1,4 @@ -rho = thermo->rho(); +rho = thermo.rho(); volScalarField A = UEqn.A(); U = UEqn.H()/A; @@ -8,7 +8,7 @@ if (transonic) surfaceScalarField phid ( "phid", - fvc::interpolate(thermo->psi()) + fvc::interpolate(psi) *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) ); diff --git a/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H b/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H index e78a451a9..0137243b6 100644 --- a/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H +++ b/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H @@ -44,7 +44,7 @@ volScalarField Sevap dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0.0) ); -for(label i=0; i()); + label Nparcels = dieselSpray.size(); + reduce(Nparcels, sumOp