Skip to content
Browse files

ENH: Merging some updates from the internal development line

  • Loading branch information...
1 parent a3c0017 commit a9d0f048e1a387af342531d50c79a2d111e2536b andy committed Mar 7, 2013
Showing with 3,300 additions and 1,955 deletions.
  1. +2 −2 applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
  2. +3 −3 applications/solvers/combustion/chemFoam/readInitialConditions.H
  3. +4 −2 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
  4. +4 −0 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
  5. +2 −0 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
  6. +1 −0 applications/solvers/multiphase/cavitatingFoam/Make/options
  7. +1 −0 applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
  8. +2 −2 applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
  9. +4 −4 applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
  10. +2 −2 applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
  11. +1 −1 applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
  12. +5 −3 applications/solvers/multiphase/cavitatingFoam/createFields.H
  13. +1 −0 applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
  14. +6 −6 applications/solvers/multiphase/cavitatingFoam/pEqn.H
  15. +1 −1 applications/solvers/multiphase/compressibleInterFoam/Allwclean
  16. +1 −1 applications/solvers/multiphase/compressibleInterFoam/Allwmake
  17. +0 −1 applications/solvers/multiphase/compressibleInterFoam/Make/files
  18. +11 −10 applications/solvers/multiphase/compressibleInterFoam/Make/options
  19. +10 −12 applications/solvers/multiphase/compressibleInterFoam/TEqn.H
  20. +3 −1 applications/solvers/multiphase/compressibleInterFoam/UEqn.H
  21. +15 −14 applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
  22. +2 −2 ...ions/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
  23. +3 −2 applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
  24. +35 −134 applications/solvers/multiphase/compressibleInterFoam/createFields.H
  25. +0 −184 .../compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
  26. +0 −194 .../compressibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
  27. +10 −7 applications/solvers/multiphase/compressibleInterFoam/pEqn.H
  28. +0 −8 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
  29. +0 −6 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/options
  30. +0 −124 ...tiphase/compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
  31. +0 −120 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
  32. +0 −120 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
  33. +0 −119 ...ations/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
  34. +0 −60 ...iphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/newPhaseEquationOfState.C
  35. +0 −127 ...ultiphase/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.H
  36. +3 −0 applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/files
  37. +10 −0 applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options
  38. +335 −0 applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C
  39. +277 −0 applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H
  40. +2 −2 applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/EEqns.H
  41. +29 −0 applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/alphaEqn.H
  42. +6 −1 applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
  43. +1 −1 applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
  44. +2 −1 applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options
  45. +2 −1 applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqn.H
  46. +1 −1 applications/solvers/multiphase/interFoam/LTSInterFoam/alphaEqnSubCycle.H
  47. +1 −1 applications/solvers/multiphase/interFoam/MRFInterFoam/MRFInterFoam.C
  48. +2 −1 applications/solvers/multiphase/interFoam/MRFInterFoam/Make/options
  49. +2 −1 applications/solvers/multiphase/interFoam/Make/options
  50. +2 −1 applications/solvers/multiphase/interFoam/alphaEqn.H
  51. +1 −1 applications/solvers/multiphase/interFoam/alphaEqnSubCycle.H
  52. +3 −2 applications/solvers/multiphase/interFoam/createFields.H
  53. +2 −1 applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
  54. +1 −1 applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
  55. +1 −1 applications/solvers/multiphase/interFoam/interFoam.C
  56. +3 −2 applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
  57. +2 −1 applications/solvers/multiphase/interFoam/porousInterFoam/Make/options
  58. +1 −1 applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C
  59. +2 −1 applications/solvers/multiphase/interPhaseChangeFoam/Make/options
  60. +2 −2 ...ChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
  61. +3 −3 ...aseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
  62. +3 −3 ...aseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
  63. +36 −0 applications/solvers/multiphase/multiphaseEulerFoam/TEqns.H
  64. +4 −3 applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H
  65. +1 −0 applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
  66. +27 −7 applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
  67. +7 −2 applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C
  68. +2 −1 applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
  69. +2 −1 applications/solvers/multiphase/twoLiquidMixingFoam/alphaDiffusionEqn.H
  70. +1 −1 applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
  71. +3 −2 applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
  72. +2 −2 applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
  73. +7 −2 applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
  74. +2 −2 ...tressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C
  75. +63 −5 applications/test/Matrix/Test-Matrix.C
  76. +59 −1 applications/test/dataEntry/Test-DataEntry.C
  77. +9 −7 applications/test/extendedStencil/Test-ExtendedStencil.C
  78. +7 −10 applications/test/fvc/Test-fvc.C
  79. +2 −2 applications/test/router/Gather/Gather.C
  80. +2 −2 applications/test/router/Gather/Gather.H
  81. +3 −3 applications/test/router/Gather/GatherBase.C
  82. +4 −4 applications/test/router/Gather/GatherBase.H
  83. +1 −1 applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
  84. +1 −1 applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
  85. +1 −1 applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
  86. +1 −1 applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
  87. +1 −1 applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
  88. +1 −1 applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
  89. +1 −1 applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
  90. +1 −1 applications/utilities/mesh/advanced/removeFaces/removeFaces.C
  91. +1 −1 applications/utilities/mesh/advanced/selectCells/selectCells.C
  92. +1 −1 applications/utilities/mesh/advanced/splitCells/splitCells.C
  93. +1 −1 applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
  94. +1 −1 applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
  95. +1 −1 applications/utilities/mesh/conversion/datToFoam/datToFoam.C
  96. +1 −1 applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C
  97. +1 −1 applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
  98. +1 −1 applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C
  99. +1 −1 applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
  100. +1 −1 applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
  101. +1 −1 applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
  102. +1 −1 applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
  103. +1 −1 applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
  104. +1 −1 applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
  105. +1 −1 applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C
  106. +1 −1 applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
  107. +1 −1 applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
  108. +1 −1 applications/utilities/mesh/conversion/vtkUnstructuredToFoam/vtkUnstructuredToFoam.C
  109. +1 −1 applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
  110. +1 −1 applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
  111. +13 −10 applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
  112. +2 −0 applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
  113. +279 −1 applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
  114. +1 −1 applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
  115. +1 −1 applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
  116. +1 −1 applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
  117. +2 −2 applications/utilities/mesh/manipulation/createPatch/createPatch.C
  118. +1 −1 applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
  119. +1 −1 applications/utilities/mesh/manipulation/insideCells/insideCells.C
  120. +1 −1 applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C
  121. +1 −1 applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C
  122. +1 −1 applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
  123. +1 −1 applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
  124. +1 −1 applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
  125. +1 −1 applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
  126. +1 −1 applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C
  127. +1 −1 applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
  128. +1 −1 applications/utilities/mesh/manipulation/setSet/setSet.C
  129. +1 −1 applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
  130. +1 −1 applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C
  131. +1 −1 applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
  132. +1 −1 applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
  133. +1 −1 applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
  134. +1 −1 applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
  135. +1 −1 applications/utilities/mesh/manipulation/topoSet/topoSet.C
  136. +1 −1 applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
  137. +1 −1 applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
  138. +1 −1 applications/utilities/miscellaneous/foamDebugSwitches/Make/options
  139. +1 −1 applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
  140. +1 −1 applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
  141. +1 −1 applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
  142. +1 −1 applications/utilities/parallelProcessing/redistributePar/redistributePar.C
  143. +1 −1 applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
  144. +15 −15 applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
  145. +2 −2 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
  146. +1 −1 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
  147. +1 −1 applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
  148. +1 −1 applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
  149. +1 −1 applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
  150. +1 −1 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
  151. +1 −1 applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
  152. +1 −1 applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
  153. +1 −1 applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
  154. +1 −1 applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
  155. +1 −1 applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C
  156. +1 −1 applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
  157. +1 −1 applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
  158. +1 −1 applications/utilities/postProcessing/miscellaneous/temporalInterpolate/temporalInterpolate.C
  159. +1 −1 applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C
  160. +1 −1 applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
  161. +1 −1 applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
  162. +1 −1 applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C
  163. +1 −1 applications/utilities/postProcessing/sampling/sample/sample.C
  164. +1 −1 applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
  165. +1 −1 applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
  166. +1 −1 applications/utilities/postProcessing/wall/wallGradU/wallGradU.C
  167. +1 −1 applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
  168. +2 −2 applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
  169. +1 −1 ...utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
  170. +1 −1 applications/utilities/preProcessing/boxTurb/boxTurb.C
  171. +1 −1 applications/utilities/preProcessing/changeDictionary/changeDictionary.C
  172. +1 −1 applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
  173. +1 −1 applications/utilities/preProcessing/engineSwirl/engineSwirl.C
  174. +1 −1 applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
  175. +1 −1 applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
  176. +1 −1 applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C
  177. +1 −1 applications/utilities/surface/surfaceAdd/surfaceAdd.C
  178. +1 −1 applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C
  179. +1 −1 applications/utilities/surface/surfaceCheck/surfaceCheck.C
  180. +1 −1 applications/utilities/surface/surfaceClean/surfaceClean.C
  181. +1 −1 applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
  182. +1 −1 applications/utilities/surface/surfaceConvert/surfaceConvert.C
  183. +1 −1 applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
  184. +5 −5 applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
  185. +1 −1 applications/utilities/surface/surfaceFind/surfaceFind.C
  186. +1 −1 applications/utilities/surface/surfaceInertia/surfaceInertia.C
  187. +1 −1 applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
  188. +1 −1 applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
  189. +1 −1 applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
  190. +1 −1 applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
  191. +1 −1 applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
  192. +1 −1 applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
  193. +1 −1 applications/utilities/surface/surfaceOrient/surfaceOrient.C
  194. +1 −1 applications/utilities/surface/surfacePointMerge/surfacePointMerge.C
  195. +1 −1 applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
  196. +1 −1 applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C
  197. +1 −1 applications/utilities/surface/surfaceSmooth/surfaceSmooth.C
  198. +1 −1 applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
  199. +1 −1 applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
  200. +1 −1 applications/utilities/surface/surfaceSubset/surfaceSubset.C
  201. +1 −1 applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
  202. +1 −1 applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
  203. +2 −2 bin/tools/pre-commit-hook
  204. +1 −1 etc/config/settings.csh
  205. +1 −1 etc/config/settings.sh
  206. +51 −51 src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
  207. +4 −4 src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
  208. +53 −53 src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
  209. +4 −4 src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
  210. +3 −3 src/OpenFOAM/containers/Lists/Distribution/Distribution.C
  211. +4 −4 src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
  212. +6 −6 src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
  213. +5 −5 src/OpenFOAM/containers/Lists/ListOps/ListOps.H
  214. +5 −5 src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
  215. +8 −8 src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
  216. +2 −2 src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
  217. +22 −22 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
  218. +3 −3 src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineReduceOps.H
  219. +6 −6 src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
  220. +8 −1 src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C
  221. +6 −1 src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C
  222. +13 −13 src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
  223. +3 −3 src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
  224. +5 −5 src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
  225. +5 −5 src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
  226. +5 −1 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
  227. +5 −1 src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
  228. +3 −3 src/OpenFOAM/db/IOstreams/token/tokenIO.C
  229. +2 −1 src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.C
  230. +5 −1 src/OpenFOAM/db/objectRegistry/objectRegistry.H
  231. +29 −1 src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
  232. +14 −0 src/OpenFOAM/dimensionSet/dimensionSet.C
  233. +2 −0 src/OpenFOAM/dimensionSet/dimensionSet.H
  234. +15 −0 src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.C
  235. +1 −0 src/OpenFOAM/dimensionedTypes/dimensionedScalar/dimensionedScalar.H
  236. +37 −37 src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
  237. +2 −2 src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
  238. +257 −0 src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.C
  239. +3 −0 src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H
  240. +8 −8 src/OpenFOAM/fields/Fields/transformList/transformList.C
  241. +310 −0 src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
  242. +3 −0 src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H
  243. +6 −2 src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
  244. +2 −2 src/OpenFOAM/global/foamDoc.H
  245. +18 −3 src/OpenFOAM/graph/graph.C
  246. +4 −1 src/OpenFOAM/graph/graph.H
  247. +3 −3 src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
  248. +9 −9 src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
  249. +2 −2 src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
  250. +11 −11 src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTableI.H
  251. +2 −2 src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
  252. +1 −2 src/OpenFOAM/matrices/Matrix/Matrix.H
  253. +98 −0 src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.C
  254. +126 −0 src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H
  255. +139 −0 src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H
  256. +2 −2 ...OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
  257. +2 −2 ...OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
  258. +51 −1 src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.C
  259. +30 −6 src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H
  260. +65 −6 src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
  261. +93 −32 src/OpenFOAM/meshes/MeshObject/MeshObject.C
  262. +151 −6 src/OpenFOAM/meshes/MeshObject/MeshObject.H
  263. +6 −4 src/OpenFOAM/meshes/pointMesh/pointMesh.C
  264. +3 −3 src/OpenFOAM/meshes/pointMesh/pointMesh.H
  265. +2 −2 src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
  266. +6 −26 src/OpenFOAM/meshes/polyMesh/polyMesh.C
  267. +7 −7 src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
  268. +3 −16 src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
  269. +34 −34 src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
Sorry, we could not display the entire diff because too many files (1,529) changed.
View
4 applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -116,7 +116,7 @@ void PDRkEpsilon::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
- volScalarField G(type() + ".G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
+ volScalarField G(GName(), mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
// Update espsilon and G at the wall
View
6 applications/solvers/combustion/chemFoam/readInitialConditions.H
@@ -15,15 +15,15 @@
}
label nSpecie = Y.size();
- PtrList<gasThermoPhysics> specieData(Y.size());
+ PtrList<gasHThermoPhysics> specieData(Y.size());
forAll(specieData, i)
{
specieData.set
(
i,
- new gasThermoPhysics
+ new gasHThermoPhysics
(
- dynamic_cast<const reactingMixture<gasThermoPhysics>&>
+ dynamic_cast<const reactingMixture<gasHThermoPhysics>&>
(thermo).speciesData()[i]
)
);
View
6 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options
@@ -4,11 +4,13 @@ EXE_INC = \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/incompressible/RAS/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
+ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lincompressibleTurbulenceModel \
-lincompressibleRASModels \
- -lincompressibleTransportModels
+ -lincompressibleTransportModels \
+ -lradiationModels
View
4 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/TEqn.H
@@ -9,10 +9,14 @@
fvm::ddt(T)
+ fvm::div(phi, T)
- fvm::laplacian(kappaEff, T)
+ ==
+ radiation->ST(rhoCpRef, T)
);
TEqn.relax();
TEqn.solve();
+ radiation->correct();
+
rhok = 1.0 - beta*(T - TRef);
}
View
2 applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -49,6 +49,7 @@ Description
#include "singlePhaseTransportModel.H"
#include "RASModel.H"
#include "pimpleControl.H"
+#include "radiationModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,6 +60,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
+ #include "createIncompressibleRadiationModel.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "CourantNo.H"
View
1 applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
View
1 applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
@@ -1,6 +1,7 @@
EXE_INC = \
-I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
View
4 applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "barotropicCompressibilityModel.H"
-#include "twoPhaseMixture.H"
+#include "incompressibleTwoPhaseMixture.H"
#include "turbulenceModel.H"
#include "pimpleControl.H"
View
8 applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
@@ -4,8 +4,8 @@
p =
(
rho
- - (1.0 - gamma)*rhol0
- - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
+ - gamma2*rhol0
+ - ((gamma*psiv + gamma2*psil) - psi)*pSat
)/psi;
}
@@ -57,8 +57,8 @@
p =
(
rho
- - (1.0 - gamma)*rhol0
- - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
+ - gamma2*rhol0
+ - ((gamma*psiv + gamma2*psil) - psi)*pSat
)/psi;
p.correctBoundaryConditions();
View
4 applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ Description
#include "fvCFD.H"
#include "barotropicCompressibilityModel.H"
-#include "twoPhaseMixture.H"
+#include "incompressibleTwoPhaseMixture.H"
#include "turbulenceModel.H"
#include "pimpleControl.H"
View
2 applications/solvers/multiphase/cavitatingFoam/continuityErrs.H
@@ -1,5 +1,5 @@
{
- volScalarField thermoRho = psi*p + (1.0 - gamma)*rhol0;
+ volScalarField thermoRho = psi*p + gamma2*rhol0;
dimensionedScalar totalMass = fvc::domainIntegrate(rho);
View
8 applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -44,11 +44,13 @@
Info<< "Reading transportProperties\n" << endl;
- twoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
+ incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv, "gamma");
volScalarField& gamma(twoPhaseProperties.alpha1());
gamma.oldTime();
+ volScalarField& gamma2(twoPhaseProperties.alpha2());
+
Info<< "Creating compressibilityModel\n" << endl;
autoPtr<barotropicCompressibilityModel> psiModel =
barotropicCompressibilityModel::New
@@ -62,8 +64,8 @@
rho == max
(
psi*p
- + (1.0 - gamma)*rhol0
- + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
+ + gamma2*rhol0
+ + ((gamma*psiv + gamma2*psil) - psi)*pSat,
rhoMin
);
View
1 applications/solvers/multiphase/cavitatingFoam/gammaPsi.H
@@ -1,5 +1,6 @@
{
gamma = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
+ gamma2 = 1.0 - gamma;
Info<< "max-min gamma: " << max(gamma).value()
<< " " << min(gamma).value() << endl;
View
12 applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -4,8 +4,8 @@
p =
(
rho
- - (1.0 - gamma)*rhol0
- - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
+ - gamma2*rhol0
+ - ((gamma*psiv + gamma2*psil) - psi)*pSat
)/psi;
}
@@ -49,8 +49,8 @@
rho == max
(
psi*p
- + (1.0 - gamma)*rhol0
- + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
+ + gamma2*rhol0
+ + ((gamma*psiv + gamma2*psil) - psi)*pSat,
rhoMin
);
@@ -59,8 +59,8 @@
p =
(
rho
- - (1.0 - gamma)*rhol0
- - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
+ - gamma2*rhol0
+ - ((gamma*psiv + gamma2*psil) - psi)*pSat
)/psi;
p.correctBoundaryConditions();
View
2 applications/solvers/multiphase/compressibleInterFoam/Allwclean
@@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
-wclean libso phaseEquationsOfState
+wclean libso twoPhaseMixtureThermo
wclean
wclean compressibleInterDyMFoam
View
2 applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
-wmake libso phaseEquationsOfState
+wmake libso twoPhaseMixtureThermo
wmake
wmake compressibleInterDyMFoam
View
1 applications/solvers/multiphase/compressibleInterFoam/Make/files
@@ -1,4 +1,3 @@
-derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
compressibleInterFoam.C
EXE = $(FOAM_APPBIN)/compressibleInterFoam
View
21 applications/solvers/multiphase/compressibleInterFoam/Make/options
@@ -1,17 +1,18 @@
EXE_INC = \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
+ -ItwoPhaseMixtureThermo \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -IphaseEquationsOfState/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
+ -ltwoPhaseMixtureThermo \
+ -lfluidThermophysicalModels \
+ -lspecie \
+ -ltwoPhaseProperties \
-linterfaceProperties \
- -ltwoPhaseInterfaceProperties \
- -lincompressibleTransportModels \
- -lphaseEquationsOfState \
- -lincompressibleTurbulenceModel \
- -lincompressibleRASModels \
- -lincompressibleLESModels \
+ -lcompressibleTurbulenceModel \
+ -lcompressibleRASModels \
+ -lcompressibleLESModels \
-lfiniteVolume
View
22 applications/solvers/multiphase/compressibleInterFoam/TEqn.H
@@ -1,20 +1,18 @@
{
- volScalarField kByCv
- (
- "kByCv",
- (alpha1*k1/Cv1 + alpha2*k2/Cv2)
- + (alpha1*rho1 + alpha2*rho2)*turbulence->nut()
- );
-
solve
(
fvm::ddt(rho, T)
+ fvm::div(rhoPhi, T)
- - fvm::laplacian(kByCv, T)
- + p*fvc::div(phi)*(alpha1/Cv1 + alpha2/Cv2)
+ - fvm::laplacian(twoPhaseProperties.alphaEff(turbulence->mut()), T)
+ + (
+ p*fvc::div(phi)
+ + fvc::ddt(rho, K) + fvc::div(rhoPhi, K)
+ )
+ *(
+ alpha1/twoPhaseProperties.thermo1().Cv()
+ + alpha2/twoPhaseProperties.thermo2().Cv()
+ )
);
- // Update compressibilities
- psi1 = eos1->psi(p, T);
- psi2 = eos2->psi(p, T);
+ twoPhaseProperties.correct();
}
View
4 applications/solvers/multiphase/compressibleInterFoam/UEqn.H
@@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(rhoPhi, U)
- + turbulence->divDevRhoReff(rho, U)
+ + turbulence->divDevRhoReff(U)
);
UEqn.relax();
@@ -22,4 +22,6 @@
) * mesh.magSf()
)
);
+
+ K = 0.5*magSqr(U);
}
View
29 applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
@@ -1,24 +1,25 @@
EXE_INC = \
-I.. \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
+ -I../twoPhaseMixtureThermo \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I../phaseEquationsOfState/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/dynamicFvMesh/lnInclude
+ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
+ -ltwoPhaseMixtureThermo \
+ -lfluidThermophysicalModels \
+ -lspecie \
+ -ltwoPhaseProperties \
-linterfaceProperties \
- -ltwoPhaseInterfaceProperties \
- -lincompressibleTransportModels \
- -lphaseEquationsOfState \
- -lincompressibleTurbulenceModel \
- -lincompressibleRASModels \
- -lincompressibleLESModels \
- -lfiniteVolume \
+ -lcompressibleTurbulenceModel \
+ -lcompressibleRASModels \
+ -lcompressibleLESModels \
-ldynamicMesh \
-lmeshTools \
- -ldynamicFvMesh
+ -ldynamicFvMesh \
+ -lfiniteVolume
View
4 ...vers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,7 +43,7 @@ Description
#include "subCycle.H"
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
-#include "phaseEquationOfState.H"
+#include "twoPhaseMixtureThermo.H"
#include "turbulenceModel.H"
#include "pimpleControl.H"
View
5 applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,9 +38,10 @@ Description
#include "fvCFD.H"
#include "MULES.H"
#include "subCycle.H"
+#include "rhoThermo.H"
#include "interfaceProperties.H"
#include "twoPhaseMixture.H"
-#include "phaseEquationOfState.H"
+#include "twoPhaseMixtureThermo.H"
#include "turbulenceModel.H"
#include "pimpleControl.H"
View
169 applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -28,141 +28,20 @@
#include "createPhi.H"
- Info<< "Reading field T\n" << endl;
- volScalarField T
- (
- IOobject
- (
- "T",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- volScalarField p
- (
- IOobject
- (
- "p",
- runTime.timeName(),
- mesh,
- IOobject::READ_IF_PRESENT,
- IOobject::AUTO_WRITE
- ),
- p_rgh
- );
-
-
- Info<< "Reading transportProperties\n" << endl;
- twoPhaseMixture twoPhaseProperties(U, phi);
+ Info<< "Constructing twoPhaseMixtureThermo\n" << endl;
+ twoPhaseMixtureThermo twoPhaseProperties(mesh);
volScalarField& alpha1(twoPhaseProperties.alpha1());
+ volScalarField& alpha2(twoPhaseProperties.alpha2());
- Info<< "Calculating phase-fraction alpha" << twoPhaseProperties.phase2Name()
- << nl << endl;
- volScalarField alpha2
- (
- "alpha" + twoPhaseProperties.phase2Name(),
- scalar(1) - alpha1
- );
-
- dimensionedScalar k1
- (
- "k",
- dimensionSet(1, 1, -3, -1, 0),
- twoPhaseProperties.subDict
- (
- twoPhaseProperties.phase1Name()
- ).lookup("k")
- );
+ Info<< "Reading thermophysical properties\n" << endl;
- dimensionedScalar k2
- (
- "k",
- dimensionSet(1, 1, -3, -1, 0),
- twoPhaseProperties.subDict
- (
- twoPhaseProperties.phase2Name()
- ).lookup("k")
- );
-
- dimensionedScalar Cv1
- (
- "Cv",
- dimensionSet(0, 2, -2, -1, 0),
- twoPhaseProperties.subDict
- (
- twoPhaseProperties.phase1Name()
- ).lookup("Cv")
- );
-
- dimensionedScalar Cv2
- (
- "Cv",
- dimensionSet(0, 2, -2, -1, 0),
- twoPhaseProperties.subDict
- (
- twoPhaseProperties.phase2Name()
- ).lookup("Cv")
- );
-
- autoPtr<phaseEquationOfState> eos1
- (
- phaseEquationOfState::New
- (
- twoPhaseProperties.subDict
- (
- twoPhaseProperties.phase1Name()
- )
- )
- );
-
- autoPtr<phaseEquationOfState> eos2
- (
- phaseEquationOfState::New
- (
- twoPhaseProperties.subDict
- (
- twoPhaseProperties.phase2Name()
- )
- )
- );
-
- volScalarField psi1
- (
- IOobject
- (
- "psi1",
- runTime.timeName(),
- mesh
- ),
- eos1->psi(p, T)
- );
- psi1.oldTime();
-
- volScalarField psi2
- (
- IOobject
- (
- "psi2",
- runTime.timeName(),
- mesh
- ),
- eos2->psi(p, T)
- );
- psi2.oldTime();
-
- dimensionedScalar pMin(twoPhaseProperties.lookup("pMin"));
-
- Info<< "Calculating field g.h\n" << endl;
- volScalarField gh("gh", g & mesh.C());
- surfaceScalarField ghf("ghf", g & mesh.Cf());
-
- volScalarField rho1("rho1", eos1->rho(p, T));
- volScalarField rho2("rho2", eos2->rho(p, T));
+ volScalarField& p = twoPhaseProperties.p();
+ volScalarField& T = twoPhaseProperties.T();
+ const volScalarField& rho1 = twoPhaseProperties.thermo1().rho();
+ const volScalarField& psi1 = twoPhaseProperties.thermo1().psi();
+ const volScalarField& rho2 = twoPhaseProperties.thermo2().rho();
+ const volScalarField& psi2 = twoPhaseProperties.thermo2().psi();
volScalarField rho
(
@@ -178,6 +57,12 @@
);
+ dimensionedScalar pMin(twoPhaseProperties.lookup("pMin"));
+
+ Info<< "Calculating field g.h\n" << endl;
+ volScalarField gh("gh", g & mesh.C());
+ surfaceScalarField ghf("ghf", g & mesh.Cf());
+
// Mass flux
// Initialisation does not matter because rhoPhi is reset after the
// alpha1 solution before it is used in the U equation.
@@ -202,8 +87,24 @@
// Construct interface from alpha1 distribution
interfaceProperties interface(alpha1, U, twoPhaseProperties);
- // Construct incompressible turbulence model
- autoPtr<incompressible::turbulenceModel> turbulence
+ // Construct compressible turbulence model
+ autoPtr<compressible::turbulenceModel> turbulence
(
- incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
+ compressible::turbulenceModel::New(rho, U, rhoPhi, twoPhaseProperties)
+ );
+
+ Info<< "Creating field dpdt\n" << endl;
+ volScalarField dpdt
+ (
+ IOobject
+ (
+ "dpdt",
+ runTime.timeName(),
+ mesh
+ ),
+ mesh,
+ dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
);
+
+ Info<< "Creating field kinetic energy K\n" << endl;
+ volScalarField K("K", 0.5*magSqr(U));
View
184 ...sibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -1,184 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "wallHeatTransferFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
-(
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF
-)
-:
- mixedFvPatchScalarField(p, iF),
- Tinf_(p.size(), 0.0),
- alphaWall_(p.size(), 0.0)
-{
- refValue() = 0.0;
- refGrad() = 0.0;
- valueFraction() = 0.0;
-}
-
-
-Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
-(
- const wallHeatTransferFvPatchScalarField& ptf,
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF,
- const fvPatchFieldMapper& mapper
-)
-:
- mixedFvPatchScalarField(ptf, p, iF, mapper),
- Tinf_(ptf.Tinf_, mapper),
- alphaWall_(ptf.alphaWall_, mapper)
-{}
-
-
-Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
-(
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF,
- const dictionary& dict
-)
-:
- mixedFvPatchScalarField(p, iF),
- Tinf_("Tinf", dict, p.size()),
- alphaWall_("alphaWall", dict, p.size())
-{
- refValue() = Tinf_;
- refGrad() = 0.0;
- valueFraction() = 0.0;
-
- if (dict.found("value"))
- {
- fvPatchField<scalar>::operator=
- (
- scalarField("value", dict, p.size())
- );
- }
- else
- {
- evaluate();
- }
-}
-
-
-Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
-(
- const wallHeatTransferFvPatchScalarField& tppsf
-)
-:
- mixedFvPatchScalarField(tppsf),
- Tinf_(tppsf.Tinf_),
- alphaWall_(tppsf.alphaWall_)
-{}
-
-
-Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
-(
- const wallHeatTransferFvPatchScalarField& tppsf,
- const DimensionedField<scalar, volMesh>& iF
-)
-:
- mixedFvPatchScalarField(tppsf, iF),
- Tinf_(tppsf.Tinf_),
- alphaWall_(tppsf.alphaWall_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-void Foam::wallHeatTransferFvPatchScalarField::autoMap
-(
- const fvPatchFieldMapper& m
-)
-{
- scalarField::autoMap(m);
- Tinf_.autoMap(m);
- alphaWall_.autoMap(m);
-}
-
-
-void Foam::wallHeatTransferFvPatchScalarField::rmap
-(
- const fvPatchScalarField& ptf,
- const labelList& addr
-)
-{
- mixedFvPatchScalarField::rmap(ptf, addr);
-
- const wallHeatTransferFvPatchScalarField& tiptf =
- refCast<const wallHeatTransferFvPatchScalarField>(ptf);
-
- Tinf_.rmap(tiptf.Tinf_, addr);
- alphaWall_.rmap(tiptf.alphaWall_, addr);
-}
-
-
-void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
-{
- if (updated())
- {
- return;
- }
-
- const fvPatchScalarField& Cpw =
- patch().lookupPatchField<volScalarField, scalar>("Cp");
-
- const fvPatchScalarField& kByCpw =
- patch().lookupPatchField<volScalarField, scalar>("kByCp");
-
- valueFraction() =
- 1.0/
- (
- 1.0
- + Cpw*kByCpw*patch().deltaCoeffs()/alphaWall_
- );
-
- mixedFvPatchScalarField::updateCoeffs();
-}
-
-
-void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
-{
- fvPatchScalarField::write(os);
- Tinf_.writeEntry("Tinf", os);
- alphaWall_.writeEntry("alphaWall", os);
- writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
-}
-
-// ************************************************************************* //
View
194 ...sibleInterFoam/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H
@@ -1,194 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Class
- Foam::wallHeatTransferFvPatchScalarField
-
-Description
- Enthalpy boundary conditions for wall heat transfer
-
-SourceFiles
- wallHeatTransferFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef wallHeatTransferFvPatchScalarField_H
-#define wallHeatTransferFvPatchScalarField_H
-
-#include "mixedFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class wallHeatTransferFvPatch Declaration
-\*---------------------------------------------------------------------------*/
-
-class wallHeatTransferFvPatchScalarField
-:
- public mixedFvPatchScalarField
-{
- // Private data
-
- //- Tinf
- scalarField Tinf_;
-
- //- alphaWall
- scalarField alphaWall_;
-
-
-public:
-
- //- Runtime type information
- TypeName("wallHeatTransfer");
-
-
- // Constructors
-
- //- Construct from patch and internal field
- wallHeatTransferFvPatchScalarField
- (
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&
- );
-
- //- Construct from patch, internal field and dictionary
- wallHeatTransferFvPatchScalarField
- (
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&,
- const dictionary&
- );
-
- //- Construct by mapping given wallHeatTransferFvPatchScalarField
- // onto a new patch
- wallHeatTransferFvPatchScalarField
- (
- const wallHeatTransferFvPatchScalarField&,
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&,
- const fvPatchFieldMapper&
- );
-
- //- Construct as copy
- wallHeatTransferFvPatchScalarField
- (
- const wallHeatTransferFvPatchScalarField&
- );
-
- //- Construct and return a clone
- virtual tmp<fvPatchScalarField> clone() const
- {
- return tmp<fvPatchScalarField>
- (
- new wallHeatTransferFvPatchScalarField(*this)
- );
- }
-
- //- Construct as copy setting internal field reference
- wallHeatTransferFvPatchScalarField
- (
- const wallHeatTransferFvPatchScalarField&,
- const DimensionedField<scalar, volMesh>&
- );
-
- //- Construct and return a clone setting internal field reference
- virtual tmp<fvPatchScalarField> clone
- (
- const DimensionedField<scalar, volMesh>& iF
- ) const
- {
- return tmp<fvPatchScalarField>
- (
- new wallHeatTransferFvPatchScalarField(*this, iF)
- );
- }
-
-
- // Member functions
-
- // Access
-
- //- Return Tinf
- const scalarField& Tinf() const
- {
- return Tinf_;
- }
-
- //- Return reference to Tinf to allow adjustment
- scalarField& Tinf()
- {
- return Tinf_;
- }
-
- //- Return alphaWall
- const scalarField& alphaWall() const
- {
- return alphaWall_;
- }
-
- //- Return reference to alphaWall to allow adjustment
- scalarField& alphaWall()
- {
- return alphaWall_;
- }
-
-
- // Mapping functions
-
- //- Map (and resize as needed) from self given a mapping object
- virtual void autoMap
- (
- const fvPatchFieldMapper&
- );
-
- //- Reverse map the given fvPatchField onto this fvPatchField
- virtual void rmap
- (
- const fvPatchScalarField&,
- const labelList&
- );
-
-
- // Evaluation functions
-
- //- Update the coefficients associated with the patch field
- virtual void updateCoeffs();
-
-
- //- Write
- virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
View
17 applications/solvers/multiphase/compressibleInterFoam/pEqn.H
@@ -1,7 +1,4 @@
{
- rho1 = eos1->rho(p, T);
- rho2 = eos2->rho(p, T);
-
volScalarField rAU("rAU", 1.0/UEqn.A());
surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
@@ -50,7 +47,7 @@
// Thermodynamic density needs to be updated by psi*d(p) after the
// pressure solution - done in 2 parts. Part 1:
- //thermo.rho() -= psi*p_rgh;
+ //twoPhaseProperties.rho() -= psi*p_rgh;
while (pimple.correctNonOrthogonal())
{
@@ -73,7 +70,7 @@
if (pimple.finalNonOrthogonalIter())
{
// Second part of thermodynamic density update
- //thermo.rho() += psi*p_rgh;
+ //twoPhaseProperties.rho() += psi*p_rgh;
dgdt =
(
@@ -91,9 +88,15 @@
p = max(p_rgh + (alpha1*rho1 + alpha2*rho2)*gh, pMin);
- rho1 = eos1->rho(p, T);
- rho2 = eos2->rho(p, T);
+ // twoPhaseProperties.correct();
Info<< "max(U) " << max(mag(U)).value() << endl;
Info<< "min(p_rgh) " << min(p_rgh).value() << endl;
+
+ K = 0.5*magSqr(U);
+
+ if (twoPhaseProperties.dpdt())
+ {
+ dpdt = fvc::ddt(p);
+ }
}
View
8 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/files
@@ -1,8 +0,0 @@
-phaseEquationOfState/phaseEquationOfState.C
-phaseEquationOfState/newPhaseEquationOfState.C
-constant/constant.C
-linear/linear.C
-perfectFluid/perfectFluid.C
-adiabaticPerfectFluid/adiabaticPerfectFluid.C
-
-LIB = $(FOAM_LIBBIN)/libphaseEquationsOfState
View
6 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/Make/options
@@ -1,6 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude
-
-LIB_LIBS = \
- -lincompressibleTransportModels
View
124 ...compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
@@ -1,124 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "adiabaticPerfectFluid.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace phaseEquationsOfState
-{
- defineTypeNameAndDebug(adiabaticPerfectFluid, 0);
-
- addToRunTimeSelectionTable
- (
- phaseEquationOfState,
- adiabaticPerfectFluid,
- dictionary
- );
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::adiabaticPerfectFluid::adiabaticPerfectFluid
-(
- const dictionary& dict
-)
-:
- phaseEquationOfState(dict),
- p0_("p0", dimPressure, dict.lookup("p0")),
- rho0_("rho0", dimDensity, dict.lookup("rho0")),
- gamma_("gamma", dimless, dict.lookup("gamma")),
- B_("B", dimPressure, dict.lookup("B"))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::adiabaticPerfectFluid::~adiabaticPerfectFluid()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField>
-Foam::phaseEquationsOfState::adiabaticPerfectFluid::rho
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "rho",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- rho0_*pow((p + B_)/(p0_ + B_), 1.0/gamma_)
- )
- );
-}
-
-
-Foam::tmp<Foam::volScalarField>
-Foam::phaseEquationsOfState::adiabaticPerfectFluid::psi
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "psi",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- (rho0_/(gamma_*(p0_ + B_)))
- *pow((p + B_)/(p0_ + B_), 1.0/gamma_ - 1.0)
- )
- );
-}
-
-
-// ************************************************************************* //
View
0 ...compressibleInterFoam/phaseEquationsOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
120 ...ations/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.C
@@ -1,120 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "constant.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace phaseEquationsOfState
-{
- defineTypeNameAndDebug(constant, 0);
-
- addToRunTimeSelectionTable
- (
- phaseEquationOfState,
- constant,
- dictionary
- );
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::constant::constant
-(
- const dictionary& dict
-)
-:
- phaseEquationOfState(dict),
- rho_("rho", dimDensity, dict.lookup("rho"))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::constant::~constant()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::rho
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "rho",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- p.mesh(),
- rho_
- )
- );
-}
-
-
-Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::constant::psi
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "psi",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- p.mesh(),
- dimensionedScalar("psi", dimDensity/dimPressure, 0)
- )
- );
-}
-
-
-// ************************************************************************* //
View
0 ...ations/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/constant/constant.H
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
120 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.C
@@ -1,120 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "linear.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace phaseEquationsOfState
-{
- defineTypeNameAndDebug(linear, 0);
-
- addToRunTimeSelectionTable
- (
- phaseEquationOfState,
- linear,
- dictionary
- );
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::linear::linear
-(
- const dictionary& dict
-)
-:
- phaseEquationOfState(dict),
- rho0_("rho0", dimDensity, dict.lookup("rho0")),
- psi_("psi", dimDensity/dimPressure, dict.lookup("psi"))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::linear::~linear()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::rho
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "rho",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- rho0_ + psi_*p
- )
- );
-}
-
-
-Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::linear::psi
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "psi",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- p.mesh(),
- psi_
- )
- );
-}
-
-
-// ************************************************************************* //
View
0 applications/solvers/multiphase/compressibleInterFoam/phaseEquationsOfState/linear/linear.H
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
119 ...olvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.C
@@ -1,119 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "perfectFluid.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace phaseEquationsOfState
-{
- defineTypeNameAndDebug(perfectFluid, 0);
-
- addToRunTimeSelectionTable
- (
- phaseEquationOfState,
- perfectFluid,
- dictionary
- );
-}
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::perfectFluid::perfectFluid
-(
- const dictionary& dict
-)
-:
- phaseEquationOfState(dict),
- rho0_("rho0", dimDensity, dict.lookup("rho0")),
- R_("R", dimensionSet(0, 2, -2, -1, 0), dict.lookup("R"))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::phaseEquationsOfState::perfectFluid::~perfectFluid()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::rho
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "rho",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- rho0_ + psi(p, T)*p
- )
- );
-}
-
-
-Foam::tmp<Foam::volScalarField> Foam::phaseEquationsOfState::perfectFluid::psi
-(
- const volScalarField& p,
- const volScalarField& T
-) const
-{
- return tmp<Foam::volScalarField>
- (
- new volScalarField
- (
- IOobject
- (
- "psi",
- p.time().timeName(),
- p.mesh(),
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
- 1.0/(R_*T)
- )
- );
-}
-
-
-// ************************************************************************* //
View
0 ...olvers/multiphase/compressibleInterFoam/phaseEquationsOfState/perfectFluid/perfectFluid.H
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
60 ...ompressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/newPhaseEquationOfState.C
@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "phaseEquationOfState.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::phaseEquationOfState> Foam::phaseEquationOfState::New
-(
- const dictionary& dict
-)
-{
- word phaseEquationOfStateType
- (
- dict.subDict("equationOfState").lookup("type")
- );
-
- Info<< "Selecting phaseEquationOfState "
- << phaseEquationOfStateType << endl;
-
- dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(phaseEquationOfStateType);
-
- if (cstrIter == dictionaryConstructorTablePtr_->end())
- {
- FatalErrorIn("phaseEquationOfState::New")
- << "Unknown phaseEquationOfStateType type "
- << phaseEquationOfStateType << endl << endl
- << "Valid phaseEquationOfState types are : " << endl
- << dictionaryConstructorTablePtr_->sortedToc()
- << exit(FatalError);
- }
-
- return cstrIter()(dict.subDict("equationOfState"));
-}
-
-
-// ************************************************************************* //
View
0 ...e/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.C
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
127 ...e/compressibleInterFoam/phaseEquationsOfState/phaseEquationOfState/phaseEquationOfState.H
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Class
- Foam::phaseEquationOfState
-
-Description
- A2stract base-class for dispersed-phase particle diameter models.
-
-SourceFiles
- phaseEquationOfState.C
- newDiameterModel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef phaseEquationOfState_H
-#define phaseEquationOfState_H
-