Permalink
Browse files

functionObjects: rewritten to all be derived from 'functionObject'

  - Avoids the need for the 'OutputFilterFunctionObject' wrapper
  - Time-control for execution and writing is now provided by the
    'timeControlFunctionObject' which instantiates the processing
    'functionObject' and controls its operation.
  - Alternative time-control functionObjects can now be written and
    selected at run-time without the need to compile wrapped version of
    EVERY existing functionObject which would have been required in the
    old structure.
  - The separation of 'execute' and 'write' functions is now formalized in the
    'functionObject' base-class and all derived classes implement the
    two functions.
  - Unnecessary implementations of functions with appropriate defaults
    in the 'functionObject' base-class have been removed reducing
    clutter and simplifying implementation of new functionObjects.
  - The 'coded' 'functionObject' has also been updated, simplified and tested.
  - Further simplification is now possible by creating some general
    intermediate classes derived from 'functionObject'.
  • Loading branch information...
1 parent 1441f8c commit 91aba2db2ecba575d4241198a75ff3ee983ee421 Henry Weller committed May 15, 2016
Showing with 2,676 additions and 8,701 deletions.
  1. +3 −3 applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options
  2. +0 −1 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files
  3. +3 −3 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/options
  4. +25 −19 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.C
  5. +14 −36 applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H
  6. +0 −46 ...ons/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTKFunctionObject.C
  7. +0 −54 ...ons/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTKFunctionObject.H
  8. +0 −3 applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/files
  9. +0 −15 applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options
  10. +0 −155 applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
  11. +1 −1 applications/utilities/postProcessing/noise/noise.C
  12. +0 −65 etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.C
  13. +0 −51 etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.H
  14. +57 −12 etc/codeTemplates/dynamicCode/functionObjectTemplate.C
  15. +12 −33 etc/codeTemplates/dynamicCode/functionObjectTemplate.H
  16. +0 −54 etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H
  17. +0 −245 src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
  18. +0 −197 src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
  19. +0 −60 src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
  20. +12 −4 src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
  21. +9 −8 src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
  22. +16 −1 src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
  23. +5 −4 src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
  24. +58 −16 src/OpenFOAM/db/functionObjects/{functionObjectFile/functionObjectFile.C → writeFile/writeFile.C}
  25. +45 −27 src/OpenFOAM/db/functionObjects/{functionObjectFile/functionObjectFile.H → writeFile/writeFile.H}
  26. +1 −1 ...nctionObjects/{functionObjectFile/functionObjectFileTemplates.C → writeFile/writeFileTemplates.C}
  27. +21 −55 ...OpenFOAM/db/functionObjects/{functionObjectFiles/functionObjectFiles.C → writeFiles/writeFiles.C}
  28. +25 −24 ...OpenFOAM/db/functionObjects/{functionObjectFiles/functionObjectFiles.H → writeFiles/writeFiles.H}
  29. +2 −24 src/postProcessing/functionObjects/field/Make/files
  30. +22 −21 src/postProcessing/functionObjects/field/div/div.C
  31. +14 −43 src/postProcessing/functionObjects/field/div/div.H
  32. +0 −42 src/postProcessing/functionObjects/field/div/divFunctionObject.C
  33. +0 −54 src/postProcessing/functionObjects/field/div/divFunctionObject.H
  34. +24 −31 src/postProcessing/functionObjects/field/fieldAverage/{fieldAverage → }/fieldAverage.C
  35. +12 −39 src/postProcessing/functionObjects/field/fieldAverage/{fieldAverage → }/fieldAverage.H
  36. +0 −42 ...essing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C
  37. +0 −54 ...essing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H
  38. 0 src/postProcessing/functionObjects/field/fieldAverage/{fieldAverage → }/fieldAverageTemplates.C
  39. +37 −22 ...tProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
  40. +11 −38 ...tProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
  41. +0 −45 ...nctionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformFunctionObject.C
  42. +0 −56 ...nctionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformFunctionObject.H
  43. +53 −53 src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
  44. +17 −56 src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
  45. +0 −42 src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxFunctionObject.C
  46. +0 −54 src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMaxFunctionObject.H
  47. +40 −8 src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
  48. +25 −26 src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
  49. +0 −46 src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceFunctionObject.C
  50. +0 −56 src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceFunctionObject.H
  51. +49 −12 src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
  52. +48 −49 src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
  53. +0 −46 src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceFunctionObject.C
  54. +0 −56 src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceFunctionObject.H
  55. +3 −2 src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C
  56. +43 −37 src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
  57. +65 −89 src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
  58. +8 −24 src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueI.H
  59. +4 −13 src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
  60. +2 −2 src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueTemplates.C
  61. +27 −44 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
  62. +12 −40 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
  63. +0 −46 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaFunctionObject.C
  64. +0 −56 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaFunctionObject.H
  65. +22 −21 src/postProcessing/functionObjects/field/grad/grad.C
  66. +12 −41 src/postProcessing/functionObjects/field/grad/grad.H
  67. +0 −42 src/postProcessing/functionObjects/field/grad/gradFunctionObject.C
  68. +0 −54 src/postProcessing/functionObjects/field/grad/gradFunctionObject.H
  69. +17 −19 src/postProcessing/functionObjects/field/histogram/histogram.C
  70. +13 −44 src/postProcessing/functionObjects/field/histogram/histogram.H
  71. +0 −46 src/postProcessing/functionObjects/field/histogram/histogramFunctionObject.C
  72. +0 −54 src/postProcessing/functionObjects/field/histogram/histogramFunctionObject.H
  73. +22 −21 src/postProcessing/functionObjects/field/mag/mag.C
  74. +12 −41 src/postProcessing/functionObjects/field/mag/mag.H
  75. +0 −42 src/postProcessing/functionObjects/field/mag/magFunctionObject.C
  76. +0 −54 src/postProcessing/functionObjects/field/mag/magFunctionObject.H
  77. +24 −26 src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
  78. +11 −35 src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
  79. +0 −46 src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsFunctionObject.C
  80. +0 −54 src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsFunctionObject.H
  81. +23 −21 src/postProcessing/functionObjects/field/processorField/processorField.C
  82. +12 −42 src/postProcessing/functionObjects/field/processorField/processorField.H
  83. +0 −42 src/postProcessing/functionObjects/field/processorField/processorFieldFunctionObject.C
  84. +0 −54 src/postProcessing/functionObjects/field/processorField/processorFieldFunctionObject.H
  85. +23 −19 src/postProcessing/functionObjects/field/readFields/readFields.C
  86. +13 −38 src/postProcessing/functionObjects/field/readFields/readFields.H
  87. +0 −42 src/postProcessing/functionObjects/field/readFields/readFieldsFunctionObject.C
  88. +0 −54 src/postProcessing/functionObjects/field/readFields/readFieldsFunctionObject.H
  89. +29 −24 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
  90. +9 −39 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
  91. +0 −46 ...ostProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistributionFunctionObject.C
  92. +0 −54 ...ostProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistributionFunctionObject.H
  93. +91 −117 src/postProcessing/functionObjects/field/streamLine/streamLine.C
  94. +14 −36 src/postProcessing/functionObjects/field/streamLine/streamLine.H
  95. +0 −42 src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.C
  96. +0 −54 src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.H
  97. +36 −20 src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C
  98. +13 −35 src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
  99. +0 −46 ...rocessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.C
  100. +0 −56 ...rocessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFieldsFunctionObject.H
  101. +101 −117 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
  102. +14 −37 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
  103. +0 −42 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.C
  104. +0 −55 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.H
  105. +0 −7 src/postProcessing/functionObjects/forces/Make/files
  106. +17 −29 src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
  107. +8 −16 src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
  108. +0 −42 src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.C
  109. +0 −54 src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffsFunctionObject.H
  110. +55 −71 src/postProcessing/functionObjects/forces/forces/forces.C
  111. +15 −65 src/postProcessing/functionObjects/forces/forces/forces.H
  112. +0 −42 src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.C
  113. +0 −54 src/postProcessing/functionObjects/forces/forces/forcesFunctionObject.H
  114. +23 −21 src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
  115. +10 −35 src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
  116. +0 −42 src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C
  117. +0 −54 src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.H
  118. +21 −26 src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.C
  119. +16 −45 src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
  120. +0 −42 src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C
  121. +0 −54 src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.H
  122. +0 −1 src/postProcessing/functionObjects/lagrangian/Make/files
  123. +24 −22 src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.C
  124. +9 −50 src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
  125. +0 −42 src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C
  126. +0 −54 src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.H
  127. +28 −19 src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C
  128. +9 −38 src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
  129. +0 −42 src/postProcessing/functionObjects/utilities/CourantNo/CourantNoFunctionObject.C
  130. +0 −54 src/postProcessing/functionObjects/utilities/CourantNo/CourantNoFunctionObject.H
  131. +28 −20 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C
  132. +11 −39 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
  133. +0 −42 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2FunctionObject.C
  134. +0 −54 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2FunctionObject.H
  135. +0 −36 src/postProcessing/functionObjects/utilities/Make/files
  136. +28 −18 src/postProcessing/functionObjects/utilities/Peclet/Peclet.C
  137. +10 −37 src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
  138. +0 −42 src/postProcessing/functionObjects/utilities/Peclet/PecletFunctionObject.C
  139. +0 −54 src/postProcessing/functionObjects/utilities/Peclet/PecletFunctionObject.H
  140. +28 −20 src/postProcessing/functionObjects/utilities/Q/Q.C
  141. +11 −39 src/postProcessing/functionObjects/utilities/Q/Q.H
  142. +0 −42 src/postProcessing/functionObjects/utilities/Q/QFunctionObject.C
  143. +0 −54 src/postProcessing/functionObjects/utilities/Q/QFunctionObject.H
  144. +33 −23 src/postProcessing/functionObjects/utilities/abort/abort.C
  145. +13 −37 src/postProcessing/functionObjects/utilities/abort/abort.H
  146. +0 −42 src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.C
  147. +0 −54 src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.H
  148. +23 −19 src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
  149. +12 −41 src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
  150. +0 −42 src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorFunctionObject.C
  151. +0 −54 src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactorFunctionObject.H
  152. +17 −31 src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
  153. +2 −11 src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
  154. +32 −20 src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
  155. +11 −38 src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
  156. +0 −42 src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.C
  157. +0 −54 src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.H
  158. +30 −18 src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
  159. +19 −42 src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
  160. +0 −46 src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C
  161. +14 −22 src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.H
  162. +34 −19 src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
  163. +14 −46 src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
  164. +0 −46 ...rocessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
  165. +0 −54 ...rocessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
  166. +24 −22 src/postProcessing/functionObjects/utilities/residuals/residuals.C
  167. +15 −56 src/postProcessing/functionObjects/utilities/residuals/residuals.H
  168. +0 −42 src/postProcessing/functionObjects/utilities/residuals/residualsFunctionObject.C
  169. +0 −54 src/postProcessing/functionObjects/utilities/residuals/residualsFunctionObject.H
  170. +0 −2 src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C
  171. +29 −23 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
  172. +12 −37 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
  173. +0 −42 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransportFunctionObject.C
  174. +0 −54 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransportFunctionObject.H
  175. +10 −36 src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
  176. +14 −31 src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
  177. +23 −12 src/postProcessing/functionObjects/utilities/systemCall/systemCall.C
  178. +11 −37 src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
  179. +0 −42 src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.C
  180. +0 −54 src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.H
  181. +28 −20 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
  182. +14 −39 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
  183. +0 −46 ...cessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C
  184. +0 −54 ...cessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.H
  185. +30 −22 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C
  186. +14 −37 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
  187. +0 −42 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.C
  188. +0 −54 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.H
  189. +28 −20 src/postProcessing/functionObjects/utilities/vorticity/vorticity.C
  190. +9 −34 src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
  191. +0 −42 src/postProcessing/functionObjects/utilities/vorticity/vorticityFunctionObject.C
  192. +0 −54 src/postProcessing/functionObjects/utilities/vorticity/vorticityFunctionObject.H
  193. +30 −22 src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.C
  194. +9 −37 src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
  195. +0 −42 src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.C
  196. +0 −54 src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.H
  197. +36 −19 src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.C
  198. +16 −45 src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
  199. +0 −46 ...tProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
  200. +0 −54 ...tProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
  201. +26 −24 src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
  202. +13 −43 src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
  203. +0 −42 src/postProcessing/functionObjects/utilities/yPlus/yPlusFunctionObject.C
  204. +0 −54 src/postProcessing/functionObjects/utilities/yPlus/yPlusFunctionObject.H
  205. +0 −3 src/sampling/Make/files
  206. +2 −0 src/sampling/Make/options
  207. +8 −2 src/sampling/meshToMesh/meshToMesh.C
  208. +36 −4 src/sampling/probes/patchProbes.C
  209. +11 −2 src/sampling/probes/patchProbes.H
  210. +66 −32 src/sampling/probes/probes.C
  211. +18 −23 src/sampling/probes/probes.H
  212. +0 −49 src/sampling/probes/probesFunctionObject/probesFunctionObject.C
  213. +0 −55 src/sampling/probes/probesFunctionObject/probesFunctionObject.H
  214. +64 −16 src/sampling/sampledSet/sampledSets/sampledSets.C
  215. +17 −21 src/sampling/sampledSet/sampledSets/sampledSets.H
  216. +0 −34 src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
  217. +0 −42 src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsFunctionObject.C
  218. +0 −54 src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsFunctionObject.H
  219. +60 −15 src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
  220. +17 −23 src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
  221. +0 −42 src/sampling/sampledSurface/sampledSurfacesFunctionObject/sampledSurfacesFunctionObject.C
  222. +0 −54 src/sampling/sampledSurface/sampledSurfacesFunctionObject/sampledSurfacesFunctionObject.H
  223. +14 −27 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
  224. +10 −36 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.H
  225. +1 −14 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.C
  226. +4 −6 src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractionsFunctionObjects.H
  227. +8 −4 tutorials/basic/potentialFoam/cylinder/system/controlDict
  228. +4 −0 tutorials/combustion/engineFoam/kivaTest/system/controlDict
  229. +1 −1 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
  230. +3 −0 tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -2,11 +2,11 @@ EXE_INC = \
-IfoamToVTK/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lfoamToVTK \
- -lfiniteVolume \
+ -ldynamicMesh \
-llagrangian \
- -lgenericPatchFields \
- -lmeshTools
+ -lgenericPatchFields
@@ -10,6 +10,5 @@ vtkMesh.C
vtkTopo.C
writeVTK/writeVTK.C
-writeVTK/writeVTKFunctionObject.C
LIB = $(FOAM_LIBBIN)/libfoamToVTK
@@ -1,10 +1,10 @@
EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
- -lfiniteVolume \
+ -ldynamicMesh \
-llagrangian \
- -lgenericPatchFields \
- -lmeshTools
+ -lgenericPatchFields
@@ -28,6 +28,7 @@ License
#include "Time.H"
#include "vtkMesh.H"
#include "internalWriter.H"
+#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -36,6 +37,7 @@ namespace Foam
namespace functionObjects
{
defineTypeNameAndDebug(writeVTK, 0);
+ addToRunTimeSelectionTable(functionObject, writeVTK, dictionary);
}
}
@@ -45,16 +47,22 @@ namespace functionObjects
Foam::functionObjects::writeVTK::writeVTK
(
const word& name,
- const objectRegistry& obr,
- const dictionary& dict,
- const bool loadFromFiles
+ const Time& t,
+ const dictionary& dict
)
:
- name_(name),
- obr_(obr),
+ functionObject(name),
+ time_(t),
+ obr_
+ (
+ time_.lookupObject<objectRegistry>
+ (
+ dict.lookupOrDefault("region", polyMesh::defaultRegion)
+ )
+ ),
objectNames_()
{
- if (!isA<fvMesh>(obr))
+ if (!isA<fvMesh>(obr_))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
@@ -72,27 +80,23 @@ Foam::functionObjects::writeVTK::~writeVTK()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::functionObjects::writeVTK::read(const dictionary& dict)
+bool Foam::functionObjects::writeVTK::read(const dictionary& dict)
{
dict.lookup("objectNames") >> objectNames_;
-}
-
-
-void Foam::functionObjects::writeVTK::execute()
-{}
-
-void Foam::functionObjects::writeVTK::end()
-{}
+ return true;
+}
-void Foam::functionObjects::writeVTK::timeSet()
-{}
+bool Foam::functionObjects::writeVTK::execute(const bool postProcess)
+{
+ return true;
+}
-void Foam::functionObjects::writeVTK::write()
+bool Foam::functionObjects::writeVTK::write(const bool postProcess)
{
- Info<< type() << " " << name_ << " output:" << nl;
+ Info<< type() << " " << name() << " output:" << nl;
fvMesh& mesh = const_cast<fvMesh&>(refCast<const fvMesh>(obr_));
@@ -162,6 +166,8 @@ void Foam::functionObjects::writeVTK::write()
writer.write(vsptf);
writer.write(vstf);
writer.write(vtf);
+
+ return true;
}
@@ -55,7 +55,7 @@ Description
SeeAlso
Foam::functionObject
- Foam::OutputFilterFunctionObject
+ Foam::functionObjects::timeControl
SourceFiles
writeVTK.C
@@ -66,19 +66,17 @@ SourceFiles
#ifndef functionObjects_writeVTK_H
#define functionObjects_writeVTK_H
+#include "functionObject.H"
#include "wordReList.H"
-#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// Forward declaration of classes
+class Time;
class objectRegistry;
-class dictionary;
-class polyMesh;
-class mapPolyMesh;
namespace functionObjects
{
@@ -88,13 +86,15 @@ namespace functionObjects
\*---------------------------------------------------------------------------*/
class writeVTK
+:
+ public functionObject
{
// Private data
- //- Name of this set of writeVTK
- word name_;
+ //- Reference to the Time
+ const Time& time_;
- //- Refererence to Db
+ //- Refererence to objectRegistry
const objectRegistry& obr_;
//- Names of objects
@@ -121,14 +121,12 @@ public:
// Constructors
- //- Construct for given objectRegistry and dictionary.
- // Allow the possibility to load fields from files
+ //- Construct from Time and dictionary
writeVTK
(
const word& name,
- const objectRegistry&,
- const dictionary&,
- const bool loadFromFiles = false
+ const Time& t,
+ const dictionary&
);
@@ -138,34 +136,14 @@ public:
// Member Functions
- //- Return name of the writeVTK
- virtual const word& name() const
- {
- return name_;
- }
-
//- Read the writeVTK data
- virtual void read(const dictionary&);
+ virtual bool read(const dictionary&);
//- Execute, currently does nothing
- virtual void execute();
-
- //- Execute at the final time-loop, currently does nothing
- virtual void end();
-
- //- Called when time was set at the end of the Time::operator++
- virtual void timeSet();
+ virtual bool execute(const bool postProcess = false);
//- Write the writeVTK
- virtual void write();
-
- //- Update for changes of mesh
- virtual void updateMesh(const mapPolyMesh&)
- {}
-
- //- Update for changes of mesh
- virtual void movePoints(const polyMesh&)
- {}
+ virtual bool write(const bool postProcess = false);
};
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2016 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 "writeVTKFunctionObject.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
- defineNamedTemplateTypeNameAndDebug
- (
- writeVTKFunctionObject,
- 0
- );
-
- addToRunTimeSelectionTable
- (
- functionObject,
- writeVTKFunctionObject,
- dictionary
- );
-}
-
-// ************************************************************************* //
@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2016 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/>.
-
-Typedef
- Foam::writeVTKFunctionObject
-
-Description
- FunctionObject wrapper around writeVTK to allow them to be
- created via the functions entry within controlDict.
-
-SourceFiles
- writeVTKFunctionObject.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writeVTKFunctionObject_H
-#define writeVTKFunctionObject_H
-
-#include "writeVTK.H"
-#include "OutputFilterFunctionObject.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- typedef OutputFilterFunctionObject<functionObjects::writeVTK>
- writeVTKFunctionObject;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
@@ -1,3 +0,0 @@
-dsmcFieldsCalc.C
-
-EXE = $(FOAM_APPBIN)/dsmcFieldsCalc
@@ -1,15 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/postProcessing/postCalc \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
- -I$(LIB_SRC)/postProcessing/functionObjects/utilities/lnInclude \
- -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
- $(FOAM_LIBBIN)/postCalc.o \
- -lmeshTools \
- -lfiniteVolume \
- -lutilityFunctionObjects \
- -llagrangian \
- -lDSMC
Oops, something went wrong.

0 comments on commit 91aba2d

Please sign in to comment.