research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
mattijs 2014-06-13 08:59:00 +01:00
commit 7473cb23c9
4 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
View file

@ -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())
);
}

15
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
View file

@ -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())
);
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View file

@ -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)

8
src/thermophysicalModels/radiationModels/radiationModel/viewFactor/viewFactor.C
View file

@ -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;
}
}
}