From 67ab0b5abd3606761a7bb22013b797ea22ebcd6a Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Sun, 9 Apr 2017 15:11:54 +0200 Subject: [PATCH 1/6] Vanilla backport - in FOAM library updated containers backported PackedBoolList, hashedWordList, nullObject, wordRe, backported functions to backported int32 support backported tableReaders backported Function1, TimeFunction1 backported dynamicCode (for codedBCs, ...) -- needs to be mapped out advanced error macros (FatalIOErrorInFunction, ...) -- needs to be mapped out backported IOobject::MUST_READ_IF_MODIFIED and added IOobject::READ_IF_PRESENT_IF_MODIFIED (only in FO) - in postProcessing backported IO FOs (partialWrite, removeRegisteredObject, writeDictionary, writeRegisteredObject) backported field FOs (fieldCoordinateSystemTransform, fieldValues, nearWallFields, processorField, readFields, regionSizeDistribution, streamLine, wallBoundedStreamLine) backported fvTools FOs (calcFvcDiv, calcFvcGrad, calcMag) backported jobControl FOs (abortCalculation) backported utilities FOs (ourantNo, Lambda2, Peclet, Q, codedFunctionObject, pressureTools, residuals, scalarTransport, setTimeStep, timeActivatedFileUpdate, turbulenceFields, vorticity, wallShearStress) --- .../DNS/dnsFoam/readTransportProperties.H | 2 +- .../DNS/dnsFoam/readTurbulenceProperties.H | 2 +- .../basic/laplacianFoam/createFields.H | 2 +- .../basic/scalarTransportFoam/createFields.H | 2 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 6 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.H | 4 +- .../solvers/combustion/PDRFoam/createFields.H | 2 +- .../PDRFoam/readCombustionProperties.H | 2 +- .../XiFoam/readCombustionProperties.H | 2 +- .../readCombustionProperties.H | 2 +- .../combustion/fireFoam/createFields.H | 2 +- .../reactingFoam/readChemistryProperties.H | 2 +- .../rhoReactingFoam/readChemistryProperties.H | 2 +- .../readThermophysicalProperties.H | 2 +- .../readThermodynamicProperties.H | 2 +- .../readThermodynamicProperties.H | 2 +- .../sonicDyMFoam/readTransportProperties.H | 2 +- .../readThermodynamicProperties.H | 2 +- .../sonicLiquidFoam/readTransportProperties.H | 2 +- .../createFields.H | 2 +- .../coupled/conjugateHeatFoam/createFields.H | 2 +- .../conjugateHeatSimpleFoam/createFields.H | 2 +- .../electrostaticFoam/createFields.H | 2 +- .../electromagnetics/mhdFoam/createFields.H | 2 +- .../engine/icoDyMEngineFoam/createFields.H | 2 +- .../financial/financialFoam/createFields.H | 2 +- .../liquidFilmFoam/readTransportProperties.H | 2 +- .../surfactantFoam/createFaFields.H | 2 +- .../readTransportProperties.H | 2 +- .../icoDyMIbFoam/createFields.H | 2 +- .../immersedBoundary/icoIbFoam/createFields.H | 2 +- .../RichardsFoam/RichardsFoam.C | 28 +- .../incompressible/RichardsFoam/setDeltaT.H | 28 +- .../spatialMeanValueRichardsonFoam.C | 28 +- .../boundaryFoam/createFields.H | 4 +- .../channelFoam/readTransportProperties.H | 2 +- .../incompressible/icoDyMFoam/createFields.H | 2 +- .../icoDyMSimpleFoam/createFields.H | 2 +- .../incompressible/icoFoam/createFields.H | 2 +- .../readGravitationalAcceleration.H | 2 +- .../readChemistryProperties.H | 2 +- .../readChemistryProperties.H | 2 +- .../readChemistryProperties.H | 2 +- .../multiSolverDemo/createFields_icoFoam.H | 2 +- .../createFields_scalarTransportFoam.H | 2 +- .../readThermodynamicProperties.H | 2 +- .../readTransportProperties.H | 2 +- .../multiphase/bubbleFoam/createFields.H | 2 +- .../bubbleFoam/createRASTurbulence.H | 2 +- .../readThermodynamicProperties.H | 2 +- .../newPhaseChangeTwoPhaseMixture.C | 2 +- .../multiphase/settlingFoam/createFields.H | 2 +- .../twoPhaseEulerFoam/createFields.H | 2 +- .../twoPhaseEulerFoam/readPPProperties.H | 2 +- .../contactStressFoam/createFields.H | 4 +- .../icoFsiFoam/createFields.H | 2 +- .../icoFsiFoam/readCouplingProperties.H | 2 +- .../icoFsiFoam/readMechanicalProperties.H | 2 +- .../readMechanicalProperties.H | 2 +- .../readThermalProperties.H | 2 +- .../stressedFoam/readMechanicalProperties.H | 2 +- .../stressedFoam/readThermalProperties.H | 2 +- .../readThermalProperties.H | 2 +- .../createFields.H | 2 +- .../readCouplingProperties.H | 2 +- .../stressFemFoam/readMechanicalProperties.H | 2 +- .../bubbleInterTrackFoam/createBubble.H | 2 +- .../bubbleHistory/bubbleHistory.C | 7 +- .../bubbleHistory/bubbleHistory.H | 13 +- .../sloshingHistory/sloshingHistory.C | 8 +- .../sloshingHistory/sloshingHistory.H | 13 +- .../generation/snappyHexMesh/Make/options | 3 +- .../manipulation/createPatch/createPatch.C | 6 +- .../splitMeshRegions/splitMeshRegions.C | 6 +- .../decomposeSets/decomposeSets.C | 2 +- .../reconstructPar/reconstructPar.C | 4 +- .../reconstructParMesh/reconstructParMesh.C | 4 +- .../foamToEnsightParts/foamToEnsightParts.C | 2 +- .../PV3FoamReader/CMakeLists.txt | 2 + .../PV4FoamReader/CMakeLists.txt | 2 + .../PVFoamReader/PVFoamReader/CMakeLists.txt | 7 +- .../postProcessing/multiSolver/multiSolver.C | 4 +- .../sampling/probeLocations/probeLocations.C | 2 +- .../postProcessing/sampling/sample/sample.C | 4 +- etc/bashrc | 5 +- etc/codeTemplates/BC/BC.C | 240 + etc/codeTemplates/BC/BC.H | 246 + .../codeTemplates/BC/BCs.C | 7 +- .../codeTemplates/BC/BCs.H | 18 +- .../codeTemplates/BC/BCsFwd.H | 19 +- etc/codeTemplates/BC/Make/files | 3 + etc/codeTemplates/BC/Make/options | 7 + etc/codeTemplates/app/Make/files | 3 + etc/codeTemplates/app/Make/options | 7 + etc/codeTemplates/app/app.C | 52 + .../FilterFunctionObjectTemplate.C | 65 + .../FilterFunctionObjectTemplate.H | 51 + .../dynamicCode/IOfunctionObjectTemplate.H | 50 + .../dynamicCode/codeStreamTemplate.C | 50 +- .../dynamicCode/codedFvOptionTemplate.C | 204 + .../dynamicCode/codedFvOptionTemplate.H | 193 + .../fixedValueFvPatchFieldTemplate.C | 211 + .../fixedValueFvPatchFieldTemplate.H | 142 + .../fixedValuePointPatchFieldTemplate.C | 211 + .../fixedValuePointPatchFieldTemplate.H | 143 + .../dynamicCode/functionObjectTemplate.C | 157 + .../dynamicCode/functionObjectTemplate.H | 151 + .../dynamicCode/mixedFvPatchFieldTemplate.C | 211 + .../dynamicCode/mixedFvPatchFieldTemplate.H | 142 + etc/codeTemplates/foamCommentStyles | 31 + etc/codeTemplates/foamScript | 32 + .../functionObject/FUNCTIONOBJECT.C | 96 + .../functionObject/FUNCTIONOBJECT.H | 176 + .../FUNCTIONOBJECTFunctionObject.C | 46 + .../FUNCTIONOBJECTFunctionObject.H | 54 + .../functionObject/IOFUNCTIONOBJECT.H | 49 + etc/codeTemplates/functionObject/Make/files | 4 + etc/codeTemplates/functionObject/Make/options | 7 + etc/codeTemplates/source/_Template.C | 102 + .../codeTemplates/source/_Template.H | 95 +- etc/codeTemplates/source/_TemplateApp.C | 48 + .../codeTemplates/source/_TemplateI.H | 42 +- etc/codeTemplates/source/_TemplateIO.C | 70 + etc/codeTemplates/source/foamNewSource | 115 + .../template/_TemplateTemplate.C | 122 + .../template/_TemplateTemplate.H | 157 + .../template/_TemplateTemplateI.H | 63 +- .../template/_TemplateTemplateIO.C | 82 + etc/codeTemplates/template/foamNewTemplate | 130 + etc/cshrc | 3 + src/Allwmake | 2 +- src/ODE/sixDOF/sixDOFBodies/sixDOFBodies.C | 4 +- src/ODE/sixDOF/sixDOFODE/newSixDOFODE.C | 25 +- src/OSspecific/POSIX/Make/files | 7 + src/OSspecific/POSIX/POSIX.C | 415 +- src/OSspecific/POSIX/fileMonitor.C | 626 ++ src/OSspecific/POSIX/fileMonitor.H | 162 + src/OSspecific/POSIX/memInfo/memInfo.C | 125 + src/OSspecific/POSIX/memInfo/memInfo.H | 130 + src/OSspecific/POSIX/memInfo/memInfoIO.C | 70 + src/OSspecific/POSIX/regExp.C | 141 +- src/OSspecific/POSIX/regExp.H | 108 +- src/OSspecific/POSIX/signals/sigFpe.C | 167 +- src/OSspecific/POSIX/signals/sigFpe.H | 50 +- src/OSspecific/POSIX/signals/sigInt.C | 11 +- src/OSspecific/POSIX/signals/sigInt.H | 17 +- src/OSspecific/POSIX/signals/sigQuit.C | 9 +- src/OSspecific/POSIX/signals/sigQuit.H | 18 +- src/OSspecific/POSIX/signals/sigSegv.C | 10 +- src/OSspecific/POSIX/signals/sigSegv.H | 18 +- src/OSspecific/POSIX/timer.C | 14 +- src/OSspecific/POSIX/timer.H | 6 +- .../scalarTransportPOD/scalarTransportPOD.C | 4 +- .../heatFlux/heatFlux/heatFlux.C | 6 + .../heatFlux/heatFlux/heatFlux.H | 21 +- .../thermalModel/thermalModel.C | 2 +- .../decompositionMethod/decompositionMethod.C | 30 +- .../decompositionMethod/decompositionMethod.H | 2 +- .../dynamicBodyFvMesh/dynamicBodyFvMesh.C | 2 +- .../dynamicBoxFvMesh/dynamicBoxFvMesh.C | 2 +- .../dynamicFvMesh/newDynamicFvMesh.C | 21 +- .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C | 2 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 4 +- .../fvMeshDistributeTemplates.C | 88 +- .../mixerGgiFvMesh/mixerGgiFvMesh.C | 2 +- .../movingBoxFvMesh/movingBoxFvMesh.C | 2 +- .../solidBodyMotionFvMesh.C | 2 +- .../subsetMotionSolverFvMesh.C | 2 +- .../dynamicFvMesh/turboFvMesh/turboFvMesh.C | 2 +- .../dynamicMesh/motionSolver/motionSolver.C | 6 +- .../fieldMapping/fluxCorrector.C | 2 +- src/dynamicMesh/dynamicTopoFvMesh/meshOps.H | 20 - .../dynamicTopoFvMesh/tetMetrics/tetMetric.C | 29 +- .../displacementInterpolationFvMotionSolver.C | 2 +- .../inverseDistanceDiffusivity.H | 2 +- .../attachDetachFvMesh/attachDetachFvMesh.C | 2 +- .../linearValveFvMesh/linearValveFvMesh.C | 2 +- .../linearValveLayersFvMesh.C | 2 +- .../mixerFvMesh/mixerFvMesh.C | 2 +- .../movingBodyTopoFvMesh.C | 2 +- .../multiMixerFvMesh/multiMixerFvMesh.C | 2 +- .../multiTopoBodyFvMesh/multiTopoBodyFvMesh.C | 2 +- .../engineMesh/engineMesh/newEngineMesh.C | 2 +- .../newEngineTopoChangerMesh.C | 2 +- .../pistonRefine/pistonRefine.C | 4 +- .../equationReader/equationReaderParse.C | 2 +- .../finiteArea/faSchemes/faSchemes.C | 3 +- src/finiteArea/finiteArea/fac/facNDiv.C | 2 +- src/finiteArea/finiteArea/fac/facNDiv.H | 2 +- src/finiteArea/finiteArea/fac/facNGrad.C | 2 +- src/finiteArea/finiteArea/fac/facNGrad.H | 2 +- src/finiteArea/finiteArea/fam/famNDiv.C | 2 +- src/finiteArea/finiteArea/fam/famNDiv.H | 2 +- src/finiteVolume/Make/files | 1 - .../general/SRF/SRFModel/SRFModel/SRFModel.C | 2 +- .../SRF/SRFModel/SRFModel/newSRFModel.C | 2 +- .../pressureGradientExplicitSource.C | 2 +- .../solutionControlTemplates.C | 6 +- .../basic/generic/genericFvPatchField.C | 10 +- .../timeVaryingMappedFixedValueFvPatchField.C | 1 - .../finiteVolume/fvSchemes/fvSchemes.C | 3 +- .../gradSchemes/gradScheme/gradScheme.C | 2 +- .../fvMatrices/fvMatrix/fvMatrix.C | 10 + src/finiteVolume/fvMesh/fvMesh.C | 3 +- src/foam/Make/files | 45 +- src/foam/Make/options | 2 +- src/foam/algorithms/octree/octree/octree.C | 1 - src/foam/algorithms/octree/octree/treeNode.C | 1 - .../linkTypes/DLListBase/DLListBase.C | 1 - .../containers/Lists/FixedList/FixedListIO.C | 4 +- src/foam/containers/Lists/List/List.H | 3 + src/foam/containers/Lists/List/ListI.H | 13 +- src/foam/containers/Lists/List/ListIO.C | 15 +- .../Lists/ListListOps/ListListOps.C | 1 + .../Lists/ListListOps/ListListOps.H | 4 +- src/foam/containers/Lists/ListOps/ListOps.H | 52 + .../Lists/ListOps/ListOpsTemplates.C | 124 +- .../containers/Lists/PackedList/PackedList.C | 522 +- .../containers/Lists/PackedList/PackedList.H | 355 +- .../containers/Lists/PackedList/PackedListI.H | 430 +- src/foam/containers/Lists/UList/UList.H | 3 + src/foam/containers/Lists/UList/UListI.H | 2 +- src/foam/containers/Lists/UList/UListIO.C | 152 + src/foam/coordinateSystems/coordinateSystem.H | 2 +- src/foam/db/IOobject/IOobject.C | 232 +- src/foam/db/IOobject/IOobject.H | 66 +- src/foam/db/IOobject/IOobjectI.H | 14 + src/foam/db/IOobject/IOobjectReadHeader.C | 6 +- src/foam/db/IOobject/IOobjectWriteHeader.C | 11 +- src/foam/db/IOobjectList/IOobjectList.C | 118 +- src/foam/db/IOobjectList/IOobjectList.H | 24 +- .../IOobjects/CompactIOField/CompactIOField.C | 292 + .../IOobjects/CompactIOField/CompactIOField.H | 140 + .../IOobjects/CompactIOList/CompactIOList.C | 293 + .../IOobjects/CompactIOList/CompactIOList.H | 159 + src/foam/db/IOobjects/IOField/IOField.C | 82 +- src/foam/db/IOobjects/IOField/IOField.H | 5 +- src/foam/db/IOobjects/IOList/IOList.C | 80 +- src/foam/db/IOobjects/IOMap/IOMap.C | 24 +- src/foam/db/IOobjects/IOMap/IOMap.H | 5 +- src/foam/db/IOobjects/IOMap/IOMapName.C | 2 - src/foam/db/IOobjects/IOPtrList/IOPtrList.C | 24 +- src/foam/db/IOobjects/IOPtrList/IOPtrList.H | 5 +- .../db/IOobjects/IOdictionary/IOdictionary.C | 131 +- .../db/IOobjects/IOdictionary/IOdictionary.H | 28 +- .../IOobjects/IOdictionary/IOdictionaryIO.C | 129 +- src/foam/db/IOstreams/Fstreams/IFstream.C | 33 +- src/foam/db/IOstreams/Fstreams/IFstream.H | 32 +- src/foam/db/IOstreams/Fstreams/OFstream.C | 33 +- src/foam/db/IOstreams/Fstreams/OFstream.H | 25 +- src/foam/db/IOstreams/IOstreams/IOstream.C | 2 - src/foam/db/IOstreams/IOstreams/IOstream.H | 4 +- src/foam/db/IOstreams/IOstreams/Istream.C | 60 +- src/foam/db/IOstreams/IOstreams/Istream.H | 18 +- .../db/IOstreams/Pstreams/PstreamReduceOps.C | 6 +- src/foam/db/IOstreams/Sstreams/ISstream.C | 586 +- src/foam/db/IOstreams/Sstreams/ISstream.H | 56 +- src/foam/db/IOstreams/Sstreams/ISstreamI.H | 6 + src/foam/db/IOstreams/Sstreams/OSstream.C | 14 +- src/foam/db/IOstreams/Sstreams/OSstream.H | 16 +- .../db/IOstreams/Sstreams/prefixOSstream.C | 14 +- .../IOstreams/StringStreams/IStringStream.H | 16 +- .../IOstreams/StringStreams/OStringStream.H | 24 +- src/foam/db/IOstreams/Tstreams/ITstream.C | 12 +- src/foam/db/IOstreams/Tstreams/ITstream.H | 28 +- src/foam/db/IOstreams/token/token.C | 10 +- src/foam/db/IOstreams/token/token.H | 17 +- src/foam/db/IOstreams/token/tokenI.H | 210 +- src/foam/db/IOstreams/token/tokenIO.C | 6 +- src/foam/db/Time/TimePaths.C | 66 +- src/foam/db/Time/TimePaths.H | 27 +- src/foam/db/Time/TimeState.H | 22 +- src/foam/db/Time/findInstance.C | 84 +- src/foam/db/Time/findTimes.C | 9 +- src/foam/db/Time/foamTime.C | 799 +- src/foam/db/Time/foamTime.H | 162 +- src/foam/db/Time/foamTimeIO.C | 51 +- src/foam/db/Time/instant/instant.C | 16 +- src/foam/db/Time/instant/instant.H | 7 +- src/foam/db/Time/subCycleTime.H | 18 +- src/foam/db/Time/timeSelector.C | 167 +- src/foam/db/Time/timeSelector.H | 87 +- src/foam/db/dictionary/dictionary.C | 283 +- src/foam/db/dictionary/dictionary.H | 85 +- .../dictionaryEntry/dictionaryEntry.C | 1 + .../dictionaryEntry/dictionaryEntry.H | 14 +- .../dictionaryEntry/dictionaryEntryIO.C | 5 +- src/foam/db/dictionary/dictionaryIO.C | 153 +- src/foam/db/dictionary/dictionaryTemplates.C | 28 +- src/foam/db/dictionary/entry/entry.C | 13 +- src/foam/db/dictionary/entry/entry.H | 4 + src/foam/db/dictionary/entry/entryIO.C | 80 +- .../functionEntries/calcEntry/calcEntry.C | 151 + .../functionEntries/calcEntry/calcEntry.H | 114 + .../functionEntries/codeStream/codeStream.C | 398 + .../functionEntries/codeStream/codeStream.H | 186 + .../functionEntry/functionEntry.C | 3 +- .../functionEntry/functionEntry.H | 2 +- .../includeEntry/includeEntry.C | 91 +- .../includeEntry/includeEntry.H | 23 +- .../includeEtcEntry/includeEtcEntry.C | 181 + .../includeEtcEntry/includeEtcEntry.H | 134 + .../includeIfPresentEntry.C | 14 +- .../includeIfPresentEntry.H | 2 +- .../inputModeEntry/inputModeEntry.C | 4 +- .../inputModeEntry/inputModeEntry.H | 20 +- .../functionEntries/removeEntry/removeEntry.H | 6 +- .../primitiveEntry/primitiveEntry.C | 130 +- .../primitiveEntry/primitiveEntry.H | 29 +- .../primitiveEntry/primitiveEntryIO.C | 143 +- .../primitiveEntry/primitiveEntryTemplates.C | 8 +- .../db/dynamicLibrary/codedBase/codedBase.C | 356 + .../db/dynamicLibrary/codedBase/codedBase.H | 146 + .../dlLibraryTable/dlLibraryTable.C | 159 +- .../dlLibraryTable/dlLibraryTable.H | 55 +- .../dlLibraryTable/dlLibraryTableTemplates.C | 16 +- .../dynamicLibrary/dynamicCode/dynamicCode.C | 530 ++ .../dynamicLibrary/dynamicCode/dynamicCode.H | 295 + .../dynamicCode/dynamicCodeContext.C | 139 + .../dynamicCode/dynamicCodeContext.H | 147 + src/foam/db/error/IOerror.C | 85 +- src/foam/db/error/error.C | 7 +- src/foam/db/error/error.H | 110 +- src/foam/db/error/errorManip.H | 9 +- src/foam/db/error/messageStream.H | 128 +- .../IOOutputFilter/IOOutputFilter.C | 39 +- .../IOOutputFilter/IOOutputFilter.H | 38 +- .../OutputFilterFunctionObject.C | 125 +- .../OutputFilterFunctionObject.H | 57 +- .../functionObject/functionObject.C | 39 +- .../functionObject/functionObject.H | 23 +- .../functionObjectFile/functionObjectFile.C | 340 + .../functionObjectFile/functionObjectFile.H | 211 + .../functionObjectFileTemplates.C | 44 + .../functionObjectList/functionObjectList.C | 105 +- .../functionObjectList/functionObjectList.H | 25 +- .../functionObjectList/postProcess.H | 170 + .../outputFilterOutputControl.C | 135 +- .../outputFilterOutputControl.H | 56 +- src/foam/db/objectRegistry/objectRegistry.C | 73 +- src/foam/db/objectRegistry/objectRegistry.H | 50 +- .../objectRegistry/objectRegistryTemplates.C | 103 +- src/foam/db/regIOobject/regIOobject.C | 164 +- src/foam/db/regIOobject/regIOobject.H | 97 +- src/foam/db/regIOobject/regIOobjectI.H | 12 + src/foam/db/regIOobject/regIOobjectRead.C | 179 +- src/foam/db/regIOobject/regIOobjectWrite.C | 4 +- .../addToRunTimeSelectionTable.H | 32 +- src/foam/db/typeInfo/typeInfo.H | 12 +- .../dimensionedScalar/dimensionedScalar.C | 18 +- .../transformGeometricField.C | 2 +- .../basic/generic/GenericPointPatchField.C | 14 +- .../processor/ProcessorPointPatchField.C | 4 +- .../constraint/wedge/WedgePointPatchField.C | 8 +- src/foam/global/argList/argList.C | 876 ++- src/foam/global/argList/argList.H | 321 +- src/foam/global/argList/argListI.H | 267 + src/foam/global/debug/debug.H | 2 + src/foam/global/debug/simpleObjectRegistry.H | 92 + .../global/debug/simpleRegIOobject.H} | 67 +- src/foam/global/global.Cver | 7 +- src/foam/global/profiling/profilingStack.H | 1 + src/foam/include/OSspecific.H | 75 +- src/foam/include/createTime.H | 12 +- .../interpolationTable/interpolationTable.C | 276 +- .../interpolationTable/interpolationTable.H | 42 +- .../tableReaders/csv/csvTableReader.C | 197 + .../tableReaders/csv/csvTableReader.H | 132 + .../tableReaders/csv/csvTableReaders.C | 37 + .../openFoam/openFoamTableReader.C | 71 + .../openFoam/openFoamTableReader.H | 112 + .../openFoam/openFoamTableReaders.C | 37 + .../tableReaders/tableReader.C | 87 + .../tableReaders/tableReader.H | 133 + .../tableReaders/tableReaders.C} | 20 +- .../tableReaders/tableReaders.H} | 63 +- .../interpolationWeights.C | 95 + .../interpolationWeights.H | 159 + .../interpolationWeightsTemplates.C} | 50 +- .../linearInterpolationWeights.C | 252 + .../linearInterpolationWeights.H | 120 + .../splineInterpolationWeights.C | 225 + .../splineInterpolationWeights.H | 118 + .../uniformInterpolationTable.C | 235 + .../uniformInterpolationTable.H | 210 + .../uniformInterpolationTableI.H | 96 + .../BlockGMRES/BlockGMRESSolver.C | 8 +- .../GAMGAgglomeration/GAMGAgglomeration.C | 4 +- src/foam/matrices/solution/solution.C | 2 +- src/foam/matrices/tolerances/tolerances.C | 2 +- src/foam/memory/Xfer/XferI.H | 9 +- src/foam/memory/autoPtr/autoPtr.H | 3 + src/foam/memory/autoPtr/autoPtrI.H | 19 + src/foam/memory/tmp/refCount.H | 4 +- src/foam/memory/tmp/tmpI.H | 6 +- .../cellModeller/globalCellModeller.C | 1 - src/foam/meshes/meshShapes/face/face.H | 35 + .../meshes/meshShapes/face/faceTemplates.C | 21 +- src/foam/meshes/meshShapes/triFace/triFace.H | 33 +- .../meshes/patchIdentifier/patchIdentifier.C | 21 +- .../meshes/patchIdentifier/patchIdentifier.H | 25 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 347 +- .../polyBoundaryMesh/polyBoundaryMesh.H | 57 +- .../polyBoundaryMeshTemplates.C | 46 + .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H | 21 + .../primitiveMesh/PatchTools/PatchTools.C | 1 + .../primitiveMesh/PatchTools/PatchTools.H | 18 + .../PatchTools/PatchToolsGatherAndMerge.C | 130 + src/foam/primitives/Lists/PackedBoolList.C | 375 + src/foam/primitives/Lists/PackedBoolList.H | 261 +- src/foam/primitives/Lists/PackedBoolListI.H | 276 + src/foam/primitives/Lists/hashedWordList.C | 159 + src/foam/primitives/Lists/hashedWordList.H | 146 + src/foam/primitives/Lists/hashedWordListI.H | 65 + src/foam/primitives/Lists/wordList.H | 2 + src/foam/primitives/Lists/wordReList.H | 10 +- src/foam/primitives/Scalar/ScalarTemplate.C | 10 +- src/foam/primitives/Scalar/ScalarTemplate.H | 115 +- src/foam/primitives/Scalar/doubleFloat.H | 22 +- .../Scalar/doubleScalar/doubleScalar.C | 7 +- .../Scalar/doubleScalar/doubleScalar.H | 26 + .../Scalar/floatScalar/floatScalar.C | 7 +- .../Scalar/floatScalar/floatScalar.H | 26 + .../longDoubleScalar/longDoubleScalar.C | 7 +- .../longDoubleScalar/longDoubleScalar.H | 38 +- src/foam/primitives/Scalar/scalar/scalar.H | 3 + src/foam/primitives/VectorSpace/VectorSpace.H | 1 + .../primitives/VectorSpace/VectorSpaceI.H | 15 +- .../primitives/functions/Function1/CSV/CSV.C | 301 + .../primitives/functions/Function1/CSV/CSV.H | 174 + .../functions/Function1/Constant/Constant.C | 102 + .../functions/Function1/Constant/Constant.H | 132 + .../functions/Function1/Function1/Function1.C | 149 + .../functions/Function1/Function1/Function1.H | 209 + .../Function1/Function1/Function1Fwd.H | 52 + .../Function1/Function1/Function1New.C | 73 + .../PolynomialEntry/PolynomialEntry.C | 210 + .../PolynomialEntry/PolynomialEntry.H | 151 + .../functions/Function1/Sine/Sine.C | 104 + .../functions/Function1/Sine/Sine.H | 178 + .../functions/Function1/Square/Square.C | 118 + .../functions/Function1/Square/Square.H | 185 + .../functions/Function1/Table/Table.C | 60 + .../functions/Function1/Table/Table.H | 114 + .../functions/Function1/Table/TableBase.C | 434 ++ .../functions/Function1/Table/TableBase.H | 185 + .../functions/Function1/TableFile/TableFile.C | 95 + .../functions/Function1/TableFile/TableFile.H | 137 + .../functions/Function1/makeDataEntries.C | 63 + .../Polynomial.C} | 198 +- .../Polynomial.H} | 81 +- .../PolynomialIO.C} | 2 +- .../functions/Polynomial/polynomialFunction.C | 403 + .../functions/Polynomial/polynomialFunction.H | 248 + .../functions/TimeFunction1/TimeFunction1.C | 142 + .../functions/TimeFunction1/TimeFunction1.H | 153 + src/foam/primitives/hashes/SHA1/SHA1.C | 150 +- src/foam/primitives/hashes/SHA1/SHA1.H | 43 +- src/foam/primitives/hashes/SHA1/SHA1Digest.C | 207 +- src/foam/primitives/hashes/SHA1/SHA1Digest.H | 96 +- src/foam/primitives/hashes/SHA1/SHA1I.H | 51 +- src/foam/primitives/ints/int/int.H | 31 +- src/foam/primitives/ints/int/intIO.C | 59 - src/foam/primitives/ints/int32/int32.C | 50 + src/foam/primitives/ints/int32/int32.H | 153 + src/foam/primitives/ints/int32/int32IO.C | 121 + src/foam/primitives/ints/int64/int64.C | 50 + src/foam/primitives/ints/int64/int64.H | 144 + .../keyTypeIO.C => ints/int64/int64IO.C} | 66 +- src/foam/primitives/ints/label/label.C | 48 +- src/foam/primitives/ints/label/label.H | 232 +- .../{long/long.H => label/labelSpecific.H} | 50 +- .../primitives/ints/longLong/longLongIO.C | 123 - src/foam/primitives/ints/uLabel/uLabel.C | 60 +- src/foam/primitives/ints/uLabel/uLabel.H | 160 +- .../primitives/ints/uLabel/uLabelSpecific.H | 0 src/foam/primitives/ints/uint/uint.H | 32 +- src/foam/primitives/ints/uint/uintIO.C | 52 - src/foam/primitives/ints/uint32/uint32.C | 50 + src/foam/primitives/ints/uint32/uint32.H | 138 + .../{ulong/ulongIO.C => uint32/uint32IO.C} | 36 +- src/foam/primitives/ints/uint64/uint64.C | 50 + src/foam/primitives/ints/uint64/uint64.H | 138 + .../ints/{long/longIO.C => uint64/uint64IO.C} | 39 +- src/foam/primitives/nullObject/nullObject.C | 34 + src/foam/primitives/nullObject/nullObject.H | 110 + src/foam/primitives/nullObject/nullObjectI.H | 65 + src/foam/primitives/ops/ops.H | 59 + .../primitives/strings/fileName/fileName.C | 239 +- .../primitives/strings/fileName/fileName.H | 78 +- src/foam/primitives/strings/keyType/keyType.C | 128 + src/foam/primitives/strings/keyType/keyType.H | 27 +- .../primitives/strings/keyType/keyTypeI.H | 3 - .../primitives/strings/string/foamString.C | 135 +- .../primitives/strings/string/foamString.H | 26 +- .../primitives/strings/string/foamStringI.H | 6 + .../primitives/strings/stringOps/stringOps.C | 937 +++ .../primitives/strings/stringOps/stringOps.H | 306 + .../strings/wordRe/{wordReIO.C => wordRe.C} | 21 +- src/foam/primitives/strings/wordRe/wordRe.H | 95 +- src/foam/primitives/strings/wordRe/wordReI.H | 39 +- src/foam/primitives/zero/zero.H | 45 +- src/foam/primitives/zero/zeroI.H | 6 +- .../immersedBoundaryFvPatchField.C | 7 +- .../immersedBoundarySolidBodyMotionFvMesh.C | 2 +- .../Templates/DsmcCloud/DsmcCloudTemplate.C | 4 +- .../mdTools/createAutoCorrelationFunctions.H | 2 +- .../molecule/moleculeCloud/moleculeCloud.C | 2 +- .../potential/potential/potential.C | 8 +- .../meshRefinement/meshRefinementTemplates.C | 32 +- .../containers/IODynList/IODynList.C | 7 +- .../containers/IOLongList/IOLongList.C | 7 +- src/meshTools/readSTLASCII.C | 2272 ++++++ .../distributedTriSurfaceMesh.C | 2 +- .../distributedTriSurfaceMeshTemplates.C | 13 +- .../searchableSurface/searchableSurface.C | 1 - .../tools/labelledTri/labelledTri.H | 25 + src/multiSolver/multiSolver/multiSolver.C | 6 +- src/postProcessing/functionObjects/Allwmake | 20 +- .../functionObjects/IO/IOFunctionObjectsDoc.H | 30 + .../functionObjects/IO/Make/files | 9 + .../functionObjects/IO/Make/options | 6 +- .../functionObjects/IO/controlDict | 123 + .../IO/partialWrite/IOpartialWrite.H | 49 + .../IO/partialWrite/partialWrite.C | 181 + .../IO/partialWrite/partialWrite.H | 223 + .../partialWrite/partialWriteFunctionObject.C | 46 + .../partialWrite/partialWriteFunctionObject.H | 54 + .../IO/partialWrite/partialWriteTemplates.C | 105 + .../IOremoveRegisteredObject.H} | 24 +- .../removeRegisteredObject.C | 111 + .../removeRegisteredObject.H | 174 + .../removeRegisteredObjectFunctionObject.C | 46 + .../removeRegisteredObjectFunctionObject.H | 54 + .../IO/writeDictionary/IOwriteDictionary.H | 49 + .../IO/writeDictionary/writeDictionary.C | 214 + .../IO/writeDictionary/writeDictionary.H | 162 + .../writeDictionaryFunctionObject.C | 42 + .../writeDictionaryFunctionObject.H | 54 + .../writeRegisteredObject.C | 77 +- .../writeRegisteredObject.H | 61 +- .../writeRegisteredObjectFunctionObject.H | 2 +- .../check/ggiCheck/ggiCheckFunctionObject.C | 10 +- .../check/ggiCheck/ggiCheckFunctionObject.H | 13 +- .../check/meshCheck/meshCheckFunctionObject.C | 8 +- .../check/meshCheck/meshCheckFunctionObject.H | 13 +- .../mixingPlaneCheckFunctionObject.C | 8 +- .../mixingPlaneCheckFunctionObject.H | 13 +- .../functionObjects/doc/functionObjects.dox | 94 + .../functionObjects/field/Make/files | 14 +- .../functionObjects/field/Make/options | 10 +- .../field/fieldAverage/controlDict | 18 +- .../fieldAverage/fieldAverage/fieldAverage.C | 285 +- .../fieldAverage/fieldAverage/fieldAverage.H | 212 +- .../fieldAverage/fieldAverageTemplates.C | 466 +- .../fieldAverageFunctionObject.H | 2 +- .../fieldAverageItem/fieldAverageItem.C | 40 +- .../fieldAverageItem/fieldAverageItem.H | 105 +- .../fieldAverageItem/fieldAverageItemIO.C | 48 +- .../IOfieldCoordinateSystemTransform.H | 50 + .../fieldCoordinateSystemTransform.C | 154 + .../fieldCoordinateSystemTransform.H | 206 + ...dCoordinateSystemTransformFunctionObject.C | 45 + ...dCoordinateSystemTransformFunctionObject.H | 54 + .../fieldCoordinateSystemTransformTemplates.C | 148 + .../postProcessingDict | 51 + .../field/fieldFunctionObjectsDoc.H | 33 + .../field/fieldMinMax/controlDict | 76 + .../field/fieldMinMax/fieldMinMax.C | 167 +- .../field/fieldMinMax/fieldMinMax.H | 103 +- .../fieldMinMax/fieldMinMaxFunctionObject.H | 2 +- .../field/fieldMinMax/fieldMinMaxTemplates.C | 252 +- .../field/fieldValues/cellSource/cellSource.C | 252 +- .../field/fieldValues/cellSource/cellSource.H | 111 +- .../cellSource/cellSourceTemplates.C | 94 +- .../field/fieldValues/controlDict | 38 +- .../field/fieldValues/faceSource/faceSource.C | 613 +- .../field/fieldValues/faceSource/faceSource.H | 258 +- .../faceSource/faceSourceTemplates.C | 293 +- .../field/fieldValues/fieldValue/fieldValue.C | 103 +- .../field/fieldValues/fieldValue/fieldValue.H | 90 +- .../fieldValues/fieldValue/fieldValueI.H | 13 + .../fieldValues/fieldValue/fieldValueNew.C | 80 + .../fieldValue/fieldValueTemplates.C | 33 +- .../fieldValueDelta/IOfieldValueDelta.H | 50 + .../fieldValueDelta/fieldValueDelta.C | 219 + .../fieldValueDelta/fieldValueDelta.H | 221 + .../fieldValueDeltaFunctionObject.C | 46 + .../fieldValueDeltaFunctionObject.H | 54 + .../fieldValueDeltaTemplates.C | 132 + .../field/maxFieldCell/maxFieldCell.C | 2 +- .../field/maxFieldCell/maxFieldCell.H | 10 +- .../field/minMaxField/minMaxField.C | 2 +- .../field/minMaxField/minMaxField.H | 10 +- .../field/nearWallFields/IOnearWallFields.H | 49 + .../field/nearWallFields/controlDict | 78 + .../field/nearWallFields/findCellParticle.C | 237 + .../field/nearWallFields/findCellParticle.H | 266 + .../nearWallFields/findCellParticleCloud.C} | 9 +- .../field/nearWallFields/nearWallFields.C | 428 ++ .../field/nearWallFields/nearWallFields.H | 252 + .../nearWallFieldsFunctionObject.C | 46 + .../nearWallFieldsFunctionObject.H | 54 + .../nearWallFields/nearWallFieldsTemplates.C | 146 + .../field/processorField/IOprocessorField.H | 49 + .../field/processorField/postProcessingDict | 36 + .../field/processorField/processorField.C | 150 + .../field/processorField/processorField.H | 172 + .../processorFieldFunctionObject.C | 42 + .../processorFieldFunctionObject.H | 54 + .../readFields/IOreadFields.H} | 12 +- .../field/readFields/postProcessingDict | 54 + .../field/readFields/readFields.C | 68 +- .../field/readFields/readFields.H | 36 +- .../regionSizeDistribution.C | 873 +++ .../regionSizeDistribution.H | 311 + .../regionSizeDistributionFunctionObject.C | 46 + .../regionSizeDistributionFunctionObject.H | 54 + .../regionSizeDistributionTemplates.C | 81 + .../field/streamLine/controlDict | 106 + .../field/streamLine/streamLine.C | 779 ++ .../field/streamLine/streamLine.H | 294 + .../streamLine/streamLineFunctionObject.C | 42 + .../streamLine/streamLineFunctionObject.H | 54 + .../field/streamLine/streamLineParticle.C | 507 ++ .../field/streamLine/streamLineParticle.H | 309 + .../streamLine/streamLineParticleCloud.C | 64 + .../streamLine/streamLineParticleCloud.H | 96 + .../surfaceInterpolateFields.C | 78 +- .../surfaceInterpolateFields.H | 43 +- .../surfaceInterpolateFieldsFunctionObject.C | 6 +- .../surfaceInterpolateFieldsFunctionObject.H | 4 +- .../surfaceInterpolateFieldsTemplates.C | 4 +- .../field/wallBoundedStreamLine/controlDict | 148 + .../wallBoundedParticle.C | 437 ++ .../wallBoundedParticle.H | 356 + .../wallBoundedParticleTemplates.C | 562 ++ .../wallBoundedStreamLine.C | 904 +++ .../wallBoundedStreamLine.H | 300 + .../wallBoundedStreamLineFunctionObject.C | 42 + .../wallBoundedStreamLineFunctionObject.H | 55 + .../wallBoundedStreamLineParticle.C | 435 ++ .../wallBoundedStreamLineParticle.H | 252 + .../wallBoundedStreamLineParticleCloud.C | 64 + .../wallBoundedStreamLineParticleCloud.H | 99 + .../forces/forceCoeffs/forceCoeffs.H | 4 + .../functionObjects/forces/forces/forces.C | 2 +- .../functionObjects/forces/forces/forces.H | 4 + .../forces/forcesFunctionObjectsDoc.H | 33 + .../functionObjects/fvTools/Make/files | 10 + .../functionObjects/fvTools/Make/options | 5 + .../fvTools/calcFvcDiv/IOcalcFvcDiv.H | 49 + .../fvTools/calcFvcDiv/calcFvcDiv.C | 188 + .../fvTools/calcFvcDiv/calcFvcDiv.H | 181 + .../calcFvcDiv/calcFvcDivFunctionObject.C | 42 + .../calcFvcDiv/calcFvcDivFunctionObject.H | 53 + .../fvTools/calcFvcDiv/calcFvcDivTemplates.C | 54 + .../fvTools/calcFvcGrad/IOcalcFvcGrad.H | 49 + .../fvTools/calcFvcGrad/calcFvcGrad.C | 150 + .../fvTools/calcFvcGrad/calcFvcGrad.H | 184 + .../calcFvcGrad/calcFvcGradFunctionObject.C | 42 + .../calcFvcGrad/calcFvcGradFunctionObject.H | 53 + .../calcFvcGrad/calcFvcGradTemplates.C | 122 + .../fvTools/calcMag/IOcalcMag.H | 49 + .../functionObjects/fvTools/calcMag/calcMag.C | 153 + .../functionObjects/fvTools/calcMag/calcMag.H | 178 + .../fvTools/calcMag/calcMagFunctionObject.C | 42 + .../fvTools/calcMag/calcMagFunctionObject.H | 53 + .../fvTools/calcMag/calcMagTemplates.C | 108 + .../fvTools/doc/fvToolsFunctionObjectsDoc.H | 30 + .../functionObjects/jobControl/Make/files | 4 + .../functionObjects/jobControl/Make/options | 0 .../abortCalculation/IOabortCalculation.H | 49 + .../abortCalculation/abortCalculation.C | 194 + .../abortCalculation/abortCalculation.H | 174 + .../abortCalculationFunctionObject.C | 42 + .../abortCalculationFunctionObject.H | 54 + .../jobControl/jobControlFunctionObjectsDoc.H | 30 + .../functionObjects/systemCall/Make/options | 9 - .../functionObjects/systemCall/controlDict | 79 + .../functionObjects/systemCall/systemCall.C | 32 +- .../functionObjects/systemCall/systemCall.H | 66 +- .../systemCall/systemCallFunctionObject.H | 2 +- .../utilities/CourantNo/CourantNo.C | 192 + .../utilities/CourantNo/CourantNo.H | 160 + .../CourantNo/CourantNoFunctionObject.C | 42 + .../CourantNo/CourantNoFunctionObject.H | 53 + .../utilities/CourantNo/IOCourantNo.H | 49 + .../utilities/Lambda2/IOLambda2.H | 49 + .../utilities/Lambda2/Lambda2.C | 176 + .../utilities/Lambda2/Lambda2.H | 155 + .../utilities/Lambda2/Lambda2FunctionObject.C | 42 + .../utilities/Lambda2/Lambda2FunctionObject.H | 53 + .../utilities/MachNumber/MachNumber.C | 2 +- .../utilities/MachNumber/MachNumber.H | 10 +- .../functionObjects/utilities/Make/files | 37 + .../functionObjects/utilities/Make/options | 25 +- .../utilities/Peclet/IOPeclet.H | 49 + .../functionObjects/utilities/Peclet/Peclet.C | 228 + .../functionObjects/utilities/Peclet/Peclet.H | 157 + .../utilities/Peclet/PecletFunctionObject.C | 42 + .../utilities/Peclet/PecletFunctionObject.H | 53 + .../functionObjects/utilities/Q/IOQ.H | 49 + .../functionObjects/utilities/Q/Q.C | 169 + .../functionObjects/utilities/Q/Q.H | 158 + .../utilities/Q/QFunctionObject.C | 42 + .../utilities/Q/QFunctionObject.H | 53 + .../codedFunctionObject/codedFunctionObject.C | 305 + .../codedFunctionObject/codedFunctionObject.H | 210 + .../utilities/divFlux/divFlux.C | 2 +- .../utilities/divFlux/divFlux.H | 10 +- .../doc/utilitiesFunctionObjectsDoc.H | 30 + .../utilities/dsmcFields/dsmcFields.C | 19 +- .../utilities/dsmcFields/dsmcFields.H | 16 +- .../dsmcFields/dsmcFieldsFunctionObject.H | 2 +- .../utilities/pressureTools/IOpressureTools.H | 49 + .../utilities/pressureTools/pressureTools.C | 352 + .../utilities/pressureTools/pressureTools.H | 269 + .../pressureToolsFunctionObject.C | 42 + .../pressureToolsFunctionObject.H | 54 + .../utilities/residuals/IOresiduals.H | 49 + .../utilities/residuals/residuals.C | 153 + .../utilities/residuals/residuals.H | 196 + .../residuals/residualsFunctionObject.C | 42 + .../residuals/residualsFunctionObject.H | 54 + .../utilities/residuals/residualsTemplates.C | 59 + .../scalarTransport/IOscalarTransport.H | 49 + .../scalarTransport/scalarTransport.C | 304 + .../scalarTransport/scalarTransport.H | 188 + .../scalarTransportFunctionObject.C | 42 + .../scalarTransportFunctionObject.H | 54 + .../setTimeStep/setTimeStepFunctionObject.C | 152 + .../setTimeStep/setTimeStepFunctionObject.H | 160 + .../utilities/staticPressure/staticPressure.H | 4 + .../IOtimeActivatedFileUpdate.H | 49 + .../timeActivatedFileUpdate/controlDict | 68 + .../timeActivatedFileUpdate.C | 154 + .../timeActivatedFileUpdate.H | 180 + .../timeActivatedFileUpdateFunctionObject.C | 46 + .../timeActivatedFileUpdateFunctionObject.H | 54 + .../turbulenceFields/IOturbulenceFields.H | 49 + .../turbulenceFields/postProcessingDict | 35 + .../turbulenceFields/turbulenceFields.C | 297 + .../turbulenceFields/turbulenceFields.H | 246 + .../turbulenceFieldsFunctionObject.C | 42 + .../turbulenceFieldsFunctionObject.H | 54 + .../turbulenceFieldsTemplates.C | 81 + .../utilities/vorticity/IOvorticity.H | 49 + .../utilities/vorticity/vorticity.C | 169 + .../utilities/vorticity/vorticity.H | 153 + .../vorticity/vorticityFunctionObject.C | 42 + .../vorticity/vorticityFunctionObject.H | 53 + .../wallShearStress/IOwallShearStress.H | 49 + .../wallShearStress/wallShearStress.C | 304 + .../wallShearStress/wallShearStress.H | 205 + .../wallShearStressFunctionObject.C | 42 + .../wallShearStressFunctionObject.H | 54 + src/sampling/Make/files | 22 +- src/sampling/Make/options | 4 +- src/sampling/probes/probes.C | 492 +- src/sampling/probes/probes.H | 134 +- .../probesFunctionObject.C | 0 .../probesFunctionObject.H | 2 +- src/sampling/probes/probesGrouping.C | 156 + src/sampling/probes/probesTemplates.C | 191 +- src/sampling/sampledSet/coordSet/coordSet.C | 89 +- src/sampling/sampledSet/coordSet/coordSet.H | 64 +- .../sampledSet/sampledSets/sampledSets.C | 228 +- .../sampledSet/sampledSets/sampledSets.H | 60 +- .../sampledSets/sampledSetsGrouping.C | 151 + .../sampledSets/sampledSetsTemplates.C | 141 +- .../sampledCuttingPlane/sampledCuttingPlane.C | 1 + .../sampledCuttingPlane/sampledCuttingPlane.H | 3 + .../sampledCuttingPlaneTemplates.C | 20 +- .../sampledPatchInternalField.C | 245 + .../sampledPatchInternalField.H | 186 + .../sampledPatchInternalFieldTemplates.C | 143 + .../sampledSurface/sampledSurface.C | 71 +- .../sampledSurface/sampledSurface.H | 51 +- .../sampledSurface/sampledSurfaceTemplates.C | 62 +- .../sampledSurfaces/sampledSurfaces.C | 330 +- .../sampledSurfaces/sampledSurfaces.H | 110 +- .../sampledSurfaces/sampledSurfacesGrouping.C | 86 + .../sampledSurfacesTemplates.C | 255 +- .../writers/dx/dxSurfaceWriter.C | 142 +- .../writers/dx/dxSurfaceWriter.H | 135 +- .../writers/ensight/ensightPTraits.C | 46 + .../writers/ensight/ensightPTraits.H | 108 + .../writers/ensight/ensightSurfaceWriter.C | 200 + .../writers/ensight/ensightSurfaceWriter.H | 197 + .../writers/foamFile/foamFileSurfaceWriter.C | 117 +- .../writers/foamFile/foamFileSurfaceWriter.H | 137 +- .../writers/makeSurfaceWriterMethods.H | 94 + .../writers/nastran/nastranSurfaceWriter.C | 412 + .../writers/nastran/nastranSurfaceWriter.H | 303 + .../nastran/nastranSurfaceWriterTemplates.C | 229 + .../writers/proxy/proxySurfaceWriter.C | 32 +- .../writers/proxy/proxySurfaceWriter.H | 40 +- .../writers/raw/rawSurfaceWriter.C | 651 +- .../writers/raw/rawSurfaceWriter.H | 209 +- .../writers/starcd/starcdSurfaceWriter.C | 172 + .../writers/starcd/starcdSurfaceWriter.H | 181 + .../sampledSurface/writers/surfaceWriter.C | 79 +- .../sampledSurface/writers/surfaceWriter.H | 153 +- .../writers/vtk/vtkSurfaceWriter.C | 175 +- .../writers/vtk/vtkSurfaceWriter.H | 135 +- .../crackerFvMesh/crackerFvMesh.C | 2 +- .../constitutiveModel/constitutiveModel.C | 4 +- src/solidModels/thermalModel/thermalModel.C | 2 +- src/surfMesh/STLsurfaceFormatASCII.C | 2229 ++++++ .../basic/basicThermo/basicThermo.C | 2 +- .../basicPsiThermo/newBasicPsiThermo.C | 2 +- .../basicRhoThermo/newBasicRhoThermo.C | 2 +- .../basicChemistryModel/basicChemistryModel.C | 2 +- .../psiChemistryModel/newPsiChemistryModel.C | 2 +- .../rhoChemistryModel/newRhoChemistryModel.C | 2 +- .../laminarFlameSpeed/newLaminarFlameSpeed.C | 2 +- .../interpolationLookUpTable.C | 2 +- .../radiationModel/newRadiationModel.C | 2 +- .../radiationModel/radiationModel.C | 4 +- .../chemkinReader/chemkinLexer.L | 2 +- .../reactionThermo/chemkinLexer.C | 6724 +++++++++++++++++ .../hCombustionThermo/newhCombustionThermo.C | 4 +- .../newhhuCombustionThermo.C | 2 +- .../newhsCombustionThermo.C | 4 +- .../hReactionThermo/newhReactionThermo.C | 4 +- .../hsReactionThermo/newhsReactionThermo.C | 4 +- .../icoPolynomial/icoPolynomial.H | 2 +- .../icoPolynomial/icoPolynomialI.H | 2 +- .../thermo/hPolynomial/hPolynomialThermo.C | 8 +- .../thermo/hPolynomial/hPolynomialThermo.H | 2 +- .../thermo/hPolynomial/hPolynomialThermoI.H | 6 +- .../polynomial/polynomialTransport.H | 2 +- .../polynomial/polynomialTransportI.H | 4 +- .../transportModel/transportModel.C | 2 +- .../viscoelasticModel/viscoelasticModel.C | 2 +- .../compressible/LES/LESModel/LESModel.C | 4 +- .../compressible/RAS/LRR/LRR.H | 9 +- .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 9 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 9 +- .../compressible/RAS/RASModel/RASModel.C | 4 +- .../compressible/RAS/RASModel/RASModel.H | 8 +- .../RAS/RNGkEpsilon/RNGkEpsilon.H | 6 + .../RAS/SpalartAllmaras/SpalartAllmaras.H | 9 +- .../regionProperties.C | 2 +- .../compressible/RAS/kEpsilon/kEpsilon.H | 6 + .../compressible/RAS/kOmegaSST/kOmegaSST.H | 9 +- .../compressible/RAS/laminar/laminar.C | 21 + .../compressible/RAS/laminar/laminar.H | 3 + .../RAS/realizableKE/realizableKE.H | 9 +- .../turbulenceModel/laminar/laminar.C | 21 + .../turbulenceModel/laminar/laminar.H | 3 + .../turbulenceModel/turbulenceModel.C | 53 +- .../turbulenceModel/turbulenceModel.H | 11 +- .../incompressible/RAS/RASModel/RASModel.C | 2 +- .../pressureGradientFunctionObject.C | 25 +- .../pressureGradientFunctionObject.H | 25 +- .../velocityConvectionFunctionObject.C | 25 +- .../velocityConvectionFunctionObject.H | 25 +- .../kNonEqWallFunctionFvPatchScalarField.C | 2 +- .../nutMEWTWallFunctionFvPatchScalarField.H | 2 +- .../omegaCWTWallFunctionFvPatchScalarField.C | 2 +- .../omegaMEWTWallFunctionFvPatchScalarField.C | 2 +- .../omegaMEWTWallFunctionFvPatchScalarField.H | 2 +- .../turbulenceModel/turbulenceModel.C | 2 +- .../laminar/shockTube/system/sampleDict | 2 + .../freeSpacePeriodic/system/controlDict | 14 +- .../freeSpaceStream/system/controlDict | 14 +- .../supersonicCorner/system/controlDict | 14 +- .../dsmcFoam/wedge15Ma5/system/controlDict | 16 +- .../mhdFoam/hartmann/system/sampleDict | 2 + .../oneDimensionalSoilTransport/0/U | 6 +- .../oneDimensionalSoilTransport/0/err | 6 +- .../oneDimensionalSoilTransport/0/psi | 6 +- .../oneDimensionalSoilTransport/0/theta | 6 +- .../oneDimensionalSoilTransport/0/usf | 6 +- .../oneDimensionalSoilTransport/0/vuz | 6 +- .../constant/polyMesh/blockMeshDict | 7 +- .../constant/transportProperties | 6 +- .../system/controlDict | 6 +- .../system/fvSchemes | 6 +- .../system/fvSolution | 6 +- .../RBFMotionFunctionObject.C | 2 +- .../RBFMotionFunctionObject.H | 7 +- .../verticalChannel/system/controlDict | 2 +- .../cfMesh/cartesianMesh/sawOctree/Allrun | 2 +- .../circCylinder3d/constant/dynamicMeshDict | 2 +- .../ras/sloshingTank2D/system/controlDict | 1 + .../ras/sloshingTank2D3DoF/system/controlDict | 1 + .../stressedFoam/plateHole/system/sampleDict | 2 + .../DCPP/system/sampleDict | 2 + .../FENE-P/system/sampleDict | 2 + .../Giesekus/system/sampleDict | 2 + .../Oldroyd-B/system/sampleDict | 2 + .../PTT-Linear/system/sampleDict | 2 + .../viscoelasticFluidFoam/UCM/0/tau | 1 + .../UCM/constant/viscoelasticProperties | 1 + .../UCM/system/controlDict | 1 + .../UCM/system/fvSolution | 1 - .../incompressible/pisoFoam/NACA-4412/0/p | 2 +- .../pisoFoam/NACA-4412/constant/RASProperties | 6 +- .../NACA-4412/constant/polyMesh/boundary | 2 +- .../NACA-4412/constant/transportProperties | 6 +- .../incompressible/pisoFoam/NACA-4412/save/p | 2 +- .../pisoFoam/NACA-4412/system/controlDict | 2 +- .../pisoFoam/NACA-4412/system/fvSchemes | 2 +- .../pisoFoam/NACA-4412/system/fvSolution | 2 +- .../NACA-4412/system/fvSolution-sample | 2 +- .../pisoFoam/NACA-4412/system/sampleDict | 6 +- .../simpleFoam/backwardFacingStep/0/U | 2 +- .../simpleFoam/backwardFacingStep/0/epsilon | 2 +- .../simpleFoam/backwardFacingStep/0/k | 2 +- .../simpleFoam/backwardFacingStep/0/omega | 2 +- .../simpleFoam/backwardFacingStep/0/p | 2 +- .../backwardFacingStep/constant/RASProperties | 2 +- .../constant/polyMesh/blockMeshDict | 2 +- .../constant/transportProperties | 2 +- .../simpleFoam/backwardFacingStep/save/U | 2 +- .../backwardFacingStep/save/epsilon | 2 +- .../simpleFoam/backwardFacingStep/save/k | 2 +- .../simpleFoam/backwardFacingStep/save/omega | 2 +- .../simpleFoam/backwardFacingStep/save/p | 2 +- .../backwardFacingStep/system/controlDict | 2 +- .../system/decomposeParDict | 2 +- .../backwardFacingStep/system/fvSchemes | 2 +- .../backwardFacingStep/system/fvSolution | 2 +- wmake/rules/General/general | 3 +- wmake/src/Makefile | 79 - wmake/wmake | 79 +- 929 files changed, 73958 insertions(+), 8367 deletions(-) create mode 100644 etc/codeTemplates/BC/BC.C create mode 100644 etc/codeTemplates/BC/BC.H rename src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C => etc/codeTemplates/BC/BCs.C (93%) rename src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C => etc/codeTemplates/BC/BCs.H (84%) rename src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C => etc/codeTemplates/BC/BCsFwd.H (83%) create mode 100644 etc/codeTemplates/BC/Make/files create mode 100644 etc/codeTemplates/BC/Make/options create mode 100644 etc/codeTemplates/app/Make/files create mode 100644 etc/codeTemplates/app/Make/options create mode 100644 etc/codeTemplates/app/app.C create mode 100644 etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.C create mode 100644 etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.H create mode 100644 etc/codeTemplates/dynamicCode/IOfunctionObjectTemplate.H rename src/foam/primitives/ints/ulong/ulong.H => etc/codeTemplates/dynamicCode/codeStreamTemplate.C (72%) create mode 100644 etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C create mode 100644 etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H create mode 100644 etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C create mode 100644 etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H create mode 100644 etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C create mode 100644 etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H create mode 100644 etc/codeTemplates/dynamicCode/functionObjectTemplate.C create mode 100644 etc/codeTemplates/dynamicCode/functionObjectTemplate.H create mode 100644 etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C create mode 100644 etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H create mode 100644 etc/codeTemplates/foamCommentStyles create mode 100755 etc/codeTemplates/foamScript create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECT.C create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECT.H create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C create mode 100644 etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H create mode 100644 etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H create mode 100644 etc/codeTemplates/functionObject/Make/files create mode 100644 etc/codeTemplates/functionObject/Make/options create mode 100644 etc/codeTemplates/source/_Template.C rename src/foam/db/IOstreams/token/CompoundToken/CompoundToken.H => etc/codeTemplates/source/_Template.H (62%) create mode 100644 etc/codeTemplates/source/_TemplateApp.C rename src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C => etc/codeTemplates/source/_TemplateI.H (74%) create mode 100644 etc/codeTemplates/source/_TemplateIO.C create mode 100755 etc/codeTemplates/source/foamNewSource create mode 100644 etc/codeTemplates/template/_TemplateTemplate.C create mode 100644 etc/codeTemplates/template/_TemplateTemplate.H rename src/foam/primitives/ints/longLong/longLong.H => etc/codeTemplates/template/_TemplateTemplateI.H (69%) create mode 100644 etc/codeTemplates/template/_TemplateTemplateIO.C create mode 100755 etc/codeTemplates/template/foamNewTemplate create mode 100644 src/OSspecific/POSIX/fileMonitor.C create mode 100644 src/OSspecific/POSIX/fileMonitor.H create mode 100644 src/OSspecific/POSIX/memInfo/memInfo.C create mode 100644 src/OSspecific/POSIX/memInfo/memInfo.H create mode 100644 src/OSspecific/POSIX/memInfo/memInfoIO.C create mode 100644 src/foam/db/IOobjects/CompactIOField/CompactIOField.C create mode 100644 src/foam/db/IOobjects/CompactIOField/CompactIOField.H create mode 100644 src/foam/db/IOobjects/CompactIOList/CompactIOList.C create mode 100644 src/foam/db/IOobjects/CompactIOList/CompactIOList.H create mode 100644 src/foam/db/dictionary/functionEntries/calcEntry/calcEntry.C create mode 100644 src/foam/db/dictionary/functionEntries/calcEntry/calcEntry.H create mode 100644 src/foam/db/dictionary/functionEntries/codeStream/codeStream.C create mode 100644 src/foam/db/dictionary/functionEntries/codeStream/codeStream.H create mode 100644 src/foam/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.C create mode 100644 src/foam/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H create mode 100644 src/foam/db/dynamicLibrary/codedBase/codedBase.C create mode 100644 src/foam/db/dynamicLibrary/codedBase/codedBase.H rename src/foam/db/{ => dynamicLibrary}/dlLibraryTable/dlLibraryTable.C (51%) rename src/foam/db/{ => dynamicLibrary}/dlLibraryTable/dlLibraryTable.H (75%) rename src/foam/db/{ => dynamicLibrary}/dlLibraryTable/dlLibraryTableTemplates.C (87%) create mode 100644 src/foam/db/dynamicLibrary/dynamicCode/dynamicCode.C create mode 100644 src/foam/db/dynamicLibrary/dynamicCode/dynamicCode.H create mode 100644 src/foam/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C create mode 100644 src/foam/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H create mode 100644 src/foam/db/functionObjects/functionObjectFile/functionObjectFile.C create mode 100644 src/foam/db/functionObjects/functionObjectFile/functionObjectFile.H create mode 100644 src/foam/db/functionObjects/functionObjectFile/functionObjectFileTemplates.C create mode 100644 src/foam/db/functionObjects/functionObjectList/postProcess.H create mode 100644 src/foam/global/argList/argListI.H create mode 100644 src/foam/global/debug/simpleObjectRegistry.H rename src/{sampling/sampledSurface/writers/null/nullSurfaceWriter.H => foam/global/debug/simpleRegIOobject.H} (66%) create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/tableReader.C create mode 100644 src/foam/interpolations/interpolationTable/tableReaders/tableReader.H rename src/{sampling/sampledSurface/writers/proxy/proxySurfaceWriterRunTime.C => foam/interpolations/interpolationTable/tableReaders/tableReaders.C} (75%) rename src/{sampling/sampledSurface/writers/surfaceWriters.H => foam/interpolations/interpolationTable/tableReaders/tableReaders.H} (53%) create mode 100644 src/foam/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.C create mode 100644 src/foam/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H rename src/{sampling/sampledSurface/writers/surfaceWriters.C => foam/interpolations/interpolationWeights/interpolationWeights/interpolationWeightsTemplates.C} (66%) create mode 100644 src/foam/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.C create mode 100644 src/foam/interpolations/interpolationWeights/linearInterpolationWeights/linearInterpolationWeights.H create mode 100644 src/foam/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.C create mode 100644 src/foam/interpolations/interpolationWeights/splineInterpolationWeights/splineInterpolationWeights.H create mode 100644 src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTable.C create mode 100644 src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTable.H create mode 100644 src/foam/interpolations/uniformInterpolationTable/uniformInterpolationTableI.H create mode 100644 src/foam/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMeshTemplates.C create mode 100644 src/foam/meshes/primitiveMesh/PatchTools/PatchToolsGatherAndMerge.C create mode 100644 src/foam/primitives/Lists/PackedBoolList.C create mode 100644 src/foam/primitives/Lists/PackedBoolListI.H create mode 100644 src/foam/primitives/Lists/hashedWordList.C create mode 100644 src/foam/primitives/Lists/hashedWordList.H create mode 100644 src/foam/primitives/Lists/hashedWordListI.H create mode 100644 src/foam/primitives/functions/Function1/CSV/CSV.C create mode 100644 src/foam/primitives/functions/Function1/CSV/CSV.H create mode 100644 src/foam/primitives/functions/Function1/Constant/Constant.C create mode 100644 src/foam/primitives/functions/Function1/Constant/Constant.H create mode 100644 src/foam/primitives/functions/Function1/Function1/Function1.C create mode 100644 src/foam/primitives/functions/Function1/Function1/Function1.H create mode 100644 src/foam/primitives/functions/Function1/Function1/Function1Fwd.H create mode 100644 src/foam/primitives/functions/Function1/Function1/Function1New.C create mode 100644 src/foam/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C create mode 100644 src/foam/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H create mode 100644 src/foam/primitives/functions/Function1/Sine/Sine.C create mode 100644 src/foam/primitives/functions/Function1/Sine/Sine.H create mode 100644 src/foam/primitives/functions/Function1/Square/Square.C create mode 100644 src/foam/primitives/functions/Function1/Square/Square.H create mode 100644 src/foam/primitives/functions/Function1/Table/Table.C create mode 100644 src/foam/primitives/functions/Function1/Table/Table.H create mode 100644 src/foam/primitives/functions/Function1/Table/TableBase.C create mode 100644 src/foam/primitives/functions/Function1/Table/TableBase.H create mode 100644 src/foam/primitives/functions/Function1/TableFile/TableFile.C create mode 100644 src/foam/primitives/functions/Function1/TableFile/TableFile.H create mode 100644 src/foam/primitives/functions/Function1/makeDataEntries.C rename src/foam/primitives/functions/{PolynomialTemplate/PolynomialTemplate.C => Polynomial/Polynomial.C} (52%) rename src/foam/primitives/functions/{PolynomialTemplate/PolynomialTemplate.H => Polynomial/Polynomial.H} (60%) rename src/foam/primitives/functions/{PolynomialTemplate/PolynomialTemplateIO.C => Polynomial/PolynomialIO.C} (98%) create mode 100644 src/foam/primitives/functions/Polynomial/polynomialFunction.C create mode 100644 src/foam/primitives/functions/Polynomial/polynomialFunction.H create mode 100644 src/foam/primitives/functions/TimeFunction1/TimeFunction1.C create mode 100644 src/foam/primitives/functions/TimeFunction1/TimeFunction1.H create mode 100644 src/foam/primitives/ints/int32/int32.C create mode 100644 src/foam/primitives/ints/int32/int32.H create mode 100644 src/foam/primitives/ints/int32/int32IO.C create mode 100644 src/foam/primitives/ints/int64/int64.C create mode 100644 src/foam/primitives/ints/int64/int64.H rename src/foam/primitives/{strings/keyType/keyTypeIO.C => ints/int64/int64IO.C} (60%) rename src/foam/primitives/ints/{long/long.H => label/labelSpecific.H} (76%) delete mode 100644 src/foam/primitives/ints/longLong/longLongIO.C create mode 100644 src/foam/primitives/ints/uLabel/uLabelSpecific.H create mode 100644 src/foam/primitives/ints/uint32/uint32.C create mode 100644 src/foam/primitives/ints/uint32/uint32.H rename src/foam/primitives/ints/{ulong/ulongIO.C => uint32/uint32IO.C} (72%) create mode 100644 src/foam/primitives/ints/uint64/uint64.C create mode 100644 src/foam/primitives/ints/uint64/uint64.H rename src/foam/primitives/ints/{long/longIO.C => uint64/uint64IO.C} (72%) create mode 100644 src/foam/primitives/nullObject/nullObject.C create mode 100644 src/foam/primitives/nullObject/nullObject.H create mode 100644 src/foam/primitives/nullObject/nullObjectI.H create mode 100644 src/foam/primitives/strings/keyType/keyType.C create mode 100644 src/foam/primitives/strings/stringOps/stringOps.C create mode 100644 src/foam/primitives/strings/stringOps/stringOps.H rename src/foam/primitives/strings/wordRe/{wordReIO.C => wordRe.C} (80%) create mode 100644 src/meshTools/readSTLASCII.C create mode 100644 src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H create mode 100644 src/postProcessing/functionObjects/IO/controlDict create mode 100644 src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H create mode 100644 src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C create mode 100644 src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H create mode 100644 src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C create mode 100644 src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.H create mode 100644 src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C rename src/{sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterRunTime.C => postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H} (80%) create mode 100644 src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C create mode 100644 src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H create mode 100644 src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C create mode 100644 src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.H create mode 100644 src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H create mode 100644 src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C create mode 100644 src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H create mode 100644 src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C create mode 100644 src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.H create mode 100644 src/postProcessing/functionObjects/doc/functionObjects.dox create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/IOfieldCoordinateSystemTransform.H create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformFunctionObject.H create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C create mode 100644 src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict create mode 100644 src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H create mode 100644 src/postProcessing/functionObjects/field/fieldMinMax/controlDict create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/IOfieldValueDelta.H create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaFunctionObject.H create mode 100644 src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/IOnearWallFields.H create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/controlDict create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.C create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/findCellParticle.H rename src/{sampling/sampledSurface/writers/vtk/vtkSurfaceWriterRunTime.C => postProcessing/functionObjects/field/nearWallFields/findCellParticleCloud.C} (88%) create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsFunctionObject.H create mode 100644 src/postProcessing/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C create mode 100644 src/postProcessing/functionObjects/field/processorField/IOprocessorField.H create mode 100644 src/postProcessing/functionObjects/field/processorField/postProcessingDict create mode 100644 src/postProcessing/functionObjects/field/processorField/processorField.C create mode 100644 src/postProcessing/functionObjects/field/processorField/processorField.H create mode 100644 src/postProcessing/functionObjects/field/processorField/processorFieldFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/processorField/processorFieldFunctionObject.H rename src/postProcessing/functionObjects/{utilities/dsmcFields/IOdsmcFields.C => field/readFields/IOreadFields.H} (88%) create mode 100644 src/postProcessing/functionObjects/field/readFields/postProcessingDict create mode 100644 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C create mode 100644 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H create mode 100644 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistributionFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistributionFunctionObject.H create mode 100644 src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C create mode 100644 src/postProcessing/functionObjects/field/streamLine/controlDict create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLine.C create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLine.H create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.H create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C create mode 100644 src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.H create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.C create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticle.H create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedParticleTemplates.C create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.C create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineFunctionObject.H create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.C create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticle.H create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.C create mode 100644 src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.H create mode 100644 src/postProcessing/functionObjects/forces/forcesFunctionObjectsDoc.H create mode 100644 src/postProcessing/functionObjects/fvTools/Make/files create mode 100644 src/postProcessing/functionObjects/fvTools/Make/options create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C create mode 100644 src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H create mode 100644 src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C create mode 100644 src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H create mode 100644 src/postProcessing/functionObjects/jobControl/Make/files create mode 100644 src/postProcessing/functionObjects/jobControl/Make/options create mode 100644 src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H create mode 100644 src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C create mode 100644 src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H create mode 100644 src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C create mode 100644 src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H create mode 100644 src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H create mode 100644 src/postProcessing/functionObjects/systemCall/controlDict create mode 100644 src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.C create mode 100644 src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H create mode 100644 src/postProcessing/functionObjects/utilities/CourantNo/CourantNoFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/CourantNo/CourantNoFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/CourantNo/IOCourantNo.H create mode 100644 src/postProcessing/functionObjects/utilities/Lambda2/IOLambda2.H create mode 100644 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.C create mode 100644 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H create mode 100644 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2FunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/Lambda2/Lambda2FunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/Peclet/IOPeclet.H create mode 100644 src/postProcessing/functionObjects/utilities/Peclet/Peclet.C create mode 100644 src/postProcessing/functionObjects/utilities/Peclet/Peclet.H create mode 100644 src/postProcessing/functionObjects/utilities/Peclet/PecletFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/Peclet/PecletFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/Q/IOQ.H create mode 100644 src/postProcessing/functionObjects/utilities/Q/Q.C create mode 100644 src/postProcessing/functionObjects/utilities/Q/Q.H create mode 100644 src/postProcessing/functionObjects/utilities/Q/QFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/Q/QFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/doc/utilitiesFunctionObjectsDoc.H create mode 100644 src/postProcessing/functionObjects/utilities/pressureTools/IOpressureTools.H create mode 100644 src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C create mode 100644 src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H create mode 100644 src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/residuals/IOresiduals.H create mode 100644 src/postProcessing/functionObjects/utilities/residuals/residuals.C create mode 100644 src/postProcessing/functionObjects/utilities/residuals/residuals.H create mode 100644 src/postProcessing/functionObjects/utilities/residuals/residualsFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/residuals/residualsFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/residuals/residualsTemplates.C create mode 100644 src/postProcessing/functionObjects/utilities/scalarTransport/IOscalarTransport.H create mode 100644 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C create mode 100644 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H create mode 100644 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransportFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransportFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/IOtimeActivatedFileUpdate.H create mode 100644 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict create mode 100644 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C create mode 100644 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H create mode 100644 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdateFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/IOturbulenceFields.H create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.C create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFieldsTemplates.C create mode 100644 src/postProcessing/functionObjects/utilities/vorticity/IOvorticity.H create mode 100644 src/postProcessing/functionObjects/utilities/vorticity/vorticity.C create mode 100644 src/postProcessing/functionObjects/utilities/vorticity/vorticity.H create mode 100644 src/postProcessing/functionObjects/utilities/vorticity/vorticityFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/vorticity/vorticityFunctionObject.H create mode 100644 src/postProcessing/functionObjects/utilities/wallShearStress/IOwallShearStress.H create mode 100644 src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C create mode 100644 src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H create mode 100644 src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C create mode 100644 src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.H rename src/sampling/probes/{ => probesFunctionObject}/probesFunctionObject.C (100%) rename src/sampling/probes/{ => probesFunctionObject}/probesFunctionObject.H (97%) create mode 100644 src/sampling/probes/probesGrouping.C create mode 100644 src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C create mode 100644 src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.C create mode 100644 src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H create mode 100644 src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C create mode 100644 src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesGrouping.C create mode 100644 src/sampling/sampledSurface/writers/ensight/ensightPTraits.C create mode 100644 src/sampling/sampledSurface/writers/ensight/ensightPTraits.H create mode 100644 src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C create mode 100644 src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H create mode 100644 src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H create mode 100644 src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C create mode 100644 src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.H create mode 100644 src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C create mode 100644 src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C create mode 100644 src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H create mode 100644 src/surfMesh/STLsurfaceFormatASCII.C create mode 100644 src/thermophysicalModels/reactionThermo/chemkinLexer.C delete mode 100644 wmake/src/Makefile diff --git a/applications/solvers/DNS/dnsFoam/readTransportProperties.H b/applications/solvers/DNS/dnsFoam/readTransportProperties.H index 77af096bf..0d8090854 100644 --- a/applications/solvers/DNS/dnsFoam/readTransportProperties.H +++ b/applications/solvers/DNS/dnsFoam/readTransportProperties.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H index 9f4d8368a..dc48e2fd8 100644 --- a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H +++ b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H @@ -7,7 +7,7 @@ "turbulenceProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/basic/laplacianFoam/createFields.H b/applications/solvers/basic/laplacianFoam/createFields.H index 3359f2896..616afe1a8 100644 --- a/applications/solvers/basic/laplacianFoam/createFields.H +++ b/applications/solvers/basic/laplacianFoam/createFields.H @@ -23,7 +23,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/basic/scalarTransportFoam/createFields.H b/applications/solvers/basic/scalarTransportFoam/createFields.H index fb88dcc88..394fe42e9 100644 --- a/applications/solvers/basic/scalarTransportFoam/createFields.H +++ b/applications/solvers/basic/scalarTransportFoam/createFields.H @@ -39,7 +39,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 950a370d4..d7402c175 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -50,10 +50,12 @@ PDRkEpsilon::PDRkEpsilon const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermophysicalModel + const basicThermo& thermophysicalModel, + const word& turbulenceModelName, + const word& modelName ) : - RASModel(typeName, rho, U, phi, thermophysicalModel), + RASModel(typeName, rho, U, phi, thermophysicalModel, turbulenceModelName), Cmu_ ( diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 8ab470533..839c3de99 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -112,7 +112,9 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermophysicalModel + const basicThermo& thermophysicalModel, + const word& turbulenceModelName = turbulenceModel::typeName, + const word& modelName = typeName ); diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index 6d3a4bdf5..047840fae 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -110,7 +110,7 @@ "PDRProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/combustion/PDRFoam/readCombustionProperties.H b/applications/solvers/combustion/PDRFoam/readCombustionProperties.H index 9f4435b25..acc5cb786 100644 --- a/applications/solvers/combustion/PDRFoam/readCombustionProperties.H +++ b/applications/solvers/combustion/PDRFoam/readCombustionProperties.H @@ -7,7 +7,7 @@ "combustionProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/combustion/XiFoam/readCombustionProperties.H b/applications/solvers/combustion/XiFoam/readCombustionProperties.H index da0a3a94a..58b0626fb 100644 --- a/applications/solvers/combustion/XiFoam/readCombustionProperties.H +++ b/applications/solvers/combustion/XiFoam/readCombustionProperties.H @@ -7,7 +7,7 @@ "combustionProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H b/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H index 687d83ea9..84cf9b975 100644 --- a/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H +++ b/applications/solvers/combustion/dieselEngineFoam/readCombustionProperties.H @@ -7,7 +7,7 @@ IOdictionary combustionProperties "combustionProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index b2acec7ed..1ad5cd190 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -65,7 +65,7 @@ IOdictionary combustionProperties "combustionProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/combustion/reactingFoam/readChemistryProperties.H b/applications/solvers/combustion/reactingFoam/readChemistryProperties.H index ab51afe28..f0bcf7597 100644 --- a/applications/solvers/combustion/reactingFoam/readChemistryProperties.H +++ b/applications/solvers/combustion/reactingFoam/readChemistryProperties.H @@ -7,7 +7,7 @@ IOdictionary chemistryProperties "chemistryProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H b/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H index ab51afe28..f0bcf7597 100644 --- a/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H +++ b/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H @@ -7,7 +7,7 @@ IOdictionary chemistryProperties "chemistryProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H index adc9ec4d1..0b28b77ee 100644 --- a/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H +++ b/applications/solvers/compressible/rhoCentralFoam/readThermophysicalProperties.H @@ -9,7 +9,7 @@ IOdictionary thermophysicalProperties "thermophysicalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H b/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H index 1fc57fc5f..4e19adaae 100644 --- a/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H +++ b/applications/solvers/compressible/rhoSonicFoam/readThermodynamicProperties.H @@ -7,7 +7,7 @@ "thermodynamicProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H b/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H index e8242e806..1e08986df 100644 --- a/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H +++ b/applications/solvers/compressible/rhopSonicFoam/readThermodynamicProperties.H @@ -7,7 +7,7 @@ "thermodynamicProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H b/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H index 1502e2033..c30f65b44 100644 --- a/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H +++ b/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H index d8dad7d80..82f3655f4 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H +++ b/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H @@ -7,7 +7,7 @@ "thermodynamicProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H b/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H index 1502e2033..c30f65b44 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H +++ b/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/coupled/blockCoupledScalarTransportFoam/createFields.H b/applications/solvers/coupled/blockCoupledScalarTransportFoam/createFields.H index d3d4b42a8..6f4efc8e9 100644 --- a/applications/solvers/coupled/blockCoupledScalarTransportFoam/createFields.H +++ b/applications/solvers/coupled/blockCoupledScalarTransportFoam/createFields.H @@ -69,7 +69,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/coupled/conjugateHeatFoam/createFields.H b/applications/solvers/coupled/conjugateHeatFoam/createFields.H index d04677e18..afd4d5483 100644 --- a/applications/solvers/coupled/conjugateHeatFoam/createFields.H +++ b/applications/solvers/coupled/conjugateHeatFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H b/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H index 42330b79f..e9d058919 100644 --- a/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H +++ b/applications/solvers/coupled/conjugateHeatSimpleFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/electromagnetics/electrostaticFoam/createFields.H b/applications/solvers/electromagnetics/electrostaticFoam/createFields.H index 64522273b..04c86c4ed 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/createFields.H +++ b/applications/solvers/electromagnetics/electrostaticFoam/createFields.H @@ -7,7 +7,7 @@ "physicalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H index d5a0e62de..dcc9b127b 100644 --- a/applications/solvers/electromagnetics/mhdFoam/createFields.H +++ b/applications/solvers/electromagnetics/mhdFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/engine/icoDyMEngineFoam/createFields.H b/applications/solvers/engine/icoDyMEngineFoam/createFields.H index 3fbf47549..b203e1283 100644 --- a/applications/solvers/engine/icoDyMEngineFoam/createFields.H +++ b/applications/solvers/engine/icoDyMEngineFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/financial/financialFoam/createFields.H b/applications/solvers/financial/financialFoam/createFields.H index 6cdbbe2bd..dc0da4d2a 100644 --- a/applications/solvers/financial/financialFoam/createFields.H +++ b/applications/solvers/financial/financialFoam/createFields.H @@ -7,7 +7,7 @@ "financialProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/finiteArea/liquidFilmFoam/readTransportProperties.H b/applications/solvers/finiteArea/liquidFilmFoam/readTransportProperties.H index 2f2c99ffd..1d68c4173 100644 --- a/applications/solvers/finiteArea/liquidFilmFoam/readTransportProperties.H +++ b/applications/solvers/finiteArea/liquidFilmFoam/readTransportProperties.H @@ -5,7 +5,7 @@ IOdictionary transportProperties "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/finiteArea/surfactantFoam/createFaFields.H b/applications/solvers/finiteArea/surfactantFoam/createFaFields.H index 89d8da2f7..a8be20751 100644 --- a/applications/solvers/finiteArea/surfactantFoam/createFaFields.H +++ b/applications/solvers/finiteArea/surfactantFoam/createFaFields.H @@ -21,7 +21,7 @@ IOdictionary transportProperties "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/readTransportProperties.H b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/readTransportProperties.H index 571a66ee0..02492fe22 100644 --- a/applications/solvers/heatTransfer/boussinesqBuoyantFoam/readTransportProperties.H +++ b/applications/solvers/heatTransfer/boussinesqBuoyantFoam/readTransportProperties.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H b/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H index 2721134d9..5af8f976c 100644 --- a/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H +++ b/applications/solvers/immersedBoundary/icoDyMIbFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/immersedBoundary/icoIbFoam/createFields.H b/applications/solvers/immersedBoundary/icoIbFoam/createFields.H index 2721134d9..5af8f976c 100644 --- a/applications/solvers/immersedBoundary/icoIbFoam/createFields.H +++ b/applications/solvers/immersedBoundary/icoIbFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/incompressible/RichardsFoam/RichardsFoam.C b/applications/solvers/incompressible/RichardsFoam/RichardsFoam.C index 7c8ed800e..1097a75a9 100644 --- a/applications/solvers/incompressible/RichardsFoam/RichardsFoam.C +++ b/applications/solvers/incompressible/RichardsFoam/RichardsFoam.C @@ -1,25 +1,25 @@ /*---------------------------------------------------------------------------*\ ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. - \\/ M anipulation | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright ------------------------------------------------------------------------------- License - This file is part of OpenFOAM. + This file is part of foam-extend. - 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. + foam-extend 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. + foam-extend 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 . + along with foam-extend. If not, see . Application RichardsFoam diff --git a/applications/solvers/incompressible/RichardsFoam/setDeltaT.H b/applications/solvers/incompressible/RichardsFoam/setDeltaT.H index c597cda93..b2c47552e 100644 --- a/applications/solvers/incompressible/RichardsFoam/setDeltaT.H +++ b/applications/solvers/incompressible/RichardsFoam/setDeltaT.H @@ -1,25 +1,25 @@ /*---------------------------------------------------------------------------*\ ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright ------------------------------------------------------------------------------- License - This file is part of OpenFOAM. + This file is part of foam-extend. - 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. + foam-extend 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. + foam-extend 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 . + along with foam-extend. If not, see . Global setDeltaT diff --git a/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C b/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C index 298304b98..2068fb95d 100644 --- a/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C +++ b/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C @@ -1,25 +1,25 @@ /*---------------------------------------------------------------------------*\ ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. - \\/ M anipulation | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright ------------------------------------------------------------------------------- License - This file is part of OpenFOAM. + This file is part of foam-extend. - 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. + foam-extend 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. + foam-extend 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 . + along with foam-extend. If not, see . Application spatialMeanValue diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index e4db531c0..34a4592e5 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -6,7 +6,7 @@ "U", runTime.timeName(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::AUTO_WRITE ), mesh @@ -44,7 +44,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/incompressible/channelFoam/readTransportProperties.H b/applications/solvers/incompressible/channelFoam/readTransportProperties.H index 87c93c919..abaee647c 100644 --- a/applications/solvers/incompressible/channelFoam/readTransportProperties.H +++ b/applications/solvers/incompressible/channelFoam/readTransportProperties.H @@ -6,7 +6,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/incompressible/icoDyMFoam/createFields.H b/applications/solvers/incompressible/icoDyMFoam/createFields.H index 6e54a75c4..ba6a35cc0 100644 --- a/applications/solvers/incompressible/icoDyMFoam/createFields.H +++ b/applications/solvers/incompressible/icoDyMFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H index ad0d528b7..de42195a6 100644 --- a/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/icoDyMSimpleFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H index 4fdfcb208..b9747cf22 100644 --- a/applications/solvers/incompressible/icoFoam/createFields.H +++ b/applications/solvers/incompressible/icoFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H index 0e34b0fa1..78b2bdc33 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H +++ b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H @@ -7,7 +7,7 @@ IOdictionary gravitationalProperties "gravitationalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H b/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H index ab51afe28..f0bcf7597 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/readChemistryProperties.H @@ -7,7 +7,7 @@ IOdictionary chemistryProperties "chemistryProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H index ab51afe28..f0bcf7597 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readChemistryProperties.H @@ -7,7 +7,7 @@ IOdictionary chemistryProperties "chemistryProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H index ab51afe28..f0bcf7597 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/readChemistryProperties.H @@ -7,7 +7,7 @@ IOdictionary chemistryProperties "chemistryProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H b/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H index 2e2c782db..cdbed4af2 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H +++ b/applications/solvers/multiSolver/multiSolverDemo/createFields_icoFoam.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiSolver/multiSolverDemo/createFields_scalarTransportFoam.H b/applications/solvers/multiSolver/multiSolverDemo/createFields_scalarTransportFoam.H index 5eb6c116f..c33ab487c 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/createFields_scalarTransportFoam.H +++ b/applications/solvers/multiSolver/multiSolverDemo/createFields_scalarTransportFoam.H @@ -39,7 +39,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/barotropicCavitatingFoam/readThermodynamicProperties.H index c057c442b..5121f49e1 100644 --- a/applications/solvers/multiphase/barotropicCavitatingFoam/readThermodynamicProperties.H +++ b/applications/solvers/multiphase/barotropicCavitatingFoam/readThermodynamicProperties.H @@ -7,7 +7,7 @@ "thermodynamicProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/barotropicCavitatingFoam/readTransportProperties.H b/applications/solvers/multiphase/barotropicCavitatingFoam/readTransportProperties.H index a253dd1be..722b7e4ba 100644 --- a/applications/solvers/multiphase/barotropicCavitatingFoam/readTransportProperties.H +++ b/applications/solvers/multiphase/barotropicCavitatingFoam/readTransportProperties.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H index 26013f9f4..c5c1a8212 100644 --- a/applications/solvers/multiphase/bubbleFoam/createFields.H +++ b/applications/solvers/multiphase/bubbleFoam/createFields.H @@ -91,7 +91,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H index 9eb468f91..906b2e39a 100644 --- a/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H +++ b/applications/solvers/multiphase/bubbleFoam/createRASTurbulence.H @@ -5,7 +5,7 @@ "RASProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H index d3fbb9307..3740f1056 100644 --- a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H +++ b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H @@ -7,7 +7,7 @@ "thermodynamicProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C index bf96e7a7c..0c896f119 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C @@ -43,7 +43,7 @@ Foam::phaseChangeTwoPhaseMixture::New "transportProperties", U.time().constant(), U.db(), - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE, false ) diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H index 57f62457b..38a71cff7 100644 --- a/applications/solvers/multiphase/settlingFoam/createFields.H +++ b/applications/solvers/multiphase/settlingFoam/createFields.H @@ -50,7 +50,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index 0a2d24ed6..4b11cce9c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H index 3acbf758d..c1b319cbc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/readPPProperties.H @@ -5,7 +5,7 @@ "ppProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/createFields.H b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/createFields.H index 52b1f820a..9454eaed8 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/createFields.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/contactStressFoam/createFields.H @@ -8,7 +8,7 @@ "U", runTime.timeName(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::AUTO_WRITE ), mesh @@ -23,7 +23,7 @@ "mechanicalProperties", "constant", mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H index 461709e4b..68d92f649 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readCouplingProperties.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readCouplingProperties.H index c10e7af3c..51fc02d14 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readCouplingProperties.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readCouplingProperties.H @@ -6,7 +6,7 @@ "couplingProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readMechanicalProperties.H b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readMechanicalProperties.H index f06856dce..be3280868 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readMechanicalProperties.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/icoFsiFoam/readMechanicalProperties.H @@ -7,7 +7,7 @@ "mechanicalProperties", runTime.constant(), stressMesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readMechanicalProperties.H index 91bd5f3da..9f256bd68 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readMechanicalProperties.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readMechanicalProperties.H @@ -7,7 +7,7 @@ "mechanicalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readThermalProperties.H index a4c3082fb..12e10a607 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readThermalProperties.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/solidDisplacementFoam/readThermalProperties.H @@ -7,7 +7,7 @@ "thermalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readMechanicalProperties.H b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readMechanicalProperties.H index 0e8a1918b..81afaeafe 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readMechanicalProperties.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readMechanicalProperties.H @@ -7,7 +7,7 @@ "mechanicalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readThermalProperties.H b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readThermalProperties.H index a4c3082fb..12e10a607 100644 --- a/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readThermalProperties.H +++ b/applications/solvers/solidMechanics/deprecatedSolvers/stressedFoam/readThermalProperties.H @@ -7,7 +7,7 @@ "thermalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/elasticThermalSolidFoam/readThermalProperties.H b/applications/solvers/solidMechanics/elasticThermalSolidFoam/readThermalProperties.H index a4c3082fb..12e10a607 100644 --- a/applications/solvers/solidMechanics/elasticThermalSolidFoam/readThermalProperties.H +++ b/applications/solvers/solidMechanics/elasticThermalSolidFoam/readThermalProperties.H @@ -7,7 +7,7 @@ "thermalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H index 1f930006d..caaf161fd 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/createFields.H @@ -7,7 +7,7 @@ "transportProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H index 26f76ed67..f07a7969f 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/readCouplingProperties.H @@ -6,7 +6,7 @@ "couplingProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/solidMechanics/stressFemFoam/readMechanicalProperties.H b/applications/solvers/solidMechanics/stressFemFoam/readMechanicalProperties.H index abeff6d13..f042c1082 100644 --- a/applications/solvers/solidMechanics/stressFemFoam/readMechanicalProperties.H +++ b/applications/solvers/solidMechanics/stressFemFoam/readMechanicalProperties.H @@ -7,7 +7,7 @@ "mechanicalProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createBubble.H b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createBubble.H index e46ce1469..4e71afe3c 100644 --- a/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createBubble.H +++ b/applications/solvers/surfaceTracking/bubbleInterTrackFoam/createBubble.H @@ -28,7 +28,7 @@ "mrfProperties", runTime.constant(), mesh, - IOobject::MUST_READ, + IOobject::MUST_READ_IF_MODIFIED, IOobject::NO_WRITE ) ); diff --git a/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.C b/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.C index 7d76173b6..7408a0222 100644 --- a/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.C +++ b/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.C @@ -285,7 +285,7 @@ bool Foam::bubbleHistory::start() } -bool Foam::bubbleHistory::execute() +bool Foam::bubbleHistory::execute(const bool forceWrite) { const fvMesh& mesh = time_.lookupObject(regionName_); @@ -401,6 +401,11 @@ bool Foam::bubbleHistory::execute() } +bool Foam::bubbleHistory::setTime() +{ + return true; +} + bool Foam::bubbleHistory::read(const dictionary& dict) { if (dict.found("region")) diff --git a/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.H b/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.H index fc0f48a2b..013d5c0f0 100644 --- a/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.H +++ b/applications/solvers/surfaceTracking/freeSurface/functionObjects/bubbleHistory/bubbleHistory.H @@ -109,10 +109,21 @@ public: virtual bool start(); //- execute is called at each ++ or += of the time-loop - virtual bool execute(); + virtual bool execute(const bool forceWrite); + + //- Called when time was set at the end of the Time::operator++ + virtual bool setTime(); //- Read and set the function object if its data has changed virtual bool read(const dictionary& dict); + + //- Update for changes of mesh + virtual void updateMesh(const mapPolyMesh&) + {} + + //- Update for changes of mesh + virtual void movePoints(const pointField&) + {} }; diff --git a/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.C b/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.C index beba853fb..cde12ffc1 100644 --- a/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.C +++ b/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.C @@ -186,7 +186,7 @@ bool Foam::sloshingHistory::start() } -bool Foam::sloshingHistory::execute() +bool Foam::sloshingHistory::execute(const bool forceWrite) { const fvMesh& mesh = time_.lookupObject(regionName_); @@ -209,6 +209,12 @@ bool Foam::sloshingHistory::execute() } +bool Foam::sloshingHistory::setTime() +{ + return true; +} + + bool Foam::sloshingHistory::read(const dictionary& dict) { if (dict.found("region")) diff --git a/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.H b/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.H index 633c70a76..310146395 100644 --- a/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.H +++ b/applications/solvers/surfaceTracking/freeSurface/functionObjects/sloshingHistory/sloshingHistory.H @@ -114,10 +114,21 @@ public: virtual bool start(); //- execute is called at each ++ or += of the time-loop - virtual bool execute(); + virtual bool execute(const bool forceWrite); + + //- Called when time was set at the end of the Time::operator++ + virtual bool setTime(); //- Read and set the function object if its data has changed virtual bool read(const dictionary& dict); + + //- Update for changes of mesh + virtual void updateMesh(const mapPolyMesh&) + {} + + //- Update for changes of mesh + virtual void movePoints(const pointField&) + {} }; diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index d380ebf20..281ba3844 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -14,5 +14,4 @@ EXE_LIBS = \ -lmeshTools \ -ldynamicMesh \ -ldynamicFvMesh \ - -lautoMesh \ - -L$(MESQUITE_LIB_DIR) -lmesquite + -lautoMesh diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C index b3d567b7e..3c601ed0e 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C +++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C @@ -46,6 +46,7 @@ Description #include "mapPolyMesh.H" #include "directTopoChange.H" #include "polyModifyFace.H" +#include "wordReList.H" using namespace Foam; @@ -698,7 +699,10 @@ int main(int argc, char *argv[]) if (sourceType == "patches") { - labelHashSet patchSources(patches.patchSet(dict.lookup("patches"))); + labelHashSet patchSources + ( + patches.patchSet(wordReList(dict.lookup("patches"))) + ); // Repatch faces of the patches. forAllConstIter(labelHashSet, patchSources, iter) diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index c68bf6f24..6cc19d35f 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -95,7 +95,7 @@ using namespace Foam; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -void addPatchFields(fvMesh& mesh, const word& patchFieldType) +void addPatchFields(const fvMesh& mesh, const word& patchFieldType) { HashTable flds ( @@ -136,7 +136,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType) // Remove last patch field template -void trimPatchFields(fvMesh& mesh, const label nPatches) +void trimPatchFields(const fvMesh& mesh, const label nPatches) { HashTable flds ( @@ -163,7 +163,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches) // Reorder patch field template -void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew) +void reorderPatchFields(const fvMesh& mesh, const labelList& oldToNew) { HashTable flds ( diff --git a/applications/utilities/parallelProcessing/decomposeSets/decomposeSets.C b/applications/utilities/parallelProcessing/decomposeSets/decomposeSets.C index 77daf7e6f..a2c9a1494 100644 --- a/applications/utilities/parallelProcessing/decomposeSets/decomposeSets.C +++ b/applications/utilities/parallelProcessing/decomposeSets/decomposeSets.C @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) // Set all times on processor meshes equal to decomposed mesh forAll (databases, procI) { - databases[procI].setTime(runTime.timeName(), runTime.timeIndex()); + databases[procI].setTime(runTime, runTime.timeIndex()); } // Read all meshes and addressing to reconstructed mesh diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C index 51dcb16f8..122b05d98 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C +++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C @@ -51,7 +51,7 @@ Description int main(int argc, char *argv[]) { // enable -constant ... if someone really wants it - // enable -zeroTime to prevent accidentally trashing the initial fields + // enable -noZero to prevent accidentally trashing the initial fields timeSelector::addOptions(true, true); argList::noParallel(); # include "addRegionOption.H" @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) // Set all times on processor meshes equal to reconstructed mesh forAll (databases, procI) { - databases[procI].setTime(runTime.timeName(), runTime.timeIndex()); + databases[procI].setTime(runTime); } // Read all meshes and addressing to reconstructed mesh diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C index c5a01c0c0..c619b42aa 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C +++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C @@ -50,8 +50,8 @@ Description int main(int argc, char *argv[]) { - // enable -constant ... if someone really wants it - // enable -zeroTime to prevent accidentally trashing the initial fields + // disable -constant + // enable -noZero to prevent accidentally trashing the initial fields timeSelector::addOptions(false, true); argList::noParallel(); # include "addRegionOption.H" diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C index db185e03b..d38f0016c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C @@ -74,7 +74,7 @@ using namespace Foam; int main(int argc, char *argv[]) { // enable -constant - // probably don't need -zeroTime though, since the fields are vetted + // probably don't need -noZero though, since the fields are vetted // afterwards anyhow timeSelector::addOptions(true, false); argList::noParallel(); diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt index 18f46de99..b9679bbf7 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt @@ -22,12 +22,14 @@ LINK_DIRECTORIES( INCLUDE_DIRECTORIES( $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude + $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude ${PROJECT_SOURCE_DIR}/../vtkPV3Foam ) ADD_DEFINITIONS( -DWM_$ENV{WM_PRECISION_OPTION} + -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE} ) # Set output library destination to plugin folder diff --git a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt index e9054371f..b34f901da 100644 --- a/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV4FoamReader/PV4FoamReader/CMakeLists.txt @@ -22,12 +22,14 @@ LINK_DIRECTORIES( INCLUDE_DIRECTORIES( $ENV{WM_PROJECT_DIR}/src/foam/lnInclude + $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude ${PROJECT_SOURCE_DIR}/../vtkPV4Foam ) ADD_DEFINITIONS( -DWM_$ENV{WM_PRECISION_OPTION} + -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE} ) # Set output library destination to plugin folder diff --git a/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt index 1c88efbbf..14e5d235a 100644 --- a/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt @@ -18,11 +18,16 @@ SET(PVFoamReader_LIBS INCLUDE_DIRECTORIES( $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude + $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude $ENV{ParaView_INST_DIR}/include ../vtkFoam/lnInclude ) -ADD_DEFINITIONS(-DWM_$ENV{WM_PRECISION_OPTION}) + +ADD_DEFINITIONS( + -DWM_$ENV{WM_PRECISION_OPTION} + -DWM_LABEL_SIZE=$ENV{WM_LABEL_SIZE} +) #----------------------------------------------------------------------------- # Most users should not need to change anything below this line. diff --git a/applications/utilities/postProcessing/multiSolver/multiSolver.C b/applications/utilities/postProcessing/multiSolver/multiSolver.C index ed162a23a..88481bf71 100644 --- a/applications/utilities/postProcessing/multiSolver/multiSolver.C +++ b/applications/utilities/postProcessing/multiSolver/multiSolver.C @@ -55,7 +55,7 @@ void parseOptions token nextOption(optionsStream); // Bug workaround - if (nextOption.type() == token::FATALERROR) + if (nextOption.type() == token::ERROR) { break; } @@ -89,7 +89,7 @@ void parseOptions token nextOption(optionsStream); // Bug workaround - if (nextOption.type() == token::FATALERROR) + if (nextOption.type() == token::ERROR) { break; } diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C index 587cae97a..441c43871 100644 --- a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C +++ b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) ( probes::typeName, mesh, - "probesDict", + word("probesDict"), IOobject::MUST_READ, true ); diff --git a/applications/utilities/postProcessing/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C index c0ce97c5a..0eeac119f 100644 --- a/applications/utilities/postProcessing/sampling/sample/sample.C +++ b/applications/utilities/postProcessing/sampling/sample/sample.C @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) ( sampledSets::typeName, mesh, - "sampleDict", + word("sampleDict"), IOobject::MUST_READ, true ); @@ -115,7 +115,7 @@ int main(int argc, char *argv[]) ( sampledSurfaces::typeName, mesh, - "sampleDict", + word("sampleDict"), IOobject::MUST_READ, true ); diff --git a/etc/bashrc b/etc/bashrc index 47ae6e22d..8e0ce4362 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -47,7 +47,7 @@ export FOAM_DEV=1 # # Location of FOAM installation # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -foamInstall=$HOME/$WM_PROJECT +foamInstall=$HOME/OpenFOAM # foamInstall=~$WM_PROJECT # foamInstall=/usr/local/$WM_PROJECT # foamInstall=/opt/$WM_PROJECT @@ -179,6 +179,9 @@ export WM_COMPILER_LIB_ARCH= # WM_PRECISION_OPTION = LDP | DP | SP : ${WM_PRECISION_OPTION:=DP}; export WM_PRECISION_OPTION +# WM_LABEL_SIZE = 32 | 64 +: ${WM_LABEL_SIZE:=32}; export WM_LABEL_SIZE + # WM_COMPILE_OPTION = Opt | Debug | Prof : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C new file mode 100644 index 000000000..918205766 --- /dev/null +++ b/etc/codeTemplates/BC/BC.C @@ -0,0 +1,240 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "CONSTRUCT.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "volFields.H" +#include "surfaceFields.H" + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +Foam::scalar Foam::CLASS::t() const +{ + return this->db().time().timeOutputValue(); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::CLASS:: +CONSTRUCT +( + const fvPatch& p, + const DimensionedField& iF +) +: + PARENT(p, iF), + scalarData_(0.0), + data_(pTraits::zero), + fieldData_(p.size(), pTraits::zero), + timeVsData_(), + wordData_("wordDefault"), + labelData_(-1), + boolData_(false) +{ + this->refValue() = pTraits::zero; + this->refGrad() = pTraits::zero; + this->valueFraction() = 0.0; +} + + +template +Foam::CLASS:: +CONSTRUCT +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + PARENT(p, iF), + scalarData_(readScalar(dict.lookup("scalarData"))), + data_(pTraits(dict.lookup("data"))), + fieldData_("fieldData", dict, p.size()), + timeVsData_(DataEntry::New("timeVsData", dict)), + wordData_(dict.lookupOrDefault("wordName", "wordDefault")), + labelData_(-1), + boolData_(false) +{ + this->refGrad() = pTraits::zero; + this->valueFraction() = 0.0; + + this->refValue() = FIELD("fieldData", dict, p.size()); + FVPATCHF::operator=(this->refValue()); + + PARENT::evaluate(); + + /* + //Initialise with the value entry if evaluation is not possible + FVPATCHF::operator= + ( + FIELD("value", dict, p.size()) + ); + this->refValue() = *this; + */ +} + + +template +Foam::CLASS:: +CONSTRUCT +( + const CLASS& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + PARENT(ptf, p, iF, mapper), + scalarData_(ptf.scalarData_), + data_(ptf.data_), + fieldData_(ptf.fieldData_, mapper), + timeVsData_(ptf.timeVsData_, false), + wordData_(ptf.wordData_), + labelData_(-1), + boolData_(ptf.boolData_) +{} + + +template +Foam::CLASS:: +CONSTRUCT +( + const CLASS& ptf +) +: + PARENT(ptf), + scalarData_(ptf.scalarData_), + data_(ptf.data_), + fieldData_(ptf.fieldData_), + timeVsData_(ptf.timeVsData_, false), + wordData_(ptf.wordData_), + labelData_(-1), + boolData_(ptf.boolData_) +{} + + +template +Foam::CLASS:: +CONSTRUCT +( + const CLASS& ptf, + const DimensionedField& iF +) +: + PARENT(ptf, iF), + scalarData_(ptf.scalarData_), + data_(ptf.data_), + fieldData_(ptf.fieldData_), + timeVsData_(ptf.timeVsData_, false), + wordData_(ptf.wordData_), + labelData_(-1), + boolData_(ptf.boolData_) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +void Foam::CLASS::autoMap +( + const fvPatchFieldMapper& m +) +{ + PARENT::autoMap(m); + fieldData_.autoMap(m); +} + + +template +void Foam::CLASS::rmap +( + const FVPATCHF& ptf, + const labelList& addr +) +{ + PARENT::rmap(ptf, addr); + + const CLASS& tiptf = + refCast(ptf); + + fieldData_.rmap(tiptf.fieldData_, addr); +} + + +template +void Foam::CLASS::updateCoeffs() +{ + if (this->updated()) + { + return; + } + + PARENT::operator== + ( + data_ + + fieldData_ + + scalarData_*timeVsData_->value(t()) + ); + + const scalarField& phip = + this->patch().template lookupPatchField("phi"); + this->valueFraction() = 1.0 - pos(phip); + + PARENT::updateCoeffs(); +} + + +template +void Foam::CLASS::write +( + Ostream& os +) const +{ + FVPATCHF::write(os); + os.writeKeyword("scalarData") << scalarData_ << token::END_STATEMENT << nl; + os.writeKeyword("data") << data_ << token::END_STATEMENT << nl; + fieldData_.writeEntry("fieldData", os); + timeVsData_->writeData(os); + os.writeKeyword("wordData") << wordData_ << token::END_STATEMENT << nl; + this->writeEntry("value", os); +} + + +// * * * * * * * * * * * * * * Build Macro Function * * * * * * * * * * * * // + +namespace Foam +{ + makePatchTypeField + ( + FVPATCHF, + CLASS + ); +} + +// ************************************************************************* // diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H new file mode 100644 index 000000000..f8906e6fd --- /dev/null +++ b/etc/codeTemplates/BC/BC.H @@ -0,0 +1,246 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Class + Foam::CONSTRUCT + +Group + grpGenericBoundaryConditions + +Description + This boundary condition provides a NAME condition, + calculated as: + + \f[ + Q = Q_{0} + Q_{p} + s*Q_{t} + \f] + + where + \vartable + s | single scalar value [units] + Q_{0} | single TYPE value [units] + Q_{p} | TYPE field across patch [units] + Q_{t} | TYPE function of time [units] + \endtable + + \heading Patch usage + + \table + Property | Description | Req'd? | Default + scalarData | single scalar value | yes | + data | single TYPE value | yes | + fieldData | TYPE field across patch | yes | + timeVsData | TYPE function of time | yes | + wordData | word, eg name of data object | no | wordDefault + \endtable + + Example of the boundary condition specification: + \verbatim + myPatch + { + type NAME; + scalarData -1; + data ONE; + fieldData uniform THREE; + timeVsData table ( + (0 ZERO) + (1 TWO) + ); + wordName anotherName; + value uniform FOUR; // optional initial value + } + \endverbatim + +SourceFiles + CONSTRUCT.C + +\*---------------------------------------------------------------------------*/ + +#ifndef CONSTRUCT_H +#define CONSTRUCT_H + +#include "BASEFvPatchFields.H" +#include "DataEntry.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class CONSTRUCT Declaration +\*---------------------------------------------------------------------------*/ + +template +class CONSTRUCT +: + public PARENT +{ + // Private data + + //- Single valued scalar quantity, e.g. a coefficient + scalar scalarData_; + + //- Single valued Type quantity, e.g. reference pressure pRefValue_ + // Other options include vector, tensor + TYPE data_; + + //- Field of Types, typically defined across patch faces + // e.g. total pressure p0_. Other options include vectorField + FIELD fieldData_; + + //- Type specified as a function of time for time-varying BCs + autoPtr > timeVsData_; + + //- Word entry, e.g. pName_ for name of the pressure field on database + word wordData_; + + //- Label, e.g. patch index, current time index + label labelData_; + + //- Boolean for true/false, e.g. specify if flow rate is volumetric_ + bool boolData_; + + + // Private Member Functions + + //- Return current time + scalar t() const; + + +public: + + //- Runtime type information + TypeName("NAME"); + + + // Constructors + + //- Construct from patch and internal field + CONSTRUCT + ( + const fvPatch&, + const DimensionedField& + ); + + //- Construct from patch, internal field and dictionary + CONSTRUCT + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct by mapping given BASETypeFvPatchField + // onto a new patch + CONSTRUCT + ( + const CLASS&, + const fvPatch&, + const DimensionedField&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + CONSTRUCT + ( + const CLASS& + ); + + //- Construct and return a clone + virtual tmp clone() const + { + return tmp + ( + new CLASS(*this) + ); + } + + //- Construct as copy setting internal field reference + CONSTRUCT + ( + const CLASS&, + const DimensionedField& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp clone + ( + const DimensionedField& iF + ) const + { + return tmp + ( + new CLASS + ( + *this, + iF + ) + ); + } + + + // Member functions + + // 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 FVPATCHF&, + const labelList& + ); + + + // Evaluation functions + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); + + + //- Write + virtual void write(Ostream&) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "CONSTRUCT.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C b/etc/codeTemplates/BC/BCs.C similarity index 93% rename from src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C rename to etc/codeTemplates/BC/BCs.C index 64380a317..ac5e5e8b2 100644 --- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C +++ b/etc/codeTemplates/BC/BCs.C @@ -23,10 +23,9 @@ License \*---------------------------------------------------------------------------*/ -#include "objectRegistry.H" -#include "dxSurfaceWriter.H" -#include "surfaceWriters.H" +#include "CONSTRUCTs.H" #include "addToRunTimeSelectionTable.H" +#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -35,7 +34,7 @@ namespace Foam // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -makeSurfaceWriters(dxSurfaceWriter); +makePatchFields(NAME); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C b/etc/codeTemplates/BC/BCs.H similarity index 84% rename from src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C rename to etc/codeTemplates/BC/BCs.H index bbe6e410b..7d6466fa5 100644 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C +++ b/etc/codeTemplates/BC/BCs.H @@ -23,23 +23,27 @@ License \*---------------------------------------------------------------------------*/ -#include "objectRegistry.H" -#include "rawSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" +#ifndef CONSTRUCTs_H +#define CONSTRUCTs_H + +#include "CONSTRUCT.H" +#include "fieldTypes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeSurfaceWriterType(rawSurfaceWriter, bool); -makeSurfaceWriters(rawSurfaceWriter); +makePatchTypeFieldTypedefs(NAME); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C b/etc/codeTemplates/BC/BCsFwd.H similarity index 83% rename from src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C rename to etc/codeTemplates/BC/BCsFwd.H index 47abcf259..33690cbcf 100644 --- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C +++ b/etc/codeTemplates/BC/BCsFwd.H @@ -23,23 +23,28 @@ License \*---------------------------------------------------------------------------*/ -#include "objectRegistry.H" -#include "nullSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" +#ifndef CONSTRUCTsFwd_H +#define CONSTRUCTsFwd_H + +#include "fieldTypes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeSurfaceWriterType(nullSurfaceWriter, bool); -makeSurfaceWriters(nullSurfaceWriter); +template class CONSTRUCT; + +makePatchTypeFieldTypedefs(NAME); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + // ************************************************************************* // diff --git a/etc/codeTemplates/BC/Make/files b/etc/codeTemplates/BC/Make/files new file mode 100644 index 000000000..bf5c6588a --- /dev/null +++ b/etc/codeTemplates/BC/Make/files @@ -0,0 +1,3 @@ +COMPILED.C + +LIB = $(FOAM_USER_LIBBIN)/libNAME diff --git a/etc/codeTemplates/BC/Make/options b/etc/codeTemplates/BC/Make/options new file mode 100644 index 000000000..a3ae8da83 --- /dev/null +++ b/etc/codeTemplates/BC/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +LIB_LIBS = \ + -lfiniteVolume \ + -lmeshTools diff --git a/etc/codeTemplates/app/Make/files b/etc/codeTemplates/app/Make/files new file mode 100644 index 000000000..bfe94ae06 --- /dev/null +++ b/etc/codeTemplates/app/Make/files @@ -0,0 +1,3 @@ +NAME.C + +EXE = $(FOAM_USER_APPBIN)/NAME diff --git a/etc/codeTemplates/app/Make/options b/etc/codeTemplates/app/Make/options new file mode 100644 index 000000000..d27c95d03 --- /dev/null +++ b/etc/codeTemplates/app/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = \ + -lfiniteVolume \ + -lmeshTools diff --git a/etc/codeTemplates/app/app.C b/etc/codeTemplates/app/app.C new file mode 100644 index 000000000..85722a69b --- /dev/null +++ b/etc/codeTemplates/app/app.C @@ -0,0 +1,52 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Application + NAME + +Description + +\*---------------------------------------------------------------------------*/ + +#include "fvCFD.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +int main(int argc, char *argv[]) +{ + #include "setRootCase.H" + #include "createTime.H" + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + << " ClockTime = " << runTime.elapsedClockTime() << " s" + << nl << endl; + + Info<< "End\n" << endl; + + return 0; +} + + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.C b/etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.C new file mode 100644 index 000000000..f1df6147e --- /dev/null +++ b/etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.C @@ -0,0 +1,65 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "FilterFunctionObjectTemplate.H" + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +extern "C" +{ + // dynamicCode: + // SHA1 = ${SHA1sum} + // + // unique function name that can be checked if the correct library version + // has been loaded + void ${typeName}_${SHA1sum}(bool load) + { + if (load) + { + // code that can be explicitly executed after loading + } + else + { + // code that can be explicitly executed before unloading + } + } +} + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineNamedTemplateTypeNameAndDebug(${typeName}FilterFunctionObject, 0); + + //addToRunTimeSelectionTable + addToRunTimeSelectionTable + ( + functionObject, + ${typeName}FilterFunctionObject, + dictionary + ); +} + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.H b/etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.H new file mode 100644 index 000000000..b048d2782 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/FilterFunctionObjectTemplate.H @@ -0,0 +1,51 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Description + FunctionObject wrapper around functionObjectTemplate to allow them + to be created via the functions entry within controlDict. + +SourceFiles + FilterFunctionObject.C + +\*---------------------------------------------------------------------------*/ + +#ifndef FilterFunctionObject_H +#define FilterFunctionObject_H + +#include "functionObjectTemplate.H" +#include "OutputFilterFunctionObject.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef OutputFilterFunctionObject<${typeName}FunctionObject> + ${typeName}FilterFunctionObject; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/IOfunctionObjectTemplate.H b/etc/codeTemplates/dynamicCode/IOfunctionObjectTemplate.H new file mode 100644 index 000000000..5c7c5f7a0 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/IOfunctionObjectTemplate.H @@ -0,0 +1,50 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Typedef + Foam::IOfunctionObjectTemplate + +Description + Instance of the generic IOOutputFilter for ${typeName}FunctionObject. + +\*---------------------------------------------------------------------------*/ + +#ifndef IOfunctionObjectTemplate_H +#define IOfunctionObjectTemplate_H + +#include "functionObjectTemplate.H" +#include "IOOutputFilter.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef IOOutputFilter<${typeName}FunctionObject> + IO${typeName}FunctionObject; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/foam/primitives/ints/ulong/ulong.H b/etc/codeTemplates/dynamicCode/codeStreamTemplate.C similarity index 72% rename from src/foam/primitives/ints/ulong/ulong.H rename to etc/codeTemplates/dynamicCode/codeStreamTemplate.C index 3081d39c2..e0b7eb6e9 100644 --- a/src/foam/primitives/ints/ulong/ulong.H +++ b/etc/codeTemplates/dynamicCode/codeStreamTemplate.C @@ -21,47 +21,51 @@ License You should have received a copy of the GNU General Public License along with foam-extend. If not, see . -Primitive - ulong - Description - System unsigned long - -SourceFiles - ulongIO.C + Template for use with codeStream. \*---------------------------------------------------------------------------*/ -#ifndef ulong_H -#define ulong_H +#include "dictionary.H" +#include "Ostream.H" +#include "Pstream.H" +#include "unitConversion.H" -#include "word.H" +//{{{ begin codeInclude +${codeInclude} +//}}} end codeInclude // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -class Istream; -class Ostream; +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +//{{{ begin localCode +${localCode} +//}}} end localCode -//- Return a string representation of a ulong -word name(const unsigned long); -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +extern "C" +{ + void ${typeName} + ( + Ostream& os, + const dictionary& dict + ) + { +//{{{ begin code + ${code} +//}}} end code + } +} -unsigned long readUlong(Istream&); -Istream& operator>>(Istream&, unsigned long&); -Ostream& operator<<(Ostream&, const unsigned long); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - // ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C new file mode 100644 index 000000000..3f2a6a4a2 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C @@ -0,0 +1,204 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "codedFvOptionTemplate.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "volFields.H" +#include "surfaceFields.H" +#include "unitConversion.H" +#include "fvMatrix.H" + +//{{{ begin codeInclude +${codeInclude} +//}}} end codeInclude + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +namespace fv +{ + +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + +//{{{ begin localCode +${localCode} +//}}} end localCode + + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +extern "C" +{ + // dynamicCode: + // SHA1 = ${SHA1sum} + // + // unique function name that can be checked if the correct library version + // has been loaded + void ${typeName}_${SHA1sum}(bool load) + { + if (load) + { + // code that can be explicitly executed after loading + } + else + { + // code that can be explicitly executed before unloading + } + } +} + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//makeRemovablePatchTypeField +//( +// fvPatch${FieldType}, +// ${typeName}FvOption${SourceType} +//); +defineTypeNameAndDebug(${typeName}FvOption${SourceType}, 0); +addToRunTimeSelectionTable +( + option, + ${typeName}FvOption${SourceType}, + dictionary +); + + +const char* const ${typeName}FvOption${SourceType}::SHA1sum = + "${SHA1sum}"; + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +${typeName}FvOption${SourceType}:: +${typeName}FvOption${SourceType} +( + const word& name, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh +) +: + option(name, modelType, dict, mesh) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from components\n"; + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +${typeName}FvOption${SourceType}:: +~${typeName}FvOption${SourceType}() +{ + if (${verbose:-false}) + { + Info<<"destroy ${typeName} sha1: ${SHA1sum}\n"; + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void ${typeName}FvOption${SourceType}::correct +( + GeometricField<${TemplateType}, fvPatchField, volMesh>& fld +) +{ + if (${verbose:-false}) + { + Info<<"${typeName}FvOption${SourceType}::correct()\n"; + } + +//{{{ begin code + ${codeCorrect} +//}}} end code +} + + +void ${typeName}FvOption${SourceType}::addSup +( + fvMatrix<${TemplateType}>& eqn, + const label fieldI +) +{ + if (${verbose:-false}) + { + Info<<"${typeName}FvOption${SourceType}::addSup()\n"; + } + +//{{{ begin code + ${codeAddSup} +//}}} end code +} + + +void ${typeName}FvOption${SourceType}::addSup +( + const volScalarField& rho, + fvMatrix<${TemplateType}>& eqn, + const label fieldI +) +{ + if (${verbose:-false}) + { + Info<<"${typeName}FvOption${SourceType}::addSup()\n"; + } + +//{{{ begin code + ${codeAddSup} +//}}} end code +} + + +void ${typeName}FvOption${SourceType}::setValue +( + fvMatrix<${TemplateType}>& eqn, + const label fieldI +) +{ + if (${verbose:-false}) + { + Info<<"${typeName}FvOption${SourceType}::setValue()\n"; + } + +//{{{ begin code + ${codeSetValue} +//}}} end code +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +} // End namespace fv +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H new file mode 100644 index 000000000..bb4482f84 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H @@ -0,0 +1,193 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Description + Template for use with dynamic code generation of a source. + The hook functions take the following arguments: + + codeCorrect + ( + GeometricField& fld + ) + + codeAddSup + ( + fvMatrix& eqn, + const label fieldI + ) + + setValue + ( + fvMatrix& eqn, + const label fieldI + ) + + where : + fld is the field in fieldNames + eqn is the fvMatrix + + energySource + { + type scalarCodedSource; + + active true; + selectionMode all; + + scalarCodedSourceCoeffs + { + fieldNames (h); + redirectType sourceTime; + + codeInclude + #{ + + #}; + + codeCorrect + #{ + Pout<< "**codeCorrect**" << endl; + #}; + + codeAddSup + #{ + const Time& time = mesh().time(); + const scalarField& V = mesh_.V(); + scalarField& heSource = eqn.source(); + heSource -= 0.1*sqr(time.value())*V; + #}; + + codeSetValue + #{ + Pout<< "**codeSetValue**" << endl; + #}; + + // Dummy entry. Make dependent on above to trigger recompilation + code + #{ + $codeInclude + $codeCorrect + $codeAddSup + $codeSetValue + #}; + } + + sourceTimeCoeffs + { + // Dummy entry + } + } + +SourceFiles + codedFvOptionTemplate.C + +\*---------------------------------------------------------------------------*/ + +#ifndef codedFvOptionTemplate_H +#define codedFvOptionTemplate_H + +#include "fvOption.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +namespace fv +{ + +/*---------------------------------------------------------------------------*\ + A templated CodedFvOption +\*---------------------------------------------------------------------------*/ + +class ${typeName}FvOption${SourceType} +: + public option +{ +public: + + //- Information about the SHA1 of the code itself + static const char* const SHA1sum; + + //- Runtime type information + TypeName("${typeName}"); + + + // Constructors + + //- Construct from patch and internal field + ${typeName}FvOption${SourceType} + ( + const word& name, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh + ); + + //- Destructor + virtual ~${typeName}FvOption${SourceType}(); + + + // Member functions + + //- Correct field + virtual void correct + ( + GeometricField<${TemplateType}, fvPatchField, volMesh>& + ); + + //- Explicit and implicit matrix contributions + virtual void addSup + ( + fvMatrix<${TemplateType}>& eqn, + const label fieldI + ); + + //- Explicit and implicit matrix contributions for compressible + // equations + virtual void addSup + ( + const volScalarField& rho, + fvMatrix<${TemplateType}>& eqn, + const label fieldI + ); + + //- Set value + virtual void setValue + ( + fvMatrix<${TemplateType}>& eqn, + const label fieldI + ); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +} // End namespace fv + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C new file mode 100644 index 000000000..ace8bba6b --- /dev/null +++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C @@ -0,0 +1,211 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "fixedValueFvPatchFieldTemplate.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "volFields.H" +#include "surfaceFields.H" +#include "unitConversion.H" +//{{{ begin codeInclude +${codeInclude} +//}}} end codeInclude + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + +//{{{ begin localCode +${localCode} +//}}} end localCode + + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +extern "C" +{ + // dynamicCode: + // SHA1 = ${SHA1sum} + // + // unique function name that can be checked if the correct library version + // has been loaded + void ${typeName}_${SHA1sum}(bool load) + { + if (load) + { + // code that can be explicitly executed after loading + } + else + { + // code that can be explicitly executed before unloading + } + } +} + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +makeRemovablePatchTypeField +( + fvPatch${FieldType}, + ${typeName}FixedValueFvPatch${FieldType} +); + + +const char* const ${typeName}FixedValueFvPatch${FieldType}::SHA1sum = + "${SHA1sum}"; + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +${typeName}FixedValueFvPatch${FieldType}:: +${typeName}FixedValueFvPatch${FieldType} +( + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF +) +: + fixedValueFvPatchField<${TemplateType}>(p, iF) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/DimensionedField\n"; + } +} + + +${typeName}FixedValueFvPatch${FieldType}:: +${typeName}FixedValueFvPatch${FieldType} +( + const ${typeName}FixedValueFvPatch${FieldType}& ptf, + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField<${TemplateType}>(ptf, p, iF, mapper) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/DimensionedField/mapper\n"; + } +} + + +${typeName}FixedValueFvPatch${FieldType}:: +${typeName}FixedValueFvPatch${FieldType} +( + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF, + const dictionary& dict +) +: + fixedValueFvPatchField<${TemplateType}>(p, iF, dict) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/dictionary\n"; + } +} + + +${typeName}FixedValueFvPatch${FieldType}:: +${typeName}FixedValueFvPatch${FieldType} +( + const ${typeName}FixedValueFvPatch${FieldType}& ptf +) +: + fixedValueFvPatchField<${TemplateType}>(ptf) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " as copy\n"; + } +} + + +${typeName}FixedValueFvPatch${FieldType}:: +${typeName}FixedValueFvPatch${FieldType} +( + const ${typeName}FixedValueFvPatch${FieldType}& ptf, + const DimensionedField<${TemplateType}, volMesh>& iF +) +: + fixedValueFvPatchField<${TemplateType}>(ptf, iF) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum} " + "as copy/DimensionedField\n"; + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +${typeName}FixedValueFvPatch${FieldType}:: +~${typeName}FixedValueFvPatch${FieldType}() +{ + if (${verbose:-false}) + { + Info<<"destroy ${typeName} sha1: ${SHA1sum}\n"; + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void ${typeName}FixedValueFvPatch${FieldType}::updateCoeffs() +{ + if (this->updated()) + { + return; + } + + if (${verbose:-false}) + { + Info<<"updateCoeffs ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${code} +//}}} end code + + this->fixedValueFvPatchField<${TemplateType}>::updateCoeffs(); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H new file mode 100644 index 000000000..cd2efdbbe --- /dev/null +++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H @@ -0,0 +1,142 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Description + Template for use with dynamic code generation of a + fixedValue fvPatchField. + + - without state + +SourceFiles + fixedValueFvPatchFieldTemplate.C + +\*---------------------------------------------------------------------------*/ + +#ifndef fixedValueFvPatchTemplate${FieldType}_H +#define fixedValueFvPatchTemplate${FieldType}_H + +#include "fixedValueFvPatchFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + A templated FixedValueFvPatch +\*---------------------------------------------------------------------------*/ + +class ${typeName}FixedValueFvPatch${FieldType} +: + public fixedValueFvPatchField<${TemplateType}> +{ +public: + + //- Information about the SHA1 of the code itself + static const char* const SHA1sum; + + //- Runtime type information + TypeName("${typeName}"); + + + // Constructors + + //- Construct from patch and internal field + ${typeName}FixedValueFvPatch${FieldType} + ( + const fvPatch&, + const DimensionedField<${TemplateType}, volMesh>& + ); + + //- Construct from patch, internal field and dictionary + ${typeName}FixedValueFvPatch${FieldType} + ( + const fvPatch&, + const DimensionedField<${TemplateType}, volMesh>&, + const dictionary& + ); + + //- Construct by mapping a copy onto a new patch + ${typeName}FixedValueFvPatch${FieldType} + ( + const ${typeName}FixedValueFvPatch${FieldType}&, + const fvPatch&, + const DimensionedField<${TemplateType}, volMesh>&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + ${typeName}FixedValueFvPatch${FieldType} + ( + const ${typeName}FixedValueFvPatch${FieldType}& + ); + + //- Construct and return a clone + virtual tmp< fvPatch${FieldType} > clone() const + { + return tmp< fvPatch${FieldType} > + ( + new ${typeName}FixedValueFvPatch${FieldType}(*this) + ); + } + + //- Construct as copy setting internal field reference + ${typeName}FixedValueFvPatch${FieldType} + ( + const ${typeName}FixedValueFvPatch${FieldType}&, + const DimensionedField<${TemplateType}, volMesh>& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp< fvPatch${FieldType} > clone + ( + const DimensionedField<${TemplateType}, volMesh>& iF + ) const + { + return tmp< fvPatch${FieldType} > + ( + new ${typeName}FixedValueFvPatch${FieldType}(*this, iF) + ); + } + + + //- Destructor + virtual ~${typeName}FixedValueFvPatch${FieldType}(); + + + // Member functions + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C new file mode 100644 index 000000000..39b025d2b --- /dev/null +++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C @@ -0,0 +1,211 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "fixedValuePointPatchFieldTemplate.H" +#include "addToRunTimeSelectionTable.H" +#include "pointPatchFieldMapper.H" +#include "pointFields.H" +#include "unitConversion.H" +//{{{ begin codeInclude +${codeInclude} +//}}} end codeInclude + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + +//{{{ begin localCode +${localCode} +//}}} end localCode + + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +extern "C" +{ + // dynamicCode: + // SHA1 = ${SHA1sum} + // + // unique function name that can be checked if the correct library version + // has been loaded + void ${typeName}_${SHA1sum}(bool load) + { + if (load) + { + // code that can be explicitly executed after loading + } + else + { + // code that can be explicitly executed before unloading + } + } +} + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +makePointPatchTypeField +( + pointPatch${FieldType}, + ${typeName}FixedValuePointPatch${FieldType} +); + + +const char* const ${typeName}FixedValuePointPatch${FieldType}::SHA1sum = + "${SHA1sum}"; + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +${typeName}FixedValuePointPatch${FieldType}:: +${typeName}FixedValuePointPatch${FieldType} +( + const pointPatch& p, + const DimensionedField<${TemplateType}, pointMesh>& iF +) +: + fixedValuePointPatchField<${TemplateType}>(p, iF) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/DimensionedField\n"; + } +} + + +${typeName}FixedValuePointPatch${FieldType}:: +${typeName}FixedValuePointPatch${FieldType} +( + const ${typeName}FixedValuePointPatch${FieldType}& ptf, + const pointPatch& p, + const DimensionedField<${TemplateType}, pointMesh>& iF, + const pointPatchFieldMapper& mapper +) +: + fixedValuePointPatchField<${TemplateType}>(ptf, p, iF, mapper) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/DimensionedField/mapper\n"; + } +} + + +${typeName}FixedValuePointPatch${FieldType}:: +${typeName}FixedValuePointPatch${FieldType} +( + const pointPatch& p, + const DimensionedField<${TemplateType}, pointMesh>& iF, + const dictionary& dict, + const bool valueRequired +) +: + fixedValuePointPatchField<${TemplateType}>(p, iF, dict, valueRequired) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/dictionary\n"; + } +} + + +${typeName}FixedValuePointPatch${FieldType}:: +${typeName}FixedValuePointPatch${FieldType} +( + const ${typeName}FixedValuePointPatch${FieldType}& ptf +) +: + fixedValuePointPatchField<${TemplateType}>(ptf) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " as copy\n"; + } +} + + +${typeName}FixedValuePointPatch${FieldType}:: +${typeName}FixedValuePointPatch${FieldType} +( + const ${typeName}FixedValuePointPatch${FieldType}& ptf, + const DimensionedField<${TemplateType}, pointMesh>& iF +) +: + fixedValuePointPatchField<${TemplateType}>(ptf, iF) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum} " + "as copy/DimensionedField\n"; + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +${typeName}FixedValuePointPatch${FieldType}:: +~${typeName}FixedValuePointPatch${FieldType}() +{ + if (${verbose:-false}) + { + Info<<"destroy ${typeName} sha1: ${SHA1sum}\n"; + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void ${typeName}FixedValuePointPatch${FieldType}::updateCoeffs() +{ + if (this->updated()) + { + return; + } + + if (${verbose:-false}) + { + Info<<"updateCoeffs ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${code} +//}}} end code + + this->fixedValuePointPatchField<${TemplateType}>::updateCoeffs(); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H new file mode 100644 index 000000000..35174e101 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H @@ -0,0 +1,143 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Description + Template for use with dynamic code generation of a + fixedValue pointPatchField. + + - without state + +SourceFiles + fixedValuePointPatchFieldTemplate.C + +\*---------------------------------------------------------------------------*/ + +#ifndef fixedValuePointPatchTemplate${FieldType}_H +#define fixedValuePointPatchTemplate${FieldType}_H + +#include "fixedValuePointPatchFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + A templated FixedValuePointPatchField +\*---------------------------------------------------------------------------*/ + +class ${typeName}FixedValuePointPatch${FieldType} +: + public fixedValuePointPatchField<${TemplateType}> +{ +public: + + //- Information about the SHA1 of the code itself + static const char* const SHA1sum; + + //- Runtime type information + TypeName("${typeName}"); + + + // Constructors + + //- Construct from patch and internal field + ${typeName}FixedValuePointPatch${FieldType} + ( + const pointPatch&, + const DimensionedField<${TemplateType}, pointMesh>& + ); + + //- Construct from patch, internal field and dictionary + ${typeName}FixedValuePointPatch${FieldType} + ( + const pointPatch&, + const DimensionedField<${TemplateType}, pointMesh>&, + const dictionary&, + const bool valueRequired=true + ); + + //- Construct by mapping a copy onto a new patch + ${typeName}FixedValuePointPatch${FieldType} + ( + const ${typeName}FixedValuePointPatch${FieldType}&, + const pointPatch&, + const DimensionedField<${TemplateType}, pointMesh>&, + const pointPatchFieldMapper& + ); + + //- Construct as copy + ${typeName}FixedValuePointPatch${FieldType} + ( + const ${typeName}FixedValuePointPatch${FieldType}& + ); + + //- Construct and return a clone + virtual autoPtr< pointPatchField<${TemplateType}> > clone() const + { + return autoPtr< pointPatchField<${TemplateType}> > + ( + new ${typeName}FixedValuePointPatch${FieldType}(*this) + ); + } + + //- Construct as copy setting internal field reference + ${typeName}FixedValuePointPatch${FieldType} + ( + const ${typeName}FixedValuePointPatch${FieldType}&, + const DimensionedField<${TemplateType}, pointMesh>& + ); + + //- Construct and return a clone setting internal field reference + virtual autoPtr< pointPatchField<${TemplateType}> > clone + ( + const DimensionedField<${TemplateType}, pointMesh>& iF + ) const + { + return autoPtr< pointPatchField<${TemplateType}> > + ( + new ${typeName}FixedValuePointPatch${FieldType}(*this, iF) + ); + } + + + //- Destructor + virtual ~${typeName}FixedValuePointPatch${FieldType}(); + + + // Member functions + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.C b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C new file mode 100644 index 000000000..9d881b899 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.C @@ -0,0 +1,157 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "functionObjectTemplate.H" +#include "functionObject.H" +#include "foamTime.H" +#include "fvCFD.H" +#include "unitConversion.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +defineTypeNameAndDebug(${typeName}FunctionObject, 0); + + +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + +//{{{ begin localCode +${localCode} +//}}} end localCode + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +const objectRegistry& ${typeName}FunctionObject::obr() const +{ + return obr_; +} + + +const fvMesh& ${typeName}FunctionObject::mesh() const +{ + return refCast(obr_); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +${typeName}FunctionObject::${typeName}FunctionObject +( + const word& name, + const objectRegistry& obr, + const dictionary& dict, + const bool +) +: + name_(name), + obr_(obr) +{ + read(dict); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +${typeName}FunctionObject::~${typeName}FunctionObject() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void ${typeName}FunctionObject::read(const dictionary& dict) +{ + if (${verbose:-false}) + { + Info<<"read ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${codeRead} +//}}} end code +} + + +void ${typeName}FunctionObject::execute() +{ + if (${verbose:-false}) + { + Info<<"execute ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${codeExecute} +//}}} end code +} + + +void ${typeName}FunctionObject::end() +{ + if (${verbose:-false}) + { + Info<<"end ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${codeEnd} +//}}} end code +} + + +void ${typeName}FunctionObject::timeSet() +{ + if (${verbose:-false}) + { + Info<<"timeSet ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin codeTime + ${codeTimeSet} +//}}} end code +} + + +void ${typeName}FunctionObject::write() +{ + if (${verbose:-false}) + { + Info<<"write ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${code} +//}}} end code +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/functionObjectTemplate.H b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H new file mode 100644 index 000000000..09fb75556 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/functionObjectTemplate.H @@ -0,0 +1,151 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Description + Template for use with dynamic code generation of a + OutputFilter functionObject. + +SourceFiles + functionObjectTemplate.C + +\*---------------------------------------------------------------------------*/ + +#ifndef functionObjectTemplate_H +#define functionObjectTemplate_H + +#include "stringList.H" +#include "pointField.H" + +//{{{ begin codeInclude +${codeInclude} +//}}} end codeInclude + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class objectRegistry; +class dictionary; +class polyMesh; +class mapPolyMesh; +class fvMesh; + +/*---------------------------------------------------------------------------*\ + A templated functionObject +\*---------------------------------------------------------------------------*/ + +class ${typeName}FunctionObject +{ + // Private data + + //- Name of this set of system calls + word name_; + + //- Registry + const objectRegistry& obr_; + +//{{{ begin codeData + ${codeData} +//}}} end codeData + + + // Private Member Functions + + const objectRegistry& obr() const; + + const fvMesh& mesh() const; + + //- Disallow default bitwise copy construct + ${typeName}FunctionObject(const ${typeName}FunctionObject&); + + //- Disallow default bitwise assignment + void operator=(const ${typeName}FunctionObject&); + + +public: + + //- Runtime type information + TypeName("${typeName}"); + + + // Constructors + + //- Construct for given objectRegistry and dictionary. + // Allow the possibility to load fields from files + ${typeName}FunctionObject + ( + const word& name, + const objectRegistry& unused, + const dictionary&, + const bool loadFromFilesUnused = false + ); + + + //- Destructor + virtual ~${typeName}FunctionObject(); + + + // Member Functions + + //- Return name of the system call set + virtual const word& name() const + { + return name_; + } + + //- Read the system calls + virtual void read(const dictionary&); + + //- Execute the "executeCalls" at each time-step + virtual void execute(); + + //- Execute the "endCalls" at the final time-loop + virtual void end(); + + //- Write, execute the "writeCalls" + virtual void write(); + + //- Called when time was set at the end of the Time::operator++ + virtual void timeSet(); + + //- Update for changes of mesh + virtual void updateMesh(const mapPolyMesh&) + {} + + //- Update for changes of mesh + virtual void movePoints(const pointField&) + {} +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C new file mode 100644 index 000000000..48a51671f --- /dev/null +++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C @@ -0,0 +1,211 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "mixedFvPatchFieldTemplate.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "volFields.H" +#include "surfaceFields.H" +#include "unitConversion.H" +//{{{ begin codeInclude +${codeInclude} +//}}} end codeInclude + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * // + +//{{{ begin localCode +${localCode} +//}}} end localCode + + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +extern "C" +{ + // dynamicCode: + // SHA1 = ${SHA1sum} + // + // unique function name that can be checked if the correct library version + // has been loaded + void ${typeName}_${SHA1sum}(bool load) + { + if (load) + { + // code that can be explicitly executed after loading + } + else + { + // code that can be explicitly executed before unloading + } + } +} + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +makeRemovablePatchTypeField +( + fvPatch${FieldType}, + ${typeName}MixedValueFvPatch${FieldType} +); + + +const char* const ${typeName}MixedValueFvPatch${FieldType}::SHA1sum = + "${SHA1sum}"; + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +${typeName}MixedValueFvPatch${FieldType}:: +${typeName}MixedValueFvPatch${FieldType} +( + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF +) +: + mixedFvPatchField<${TemplateType}>(p, iF) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/DimensionedField\n"; + } +} + + +${typeName}MixedValueFvPatch${FieldType}:: +${typeName}MixedValueFvPatch${FieldType} +( + const ${typeName}MixedValueFvPatch${FieldType}& ptf, + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF, + const fvPatchFieldMapper& mapper +) +: + mixedFvPatchField<${TemplateType}>(ptf, p, iF, mapper) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/DimensionedField/mapper\n"; + } +} + + +${typeName}MixedValueFvPatch${FieldType}:: +${typeName}MixedValueFvPatch${FieldType} +( + const fvPatch& p, + const DimensionedField<${TemplateType}, volMesh>& iF, + const dictionary& dict +) +: + mixedFvPatchField<${TemplateType}>(p, iF, dict) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " from patch/dictionary\n"; + } +} + + +${typeName}MixedValueFvPatch${FieldType}:: +${typeName}MixedValueFvPatch${FieldType} +( + const ${typeName}MixedValueFvPatch${FieldType}& ptf +) +: + mixedFvPatchField<${TemplateType}>(ptf) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum}" + " as copy\n"; + } +} + + +${typeName}MixedValueFvPatch${FieldType}:: +${typeName}MixedValueFvPatch${FieldType} +( + const ${typeName}MixedValueFvPatch${FieldType}& ptf, + const DimensionedField<${TemplateType}, volMesh>& iF +) +: + mixedFvPatchField<${TemplateType}>(ptf, iF) +{ + if (${verbose:-false}) + { + Info<<"construct ${typeName} sha1: ${SHA1sum} " + "as copy/DimensionedField\n"; + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +${typeName}MixedValueFvPatch${FieldType}:: +~${typeName}MixedValueFvPatch${FieldType}() +{ + if (${verbose:-false}) + { + Info<<"destroy ${typeName} sha1: ${SHA1sum}\n"; + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void ${typeName}MixedValueFvPatch${FieldType}::updateCoeffs() +{ + if (this->updated()) + { + return; + } + + if (${verbose:-false}) + { + Info<<"updateCoeffs ${typeName} sha1: ${SHA1sum}\n"; + } + +//{{{ begin code + ${code} +//}}} end code + + this->mixedFvPatchField<${TemplateType}>::updateCoeffs(); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H new file mode 100644 index 000000000..494d33644 --- /dev/null +++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H @@ -0,0 +1,142 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Description + Template for use with dynamic code generation of a + mixed fvPatchField. + + - without state + +SourceFiles + mixedFvPatchFieldTemplate.C + +\*---------------------------------------------------------------------------*/ + +#ifndef mixedFvPatchTemplate${FieldType}_H +#define mixedFvPatchTemplate${FieldType}_H + +#include "mixedFvPatchFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + A templated MixedValueFvPatchField +\*---------------------------------------------------------------------------*/ + +class ${typeName}MixedValueFvPatch${FieldType} +: + public mixedFvPatchField<${TemplateType}> +{ +public: + + //- Information about the SHA1 of the code itself + static const char* const SHA1sum; + + //- Runtime type information + TypeName("${typeName}"); + + + // Constructors + + //- Construct from patch and internal field + ${typeName}MixedValueFvPatch${FieldType} + ( + const fvPatch&, + const DimensionedField<${TemplateType}, volMesh>& + ); + + //- Construct from patch, internal field and dictionary + ${typeName}MixedValueFvPatch${FieldType} + ( + const fvPatch&, + const DimensionedField<${TemplateType}, volMesh>&, + const dictionary& + ); + + //- Construct by mapping a copy onto a new patch + ${typeName}MixedValueFvPatch${FieldType} + ( + const ${typeName}MixedValueFvPatch${FieldType}&, + const fvPatch&, + const DimensionedField<${TemplateType}, volMesh>&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + ${typeName}MixedValueFvPatch${FieldType} + ( + const ${typeName}MixedValueFvPatch${FieldType}& + ); + + //- Construct and return a clone + virtual tmp< fvPatch${FieldType} > clone() const + { + return tmp< fvPatch${FieldType} > + ( + new ${typeName}MixedValueFvPatch${FieldType}(*this) + ); + } + + //- Construct as copy setting internal field reference + ${typeName}MixedValueFvPatch${FieldType} + ( + const ${typeName}MixedValueFvPatch${FieldType}&, + const DimensionedField<${TemplateType}, volMesh>& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp< fvPatch${FieldType} > clone + ( + const DimensionedField<${TemplateType}, volMesh>& iF + ) const + { + return tmp< fvPatch${FieldType} > + ( + new ${typeName}MixedValueFvPatch${FieldType}(*this, iF) + ); + } + + + //- Destructor + virtual ~${typeName}MixedValueFvPatch${FieldType}(); + + + // Member functions + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/foamCommentStyles b/etc/codeTemplates/foamCommentStyles new file mode 100644 index 000000000..b55f2c237 --- /dev/null +++ b/etc/codeTemplates/foamCommentStyles @@ -0,0 +1,31 @@ +1234567890123456789012345678901234567890123456789012345678901234567890123456789 + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +------------------------------------------------------------------------------- + +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +// ************************************************************************* // + +// ------------------------------------------------------------------------- // + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // + +// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // diff --git a/etc/codeTemplates/foamScript b/etc/codeTemplates/foamScript new file mode 100755 index 000000000..49c427da7 --- /dev/null +++ b/etc/codeTemplates/foamScript @@ -0,0 +1,32 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | Version: 4.0 +# \\ / A nd | Web: http://www.foam-extend.org +# \\/ M anipulation | For copyright notice see file Copyright +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# +# +# Description +# +#------------------------------------------------------------------------------ + +# ----------------------------------------------------------------- end-of-file diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C new file mode 100644 index 000000000..61fc5e904 --- /dev/null +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.C @@ -0,0 +1,96 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "FUNCTIONOBJECT.H" +#include "dictionary.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ +defineTypeNameAndDebug(FUNCTIONOBJECT, 0); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::FUNCTIONOBJECT::FUNCTIONOBJECT +( + const word& name, + const objectRegistry& obr, + const dictionary& dict, + const bool loadFromFiles +) +: + name_(name), + obr_(obr), + wordData_(dict.lookupOrDefault("wordData", "defaultWord")), + scalarData_(readScalar(dict.lookup("scalarData"))), + labelData_(readLabel(dict.lookup("labelData"))) +{ + read(dict); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::FUNCTIONOBJECT::~FUNCTIONOBJECT() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::FUNCTIONOBJECT::read(const dictionary& dict) +{ + dict.readIfPresent("wordData", wordData_); + dict.lookup("scalarData") >> scalarData_; + dict.lookup("labelData") >> labelData_; +} + + +void Foam::FUNCTIONOBJECT::execute() +{ + // Do nothing - only valid on write +} + + +void Foam::FUNCTIONOBJECT::end() +{ + // Do nothing - only valid on write +} + + +void Foam::FUNCTIONOBJECT::timeSet() +{ + // Do nothing - only valid on write +} + + +void Foam::FUNCTIONOBJECT::write() +{ +} + + +// ************************************************************************* // diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H new file mode 100644 index 000000000..826815335 --- /dev/null +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H @@ -0,0 +1,176 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Class + Foam::FUNCTIONOBJECT + +Group + +Description + This function object... + + Example of function object specification: + \verbatim + FUNCTIONOBJECT1 + { + type FUNCTIONOBJECT; + functionObjectLibs ("libFUNCTIONOBJECTFunctionObject.so"); + ... + wordData someWord; + scalarData 1.0; + labelData 1; + } + \endverbatim + + \heading Function object usage + \table + Property | Description | Required | Default value + type | type name: FUNCTIONOBJECT | yes | + wordData | some word option... | no | defaultWord + scalarData | some scalar value... | yes | + labelData | some label value... | yes | + \endtable + +SourceFiles + FUNCTIONOBJECT.C + IOFUNCTIONOBJECT.H + +\*---------------------------------------------------------------------------*/ + +#ifndef FUNCTIONOBJECT_H +#define FUNCTIONOBJECT_H + +#include "runTimeSelectionTables.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class objectRegistry; +class dictionary; +class polyMesh; +class mapPolyMesh; + +/*---------------------------------------------------------------------------*\ + Class FUNCTIONOBJECT Declaration +\*---------------------------------------------------------------------------*/ + +class FUNCTIONOBJECT +{ + // Private data + + //- Name of this set of FUNCTIONOBJECT + word name_; + + //- Refererence to Db + const objectRegistry& obr_; + + // Read from dictionary + + //- word + word wordData_; + + //- scalar + scalar scalarData_; + + //- label + label labelData_; + + + // Private Member Functions + + + //- Disallow default bitwise copy construct + FUNCTIONOBJECT(const FUNCTIONOBJECT&); + + //- Disallow default bitwise assignment + void operator=(const FUNCTIONOBJECT&); + + +public: + + //- Runtime type information + TypeName("FUNCTIONOBJECT"); + + + // Constructors + + //- Construct for given objectRegistry and dictionary. + // Allow the possibility to load fields from files + FUNCTIONOBJECT + ( + const word& name, + const objectRegistry&, + const dictionary&, + const bool loadFromFiles = false + ); + + + //- Destructor + virtual ~FUNCTIONOBJECT(); + + + // Member Functions + + //- Return name of the FUNCTIONOBJECT + virtual const word& name() const + { + return name_; + } + + //- Read the FUNCTIONOBJECT data + virtual void 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(); + + //- Write the FUNCTIONOBJECT + virtual void write(); + + //- Update for changes of mesh + virtual void updateMesh(const mapPolyMesh&) + {} + + //- Update for changes of mesh + virtual void movePoints(const polyMesh&) + {} +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C new file mode 100644 index 000000000..3fcaccb19 --- /dev/null +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.C @@ -0,0 +1,46 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "FUNCTIONOBJECTFunctionObject.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineNamedTemplateTypeNameAndDebug + ( + FUNCTIONOBJECTFunctionObject, + 0 + ); + + addToRunTimeSelectionTable + ( + functionObject, + FUNCTIONOBJECTFunctionObject, + dictionary + ); +} + +// ************************************************************************* // diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H new file mode 100644 index 000000000..083783cec --- /dev/null +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECTFunctionObject.H @@ -0,0 +1,54 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Typedef + Foam::FUNCTIONOBJECTFunctionObject + +Description + FunctionObject wrapper around FUNCTIONOBJECT to allow them to be + created via the functions entry within controlDict. + +SourceFiles + FUNCTIONOBJECTFunctionObject.C + +\*---------------------------------------------------------------------------*/ + +#ifndef FUNCTIONOBJECTFunctionObject_H +#define FUNCTIONOBJECTFunctionObject_H + +#include "FUNCTIONOBJECT.H" +#include "OutputFilterFunctionObject.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef OutputFilterFunctionObject + FUNCTIONOBJECTFunctionObject; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H new file mode 100644 index 000000000..9c6db88e0 --- /dev/null +++ b/etc/codeTemplates/functionObject/IOFUNCTIONOBJECT.H @@ -0,0 +1,49 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Typedef + Foam::IOFUNCTIONOBJECT + +Description + Instance of the generic IOOutputFilter for FUNCTIONOBJECT. + +\*---------------------------------------------------------------------------*/ + +#ifndef IOFUNCTIONOBJECT_H +#define IOFUNCTIONOBJECT_H + +#include "FUNCTIONOBJECT.H" +#include "IOOutputFilter.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef IOOutputFilter IOFUNCTIONOBJECT; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/etc/codeTemplates/functionObject/Make/files b/etc/codeTemplates/functionObject/Make/files new file mode 100644 index 000000000..73b995603 --- /dev/null +++ b/etc/codeTemplates/functionObject/Make/files @@ -0,0 +1,4 @@ +FUNCTIONOBJECT.C +FUNCTIONOBJECTFunctionObject.C + +LIB = $(FOAM_USER_LIBBIN)/libFUNCTIONOBJECTFunctionObject diff --git a/etc/codeTemplates/functionObject/Make/options b/etc/codeTemplates/functionObject/Make/options new file mode 100644 index 000000000..a3ae8da83 --- /dev/null +++ b/etc/codeTemplates/functionObject/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +LIB_LIBS = \ + -lfiniteVolume \ + -lmeshTools diff --git a/etc/codeTemplates/source/_Template.C b/etc/codeTemplates/source/_Template.C new file mode 100644 index 000000000..d143f0562 --- /dev/null +++ b/etc/codeTemplates/source/_Template.C @@ -0,0 +1,102 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "CLASSNAME.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +const dataType Foam::CLASSNAME::staticData(); + + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::CLASSNAME::CLASSNAME() +: + baseClassName(), + data_() +{} + + +Foam::CLASSNAME::CLASSNAME(const dataType& data) +: + baseClassName(), + data_(data) +{} + + +Foam::CLASSNAME::CLASSNAME(const CLASSNAME&) +: + baseClassName(), + data_() +{} + + +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +Foam::autoPtr +Foam::CLASSNAME::New() +{ + return autoPtr(new CLASSNAME); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::CLASSNAME::~CLASSNAME() +{} + + +// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // + +void Foam::CLASSNAME::operator=(const CLASSNAME& rhs) +{ + // Check for assignment to self + if (this == &rhs) + { + FatalErrorIn("Foam::CLASSNAME::operator=(const Foam::CLASSNAME&)") + << "Attempted assignment to self" + << abort(FatalError); + } +} + +// * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * // + + +// ************************************************************************* // diff --git a/src/foam/db/IOstreams/token/CompoundToken/CompoundToken.H b/etc/codeTemplates/source/_Template.H similarity index 62% rename from src/foam/db/IOstreams/token/CompoundToken/CompoundToken.H rename to etc/codeTemplates/source/_Template.H index bdd0f3dd0..088c2adf5 100644 --- a/src/foam/db/IOstreams/token/CompoundToken/CompoundToken.H +++ b/etc/codeTemplates/source/_Template.H @@ -22,86 +22,91 @@ License along with foam-extend. If not, see . Class - Foam::CompoundToken + Foam::CLASSNAME Description - An abstract base class for managing compound tokens + +SourceFiles + CLASSNAMEI.H + CLASSNAME.C + CLASSNAMEIO.C \*---------------------------------------------------------------------------*/ -#ifndef CompoundToken_H -#define CompoundToken_H +#ifndef CLASSNAME_H +#define CLASSNAME_H -#include "refCount.H" -#include "typeInfo.H" -#include "autoPtr.H" -#include "runTimeSelectionTables.H" +#include ".H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -// Forward declaration of friend functions and operators +// Forward declaration of classes +class Istream; +class Ostream; -class CompoundToken; -Ostream& operator<<(Ostream&, const CompoundToken&); +// Forward declaration of friend functions and operators +class CLASSNAME; +Istream& operator>>(Istream&, CLASSNAME&); +Ostream& operator<<(Ostream&, const CLASSNAME&); /*---------------------------------------------------------------------------*\ - Class CompoundToken Declaration + Class CLASSNAME Declaration \*---------------------------------------------------------------------------*/ -class CompoundToken +class CLASSNAME : - public refCount + public baseClassName { + // Private data + + //- Description of data_ + dataType data_; + + // Private Member Functions //- Disallow default bitwise copy construct - CompoundToken(const CompoundToken&); + CLASSNAME(const CLASSNAME&); //- Disallow default bitwise assignment - void operator=(const CompoundToken&); + void operator=(const CLASSNAME&); public: - //- Runtime type information - virtual const word& type() const = 0; + // Static data members - - // Declare run-time constructor selection tables - - declareRunTimeSelectionTable - ( - autoPtr, - CompoundToken, - Istream, - (const word& type, Istream& is), - (type, is) - ); + //- Static data staticData + static const dataType staticData; // Constructors //- Construct null - CompoundToken() - {} + CLASSNAME(); - //- Return the clone as this and increment reference count - virtual autoPtr clone() const = 0; + //- Construct from components + CLASSNAME(const dataType& data); + + //- Construct from Istream + CLASSNAME(Istream&); + + //- Construct as copy + CLASSNAME(const CLASSNAME&); // Selectors //- Select null constructed - static autoPtr New(const word& type, Istream& is); + static autoPtr New(); - // Destructor - - virtual ~CompoundToken(); + //- Destructor + ~CLASSNAME(); // Member Functions @@ -114,12 +119,20 @@ public: // Write - virtual void write(Istream&) = 0; + // Member Operators + + void operator=(const CLASSNAME&); + + + // Friend Functions + + // Friend Operators // IOstream Operators - friend Ostream& operator<<(Ostream&, const CompoundToken&); + friend Istream& operator>>(Istream&, CLASSNAME&); + friend Ostream& operator<<(Ostream&, const CLASSNAME&); }; @@ -129,6 +142,10 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#include "CLASSNAMEI.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/etc/codeTemplates/source/_TemplateApp.C b/etc/codeTemplates/source/_TemplateApp.C new file mode 100644 index 000000000..65e484a09 --- /dev/null +++ b/etc/codeTemplates/source/_TemplateApp.C @@ -0,0 +1,48 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Application + CLASSNAME + +Description + +\*---------------------------------------------------------------------------*/ + +#include "fvCFD.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Main program: + +int main(int argc, char *argv[]) +{ + #include "setRootCase.H" + #include "createTime.H" + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + Info<< "\nEnd\n" << endl; + return 0; +} + + +// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C b/etc/codeTemplates/source/_TemplateI.H similarity index 74% rename from src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C rename to etc/codeTemplates/source/_TemplateI.H index d3ff7f1cf..a4e6bf00c 100644 --- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C +++ b/etc/codeTemplates/source/_TemplateI.H @@ -23,40 +23,36 @@ License \*---------------------------------------------------------------------------*/ -#include "nullSurfaceWriter.H" +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::nullSurfaceWriter::nullSurfaceWriter() -: - surfaceWriter() -{} +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::nullSurfaceWriter::~nullSurfaceWriter() -{} - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::nullSurfaceWriter::write -( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const fileName& fieldName, - const Field& values, - const bool verbose -) const -{} + +// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // ************************************************************************* // diff --git a/etc/codeTemplates/source/_TemplateIO.C b/etc/codeTemplates/source/_TemplateIO.C new file mode 100644 index 000000000..61aa2c71b --- /dev/null +++ b/etc/codeTemplates/source/_TemplateIO.C @@ -0,0 +1,70 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "CLASSNAME.H" +#include "IOstreams.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::CLASSNAME::CLASSNAME(Istream& is) +: + base1(is), + base2(is), + member1(is), + member2(is) +{ + // Check state of Istream + is.check("Foam::CLASSNAME::CLASSNAME(Foam::Istream&)"); +} + + +// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // + +Foam::Istream& Foam::operator>>(Istream& is, CLASSNAME&) +{ + // Check state of Istream + is.check + ( + "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::CLASSNAME&)" + ); + + return is; +} + + +Foam::Ostream& Foam::operator<<(Ostream& os, const CLASSNAME&) +{ + // Check state of Ostream + os.check + ( + "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " + "const Foam::CLASSNAME&)" + ); + + return os; +} + + +// ************************************************************************* // diff --git a/etc/codeTemplates/source/foamNewSource b/etc/codeTemplates/source/foamNewSource new file mode 100755 index 000000000..b0e33f24e --- /dev/null +++ b/etc/codeTemplates/source/foamNewSource @@ -0,0 +1,115 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | Version: 4.0 +# \\ / A nd | Web: http://www.foam-extend.org +# \\/ M anipulation | For copyright notice see file Copyright +#------------------------------------------------------------------------------- +# License +# This file is part of foam-extend. +# +# foam-extend 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. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# foamNewSource +# +# Description +# Create a new standard OpenFOAM source file +# +#------------------------------------------------------------------------------ +Script=${0##*/} +Template="$WM_PROJECT_DIR/etc/codeTemplates/source/_Template" + +usage() { + while [ "$#" -ge 1 ]; do echo "$1"; shift; done + cat< +options: + -help print the usage + +* create a new standard OpenFOAM source file + +type: (C|H|I|IO|App) + +A ClassName starting with '-' will simply display the template + +USAGE + exit 1 +} + + +className="$2" +unset subType Type printOpt + +# for a className starting with '-' simply display the code +if [ "${2#-}" != "${2}" ] +then + printOpt=true +fi + + +# this implicitly covers a lone -help +[ "$#" -gt 1 ] || usage + +case "$1" in +(-h | -help) + usage + ;; +(C|H) + Type=".$1" + ;; +(I) + Type="$1.H" + ;; +(IO) + Type="$1.C" + ;; +(app|App) + subType=App + Type=".C" + ;; +(*) + usage "unknown type '$1'" + ;; +esac + +[ "$#" -eq 2 ] || usage "wrong number of arguments" +shift 2 + + +if [ "${printOpt:-false}" = true ] +then + cat $Template$subType$Type +else + + fileName="$className$Type" + + echo "$Script: Creating new interface file $fileName" + if [ -e "$fileName" ] + then + echo " Error: file exists" + exit 1 + fi + + # process class name + sed "s/CLASSNAME/$className/g" $Template$subType$Type > $fileName + + if [ "$subType" = App -a ! -d Make ] + then + wmakeFilesAndOptions + fi +fi + +#------------------------------------------------------------------------------ diff --git a/etc/codeTemplates/template/_TemplateTemplate.C b/etc/codeTemplates/template/_TemplateTemplate.C new file mode 100644 index 000000000..086321407 --- /dev/null +++ b/etc/codeTemplates/template/_TemplateTemplate.C @@ -0,0 +1,122 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "CLASSNAME.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +template +const dataType Foam::CLASSNAME::staticData(); + + +// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::CLASSNAME::CLASSNAME() +: + baseClassName(), + data_() +{} + + +template +Foam::CLASSNAME::CLASSNAME(const dataType& data) +: + baseClassName(), + data_(data) +{} + + +template +Foam::CLASSNAME::CLASSNAME +( + const CLASSNAME& +) +: + baseCLASSNAME(), + data_() +{} + + +// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // + +template +Foam::autoPtr > +Foam::CLASSNAME::New() +{ + return autoPtr > + ( + new CLASSNAME + ); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +template +Foam::CLASSNAME::~CLASSNAME() +{} + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // + +template +void Foam::CLASSNAME::operator= +( + const CLASSNAME& rhs +) +{ + // Check for assignment to self + if (this == &rhs) + { + FatalErrorIn + ( + "Foam::CLASSNAME::operator=" + "(const Foam::CLASSNAME&)" + ) << "Attempted assignment to self" + << abort(FatalError); + } +} + + +// * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * // + + +// ************************************************************************* // diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H new file mode 100644 index 000000000..3410c6dd6 --- /dev/null +++ b/etc/codeTemplates/template/_TemplateTemplate.H @@ -0,0 +1,157 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +Class + Foam::CLASSNAME + +Description + +SourceFiles + CLASSNAMEI.H + CLASSNAME.C + CLASSNAMEIO.C + +\*---------------------------------------------------------------------------*/ + +#ifndef CLASSNAME_H +#define CLASSNAME_H + +#include ".H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class someClass; + + +// Forward declaration of friend functions and operators + +template +class CLASSNAME; + +template +Istream& operator>>(Istream&, CLASSNAME&); + +template +Ostream& operator<<(Ostream&, const CLASSNAME&); + + +/*---------------------------------------------------------------------------*\ + Class CLASSNAME Declaration +\*---------------------------------------------------------------------------*/ + +template +class CLASSNAME +: + public baseClassName +{ + // Private data + + dataType data_; + + + // Private Member Functions + + //- Disallow default bitwise copy construct + CLASSNAME(const CLASSNAME&); + + //- Disallow default bitwise assignment + void operator=(const CLASSNAME&); + + +public: + + // Static data members + + //- Static data someStaticData + static const dataType staticData; + + + // Constructors + + //- Construct null + CLASSNAME(); + + //- Construct from components + CLASSNAME(const dataType& data); + + //- Construct from Istream + CLASSNAME(Istream&); + + //- Construct as copy + CLASSNAME(const CLASSNAME&); + + + // Selectors + + //- Select null constructed + static autoPtr > New(); + + + //- Destructor + ~CLASSNAME(); + + + // Member Functions + + // Member Operators + + void operator=(const CLASSNAME&); + + + // Friend Functions + + // Friend Operators + + // IOstream Operators + + friend Istream& operator>> + (Istream&, CLASSNAME&); + + friend Ostream& operator<< + (Ostream&, const CLASSNAME&); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "CLASSNAMEI.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "CLASSNAME.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/foam/primitives/ints/longLong/longLong.H b/etc/codeTemplates/template/_TemplateTemplateI.H similarity index 69% rename from src/foam/primitives/ints/longLong/longLong.H rename to etc/codeTemplates/template/_TemplateTemplateI.H index a593ecb26..a4e6bf00c 100644 --- a/src/foam/primitives/ints/longLong/longLong.H +++ b/etc/codeTemplates/template/_TemplateTemplateI.H @@ -21,47 +21,38 @@ License You should have received a copy of the GNU General Public License along with foam-extend. If not, see . -Primitive - long long - -Description - A long long (64 bits on many systems) - -SourceFiles - longLongIO.C - \*---------------------------------------------------------------------------*/ -#ifndef longLong_H -#define longLong_H +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -#include "word.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ - -class Istream; -class Ostream; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//- Return a string representation of a long long -word name(long long); - -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // - -long long readLongLong(Istream&); -Istream& operator>>(Istream&, long long&); -Ostream& operator<<(Ostream&, const long long); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif // ************************************************************************* // diff --git a/etc/codeTemplates/template/_TemplateTemplateIO.C b/etc/codeTemplates/template/_TemplateTemplateIO.C new file mode 100644 index 000000000..fd5aaf94b --- /dev/null +++ b/etc/codeTemplates/template/_TemplateTemplateIO.C @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | foam-extend: Open Source CFD + \\ / O peration | Version: 4.0 + \\ / A nd | Web: http://www.foam-extend.org + \\/ M anipulation | For copyright notice see file Copyright +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend 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. + + foam-extend 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 foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "CLASSNAME.H" +#include "IOstreams.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::CLASSNAME::CLASSNAME(Istream& is) +: + base1(is), + base2(is), + member1(is), + member2(is) +{ + // Check state of Istream + is.check("Foam::CLASSNAME::CLASSNAME(Foam::Istream&)"); +} + + +// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // + +template +Foam::Istream& Foam::operator>> +( + Istream& is, + CLASSNAME& +) +{ + // Check state of Istream + is.check + ( + "Foam::Istream& Foam::operator>>" + "(Foam::Istream&, Foam::CLASSNAME&)" + ); + + return is; +} + + +template +Foam::Ostream& Foam::operator<< +( + Ostream& os, + const CLASSNAME& +) +{ + // Check state of Ostream + os.check + ( + "Foam::Ostream& Foam::operator<<" + "(Ostream&, const CLASSNAME&)" + ); + + return os; +} + + +// ************************************************************************* // diff --git a/etc/codeTemplates/template/foamNewTemplate b/etc/codeTemplates/template/foamNewTemplate new file mode 100755 index 000000000..f5e5e1891 --- /dev/null +++ b/etc/codeTemplates/template/foamNewTemplate @@ -0,0 +1,130 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | Version: 4.0 +# \\ / A nd | Web: http://www.foam-extend.org +# \\/ M anipulation | For copyright notice see file Copyright +#------------------------------------------------------------------------------- +# License +# This file is part of foam-extend. +# +# foam-extend 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. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# foamNewTemplate +# +# Description +# Create a new standard OpenFOAM templated source file +# +#------------------------------------------------------------------------------ +Script=${0##*/} +Template="$WM_PROJECT_DIR/etc/codeTemplates/template/_TemplateTemplate" + +usage() { + while [ "$#" -ge 1 ]; do echo "$1"; shift; done + cat<