Commit 958091d4 authored by mattijs's avatar mattijs
Browse files

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

parents 25ca14a9 ee590889
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -477,7 +477,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
const scalar T4 = pow4(this->T_);
td.cloud().radAreaP()[cellI] += dt*np0*ap;
td.cloud().radT4()[cellI] += dt*np0*T4;
td.cloud().radAreaP()[cellI] += dt*np0*ap*T4;
td.cloud().radAreaPT4()[cellI] += dt*np0*ap*T4;
}
}
}
......
......@@ -466,7 +466,7 @@ void Foam::ReactingParcel<ParcelType>::calc
const scalar T4 = pow4(this->T_);
td.cloud().radAreaP()[cellI] += dt*np0*ap;
td.cloud().radT4()[cellI] += dt*np0*T4;
td.cloud().radAreaP()[cellI] += dt*np0*ap*T4;
td.cloud().radAreaPT4()[cellI] += dt*np0*ap*T4;
}
}
}
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -260,7 +260,7 @@ void Foam::ThermoParcel<ParcelType>::calc
const scalar T4 = pow4(this->T_);
td.cloud().radAreaP()[cellI] += dt*np0*ap;
td.cloud().radT4()[cellI] += dt*np0*T4;
td.cloud().radAreaP()[cellI] += dt*np0*ap*T4;
td.cloud().radAreaPT4()[cellI] += dt*np0*ap*T4;
}
}
}
......
......@@ -47,7 +47,7 @@ void dynLagrangian::updateSubGridScaleFields
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();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment