From 723b92ddc1f36a6ab30b2bc24b188befbd0f72f0 Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Wed, 1 Jun 2016 21:52:07 +0100 Subject: [PATCH] etc/caseDicts/postProcessing: Updated now that #includeFunc handles function arguments --- etc/caseDicts/postProcessing/README | 2 +- etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg | 2 +- etc/caseDicts/postProcessing/faceSource/patchAverage | 2 +- etc/caseDicts/postProcessing/faceSource/patchSource.cfg | 2 +- etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg | 2 +- etc/caseDicts/postProcessing/fields/randomise | 2 +- etc/caseDicts/postProcessing/flowRate/flowRatePatch | 2 +- etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg | 2 +- etc/caseDicts/postProcessing/flowRate/volFlowRateSurface | 2 +- etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg | 2 +- etc/caseDicts/postProcessing/forces/forceCoeffs.cfg | 2 +- etc/caseDicts/postProcessing/forces/forceCoeffsCompressible | 2 +- .../postProcessing/forces/forceCoeffsCompressible.cfg | 2 +- etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible | 2 +- etc/caseDicts/postProcessing/forces/forcesCompressible | 2 +- etc/caseDicts/postProcessing/forces/forcesCompressible.cfg | 2 +- etc/caseDicts/postProcessing/forces/forcesIncompressible | 2 +- etc/caseDicts/postProcessing/graphs/sampleDict | 2 +- etc/caseDicts/postProcessing/graphs/singleGraph | 4 ++-- etc/caseDicts/postProcessing/minMax/cellMax | 2 +- etc/caseDicts/postProcessing/minMax/cellMin | 2 +- etc/caseDicts/postProcessing/minMax/cellMin.cfg | 2 +- etc/caseDicts/postProcessing/minMax/faceMax | 2 +- etc/caseDicts/postProcessing/minMax/faceMin | 2 +- etc/caseDicts/postProcessing/minMax/faceMin.cfg | 2 +- etc/caseDicts/postProcessing/minMax/minMaxComponents | 2 +- etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg | 2 +- etc/caseDicts/postProcessing/minMax/minMaxMagnitude | 2 +- etc/caseDicts/postProcessing/numerical/residuals | 2 +- etc/caseDicts/postProcessing/pressure/pressureDifference.cfg | 4 ++-- etc/caseDicts/postProcessing/pressure/pressureDifferencePatch | 2 +- .../postProcessing/pressure/pressureDifferencePatch.cfg | 2 +- .../postProcessing/pressure/pressureDifferenceSurface | 2 +- .../postProcessing/pressure/pressureDifferenceSurface.cfg | 2 +- etc/caseDicts/postProcessing/pressure/staticPressure | 2 +- etc/caseDicts/postProcessing/pressure/staticPressure.cfg | 2 +- .../postProcessing/pressure/totalPressureCompressible | 2 +- .../postProcessing/pressure/totalPressureCompressible.cfg | 2 +- .../postProcessing/pressure/totalPressureIncompressible | 2 +- .../postProcessing/pressure/totalPressureIncompressible.cfg | 2 +- etc/caseDicts/postProcessing/probes/boundaryCloud | 2 +- etc/caseDicts/postProcessing/probes/boundaryCloud.cfg | 2 +- etc/caseDicts/postProcessing/probes/internalCloud | 2 +- etc/caseDicts/postProcessing/probes/internalCloud.cfg | 2 +- etc/caseDicts/postProcessing/probes/probes | 2 +- etc/caseDicts/postProcessing/scalarTransport/scalarTransport | 2 +- .../postProcessing/scalarTransport/scalarTransportDict | 2 +- etc/caseDicts/postProcessing/visualization/streamlines | 2 +- etc/caseDicts/postProcessing/visualization/surfaces | 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/etc/caseDicts/postProcessing/README b/etc/caseDicts/postProcessing/README index 4e265159e37..2759598c0a4 100644 --- a/etc/caseDicts/postProcessing/README +++ b/etc/caseDicts/postProcessing/README @@ -32,7 +32,7 @@ Solution: sub-dictionary in the case controlDict file, e.g. functions { - #includeFunc flowRatePatch + #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch" ... other function objects here ... } diff --git a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg index 33e20231b1e..b63c882f06a 100644 --- a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg +++ b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc faceSource.cfg +#includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg" source faceZone; diff --git a/etc/caseDicts/postProcessing/faceSource/patchAverage b/etc/caseDicts/postProcessing/faceSource/patchAverage index b6d3f3ca217..cab266e03c5 100644 --- a/etc/caseDicts/postProcessing/faceSource/patchAverage +++ b/etc/caseDicts/postProcessing/faceSource/patchAverage @@ -12,7 +12,7 @@ patchAverage fields (p); operation average; - #includeFunc patchSource.cfg; + #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg;" } diff --git a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg index c4502acff94..d5bd7fd1afe 100644 --- a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg +++ b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc faceSource.cfg +#includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg" source patch; sourceName $patch; diff --git a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg index c740c0ee0c5..4bcbde878d6 100644 --- a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg +++ b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc faceSource.cfg +#includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg" source sampledSurface; diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/postProcessing/fields/randomise index 840b614b324..84c58b5a073 100644 --- a/etc/caseDicts/postProcessing/fields/randomise +++ b/etc/caseDicts/postProcessing/fields/randomise @@ -8,7 +8,7 @@ randomise { - #includeFunc "randomise.cfg" + #includeEtc "caseDicts/postProcessing/fields/randomise.cfg" field <fieldName>; diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch index 1a6e27d8be3..7eb8d0873c4 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch +++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch @@ -14,7 +14,7 @@ flowRatePatch { patch <patchName>; - #includeFunc flowRatePatch.cfg + #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg index 67d6a3f3ed5..8ce22645feb 100644 --- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg +++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc patchSource.cfg +#includeEtc "caseDicts/postProcessing/flowRate/patchSource.cfg" fields (phi); operation sum; diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface index 8525079f05a..1f64e1e5b25 100644 --- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface +++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface @@ -14,7 +14,7 @@ volFlowRateSurface { triSurface <triSurfaceFile>; - #includeFunc volFlowRateSurface.cfg + #includeEtc "caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg index fe6d1b987fa..f0c76cb4990 100644 --- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg +++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc surfaceSource.cfg +#includeEtc "caseDicts/postProcessing/flowRate/surfaceSource.cfg" fields (U); operation areaNormalIntegrate; diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg index 561b6fd8686..d9d83a75d3d 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg +++ b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc forces.cfg +#includeEtc "caseDicts/postProcessing/forces/forces.cfg" type forceCoeffs; rhoInf 1; // Redundant for incompressible diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible index 1200131acd7..dbd6124827f 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible +++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible @@ -21,7 +21,7 @@ forceCoeffs CofR (0 0 0); pitchAxis (0 1 0); - #includeFunc forceCoeffsCompressible.cfg + #includeEtc "caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg index 1da340d3d14..87a8667d875 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg +++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg @@ -6,6 +6,6 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc forceCoeffs.cfg +#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible index 9283f9778e7..89926a516fb 100644 --- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible +++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible @@ -20,7 +20,7 @@ forceCoeffs CofR (0 0 0); pitchAxis (0 1 0); - #includeFunc forceCoeffs.cfg + #includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible index 6a836135a2d..1792b0c3819 100644 --- a/etc/caseDicts/postProcessing/forces/forcesCompressible +++ b/etc/caseDicts/postProcessing/forces/forcesCompressible @@ -13,7 +13,7 @@ forces CofR (0 0 0); pitchAxis (0 1 0); - #includeFunc forcesCompressible.cfg + #includeEtc "caseDicts/postProcessing/forces/forcesCompressible.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg index c371556f8a9..66604a4a09e 100644 --- a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg +++ b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc forces.cfg +#includeEtc "caseDicts/postProcessing/forces/forces.cfg" rhoInf 1; // Redundant diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible index 6692b1ecf20..0b91e37f517 100644 --- a/etc/caseDicts/postProcessing/forces/forcesIncompressible +++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible @@ -8,7 +8,7 @@ forces { - #includeFunc forces.cfg + #includeEtc "caseDicts/postProcessing/forces/forces.cfg" rhoInf 1.225; // Fluid density patches (patch1 patch2); diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict b/etc/caseDicts/postProcessing/graphs/sampleDict index c1268621873..7731f411f3b 100644 --- a/etc/caseDicts/postProcessing/graphs/sampleDict +++ b/etc/caseDicts/postProcessing/graphs/sampleDict @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc sampleDict.cfg +#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/graphs/singleGraph b/etc/caseDicts/postProcessing/graphs/singleGraph index d9541186349..836d7a82c91 100644 --- a/etc/caseDicts/postProcessing/graphs/singleGraph +++ b/etc/caseDicts/postProcessing/graphs/singleGraph @@ -12,10 +12,10 @@ graph end (1 1e-06 0); fields (U p); - #includeFunc sampleDict.cfg + #includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg" // Must be last entry - #includeFunc graph.cfg + #includeEtc "caseDicts/postProcessing/graphs/graph.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/minMax/cellMax b/etc/caseDicts/postProcessing/minMax/cellMax index 5eb6de159c8..815a7f7f344 100644 --- a/etc/caseDicts/postProcessing/minMax/cellMax +++ b/etc/caseDicts/postProcessing/minMax/cellMax @@ -8,7 +8,7 @@ cellMax { - #includeFunc cellMinMax.cfg + #includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg" fields (U p); } diff --git a/etc/caseDicts/postProcessing/minMax/cellMin b/etc/caseDicts/postProcessing/minMax/cellMin index 5dfc71282b9..aea52c7b69c 100644 --- a/etc/caseDicts/postProcessing/minMax/cellMin +++ b/etc/caseDicts/postProcessing/minMax/cellMin @@ -8,7 +8,7 @@ cellMin { - #includeFunc cellMin.cfg + #includeEtc "caseDicts/postProcessing/minMax/cellMin.cfg" fields (U p); } diff --git a/etc/caseDicts/postProcessing/minMax/cellMin.cfg b/etc/caseDicts/postProcessing/minMax/cellMin.cfg index 52583d15454..dc0e49df238 100644 --- a/etc/caseDicts/postProcessing/minMax/cellMin.cfg +++ b/etc/caseDicts/postProcessing/minMax/cellMin.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc cellMinMax.cfg +#includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg" operation min; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/minMax/faceMax b/etc/caseDicts/postProcessing/minMax/faceMax index 5372527386b..d8b4f6fd094 100644 --- a/etc/caseDicts/postProcessing/minMax/faceMax +++ b/etc/caseDicts/postProcessing/minMax/faceMax @@ -8,7 +8,7 @@ faceMax { - #includeFunc faceMinMax.cfg + #includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg" fields (U p); } diff --git a/etc/caseDicts/postProcessing/minMax/faceMin b/etc/caseDicts/postProcessing/minMax/faceMin index f100563ca8d..0c82ec01ddf 100644 --- a/etc/caseDicts/postProcessing/minMax/faceMin +++ b/etc/caseDicts/postProcessing/minMax/faceMin @@ -8,7 +8,7 @@ faceMin { - #includeFunc faceMin.cfg + #includeEtc "caseDicts/postProcessing/minMax/faceMin.cfg" fields (U p); } diff --git a/etc/caseDicts/postProcessing/minMax/faceMin.cfg b/etc/caseDicts/postProcessing/minMax/faceMin.cfg index 6875f0244b2..f2bf1aeeef0 100644 --- a/etc/caseDicts/postProcessing/minMax/faceMin.cfg +++ b/etc/caseDicts/postProcessing/minMax/faceMin.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc faceMinMax.cfg +#includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg" operation min; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents b/etc/caseDicts/postProcessing/minMax/minMaxComponents index 3af6c8a7a51..71db684633f 100644 --- a/etc/caseDicts/postProcessing/minMax/minMaxComponents +++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents @@ -8,7 +8,7 @@ minMaxComponents { - #includeFunc minMaxComponents.cfg + #includeEtc "caseDicts/postProcessing/minMax/minMaxComponents.cfg" mode components; } diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg index cc1d5ab3889..f18af3c91f9 100644 --- a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg +++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc fieldMinMax.cfg +#includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg" mode components; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude index 7197b3dc4ff..3691baa8c09 100644 --- a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude +++ b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude @@ -8,7 +8,7 @@ minMaxMagnitude { - #includeFunc fieldMinMax.cfg + #includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg" fields (U p); } diff --git a/etc/caseDicts/postProcessing/numerical/residuals b/etc/caseDicts/postProcessing/numerical/residuals index feb2a5924ff..d4e937ecc72 100644 --- a/etc/caseDicts/postProcessing/numerical/residuals +++ b/etc/caseDicts/postProcessing/numerical/residuals @@ -8,7 +8,7 @@ residuals { - #includeFunc residuals.cfg + #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg" fields (p U); } diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg index b64268ed316..3b6fd7bcd16 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg @@ -17,13 +17,13 @@ log false; source1 { - #includeFunc faceSource.cfg + #includeEtc "caseDicts/postProcessing/pressure/faceSource.cfg" operation areaAverage; fields (p); } source2 { - #includeFunc faceSource.cfg + #includeEtc "caseDicts/postProcessing/pressure/faceSource.cfg" operation areaAverage; fields (p); } diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch index dc76efaf318..8bb8360cb7e 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch +++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch @@ -11,7 +11,7 @@ pressureDifferencePatch patch1 <patch1>; patch2 <patch2>; - #includeFunc pressureDifferencePatch.cfg + #includeEtc "caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg index d9e9b2f404d..01a239236fb 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc pressureDifference.cfg +#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg" source1 { diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface index dc2a39451a8..a2693dc52be 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface +++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface @@ -11,7 +11,7 @@ pressureDifferenceSurface triSurface1 <triSurface1>; triSurface2 <triSurface2>; - #includeFunc pressureDifferenceSurface.cfg + #includeEtc "caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg index 4a57c5a7cfb..c1df7cff5bc 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc pressureDifference.cfg +#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg" source1 { diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure b/etc/caseDicts/postProcessing/pressure/staticPressure index 37bde327a45..39ebd637f52 100644 --- a/etc/caseDicts/postProcessing/pressure/staticPressure +++ b/etc/caseDicts/postProcessing/pressure/staticPressure @@ -8,7 +8,7 @@ staticPressure { - #includeFunc staticPressure.cfg + #includeEtc "caseDicts/postProcessing/pressure/staticPressure.cfg" rhoInf 1.2; // Density to scale } diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg index 7d9cbddfab6..59c76b41db5 100644 --- a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg +++ b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc pressure.cfg +#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg" calcTotal no; calcCoeff no; diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible index 950bff3ecc1..16fdabb1b09 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible +++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible @@ -8,7 +8,7 @@ totalPressure { - #includeFunc totalPressureCompressible.cfg + #includeEtc "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg" pRef 0; } diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg index 28ab16cda16..6a86d3949fc 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg +++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc pressure.cfg +#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg" calcTotal no; calcCoeff no; diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible index 6f9f0de9001..cbac4b71fd6 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible +++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible @@ -8,7 +8,7 @@ totalPressure { - #includeFunc totalPressureIncompressible.cfg + #includeEtc "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg" pRef 0.0; rhoInf 1.2; diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg index 4be65223eef..41998addb0a 100644 --- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg +++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc pressure.cfg +#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg" calcTotal yes; calcCoeff no; diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud b/etc/caseDicts/postProcessing/probes/boundaryCloud index 195bd472416..72b0da5b76c 100644 --- a/etc/caseDicts/postProcessing/probes/boundaryCloud +++ b/etc/caseDicts/postProcessing/probes/boundaryCloud @@ -19,7 +19,7 @@ boundaryCloud patches (".*"); - #includeFunc boundaryCloud.cfg + #includeEtc "caseDicts/postProcessing/probes/boundaryCloud.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg index 10d23ab346d..d90c94122bd 100644 --- a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg +++ b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc cloud.cfg +#includeEtc "caseDicts/postProcessing/probes/cloud.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/probes/internalCloud b/etc/caseDicts/postProcessing/probes/internalCloud index 7fdeb0c13aa..e5ba0c2541d 100644 --- a/etc/caseDicts/postProcessing/probes/internalCloud +++ b/etc/caseDicts/postProcessing/probes/internalCloud @@ -14,7 +14,7 @@ internalCloud (0 0 0) ); - #includeFunc internalCloud.cfg + #includeEtc "caseDicts/postProcessing/probes/internalCloud.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/probes/internalCloud.cfg b/etc/caseDicts/postProcessing/probes/internalCloud.cfg index 9179ce273e8..19bf54f8983 100644 --- a/etc/caseDicts/postProcessing/probes/internalCloud.cfg +++ b/etc/caseDicts/postProcessing/probes/internalCloud.cfg @@ -6,7 +6,7 @@ | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ -#includeFunc cloud.cfg +#includeEtc "caseDicts/postProcessing/probes/cloud.cfg" sets ( diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/postProcessing/probes/probes index a2d4a4fed02..f5936b06b3b 100644 --- a/etc/caseDicts/postProcessing/probes/probes +++ b/etc/caseDicts/postProcessing/probes/probes @@ -8,7 +8,7 @@ probes { - #includeFunc probes.cfg + #includeEtc "caseDicts/postProcessing/probes/probes.cfg" fields (p U); probeLocations diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport index 2eba2a4a565..c1204f7e731 100644 --- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport +++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport @@ -8,7 +8,7 @@ T { - #includeFunc scalarTransport.cfg + #includeEtc "caseDicts/postProcessing/scalarTransport/scalarTransport.cfg" userDT true; DT 1e-09; diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict index dea72251df2..32b4bf14032 100644 --- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict +++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict @@ -20,6 +20,6 @@ writeInterval 1e-2; // transportProperties settings DT DT [ 0 2 -1 0 0 0 0 ] 1e-9; -#includeFunc scalarTransportDict.cfg +#includeEtc "caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg" // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines index b9d625f5b64..c194eb7efe1 100644 --- a/etc/caseDicts/postProcessing/visualization/streamlines +++ b/etc/caseDicts/postProcessing/visualization/streamlines @@ -14,7 +14,7 @@ streamlines fields (U p); // Must be last entry - #includeFunc streamlines.cfg + #includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg" } // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/visualization/surfaces b/etc/caseDicts/postProcessing/visualization/surfaces index 60b6432f8b1..3b820bd51ee 100644 --- a/etc/caseDicts/postProcessing/visualization/surfaces +++ b/etc/caseDicts/postProcessing/visualization/surfaces @@ -8,7 +8,7 @@ surfaces { - #includeFunc surfaces.cfg + #includeEtc "caseDicts/postProcessing/visualization/surfaces.cfg" fields (p U); -- GitLab