From 722ebdb1512ca6a068df6ad0c01c6b7743da3749 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Fri, 17 May 2019 09:53:25 +0100 Subject: [PATCH] STYLE: update of 'mode' to 'type' keyword for radiation properties --- .../filmThermoModel/filmThermoModelNew.C | 2 +- .../boundaryRadiationPropertiesPatch.C | 4 ++-- src/waveModels/waveModel/waveModelNew.C | 2 +- .../constant/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 16 +++++++--------- .../constant/boundaryRadiationProperties | 2 -- .../constant/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 3 +-- .../constant/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 2 ++ .../bottomAir/boundaryRadiationProperties | 1 - .../constant/boundaryRadiationProperties | 3 +-- 15 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C index f311eb4761b..a814b968528 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C @@ -44,7 +44,7 @@ autoPtr<filmThermoModel> filmThermoModel::New const dictionary& dict ) { - word modelType(dict.get<word>("filmThermoModel")); + const word modelType(dict.get<word>("filmThermoModel")); Info<< " Selecting filmThermoModel " << modelType << endl; diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C index 6d108280554..e96f9263939 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ Foam::radiation::boundaryRadiationPropertiesPatch::New const polyPatch& pp ) { - word modelType(dict.lookupCompat("type", {{"mode", 1812}})); + const word modelType(dict.getCompat<word>("type", {{"mode", 1812}})); Info<< "Selecting boundary radiation Model: " << modelType << endl; diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C index 5d452594cbf..6c07dc29b77 100644 --- a/src/waveModels/waveModel/waveModelNew.C +++ b/src/waveModels/waveModel/waveModelNew.C @@ -48,7 +48,7 @@ Foam::autoPtr<Foam::waveModel> Foam::waveModel::New ) ); - word modelType = "none"; + word modelType("none"); dictionary patchDict; if (waveDict.found(patch.name())) { diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties index c0d2e868640..57594a61753 100644 --- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/boundaryRadiationProperties @@ -29,5 +29,4 @@ inlet absorptivity 0.9; } - // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties index 59430dda024..0d849889040 100644 --- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties @@ -15,6 +15,13 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +".*" +{ + type lookup; + emissivity 1.0; + absorptivity 1.0; + transmissivity 0.0; +} region0_to_pyrolysisRegion_coupledWall { @@ -25,13 +32,4 @@ region0_to_pyrolysisRegion_coupledWall } } -".*" -{ - type lookup; - emissivity 1.0; - absorptivity 1.0; - transmissivity 0.0; -} - - // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties index 397bae330be..c0cd21bce3c 100644 --- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/boundaryRadiationProperties @@ -15,7 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - ".*" { type lookup; @@ -31,5 +30,4 @@ FoamFile } } - // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties index 0873938f8c8..5a0d6c2cc26 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/boundaryRadiationProperties @@ -39,5 +39,4 @@ inlet emissivity 1.0; } - // ************************************************************************* // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties index 3d597f2a67b..dab7e297988 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/boundaryRadiationProperties @@ -21,5 +21,4 @@ FoamFile emissivity 1.0; } - // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties index 76b5b1030b5..be4b67e973b 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/boundaryRadiationProperties @@ -17,10 +17,9 @@ FoamFile ".*" { - mode lookup; + type lookup; emissivity 1; absorptivity 0; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties index c7aace78679..01ed536a7d8 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties @@ -22,5 +22,4 @@ FoamFile absorptivity 1.0; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties index c7aace78679..01ed536a7d8 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties @@ -22,5 +22,4 @@ FoamFile absorptivity 1.0; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties index c7aace78679..01ed536a7d8 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties @@ -22,5 +22,4 @@ FoamFile absorptivity 1.0; } - // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties index 0ab2c1e8494..29f0e981c64 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/simpleCarSolarPanel/constant/boundaryRadiationProperties @@ -73,3 +73,5 @@ ZMin emissivity (0.3 0.7); }; } + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties index 5886f0d2c47..3bffba0aa68 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties @@ -15,7 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - ".*" { type lookup; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties index adabddc6418..0760baff80b 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties @@ -15,10 +15,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - ".*" { - mode lookup; + type lookup; emissivity 1.0; absorptivity 0.0; } -- GitLab