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-07-30 13:02:10 +01:00
parent db0036f34e 4d3b3e7a9f
commit c4f83d913a
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -223,7 +223,11 @@ inline Foam::UList<T> Foam::CompactListList<T, Container>::operator[]
)
{
label start = offsets_[i];
return UList<T>((m_.size() ? &m_[start] : NULL), offsets_[i+1] - start);
return UList<T>
(
(m_.size() ? m_.begin() + start : NULL),
offsets_[i+1] - start
);
}
@ -237,7 +241,7 @@ Foam::CompactListList<T, Container>::operator[]
label start = offsets_[i];
return UList<T>
(
(m_.size() ? const_cast<T*>(&m_[start]) : NULL),
(m_.size() ? const_cast<T*>(m_.begin() + start) : NULL),
offsets_[i+1] - start
);
}

14
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
View File

@ -266,11 +266,10 @@ template<class CloudType>
Foam::label Foam::ParticleCollector<CloudType>::collectParcelPolygon
(
const point& position,
const vector& U
const vector& U,
const scalar dt
) const
{
scalar dt = this->owner().db().time().deltaTValue();
point end(position + dt*U);
label dummyNearType = -1;
@ -322,13 +321,12 @@ template<class CloudType>
Foam::label Foam::ParticleCollector<CloudType>::collectParcelConcentricCircles
(
const point& position,
const vector& U
const vector& U,
const scalar dt
) const
{
label secI = -1;
scalar dt = this->owner().db().time().deltaTValue();
point end(position + dt*U);
const scalar d1 = normal_ & (position - coordSys_.origin());
@ -636,12 +634,12 @@ void Foam::ParticleCollector<CloudType>::postMove
{
case mtPolygon:
{
faceI = collectParcelPolygon(p.position(), p.U());
faceI = collectParcelPolygon(p.position(), p.U(), dt);
break;
}
case mtConcentricCircle:
{
faceI = collectParcelConcentricCircles(p.position(), p.U());
faceI = collectParcelConcentricCircles(p.position(), p.U(), dt);
break;
}
default:

8
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -170,14 +170,16 @@ private:
label collectParcelPolygon
(
const point& position,
const vector& U
const vector& U,
const scalar dt
) const;
//- Collect parcels in concentric circle collectors
label collectParcelConcentricCircles
(
const point& position,
const vector& U
const vector& U,
const scalar dt
) const;

4
tutorials/Alltest
View File

@ -3,7 +3,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
@ -74,7 +74,7 @@ do
usage "unknown option: '$*'"
;;
*)
break
usage "unknown option/argument: '$*'"
;;
esac
shift

6
tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
View File

@ -12,7 +12,8 @@ forceCoeffs1
functionObjectLibs ( "libforces.so" );
outputControl outputTime;
outputControl timeStep;
timeInterval 1;
log yes;
@ -30,15 +31,12 @@ forceCoeffs1
lRef 1.42; // Wheelbase length
Aref 0.75; // Estimated
/* - Uncomment to have forceCoeffs calculated in 20 bins
binData
{
nBin 20; // output data into 20 bins
direction (1 0 0); // bin direction
format gnuplot;
cumulative yes;
}
*/
}