From cdd3e495bb414ae99759edc8649dfed7dd6a36f5 Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 10 Jun 2014 10:14:53 +0100 Subject: [PATCH 1/3] BUG: Adding Qext to the correct position in the matrix http://www.openfoam.org/mantisbt/view.php?id=1309 --- .../radiationModel/viewFactor/viewFactor.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C index 5cfb6b11..c382f3ed 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C @@ -531,12 +531,12 @@ void Foam::radiation::viewFactor::calculate() if (i==j) { C[i][j] = invEj - (invEj - 1.0)*Fmatrix_()[i][j]; - q[i] += (Fmatrix_()[i][j] - 1.0)*sigmaT4; + q[i] += (Fmatrix_()[i][j] - 1.0)*sigmaT4 - QrExt[j]; } else { C[i][j] = (1.0 - invEj)*Fmatrix_()[i][j]; - q[i] += Fmatrix_()[i][j]*sigmaT4 - QrExt[j]; + q[i] += Fmatrix_()[i][j]*sigmaT4; } } @@ -580,11 +580,11 @@ void Foam::radiation::viewFactor::calculate() if (i==j) { - q[i] += (Fmatrix_()[i][j] - 1.0)*sigmaT4; + q[i] += (Fmatrix_()[i][j] - 1.0)*sigmaT4 - QrExt[j]; } else { - q[i] += Fmatrix_()[i][j]*sigmaT4 - QrExt[j]; + q[i] += Fmatrix_()[i][j]*sigmaT4; } } } From c70020edaebc0d66ebea82b55ca4786d4c05f49c Mon Sep 17 00:00:00 2001 From: william Date: Wed, 11 Jun 2014 11:22:33 +0100 Subject: [PATCH 2/3] BUG: Mantis 1325: Johnson Jackson BCs evaluating before dependent sub model data is created --- ...JohnsonJacksonParticleSlipFvPatchVectorField.C | 15 ++++----------- ...ohnsonJacksonParticleThetaFvPatchScalarField.C | 15 ++++----------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index 104201d4..78b6ab7e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -102,17 +102,10 @@ JohnsonJacksonParticleSlipFvPatchVectorField << abort(FatalError); } - if (dict.found("value")) - { - fvPatchVectorField::operator= - ( - vectorField("value", dict, p.size()) - ); - } - else - { - partialSlipFvPatchVectorField::evaluate(); - } + fvPatchVectorField::operator= + ( + vectorField("value", dict, p.size()) + ); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 4369c4ad..1bea5199 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -129,17 +129,10 @@ JohnsonJacksonParticleThetaFvPatchScalarField << abort(FatalError); } - if (dict.found("value")) - { - fvPatchScalarField::operator= - ( - scalarField("value", dict, p.size()) - ); - } - else - { - evaluate(); - } + fvPatchScalarField::operator= + ( + scalarField("value", dict, p.size()) + ); } From ddafa9836ad9fdbb12c9ee18916f55d419596a24 Mon Sep 17 00:00:00 2001 From: william Date: Wed, 11 Jun 2014 11:31:12 +0100 Subject: [PATCH 3/3] BUG: Mantis 1325: laplacian name in kinetic theory model incorrectly formatted --- .../kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index f158b243..4fdc9a5f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -466,7 +466,7 @@ void Foam::RASModels::kineticTheoryModel::correct() + fvm::div(alphaRhoPhi, Theta_) - fvc::Sp(fvc::ddt(alpha, rho) + fvc::div(alphaRhoPhi), Theta_) ) - - fvm::laplacian(kappa_, Theta_, "laplacian(kappa, Theta)") + - fvm::laplacian(kappa_, Theta_, "laplacian(kappa,Theta)") == fvm::SuSp(-((PsCoeff*I) && gradU), Theta_) + (tau && gradU)