From 86c1ecdf32f98426840f226e0237027748e0d6f2 Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 5 Mar 2021 17:30:26 +0000 Subject: [PATCH] TUT: lagrangian: clean up tutorials --- .../lagrangian/DPMFoam/Goldschmidt/0/U.air | 1 - tutorials/lagrangian/DPMFoam/Goldschmidt/0/p | 1 + .../lagrangian/DPMFoam/Goldschmidt/constant/g | 1 - .../constant/kinematicCloudProperties | 32 +------------ .../Goldschmidt/constant/transportProperties | 2 +- .../constant/turbulenceProperties.air | 2 +- .../DPMFoam/Goldschmidt/system/controlDict | 2 +- .../Goldschmidt/system/decomposeParDict | 1 + .../DPMFoam/Goldschmidt/system/fvSolution | 5 -- .../DPMFoam/Goldschmidt/system/mapFieldsDict | 29 ----------- .../lagrangian/MPPICDyMFoam/column/0/U.air | 2 +- .../column/constant/kinematicCloudProperties | 19 +------- .../MPPICDyMFoam/denseRotor2DAMI/0/T | 48 ------------------- .../constant/kinematicCloudProperties | 17 ++----- .../lagrangian/MPPICFoam/Goldschmidt/0/U.air | 3 +- .../lagrangian/MPPICFoam/Goldschmidt/0/p | 1 + .../MPPICFoam/Goldschmidt/constant/g | 2 +- .../constant/kinematicCloudProperties | 26 +--------- .../Goldschmidt/constant/transportProperties | 2 +- .../constant/turbulenceProperties.air | 2 +- .../MPPICFoam/Goldschmidt/system/controlDict | 2 +- .../Goldschmidt/system/decomposeParDict | 1 + .../MPPICFoam/Goldschmidt/system/fvSchemes | 2 +- .../MPPICFoam/Goldschmidt/system/fvSolution | 5 -- tutorials/lagrangian/MPPICFoam/column/0/U.air | 4 +- tutorials/lagrangian/MPPICFoam/column/0/p | 1 + .../lagrangian/MPPICFoam/column/constant/g | 1 - .../column/constant/kinematicCloudProperties | 21 +------- .../column/constant/transportProperties | 2 +- .../column/constant/turbulenceProperties.air | 2 +- .../MPPICFoam/column/system/controlDict | 2 +- .../MPPICFoam/column/system/fvSchemes | 4 +- .../MPPICFoam/column/system/fvSolution | 5 -- .../MPPICFoam/cyclone/{0 => 0.orig}/U.air | 3 +- .../MPPICFoam/cyclone/{0 => 0.orig}/k.air | 3 +- .../MPPICFoam/cyclone/{0 => 0.orig}/nut.air | 3 +- .../MPPICFoam/cyclone/{0 => 0.orig}/p | 0 .../lagrangian/MPPICFoam/cyclone/Allclean | 4 +- tutorials/lagrangian/MPPICFoam/cyclone/Allrun | 8 +++- .../lagrangian/MPPICFoam/cyclone/constant/g | 2 +- .../cyclone/constant/kinematicCloudProperties | 14 +----- .../cyclone/constant/transportProperties | 2 +- .../cyclone/constant/triSurface/README | 4 -- .../cyclone/constant/turbulenceProperties.air | 1 - .../MPPICFoam/cyclone/system/controlDict | 2 +- .../MPPICFoam/cyclone/system/decomposeParDict | 1 + .../MPPICFoam/cyclone/system/fvSolution | 5 -- .../MPPICFoam/injectionChannel/0/U.air | 3 +- .../lagrangian/MPPICFoam/injectionChannel/0/p | 1 + .../MPPICFoam/injectionChannel/constant/g | 1 - .../constant/kinematicCloudProperties | 18 +------ .../constant/transportProperties | 2 +- .../constant/turbulenceProperties.air | 2 +- .../injectionChannel/system/controlDict | 2 +- .../injectionChannel/system/fvSchemes | 3 +- .../injectionChannel/system/fvSolution | 5 -- .../simplifiedSiwek/0.orig/CH4 | 1 - .../simplifiedSiwek/0.orig/CO | 1 - .../simplifiedSiwek/0.orig/CO2 | 1 - .../simplifiedSiwek/0.orig/G | 5 +- .../simplifiedSiwek/0.orig/H2 | 1 - .../simplifiedSiwek/0.orig/H2O | 1 - .../simplifiedSiwek/0.orig/N2 | 1 - .../simplifiedSiwek/0.orig/O2 | 1 - .../simplifiedSiwek/0.orig/T | 1 - .../simplifiedSiwek/0.orig/U | 5 +- .../simplifiedSiwek/0.orig/alphat | 5 +- .../simplifiedSiwek/0.orig/epsilon | 5 +- .../simplifiedSiwek/0.orig/k | 5 +- .../simplifiedSiwek/0.orig/nut | 5 +- .../simplifiedSiwek/0.orig/p | 1 - .../constant/boundaryRadiationProperties | 2 +- .../constant/chemistryProperties | 1 - .../constant/coalCloud1Positions | 5 +- .../constant/coalCloud1Properties | 1 - .../constant/combustionProperties | 1 - .../simplifiedSiwek/constant/foam.dat | 1 - .../simplifiedSiwek/constant/fvOptions | 1 - .../simplifiedSiwek/constant/g | 1 - .../constant/limestoneCloud1Properties | 1 - .../constant/limestonePositions | 4 +- .../constant/radiationProperties | 2 +- .../constant/thermophysicalProperties | 1 - .../constant/turbulenceProperties | 1 - .../simplifiedSiwek/system/controlDict | 3 +- .../simplifiedSiwek/system/dataCloud | 1 + .../simplifiedSiwek/system/decomposeParDict | 8 ---- .../simplifiedSiwek/system/fvSchemes | 3 +- .../simplifiedSiwek/system/fvSolution | 2 - .../system/runTimePostProcessing | 1 + .../simplifiedSiwek/system/topoSetDict | 1 - .../mixerVesselAMI2D/{0 => 0.orig}/U | 1 + .../mixerVesselAMI2D/Allclean | 8 ++++ .../mixerVesselAMI2D/Allrun | 2 + .../mixerVesselAMI2D/constant/dynamicMeshDict | 1 - .../mixerVesselAMI2D/constant/g | 2 - .../constant/kinematicCloudProperties | 5 -- .../constant/transportProperties | 5 +- .../constant/turbulenceProperties | 1 - .../mixerVesselAMI2D/system/controlDict | 1 - .../mixerVesselAMI2D/system/fvSolution | 1 - .../hopper/hopperEmptying/0.orig/U | 4 +- .../hopper/hopperEmptying/0.orig/mu | 4 +- .../hopper/hopperEmptying/0.orig/rho | 4 +- .../hopper/hopperEmptying/constant/g | 1 - .../constant/kinematicCloudProperties | 1 - .../constant/transportProperties | 2 +- .../constant/turbulenceProperties | 1 - .../hopperEmptying/system/blockMeshDict | 2 - .../hopper/hopperEmptying/system/controlDict | 2 +- .../hopperEmptying/system/decomposeParDict | 5 -- .../hopper/hopperEmptying/system/fvSchemes | 2 +- .../hopper/hopperEmptying/system/fvSolution | 5 -- .../hopperEmptying/system/mapFieldsDict | 2 +- .../hopper/hopperInitialState/0/U | 3 ++ .../hopper/hopperInitialState/constant/g | 1 - .../constant/kinematicCloudPositions | 1 - .../constant/kinematicCloudProperties | 2 - .../constant/transportProperties | 2 +- .../constant/turbulenceProperties | 1 - .../hopperInitialState/system/blockMeshDict | 1 - .../hopperInitialState/system/controlDict | 2 +- .../system/decomposeParDict | 4 -- .../hopperInitialState/system/fvSchemes | 2 +- .../hopperInitialState/system/fvSolution | 5 -- .../rectangularDuct/0/N2 | 3 +- .../rectangularDuct/0/O2 | 3 +- .../rectangularDuct/0/T | 3 +- .../rectangularDuct/0/U | 4 +- .../rectangularDuct/0/alphat | 3 +- .../rectangularDuct/0/k | 3 +- .../rectangularDuct/0/nut | 4 +- .../rectangularDuct/0/omega | 4 +- .../rectangularDuct/0/p | 4 +- .../rectangularDuct/0/p_rgh | 3 +- .../constant/chemistryProperties | 1 - .../constant/combustionProperties | 1 - .../rectangularDuct/constant/foam.dat | 1 - .../rectangularDuct/constant/g | 1 - .../constant/particleTrackDict | 1 - .../constant/radiationProperties | 2 +- .../constant/reactingCloud1Properties | 2 - .../constant/thermophysicalProperties | 2 - .../constant/turbulenceProperties | 2 +- .../rectangularDuct/system/blockMeshDict | 1 - .../rectangularDuct/system/controlDict | 5 +- .../rectangularDuct/system/decomposeParDict | 8 ---- .../rectangularDuct/system/fvSchemes | 7 ++- .../rectangularDuct/system/fvSolution | 1 - .../counterFlowFlame2DLTS/0/CH4 | 5 +- .../counterFlowFlame2DLTS/0/CO2 | 5 +- .../counterFlowFlame2DLTS/0/H2O | 5 +- .../counterFlowFlame2DLTS/0/N2 | 5 +- .../counterFlowFlame2DLTS/0/O2 | 4 +- .../counterFlowFlame2DLTS/0/T | 4 +- .../counterFlowFlame2DLTS/0/U | 4 +- .../counterFlowFlame2DLTS/0/nut | 4 +- .../counterFlowFlame2DLTS/0/p | 1 - .../counterFlowFlame2DLTS/0/p_rgh | 1 - .../counterFlowFlame2DLTS/0/rho | 4 +- .../constant/chemistryProperties | 2 +- .../constant/combustionProperties | 4 +- .../counterFlowFlame2DLTS/constant/g | 1 - .../constant/radiationProperties | 2 +- .../constant/reactingCloud1Properties | 2 - .../constant/thermo.compressibleGas | 1 - .../constant/thermophysicalProperties | 1 - .../constant/turbulenceProperties | 2 +- .../counterFlowFlame2DLTS/system/controlDict | 2 +- .../counterFlowFlame2DLTS/system/fvSchemes | 1 - .../counterFlowFlame2DLTS/system/fvSolution | 1 - .../reactingParcelFoam/cylinder/0.orig/H2O | 3 +- .../reactingParcelFoam/cylinder/0.orig/N2 | 3 +- .../reactingParcelFoam/cylinder/0.orig/O2 | 3 +- .../reactingParcelFoam/cylinder/0.orig/T | 3 +- .../reactingParcelFoam/cylinder/0.orig/U | 2 +- .../reactingParcelFoam/cylinder/0.orig/p | 3 +- .../reactingParcelFoam/cylinder/0.orig/p_rgh | 3 +- .../cylinder/0.orig/wallFilmRegion/Tf | 1 - .../cylinder/0.orig/wallFilmRegion/Uf | 1 - .../cylinder/0.orig/wallFilmRegion/deltaf | 1 - .../cylinder/constant/chemistryProperties | 1 - .../cylinder/constant/combustionProperties | 1 - .../cylinder/constant/foam.dat | 1 - .../reactingParcelFoam/cylinder/constant/g | 1 - .../constant/parcelInjectionProperties | 2 +- .../cylinder/constant/radiationProperties | 1 - .../constant/reactingCloud1Properties | 1 - .../cylinder/constant/surfaceFilmProperties | 4 +- .../constant/thermophysicalProperties | 1 - .../cylinder/constant/turbulenceProperties | 1 - .../cylinder/system/controlDict | 1 - .../cylinder/system/createPatchDict | 2 +- .../cylinder/system/decomposeParDict | 36 -------------- .../cylinder/system/extrudeToRegionMeshDict | 3 +- .../cylinder/system/fvSchemes | 2 - .../cylinder/system/fvSolution | 4 +- .../cylinder/system/topoSetDict | 2 +- .../cylinder/system/wallFilmRegion/fvSchemes | 23 +++++---- .../cylinder/system/wallFilmRegion/fvSolution | 2 +- .../reactingParcelFoam/filter/0.orig/G | 8 +++- .../reactingParcelFoam/filter/0.orig/H2O | 8 +++- .../reactingParcelFoam/filter/0.orig/N2 | 8 +++- .../reactingParcelFoam/filter/0.orig/O2 | 8 +++- .../reactingParcelFoam/filter/0.orig/T | 8 +++- .../reactingParcelFoam/filter/0.orig/U | 8 +++- .../reactingParcelFoam/filter/0.orig/alphat | 8 +++- .../reactingParcelFoam/filter/0.orig/epsilon | 8 +++- .../reactingParcelFoam/filter/0.orig/k | 8 +++- .../reactingParcelFoam/filter/0.orig/nut | 8 +++- .../filter/constant/chemistryProperties | 1 - .../filter/constant/combustionProperties | 1 - .../filter/constant/fvOptions | 1 - .../reactingParcelFoam/filter/constant/g | 1 - .../filter/constant/parcelInjectionProperties | 1 - .../filter/constant/particleTrackProperties | 1 - .../filter/constant/radiationProperties | 2 - .../filter/constant/reactingCloud1Properties | 3 +- .../filter/constant/thermo.incompressiblePoly | 1 - .../filter/constant/thermophysicalProperties | 1 - .../filter/system/controlDict | 2 +- .../filter/system/decomposeParDict | 1 + .../filter/system/fvSchemes | 1 - .../filter/system/fvSolution | 1 - .../filter/system/topoSetDict | 1 - .../reactingParcelFoam/hotBoxes/0.orig/H2O | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/N2 | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/O2 | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/T | 4 +- .../reactingParcelFoam/hotBoxes/0.orig/U | 4 +- .../reactingParcelFoam/hotBoxes/0.orig/alphat | 2 +- .../hotBoxes/0.orig/epsilon | 2 +- .../hotBoxes/0.orig/htcConv | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/k | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/nut | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/p | 2 +- .../reactingParcelFoam/hotBoxes/0.orig/p_rgh | 2 +- .../hotBoxes/0.orig/wallFilmRegion/Tf | 3 +- .../hotBoxes/0.orig/wallFilmRegion/Uf | 2 +- .../hotBoxes/0.orig/wallFilmRegion/deltaf | 2 +- .../hotBoxes/constant/chemistryProperties | 1 - .../hotBoxes/constant/combustionProperties | 1 - .../hotBoxes/constant/foam.dat | 1 - .../reactingParcelFoam/hotBoxes/constant/g | 1 - .../hotBoxes/constant/radiationProperties | 1 - .../constant/reactingCloud1Properties | 1 - .../hotBoxes/constant/surfaceFilmProperties | 8 ---- .../constant/thermophysicalProperties | 1 - .../hotBoxes/constant/turbulenceProperties | 1 - .../hotBoxes/system/changeDictionaryDict | 1 + .../hotBoxes/system/controlDict | 3 +- .../hotBoxes/system/extrudeToRegionMeshDict | 3 +- .../hotBoxes/system/fvSchemes | 2 - .../hotBoxes/system/fvSolution | 1 - .../hotBoxes/system/topoSetDict | 2 +- .../system/wallFilmRegion.orig/fvSchemes | 20 ++++---- .../system/wallFilmRegion.orig/fvSolution | 2 +- .../parcelInBox/{0 => 0.orig}/G | 0 .../parcelInBox/{0 => 0.orig}/H2O | 0 .../parcelInBox/{0 => 0.orig}/T | 0 .../parcelInBox/{0 => 0.orig}/U | 0 .../parcelInBox/{0 => 0.orig}/air | 0 .../parcelInBox/{0 => 0.orig}/p | 0 .../parcelInBox/{0 => 0.orig}/p_rgh | 0 .../reactingParcelFoam/parcelInBox/Allclean | 8 ++++ .../reactingParcelFoam/parcelInBox/Allrun | 12 +++++ .../rectangularChannel/0.orig/H2O | 5 +- .../rectangularChannel/0.orig/N2 | 3 +- .../rectangularChannel/0.orig/O2 | 3 +- .../rectangularChannel/0.orig/T | 3 +- .../rectangularChannel/0.orig/U | 3 +- .../rectangularChannel/0.orig/alphat | 3 +- .../rectangularChannel/0.orig/k | 3 +- .../rectangularChannel/0.orig/nut | 3 +- .../rectangularChannel/0.orig/omega | 3 +- .../rectangularChannel/0.orig/p | 3 +- .../rectangularChannel/0.orig/p_rgh | 3 +- .../constant/chemistryProperties | 1 - .../constant/combustionProperties | 1 - .../rectangularChannel/constant/foam.dat | 1 - .../rectangularChannel/constant/g | 1 - .../constant/radiationProperties | 2 +- .../constant/reactingCloud1Properties | 1 - .../constant/thermophysicalProperties | 1 - .../constant/turbulenceProperties | 2 +- .../rectangularChannel/system/blockMeshDict | 1 - .../rectangularChannel/system/controlDict | 1 - .../system/decomposeParDict | 1 + .../rectangularChannel/system/fvSchemes | 1 - .../rectangularChannel/system/fvSolution | 2 - .../rivuletPanel/0.orig/H2O | 4 +- .../reactingParcelFoam/rivuletPanel/0.orig/N2 | 4 +- .../reactingParcelFoam/rivuletPanel/0.orig/O2 | 4 +- .../reactingParcelFoam/rivuletPanel/0.orig/T | 5 +- .../reactingParcelFoam/rivuletPanel/0.orig/U | 4 +- .../reactingParcelFoam/rivuletPanel/0.orig/p | 5 +- .../rivuletPanel/0.orig/p_rgh | 5 +- .../rivuletPanel/0.orig/wallFilmRegion/Tf | 1 - .../rivuletPanel/0.orig/wallFilmRegion/Uf | 1 - .../rivuletPanel/0.orig/wallFilmRegion/deltaf | 1 - .../rivuletPanel/constant/chemistryProperties | 1 - .../constant/combustionProperties | 1 - .../rivuletPanel/constant/foam.dat | 1 - .../rivuletPanel/constant/g | 1 - .../constant/parcelInjectionProperties | 2 +- .../rivuletPanel/constant/radiationProperties | 1 - .../constant/reactingCloud1Properties | 1 - .../constant/surfaceFilmProperties | 1 - .../constant/thermophysicalProperties | 1 - .../constant/turbulenceProperties | 1 - .../rivuletPanel/system/controlDict | 3 +- .../rivuletPanel/system/createPatchDict | 2 +- .../rivuletPanel/system/decomposeParDict | 36 -------------- .../system/extrudeToRegionMeshDict | 3 +- .../rivuletPanel/system/fvSchemes | 2 - .../rivuletPanel/system/fvSolution | 1 - .../system/wallFilmRegion.topoSet | 1 - .../system/wallFilmRegion/createPatchDict | 1 - .../system/wallFilmRegion/fvSchemes | 17 ++++--- .../system/wallFilmRegion/fvSolution | 5 +- .../reactingParcelFoam/splashPanel/0.orig/H2O | 3 +- .../reactingParcelFoam/splashPanel/0.orig/N2 | 3 +- .../reactingParcelFoam/splashPanel/0.orig/O2 | 3 +- .../reactingParcelFoam/splashPanel/0.orig/T | 3 +- .../reactingParcelFoam/splashPanel/0.orig/U | 2 +- .../reactingParcelFoam/splashPanel/0.orig/p | 3 +- .../splashPanel/0.orig/p_rgh | 3 +- .../splashPanel/constant/chemistryProperties | 1 - .../splashPanel/constant/combustionProperties | 1 - .../splashPanel/constant/foam.dat | 1 - .../reactingParcelFoam/splashPanel/constant/g | 1 - .../constant/parcelInjectionProperties | 2 +- .../splashPanel/constant/radiationProperties | 1 - .../constant/reactingCloud1Properties | 1 - .../constant/surfaceFilmProperties | 4 +- .../constant/thermophysicalProperties | 1 - .../splashPanel/constant/turbulenceProperties | 1 - .../splashPanel/system/controlDict | 1 - .../splashPanel/system/createPatchDict | 2 +- .../splashPanel/system/decomposeParDict | 36 -------------- .../system/extrudeToRegionMeshDict | 3 +- .../splashPanel/system/fvSchemes | 2 - .../splashPanel/system/fvSolution | 2 +- .../splashPanel/system/wallFilmRegion.topoSet | 2 +- .../system/wallFilmRegion/createPatchDict | 2 +- .../createWallFilmRegionPatches.topoSet | 2 +- .../system/wallFilmRegion/fvSchemes | 17 ++++--- .../system/wallFilmRegion/fvSolution | 3 +- .../verticalChannel/0.orig/H2O | 6 ++- .../verticalChannel/0.orig/T | 6 ++- .../verticalChannel/0.orig/U | 6 ++- .../verticalChannel/0.orig/air | 6 ++- .../verticalChannel/0.orig/alphat | 6 ++- .../verticalChannel/0.orig/k | 6 ++- .../verticalChannel/0.orig/nut | 6 ++- .../verticalChannel/0.orig/omega | 6 ++- .../verticalChannel/0.orig/p | 6 ++- .../verticalChannel/0.orig/p_rgh | 1 - .../constant/chemistryProperties | 1 - .../constant/combustionProperties | 1 - .../verticalChannel/constant/g | 1 - .../constant/particleTrackProperties | 1 - .../constant/radiationProperties | 2 +- .../constant/reactingCloud1Properties | 1 - .../constant/thermo.incompressiblePoly | 1 - .../constant/thermophysicalProperties | 1 - .../verticalChannel/system/blockMeshDict | 1 - .../verticalChannel/system/controlDict | 2 +- .../verticalChannel/system/decomposeParDict | 1 + .../verticalChannel/system/fvSchemes | 1 - .../verticalChannel/system/fvSolution | 3 -- .../verticalChannelLTS/0.orig/H2O | 6 ++- .../verticalChannelLTS/0.orig/T | 6 ++- .../verticalChannelLTS/0.orig/U | 6 ++- .../verticalChannelLTS/0.orig/air | 6 ++- .../verticalChannelLTS/0.orig/alphat | 6 ++- .../verticalChannelLTS/0.orig/k | 6 ++- .../verticalChannelLTS/0.orig/nut | 6 ++- .../verticalChannelLTS/0.orig/omega | 6 ++- .../verticalChannelLTS/0.orig/p | 6 ++- .../verticalChannelLTS/0.orig/p_rgh | 1 - .../constant/chemistryProperties | 1 - .../constant/combustionProperties | 1 - .../verticalChannelLTS/constant/g | 1 - .../constant/particleTrackDict | 1 - .../constant/radiationProperties | 2 +- .../constant/reactingCloud1Properties | 1 - .../constant/thermo.incompressiblePoly | 1 - .../constant/thermophysicalProperties | 1 - .../verticalChannelLTS/system/blockMeshDict | 1 - .../verticalChannelLTS/system/controlDict | 1 - .../verticalChannelLTS/system/fvSchemes | 1 - .../verticalChannelLTS/system/fvSolution | 9 +--- .../verticalChannel/0.orig/H2O | 6 ++- .../verticalChannel/0.orig/T | 6 ++- .../verticalChannel/0.orig/U | 6 ++- .../verticalChannel/0.orig/air | 6 ++- .../verticalChannel/0.orig/alphat | 6 ++- .../verticalChannel/0.orig/k | 6 ++- .../verticalChannel/0.orig/nut | 6 ++- .../verticalChannel/0.orig/omega | 6 ++- .../verticalChannel/0.orig/p | 6 ++- .../constant/chemistryProperties | 1 - .../constant/combustionProperties | 1 - .../verticalChannel/constant/g | 1 - .../constant/particleTrackDict | 1 - .../constant/radiationProperties | 2 +- .../constant/reactingCloud1Properties | 1 - .../constant/thermo.incompressiblePoly | 1 - .../constant/thermophysicalProperties | 1 - .../constant/turbulenceProperties | 2 +- .../verticalChannel/system/blockMeshDict | 1 - .../verticalChannel/system/controlDict | 1 - .../verticalChannel/system/decomposeParDict | 8 ---- .../verticalChannel/system/fvSchemes | 1 - .../verticalChannel/system/fvSolution | 6 --- .../lagrangian/sprayFoam/aachenBomb/0/N2 | 1 + .../lagrangian/sprayFoam/aachenBomb/0/O2 | 1 + tutorials/lagrangian/sprayFoam/aachenBomb/0/U | 1 + .../sprayFoam/aachenBomb/0/Ydefault | 1 + .../lagrangian/sprayFoam/aachenBomb/0/alphat | 3 +- .../lagrangian/sprayFoam/aachenBomb/0/epsilon | 3 +- tutorials/lagrangian/sprayFoam/aachenBomb/0/k | 3 +- .../lagrangian/sprayFoam/aachenBomb/0/nut | 3 +- tutorials/lagrangian/sprayFoam/aachenBomb/0/p | 3 +- .../aachenBomb/constant/chemistryProperties | 1 - .../aachenBomb/constant/combustionProperties | 1 - .../sprayFoam/aachenBomb/constant/g | 3 +- .../aachenBomb/constant/radiationProperties | 1 - .../aachenBomb/constant/sprayCloudProperties | 3 +- .../constant/thermophysicalProperties | 1 - .../aachenBomb/constant/turbulenceProperties | 3 +- .../sprayFoam/aachenBomb/system/controlDict | 1 - .../sprayFoam/aachenBomb/system/fvSchemes | 1 - .../sprayFoam/aachenBomb/system/fvSolution | 2 +- .../constant/kinematicCloudProperties | 6 +-- 436 files changed, 593 insertions(+), 903 deletions(-) delete mode 100644 tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict delete mode 100644 tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T rename tutorials/lagrangian/MPPICFoam/cyclone/{0 => 0.orig}/U.air (96%) rename tutorials/lagrangian/MPPICFoam/cyclone/{0 => 0.orig}/k.air (93%) rename tutorials/lagrangian/MPPICFoam/cyclone/{0 => 0.orig}/nut.air (93%) rename tutorials/lagrangian/MPPICFoam/cyclone/{0 => 0.orig}/p (100%) delete mode 100644 tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README rename tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/{0 => 0.orig}/U (99%) create mode 100755 tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean delete mode 100644 tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/G (100%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/H2O (100%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/T (100%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/U (100%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/air (100%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/p (100%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/{0 => 0.orig}/p_rgh (100%) create mode 100755 tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean create mode 100755 tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun delete mode 100644 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict delete mode 100644 tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air index e1b59064be..4a51544403 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format binary; class volVectorField; - location "0"; object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p index 6c2675d32b..2ac162c2cc 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/0/p @@ -47,4 +47,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties index 312f6b3385..2994899c94 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -100,25 +99,7 @@ subModels { patches ( - top - { - type rebound; - e 0.97; - mu 0.09; - } - bottom - { - type rebound; - e 0.97; - mu 0.09; - } - walls - { - type rebound; - e 0.97; - mu 0.09; - } - frontAndBack + "(top|bottom|walls|frontAndBack)" { type rebound; e 0.97; @@ -127,15 +108,6 @@ subModels ); } - StandardWallInteractionCoeffs - { - type rebound; - e 0.97; - mu 0.09; - } - - heatTransferModel none; - surfaceFilmModel none; collisionModel pairCollision; @@ -176,8 +148,6 @@ subModels } stochasticCollisionModel none; - - radiation off; } diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties index 0aa475ea13..6c483888ab 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ rho.air 1.2; transportModel Newtonian; nu 1e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict index 301493ec3d..809ab215a4 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict index d955f4f7ec..d9d2fe776c 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 6 1); } + // ************************************************************************* // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution index f2f3fdc7c5..bc10be5bae 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,9 +59,5 @@ PIMPLE pRefValue 0; } -relaxationFactors -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict deleted file mode 100644 index 0064b83046..0000000000 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict +++ /dev/null @@ -1,29 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object mapFieldsDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -// List of pairs of source/target patches for mapping -patchMap -( -); - -// List of target patches cutting the source domain (these need to be -// handled specially e.g. interpolated from internal values) -cuttingPatches -( -); - -// ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air b/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air index 063fd73c86..ba5c92ff73 100644 --- a/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air +++ b/tutorials/lagrangian/MPPICDyMFoam/column/0/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U; } diff --git a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties index dc05ae2415..8494348756 100644 --- a/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties @@ -90,19 +90,7 @@ subModels { patches ( - sides - { - type rebound; - e 1; - mu 0.09; - } - top - { - type rebound; - e 1; - mu 0.09; - } - bottom + "(sides|top|bottom)" { type rebound; e 1; @@ -111,8 +99,6 @@ subModels ); } - heatTransferModel none; - surfaceFilmModel none; packingModel implicit; @@ -175,11 +161,8 @@ subModels } stochasticCollisionModel none; - - radiation off; } - cloudFunctions {} diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T deleted file mode 100644 index 01917695dc..0000000000 --- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 350; - -boundaryField -{ - AMI1a - { - type cyclicAMI; - value $internalField; - } - - AMI1b - { - type cyclicAMI; - value $internalField; - } - - ".*" - { - type zeroGradient; - value $internalField; - } - - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties index 18c6ad5b51..0ab51355c9 100644 --- a/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object particleProperties; + object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,14 +76,14 @@ subModels parcelsPerSecond 20000; sizeDistribution - { - type uniform; + { + type uniform; uniformDistribution { minValue 5e-03; maxValue 5e-03; } - } + } flowRateProfile constant 1; massTotal 2000000; @@ -94,14 +94,8 @@ subModels dispersionModel none; - patchInteractionModel none; - - heatTransferModel none; - surfaceFilmModel none; - collisionModel none; - patchInteractionModel standardWallInteraction; standardWallInteractionCoeffs @@ -158,11 +152,8 @@ subModels e 0.8; } } - - radiation off; } - cloudFunctions {} diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air index e1b59064be..9226f1e7b6 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; - location "0"; object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p index e6529ef584..406763a269 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g index ebc62289ef..290ced5eee 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties index 0256c6a610..46acb5ed19 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -94,25 +93,7 @@ subModels { patches ( - top - { - type rebound; - e 0.97; - mu 0.09; - } - bottom - { - type rebound; - e 0.97; - mu 0.09; - } - walls - { - type rebound; - e 0.97; - mu 0.09; - } - frontAndBack + "(top|bottom|walls|frontAndBack)" { type rebound; e 0.97; @@ -121,8 +102,6 @@ subModels ); } - heatTransferModel none; - surfaceFilmModel none; packingModel explicit; @@ -185,11 +164,8 @@ subModels } stochasticCollisionModel none; - - radiation off; } - cloudFunctions {} diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties index 7d906834f4..5a193362ab 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ rho.air 1.2; transportModel Newtonian; nu 1.568e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict index eee423a510..b5abe538d0 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict index 9e7eafb19a..b501465471 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 5 1); } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes index e256f146ce..e3fda5a02a 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes @@ -16,7 +16,7 @@ FoamFile ddtSchemes { - default Euler; + default Euler; } gradSchemes diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution index c89b4f2aa8..d2750639d6 100644 --- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -68,9 +67,5 @@ PIMPLE pRefValue 0; } -relaxationFactors -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/column/0/U.air b/tutorials/lagrangian/MPPICFoam/column/0/U.air index 7fc4d5545c..ba5c92ff73 100644 --- a/tutorials/lagrangian/MPPICFoam/column/0/U.air +++ b/tutorials/lagrangian/MPPICFoam/column/0/U.air @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -37,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/column/0/p b/tutorials/lagrangian/MPPICFoam/column/0/p index 743d647292..d10f31f194 100644 --- a/tutorials/lagrangian/MPPICFoam/column/0/p +++ b/tutorials/lagrangian/MPPICFoam/column/0/p @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/g b/tutorials/lagrangian/MPPICFoam/column/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/lagrangian/MPPICFoam/column/constant/g +++ b/tutorials/lagrangian/MPPICFoam/column/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties index bbe0289979..16acfb70f4 100644 --- a/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,7 +58,6 @@ subModels { alphac alpha.air; } - //gravity; } injectionModels @@ -92,19 +90,7 @@ subModels { patches ( - sides - { - type rebound; - e 1; - mu 0; - } - top - { - type rebound; - e 1; - mu 0; - } - bottom + "(sides|top|bottom)" { type rebound; e 1; @@ -113,8 +99,6 @@ subModels ); } - heatTransferModel none; - surfaceFilmModel none; packingModel implicit; @@ -177,11 +161,8 @@ subModels } stochasticCollisionModel none; - - radiation off; } - cloudFunctions {} diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties index 0aa475ea13..6c483888ab 100644 --- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties +++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ rho.air 1.2; transportModel Newtonian; nu 1e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air +++ b/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/column/system/controlDict b/tutorials/lagrangian/MPPICFoam/column/system/controlDict index c892342030..b8024c1c6f 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/column/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes index 56cfbbd624..11e09f246b 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSchemes @@ -16,12 +16,12 @@ FoamFile ddtSchemes { - default Euler; + default Euler; } d2dt2Schemes { - default Euler; + default Euler; } gradSchemes diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution index 604eaa94c2..598de5b53a 100644 --- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,9 +65,5 @@ PIMPLE pRefValue 0; } -relaxationFactors -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air similarity index 96% rename from tutorials/lagrangian/MPPICFoam/cyclone/0/U.air rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air index 0391b3bd3c..420651a6b6 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/0/U.air +++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; - location "0"; object U.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air similarity index 93% rename from tutorials/lagrangian/MPPICFoam/cyclone/0/k.air rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air index 210811899e..a2a0f66192 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/0/k.air +++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air @@ -41,4 +41,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air similarity index 93% rename from tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air index 2818479ab6..3cf45e1588 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/0/nut.air +++ b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/0/p b/tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p similarity index 100% rename from tutorials/lagrangian/MPPICFoam/cyclone/0/p rename to tutorials/lagrangian/MPPICFoam/cyclone/0.orig/p diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean index 0834bb8d4a..4afce75b5c 100755 --- a/tutorials/lagrangian/MPPICFoam/cyclone/Allclean +++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allclean @@ -3,8 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase +cleanCase0 -# rm -f constant/triSurface/cyclone.stl* +rm -rf constant/triSurface #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun index a3fbae9767..29acb54d73 100755 --- a/tutorials/lagrangian/MPPICFoam/cyclone/Allrun +++ b/tutorials/lagrangian/MPPICFoam/cyclone/Allrun @@ -3,7 +3,11 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -cp $FOAM_TUTORIALS/resources/geometry/cyclone.stl.gz constant/triSurface +[ -d constant/triSurface ] || mkdir -p constant/triSurface + +cp -f "$FOAM_TUTORIALS"/resources/geometry/cyclone.stl.gz constant/triSurface + +restore0Dir runApplication blockMesh @@ -11,6 +15,6 @@ runApplication snappyHexMesh -overwrite runApplication decomposePar -runParallel MPPICFoam +runParallel $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g index ebc62289ef..290ced5eee 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/g +++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties index ac646a7728..88466d112f 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -99,13 +98,7 @@ subModels { patches ( - walls - { - type rebound; - e 0.97; - mu 0.09; - } - inlet + "(walls|inlet)" { type rebound; e 0.97; @@ -118,8 +111,6 @@ subModels ); } - heatTransferModel none; - surfaceFilmModel none; packingModel implicit; @@ -172,11 +163,8 @@ subModels } stochasticCollisionModel none; - - radiation off; } - cloudFunctions {} diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties index 7d906834f4..5a193362ab 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties +++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ rho.air 1.2; transportModel Newtonian; nu 1.568e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README b/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README deleted file mode 100644 index de3f29cc01..0000000000 --- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README +++ /dev/null @@ -1,4 +0,0 @@ -Directory to house tri-surfaces - -The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry -directory diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air index 4a32819e8c..a5552b105d 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air +++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict index 2d35f315ce..c1862b46c1 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict index d5c24ac34d..249050a70b 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 3); } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution index 4d975cd678..2ae5a4af50 100644 --- a/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -68,9 +67,5 @@ PIMPLE pRefValue 0; } -relaxationFactors -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air index de1304042d..5324e151a1 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p index 51b3fe9dcd..6fd7865b7f 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/0/p @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties index bba5d7b224..ca96c07d26 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -135,29 +134,19 @@ subModels { patches ( - frontAndBack + "(frontAndBack|walls)" { type rebound; e 1; mu 0; } - - walls - { - type rebound; - e 1; - mu 0; - } - - "lowerInlet|upperInlet|outlet" + "(lowerInlet|upperInlet|outlet)" { type escape; } ); } - heatTransferModel none; - surfaceFilmModel none; packingModel none; @@ -187,11 +176,8 @@ subModels } stochasticCollisionModel none; - - radiation off; } - cloudFunctions {} diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties index 0aa475ea13..6c483888ab 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ rho.air 1.2; transportModel Newtonian; nu 1e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict index fc31000533..2640933aaf 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes index 27e11ffcee..79273c6abf 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes @@ -16,7 +16,7 @@ FoamFile ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -47,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution index f665c50d4d..23b40cd4f4 100644 --- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution +++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,9 +58,5 @@ PIMPLE pRefValue 0; } -relaxationFactors -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4 index 3c831e6d43..64b060ab33 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4 +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object CH4; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO index 61cb17a85e..f28a102b9f 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object CO; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2 index 2c28b61c01..862c54d6fa 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2 +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object CO2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G index a4a9fa3b59..378189c7b7 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object G; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,20 +25,24 @@ boundaryField type MarshakRadiation; value uniform 0; } + bottom { type MarshakRadiation; value uniform 0; } + walls { type MarshakRadiation; value uniform 0; } + symmetry { type symmetryPlane; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2 index 35835c94c0..41a5d06509 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2 +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O index 0d34dd15d8..5e1769d271 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2 index 004d167f66..a05d5ce4e3 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2 +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2 b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2 index 0e135b14ce..a021df1476 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2 +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T index cd03344d9b..022f0afa59 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U index 0ed9e0a649..7831ef7872 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,18 +24,22 @@ boundaryField { type noSlip; } + bottom { type noSlip; } + walls { type noSlip; } + symmetry { type symmetryPlane; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat index a425039f46..f03279aa2b 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,20 +25,24 @@ boundaryField type compressible::alphatWallFunction; value uniform 0; } + bottom { type compressible::alphatWallFunction; value uniform 0; } + walls { type compressible::alphatWallFunction; value uniform 0; } + symmetry { type symmetryPlane; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon index 9f9ed58ab6..e118544684 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,20 +25,24 @@ boundaryField type epsilonWallFunction; value uniform 5390.5; } + bottom { type epsilonWallFunction; value uniform 5390.5; } + walls { type epsilonWallFunction; value uniform 5390.5; } + symmetry { type symmetryPlane; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k index 0ec4bb84e5..bd5d862d01 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,20 +25,24 @@ boundaryField type kqRWallFunction; value uniform 37.5; } + bottom { type kqRWallFunction; value uniform 37.5; } + walls { type kqRWallFunction; value uniform 37.5; } + symmetry { type symmetryPlane; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut index 28b0736d27..36bc27b7a9 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,20 +25,24 @@ boundaryField type nutkWallFunction; value uniform 0; } + bottom { type nutkWallFunction; value uniform 0; } + walls { type nutkWallFunction; value uniform 0; } + symmetry { type symmetryPlane; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p index b483079256..09e3fd9006 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties index dcb1203962..f3bd907355 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object boundaryRadiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ FoamFile absorptivity 0.0; } + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties index e2f997b952..1af905d0cb 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions index fafb4d8705..bd1feae58d 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions @@ -10,12 +10,11 @@ FoamFile { version 2.0; format ascii; - location ""; class vectorField; object coalCloud1Positions; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + ( (0.005 0.5 0.05) (0.010 0.5 0.05) @@ -45,4 +44,6 @@ FoamFile (0.040 0.7 0.05) (0.045 0.7 0.05) ) + + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index ab22120602..f6d7fd9ac4 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object coalCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties index 10c6f687c0..fe796b3274 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat index 7e267d828e..e2a6d2e8dc 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions index 7f357c85d2..851c9d941a 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 80daf67d76..1236cbb3b1 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object limestoneCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions index d78d9b7fa6..38b81cb742 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions @@ -9,11 +9,11 @@ FoamFile { version 2.0; format ascii; - location ""; class vectorField; object limestonePositions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + ( (0.0075 0.55 0.05) (0.0125 0.55 0.05) @@ -34,4 +34,6 @@ FoamFile (0.0425 0.45 0.05) (0.0475 0.45 0.05) ) + + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties index 92a34d4114..f846dda766 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,4 +64,5 @@ cloudScatterCoeffs transmissivityModel none; + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties index 02c68d6045..085fb16a9b 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties index ec2628ff4a..8f39290a8c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict index d1463af21e..5e95e4963c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,8 +54,8 @@ functions { #include "dataCloud" #include "vtkCloud" - #include "runTimePostProcessing" } + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud index ebbfa731e0..0df6f6f0e8 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud @@ -11,4 +11,5 @@ dataCloud field d; } + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict index 898734ac67..b672d302d5 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict @@ -18,13 +18,5 @@ numberOfSubdomains 4; method scotch; -coeffs -{ - n (2 2 1); -} - -distributed no; - -roots ( ); // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes index b8a8419285..e3c9d678f9 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32,7 +31,7 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,K) Gauss linear; - div(phi,h) Gauss upwind; + div(phi,h) Gauss upwind; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(U) Gauss linear; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution index 25028ffbd7..49c39041de 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -83,7 +82,6 @@ PIMPLE momentumPredictor yes; } - relaxationFactors { fields diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing index c84ecc3f22..ca93482176 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing @@ -115,4 +115,5 @@ postPro1 } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict index 8bc24a11f9..0f670467f3 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U similarity index 99% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U rename to tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U index 93a426d89a..845c459bc1 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun index 8e142f906c..922b280b7c 100755 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun @@ -3,6 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict index 9f3d65ebab..faf53e3ce6 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g index a645997597..28b07d0b87 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g @@ -10,13 +10,11 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 1 -2 0 0 0 0]; - value (0 -9.81 0); diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties index 091e6e80ab..6c5bab9c1b 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -100,8 +99,6 @@ subModels mu 0.09; } - heatTransferModel none; - surfaceFilmModel none; collisionModel pairCollision; @@ -142,8 +139,6 @@ subModels } stochasticCollisionModel none; - - radiation off; } diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties index b8d4c2fdb7..3a6341dcf6 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // transportModel Newtonian; -nu [0 2 -1 0 0 0 0] 1e-05; +nu 1e-05; -rhoInf [1 -3 0 0 0 0 0] 1.2; +rhoInf 1.2; // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict index 65d797fc7e..24b23b9548 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution index 828f9064ba..1b883c3eda 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U index 1cd979e031..0777dca67a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,14 +24,17 @@ boundaryField { type noSlip; } + frontAndBack { type noSlip; } + inlet { type zeroGradient; } + outlet { type zeroGradient; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu index 8352ccf4bf..04b9209d2b 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object mu; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,16 +25,19 @@ boundaryField type calculated; value uniform 1.2e-05; } + frontAndBack { type calculated; value uniform 1.2e-05; } + inlet { type calculated; value uniform 1.2e-05; } + outlet { type calculated; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho index 20ac6a5d96..2ebfc7deea 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object rho; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,16 +25,19 @@ boundaryField type calculated; value uniform 1.2; } + frontAndBack { type calculated; value uniform 1.2; } + inlet { type calculated; value uniform 1.2; } + outlet { type calculated; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties index aa38b4f483..bc90d5e866 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties index 83c9470df8..e0a2a9585a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,4 +20,5 @@ transportModel Newtonian; nu 1e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict index 7ca8720840..ce702251fa 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict @@ -36,7 +36,6 @@ vertices (0 500 0) ); - blocks ( hex (8 13 14 15 0 5 6 7) (24 50 1) simpleGrading (1 1 1) @@ -94,7 +93,6 @@ boundary (3 2 10 11) ); } - ); diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict index 65e1838ca5..a5da92d85c 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict index 071e85c9f1..c4ba64fdf2 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict @@ -24,9 +24,4 @@ coeffs } -distributed no; - -roots ( ); - - // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes index f447db5802..d9124696f2 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,4 +39,5 @@ interpolationSchemes default linear; } + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution index 878c84cc9f..8522ada14a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution @@ -10,13 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -solvers -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict index 0064b83046..1eb64d6bd5 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object mapFieldsDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // List of pairs of source/target patches for mapping @@ -26,4 +25,5 @@ cuttingPatches ( ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U index de61e007f6..82a28a446c 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U @@ -25,14 +25,17 @@ boundaryField type zeroGradient; value uniform (0 0 0); } + walls { type noSlip; } + frontAndBack { type noSlip; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions index 39ecfaa5a2..e03cfe2384 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions @@ -14,7 +14,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - ( (0.01 0.299 0.0032) (0.01 0.305 0.0032) diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties index a789eb9bc6..7fc40c7d3d 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -130,7 +129,6 @@ subModels } } - cloudFunctions {} diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties index 83c9470df8..e0a2a9585a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,4 +20,5 @@ transportModel Newtonian; nu 1e-05; + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict index 4aef9e86de..d6f8dfaef1 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict @@ -32,7 +32,6 @@ vertices (0 500 0) ); - blocks ( hex (6 9 10 11 0 3 4 5 ) (20 40 1) simpleGrading (1 1 1) diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict index 3e6261a424..92120897d8 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict index 453dfa71dd..c4ba64fdf2 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict @@ -23,9 +23,5 @@ coeffs n (4 1 1); } -distributed no; - -roots ( ); - // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes index f447db5802..d9124696f2 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,4 +39,5 @@ interpolationSchemes default linear; } + // ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution index 878c84cc9f..8522ada14a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution @@ -10,13 +10,8 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -solvers -{ -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2 b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2 index c7fa20fff1..3499c75b5c 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2 +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,12 +24,14 @@ boundaryField { type zeroGradient; } + outlet { type inletOutlet; value uniform 0.8; inletValue uniform 0.8; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2 b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2 index c4576bdc34..c9e0ca6bf4 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2 +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,12 +24,14 @@ boundaryField { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 0.2; value uniform 0.2; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T index 6218aeb73e..8f7eba01c6 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,11 +24,13 @@ boundaryField { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 900.0; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U index bf31d0843d..961060bf23 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/U @@ -10,14 +10,12 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 1 -1 0 0 0 0]; - internalField uniform (2.0 0 0); boundaryField @@ -27,11 +25,13 @@ boundaryField type fixedValue; value uniform (2.0 0 0); } + outlet { type pressureInletOutletVelocity; value $internalField; } + walls { type fixedValue; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat index 385150dcfe..c8af26c02d 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,11 +25,13 @@ boundaryField type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type compressible::alphatWallFunction; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k index 8e63a0e057..09911ae162 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,11 +26,13 @@ boundaryField intensity 0.16; value uniform 3.75e-9; } + outlet { type inletOutlet; inletValue uniform 3.75e-9; } + walls { type kqRWallFunction; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut index 453885241e..298eb0e201 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,17 +20,18 @@ internalField uniform 0; boundaryField { - inlet { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type nutkWallFunction; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega index ee542305cc..8ae534241d 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/omega @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object omega; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,7 +20,6 @@ internalField uniform 4.5e-3; boundaryField { - inlet { type turbulentMixingLengthFrequencyInlet; @@ -29,11 +27,13 @@ boundaryField k k; value uniform 4.5e-3; } + outlet { type inletOutlet; inletValue uniform 4.5e-3; } + walls { type omegaWallFunction; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p index a73adab296..74c201f3e4 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,17 +20,18 @@ internalField uniform 1e5; boundaryField { - inlet { type calculated; value $internalField; } + outlet { type calculated; value $internalField; } + walls { type calculated; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh index 17a2f17439..0342617496 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/0/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,11 +24,13 @@ boundaryField { type fixedFluxPressure; } + outlet { type totalPressure; p0 $internalField; } + walls { type fixedFluxPressure; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties index 5b8fe1d3c1..3dd86a9117 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties index bcafaf4d7e..1d66061fb5 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat index 51764b9de3..c83b00c2b6 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict index f44256b73e..643f64dbdf 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/particleTrackDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties index 276d33e98d..6766c9f953 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ radiation off; radiationModel none; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties index 337e7b8784..58d866177b 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,7 +23,6 @@ solution maxCo 0.3; cellValueSourceCorrection off; - sourceTerms { resetOnStartup false; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties index decaeb4f7c..4cf3e9f5ca 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,5 +68,4 @@ solids } - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties index f26a920baa..d2f17dbdb0 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/constant/turbulenceProperties @@ -18,7 +18,7 @@ simulationType RAS; RAS { - RASModel kOmegaSST; // kEpsilon; + RASModel kOmegaSST; turbulence on; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict index bae8e49391..49c9c529fb 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/blockMeshDict @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36"; class dictionary; object blockMeshDict; } diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict index 142fadfbed..1245227d2a 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/controlDict @@ -10,10 +10,10 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + DebugSwitches { MUCSheterogeneousRate 0; @@ -55,8 +55,5 @@ maxCo 1; maxDeltaT 0.03; -functions -{} - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict index 898734ac67..b672d302d5 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/decomposeParDict @@ -18,13 +18,5 @@ numberOfSubdomains 4; method scotch; -coeffs -{ - n (2 2 1); -} - -distributed no; - -roots ( ); // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes index 2e39b11ce5..1b6a7af6f1 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,9 +30,9 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss upwind; div(phi,K) Gauss linear; - div(phi,h) Gauss upwind; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; + div(phi,h) Gauss upwind; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; div(phi,omega) Gauss upwind; div(phi,Yi_h) Gauss upwind; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; diff --git a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution index fb56e71967..521f14f123 100644 --- a/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution +++ b/tutorials/lagrangian/reactingHeterogenousParcelFoam/rectangularDuct/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 index 820ed6508c..f190516f31 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CH4 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object CH4; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,18 +25,20 @@ boundaryField type fixedValue; value uniform 1.0; } + air { type fixedValue; value uniform 0.0; } + outlet { type inletOutlet; inletValue uniform 0.0; value uniform 0.0; - } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 index cee79f28e8..98ad62ac95 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/CO2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object CO2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,18 +25,20 @@ boundaryField type fixedValue; value uniform 0; } + air { type fixedValue; value uniform 0; } + outlet { type inletOutlet; inletValue uniform 0; value uniform 0; - } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O index b3b363c2e6..a64c45cd0c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,18 +25,20 @@ boundaryField type fixedValue; value uniform 0; } + air { type fixedValue; value uniform 0; } + outlet { type inletOutlet; inletValue uniform 0; value uniform 0; - } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 index 4d521a75d6..1b709fad89 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,18 +25,20 @@ boundaryField type fixedValue; value uniform 0.0; } + air { type fixedValue; value uniform 0.77; } + outlet { type inletOutlet; inletValue uniform 1; value uniform 1; - } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 index aa29caac05..fa80bef28e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,17 +25,20 @@ boundaryField type fixedValue; value uniform 0.0; } + air { type fixedValue; value uniform 0.23; } + outlet { type inletOutlet; inletValue uniform 0; value uniform 0; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T index d751cc3132..6da9b61da4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,17 +25,20 @@ boundaryField type fixedValue; value uniform 800; } + air { type fixedValue; value uniform 800; } + outlet { type inletOutlet; inletValue uniform 293; value uniform 293; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U index f60e16161c..990bd48f9a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,16 +25,19 @@ boundaryField type fixedValue; value uniform (0.1 0 0); } + air { type fixedValue; value uniform (-0.1 0 0); } + outlet { type pressureInletOutletVelocity; value $internalField; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut index 675838c548..790e6073f1 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,15 +25,18 @@ boundaryField type fixedValue; value uniform 0; } + air { type fixedValue; value uniform 0; } + outlet { type zeroGradient; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p index e43dbf61cc..f561a39192 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh index 35ab93a650..840e683a62 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho index 3437603d72..88ebc991f0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/rho @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object rho; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,16 +25,19 @@ boundaryField type calculated; value uniform 0.243121; } + air { type calculated; value uniform 0.438564; } + outlet { type calculated; value uniform 1.18001; } + frontAndBack { type empty; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties index 3881c4097a..a040f2813a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -37,4 +36,5 @@ odeCoeffs relTol 0.01; } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties index 0d3fe3800e..5e1aa59a70 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,8 +19,7 @@ combustionModel laminar; active true; laminarCoeffs -{ -} +{} // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties index 276d33e98d..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ radiation off; radiationModel none; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties index aa66b30466..a7789561ca 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,7 +19,6 @@ solution active no; } - constantProperties { volumeUpdateMethod constantRho; diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas index 1f61c24d2a..a944f73f46 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermo.compressibleGas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties index 61f4bbf201..5bf51466ae 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict index 378a50b9d6..8239be96d7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,4 +46,5 @@ runTimeModifiable yes; adjustTimeStep yes; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes index 654277234a..0bd89fc77d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution index 2627079b6e..0b42792bf5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O index c15aaaf2dd..19401cd8b7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O @@ -10,12 +10,10 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 0 0 0 0 0 0]; internalField uniform 0.0; @@ -26,6 +24,7 @@ boundaryField { type zeroGradient; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 index 6a1ea9d15c..164984f655 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 @@ -10,12 +10,10 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 0 0 0 0 0 0]; internalField uniform 0.79; @@ -26,6 +24,7 @@ boundaryField { type zeroGradient; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 index ce9c005faa..6be3ccde5c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 @@ -10,10 +10,8 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 0 0 0 0 0 0]; @@ -26,6 +24,7 @@ boundaryField { type zeroGradient; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T index 25668e0998..b736b858f5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - location "0"; class volScalarField; object T; } @@ -26,6 +25,7 @@ boundaryField type fixedValue; value uniform 300; } + region0_to_wallFilmRegion_wallFilmFaces { type fixedValue; @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U index a606d370f3..0dec6dc0b3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,6 +24,7 @@ boundaryField { type noSlip; } + region0_to_wallFilmRegion_wallFilmFaces { type noSlip; diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p index db41e33d38..334bf875b8 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type calculated; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type calculated; @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh index 5792f203af..16219eced3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,10 +24,12 @@ boundaryField { type fixedFluxPressure; } + region0_to_wallFilmRegion_wallFilmFaces { type fixedFluxPressure; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf index 680e2d64e8..24de27a941 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0/wallFilmRegion"; object Tf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf index 7b15c6a28c..e4907e887b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0/wallFilmRegion"; object Uf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf index 447992632d..3811814a40 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0/wallFilmRegion"; object deltaf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties index 8c2208c3d2..a3637b7fb3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat index af2a3dc389..813528ef6f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties index fe92111002..241d64fa4c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/parcelInjectionProperties @@ -10,10 +10,10 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object parcelInjectionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // (x y z) (u v w) d rho mDot T Cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN) ( (0 1.95 -0.2) (0 -5 0) 0.001 1000 0.002 300 4200 (0 1 0) () (1) () diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties index 389b0ae41d..3603382a80 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties index 5a1951289a..daafd837b2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/surfaceFilmProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object surfaceFilmProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -72,3 +71,6 @@ thermoSingleLayerCoeffs } } } + + +// ************************************************************************* // \ No newline at end of file diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties index ced82076f0..f62cdef153 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict index fc500cb19a..53f75dd841 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict index dd8f37ec74..30e9e81815 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/createPatchDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object createPatchDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // This application/dictionary controls: @@ -51,4 +50,5 @@ patchInfo // none ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict deleted file mode 100644 index 214dfccd02..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/decomposeParDict +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object decomposeParDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 4; - -method metis; - -coeffs -{ - n (2 2 1); -} - -metisCoeffs -{ - processorWeights ( 1 1 1 1 ); -} - -distributed no; - -roots ( ); - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict index 51f22f7aeb..81a76667ba 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/extrudeToRegionMeshDict @@ -35,4 +35,5 @@ linearNormalCoeffs thickness 0.01; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes index fbbf2274c4..7b01f02893 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,5 +54,4 @@ snGradSchemes } - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution index 33550bcc90..fc2a5a3492 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -75,6 +74,7 @@ solvers tolerance 1e-6; relTol 0; } + hFinal { solver PBiCGStab; @@ -84,7 +84,6 @@ solvers } } - PIMPLE { nCorrectors 2; @@ -94,7 +93,6 @@ PIMPLE pRefValue 1e5; } - relaxationFactors { equations diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict index 46ade98cbf..f2f4132d65 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions @@ -33,4 +32,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes index 6002e35b8b..3c677d3c95 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,17 +19,6 @@ ddtSchemes default Euler; } -divSchemes -{ - default none; - div(phi,Uf) Gauss upwind; - div(phid,deltaf) Gauss upwind; - div(phi,hf) Gauss upwind; - - div(nHat) Gauss linear; - div(grad(nHat)) Gauss linear; -} - gradSchemes { default none; @@ -44,6 +32,17 @@ gradSchemes grad(nHat) Gauss linear; } +divSchemes +{ + default none; + div(phi,Uf) Gauss upwind; + div(phid,deltaf) Gauss upwind; + div(phi,hf) Gauss upwind; + + div(nHat) Gauss linear; + div(grad(nHat)) Gauss linear; +} + laplacianSchemes { default none; diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution index 22282a78d8..35a8d0c5f9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/system/wallFilmRegion/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,4 +48,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G index 4015619794..b745217d1b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object G; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,6 +30,7 @@ boundaryField refGradient uniform 0; valueFraction uniform 0; } + inlet { type MarshakRadiation; @@ -41,26 +41,32 @@ boundaryField refGradient uniform 0; valueFraction uniform 0; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O index d026d92351..7ab0d1c9de 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,31 +24,38 @@ boundaryField { type zeroGradient; } + inlet { type fixedValue; value uniform 0; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2 index 52d69a0b78..8978d3bcb7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,31 +24,38 @@ boundaryField { type zeroGradient; } + inlet { type fixedValue; value uniform 0.79; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2 index 23f6b0b5ca..c52fe941ec 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object O2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,31 +24,38 @@ boundaryField { type zeroGradient; } + inlet { type fixedValue; value uniform 0.21; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T index aaf3b13c11..53a4740a52 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,31 +25,38 @@ boundaryField type fixedValue; value uniform 400; } + inlet { type fixedValue; value uniform 350; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U index 020e37b00d..258713d4c2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "1"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,31 +24,38 @@ boundaryField { type noSlip; } + inlet { type fixedValue; value uniform (5 0 0); } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat index 8d26a5cea9..fcdb8dc974 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,32 +25,39 @@ boundaryField type compressible::alphatWallFunction; value uniform 0; } + inlet { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon index b8fbf04cb7..075bf88aa9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/epsilon @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,31 +25,38 @@ boundaryField type epsilonWallFunction; value uniform 0.0449; } + inlet { type fixedValue; value uniform 0.0449; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k index ca91db95a6..389b78b24f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,31 +25,38 @@ boundaryField type kqRWallFunction; value uniform 0.0938; } + inlet { type fixedValue; value uniform 0.0938; } + outlet { type zeroGradient; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut index 9301830ad5..47260f8c7c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut +++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "1"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,32 +25,39 @@ boundaryField type nutkWallFunction; value uniform 0; } + inlet { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + cycLeft_half0 { type cyclic; } + cycRight_half0 { type cyclic; } + frontAndBack { type empty; } + cycLeft_half1 { type cyclic; } + cycRight_half1 { type cyclic; diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties index e37699006f..d8094c48f6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions index 765ac1e130..e45aa3000e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties index dcdd14bc0d..f16f450adc 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/parcelInjectionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object parcelInjectionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties index bfbb3477ca..c2ccef00dd 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties index 93ae4ac030..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,5 +19,4 @@ radiation off; radiationModel none; - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties index ab2d59d271..f6c7a705fb 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -116,7 +115,7 @@ subModels type rebound; } - "inlet|outlet" + "(inlet|outlet)" { type escape; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly index 3063e384eb..543e3a6d4d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermo.incompressiblePoly @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermo.incompressiblePoly; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties index dbfc2d653b..e8a958135e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict index 68ebb9075f..735b83ad32 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -58,4 +57,5 @@ functions #include "vtkWrite" } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict index 2017b2e980..999f0ee436 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/decomposeParDict @@ -33,4 +33,5 @@ constraints } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes index 3dec620ee7..f9a9bcbae9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution index adf5bfdf0a..a66917eeae 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict index 5744221601..2afdded295 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O index 0c9580f4f9..7cd80c53e3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,6 +24,7 @@ boundaryField { type zeroGradient; } + wallFilm { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 index f09848bbd1..ab867143e1 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,6 +24,7 @@ boundaryField { type zeroGradient; } + wallFilm { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 index d36395a9aa..91ee7eadfa 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,6 +24,7 @@ boundaryField { type zeroGradient; } + wallFilm { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T index c5ce3f2f4a..d0c2c85237 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,11 +25,12 @@ boundaryField type fixedValue; value uniform 300; } + wallFilm { type zeroGradient; // type mapped; -// field Tsf; +// field Tsf; // average 300; // setAverage no; // value uniform 300; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U index f70eb05547..aea07023b7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,12 +25,13 @@ boundaryField type uniformFixedValue; uniformValue (0 0 0); } + wallFilm { type uniformFixedValue; uniformValue (0 0 0); // type mapped; -// field Usf; +// field Usf; // average (0 0 0); // setAverage no; // value uniform (0 0 0); diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat index 28069c9357..7e5743b614 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,6 +26,7 @@ boundaryField Prt 0.85; value uniform 0; } + wallFilm { type alphatFilmWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon index 7b48f99c59..c1213df6b4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/epsilon @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type epsilonWallFunction; value uniform 1e-7; } + wallFilm { type epsilonWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv index 275793de1a..d84e8db547 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/htcConv @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object htcConv; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type calculated; value uniform 0; } + wallFilm { type convectiveHeatTransfer; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k index 2963753282..fc9874e88d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type kqRWallFunction; value uniform 1e-5; } + wallFilm { type kqRWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut index 6ad5d9096d..7886399cbc 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type nutkWallFunction; value uniform 0; } + wallFilm { type nutkFilmWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p index dae18e13b9..1d784ffcc7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type calculated; value $internalField; } + wallFilm { type calculated; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh index ac38238e87..864f7687d9 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type fixedFluxPressure; value uniform 100000; } + wallFilm { type fixedFluxPressure; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf index cc5a80cbe8..49fcc740fc 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Tf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0/region0_to_"(region0_to.*)"Region_masterRegion"; object Tf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -36,7 +35,6 @@ boundaryField // mapped boundaries "(region0_to.*)" { -// type zeroGradient; type fixedValue; value uniform 350.0; } @@ -48,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf index d5c364ac2e..de91a4a104 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/Uf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0/region0_to_"(region0_to.*)"Region_masterRegion"; object Uf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf index 1b0432bc7d..5571691d0f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/0.orig/wallFilmRegion/deltaf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0/region0_to_"(region0_to.*)"Region_masterRegion"; object deltaf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties index 8c2208c3d2..a3637b7fb3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat index af2a3dc389..813528ef6f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties index 3c5eecbea3..00063ec701 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties index 0e7aa0acbf..8aec51333b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/surfaceFilmProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object surfaceFilmProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,13 +46,6 @@ thermoSingleLayerCoeffs upperSurfaceModels { - /* - heatTransferModel constant; - constantCoeffs - { - c0 1e-8; - } - */ heatTransferModel mappedConvectiveHeatTransfer; } diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties index ced82076f0..f62cdef153 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties index 48bbf910c0..8f2bd3dbc6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict index f0bf29f550..a622f3117b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/changeDictionaryDict @@ -66,4 +66,5 @@ U } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict index 58bf4522f1..478638f612 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +32,7 @@ writeInterval 0.1; purgeWrite 0; -writeFormat ascii; // binary; +writeFormat ascii; writePrecision 10; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict index 2fb67ea894..b2320b11d4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/extrudeToRegionMeshDict @@ -39,4 +39,5 @@ linearNormalCoeffs thickness 0.001; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes index 178a790b95..6b5c373b46 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,5 +54,4 @@ snGradSchemes } - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution index ac6ac8a927..b6fd0e576e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict index d72b40b632..516bcfc9a4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions @@ -57,4 +56,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes index 63af30949b..6a6137e567 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,15 +19,6 @@ ddtSchemes default Euler; } -divSchemes -{ - default none; - div(phi,Uf) Gauss upwind; - div(phid,deltaf) Gauss upwind; - div(phi,hf) Gauss upwind; - div(nHat) Gauss linear; -} - gradSchemes { default none; @@ -41,6 +31,15 @@ gradSchemes grad(alpha) Gauss linear; } +divSchemes +{ + default none; + div(phi,Uf) Gauss upwind; + div(phid,deltaf) Gauss upwind; + div(phi,hf) Gauss upwind; + div(nHat) Gauss linear; +} + laplacianSchemes { default none; @@ -48,7 +47,6 @@ laplacianSchemes laplacian(deltaCoeff,deltaf) Gauss linear uncorrected; } - snGradSchemes { snGrad(p) uncorrected; diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution index 968b3c968d..2c83efc768 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/system/wallFilmRegion.orig/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/G diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/H2O rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/H2O diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/T rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/T diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/U rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/U diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/air rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/air diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/p_rgh rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/0.orig/p_rgh diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun new file mode 100755 index 0000000000..5f30e6c3bb --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/Allrun @@ -0,0 +1,12 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions +#------------------------------------------------------------------------------ + +restore0Dir + +runApplication blockMesh + +runApplication $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O index e6d25813e6..00cc8217ee 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,16 +20,18 @@ internalField uniform 0.01; boundaryField { - walls + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 0.01; value uniform 0.01; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2 index c7fa20fff1..3499c75b5c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,12 +24,14 @@ boundaryField { type zeroGradient; } + outlet { type inletOutlet; value uniform 0.8; inletValue uniform 0.8; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2 index 4121f73b6e..b928e8efb6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,12 +24,14 @@ boundaryField { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 0.19; value uniform 0.19; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T index 5f3a1372e3..942e4bb152 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,11 +24,13 @@ boundaryField { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 300.0; } + inlet { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U index 6139a303a0..a5ab8e32ff 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,11 +25,13 @@ boundaryField type fixedValue; value $internalField; } + outlet { type pressureInletOutletVelocity; value $internalField; } + walls { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat index 385150dcfe..c8af26c02d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,11 +25,13 @@ boundaryField type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type compressible::alphatWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k index 8e63a0e057..09911ae162 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,11 +26,13 @@ boundaryField intensity 0.16; value uniform 3.75e-9; } + outlet { type inletOutlet; inletValue uniform 3.75e-9; } + walls { type kqRWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut index e49db263a4..298eb0e201 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,11 +25,13 @@ boundaryField type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type nutkWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega index 0afa8bed9b..8ae534241d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/omega @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object omega; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,11 +27,13 @@ boundaryField k k; value uniform 4.5e-3; } + outlet { type inletOutlet; inletValue uniform 4.5e-3; } + walls { type omegaWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p index a302b2a65f..a9a8af09fc 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,11 +25,13 @@ boundaryField type calculated; value $internalField; } + outlet { type calculated; value $internalField; } + walls { type calculated; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh index 4607a26823..bf4c95a7d1 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,11 +24,13 @@ boundaryField { type zeroGradient; } + outlet { type totalPressure; p0 $internalField; } + walls { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties index d3bef1ea49..b9ac365d4d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties index bcafaf4d7e..1d66061fb5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat index af2a3dc389..813528ef6f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties index 276d33e98d..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ radiation off; radiationModel none; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties index fbd1b3ba50..a8f2b43e36 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties index d23f1091c7..0dab703826 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties index 1c63baac8d..c990214fbe 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/constant/turbulenceProperties @@ -18,7 +18,7 @@ simulationType laminar; RAS { - RASModel kOmegaSST; // kEpsilon; + RASModel kOmegaSST; turbulence on; diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict index 1cb627ec24..49c9c529fb 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/blockMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict index 4de3f1785c..40fb383dfc 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict index 898734ac67..422358793b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/decomposeParDict @@ -27,4 +27,5 @@ distributed no; roots ( ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes index 2e39b11ce5..164f17a344 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution index 2b0d75b375..8135ad1814 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/rectangularChannel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -92,7 +91,6 @@ potentialFlow nNonOrthogonalCorrectors 5; } - PIMPLE { transonic no; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O index aade58052b..2210ee94cd 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,14 +25,17 @@ boundaryField { type zeroGradient; } + outlet { type zeroGradient; } + sides { type zeroGradient; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 index 09d64fd982..64ee60c75b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,14 +25,17 @@ boundaryField { type zeroGradient; } + outlet { type zeroGradient; } + sides { type zeroGradient; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 index 2f63b17eec..cc35236601 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } @@ -26,14 +25,17 @@ boundaryField { type zeroGradient; } + outlet { type zeroGradient; } + sides { type zeroGradient; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T index e97eb4fe1f..b686ce8d9a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - location "0"; class volScalarField; object T; } @@ -26,16 +25,19 @@ boundaryField type fixedValue; value uniform 300; } + outlet { type fixedValue; value uniform 300; } + sides { type fixedValue; value uniform 300; } + region0_to_wallFilmRegion_wallFilmFaces { type fixedValue; @@ -43,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U index 53a9ef31a3..de6f9a0ea1 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,16 +25,19 @@ boundaryField type pressureInletOutletVelocity; value uniform (0 0 0); } + outlet { type pressureInletOutletVelocity; value uniform (0 0 0); } + sides { type pressureInletOutletVelocity; value uniform (0 0 0); } + region0_to_wallFilmRegion_wallFilmFaces { type noSlip; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p index 810f10de13..b4ed92b45b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,16 +25,19 @@ boundaryField type calculated; value $internalField; } + outlet { type calculated; value $internalField; } + sides { type calculated; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type calculated; @@ -43,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh index 6127d46448..d245241e2c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,18 +24,22 @@ boundaryField { type fixedFluxPressure; } + outlet { type fixedFluxPressure; } + sides { type fixedFluxPressure; } + region0_to_wallFilmRegion_wallFilmFaces { type fixedFluxPressure; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf index 1c425f6874..2c9030d9fa 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0/wallFilmRegion"; object Tf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf index 14793a1bf5..1e46abb618 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0/wallFilmRegion"; object Uf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf index 4b403ab8a1..0cbbf3829c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0/wallFilmRegion"; object deltaf; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties index 8c2208c3d2..a3637b7fb3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat index af2a3dc389..813528ef6f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties index 7819aa3af2..0b4dc44f93 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/parcelInjectionProperties @@ -10,10 +10,10 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object parcelInjectionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN) ( (0.050 0.025 0.09) (0 0 -5) 0.001 1000 0.002 300 4200 (1) diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties index 28ece78e1d..5c3b12a0df 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties index 289cfda2e5..7752d7df68 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/surfaceFilmProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object surfaceFilmProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties index ced82076f0..f62cdef153 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict index 5a97bdcf16..fb9bd5d9c0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -82,6 +81,7 @@ functions name inlet; writeFields no; } + filmPatchFluxOut { type surfaceFieldValue; @@ -95,4 +95,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict index 8e9d8c0aa8..0c8f6b3762 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/createPatchDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object createPatchDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // This application/dictionary controls: @@ -51,4 +50,5 @@ patches // none ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict deleted file mode 100644 index 169c096939..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/decomposeParDict +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object decomposeParDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 4; - -method metis; - -coeffs -{ - n (2 2 1); -} - -metisCoeffs -{ - processorWeights ( 1 1 1 1 ); -} - - -distributed no; - -roots ( ); - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict index ece6c3de9e..9c3b434196 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/extrudeToRegionMeshDict @@ -35,4 +35,5 @@ linearNormalCoeffs thickness 0.01; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes index b9fb79e361..0566f93d24 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,5 +54,4 @@ snGradSchemes } - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution index ad6e86add0..48ff621822 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet index 875229cef3..f2f4132d65 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion.topoSet @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict index d79ff9180d..87a825965b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/createPatchDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object createPatchDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // This application/dictionary controls: diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes index 6356552528..8a4277a192 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,14 +19,6 @@ ddtSchemes default Euler; } -divSchemes -{ - default none; - div(phi,Uf) Gauss upwind; - div(phid,deltaf) Gauss upwind; - div(phi,hf) Gauss upwind; -} - gradSchemes { default none; @@ -41,6 +32,14 @@ gradSchemes grad(alpha) Gauss linear; } +divSchemes +{ + default none; + div(phi,Uf) Gauss upwind; + div(phid,deltaf) Gauss upwind; + div(phi,hf) Gauss upwind; +} + laplacianSchemes { default none; diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution index 6cd29c6283..7f200966d0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/wallFilmRegion/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,6 +23,7 @@ solvers tolerance 1e-10; relTol 0; } + deltaf { solver smoothSolver; @@ -33,7 +33,6 @@ solvers } } - PISO { momentumPredictor yes; @@ -41,7 +40,6 @@ PISO nNonOrthCorr 0; } - relaxationFactors { equations @@ -49,4 +47,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O index 2d7bbd9afc..dea3578e8e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/H2O @@ -10,12 +10,10 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 0 0 0 0 0 0]; internalField uniform 0.0; @@ -28,6 +26,7 @@ boundaryField inletValue $internalField; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2 index f4b50bafe0..621898f100 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2 +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/N2 @@ -10,12 +10,10 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object N2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 0 0 0 0 0 0]; internalField uniform 0.79; @@ -28,6 +26,7 @@ boundaryField inletValue $internalField; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2 index 551fffa1f2..1fad1e0319 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2 +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/O2 @@ -10,10 +10,8 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object O2; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 0 0 0 0 0 0]; @@ -28,6 +26,7 @@ boundaryField inletValue $internalField; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type zeroGradient; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T index 62f79d9297..12471f49a0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/T @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - location "0"; class volScalarField; object T; } @@ -27,6 +26,7 @@ boundaryField inletValue $internalField; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type fixedValue; @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U index 4d42794a3d..b9c03e65d6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type pressureInletOutletVelocity; value uniform (0 0 0); } + region0_to_wallFilmRegion_wallFilmFaces { type noSlip; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p index f4b39b2c98..997fa7516a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,6 +25,7 @@ boundaryField type calculated; value $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type calculated; @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh index 62e58ebcf9..0e7296092b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,10 +25,12 @@ boundaryField type totalPressure; p0 $internalField; } + region0_to_wallFilmRegion_wallFilmFaces { type fixedFluxPressure; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties index 8c2208c3d2..a3637b7fb3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat index af2a3dc389..813528ef6f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/foam.dat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object foam.dat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties index 5ee9f221dd..ad0c8be30a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/parcelInjectionProperties @@ -10,10 +10,10 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object parcelInjectionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN) ( (0.050 0.025 0.09) (0 0 -5) 0.001 1000 0.002 300 4200 (0 1 0) () (1) () diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties index 78e833cace..2ab159a207 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties index 0ce3f77f05..f8e1146dd4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/surfaceFilmProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object surfaceFilmProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -72,3 +71,6 @@ thermoSingleLayerCoeffs } } } + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties index ced82076f0..f62cdef153 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict index 52de3a63c5..f886ef61af 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict index 8e9d8c0aa8..0c8f6b3762 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/createPatchDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object createPatchDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // This application/dictionary controls: @@ -51,4 +50,5 @@ patches // none ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict deleted file mode 100644 index 214dfccd02..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/decomposeParDict +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object decomposeParDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 4; - -method metis; - -coeffs -{ - n (2 2 1); -} - -metisCoeffs -{ - processorWeights ( 1 1 1 1 ); -} - -distributed no; - -roots ( ); - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict index ece6c3de9e..9c3b434196 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/extrudeToRegionMeshDict @@ -35,4 +35,5 @@ linearNormalCoeffs thickness 0.01; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes index 178a790b95..6b5c373b46 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,5 +54,4 @@ snGradSchemes } - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution index c88586c08f..a29f005040 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -71,6 +70,7 @@ solvers tolerance 1e-6; relTol 0; } + hFinal { solver PBiCGStab; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet index 46ade98cbf..f2f4132d65 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion.topoSet @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions @@ -33,4 +32,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict index d79ff9180d..c9d260fa5d 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createPatchDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object createPatchDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // This application/dictionary controls: @@ -114,4 +113,5 @@ patches } ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet index f123748ca2..60780c41f7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/createWallFilmRegionPatches.topoSet @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions @@ -47,4 +46,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes index f266dc042d..7d3a2f92f0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,14 +19,6 @@ ddtSchemes default Euler; } -divSchemes -{ - default none; - div(phi,Uf) Gauss upwind; - div(phid,deltaf) Gauss upwind; - div(phi,hf) Gauss upwind; -} - gradSchemes { default none; @@ -39,6 +30,14 @@ gradSchemes grad(nHat) Gauss linear; } +divSchemes +{ + default none; + div(phi,Uf) Gauss upwind; + div(phid,deltaf) Gauss upwind; + div(phi,hf) Gauss upwind; +} + laplacianSchemes { default none; diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution index 1dfcf7ad5e..3bf6e386b2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/system/wallFilmRegion/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system/wallFilmRegion"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,6 +23,7 @@ solvers tolerance 1e-10; relTol 0; } + deltaf { solver PBiCGStab; @@ -54,4 +54,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O index 574d778c33..76d8833f51 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 0.0; } + inletSides { type fixedValue; value uniform 0.01; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T index b89a7ccb50..cd5dbdee69 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 473.0; } + inletSides { type fixedValue; value uniform 473.0; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U index 87c6682750..7f92792577 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,27 +24,32 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type flowRateInletVelocity; massFlowRate constant 0.00379; rhoInlet 1.0; // fallback value for e.g. potentialFoam } + inletSides { type flowRateInletVelocity; massFlowRate constant 0.00832; rhoInlet 1.0; // fallback value for e.g. potentialFoam } + outlet { type inletOutlet; inletValue uniform (0 0 0); } + walls { type noSlip; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air index 4e39b86f32..e5f8ab6aa7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 1.0; } + inletSides { type fixedValue; value uniform 0.99; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat index 6fda7cd934..2a1a2d5cde 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value uniform 0; } + inletSides { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type compressible::alphatWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k index 43d04129bb..7819ebf3c7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,27 +24,32 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type turbulentIntensityKineticEnergyInlet; intensity 0.15; value uniform 3.75e-9; } + inletSides { type turbulentIntensityKineticEnergyInlet; intensity 0.16; value uniform 3.75e-9; } + outlet { type inletOutlet; inletValue uniform 3.75e-9; } + walls { type kqRWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut index a49b3e32e6..8916341bf0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value uniform 0; } + inletSides { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type nutkWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega index 415805ec9f..3dd4220eb5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object omega; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,10 +24,12 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type turbulentMixingLengthFrequencyInlet; @@ -36,6 +37,7 @@ boundaryField k k; value uniform 4.5e-3; } + inletSides { type turbulentMixingLengthFrequencyInlet; @@ -43,11 +45,13 @@ boundaryField k k; value uniform 4.5e-3; } + outlet { type inletOutlet; inletValue uniform 4.5e-3; } + walls { type omegaWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p index af3e28f5f5..147f4fd6ce 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value $internalField; } + inletSides { type calculated; value $internalField; } + outlet { type calculated; value $internalField; } + walls { type calculated; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh index 0e7d68fb1f..45cf855920 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties index e37699006f..d8094c48f6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties index bfbb3477ca..c2ccef00dd 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties index 95d5353463..43aedde869 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,4 +20,5 @@ radiationModel none; solverFreq 10; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 8303a4a154..6abb17c61c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly index bdc7df00dc..40e3b95e29 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermo.incompressiblePoly; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties index ba904b0332..cc585f73b2 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict index d4c74fae04..60a339e3b6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36"; class dictionary; object blockMeshDict; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict index e8e9817bd1..ea1bd1c2e4 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -93,4 +92,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict index 898734ac67..422358793b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/decomposeParDict @@ -27,4 +27,5 @@ distributed no; roots ( ); + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes index 83bb11e608..694320f957 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution index 67d15df92a..580af2455b 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -61,7 +60,6 @@ solvers { solver PBiCGStab; preconditioner DILU; - tolerance 1e-6; relTol 0; } @@ -80,7 +78,6 @@ solvers potentialFlow { - // Used for potentialFoam initialisation nNonOrthogonalCorrectors 5; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O index 574d778c33..76d8833f51 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 0.0; } + inletSides { type fixedValue; value uniform 0.01; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T index b89a7ccb50..cd5dbdee69 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 473.0; } + inletSides { type fixedValue; value uniform 473.0; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U index 6fc282f98d..704af2a1f3 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,10 +24,12 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type flowRateInletVelocity; @@ -36,17 +37,20 @@ boundaryField value uniform (0 14.68 0); rhoInlet 1.22; // fallback value for e.g. potentialFoam } + inletSides { type flowRateInletVelocity; massFlowRate constant 0.00832; rhoInlet 1.22; // fallback value for e.g. potentialFoam } + outlet { type inletOutlet; inletValue uniform (0 0 0); } + walls { type noSlip; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air index 4e39b86f32..e5f8ab6aa7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 1.0; } + inletSides { type fixedValue; value uniform 0.99; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat index 6fda7cd934..2a1a2d5cde 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value uniform 0; } + inletSides { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type compressible::alphatWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k index 43d04129bb..7819ebf3c7 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,27 +24,32 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type turbulentIntensityKineticEnergyInlet; intensity 0.15; value uniform 3.75e-9; } + inletSides { type turbulentIntensityKineticEnergyInlet; intensity 0.16; value uniform 3.75e-9; } + outlet { type inletOutlet; inletValue uniform 3.75e-9; } + walls { type kqRWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut index a49b3e32e6..8916341bf0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value uniform 0; } + inletSides { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type nutkWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega index 415805ec9f..3dd4220eb5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object omega; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,10 +24,12 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type turbulentMixingLengthFrequencyInlet; @@ -36,6 +37,7 @@ boundaryField k k; value uniform 4.5e-3; } + inletSides { type turbulentMixingLengthFrequencyInlet; @@ -43,11 +45,13 @@ boundaryField k k; value uniform 4.5e-3; } + outlet { type inletOutlet; inletValue uniform 4.5e-3; } + walls { type omegaWallFunction; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p index af3e28f5f5..147f4fd6ce 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value $internalField; } + inletSides { type calculated; value $internalField; } + outlet { type calculated; value $internalField; } + walls { type calculated; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh index eb540bfc1d..72c4fee2bd 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties index 5b8fe1d3c1..3dd86a9117 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties index c25f6cf6f5..9b4cd08885 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict index f44256b73e..643f64dbdf 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties index 276d33e98d..6766c9f953 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ radiation off; radiationModel none; + // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties index 9203c54d9d..2e40ba4194 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly index bdc7df00dc..40e3b95e29 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermo.incompressiblePoly @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermo.incompressiblePoly; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties index 7d8642622e..cbfb232639 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict index d4c74fae04..60a339e3b6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36"; class dictionary; object blockMeshDict; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict index c1511e6a37..3b65f6506c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes index 956941e2f5..8213112eda 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution index b1a4e3618a..6539b7cea5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,13 +58,11 @@ solvers { $p; } - } potentialFlow { - // Used for potentialFoam initialisation - nNonOrthogonalCorrectors 5; + nNonOrthogonalCorrectors 3; } PIMPLE @@ -84,9 +81,5 @@ PIMPLE maxDeltaT 1; } -potentialFlow -{ - nNonOrthogonalCorrectors 3; -} // ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O index 574d778c33..76d8833f51 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/H2O @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object H2O; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 0.0; } + inletSides { type fixedValue; value uniform 0.01; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T index b89a7ccb50..cd5dbdee69 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/T @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 473.0; } + inletSides { type fixedValue; value uniform 473.0; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U index a83451a8dc..1b418a4c36 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,10 +24,12 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type flowRateInletVelocity; @@ -36,6 +37,7 @@ boundaryField massFlowRate constant 0.00379; value uniform (0 14.68 0); } + inletSides { type flowRateInletVelocity; @@ -43,11 +45,13 @@ boundaryField massFlowRate constant 0.00832; value uniform (0 17.79 0); } + outlet { type pressureInletOutletVelocity; value uniform (0 0 0); } + walls { type noSlip; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air index 4e39b86f32..e5f8ab6aa7 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,24 +24,29 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + walls { type zeroGradient; } + outlet { type inletOutlet; inletValue uniform 1.0; } + inletSides { type fixedValue; value uniform 0.99; } + inletCentral { type fixedValue; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat index 6fda7cd934..2a1a2d5cde 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/alphat @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value uniform 0; } + inletSides { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type compressible::alphatWallFunction; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k index 43d04129bb..7819ebf3c7 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,27 +24,32 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type turbulentIntensityKineticEnergyInlet; intensity 0.15; value uniform 3.75e-9; } + inletSides { type turbulentIntensityKineticEnergyInlet; intensity 0.16; value uniform 3.75e-9; } + outlet { type inletOutlet; inletValue uniform 3.75e-9; } + walls { type kqRWallFunction; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut index a49b3e32e6..8916341bf0 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,25 +24,30 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type calculated; value uniform 0; } + inletSides { type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + walls { type nutkWallFunction; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega index 415805ec9f..3dd4220eb5 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/omega @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object omega; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,10 +24,12 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type turbulentMixingLengthFrequencyInlet; @@ -36,6 +37,7 @@ boundaryField k k; value uniform 4.5e-3; } + inletSides { type turbulentMixingLengthFrequencyInlet; @@ -43,11 +45,13 @@ boundaryField k k; value uniform 4.5e-3; } + outlet { type inletOutlet; inletValue uniform 4.5e-3; } + walls { type omegaWallFunction; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p index 5a5f497ac7..198df38bc8 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0.orig/p @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,23 +24,28 @@ boundaryField { type symmetryPlane; } + front { type symmetryPlane; } + inletCentral { type zeroGradient; } + inletSides { type zeroGradient; } + outlet { type totalPressure; p0 $internalField; } + walls { type zeroGradient; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties index 5b8fe1d3c1..3dd86a9117 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties index bcafaf4d7e..1d66061fb5 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict index f44256b73e..643f64dbdf 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties index 276d33e98d..6766c9f953 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ radiation off; radiationModel none; + // ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 9203c54d9d..2e40ba4194 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object reactingCloud1Properties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly index bdc7df00dc..40e3b95e29 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermo.incompressiblePoly; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties index b0afa9e394..22fd53b276 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties index f26a920baa..d2f17dbdb0 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties @@ -18,7 +18,7 @@ simulationType RAS; RAS { - RASModel kOmegaSST; // kEpsilon; + RASModel kOmegaSST; turbulence on; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict index d4c74fae04..60a339e3b6 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict @@ -9,7 +9,6 @@ FoamFile { version 2.0; format ascii; - note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36"; class dictionary; object blockMeshDict; } diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict index 9b334d7da8..cb167bb2f5 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict index 898734ac67..b672d302d5 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/decomposeParDict @@ -18,13 +18,5 @@ numberOfSubdomains 4; method scotch; -coeffs -{ - n (2 2 1); -} - -distributed no; - -roots ( ); // ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes index 95af1840d2..7c7d6b6e5d 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution index 8b9f81dc77..4783ad2151 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,14 +19,9 @@ solvers p { solver GAMG; - tolerance 0; relTol 0.05; - smoother DICGaussSeidel; - - - maxIter 50; }; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 index 7b47877d44..d7846f77d1 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 index 7c7bc687b8..ddb7bdcd15 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U index ec65053cf5..a68a3a8f49 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U @@ -27,4 +27,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault index 999bbcefaf..75a831d832 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat b/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat index d5d328824e..36e72aa4e9 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/alphat @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; - location "0"; object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon index b5db9b0123..f553bc4867 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/epsilon @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; - location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k index 3e8bf9dfd7..68fb0923c3 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/k +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/k @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut index 9819af8661..0b9465face 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/nut @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p index 4dc6359db3..7d88af72e3 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p @@ -16,7 +16,7 @@ FoamFile dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 5e+06; +internalField uniform 5e06; boundaryField { @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties index ce77ea7ccd..5c7fd51d2f 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties index 76f3ba2ac4..3bbb5116bc 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g index 111080ed5d..28b07d0b87 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/g @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties index 4bad7148cd..3f780e0657 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object sprayCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties index b2a95e6495..a67f194c64 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties index 0a31cf3214..01e6dce9ed 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict index e81cfea028..97bef45e05 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes index 413db0e50a..f79c140957 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution index 5ed26a4684..05dd2ddaf3 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -98,4 +97,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties index a4e14aadcf..1ce11c1513 100644 --- a/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/uncoupledKinematicParcelDyMFoam/rotor2DAMI/constant/kinematicCloudProperties @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object particleProperties; + object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -90,8 +90,6 @@ subModels patchInteractionModel none; - heatTransferModel none; - surfaceFilmModel none; collisionModel none; @@ -107,8 +105,6 @@ subModels } stochasticCollisionModel none; - - radiation off; }