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

ENH: merging lagrangian developments from internal line - also resolves mantis #1304

Browse Source
This commit is contained in:
andy
2014-05-23 12:10:59 +01:00
committed by Andrew Heather
parent b73b8e7610
commit 41d61af8a1
3 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@ bool Foam::KinematicParcel<ParcelType>::move
const scalar maxCo = td.cloud().solution().maxCo();
scalar tEnd = (1.0 - p.stepFraction())*trackTime;
const scalar dtMax = tEnd;
const scalar dtMax = maxCo*trackTime;
bool tracking = true;
label nTrackingStalled = 0;

35
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,20 +76,8 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
}
else
{
is.read
(
reinterpret_cast<char*>(&active_),
sizeof(active_)
+ sizeof(typeId_)
+ sizeof(nParticle_)
+ sizeof(d_)
+ sizeof(dTarget_)
+ sizeof(U_)
+ sizeof(rho_)
+ sizeof(age_)
+ sizeof(tTurb_)
+ sizeof(UTurb_)
);
label size = long(&UTurb_) - long(&active_) + sizeof(UTurb_);
is.read(reinterpret_cast<char*>(&active_), size);
}
}
@ -248,20 +236,9 @@ Foam::Ostream& Foam::operator<<
else
{
os << static_cast<const ParcelType&>(p);
os.write
(
reinterpret_cast<const char*>(&p.active_),
sizeof(p.active())
+ sizeof(p.typeId())
+ sizeof(p.nParticle())
+ sizeof(p.d())
+ sizeof(p.dTarget())
+ sizeof(p.U())
+ sizeof(p.rho())
+ sizeof(p.age())
+ sizeof(p.tTurb())
+ sizeof(p.UTurb())
);
label size = long(&p.UTurb_) - long(&p.active_) + sizeof(p.UTurb_);
os.write(reinterpret_cast<const char*>(&p.active_), size);
}
// Check state of Ostream

18
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,12 +58,8 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
}
else
{
is.read
(
reinterpret_cast<char*>(&T_),
+ sizeof(T_)
+ sizeof(Cp_)
);
label size = long(&Cp_) - long(&T_) + sizeof(Cp_);
is.read(reinterpret_cast<char*>(&T_), size);
}
}
@ -149,11 +145,9 @@ Foam::Ostream& Foam::operator<<
else
{
os << static_cast<const ParcelType&>(p);
os.write
(
reinterpret_cast<const char*>(&p.T_),
sizeof(p.T()) + sizeof(p.Cp())
);
label size = long(&p.Cp_) - long(&p.T_) + sizeof(p.Cp_);
os.write(reinterpret_cast<const char*>(&p.T_), size);
}
// Check state of Ostream