From f26ba2c303af6e5f995f42d44aa93d7901f2209b Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 7 Mar 2011 16:47:50 +0000 Subject: [PATCH 1/6] ENH: Updated cloud enthalpy coupling --- .../COxidationDiffusionLimitedRate.C | 15 ++++++--------- .../COxidationDiffusionLimitedRate.H | 3 --- .../COxidationKineticDiffusionLimitedRate.C | 15 ++++++--------- .../COxidationKineticDiffusionLimitedRate.H | 3 --- .../COxidationMurphyShaddix.C | 17 +++++++---------- .../COxidationMurphyShaddix.H | 3 --- .../ReactingMultiphaseParcel.C | 11 ----------- .../Templates/ReactingParcel/ReactingParcel.C | 2 -- 8 files changed, 19 insertions(+), 50 deletions(-) diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C index 2f0369ae3e..f60e67099a 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C @@ -44,8 +44,7 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate O2GlobalId_(owner.composition().globalCarrierId("O2")), CO2GlobalId_(owner.composition().globalCarrierId("CO2")), WC_(0.0), - WO2_(0.0), - HcCO2_(0.0) + WO2_(0.0) { // Determine Cs ids label idSolid = owner.composition().idSolid(); @@ -55,7 +54,6 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate WO2_ = owner.thermo().carrier().W(O2GlobalId_); const scalar WCO2 = owner.thermo().carrier().W(CO2GlobalId_); WC_ = WCO2 - WO2_; - HcCO2_ = owner.thermo().carrier().Hc(CO2GlobalId_); if (Sb_ < 0) { @@ -89,8 +87,7 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate O2GlobalId_(srm.O2GlobalId_), CO2GlobalId_(srm.CO2GlobalId_), WC_(srm.WC_), - WO2_(srm.WO2_), - HcCO2_(srm.HcCO2_) + WO2_(srm.WO2_) {} @@ -160,12 +157,12 @@ Foam::scalar Foam::COxidationDiffusionLimitedRate::calculate dMassSRCarrier[O2GlobalId_] -= dmO2; dMassSRCarrier[CO2GlobalId_] += dmCO2; - const scalar HsC = thermo.solids().properties()[CsLocalId_].Hs(T); + const scalar HC = thermo.solids().properties()[CsLocalId_].H(T); + const scalar HCO2 = thermo.carrier().H(CO2GlobalId_, T); + const scalar HO2 = thermo.carrier().H(O2GlobalId_, T); // Heat of reaction [J] - // Sensible enthalpy contributions due to O2 depletion and CO2 generation - // handled by particle transfer terms - return dmC*HsC - dmCO2*HcCO2_; + return dmC*HC + dmO2*HO2 - dmCO2*HCO2; } diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H index 7c7d5ad401..18cca9b9f5 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H @@ -86,9 +86,6 @@ class COxidationDiffusionLimitedRate //- Molecular weight of O2 [kg/kmol] scalar WO2_; - //- Chemical enthalpy of CO2 [J/kg] - scalar HcCO2_; - public: diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C index 88930ed390..ef32b558f3 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C @@ -45,8 +45,7 @@ COxidationKineticDiffusionLimitedRate O2GlobalId_(owner.composition().globalCarrierId("O2")), CO2GlobalId_(owner.composition().globalCarrierId("CO2")), WC_(0.0), - WO2_(0.0), - HcCO2_(0.0) + WO2_(0.0) { // Determine Cs ids label idSolid = owner.composition().idSolid(); @@ -56,7 +55,6 @@ COxidationKineticDiffusionLimitedRate WO2_ = owner.thermo().carrier().W(O2GlobalId_); const scalar WCO2 = owner.thermo().carrier().W(CO2GlobalId_); WC_ = WCO2 - WO2_; - HcCO2_ = owner.thermo().carrier().Hc(CO2GlobalId_); const scalar YCloc = owner.composition().Y0(idSolid)[CsLocalId_]; const scalar YSolidTot = owner.composition().YMixture0()[idSolid]; @@ -80,8 +78,7 @@ COxidationKineticDiffusionLimitedRate O2GlobalId_(srm.O2GlobalId_), CO2GlobalId_(srm.CO2GlobalId_), WC_(srm.WC_), - WO2_(srm.WO2_), - HcCO2_(srm.HcCO2_) + WO2_(srm.WO2_) {} @@ -163,12 +160,12 @@ Foam::scalar Foam::COxidationKineticDiffusionLimitedRate::calculate dMassSRCarrier[O2GlobalId_] -= dmO2; dMassSRCarrier[CO2GlobalId_] += dmCO2; - const scalar HsC = thermo.solids().properties()[CsLocalId_].Hs(T); + const scalar HC = thermo.solids().properties()[CsLocalId_].H(T); + const scalar HCO2 = thermo.carrier().H(CO2GlobalId_, T); + const scalar HO2 = thermo.carrier().H(O2GlobalId_, T); // Heat of reaction [J] - // Sensible enthalpy contributions due to O2 depletion and CO2 generation - // handled by particle transfer terms - return dmC*HsC - dmCO2*HcCO2_; + return dmC*HC + dmO2*HO2 - dmCO2*HCO2; } diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H index 4eb2797a11..3a4b2da2bd 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H @@ -94,9 +94,6 @@ class COxidationKineticDiffusionLimitedRate //- Molecular weight of O2 [kg/kmol] scalar WO2_; - //- Chemical enthalpy of CO2 [J/kg] - scalar HcCO2_; - public: diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C index 16da1b3916..a26b8242de 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C @@ -57,8 +57,7 @@ Foam::COxidationMurphyShaddix::COxidationMurphyShaddix O2GlobalId_(owner.composition().globalCarrierId("O2")), CO2GlobalId_(owner.composition().globalCarrierId("CO2")), WC_(0.0), - WO2_(0.0), - HcCO2_(0.0) + WO2_(0.0) { // Determine Cs ids label idSolid = owner.composition().idSolid(); @@ -68,7 +67,6 @@ Foam::COxidationMurphyShaddix::COxidationMurphyShaddix WO2_ = owner.thermo().carrier().W(O2GlobalId_); const scalar WCO2 = owner.thermo().carrier().W(CO2GlobalId_); WC_ = WCO2 - WO2_; - HcCO2_ = owner.thermo().carrier().Hc(CO2GlobalId_); const scalar YCloc = owner.composition().Y0(idSolid)[CsLocalId_]; const scalar YSolidTot = owner.composition().YMixture0()[idSolid]; @@ -95,8 +93,7 @@ Foam::COxidationMurphyShaddix::COxidationMurphyShaddix O2GlobalId_(srm.O2GlobalId_), CO2GlobalId_(srm.CO2GlobalId_), WC_(srm.WC_), - WO2_(srm.WO2_), - HcCO2_(srm.HcCO2_) + WO2_(srm.WO2_) {} @@ -223,12 +220,12 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate // Add to particle mass transfer dMassSolid[CsLocalId_] += dOmega*WC_; - const scalar HsC = thermo.solids().properties()[CsLocalId_].Hs(T); + const scalar HC = thermo.solids().properties()[CsLocalId_].H(T); + const scalar HCO2 = thermo.carrier().H(CO2GlobalId_, T); + const scalar HO2 = thermo.carrier().H(O2GlobalId_, T); - // Heat of reaction [J] - // Sensible enthalpy contributions due to O2 depletion and CO2 generation - // handled by particle transfer terms - return dOmega*(WC_*HsC - (WC_ + WO2_)*HcCO2_); + // Heat of reaction + return dOmega*(WC_*HC + WO2_*HO2 - (WC_ + WO2_)*HCO2); } diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H index 72e522e014..73981e79d1 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H @@ -115,9 +115,6 @@ class COxidationMurphyShaddix //- Molecular weight of O2 [kg/kmol] scalar WO2_; - //- Chemical enthalpy of CO2 [J/kg] - scalar HcCO2_; - public: diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index fafaeb3ae8..fcad1a4ed3 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -382,16 +382,11 @@ void Foam::ReactingMultiphaseParcel::calc { label gid = td.cloud().composition().localToGlobalCarrierId(GAS, i); td.cloud().rhoTrans(gid)[cellI] += np0*dMassGas[i]; - td.cloud().hsTrans()[cellI] += - np0*dMassGas[i]*td.cloud().composition().carrier().Hs(gid, T0); } forAll(YLiquid_, i) { label gid = td.cloud().composition().localToGlobalCarrierId(LIQ, i); td.cloud().rhoTrans(gid)[cellI] += np0*dMassLiquid[i]; - td.cloud().hsTrans()[cellI] += - np0*dMassLiquid[i] - *td.cloud().composition().carrier().Hs(gid, T0); } /* // No mapping between solid components and carrier phase @@ -399,17 +394,11 @@ void Foam::ReactingMultiphaseParcel::calc { label gid = td.cloud().composition().localToGlobalCarrierId(SLD, i); td.cloud().rhoTrans(gid)[cellI] += np0*dMassSolid[i]; - td.cloud().hsTrans()[cellI] += - np0*dMassSolid[i] - *td.cloud().composition().carrier().Hs(gid, T0); } */ forAll(dMassSRCarrier, i) { td.cloud().rhoTrans(i)[cellI] += np0*dMassSRCarrier[i]; - td.cloud().hsTrans()[cellI] += - np0*dMassSRCarrier[i] - *td.cloud().composition().carrier().Hs(i, T0); } // Update momentum transfer diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 2e893319ad..855439b893 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -391,8 +391,6 @@ void Foam::ReactingParcel::calc { label gid = td.cloud().composition().localToGlobalCarrierId(0, i); td.cloud().rhoTrans(gid)[cellI] += np0*dMassPC[i]; - td.cloud().hsTrans()[cellI] += - np0*dMassPC[i]*td.cloud().composition().carrier().Hs(gid, T0); } // Update momentum transfer From c5e7f98a9f4673357f1a8b0479b92e18161b31c5 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 7 Mar 2011 16:50:42 +0000 Subject: [PATCH 2/6] ENH: updated LTSReactingParcelFoam verticalChannel tutorial --- .../LTSReactingParcelFoam/verticalChannel/system/controlDict | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict index 3c54915612..caac7b4162 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application steadyReactingParcelFoam; +application LTSReactingParcelFoam; startFoam latestTime; @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 5000; +endTime 300; deltaT 1; From 165439372409a90a088ed35b4ed099e08bf5889c Mon Sep 17 00:00:00 2001 From: sergio Date: Mon, 7 Mar 2011 16:51:08 +0000 Subject: [PATCH 3/6] STY: adding name to PDRFoam tutorial --- .../{ => FlamePropagationWithObstacles}/0/Aw | 2 +- .../{ => FlamePropagationWithObstacles}/0/B | 2 +- .../{ => FlamePropagationWithObstacles}/0/CR | 2 +- .../{ => FlamePropagationWithObstacles}/0/CT | 2 +- .../0/Lobs | 2 +- .../{ => FlamePropagationWithObstacles}/0/Nv | 2 +- .../{ => FlamePropagationWithObstacles}/0/Su | 0 .../{ => FlamePropagationWithObstacles}/0/T | 0 .../{ => FlamePropagationWithObstacles}/0/Tu | 0 .../{ => FlamePropagationWithObstacles}/0/U | 0 .../{ => FlamePropagationWithObstacles}/0/Xi | 0 .../0/alphat | 0 .../{ => FlamePropagationWithObstacles}/0/b | 0 .../0/betav | 2 +- .../0/epsilon | 0 .../0/epsilon.old | 0 .../{ => FlamePropagationWithObstacles}/0/ft | 0 .../{ => FlamePropagationWithObstacles}/0/k | 0 .../0/k.old | 0 .../{ => FlamePropagationWithObstacles}/0/mut | 0 .../{ => FlamePropagationWithObstacles}/0/nsv | 2 +- .../{ => FlamePropagationWithObstacles}/0/p | 0 .../Allclean | 0 .../Allrun | 3 +- .../README | 3 +- .../constant/PDRProperties | 0 .../constant/RASProperties | 0 .../constant/combustionProperties | 0 .../constant/dynamicMeshDict | 0 .../constant/g | 0 .../constant/polyMesh/blockMeshDict | 0 .../constant/polyMesh/boundary | 0 .../constant/thermophysicalProperties | 4 +- .../constant/turbulenceProperties | 0 .../fuels/propane.dat | 3 +- .../makeBlockedFaceSet.setSet | 0 .../system/PDRMeshDict | 0 .../system/changeDictionaryDict | 0 .../system/controlDict | 3 +- .../system/decomposeParDict | 0 .../system/fvSchemes | 172 +++++++++--------- .../system/fvSolution | 107 ++++++----- 42 files changed, 151 insertions(+), 160 deletions(-) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Aw (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/B (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/CR (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/CT (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Lobs (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Nv (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Su (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/T (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Tu (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/U (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/Xi (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/alphat (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/b (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/betav (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/epsilon (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/epsilon.old (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/ft (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/k (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/k.old (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/mut (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/nsv (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/0/p (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/Allclean (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/Allrun (95%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/README (83%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/PDRProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/RASProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/combustionProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/dynamicMeshDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/g (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/polyMesh/blockMeshDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/polyMesh/boundary (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/thermophysicalProperties (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/constant/turbulenceProperties (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/fuels/propane.dat (99%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/makeBlockedFaceSet.setSet (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/PDRMeshDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/changeDictionaryDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/controlDict (98%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/decomposeParDict (100%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/fvSchemes (93%) rename tutorials/combustion/PDRFoam/{ => FlamePropagationWithObstacles}/system/fvSolution (90%) diff --git a/tutorials/combustion/PDRFoam/0/Aw b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw similarity index 99% rename from tutorials/combustion/PDRFoam/0/Aw rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw index 6ef274bb0c..6e623345fc 100644 --- a/tutorials/combustion/PDRFoam/0/Aw +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 -1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 18.372496 diff --git a/tutorials/combustion/PDRFoam/0/B b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B similarity index 99% rename from tutorials/combustion/PDRFoam/0/B rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B index db76de1d70..00b545c496 100644 --- a/tutorials/combustion/PDRFoam/0/B +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (1.785697 0 0 1.785697 0 1.875) diff --git a/tutorials/combustion/PDRFoam/0/CR b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR similarity index 99% rename from tutorials/combustion/PDRFoam/0/CR rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR index 0b694da8a1..37b3633fa3 100644 --- a/tutorials/combustion/PDRFoam/0/CR +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 -1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (98.997697 0 0 77.711245 0 30.754852) diff --git a/tutorials/combustion/PDRFoam/0/CT b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT similarity index 99% rename from tutorials/combustion/PDRFoam/0/CT rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT index 80fdec42e6..3349ea01c1 100644 --- a/tutorials/combustion/PDRFoam/0/CT +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 -1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (4.501854 0 0 3.437531 0 1.537743) diff --git a/tutorials/combustion/PDRFoam/0/Lobs b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs similarity index 99% rename from tutorials/combustion/PDRFoam/0/Lobs rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs index 63b65fa6f2..4ddf9c2b17 100644 --- a/tutorials/combustion/PDRFoam/0/Lobs +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 1 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 0.2 diff --git a/tutorials/combustion/PDRFoam/0/Nv b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv similarity index 99% rename from tutorials/combustion/PDRFoam/0/Nv rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv index b31b2996cb..a75358670c 100644 --- a/tutorials/combustion/PDRFoam/0/Nv +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 2.019581 diff --git a/tutorials/combustion/PDRFoam/0/Su b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Su similarity index 100% rename from tutorials/combustion/PDRFoam/0/Su rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Su diff --git a/tutorials/combustion/PDRFoam/0/T b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/T similarity index 100% rename from tutorials/combustion/PDRFoam/0/T rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/T diff --git a/tutorials/combustion/PDRFoam/0/Tu b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Tu similarity index 100% rename from tutorials/combustion/PDRFoam/0/Tu rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Tu diff --git a/tutorials/combustion/PDRFoam/0/U b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/U similarity index 100% rename from tutorials/combustion/PDRFoam/0/U rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/U diff --git a/tutorials/combustion/PDRFoam/0/Xi b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Xi similarity index 100% rename from tutorials/combustion/PDRFoam/0/Xi rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Xi diff --git a/tutorials/combustion/PDRFoam/0/alphat b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/alphat similarity index 100% rename from tutorials/combustion/PDRFoam/0/alphat rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/alphat diff --git a/tutorials/combustion/PDRFoam/0/b b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/b similarity index 100% rename from tutorials/combustion/PDRFoam/0/b rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/b diff --git a/tutorials/combustion/PDRFoam/0/betav b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav similarity index 99% rename from tutorials/combustion/PDRFoam/0/betav rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav index 1e8a7c8ccb..61726ff235 100644 --- a/tutorials/combustion/PDRFoam/0/betav +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( 0 diff --git a/tutorials/combustion/PDRFoam/0/epsilon b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon similarity index 100% rename from tutorials/combustion/PDRFoam/0/epsilon rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon diff --git a/tutorials/combustion/PDRFoam/0/epsilon.old b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon.old similarity index 100% rename from tutorials/combustion/PDRFoam/0/epsilon.old rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon.old diff --git a/tutorials/combustion/PDRFoam/0/ft b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/ft similarity index 100% rename from tutorials/combustion/PDRFoam/0/ft rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/ft diff --git a/tutorials/combustion/PDRFoam/0/k b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k similarity index 100% rename from tutorials/combustion/PDRFoam/0/k rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k diff --git a/tutorials/combustion/PDRFoam/0/k.old b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k.old similarity index 100% rename from tutorials/combustion/PDRFoam/0/k.old rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k.old diff --git a/tutorials/combustion/PDRFoam/0/mut b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/mut similarity index 100% rename from tutorials/combustion/PDRFoam/0/mut rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/mut diff --git a/tutorials/combustion/PDRFoam/0/nsv b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv similarity index 99% rename from tutorials/combustion/PDRFoam/0/nsv rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv index ae922c5dbe..d32af7d773 100644 --- a/tutorials/combustion/PDRFoam/0/nsv +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv @@ -17,7 +17,7 @@ FoamFile dimensions [ 0 0 0 0 0 0 0 ]; -internalField nonuniform List +internalField nonuniform List 8025 ( (0.634791 0 0 0.634791 0 0.03) diff --git a/tutorials/combustion/PDRFoam/0/p b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/p similarity index 100% rename from tutorials/combustion/PDRFoam/0/p rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/p diff --git a/tutorials/combustion/PDRFoam/Allclean b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allclean similarity index 100% rename from tutorials/combustion/PDRFoam/Allclean rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allclean diff --git a/tutorials/combustion/PDRFoam/Allrun b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun similarity index 95% rename from tutorials/combustion/PDRFoam/Allrun rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun index c3595df050..a972b6806a 100755 --- a/tutorials/combustion/PDRFoam/Allrun +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun @@ -14,5 +14,4 @@ runApplication PDRMesh # Run runApplication PDRFoam -# ----------------------------------------------------------------- end-of-file - +# ----------------------------------------------------------------- end-of-file \ No newline at end of file diff --git a/tutorials/combustion/PDRFoam/README b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README similarity index 83% rename from tutorials/combustion/PDRFoam/README rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README index 8a5eab0d9d..bbf97c6866 100644 --- a/tutorials/combustion/PDRFoam/README +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README @@ -8,5 +8,4 @@ Step to introduce the PDR fields: 1) Create zero-size patches for wall or/and coupled baffles in the boundary file. 2) Specify the boundary contitions for these patches in the fields. -3) Create the new PDR mesh using the PDRMesh utility - +3) Create the new PDR mesh using the PDRMesh utility. \ No newline at end of file diff --git a/tutorials/combustion/PDRFoam/constant/PDRProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/PDRProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties diff --git a/tutorials/combustion/PDRFoam/constant/RASProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/RASProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/RASProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/RASProperties diff --git a/tutorials/combustion/PDRFoam/constant/combustionProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/combustionProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/combustionProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/combustionProperties diff --git a/tutorials/combustion/PDRFoam/constant/dynamicMeshDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/dynamicMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/constant/dynamicMeshDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/dynamicMeshDict diff --git a/tutorials/combustion/PDRFoam/constant/g b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/g similarity index 100% rename from tutorials/combustion/PDRFoam/constant/g rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/g diff --git a/tutorials/combustion/PDRFoam/constant/polyMesh/blockMeshDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/constant/polyMesh/blockMeshDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/blockMeshDict diff --git a/tutorials/combustion/PDRFoam/constant/polyMesh/boundary b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/boundary similarity index 100% rename from tutorials/combustion/PDRFoam/constant/polyMesh/boundary rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/boundary diff --git a/tutorials/combustion/PDRFoam/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties similarity index 99% rename from tutorials/combustion/PDRFoam/constant/thermophysicalProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties index 561cfd6f12..401abd41ee 100644 --- a/tutorials/combustion/PDRFoam/constant/thermophysicalProperties +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties @@ -59,6 +59,4 @@ burntProducts Ts 170.672; } -// ************************************************************************* // - - +// ************************************************************************* // \ No newline at end of file diff --git a/tutorials/combustion/PDRFoam/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/turbulenceProperties similarity index 100% rename from tutorials/combustion/PDRFoam/constant/turbulenceProperties rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/turbulenceProperties diff --git a/tutorials/combustion/PDRFoam/fuels/propane.dat b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat similarity index 99% rename from tutorials/combustion/PDRFoam/fuels/propane.dat rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat index fc8760c431..c13dca170a 100644 --- a/tutorials/combustion/PDRFoam/fuels/propane.dat +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat @@ -69,5 +69,4 @@ SCOPECoeffs 0 ); } - } - +} \ No newline at end of file diff --git a/tutorials/combustion/PDRFoam/makeBlockedFaceSet.setSet b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/makeBlockedFaceSet.setSet similarity index 100% rename from tutorials/combustion/PDRFoam/makeBlockedFaceSet.setSet rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/makeBlockedFaceSet.setSet diff --git a/tutorials/combustion/PDRFoam/system/PDRMeshDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/PDRMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/PDRMeshDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/PDRMeshDict diff --git a/tutorials/combustion/PDRFoam/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/changeDictionaryDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/changeDictionaryDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/changeDictionaryDict diff --git a/tutorials/combustion/PDRFoam/system/controlDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict similarity index 98% rename from tutorials/combustion/PDRFoam/system/controlDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict index b26483da7c..920dd2a521 100644 --- a/tutorials/combustion/PDRFoam/system/controlDict +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict @@ -51,5 +51,4 @@ maxCo 0.3; maxDeltaT 1; -// ************************************************************************* // - +// ************************************************************************* // \ No newline at end of file diff --git a/tutorials/combustion/PDRFoam/system/decomposeParDict b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/decomposeParDict similarity index 100% rename from tutorials/combustion/PDRFoam/system/decomposeParDict rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/decomposeParDict diff --git a/tutorials/combustion/PDRFoam/system/fvSchemes b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes similarity index 93% rename from tutorials/combustion/PDRFoam/system/fvSchemes rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes index 35dc92e170..d600158ce4 100755 --- a/tutorials/combustion/PDRFoam/system/fvSchemes +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes @@ -1,87 +1,85 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - grad(p) Gauss linear; -} - -divSchemes -{ - default none; - - div(phi,U) Gauss limitedLinearV 1; - div(phiU,p) Gauss limitedLinear 1; - div(phid,p) Gauss limitedLinear 1; - div(phi,k) Gauss limitedLinear 1; - div(phi,epsilon) Gauss limitedLinear 1; - - div(phiXi,Xi) Gauss limitedLinear 1; - div(phiSt,b) Gauss limitedLinear01 1; - - div(phi,ft_b_h_hu) Gauss multivariateSelection - { - ft limitedLinear01 1; - b limitedLinear01 1; - Xi limitedLinear 1; - h limitedLinear 1; - hu limitedLinear 1; - }; - - div((Su*grad(b))) Gauss linear; - div((U+((Su*Xi)*grad(b)))) Gauss linear; - div((muEff*dev2(T(grad(U))))) Gauss linear; - div(U) Gauss linear; -} - -laplacianSchemes -{ - default none; - laplacian(muEff,U) Gauss linear limited 0.333; - laplacian(DkEff,k) Gauss linear limited 0.333; - laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; - laplacian((rho*inv((((1)*A(U))+((((0.5*rho)*CR)*mag(U))+((((Csu*(1))*betav)*muEff)*sqr(Aw)))))),p) Gauss linear limited 0.333; - laplacian(Db,b) Gauss linear limited 0.333; - laplacian(Db,ft) Gauss linear limited 0.333; - laplacian(Db,h) Gauss linear limited 0.333; - laplacian(Db,hu) Gauss linear limited 0.333; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default limited 0.333; -} - -fluxRequired -{ - default no; - p; -} - - -// ************************************************************************* // +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(p) Gauss linear; +} + +divSchemes +{ + default none; + + div(phi,U) Gauss limitedLinearV 1; + div(phiU,p) Gauss limitedLinear 1; + div(phid,p) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; + div(phi,epsilon) Gauss limitedLinear 1; + + div(phiXi,Xi) Gauss limitedLinear 1; + div(phiSt,b) Gauss limitedLinear01 1; + + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + ft limitedLinear01 1; + b limitedLinear01 1; + Xi limitedLinear 1; + h limitedLinear 1; + hu limitedLinear 1; + }; + + div((Su*grad(b))) Gauss linear; + div((U+((Su*Xi)*grad(b)))) Gauss linear; + div((muEff*dev2(T(grad(U))))) Gauss linear; + div(U) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear limited 0.333; + laplacian(DkEff,k) Gauss linear limited 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; + laplacian((rho*inv((((1)*A(U))+((((0.5*rho)*CR)*mag(U))+((((Csu*(1))*betav)*muEff)*sqr(Aw)))))),p) Gauss linear limited 0.333; + laplacian(Db,b) Gauss linear limited 0.333; + laplacian(Db,ft) Gauss linear limited 0.333; + laplacian(Db,h) Gauss linear limited 0.333; + laplacian(Db,hu) Gauss linear limited 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited 0.333; +} + +fluxRequired +{ + default no; + p; +} +// ************************************************************************* // diff --git a/tutorials/combustion/PDRFoam/system/fvSolution b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution similarity index 90% rename from tutorials/combustion/PDRFoam/system/fvSolution rename to tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution index 418cb8e9fc..8a927992fe 100755 --- a/tutorials/combustion/PDRFoam/system/fvSolution +++ b/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution @@ -1,54 +1,53 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -solvers -{ - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0; - }; - - p - { - solver PCG; - preconditioner DIC; - tolerance 1e-6; - relTol 0; - }; - - "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } -} - -PISO -{ - nCorrectors 2; - nNonOrthogonalCorrectors 0; - momentumPredictor true; -} - - -// ************************************************************************* // +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0; + }; + + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-6; + relTol 0; + }; + + "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } +} + +PISO +{ + nCorrectors 2; + nNonOrthogonalCorrectors 0; + momentumPredictor true; +} + + +// ************************************************************************* // From 4be6e5f3e61a64afa5e0ee3d54a0fff491cd7e23 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Mar 2011 10:23:19 +0000 Subject: [PATCH 4/6] ENH: corrected ambiguous construct from temp --- .../PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C | 4 ++-- .../PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C | 5 ++--- .../XiEqModels/instabilityXiEq/instabilityXiEq.C | 2 +- ...xternalWallHeatFluxTemperatureFvPatchScalarField.H | 11 +++++++++-- ...lentTemperatureRadCoupledMixedFvPatchScalarField.C | 8 ++++---- ...ivePressureForceBaffleVelocityFvPatchVectorField.C | 2 +- .../MarshakRadiationMixedFvPatchScalarField.C | 2 +- .../MarshakRadiationFixedTMixedFvPatchScalarField.C | 2 +- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 06aa68b228..0b5c3e4ac9 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -135,8 +135,8 @@ void PDRkEpsilon::correct() volScalarField GR(drag.Gk()); - volScalarField LI = - C4_*(Lobs + dimensionedScalar("minLength", dimLength, VSMALL)); + volScalarField LI + (C4_*(Lobs + dimensionedScalar("minLength", dimLength, VSMALL))); // Dissipation equation tmp epsEqn diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 7f4aa91722..f7a69ce406 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -142,11 +142,10 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon)))); - volScalarField Reta = + volScalarField Reta ( up - / - ( + / ( sqrt(epsilon*tauEta) + dimensionedScalar("1e-8", up.dimensions(), 1e-8) ) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C index e5f04b7483..bd58072489 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C @@ -64,7 +64,7 @@ Foam::XiEqModels::instability::~instability() Foam::tmp Foam::XiEqModels::instability::XiEq() const { - volScalarField turbXiEq = XiEqModel_->XiEq(); + volScalarField turbXiEq(XiEqModel_->XiEq()); return XiEqIn/turbXiEq + turbXiEq; } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H index e98c940f12..4156f784d6 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H @@ -73,9 +73,11 @@ class externalWallHeatFluxTemperatureFvPatchScalarField public mixedFvPatchScalarField, public temperatureCoupledBase { - // Private data +public: - //- how to operate the BC + // Public data + + //- Operation mode enumeration enum operationMode { fixedHeatFlux, @@ -84,6 +86,11 @@ class externalWallHeatFluxTemperatureFvPatchScalarField }; static const NamedEnum operationModeNames; + +private: + + // Private data + //- Operation mode operationMode oldMode_; diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C index a137719a44..a0b356578b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C @@ -159,7 +159,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs() const fvPatch& nbrPatch = refCast(nbrMesh).boundary()[samplePatchI]; - scalarField Tc = patchInternalField(); + scalarField Tc(patchInternalField()); scalarField& Tp = *this; const turbulentTemperatureRadCoupledMixedFvPatchScalarField& @@ -170,16 +170,16 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs() ); // Swap to obtain full local values of neighbour internal field - scalarField TcNbr = nbrField.patchInternalField(); + scalarField TcNbr(nbrField.patchInternalField()); mpp.map().distribute(TcNbr); // Swap to obtain full local values of neighbour K*delta - scalarField KDeltaNbr = nbrField.K(TcNbr)*nbrPatch.deltaCoeffs(); + scalarField KDeltaNbr(nbrField.K(TcNbr)*nbrPatch.deltaCoeffs()); mpp.map().distribute(KDeltaNbr); - scalarField KDelta = K(*this)*patch().deltaCoeffs(); + scalarField KDelta(K(*this)*patch().deltaCoeffs()); scalarField Qr(Tp.size(), 0.0); if (QrName_ != "none") diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C index 245bf5662d..976a704476 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C @@ -319,7 +319,7 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs() Info<< "Pressure difference = " << valueDiff << endl; vectorField::subField Sfw = patch().patch().faceAreas(); - vectorField newSfw = (1 - openFraction_)*initWallSf_; + vectorField newSfw((1 - openFraction_)*initWallSf_); forAll(Sfw, facei) { Sfw[facei] = newSfw[facei]; diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C index ff6337ebc1..5e6fe645d3 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C @@ -170,7 +170,7 @@ void Foam::MarshakRadiationFvPatchScalarField::updateCoeffs() const scalarField& gamma = patch().lookupPatchField("gammaRad"); - const scalarField Ep = emissivity()/(2.0*(2.0 - emissivity())); + const scalarField Ep(emissivity()/(2.0*(2.0 - emissivity()))); // Set value fraction valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C index 120e699b93..903be3cf72 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C @@ -171,7 +171,7 @@ void Foam::MarshakRadiationFixedTMixedFvPatchScalarField::updateCoeffs() const scalarField& gamma = patch().lookupPatchField("gammaRad"); - const scalarField Ep = emissivity()/(2.0*(scalar(2.0) - emissivity())); + const scalarField Ep(emissivity()/(2.0*(scalar(2.0) - emissivity()))); // Set value fraction valueFraction() = 1.0/(1.0 + gamma*patch().deltaCoeffs()/Ep); From daa062e214ff8be8a5404a0fc7f30aaab4b0b461 Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 8 Mar 2011 10:49:54 +0000 Subject: [PATCH 5/6] ENH: name change for tutorial and adding Schelkin effect --- .../XiModels/XiEqModels/Gulder/Gulder.C | 79 ++-------------- .../XiModels/XiEqModels/Gulder/Gulder.H | 3 - .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 5 ++ .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H | 7 ++ .../XiModels/XiEqModels/XiEqModel/XiEqModel.C | 90 +++++++++++++++++++ .../XiModels/XiEqModels/XiEqModel/XiEqModel.H | 25 ++++++ .../0/Aw | 0 .../0/B | 0 .../0/CR | 0 .../0/CT | 0 .../0/Lobs | 0 .../0/Nv | 0 .../0/Su | 0 .../0/T | 0 .../0/Tu | 0 .../0/U | 0 .../0/Xi | 0 .../0/alphat | 0 .../0/b | 0 .../0/betav | 0 .../0/epsilon | 0 .../0/epsilon.old | 0 .../0/ft | 0 .../0/k | 0 .../0/k.old | 0 .../0/mut | 0 .../0/nsv | 0 .../0/p | 0 .../Allclean | 0 .../Allrun | 0 .../README | 0 .../constant/PDRProperties | 22 ++--- .../constant/RASProperties | 0 .../constant/combustionProperties | 0 .../constant/dynamicMeshDict | 0 .../constant/g | 0 .../constant/polyMesh/blockMeshDict | 0 .../constant/polyMesh/boundary | 0 .../constant/thermophysicalProperties | 0 .../constant/turbulenceProperties | 0 .../fuels/propane.dat | 0 .../makeBlockedFaceSet.setSet | 0 .../system/PDRMeshDict | 0 .../system/changeDictionaryDict | 0 .../system/controlDict | 0 .../system/decomposeParDict | 0 .../system/fvSchemes | 0 .../system/fvSolution | 0 48 files changed, 145 insertions(+), 86 deletions(-) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/Aw (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/B (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/CR (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/CT (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/Lobs (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/Nv (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/Su (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/T (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/Tu (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/U (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/Xi (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/alphat (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/b (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/betav (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/epsilon (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/epsilon.old (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/ft (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/k (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/k.old (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/mut (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/nsv (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/0/p (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/Allclean (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/Allrun (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/README (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/PDRProperties (80%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/RASProperties (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/combustionProperties (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/dynamicMeshDict (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/g (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/polyMesh/blockMeshDict (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/polyMesh/boundary (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/thermophysicalProperties (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/constant/turbulenceProperties (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/fuels/propane.dat (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/makeBlockedFaceSet.setSet (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/system/PDRMeshDict (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/system/changeDictionaryDict (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/system/controlDict (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/system/decomposeParDict (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/system/fvSchemes (100%) rename tutorials/combustion/PDRFoam/{FlamePropagationWithObstacles => flamePropagationWithObstacles}/system/fvSolution (100%) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 7f4aa91722..8621f0c3c5 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -50,8 +50,7 @@ Foam::XiEqModels::Gulder::Gulder : XiEqModel(XiEqProperties, thermo, turbulence, Su), XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))), - SuMin_(0.01*Su.average()), - uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))) + SuMin_(0.01*Su.average()) {} @@ -67,78 +66,11 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const { volScalarField up(sqrt((2.0/3.0)*turbulence_.k())); const volScalarField& epsilon = turbulence_.epsilon(); - const fvMesh& mesh = Su_.mesh(); - const volVectorField& U = mesh.lookupObject("U"); - - const volSymmTensorField& CT = mesh.lookupObject("CT"); - const volScalarField& Nv = mesh.lookupObject("Nv"); - const volSymmTensorField& nsv = - mesh.lookupObject("nsv"); - - tmp tN - ( - new volScalarField - ( - IOobject - ( - "tN", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - mesh, - dimensionedScalar("zero", Nv.dimensions(), 0.0), - zeroGradientFvPatchVectorField::typeName - ) - ); - - volScalarField& N = tN(); - - N.internalField() = Nv.internalField()*pow(mesh.V(), 2.0/3.0); - - tmp tns - ( - new volSymmTensorField - ( - IOobject - ( - "tns", - mesh.time().timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - mesh, - dimensionedSymmTensor - ( - "zero", - nsv.dimensions(), - pTraits::zero - ) - ) - ); - - volSymmTensorField& ns = tns(); - - ns.internalField() = nsv.internalField()*pow(mesh.V(), 2.0/3.0); - - const volVectorField Uhat - ( - U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4)) - ); - - const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), scalar(1e-4)))); - - const scalarField cellWidth(pow(mesh.V(), 1.0/3.0)); - - const scalarField upLocal(uPrimeCoef_*sqrt((U & CT & U)*cellWidth)); - - const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0)); - - up.internalField() += deltaUp; + if (subGridSchelkin()) + { + up.internalField() += calculateSchelkinEffect(); + } volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon)))); @@ -162,6 +94,7 @@ bool Foam::XiEqModels::Gulder::read(const dictionary& XiEqProperties) XiEqModelCoeffs_.lookup("XiEqCoef") >> XiEqCoef_; XiEqModelCoeffs_.lookup("uPrimeCoef") >> uPrimeCoef_; + XiEqModelCoeffs_.lookup("subGridSchelkin") >> subGridSchelkin_; return true; } diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H index e1bbb3d708..c4c6afbb27 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H @@ -61,9 +61,6 @@ class Gulder //- Minimum laminar burning velocity const dimensionedScalar SuMin_; - //- Model constant - scalar uPrimeCoef_; - // Private Member Functions diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index d0b7efeded..6483712ec8 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -84,6 +84,11 @@ Foam::tmp Foam::XiEqModels::SCOPEXiEq::XiEq() const const volScalarField& epsilon = turbulence_.epsilon(); volScalarField up(sqrt((2.0/3.0)*k)); + if (subGridSchelkin()) + { + up.internalField() += calculateSchelkinEffect(); + } + volScalarField l(lCoef_*sqrt(3.0/2.0)*up*k/epsilon); volScalarField Rl(up*l*thermo_.rhou()/thermo_.muu()); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H index ff49390a6d..eeafa1a150 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H @@ -58,9 +58,16 @@ class SCOPEXiEq { // Private data + // Model constant scalar XiEqCoef_; + + // Model constant scalar XiEqExp_; + + // Model constant scalar lCoef_; + + //- Minimum Su dimensionedScalar SuMin_; //- The SCOPE laminar flame speed model used to obtain the diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index de5850e913..e90c0b48db 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -77,6 +77,11 @@ Foam::XiEqModel::XiEqModel IOobject::NO_WRITE ), Su.mesh() + ), + uPrimeCoef_(XiEqModelCoeffs_.lookupOrDefault("uPrimeCoef", 0.0)), + subGridSchelkin_ + ( + XiEqModelCoeffs_.lookupOrDefault("subGridSchelkin", false) ) {} @@ -93,6 +98,10 @@ bool Foam::XiEqModel::read(const dictionary& XiEqProperties) { XiEqModelCoeffs_ = XiEqProperties.subDict(type() + "Coeffs"); + uPrimeCoef_ = XiEqModelCoeffs_.lookupOrDefault("uPrimeCoef", 0.0); + subGridSchelkin_ = + XiEqModelCoeffs_.lookupOrDefault("subGridSchelkin", false); + return true; } @@ -109,4 +118,85 @@ void Foam::XiEqModel::writeFields() const } } +Foam::tmp +Foam::XiEqModel::calculateSchelkinEffect() const +{ + const fvMesh& mesh = Su_.mesh(); + + const volVectorField& U = mesh.lookupObject("U"); + + const volSymmTensorField& CT = mesh.lookupObject("CT"); + const volScalarField& Nv = mesh.lookupObject("Nv"); + const volSymmTensorField& nsv = + mesh.lookupObject("nsv"); + + tmp tN + ( + new volScalarField + ( + IOobject + ( + "tN", + mesh.time().timeName(), + mesh, + IOobject::NO_READ, + IOobject::NO_WRITE, + false + ), + mesh, + dimensionedScalar("zero", Nv.dimensions(), 0.0), + zeroGradientFvPatchVectorField::typeName + ) + ); + + volScalarField& N = tN(); + + N.internalField() = Nv.internalField()*pow(mesh.V(), 2.0/3.0); + + tmp tns + ( + new volSymmTensorField + ( + IOobject + ( + "tns", + mesh.time().timeName(), + mesh, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + mesh, + dimensionedSymmTensor + ( + "zero", + nsv.dimensions(), + pTraits::zero + ) + ) + ); + + volSymmTensorField& ns = tns(); + + ns.internalField() = nsv.internalField()*pow(mesh.V(), 2.0/3.0); + + const volVectorField Uhat + ( + U/(mag(U) + dimensionedScalar("Usmall", U.dimensions(), 1e-4)) + ); + + const volScalarField nr(sqrt(max(N - (Uhat & ns & Uhat), scalar(1e-4)))); + + const scalarField cellWidth(pow(mesh.V(), 1.0/3.0)); + + const scalarField upLocal(uPrimeCoef_*sqrt((U & CT & U)*cellWidth)); + + const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0)); + + //Re use tN + N.internalField() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0); + + return tN; + +} + // ************************************************************************* // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index 664fcf8b2e..ac8c9eae11 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H @@ -62,14 +62,30 @@ protected: // Protected data + //- Dictionary dictionary XiEqModelCoeffs_; + //- Thermo const hhuCombustionThermo& thermo_; + + //- Turbulence const compressible::RASModel& turbulence_; + + //- Laminar burning velocity const volScalarField& Su_; + + //- Volumetric obstacles number volScalarField Nv_; + + // volSymmTensorField nsv_; + //- Schelkin effect Model constant + scalar uPrimeCoef_; + + //- Use sub-grid Schelkin effect + bool subGridSchelkin_; + private: @@ -146,6 +162,15 @@ public: return turbulence_.muEff(); } + //- Return state of the sub-grid Schelkin effect + bool subGridSchelkin() const + { + return subGridSchelkin_; + } + + //- Return the sub-grid Schelkin effect + tmp calculateSchelkinEffect() const; + //- Update properties from given dictionary virtual bool read(const dictionary& XiEqProperties) = 0; diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Aw rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/B rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CR rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/CT rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Lobs rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Nv rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Su b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Su similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Su rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Su diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/T b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/T similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/T rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/T diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Tu b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Tu similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Tu rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Tu diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/U b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/U similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/U rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/U diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Xi b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Xi similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/Xi rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Xi diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/alphat b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/alphat similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/alphat rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/alphat diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/b b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/b similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/b rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/b diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/betav rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon.old similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/epsilon.old rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon.old diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/ft b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/ft similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/ft rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/ft diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k.old similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/k.old rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k.old diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/mut b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/mut similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/mut rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/mut diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/nsv rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/p b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/p similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/0/p rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/p diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allclean b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allclean rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/Allrun rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/README similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/README rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/README diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties similarity index 80% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties index 7345d89ad1..c63f9cae44 100755 --- a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/PDRProperties +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/PDRProperties @@ -49,25 +49,27 @@ instabilityCoeffs { XiEqModelL { - XiEqModel Gulder; + XiEqModel Gulder; + uPrimeCoef 1.0; + subGridSchelkin true; GulderCoeffs { - XiEqCoef 0.62; - uPrimeCoef 1.0; + XiEqCoef 0.62; } } XiEqModelH { - XiEqModel SCOPEXiEq; + XiEqModel SCOPEXiEq; + uPrimeCoef 1.0; + subGridSchelkin true; - SCOPEXiEqCoeffs - { - XiEqCoef 1.6; - XiEqExp 0.33333; - lCoef 0.336; - uPrimeCoef 1.0; + SCOPEXiEqCoeffs + { + XiEqCoef 1.6; + XiEqExp 0.33333; + lCoef 0.336; } } } diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/RASProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/RASProperties similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/RASProperties rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/RASProperties diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/combustionProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/combustionProperties rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/dynamicMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/dynamicMeshDict rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/g b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/g rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/g diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/blockMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/blockMeshDict rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/blockMeshDict diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/boundary b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/polyMesh/boundary rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/thermophysicalProperties rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/constant/turbulenceProperties rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/fuels/propane.dat similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/fuels/propane.dat rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/fuels/propane.dat diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/makeBlockedFaceSet.setSet b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/makeBlockedFaceSet.setSet rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/PDRMeshDict rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/changeDictionaryDict rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/controlDict rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/decomposeParDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/decomposeParDict rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/decomposeParDict diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSchemes rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSchemes diff --git a/tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution similarity index 100% rename from tutorials/combustion/PDRFoam/FlamePropagationWithObstacles/system/fvSolution rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution From 93955f28607da18dbc30a0199d321b1606dd71a9 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 8 Mar 2011 11:04:17 +0000 Subject: [PATCH 6/6] STYLE: Minor formatting changes --- .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.H | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H index 43bfd8a53d..a4bd2850ff 100644 --- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H +++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ class fvMesh; class polyBoundaryMesh; /*---------------------------------------------------------------------------*\ - Class fvBoundaryMesh Declaration + Class fvBoundaryMesh Declaration \*---------------------------------------------------------------------------*/ class fvBoundaryMesh @@ -86,17 +86,10 @@ public: // Constructors //- Construct with zero size - fvBoundaryMesh - ( - const fvMesh& - ); + fvBoundaryMesh(const fvMesh&); //- Construct from polyBoundaryMesh - fvBoundaryMesh - ( - const fvMesh&, - const polyBoundaryMesh& - ); + fvBoundaryMesh(const fvMesh&, const polyBoundaryMesh&); // Member Functions @@ -120,6 +113,7 @@ public: //- Correct patches after moving points void movePoints(); + // Member Operators //- Return const and non-const reference to fvPatch by index. @@ -130,7 +124,6 @@ public: //- Return reference to fvPatch by name. fvPatch& operator[](const word&); - };