From c9e872b3bc8991b9bd55a00143db933cfd6ef40b Mon Sep 17 00:00:00 2001 From: sergio <sergio> Date: Tue, 31 May 2016 08:42:07 -0700 Subject: [PATCH] ENH: Changing boundaryRadiationProperties to read an scalar when a lookup mode is used for boudanry radiation properties. Tutorials updated accordingly --- .../meshRefinement/meshRefinementTemplates.C | 2 +- src/sampling/meshToMesh/meshToMeshTemplates.C | 2 +- .../boundaryRadiationPropertiesPatch.C | 16 +++++++++++++--- .../constant/boundaryRadiationProperties | 6 +++--- .../constant/boundaryRadiationProperties | 4 +--- .../constant/boundaryRadiationProperties | 12 ++++-------- .../constant/boundaryRadiationProperties | 4 ++-- .../constant/boundaryRadiationProperties | 4 ++-- .../constant/boundaryRadiationProperties | 4 ++-- .../bottomAir/boundaryRadiationProperties | 4 ++-- .../constant/topAir/boundaryRadiationProperties | 2 +- .../constant/boundaryRadiationProperties | 4 ++-- 12 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C index 2eb6e8e92ba..a6f0414d1f9 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C @@ -305,7 +305,7 @@ void Foam::meshRefinement::weightedSum } sum.setSize(meshPoints.size()); - sum = Type(zero); + sum = Type(Zero); forAll(edges, edgeI) { diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C index 5b2ba58060e..56dd95d341c 100644 --- a/src/sampling/meshToMesh/meshToMeshTemplates.C +++ b/src/sampling/meshToMesh/meshToMeshTemplates.C @@ -771,7 +771,7 @@ void Foam::meshToMesh::mapAndOpTgtToSrc const CombineOp& cop ) const { - srcField = Type(Tero); + srcField = Type(Zero); AMI.interpolateToSource ( diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C index eb27e6bf887..12c6a4fbf43 100644 --- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C +++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C @@ -194,7 +194,11 @@ Foam::radiation::boundaryRadiationPropertiesPatch::emissivity { tmp<scalarField> e ( - new scalarField("emissivity", dict_, patch_.size()) + new scalarField + ( + patch_.size(), + readScalar(dict_.lookup("emissivity")) + ) ); return e; @@ -283,7 +287,11 @@ Foam::radiation::boundaryRadiationPropertiesPatch::absorptivity { tmp<scalarField> a ( - new scalarField("absorptivity", dict_, patch_.size()) + new scalarField + ( + patch_.size(), + readScalar(dict_.lookup("absorptivity")) + ) ); return a; @@ -361,9 +369,11 @@ Foam::radiation::boundaryRadiationPropertiesPatch::transmissivity ( new scalarField ( - "transmissivity", dict_, patch_.size() + patch_.size(), + readScalar(dict_.lookup("transmissivity")) ) ); + return tau; } diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties index 8fdbaa838c3..530a06e550c 100644 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/boundaryRadiationProperties @@ -24,9 +24,9 @@ region0_to_pyrolysisRegion_coupledWall ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; - transmissivity uniform 0.0; + 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 1ea3e10732e..d3a530f353e 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/boundaryRadiationProperties @@ -20,15 +20,13 @@ FoamFile { type boundaryRadiation; mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } "(region0_to.*)" { type boundaryRadiation; mode solidRadiation; - value uniform 0; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties index 24c5356cd8d..a4660c95b70 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/boundaryRadiationProperties @@ -18,29 +18,25 @@ FoamFile base { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } outlet { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } sides { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } inlet { mode lookup; - emissivity uniform 1.0; - value uniform 0; + emissivity 1.0; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties index 08eb48ed27d..474446378fd 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/boundaryRadiationProperties @@ -18,8 +18,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; + emissivity 1.0; + absorptivity 0.0; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties index 446f19f45ab..c8a183a959e 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/boundaryRadiationProperties @@ -18,8 +18,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; + emissivity 1.0; + absorptivity 1.0; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties index 446f19f45ab..c8a183a959e 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/boundaryRadiationProperties @@ -18,8 +18,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; + emissivity 1.0; + absorptivity 1.0; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties index 35e642154af..d088ebb1af0 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/boundaryRadiationProperties @@ -19,8 +19,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 1.0; + emissivity 1.0; + absorptivity 1.0; } "bottomAir_to_.*" diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties index d544aba468f..8efbfedb84a 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/boundaryRadiationProperties @@ -18,7 +18,7 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; + emissivity 1.0; } "topAir_to_.*" diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties index 79e22009212..8b57be670c1 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties @@ -19,8 +19,8 @@ FoamFile ".*" { mode lookup; - emissivity uniform 1.0; - absorptivity uniform 0.0; + emissivity 1.0; + absorptivity 0.0; } // ************************************************************************* // -- GitLab