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
2011-11-08 09:32:39 +00:00
parent 83ec8559d6 76cf75f935
commit fb76b98af4
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
applications/solvers/combustion/chemFoam/readInitialConditions.H
View File

@ -1,13 +1,5 @@
word constProp(initialConditions.lookup("constantProperty")); word constProp(initialConditions.lookup("constantProperty"));
if (constProp == "pressure" || constProp == "volume") if ((constProp != "pressure") && (constProp != "volume"))
{
Info << constProp << " will be held constant." << nl
<< " p = " << p[0] << " [Pa]" << nl
<< " T = " << thermo.T()[0] << " [K] " << nl
<< " rho = " << rho[0] << " [kg/m3]" << nl
<< endl;
}
else
{ {
FatalError << "in initialConditions, unknown constantProperty type " FatalError << "in initialConditions, unknown constantProperty type "
<< constProp << nl << " Valid types are: pressure volume." << constProp << nl << " Valid types are: pressure volume."
@ -110,3 +102,10 @@
scalar integratedHeat = 0.0; scalar integratedHeat = 0.0;
Info << constProp << " will be held constant." << nl
<< " p = " << p[0] << " [Pa]" << nl
<< " T = " << thermo.T()[0] << " [K] " << nl
<< " rho = " << rho[0] << " [kg/m3]" << nl
<< endl;

6
src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
View File

@ -80,12 +80,12 @@ void Foam::FacePostProcessing<CloudType>::write()
const Time& time = mesh.time(); const Time& time = mesh.time();
const faceZoneMesh& fzm = mesh.faceZones(); const faceZoneMesh& fzm = mesh.faceZones();
scalar timeNew = time.value(); scalar timeNew = time.value();
scalar timeElapsed = timeNew-timeOld_; scalar timeElapsed = timeNew - timeOld_;
totalTime_ += timeElapsed; totalTime_ += timeElapsed;
const scalar alpha = (totalTime_ - timeElapsed)/totalTime_; const scalar alpha = (totalTime_ - timeElapsed)/totalTime_;
const scalar beta = timeElapsed/totalTime_; //correct const scalar beta = timeElapsed/totalTime_;
forAll(faceZoneIDs_, zoneI) forAll(faceZoneIDs_, zoneI)
{ {
@ -96,7 +96,7 @@ void Foam::FacePostProcessing<CloudType>::write()
const label procI = Pstream::myProcNo(); const label procI = Pstream::myProcNo();
Info<< "particleFaceFlowRate output:" << nl; Info<< type() << " output:" << nl;
List<scalarField> zoneMassTotal(mass_.size()); List<scalarField> zoneMassTotal(mass_.size());
List<scalarField> zoneMassFlowRate(massFlowRate_.size()); List<scalarField> zoneMassFlowRate(massFlowRate_.size());