From 295223624b8d20a15697de3bc3d8a849b6bd5448 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 1 Feb 2023 16:17:16 +0000 Subject: [PATCH] Rationalised and standardised cell, face and point set selection controls The keyword 'select' is now used to specify the cell, face or point set selection method consistently across all classes requiring this functionality. 'select' replaces the inconsistently named 'regionType' and 'selectionMode' keywords used previously but backwards-compatibility is provided for user convenience. All configuration files and tutorials have been updated. Examples of 'select' from the tutorial cases: functionObjects: cellZoneAverage { type volFieldValue; libs ("libfieldFunctionObjects.so"); writeControl writeTime; writeInterval 1; fields (p); select cellZone; cellZone injection; operation volAverage; writeFields false; } #includeFunc populationBalanceSizeDistribution ( name=numberDensity, populationBalance=aggregates, select=cellZone, cellZone=outlet, functionType=numberDensity, coordinateType=projectedAreaDiameter, allCoordinates=yes, normalise=yes, logTransform=yes ) fvModel: cylinderHeat { type heatSource; select all; q 5e7; } fvConstraint: momentumForce { type meanVelocityForce; select all; Ubar (0.1335 0 0); } --- .../VoFSolidificationMeltingSource.H | 2 +- .../populationBalanceSizeDistribution.H | 4 +- bin/SRFPimpleFoam | 6 +- bin/SRFSimpleFoam | 6 +- etc/caseDicts/fvConstraints/limitLowPressure | 2 +- etc/caseDicts/fvConstraints/limitPressure | 2 +- etc/caseDicts/fvConstraints/limitTemperature | 2 +- etc/caseDicts/fvModels/porosity/porousZone | 2 +- .../postProcessing/minMax/cellMinMax.cfg | 2 +- .../populationBalanceSizeDistribution | 4 +- .../surfaceFieldValue/faceZoneValue.cfg | 2 +- .../surfaceFieldValue/patchDifference.cfg | 4 +- .../surfaceFieldValue/patchValue.cfg | 2 +- .../triSurfaceDifference.cfg | 2 +- .../surfaceFieldValue/triSurfaceValue.cfg | 2 +- .../templates/constant/solid/fvModels | 2 +- .../templates/system/solid/fvConstraints | 2 +- .../functionObjects/volRegion/volRegion.C | 54 +++++++----- .../functionObjects/volRegion/volRegion.H | 32 +++---- .../functionObjects/volRegion/volRegionI.H | 8 +- src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H | 16 ++-- .../field/fieldValues/fieldValue/fieldValue.C | 2 - .../field/fieldValues/fieldValue/fieldValue.H | 8 +- .../fieldValues/fieldValue/fieldValueI.H | 8 +- .../surfaceFieldValue/surfaceFieldValue.C | 87 ++++++++++++------- .../surfaceFieldValue/surfaceFieldValue.H | 41 +++++---- .../surfaceFieldValue/surfaceFieldValueI.H | 16 +++- .../surfaceFieldValueTemplates.C | 17 ++-- .../fieldValues/volFieldValue/volFieldValue.H | 10 +-- .../volFieldValue/volFieldValueTemplates.C | 8 +- .../field/readFields/postProcessingDict | 4 +- .../fixedTemperatureConstraint.H | 2 +- .../fixedValueConstraint.H | 2 +- src/fvConstraints/limitMag/limitMag.C | 2 +- src/fvConstraints/limitMag/limitMag.H | 2 +- .../limitTemperature/limitTemperature.C | 4 +- .../limitTemperature/limitTemperature.H | 2 +- .../meanVelocityForce/meanVelocityForce.H | 2 +- .../patchMeanVelocityForce.H | 2 +- .../accelerationSource/accelerationSource.H | 2 +- .../actuationDiskSource/actuationDiskSource.H | 2 +- .../effectivenessHeatExchangerSource.H | 2 +- src/fvModels/derived/heatSource/heatSource.H | 2 +- .../derived/heatTransfer/heatTransfer.H | 2 +- src/fvModels/derived/massSource/massSource.H | 2 +- .../radialActuationDiskSource.H | 2 +- .../derived/rotorDiskSource/rotorDiskSource.C | 22 ++--- .../solidificationMeltingSource.H | 2 +- .../general/codedFvModel/codedFvModel.H | 2 +- .../coordinateSystems/coordinateSystems.H | 4 +- src/meshTools/sets/polyCellSet/polyCellSet.C | 54 ++++++------ src/meshTools/sets/polyCellSet/polyCellSet.H | 42 ++++----- src/meshTools/sets/polyCellSet/polyCellSetI.H | 8 +- .../populationBalance/drift/constant/fvModels | 2 +- .../isothermalGrowth/constant/fvModels | 2 +- .../isothermalGrowth/system/cellZoneAverage | 4 +- .../negativeDrift/constant/fvModels | 2 +- .../constant/solid/fvModels | 2 +- .../constant/baffle3D/fvModels | 2 +- .../coolingCylinder2D/constant/solid/fvModels | 2 +- .../templates/constant/solid/fvModels | 4 +- .../templates/system/solid/fvConstraints | 2 +- .../CHT/heatedDuct/constant/heater/fvModels | 2 +- .../CHT/wallBoiling/system/controlDict | 24 ++--- .../sloshingTank2D/constant/dynamicMeshDict | 4 +- .../channel395/system/fvConstraints | 2 +- .../ductSecondaryFlow/system/fvConstraints | 2 +- .../mixerSRF/constant/MRFProperties | 2 +- .../planarPoiseuille/constant/fvModels | 2 +- .../rotor2DRotating/constant/dynamicMeshDict | 2 +- .../rotor2DSRF/constant/MRFProperties | 2 +- .../sloshingCylinder/constant/dynamicMeshDict | 2 +- .../sloshingTank2D/constant/dynamicMeshDict | 2 +- .../constant/dynamicMeshDict | 2 +- .../sloshingTank3D/constant/dynamicMeshDict | 2 +- .../constant/dynamicMeshDict | 2 +- .../constant/dynamicMeshDict | 2 +- .../testTubeMixer/constant/dynamicMeshDict | 2 +- .../waterChannel/system/controlDict | 8 +- .../system/controlDict | 4 +- .../system/controlDict | 4 +- .../verticalChannel/system/controlDict | 4 +- .../verticalChannelLTS/system/controlDict | 2 +- .../verticalChannelSteady/system/controlDict | 4 +- .../system/continuityFunctions | 4 +- .../bubblePipe/system/controlDict | 4 +- .../pipeBend/system/controlDict | 8 +- .../titaniaSynthesis/system/controlDict | 2 +- .../system/controlDict | 2 +- .../wallBoilingIATE/system/controlDict | 24 ++--- .../system/controlDict | 36 ++++---- .../system/controlDict | 44 +++++----- 92 files changed, 392 insertions(+), 361 deletions(-) diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H index 4ea80be9b0..05295ba963 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H +++ b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H @@ -42,7 +42,7 @@ Usage { type VoFSolidificationMeltingSource; - selectionMode cellZone; + select cellZone; cellZone solidZone; alphaSolidT table diff --git a/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H index d9b8832b03..8fff079117 100644 --- a/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H +++ b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Usage weightType | weighting in case of field-dependent particle\\ properties | no\\ | numberConcentration - regionType | cellZone or all | no | all + select | cellZone or all | no | all name | name of cellZone if required | no | setFormat | output format | yes | \endtable diff --git a/bin/SRFPimpleFoam b/bin/SRFPimpleFoam index bf0b381887..c0f2fd81e7 100755 --- a/bin/SRFPimpleFoam +++ b/bin/SRFPimpleFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -41,11 +41,11 @@ incompressibleFluid solver module executed by the foamRun application: The MRF functionality has been further developed to replace SRF, enabled by setting the MRF zone to all the cells in the mesh using the optional -'selectionMode' entry to 'all' in the constant/MRFProperties dictionary, e.g. +'select' entry to 'all' in the constant/MRFProperties dictionary, e.g. SRF { - selectionMode all; + select all; origin (0 0 0); axis (0 0 1); diff --git a/bin/SRFSimpleFoam b/bin/SRFSimpleFoam index c7acd41f6d..4fba944988 100755 --- a/bin/SRFSimpleFoam +++ b/bin/SRFSimpleFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -41,11 +41,11 @@ incompressibleFluid solver module executed by the foamRun application: The MRF functionality has been further developed to replace SRF, enabled by setting the MRF zone to all the cells in the mesh using the optional -'selectionMode' entry to 'all' in the constant/MRFProperties dictionary, e.g. +'select' entry to 'all' in the constant/MRFProperties dictionary, e.g. SRF { - selectionMode all; + select all; origin (0 0 0); axis (0 0 1); diff --git a/etc/caseDicts/fvConstraints/limitLowPressure b/etc/caseDicts/fvConstraints/limitLowPressure index 99b16beaee..bea60a1829 100644 --- a/etc/caseDicts/fvConstraints/limitLowPressure +++ b/etc/caseDicts/fvConstraints/limitLowPressure @@ -15,7 +15,7 @@ FoamFile type limitPressure; -selectionMode all; +select all; min <1e4>; diff --git a/etc/caseDicts/fvConstraints/limitPressure b/etc/caseDicts/fvConstraints/limitPressure index 7882b717a4..f5f5815232 100644 --- a/etc/caseDicts/fvConstraints/limitPressure +++ b/etc/caseDicts/fvConstraints/limitPressure @@ -15,7 +15,7 @@ FoamFile type limitPressure; -selectionMode all; +select all; // limits can be specified absolute // min <200>; diff --git a/etc/caseDicts/fvConstraints/limitTemperature b/etc/caseDicts/fvConstraints/limitTemperature index 3c90a5da05..768eda341d 100644 --- a/etc/caseDicts/fvConstraints/limitTemperature +++ b/etc/caseDicts/fvConstraints/limitTemperature @@ -15,7 +15,7 @@ FoamFile type limitTemperature; -selectionMode all; +select all; min <200>; max <6000>; diff --git a/etc/caseDicts/fvModels/porosity/porousZone b/etc/caseDicts/fvModels/porosity/porousZone index f80a64ab4f..086db9130f 100644 --- a/etc/caseDicts/fvModels/porosity/porousZone +++ b/etc/caseDicts/fvModels/porosity/porousZone @@ -18,7 +18,7 @@ type explicitPorositySource; explicitPorositySourceCoeffs { type DarcyForchheimer; - selectionMode cellZone; + select cellZone; cellZone ; // Specify the name of the cellZone DarcyForchheimerCoeffs diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg index f9674c9968..5c5867935d 100644 --- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg @@ -14,6 +14,6 @@ writeInterval 1; writeFields false; -regionType all; +select all; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution index 2772bfb27f..daff41b75d 100644 --- a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution +++ b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution @@ -29,9 +29,9 @@ weightType numberConcentration; // volumeConcentration, // relevant for field-dependent // particle properties, defaults to // numberConcentration -regionType all; // cellZone +select all; // cellZone // defaults to all -cellZone cellZoneName; // relevant for regionType all +cellZone cellZoneName; // relevant select cellZone setFormat raw; diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg index d23b1e815e..c6e18734bb 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/faceZoneValue.cfg @@ -8,6 +8,6 @@ #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" -regionType faceZone; +select faceZone; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg index 24d0a75b68..0b070a3ed3 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchDifference.cfg @@ -10,13 +10,13 @@ region1 { - regionType patch; + select patch; name $patch1; } region2 { - regionType patch; + select patch; name $patch2; } diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg index 06891021c4..647fad8b5c 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/patchValue.cfg @@ -8,6 +8,6 @@ #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" -regionType patch; +select patch; // ************************************************************************* // diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg index 3cce779951..df7a26663c 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceDifference.cfg @@ -10,7 +10,7 @@ region1 { - regionType sampledSurface; + select sampledSurface; sampledSurfaceDict { diff --git a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg index 840f419161..c4f86a3cab 100644 --- a/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg +++ b/etc/caseDicts/postProcessing/surfaceFieldValue/triSurfaceValue.cfg @@ -8,7 +8,7 @@ #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceValue.cfg" -regionType sampledSurface; +select sampledSurface; sampledSurfaceDict { diff --git a/etc/templates/singleFluidCHT/templates/constant/solid/fvModels b/etc/templates/singleFluidCHT/templates/constant/solid/fvModels index 110b65d235..2c85ce6ba8 100644 --- a/etc/templates/singleFluidCHT/templates/constant/solid/fvModels +++ b/etc/templates/singleFluidCHT/templates/constant/solid/fvModels @@ -17,7 +17,7 @@ FoamFile fixedPower { type heatSource; - selectionMode all; + select all; Q 100; // Set power (W) } diff --git a/etc/templates/singleFluidCHT/templates/system/solid/fvConstraints b/etc/templates/singleFluidCHT/templates/system/solid/fvConstraints index 2835203bb5..0c3aedf6ab 100644 --- a/etc/templates/singleFluidCHT/templates/system/solid/fvConstraints +++ b/etc/templates/singleFluidCHT/templates/system/solid/fvConstraints @@ -17,7 +17,7 @@ FoamFile fixedTemperature { type fixedTemperatureConstraint; - selectionMode all; + select all; mode uniform; diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.C b/src/finiteVolume/functionObjects/volRegion/volRegion.C index 9c47cd425a..8b0031c86f 100644 --- a/src/finiteVolume/functionObjects/volRegion/volRegion.C +++ b/src/finiteVolume/functionObjects/volRegion/volRegion.C @@ -41,15 +41,15 @@ template<> const char* Foam::NamedEnum < - Foam::functionObjects::volRegion::regionTypes, + Foam::functionObjects::volRegion::selectionTypes, 2 >::names[] = {"cellZone", "all"}; const Foam::NamedEnum < - Foam::functionObjects::volRegion::regionTypes, + Foam::functionObjects::volRegion::selectionTypes, 2 -> Foam::functionObjects::volRegion::regionTypeNames_; +> Foam::functionObjects::volRegion::selectionTypeNames_; // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -60,9 +60,9 @@ void Foam::functionObjects::volRegion::writeFileHeader Ostream& file ) { - wf.writeCommented(file, "Region"); + wf.writeCommented(file, "Selection"); file<< setw(1) << ':' << setw(1) << ' ' - << regionTypeNames_[regionType_] << " " << regionName_ << endl; + << selectionTypeNames_[selectionType_] << " " << cellZoneName_ << endl; wf.writeHeaderValue(file, "Cells", nCells_); wf.writeHeaderValue(file, "Volume", V_); } @@ -77,13 +77,18 @@ Foam::functionObjects::volRegion::volRegion ) : mesh_(mesh), - regionType_ + selectionType_ ( - dict.found("regionType") - ? regionTypeNames_.read(dict.lookup("regionType")) - : vrtAll + selectionTypeNames_ + [ + dict.lookupOrDefaultBackwardsCompatible + ( + {"select", "regionType"}, + "all" + ) + ] ), - regionID_(-1) + cellZoneID_(-1) { read(dict); @@ -106,18 +111,19 @@ bool Foam::functionObjects::volRegion::read const dictionary& dict ) { - switch (regionType_) + switch (selectionType_) { case vrtCellZone: { - dict.lookupBackwardsCompatible({"cellZone", "name"}) >> regionName_; + dict.lookupBackwardsCompatible({"cellZone", "name"}) + >> cellZoneName_; - regionID_ = mesh_.cellZones().findZoneID(regionName_); + cellZoneID_ = mesh_.cellZones().findZoneID(cellZoneName_); - if (regionID_ < 0) + if (cellZoneID_ < 0) { FatalIOErrorInFunction(dict) - << "Unknown cell zone name: " << regionName_ + << "Unknown cell zone: " << cellZoneName_ << ". Valid cell zones are: " << mesh_.cellZones().names() << exit(FatalIOError); } @@ -125,9 +131,9 @@ bool Foam::functionObjects::volRegion::read if (nCells() == 0) { FatalIOErrorInFunction(dict) - << regionTypeNames_[regionType_] - << "(" << regionName_ << "):" << nl - << " Region has no cells" + << selectionTypeNames_[selectionType_] + << "(" << cellZoneName_ << "):" << nl + << " Selection has no cells" << exit(FatalIOError); } @@ -142,8 +148,8 @@ bool Foam::functionObjects::volRegion::read default: { FatalIOErrorInFunction(dict) - << "Unknown region type. Valid region types are:" - << regionTypeNames_ + << "Unknown selection. Valid selections are:" + << selectionTypeNames_ << exit(FatalIOError); } } @@ -154,20 +160,20 @@ bool Foam::functionObjects::volRegion::read const Foam::labelList& Foam::functionObjects::volRegion::cellIDs() const { - if (regionType_ == vrtAll) + if (selectionType_ == vrtAll) { return labelList::null(); } else { - return mesh_.cellZones()[regionID_]; + return mesh_.cellZones()[cellZoneID_]; } } Foam::label Foam::functionObjects::volRegion::nCells() const { - if (regionType_ == vrtAll) + if (selectionType_ == vrtAll) { return mesh_.globalData().nTotalCells(); } @@ -180,7 +186,7 @@ Foam::label Foam::functionObjects::volRegion::nCells() const Foam::scalar Foam::functionObjects::volRegion::V() const { - if (regionType_ == vrtAll) + if (selectionType_ == vrtAll) { return gSum(mesh_.V()); } diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.H b/src/finiteVolume/functionObjects/volRegion/volRegion.H index f79dfdf8e7..26811f7346 100644 --- a/src/finiteVolume/functionObjects/volRegion/volRegion.H +++ b/src/finiteVolume/functionObjects/volRegion/volRegion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,8 +33,8 @@ Description { . . - regionType cellZone; - name c0; + select cellZone; + cellZone c0; . . } @@ -43,7 +43,7 @@ Description { . . - regionType all; + select all; . . } @@ -51,9 +51,9 @@ Description Usage \table - Property | Description | Required | Default value - regionType | cellZone or all | no | all - name | Name of cellZone if required | no | + Property | Description | Required | Default value + select | cellZone or all | no | all + cellZone | Name of cellZone if required | no | \endtable See also @@ -101,28 +101,28 @@ public: // Public data types //- Region type enumeration - enum regionTypes + enum selectionTypes { vrtCellZone, vrtAll }; //- Region type names - static const NamedEnum regionTypeNames_; + static const NamedEnum selectionTypeNames_; protected: // Protected data - //- Region type - regionTypes regionType_; + //- Selection type + selectionTypes selectionType_; - //- Region name (patch, zone, etc.) - word regionName_; + //- Optional cellZone name + word cellZoneName_; - //- Region ID (patch ID, zone ID, etc.) - label regionID_; + //- Optional cellZone ID + label cellZoneID_; // Protected Member Functions @@ -157,7 +157,7 @@ public: bool read(const dictionary&); //- Return the region type - inline const regionTypes& regionType() const; + inline const selectionTypes& selectionType() const; //- Return the local list of cell IDs const labelList& cellIDs() const; diff --git a/src/finiteVolume/functionObjects/volRegion/volRegionI.H b/src/finiteVolume/functionObjects/volRegion/volRegionI.H index 140041a121..060f2dcd24 100644 --- a/src/finiteVolume/functionObjects/volRegion/volRegionI.H +++ b/src/finiteVolume/functionObjects/volRegion/volRegionI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,10 +25,10 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline const Foam::functionObjects::volRegion::regionTypes& -Foam::functionObjects::volRegion::regionType() const +inline const Foam::functionObjects::volRegion::selectionTypes& +Foam::functionObjects::volRegion::selectionType() const { - return regionType_; + return selectionType_; } // ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H index c9adc6634d..fc2475e51f 100644 --- a/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H +++ b/src/finiteVolume/fvMesh/fvCellSet/fvCellSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,26 +30,26 @@ Description Currently supports cell selection from a set of points, a specified cellSet or cellZone or all of the cells. The selection method can either be - specified explicitly using the \c selectionMode entry or inferred from the - presence of either a \c cellSet, \c cellZone or \c points entry. The \c - selectionMode entry is required to select \c all cells. + specified explicitly using the \c select entry or inferred from the presence + of either a \c cellSet, \c cellZone or \c points entry. The \c select entry + is required to select \c all cells. Usage Examples: \verbatim // Apply everywhere - selectionMode all; + select all; // Apply within a given cellSet - selectionMode cellSet; // Optional + select cellSet; // Optional cellSet rotor; // Apply within a given cellZone - selectionMode cellZone; // Optional + select cellZone; // Optional cellSet rotor; // Apply in cells containing a list of points - selectionMode points; // Optional + select points; // Optional points ( (2.25 0.5 0) diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C index 7263188743..e97129540b 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C @@ -53,7 +53,6 @@ Foam::functionObjects::fieldValue::fieldValue logFiles(obr_, name), dict_(dict), valueType_(valueType), - regionName_(word::null), resultDict_(fileName("result"), dictionary::null) { read(dict); @@ -72,7 +71,6 @@ Foam::functionObjects::fieldValue::fieldValue logFiles(obr_, name), dict_(dict), valueType_(valueType), - regionName_(word::null), resultDict_(fileName("result"), dictionary::null) { read(dict); diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H index aadcbdc6cf..c905887995 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,9 +76,6 @@ protected: //- The name of the type of value (volFieldValue, or surfaceFieldValue) const word valueType_; - //- Name of region (patch, zone, etc.) - word regionName_; - //- List of field names to operate on wordList fields_; @@ -160,9 +157,6 @@ public: //- Return the reference to the construction dictionary inline const dictionary& dict() const; - //- Return the region name - inline const word& regionName() const; - //- Return the list of fields required inline virtual wordList fields() const; diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValueI.H b/src/functionObjects/field/fieldValues/fieldValue/fieldValueI.H index aea2c07052..bbd55004e4 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValueI.H +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValueI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,12 +34,6 @@ inline const Foam::dictionary& Foam::functionObjects::fieldValue::dict() const } -inline const Foam::word& Foam::functionObjects::fieldValue::regionName() const -{ - return regionName_; -} - - inline Foam::wordList Foam::functionObjects::fieldValue::fields() const { return fields_; diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C index 62c0c2695d..ea952a3506 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C @@ -54,7 +54,7 @@ namespace fieldValues template<> const char* Foam::NamedEnum < - Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes, + Foam::functionObjects::fieldValues::surfaceFieldValue::selectionTypes, 3 >::names[] = { @@ -90,9 +90,9 @@ const char* Foam::NamedEnum const Foam::NamedEnum < - Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes, + Foam::functionObjects::fieldValues::surfaceFieldValue::selectionTypes, 3 -> Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypeNames_; +> Foam::functionObjects::fieldValues::surfaceFieldValue::selectionTypeNames_; const Foam::NamedEnum < @@ -105,14 +105,15 @@ const Foam::NamedEnum void Foam::functionObjects::fieldValues::surfaceFieldValue::setFaceZoneFaces() { - label zoneId = mesh_.faceZones().findZoneID(regionName_); + label zoneId = mesh_.faceZones().findZoneID(selectionName_); if (zoneId < 0) { FatalErrorInFunction << type() << " " << name() << ": " - << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl - << " Unknown face zone name: " << regionName_ + << selectionTypeNames_[selectionType_] + << "(" << selectionName_ << "):" << nl + << " Unknown face zone name: " << selectionName_ << ". Valid face zones are: " << mesh_.faceZones().names() << nl << exit(FatalError); } @@ -175,14 +176,15 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::setFaceZoneFaces() void Foam::functionObjects::fieldValues::surfaceFieldValue::setPatchFaces() { - const label patchId = mesh_.boundaryMesh().findPatchID(regionName_); + const label patchId = mesh_.boundaryMesh().findPatchID(selectionName_); if (patchId < 0) { FatalErrorInFunction << type() << " " << name() << ": " - << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl - << " Unknown patch name: " << regionName_ + << selectionTypeNames_[selectionType_] + << "(" << selectionName_ << "):" << nl + << " Unknown patch name: " << selectionName_ << ". Valid patch names are: " << mesh_.boundaryMesh().names() << nl << exit(FatalError); @@ -360,7 +362,7 @@ combineSurfaceGeometry pointField& points ) const { - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { const sampledSurface& s = surfacePtr_(); @@ -396,7 +398,7 @@ combineSurfaceGeometry Foam::scalar Foam::functionObjects::fieldValues::surfaceFieldValue::totalArea() const { - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { return gSum(surfacePtr_().magSf()); } @@ -414,33 +416,35 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise const dictionary& dict ) { - switch (regionType_) + switch (selectionType_) { - case regionTypes::faceZone: + case selectionTypes::faceZone: { - dict.lookupBackwardsCompatible({"faceZone", "name"}) >> regionName_; + dict.lookupBackwardsCompatible({"faceZone", "name"}) + >> selectionName_; setFaceZoneFaces(); break; } - case regionTypes::patch: + case selectionTypes::patch: { - dict.lookupBackwardsCompatible({"patch", "name"}) >> regionName_; + dict.lookupBackwardsCompatible({"patch", "name"}) >> selectionName_; setPatchFaces(); break; } - case regionTypes::sampledSurface: + case selectionTypes::sampledSurface: { sampledSurfaceFaces(dict); - regionName_ = surfacePtr_().name(); + selectionName_ = surfacePtr_().name(); break; } default: { FatalErrorInFunction << type() << " " << name() << ": " - << regionTypeNames_[regionType_] << "(" << regionName_ << "):" - << nl << " Unknown region type. Valid region types are:" - << regionTypeNames_.sortedToc() << nl << exit(FatalError); + << selectionTypeNames_[selectionType_] + << "(" << selectionName_ << "):" << nl + << " Unknown selection type. Valid selection types are:" + << selectionTypeNames_.sortedToc() << nl << exit(FatalError); } } @@ -448,11 +452,12 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise { FatalErrorInFunction << type() << " " << name() << ": " - << regionTypeNames_[regionType_] << "(" << regionName_ << "):" << nl - << " Region has no faces" << exit(FatalError); + << selectionTypeNames_[selectionType_] + << "(" << selectionName_ << "):" << nl + << " selection has no faces" << exit(FatalError); } - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { surfacePtr_().update(); } @@ -505,8 +510,10 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::writeFileHeader { if (operation_ != operationType::none) { - writeCommented(file(), "Region type : "); - file() << regionTypeNames_[regionType_] << " " << regionName_ << endl; + writeCommented(file(), "Selection type : "); + file() + << selectionTypeNames_[selectionType_] << " " + << selectionName_ << endl; writeCommented(file(), "Faces : "); file() << nFaces_ << endl; writeCommented(file(), "Area : "); @@ -652,7 +659,14 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::surfaceFieldValue fieldValue(name, runTime, dict, typeName), dict_(dict), surfaceWriterPtr_(nullptr), - regionType_(regionTypeNames_.read(dict.lookup("regionType"))), + selectionType_ + ( + selectionTypeNames_.read + ( + dict.lookupBackwardsCompatible({"select", "regionType"}) + ) + ), + selectionName_(word::null), operation_(operationTypeNames_.read(dict.lookup("operation"))), weightFieldNames_(), scaleFactor_(1), @@ -675,7 +689,14 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::surfaceFieldValue fieldValue(name, obr, dict, typeName), dict_(dict), surfaceWriterPtr_(nullptr), - regionType_(regionTypeNames_.read(dict.lookup("regionType"))), + selectionType_ + ( + selectionTypeNames_.read + ( + dict.lookupBackwardsCompatible({"select", "regionType"}) + ) + ), + selectionName_(word::null), operation_(operationTypeNames_.read(dict.lookup("operation"))), weightFieldNames_(), scaleFactor_(1), @@ -716,7 +737,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write() fieldValue::write(); } - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { surfacePtr_().update(); } @@ -742,7 +763,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write() faceList faces; pointField points; - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { combineSurfaceGeometry(faces, points); } @@ -756,7 +777,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write() surfaceWriterPtr_->write ( outputDir(), - regionTypeNames_[regionType_] + ("_" + regionName_), + selectionTypeNames_[selectionType_] + ("_" + selectionName_), points, faces ); @@ -766,7 +787,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write() // Construct the sign and weight fields and the surface normals const scalarField signs ( - regionType_ == regionTypes::sampledSurface + selectionType_ == selectionTypes::sampledSurface ? scalarField(surfacePtr_().Sf().size(), 1) : List(faceSign_) ); @@ -777,7 +798,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write() } const vectorField Sf ( - regionType_ == regionTypes::sampledSurface + selectionType_ == selectionTypes::sampledSurface ? surfacePtr_().Sf() : (signs*filterField(mesh_.Sf()))() ); diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H index 5117375c7a..b3cca28017 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::functionObjects::fieldValues::surfaceFieldValue Description - Provides a 'face regionType' variant of the fieldValues function object. + Surface (face) region selection class. Given a list of user-specified fields and a selection of mesh (or general surface) faces, a number of operations can be performed, such as sums, @@ -45,7 +45,7 @@ Description writeControl writeTime; writeFields true; - regionType patch; + select patch; name movingWall; operation areaAverage; @@ -68,7 +68,8 @@ Description writeFields true; surfaceFormat none; - regionType faceZone; + + select faceZone; name f0; operation sum; @@ -89,11 +90,11 @@ Usage Property | Description | Required | Default value type | type name: surfaceFieldValue | yes | log | write data to standard output | no | no - writeFields | Write the region field values | yes | + writeFields | Write the field values | yes | writeArea | Write the area of the surfaceFieldValue | no | surfaceFormat | output value format | no | - regionType | face regionType: see below | yes | - name | name of face regionType if required | no | + select | face selection: see below | yes | + name | name of face select if required | no | operation | operation to perform | yes | weightField | name of field to apply weighting | no | weightFields | Names of fields to apply weighting | no | @@ -101,7 +102,7 @@ Usage fields | list of fields to operate on | yes | \endtable - Where \c regionType is defined by + Where the supported \c select options are: \plaintable faceZone | requires a 'name' entry to specify the faceZone patch | requires a 'name' entry to specify the patch @@ -136,7 +137,7 @@ Usage - If the field is a volField then a \c faceZone can only consist of boundary faces, because only these faces have a value associated with them. No cell-to-face interpolation is performed. - - If the field is a surfaceField then the region cannot be a \c + - If the field is a surfaceField then the selection cannot be a \c sampledSurface - If a sampledSurface has interpolation set to false then the surface face values will be taken directly from the cell that contains the @@ -187,16 +188,16 @@ public: // Public data types - //- region type enumeration - enum class regionTypes + //- Selection type enumeration + enum class selectionTypes { faceZone, patch, sampledSurface }; - //- region type names - static const NamedEnum regionTypeNames_; + //- Selection type names + static const NamedEnum selectionTypeNames_; //- Operation type enumeration @@ -265,8 +266,11 @@ protected: //- Surface writer autoPtr surfaceWriterPtr_; - //- region type - regionTypes regionType_; + //- Selection type + selectionTypes selectionType_; + + //- Name of face selection (patch, faceZone, etc.) + word selectionName_; //- Operation to apply to values operationType operation_; @@ -434,8 +438,11 @@ public: // Public Member Functions - //- Return the region type - inline const regionTypes& regionType() const; + //- Return the selection type + inline const selectionTypes& selectionType() const; + + //- Return the selection name + inline const word& selectionName() const; //- Return the local list of face IDs inline const labelList& faceId() const; diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H index b99c22d963..afe975c817 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,10 +28,18 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline const Foam::functionObjects::fieldValues::surfaceFieldValue::regionTypes& -Foam::functionObjects::fieldValues::surfaceFieldValue::regionType() const +inline +const Foam::functionObjects::fieldValues::surfaceFieldValue::selectionTypes& +Foam::functionObjects::fieldValues::surfaceFieldValue::selectionType() const { - return regionType_; + return selectionType_; +} + + +inline const Foam::word& +Foam::functionObjects::fieldValues::surfaceFieldValue::selectionName() const +{ + return selectionName_; } diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C index f4b725924c..21e299d9c3 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValueTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::validField { if ( - regionType_ != regionTypes::sampledSurface + selectionType_ != selectionTypes::sampledSurface && obr_.foundObject>(fieldName) ) { @@ -62,7 +62,7 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::getFieldValues const word& fieldName ) const { - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { if (obr_.foundObject>(fieldName)) { @@ -302,7 +302,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues faceList faces; pointField points; - if (regionType_ == regionTypes::sampledSurface) + if (selectionType_ == selectionTypes::sampledSurface) { combineSurfaceGeometry(faces, points); } @@ -320,8 +320,8 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues ( outputDir(), fieldName - + '_' + regionTypeNames_[regionType_] - + '_' + regionName_, + + '_' + selectionTypeNames_[selectionType_] + + '_' + selectionName_, points, faces, false, @@ -390,7 +390,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::writeValues file() << tab << result; Log << " " << operationTypeNames_[operation_] - << "(" << regionName_ << ") of " << fieldName + << "(" << selectionName_ << ") of " << fieldName << " = " << result << endl; } @@ -424,7 +424,8 @@ Foam::functionObjects::fieldValues::surfaceFieldValue::filterField { FatalErrorInFunction << type() << " " << name() << ": " - << regionTypeNames_[regionType_] << "(" << regionName_ << "):" + << selectionTypeNames_[selectionType_] + << "(" << selectionName_ << "):" << nl << " Unable to process internal faces for volume field " << field.name() << nl << abort(FatalError); diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H index 1865a8108c..14e28dccec 100644 --- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H +++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,8 +41,8 @@ Description writeControl writeTime; writeFields true; - regionType cellZone; - name c0; + select cellZone; + cellZone c0; operation volAverage; weightField alpha1; @@ -62,7 +62,7 @@ Usage log | Write data to standard output | no | no writeFields | Write the region field values | yes | writeLocation| Write the location (if available) | no | no - regionType | volRegion type: see below | yes | + select | volRegion type: see below | yes | name | Name of volRegion if required | no | operation | Operation to perform | yes | weightField | Name of field to apply weighting | no | @@ -70,7 +70,7 @@ Usage fields | List of fields to operate on | yes | \endtable - Where \c regionType is defined by + Where \c select options are: \plaintable cellZone | requires a 'name' entry to specify the cellZone all | all cells diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C index a72a8e4e47..9aa85976c9 100644 --- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C +++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -250,8 +250,8 @@ bool Foam::functionObjects::fieldValues::volFieldValue::writeValues ( IOobject ( - fieldName + '_' + regionTypeNames_[regionType_] - + '-' + volRegion::regionName_, + fieldName + '_' + selectionTypeNames_[selectionType_] + + '-' + volRegion::cellZoneName_, obr_.time().name(), obr_, IOobject::NO_READ, @@ -318,7 +318,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::writeValues file() << tab << result.value; Log << " " << operationTypeNames_[operation_] - << "(" << volRegion::regionName_ << ") of " << fieldName + << "(" << volRegion::cellZoneName_ << ") of " << fieldName << " = " << result.value; if (result.celli != -1) diff --git a/src/functionObjects/field/readFields/postProcessingDict b/src/functionObjects/field/readFields/postProcessingDict index 893b3a11c2..776033d8eb 100644 --- a/src/functionObjects/field/readFields/postProcessingDict +++ b/src/functionObjects/field/readFields/postProcessingDict @@ -38,8 +38,8 @@ functions writeInterval 1; log true; writeFields true; - regionType faceZone; - name f0; + select faceZone; + faceZone f0; operation areaAverage; fields diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H index 1ed76c48a0..75c6bbae8e 100644 --- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H +++ b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.H @@ -33,7 +33,7 @@ Usage { type fixedTemperatureConstraint; - selectionMode all; + select all; phase gas; // Optional phase name diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H index df87319c2b..d4e1f4a635 100644 --- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H +++ b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.H @@ -34,7 +34,7 @@ Usage { type fixedValueConstraint; - selectionMode cellZone; + select cellZone; cellZone porosity; fieldValues diff --git a/src/fvConstraints/limitMag/limitMag.C b/src/fvConstraints/limitMag/limitMag.C index 7e3c3c40f2..f5dd14e811 100644 --- a/src/fvConstraints/limitMag/limitMag.C +++ b/src/fvConstraints/limitMag/limitMag.C @@ -78,7 +78,7 @@ inline bool Foam::fv::limitMag::constrainType } // handle boundaries in the case of 'all' - if (set_.selectionMode() == fvCellSet::selectionModeType::all) + if (set_.selectionType() == fvCellSet::selectionTypes::all) { typename VolField::Boundary& psibf = psi.boundaryFieldRef(); diff --git a/src/fvConstraints/limitMag/limitMag.H b/src/fvConstraints/limitMag/limitMag.H index 551d0cb975..740d43e351 100644 --- a/src/fvConstraints/limitMag/limitMag.H +++ b/src/fvConstraints/limitMag/limitMag.H @@ -34,7 +34,7 @@ Usage { type limitMag; - selectionMode all; + select all; field U; diff --git a/src/fvConstraints/limitTemperature/limitTemperature.C b/src/fvConstraints/limitTemperature/limitTemperature.C index 3370c20cca..9083e90667 100644 --- a/src/fvConstraints/limitTemperature/limitTemperature.C +++ b/src/fvConstraints/limitTemperature/limitTemperature.C @@ -112,7 +112,7 @@ bool Foam::fv::limitTemperature::constrain(volScalarField& he) const } // Handle boundaries in the case of 'all' - if (set_.selectionMode() == fvCellSet::selectionModeType::all) + if (set_.selectionType() == fvCellSet::selectionTypes::all) { volScalarField::Boundary& Tbf = he.boundaryFieldRef(); @@ -153,7 +153,7 @@ bool Foam::fv::limitTemperature::constrain(volScalarField& he) const } // Handle boundaries in the case of 'all' - if (set_.selectionMode() == fvCellSet::selectionModeType::all) + if (set_.selectionType() == fvCellSet::selectionTypes::all) { volScalarField::Boundary& bf = he.boundaryFieldRef(); diff --git a/src/fvConstraints/limitTemperature/limitTemperature.H b/src/fvConstraints/limitTemperature/limitTemperature.H index 3d8d9b6db2..2ade8e2ad4 100644 --- a/src/fvConstraints/limitTemperature/limitTemperature.H +++ b/src/fvConstraints/limitTemperature/limitTemperature.H @@ -34,7 +34,7 @@ Usage { type limitTemperature; - selectionMode all; + select all; // field T; // Optional energy/temperature field name // Set to T for compressibleVoF diff --git a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H b/src/fvConstraints/meanVelocityForce/meanVelocityForce.H index b6edd65580..d19f1149a5 100644 --- a/src/fvConstraints/meanVelocityForce/meanVelocityForce.H +++ b/src/fvConstraints/meanVelocityForce/meanVelocityForce.H @@ -35,7 +35,7 @@ Usage { type meanVelocityForce; - selectionMode all; + select all; U U; // Name of velocity field diff --git a/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H b/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H index 42d8041c35..85a5b4b9a0 100644 --- a/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H +++ b/src/fvConstraints/meanVelocityForce/patchMeanVelocityForce/patchMeanVelocityForce.H @@ -35,7 +35,7 @@ Usage { type patchMeanVelocityForce; - selectionMode all; + select all; U U; // Name of velocity field diff --git a/src/fvModels/derived/accelerationSource/accelerationSource.H b/src/fvModels/derived/accelerationSource/accelerationSource.H index 365799fa52..335aad9f98 100644 --- a/src/fvModels/derived/accelerationSource/accelerationSource.H +++ b/src/fvModels/derived/accelerationSource/accelerationSource.H @@ -35,7 +35,7 @@ Usage { type accelerationSource; - selectionMode all; + select all; U U; diff --git a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H index 8abc03370d..9749a109c1 100644 --- a/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H +++ b/src/fvModels/derived/actuationDiskSource/actuationDiskSource.H @@ -49,7 +49,7 @@ Usage { type actuationDiskSource; - selectionMode cellSet; + select cellSet; cellSet actuationDisk1; diskDir (-1 0 0); // Disk direction diff --git a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H index 21df8f34a0..50ec67f40f 100644 --- a/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H +++ b/src/fvModels/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.H @@ -66,7 +66,7 @@ Usage { type effectivenessHeatExchangerSource; - selectionMode cellZone; + select cellZone; cellZone porosity; secondaryMassFlowRate 1.0; diff --git a/src/fvModels/derived/heatSource/heatSource.H b/src/fvModels/derived/heatSource/heatSource.H index 6c318544e4..d78a8a9f90 100644 --- a/src/fvModels/derived/heatSource/heatSource.H +++ b/src/fvModels/derived/heatSource/heatSource.H @@ -35,7 +35,7 @@ Usage { type heatSource; - selectionMode cellSet; + select cellSet; cellSet heater; Q 1e6; diff --git a/src/fvModels/derived/heatTransfer/heatTransfer.H b/src/fvModels/derived/heatTransfer/heatTransfer.H index 8566113c16..ee33a17d1b 100644 --- a/src/fvModels/derived/heatTransfer/heatTransfer.H +++ b/src/fvModels/derived/heatTransfer/heatTransfer.H @@ -47,7 +47,7 @@ Usage { type heatTransfer; - selectionMode cellSet; + select cellSet; cellSet c0; semiImplicit no; diff --git a/src/fvModels/derived/massSource/massSource.H b/src/fvModels/derived/massSource/massSource.H index c54b424bd3..715389166c 100644 --- a/src/fvModels/derived/massSource/massSource.H +++ b/src/fvModels/derived/massSource/massSource.H @@ -35,7 +35,7 @@ Usage { type massSource; - selectionMode cellSet; + select cellSet; cellSet massSource; massFlowRate 1e-4; diff --git a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H index 4de834b072..9e90065a58 100644 --- a/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H +++ b/src/fvModels/derived/radialActuationDiskSource/radialActuationDiskSource.H @@ -60,7 +60,7 @@ Usage { type radialActuationDiskSource; - selectionMode cellSet; + select cellSet; cellSet radialActuationDisk1; U U; // Name of the velocity field diff --git a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C index 769f2b9103..4dd1a656fb 100644 --- a/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C +++ b/src/fvModels/derived/rotorDiskSource/rotorDiskSource.C @@ -111,11 +111,11 @@ void Foam::fv::rotorDiskSource::readCoeffs() void Foam::fv::rotorDiskSource::checkData() { // Set inflow type - switch (set_.selectionMode()) + switch (set_.selectionType()) { - case fvCellSet::selectionModeType::cellSet: - case fvCellSet::selectionModeType::cellZone: - case fvCellSet::selectionModeType::all: + case fvCellSet::selectionTypes::cellSet: + case fvCellSet::selectionTypes::cellZone: + case fvCellSet::selectionTypes::all: { // Set the profile ID for each blade section profiles_.connectBlades(blade_.profileName(), blade_.profileID()); @@ -151,14 +151,14 @@ void Foam::fv::rotorDiskSource::checkData() { FatalErrorInFunction << "Source cannot be used with '" - << fvCellSet::selectionModeTypeNames_[set_.selectionMode()] + << fvCellSet::selectionTypeNames_[set_.selectionType()] << "' mode. Please use one of: " << nl - << fvCellSet::selectionModeTypeNames_ - [fvCellSet::selectionModeType::cellSet] << nl - << fvCellSet::selectionModeTypeNames_ - [fvCellSet::selectionModeType::cellZone] << nl - << fvCellSet::selectionModeTypeNames_ - [fvCellSet::selectionModeType::all] + << fvCellSet::selectionTypeNames_ + [fvCellSet::selectionTypes::cellSet] << nl + << fvCellSet::selectionTypeNames_ + [fvCellSet::selectionTypes::cellZone] << nl + << fvCellSet::selectionTypeNames_ + [fvCellSet::selectionTypes::all] << exit(FatalError); } } diff --git a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H index c9b336b420..8b7b320269 100644 --- a/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H +++ b/src/fvModels/derived/solidificationMeltingSource/solidificationMeltingSource.H @@ -80,7 +80,7 @@ Usage { type solidificationMeltingSource; - selectionMode cellZone; + select cellZone; cellZone iceZone; Tsol 273; diff --git a/src/fvModels/general/codedFvModel/codedFvModel.H b/src/fvModels/general/codedFvModel/codedFvModel.H index 790a329719..571f4a12e0 100644 --- a/src/fvModels/general/codedFvModel/codedFvModel.H +++ b/src/fvModels/general/codedFvModel/codedFvModel.H @@ -34,7 +34,7 @@ Usage { type coded; - selectionMode all; + select all; field h; diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H index 36f8effecb..4229120631 100644 --- a/src/meshTools/coordinateSystems/coordinateSystems.H +++ b/src/meshTools/coordinateSystems/coordinateSystems.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description explicitPorositySourceCoeffs { - selectionMode cellZone; + select cellZone; cellZone porousBlockage; type DarcyForchheimer; diff --git a/src/meshTools/sets/polyCellSet/polyCellSet.C b/src/meshTools/sets/polyCellSet/polyCellSet.C index c7e3c60f43..5488f3020a 100644 --- a/src/meshTools/sets/polyCellSet/polyCellSet.C +++ b/src/meshTools/sets/polyCellSet/polyCellSet.C @@ -32,7 +32,7 @@ namespace Foam { template<> const char* NamedEnum < - polyCellSet::selectionModeType, + polyCellSet::selectionTypes, 4 >::names[] = { @@ -42,8 +42,8 @@ namespace Foam "all" }; - const NamedEnum - polyCellSet::selectionModeTypeNames_; + const NamedEnum + polyCellSet::selectionTypeNames_; } @@ -53,9 +53,9 @@ void Foam::polyCellSet::setCells() { Info<< incrIndent; - switch (selectionMode_) + switch (selectionType_) { - case selectionModeType::points: + case selectionTypes::points: { Info<< indent << "- selecting cells using points" << endl; @@ -83,7 +83,7 @@ void Foam::polyCellSet::setCells() break; } - case selectionModeType::cellSet: + case selectionTypes::cellSet: { Info<< indent << "- selecting cells using cellSet " << cellSetName_ << endl; @@ -92,7 +92,7 @@ void Foam::polyCellSet::setCells() break; } - case selectionModeType::cellZone: + case selectionTypes::cellZone: { Info<< indent << "- selecting cells using cellZone " << cellSetName_ << endl; @@ -109,7 +109,7 @@ void Foam::polyCellSet::setCells() break; } - case selectionModeType::all: + case selectionTypes::all: { Info<< indent << "- selecting all cells" << endl; cells_ = identity(mesh_.nCells()); @@ -131,7 +131,7 @@ Foam::polyCellSet::polyCellSet ) : mesh_(mesh), - selectionMode_(selectionModeType::all), + selectionType_(selectionTypes::all), cellSetName_(word::null) { read(dict); @@ -148,7 +148,7 @@ Foam::polyCellSet::~polyCellSet() void Foam::polyCellSet::movePoints() { - if (selectionMode_ == selectionModeType::points) + if (selectionType_ == selectionTypes::points) { setCells(); } @@ -175,56 +175,58 @@ void Foam::polyCellSet::distribute(const polyDistributionMap&) bool Foam::polyCellSet::read(const dictionary& dict) { - if (dict.found("selectionMode")) + if (dict.found("select") || dict.found("selectionMode")) { - selectionMode_ = - selectionModeTypeNames_.read(dict.lookup("selectionMode")); + selectionType_ = selectionTypeNames_.read + ( + dict.lookupBackwardsCompatible({"select", "selectionMode"}) + ); } else if (dict.found("points")) { - selectionMode_ = selectionModeType::points; + selectionType_ = selectionTypes::points; } else if (dict.found("cellSet")) { - selectionMode_ = selectionModeType::cellSet; + selectionType_ = selectionTypes::cellSet; } else if (dict.found("cellZone")) { - selectionMode_ = selectionModeType::cellZone; + selectionType_ = selectionTypes::cellZone; } else { - dict.lookup("selectionMode"); + dict.lookup("select"); } - switch (selectionMode_) + switch (selectionType_) { - case selectionModeType::points: + case selectionTypes::points: { dict.lookup("points") >> points_; break; } - case selectionModeType::cellSet: + case selectionTypes::cellSet: { dict.lookup("cellSet") >> cellSetName_; break; } - case selectionModeType::cellZone: + case selectionTypes::cellZone: { dict.lookup("cellZone") >> cellSetName_; break; } - case selectionModeType::all: + case selectionTypes::all: { break; } default: { FatalErrorInFunction - << "Unknown selectionMode " - << selectionModeTypeNames_[selectionMode_] - << nl << "Valid selectionModes:" - << selectionModeTypeNames_.toc() + << "Unknown selection type " + << selectionTypeNames_[selectionType_] + << nl << "Valid selection type:" + << selectionTypeNames_.toc() << exit(FatalError); } } diff --git a/src/meshTools/sets/polyCellSet/polyCellSet.H b/src/meshTools/sets/polyCellSet/polyCellSet.H index b5fc52ebd1..8f002788f8 100644 --- a/src/meshTools/sets/polyCellSet/polyCellSet.H +++ b/src/meshTools/sets/polyCellSet/polyCellSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,26 +30,26 @@ Description Currently supports cell selection from a set of points, a specified cellSet or cellZone or all of the cells. The selection method can either be - specified explicitly using the \c selectionMode entry or inferred from the + specified explicitly using the \c select entry or inferred from the presence of either a \c cellSet, \c cellZone or \c points entry. The \c - selectionMode entry is required to select \c all cells. + select entry is required to select \c all cells. Usage Examples: \verbatim // Apply everywhere - selectionMode all; + select all; // Apply within a given cellSet - selectionMode cellSet; // Optional + select cellSet; // Optional cellSet rotor; // Apply within a given cellZone - selectionMode cellZone; // Optional - cellSet rotor; + select cellZone; // Optional + cellZone rotor; // Apply in cells containing a list of points - selectionMode points; // Optional + select points; // Optional points ( (2.25 0.5 0) @@ -87,7 +87,7 @@ public: // Public data //- Enumeration for selection mode types - enum class selectionModeType + enum class selectionTypes { points, cellSet, @@ -95,27 +95,28 @@ public: all }; - //- Word list of selection mode type names - static const NamedEnum - selectionModeTypeNames_; + //- Word list of selection type names + static const NamedEnum + selectionTypeNames_; private: // Private data + //- Reference to the mesh const polyMesh& mesh_; - //- Cell selection mode - selectionModeType selectionMode_; + //- Cell selection type + selectionTypes selectionType_; - //- Name of cell set for "cellSet" and "cellZone" selectionMode + //- Optional name of cell set or zone word cellSetName_; - //- List of points for "points" selectionMode + //- Optional list of points List points_; - //- Set of cells to apply source to + //- Set of selected cells mutable labelList cells_; @@ -145,11 +146,10 @@ public: // Access - //- Return const access to the cell selection mode - inline const selectionModeType& selectionMode() const; + //- Return const access to the cell selection type + inline const selectionTypes& selectionType() const; - //- Return const access to the name of cell set for "cellSet" - // selectionMode + //- Return const access to the name of cellSet inline const word& cellSetName() const; //- Return const access to the cell set diff --git a/src/meshTools/sets/polyCellSet/polyCellSetI.H b/src/meshTools/sets/polyCellSet/polyCellSetI.H index 009fdca987..d3299f7712 100644 --- a/src/meshTools/sets/polyCellSet/polyCellSetI.H +++ b/src/meshTools/sets/polyCellSet/polyCellSetI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,10 +25,10 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline const Foam::polyCellSet::selectionModeType& -Foam::polyCellSet::selectionMode() const +inline const Foam::polyCellSet::selectionTypes& +Foam::polyCellSet::selectionType() const { - return selectionMode_; + return selectionType_; } diff --git a/test/multiphase/multiphaseEuler/populationBalance/drift/constant/fvModels b/test/multiphase/multiphaseEuler/populationBalance/drift/constant/fvModels index dd61f56d55..d2e6bc097f 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/drift/constant/fvModels +++ b/test/multiphase/multiphaseEuler/populationBalance/drift/constant/fvModels @@ -18,7 +18,7 @@ waterSink { type massSource; - selectionMode all; + select all; massFlowRate -21.86682; diff --git a/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/constant/fvModels b/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/constant/fvModels index 9a0deea5e4..25528022f7 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/constant/fvModels +++ b/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/constant/fvModels @@ -18,7 +18,7 @@ massSource { type massSource; - selectionMode cellZone; + select cellZone; cellZone injection; massFlowRate 1e-3; diff --git a/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/cellZoneAverage b/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/cellZoneAverage index 19c0ff523c..1b0b36da45 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/cellZoneAverage +++ b/test/multiphase/multiphaseEuler/populationBalance/isothermalGrowth/system/cellZoneAverage @@ -17,8 +17,8 @@ writeControl writeTime; writeInterval 1; fields (p); -regionType cellZone; -name injection; +select cellZone; +cellZone injection; operation volAverage; writeFields false; diff --git a/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/constant/fvModels b/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/constant/fvModels index cc55742fa1..8f6b5d7aca 100644 --- a/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/constant/fvModels +++ b/test/multiphase/multiphaseEuler/populationBalance/negativeDrift/constant/fvModels @@ -18,7 +18,7 @@ waterSource { type massSource; - selectionMode all; + select all; massFlowRate 30.785654; diff --git a/tutorials/modules/CHT/VoFcoolingCylinder2D/constant/solid/fvModels b/tutorials/modules/CHT/VoFcoolingCylinder2D/constant/solid/fvModels index 9d29be1124..cc77e28af6 100644 --- a/tutorials/modules/CHT/VoFcoolingCylinder2D/constant/solid/fvModels +++ b/tutorials/modules/CHT/VoFcoolingCylinder2D/constant/solid/fvModels @@ -17,7 +17,7 @@ cylinderHeat { type heatSource; - selectionMode all; + select all; q 5e6; } diff --git a/tutorials/modules/CHT/circuitBoardCooling/constant/baffle3D/fvModels b/tutorials/modules/CHT/circuitBoardCooling/constant/baffle3D/fvModels index 4cb9881cc4..4d53a8149b 100644 --- a/tutorials/modules/CHT/circuitBoardCooling/constant/baffle3D/fvModels +++ b/tutorials/modules/CHT/circuitBoardCooling/constant/baffle3D/fvModels @@ -17,7 +17,7 @@ cylinderHeat { type heatSource; - selectionMode all; + select all; q 17000; } diff --git a/tutorials/modules/CHT/coolingCylinder2D/constant/solid/fvModels b/tutorials/modules/CHT/coolingCylinder2D/constant/solid/fvModels index 8c16cd0a18..b760033d68 100644 --- a/tutorials/modules/CHT/coolingCylinder2D/constant/solid/fvModels +++ b/tutorials/modules/CHT/coolingCylinder2D/constant/solid/fvModels @@ -17,7 +17,7 @@ cylinderHeat { type heatSource; - selectionMode all; + select all; q 5e7; } diff --git a/tutorials/modules/CHT/coolingSphere/templates/constant/solid/fvModels b/tutorials/modules/CHT/coolingSphere/templates/constant/solid/fvModels index fd084fd3f7..797eafdc8b 100644 --- a/tutorials/modules/CHT/coolingSphere/templates/constant/solid/fvModels +++ b/tutorials/modules/CHT/coolingSphere/templates/constant/solid/fvModels @@ -17,7 +17,7 @@ FoamFile fixedTemperature { type fixedTemperatureConstraint; - selectionMode all; + select all; mode uniform; @@ -29,7 +29,7 @@ fixedTemperature fixedPower { type heatSource; - selectionMode all; + select all; Q 100; // Set power (W) } diff --git a/tutorials/modules/CHT/coolingSphere/templates/system/solid/fvConstraints b/tutorials/modules/CHT/coolingSphere/templates/system/solid/fvConstraints index 384cfb4fd5..fb8952aef7 100644 --- a/tutorials/modules/CHT/coolingSphere/templates/system/solid/fvConstraints +++ b/tutorials/modules/CHT/coolingSphere/templates/system/solid/fvConstraints @@ -16,7 +16,7 @@ FoamFile // fixedTemperature // { // type fixedTemperatureConstraint; -// selectionMode all; +// select all; // mode uniform; diff --git a/tutorials/modules/CHT/heatedDuct/constant/heater/fvModels b/tutorials/modules/CHT/heatedDuct/constant/heater/fvModels index fcd690fb7a..4f85e558a2 100644 --- a/tutorials/modules/CHT/heatedDuct/constant/heater/fvModels +++ b/tutorials/modules/CHT/heatedDuct/constant/heater/fvModels @@ -18,7 +18,7 @@ energySource { type heatSource; - selectionMode all; + select all; q 1e7; } diff --git a/tutorials/modules/CHT/wallBoiling/system/controlDict b/tutorials/modules/CHT/wallBoiling/system/controlDict index e12050232b..a0ccb9aa33 100644 --- a/tutorials/modules/CHT/wallBoiling/system/controlDict +++ b/tutorials/modules/CHT/wallBoiling/system/controlDict @@ -80,8 +80,8 @@ functions log yes; writeFields false; region fluid; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.liquid); } @@ -92,8 +92,8 @@ functions log yes; writeFields false; region fluid; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.liquid); } @@ -104,8 +104,8 @@ functions log yes; writeFields false; region fluid; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -117,8 +117,8 @@ functions log yes; writeFields false; region fluid; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); @@ -130,8 +130,8 @@ functions log yes; writeFields false; region fluid; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -143,8 +143,8 @@ functions log yes; writeFields false; region fluid; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); diff --git a/tutorials/modules/compressibleVoF/sloshingTank2D/constant/dynamicMeshDict b/tutorials/modules/compressibleVoF/sloshingTank2D/constant/dynamicMeshDict index f38a472b92..4a5ddc6d51 100644 --- a/tutorials/modules/compressibleVoF/sloshingTank2D/constant/dynamicMeshDict +++ b/tutorials/modules/compressibleVoF/sloshingTank2D/constant/dynamicMeshDict @@ -22,12 +22,12 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction SDA; CofG (0 0 0); - lambda 50; + lambda 50; rollAmax 0.22654; rollAmin 0.10472; heaveA 3.79; diff --git a/tutorials/modules/incompressibleFluid/channel395/system/fvConstraints b/tutorials/modules/incompressibleFluid/channel395/system/fvConstraints index 7d4aa80025..bb08441ffe 100644 --- a/tutorials/modules/incompressibleFluid/channel395/system/fvConstraints +++ b/tutorials/modules/incompressibleFluid/channel395/system/fvConstraints @@ -18,7 +18,7 @@ momentumForce { type meanVelocityForce; - selectionMode all; + select all; Ubar (0.1335 0 0); } diff --git a/tutorials/modules/incompressibleFluid/ductSecondaryFlow/system/fvConstraints b/tutorials/modules/incompressibleFluid/ductSecondaryFlow/system/fvConstraints index 5b71e45161..d1cb822797 100644 --- a/tutorials/modules/incompressibleFluid/ductSecondaryFlow/system/fvConstraints +++ b/tutorials/modules/incompressibleFluid/ductSecondaryFlow/system/fvConstraints @@ -18,7 +18,7 @@ momentumSource { type meanVelocityForce; - selectionMode all; + select all; Ubar (0 0 1.95); } diff --git a/tutorials/modules/incompressibleFluid/mixerSRF/constant/MRFProperties b/tutorials/modules/incompressibleFluid/mixerSRF/constant/MRFProperties index 98ca4e138d..89983e2c9a 100644 --- a/tutorials/modules/incompressibleFluid/mixerSRF/constant/MRFProperties +++ b/tutorials/modules/incompressibleFluid/mixerSRF/constant/MRFProperties @@ -16,7 +16,7 @@ FoamFile SRF { - selectionMode all; + select all; origin (0 0 0); axis (0 0 1); diff --git a/tutorials/modules/incompressibleFluid/planarPoiseuille/constant/fvModels b/tutorials/modules/incompressibleFluid/planarPoiseuille/constant/fvModels index 7c104acaaf..078eab3917 100644 --- a/tutorials/modules/incompressibleFluid/planarPoiseuille/constant/fvModels +++ b/tutorials/modules/incompressibleFluid/planarPoiseuille/constant/fvModels @@ -18,7 +18,7 @@ momentumSource { type semiImplicitSource; - selectionMode all; + select all; volumeMode specific; diff --git a/tutorials/modules/incompressibleFluid/rotor2DRotating/constant/dynamicMeshDict b/tutorials/modules/incompressibleFluid/rotor2DRotating/constant/dynamicMeshDict index 9db7c428cf..98a15a8456 100644 --- a/tutorials/modules/incompressibleFluid/rotor2DRotating/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleFluid/rotor2DRotating/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction rotatingMotion; diff --git a/tutorials/modules/incompressibleFluid/rotor2DSRF/constant/MRFProperties b/tutorials/modules/incompressibleFluid/rotor2DSRF/constant/MRFProperties index ef414895de..e656c8d24e 100644 --- a/tutorials/modules/incompressibleFluid/rotor2DSRF/constant/MRFProperties +++ b/tutorials/modules/incompressibleFluid/rotor2DSRF/constant/MRFProperties @@ -16,7 +16,7 @@ FoamFile SRF { - selectionMode all; + select all; origin (0 0 0); axis (0 0 1); diff --git a/tutorials/modules/incompressibleVoF/sloshingCylinder/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/sloshingCylinder/constant/dynamicMeshDict index 852d10f730..90701f722a 100644 --- a/tutorials/modules/incompressibleVoF/sloshingCylinder/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/sloshingCylinder/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction multiMotion; diff --git a/tutorials/modules/incompressibleVoF/sloshingTank2D/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/sloshingTank2D/constant/dynamicMeshDict index f38a472b92..8bcea97086 100644 --- a/tutorials/modules/incompressibleVoF/sloshingTank2D/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/sloshingTank2D/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction SDA; diff --git a/tutorials/modules/incompressibleVoF/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/sloshingTank2D3DoF/constant/dynamicMeshDict index 0b399d5936..97329b9bc0 100644 --- a/tutorials/modules/incompressibleVoF/sloshingTank2D3DoF/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/sloshingTank2D3DoF/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction SDA; diff --git a/tutorials/modules/incompressibleVoF/sloshingTank3D/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/sloshingTank3D/constant/dynamicMeshDict index 0dbba859a4..ffec22a5d0 100644 --- a/tutorials/modules/incompressibleVoF/sloshingTank3D/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/sloshingTank3D/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction SDA; diff --git a/tutorials/modules/incompressibleVoF/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/sloshingTank3D3DoF/constant/dynamicMeshDict index ecf58c4a1f..6fd005ad09 100644 --- a/tutorials/modules/incompressibleVoF/sloshingTank3D3DoF/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/sloshingTank3D3DoF/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction SDA; diff --git a/tutorials/modules/incompressibleVoF/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/sloshingTank3D6DoF/constant/dynamicMeshDict index e161695086..daf57b9561 100644 --- a/tutorials/modules/incompressibleVoF/sloshingTank3D6DoF/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/sloshingTank3D6DoF/constant/dynamicMeshDict @@ -22,7 +22,7 @@ mover motionSolver solidBody; - selectionMode all; + select all; solidBodyMotionFunction sixDoFMotion; diff --git a/tutorials/modules/incompressibleVoF/testTubeMixer/constant/dynamicMeshDict b/tutorials/modules/incompressibleVoF/testTubeMixer/constant/dynamicMeshDict index 6f16b0cc66..d6e3c90503 100644 --- a/tutorials/modules/incompressibleVoF/testTubeMixer/constant/dynamicMeshDict +++ b/tutorials/modules/incompressibleVoF/testTubeMixer/constant/dynamicMeshDict @@ -24,7 +24,7 @@ mover solidBodyMotionFunction multiMotion; - selectionMode all; + select all; // Table rotating in z axis rotatingTable diff --git a/tutorials/modules/incompressibleVoF/waterChannel/system/controlDict b/tutorials/modules/incompressibleVoF/waterChannel/system/controlDict index e5d188b5ce..f5c2ed4836 100644 --- a/tutorials/modules/incompressibleVoF/waterChannel/system/controlDict +++ b/tutorials/modules/incompressibleVoF/waterChannel/system/controlDict @@ -62,8 +62,8 @@ functions log true; // Output field values as well writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; fields @@ -77,13 +77,13 @@ functions outletFlux { $inletFlux; - name outlet; + patch outlet; } atmosphereFlux { $inletFlux; - name atmosphere; + patch atmosphere; } } diff --git a/tutorials/modules/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/system/controlDict b/tutorials/modules/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/system/controlDict index 86cc7882e9..69f91c987b 100644 --- a/tutorials/modules/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/system/controlDict +++ b/tutorials/modules/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/system/controlDict @@ -75,8 +75,8 @@ functions log yes; writeTotalArea no; writeFields no; - regionType faceZone; - name f0; + select faceZone; + faceZone f0; operation areaAverage; fields ( diff --git a/tutorials/modules/isothermalFluid/potentialFreeSurfaceOscillatingBox/system/controlDict b/tutorials/modules/isothermalFluid/potentialFreeSurfaceOscillatingBox/system/controlDict index b3fc3bb08e..52b775d812 100644 --- a/tutorials/modules/isothermalFluid/potentialFreeSurfaceOscillatingBox/system/controlDict +++ b/tutorials/modules/isothermalFluid/potentialFreeSurfaceOscillatingBox/system/controlDict @@ -75,8 +75,8 @@ functions log yes; writeTotalArea no; writeFields no; - regionType faceZone; - name f0; + select faceZone; + faceZone f0; operation areaAverage; fields ( diff --git a/tutorials/modules/multicomponentFluid/verticalChannel/system/controlDict b/tutorials/modules/multicomponentFluid/verticalChannel/system/controlDict index 967a871fc1..ec60b70541 100644 --- a/tutorials/modules/multicomponentFluid/verticalChannel/system/controlDict +++ b/tutorials/modules/multicomponentFluid/verticalChannel/system/controlDict @@ -61,8 +61,8 @@ functions writeControl writeTime; log yes; writeFields no; - regionType patch; - name outlet; + select patch; + patch outlet; operation average; weightField phi; diff --git a/tutorials/modules/multicomponentFluid/verticalChannelLTS/system/controlDict b/tutorials/modules/multicomponentFluid/verticalChannelLTS/system/controlDict index 3830c7f226..e9ad779391 100644 --- a/tutorials/modules/multicomponentFluid/verticalChannelLTS/system/controlDict +++ b/tutorials/modules/multicomponentFluid/verticalChannelLTS/system/controlDict @@ -56,7 +56,7 @@ functions writeControl writeTime; log yes; writeFields no; - regionType patch; + select patch; name outlet; operation average; weightField phi; diff --git a/tutorials/modules/multicomponentFluid/verticalChannelSteady/system/controlDict b/tutorials/modules/multicomponentFluid/verticalChannelSteady/system/controlDict index c8aa747a75..5d51f4b773 100644 --- a/tutorials/modules/multicomponentFluid/verticalChannelSteady/system/controlDict +++ b/tutorials/modules/multicomponentFluid/verticalChannelSteady/system/controlDict @@ -57,8 +57,8 @@ functions writeControl writeTime; log yes; writeFields no; - regionType patch; - name outlet; + select patch; + patch outlet; operation average; weightField phi; fields diff --git a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/system/continuityFunctions index fde93126ec..001b579f2d 100644 --- a/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/system/continuityFunctions +++ b/tutorials/modules/multiphaseEuler/bubbleColumnEvaporating/system/continuityFunctions @@ -21,7 +21,7 @@ inletMassFlowRate log true; surfaceFormat none; - regionType patch; + select patch; name inlet; operation sum; @@ -44,7 +44,7 @@ outletMassFlowRate log true; surfaceFormat none; - regionType patch; + select patch; name outlet; operation sum; diff --git a/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict b/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict index 0ca20feb98..f31d833866 100644 --- a/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict +++ b/tutorials/modules/multiphaseEuler/bubblePipe/system/controlDict @@ -79,7 +79,7 @@ functions ( name=probabilityDensity.injection, populationBalance=bubbles, - regionType=cellZone, + select=cellZone, cellZone=injection, functionType=volumeDensity, coordinateType=diameter, @@ -90,7 +90,7 @@ functions ( name=probabilityDensity.outlet, populationBalance=bubbles, - regionType=cellZone, + select=cellZone, cellZone=outlet, functionType=volumeDensity, coordinateType=diameter, diff --git a/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict b/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict index f465681159..247250797d 100644 --- a/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict +++ b/tutorials/modules/multiphaseEuler/pipeBend/system/controlDict @@ -59,7 +59,7 @@ functions ( name=probabilityDensity.afterBend_1d, populationBalance=agglomerates, - regionType=cellZone, + select=cellZone, cellZone=afterBend_1d, functionType=volumeDensity, coordinateType=diameter, @@ -70,7 +70,7 @@ functions ( name=probabilityDensity.afterBend_5d, populationBalance=agglomerates, - regionType=cellZone, + select=cellZone, cellZone=afterBend_5d, functionType=volumeDensity, coordinateType=diameter, @@ -81,7 +81,7 @@ functions ( name=probabilityDensity.afterBend_9d, populationBalance=agglomerates, - regionType=cellZone, + select=cellZone, cellZone=afterBend_9d, functionType=volumeDensity, coordinateType=diameter, @@ -92,7 +92,7 @@ functions ( name=probabilityDensity.beforeBend_1d, populationBalance=agglomerates, - regionType=cellZone, + select=cellZone, cellZone=beforeBend_1d, functionType=volumeDensity, coordinateType=diameter, diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict index 28df413544..dbfc0c6b6c 100644 --- a/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict +++ b/tutorials/modules/multiphaseEuler/titaniaSynthesis/system/controlDict @@ -66,7 +66,7 @@ functions ( name=numberDensity, populationBalance=aggregates, - regionType=cellZone, + select=cellZone, cellZone=outlet, functionType=numberDensity, coordinateType=projectedAreaDiameter, diff --git a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict index 7be4e152b9..73f91d49f1 100644 --- a/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict +++ b/tutorials/modules/multiphaseEuler/titaniaSynthesisSurface/system/controlDict @@ -66,7 +66,7 @@ functions ( name=numberDensity, populationBalance=aggregates, - regionType=cellZone, + select=cellZone, cellZone=outlet, functionType=numberDensity, coordinateType=projectedAreaDiameter, diff --git a/tutorials/modules/multiphaseEuler/wallBoilingIATE/system/controlDict b/tutorials/modules/multiphaseEuler/wallBoilingIATE/system/controlDict index 3f5180bdfd..240748743b 100644 --- a/tutorials/modules/multiphaseEuler/wallBoilingIATE/system/controlDict +++ b/tutorials/modules/multiphaseEuler/wallBoilingIATE/system/controlDict @@ -67,8 +67,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.liquid); } @@ -78,8 +78,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.liquid); } @@ -89,8 +89,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -101,8 +101,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); @@ -113,8 +113,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -125,8 +125,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/system/controlDict b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/system/controlDict index af87f5da21..6a4411e76c 100644 --- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/system/controlDict +++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperse/system/controlDict @@ -71,8 +71,8 @@ functions log yes; functionType volumeConcentration; coordinateType diameter; - regionType cellZone; - name x349; + select cellZone; + cellZone x349; populationBalance bubbles; } volumeDensity_bulk.diameter.bubbles @@ -85,8 +85,8 @@ functions log yes; functionType volumeConcentration; coordinateType diameter; - regionType cellZone; - name x349_bulk; + select cellZone; + cellZone x349_bulk; populationBalance bubbles; } volumeDensity_wall.diameter.bubbles @@ -99,8 +99,8 @@ functions log yes; functionType volumeConcentration; coordinateType diameter; - regionType cellZone; - name x349_wall; + select cellZone; + cellZone x349_wall; populationBalance bubbles; } outflow @@ -109,8 +109,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.liquid ); } @@ -120,8 +120,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.liquid ); } @@ -131,8 +131,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -143,8 +143,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); @@ -155,8 +155,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -167,8 +167,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); diff --git a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict index 562fdcf3f6..96d5e9f7ba 100644 --- a/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict +++ b/tutorials/modules/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict @@ -71,8 +71,8 @@ functions log yes; functionType volumeConcentration; coordinateType diameter; - regionType cellZone; - name x349; + select cellZone; + cellZone x349; populationBalance bubbles; } volumeDensity_bulk.diameter.bubbles @@ -85,8 +85,8 @@ functions log yes; functionType volumeConcentration; coordinateType diameter; - regionType cellZone; - name x349_bulk; + select cellZone; + cellZone x349_bulk; populationBalance bubbles; } volumeDensity_wall.diameter.bubbles @@ -99,8 +99,8 @@ functions log yes; functionType volumeConcentration; coordinateType diameter; - regionType cellZone; - name x349_wall; + select cellZone; + cellZone x349_wall; populationBalance bubbles; } outflow @@ -109,8 +109,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.gas2 alphaRhoPhi.liquid ); } @@ -120,8 +120,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; fields ( alphaRhoPhi.gas alphaRhoPhi.gas2 alphaRhoPhi.liquid ); } @@ -131,8 +131,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -143,8 +143,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.gas2; fields ( h.gas2 ); @@ -155,8 +155,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name outlet; + select patch; + patch outlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid ); @@ -167,8 +167,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.gas; fields ( h.gas ); @@ -179,8 +179,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.gas2; fields ( h.gas2 ); @@ -191,8 +191,8 @@ functions functionObjectLibs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; - regionType patch; - name inlet; + select patch; + patch inlet; operation sum; weightField alphaRhoPhi.liquid; fields ( h.liquid );