diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C index 1364f2cea28660a25840e4426f6f7afc307f318f..d2417a85307580599ec74a31d11c305500d833a8 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -180,8 +180,15 @@ LamBremhorstKE::LamBremhorstKE if (type == typeName) { - correctNut(); printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C index 4183371298fa67534412f51538859848e9889506..440517134f07cd0b98c70231e5df978778448136 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C @@ -330,8 +330,15 @@ LienCubicKE::LienCubicKE if (type == typeName) { - correctNut(); printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C index 40f5029312511373592411f8f9e1d005dd3d756d..29b5aa0114f977afce4a5635fd978c97bca74f9e 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C @@ -224,8 +224,15 @@ LienLeschziner::LienLeschziner if (type == typeName) { - correctNut(); printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C index 7c764f47470f52f0c7a0747c136c38f83e0f81ac..38dc7ab62b44f9233a1b327f4b5b8be7e1316650 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C @@ -222,8 +222,15 @@ ShihQuadraticKE::ShihQuadraticKE if (type == typeName) { - correctNut(); printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C index a12b61f1a64218f8fbfebc39831d076cc36ac52f..bc57fd4200ea6d346df69a900ef47460710cce51 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C @@ -207,8 +207,15 @@ qZeta::qZeta if (type == typeName) { - correctNut(); printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C index f523fce5a0babe1040f7a558f83dda4529d93cb0..c7d0d22e4426e3a2ed1d58aac745f24e4a776177 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C @@ -106,10 +106,10 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon { if (type == typeName) { + this->printCoeffs(type); + // Cannot correct nut yet: construction of the phases is not complete // correctNut(); - - this->printCoeffs(type); } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index 31526fbf0c1e2752ee5e6e2102ae0a5cd5403f34..5a00433a347e3b2649fefa44add962105c6aa6fd 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C @@ -110,9 +110,16 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress { if (type == typeName) { - this->boundNormalStress(this->R_); - correctNut(); this->printCoeffs(type); + this->boundNormalStress(this->R_); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C index c3549fdd8851d9351808a55ec0a45dd752859dd7..7de1f91f1ed0ba1456751d93e4e9fd575f743e5d 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C +++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C @@ -113,8 +113,15 @@ Smagorinsky<BasicTurbulenceModel>::Smagorinsky { if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C index 53e22dd3847db4e6af8499c0a8d49aa7253387ec..fa6ddc86e3ea800cd83371948c04506c999f7719 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C @@ -318,8 +318,15 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES { if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C index 674c889b1c4c543c94ae4b67d4a08518cdf53a37..3879d5fffe17e8abfad3c59394c3bf3ae6606fff 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C +++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C @@ -143,8 +143,15 @@ WALE<BasicTurbulenceModel>::WALE { if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C index 9f98bea02479c0f44efeef19992ff5505395a088..7fd40001837d3245a5b4939feade929aa7dae004 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C @@ -185,8 +185,15 @@ dynamicKEqn<BasicTurbulenceModel>::dynamicKEqn if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C index 15908a4ffee8a2a7ed32972a93c88eee8587206f..7c5c403fcc8df4147f295009e5a60a9f879a5f4b 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C @@ -122,8 +122,15 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian { if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C index eda73f69294578b6dd9e44720a45daa4e58c1e79..c02556ea037bebdc55874d95d0ab994e84e77a7c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C @@ -113,8 +113,15 @@ kEqn<BasicTurbulenceModel>::kEqn if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C index 7dfa45a031a01df36880bbaf7c1277a1fb469458..fe33923d19729cd85c95192be0709ec7221a0cb1 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C @@ -200,11 +200,19 @@ LRR<BasicTurbulenceModel>::LRR { if (type == typeName) { + this->printCoeffs(type); + this->boundNormalStress(this->R_); bound(epsilon_, this->epsilonMin_); k_ = 0.5*tr(this->R_); - correctNut(); - this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C index ef6809fcfc712f922c4f50f295364f270f48b4f3..e5ef40222a7ffb74159ba79d148251ca7950bf7e 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -204,8 +204,15 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C index 5406367db63cb2319ac524da3b128dcebc7c9a88..18d22249274c03663beaf589b034feec99ae2c09 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -205,8 +205,15 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C index 4d61b3db6537f12de9e636aef4213ee83d02143c..34798924b6927f695a45b83bc4c18176e2a79f6e 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C @@ -209,11 +209,19 @@ SSG<BasicTurbulenceModel>::SSG { if (type == typeName) { + this->printCoeffs(type); + this->boundNormalStress(this->R_); bound(epsilon_, this->epsilonMin_); k_ = 0.5*tr(this->R_); - correctNut(); - this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C index 8c5e5b2da53467aa478cd05c7eaf45eb98240308..50f9a989f0bb2b86a1c152e7bfccbb476a890e71 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -255,8 +255,15 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras { if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C index e4a45b01fb8157e1def74f58fe306873e8caf3d8..7cf2b1fc10d8c5310effc1f56f24dd6259e9d546 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C @@ -188,7 +188,14 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon if (type == typeName) { this->printCoeffs(type); - correctNut(); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C index 412a6b3e6b412576873e125ed9fb602d45a2937e..4578b5811f747c96bfdd1d6f36a8ee021c230d78 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C @@ -147,8 +147,15 @@ kOmega<BasicTurbulenceModel>::kOmega if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C index 76fd9cf0c3583b4613cc06fa5a5db647280ea226..f634aa65bebb34c7a9b23ca1c4ec8dcf7fced3e5 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C @@ -350,8 +350,15 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C index 597d21f1ebbddf98e7db23b3d975a6797e3beced..c3428a64c9728ecd9077ec138021ff1fadbfbd28 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C @@ -226,8 +226,15 @@ realizableKE<BasicTurbulenceModel>::realizableKE if (type == typeName) { - correctNut(); this->printCoeffs(type); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C index 1ccad744858465a603583ea90eaa11c3aaa5fbbc..95cb209a45dcfc149992003d844cca08318d885c 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C @@ -239,7 +239,14 @@ v2f<BasicTurbulenceModel>::v2f if (type == typeName) { this->printCoeffs(type); - correctNut(); + + // Correct nut for single-phase solvers only. + // For multiphase solvers the phase construction is not complete + // at this point. + if (isType<geometricOneField>(alpha)) + { + correctNut(); + } } }