zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2013-04-16 16:07:08 +01:00
parent 25ca14a968 ee59088994
commit 958091d440
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -477,7 +477,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
const scalar T4 = pow4(this->T_); const scalar T4 = pow4(this->T_);
td.cloud().radAreaP()[cellI] += dt*np0*ap; td.cloud().radAreaP()[cellI] += dt*np0*ap;
td.cloud().radT4()[cellI] += dt*np0*T4; td.cloud().radT4()[cellI] += dt*np0*T4;
td.cloud().radAreaP()[cellI] += dt*np0*ap*T4; td.cloud().radAreaPT4()[cellI] += dt*np0*ap*T4;
} }
} }
} }

2
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
View File

@ -466,7 +466,7 @@ void Foam::ReactingParcel<ParcelType>::calc
const scalar T4 = pow4(this->T_); const scalar T4 = pow4(this->T_);
td.cloud().radAreaP()[cellI] += dt*np0*ap; td.cloud().radAreaP()[cellI] += dt*np0*ap;
td.cloud().radT4()[cellI] += dt*np0*T4; td.cloud().radT4()[cellI] += dt*np0*T4;
td.cloud().radAreaP()[cellI] += dt*np0*ap*T4; td.cloud().radAreaPT4()[cellI] += dt*np0*ap*T4;
} }
} }
} }

4
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -260,7 +260,7 @@ void Foam::ThermoParcel<ParcelType>::calc
const scalar T4 = pow4(this->T_); const scalar T4 = pow4(this->T_);
td.cloud().radAreaP()[cellI] += dt*np0*ap; td.cloud().radAreaP()[cellI] += dt*np0*ap;
td.cloud().radT4()[cellI] += dt*np0*T4; td.cloud().radT4()[cellI] += dt*np0*T4;
td.cloud().radAreaP()[cellI] += dt*np0*ap*T4; td.cloud().radAreaPT4()[cellI] += dt*np0*ap*T4;
} }
} }
} }

2
src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
View File

@ -47,7 +47,7 @@ void dynLagrangian::updateSubGridScaleFields
const tmp<volTensorField>& gradU const tmp<volTensorField>& gradU
) )
{ {
nuSgs_ = 2.0*(flm_/fmm_)*sqr(delta())*mag(dev(symm(gradU))); nuSgs_ = (flm_/fmm_)*sqr(delta())*mag(dev(symm(gradU)));
nuSgs_.correctBoundaryConditions(); nuSgs_.correctBoundaryConditions();
} }