zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +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:
laurence
2013-06-14 15:42:39 +01:00
parent b2deb30972 1f64e5c7f5
commit 9d9bc02121
14 changed files with 346 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenFOAM/containers/Lists/PtrList/PtrList.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
@ -189,6 +189,11 @@ public:
// allocated entries.
void clear();
//- Append an element at the end of the list
inline void append(const T*);
inline void append(const autoPtr<T>&);
inline void append(const tmp<T>&);
//- Transfer the contents of the argument PtrList into this PtrList
// and annul the argument list.
void transfer(PtrList<T>&);

26
src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
View File

@ -79,6 +79,32 @@ inline void Foam::PtrList<T>::resize(const label newSize)
}
template<class T>
inline void Foam::PtrList<T>::append(const T* ptr)
{
label sz = size();
this->setSize(sz+1);
ptrs_[sz] = ptr;
}
template<class T>
inline void Foam::PtrList<T>::append(const autoPtr<T>& aptr)
{
return append(const_cast<autoPtr<T>&>(aptr).ptr());
}
template<class T>
inline void Foam::PtrList<T>::append
(
const tmp<T>& t
)
{
return append(const_cast<tmp<T>&>(t).ptr());
}
template<class T>
inline bool Foam::PtrList<T>::set(const label i) const
{

11
src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
View File

@ -955,6 +955,17 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
}
}
// Because of isCollapsedFace one side can decide not to baffle whereas
// the other side does so sync. Baffling is prefered over not baffling.
syncTools::syncFaceList
(
mesh_,
facePatch,
maxEqOp<label>()
);
Info<< "markFacesOnProblemCells : marked "
<< returnReduce(nBaffleFaces, sumOp<label>())
<< " additional internal faces to be converted into baffles."

2
src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
View File

@ -77,7 +77,7 @@ namespace Foam
> hExponentialSolidThermoPhysics;
typedef
typedef
polynomialSolidTransport
<
species::thermo

20
src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
View File

@ -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
@ -28,26 +28,26 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class thermo>
Foam::constAnIsoSolidTransport<thermo>::constAnIsoSolidTransport
template<class Thermo>
Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
(
const dictionary& dict
)
:
thermo(dict),
Thermo(dict),
kappa_(dict.subDict("transport").lookup("kappa"))
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class thermo>
void Foam::constAnIsoSolidTransport<thermo>::constAnIsoSolidTransport::write
template<class Thermo>
void Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport::write
(
Ostream& os
) const
{
thermo::write(os);
Thermo::write(os);
dictionary dict("transport");
dict.add("kappa", kappa_);
@ -57,14 +57,14 @@ void Foam::constAnIsoSolidTransport<thermo>::constAnIsoSolidTransport::write
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class thermo>
template<class Thermo>
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const constAnIsoSolidTransport<thermo>& ct
const constAnIsoSolidTransport<Thermo>& ct
)
{
operator<<(os, static_cast<const thermo&>(ct));
operator<<(os, static_cast<const Thermo&>(ct));
os << tab << ct.kappa_;
os.check

20
src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
View File

@ -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
@ -28,13 +28,13 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class thermo>
Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
template<class Thermo>
Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport
(
const dictionary& dict
)
:
thermo(dict),
Thermo(dict),
kappa0_(0.0),
n0_(0.0),
Tref_(0.0)
@ -48,13 +48,13 @@ Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class thermo>
void Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport::write
template<class Thermo>
void Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport::write
(
Ostream& os
) const
{
thermo::write(os);
Thermo::write(os);
dictionary dict("transport");
dict.add("kappa0", kappa0_);
@ -66,13 +66,13 @@ void Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport::write
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class thermo>
template<class Thermo>
Foam::Ostream& Foam::operator<<
(
Ostream& os, const exponentialSolidTransport<thermo>& et
Ostream& os, const exponentialSolidTransport<Thermo>& et
)
{
operator<<(os, static_cast<const thermo&>(et));
operator<<(os, static_cast<const Thermo&>(et));
os << tab << et.kappa0_ << tab << et.n0_ << tab << et.Tref_;
os.check

71
src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H
View File

@ -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
@ -25,30 +25,30 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class thermo>
inline Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
template<class Thermo>
inline Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport
(
const thermo& t,
const Thermo& t,
const scalar kappa0,
const scalar n0,
const scalar Tref
)
:
thermo(t),
Thermo(t),
kappa0_(kappa0),
n0_(n0),
Tref_(Tref)
{}
template<class thermo>
inline Foam::exponentialSolidTransport<thermo>::exponentialSolidTransport
template<class Thermo>
inline Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport
(
const word& name,
const exponentialSolidTransport& ct
)
:
thermo(name, ct),
Thermo(name, ct),
kappa0_(ct.kappa0_),
n0_(ct.n0_),
Tref_(ct.Tref_)
@ -70,8 +70,8 @@ Foam::exponentialSolidTransport<Thermo>::New
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class thermo>
inline Foam::scalar Foam::exponentialSolidTransport<thermo>::kappa
template<class Thermo>
inline Foam::scalar Foam::exponentialSolidTransport<Thermo>::kappa
(
const scalar p, const scalar T
) const
@ -80,8 +80,8 @@ inline Foam::scalar Foam::exponentialSolidTransport<thermo>::kappa
}
template<class thermo>
inline Foam::vector Foam::exponentialSolidTransport<thermo>::Kappa
template<class Thermo>
inline Foam::vector Foam::exponentialSolidTransport<Thermo>::Kappa
(
const scalar p, const scalar T
) const
@ -91,13 +91,13 @@ inline Foam::vector Foam::exponentialSolidTransport<thermo>::Kappa
}
template<class thermo>
inline Foam::scalar Foam::exponentialSolidTransport<thermo>::
template<class Thermo>
inline Foam::scalar Foam::exponentialSolidTransport<Thermo>::
mu(const scalar p, const scalar T) const
{
notImplemented
(
"Foam::scalar Foam::exponentialSolidTransport<thermo>mu::"
"Foam::scalar Foam::exponentialSolidTransport<Thermo>mu::"
"("
" const scalar p, const scalar T"
") const"
@ -106,8 +106,8 @@ mu(const scalar p, const scalar T) const
}
template<class thermo>
inline Foam::scalar Foam::exponentialSolidTransport<thermo>::
template<class Thermo>
inline Foam::scalar Foam::exponentialSolidTransport<Thermo>::
alphah(const scalar p, const scalar T) const
{
return kappa(p, T)/this->Cpv(p, T);
@ -116,33 +116,28 @@ alphah(const scalar p, const scalar T) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class thermo>
inline Foam::exponentialSolidTransport<thermo>&
Foam::exponentialSolidTransport<thermo>::operator=
template<class Thermo>
inline Foam::exponentialSolidTransport<Thermo>&
Foam::exponentialSolidTransport<Thermo>::operator=
(
const exponentialSolidTransport<thermo>& ct
const exponentialSolidTransport<Thermo>& ct
)
{
//thermo::operator=(ct);
kappa0_ = ct.kappa0_;
n0_ = ct.n0_;
Tref_ = ct.Tref_;
return *this;
}
template<class thermo>
inline void Foam::exponentialSolidTransport<thermo>::operator+=
template<class Thermo>
inline void Foam::exponentialSolidTransport<Thermo>::operator+=
(
const exponentialSolidTransport<thermo>& ct
const exponentialSolidTransport<Thermo>& ct
)
{
scalar molr1 = this->nMoles();
//thermo::operator+=(ct);
molr1 /= this->nMoles();
scalar molr2 = ct.nMoles()/this->nMoles();
@ -152,16 +147,14 @@ inline void Foam::exponentialSolidTransport<thermo>::operator+=
}
template<class thermo>
inline void Foam::exponentialSolidTransport<thermo>::operator-=
template<class Thermo>
inline void Foam::exponentialSolidTransport<Thermo>::operator-=
(
const exponentialSolidTransport<thermo>& ct
const exponentialSolidTransport<Thermo>& ct
)
{
scalar molr1 = this->nMoles();
//thermo::operator-=(ct);
molr1 /= this->nMoles();
scalar molr2 = ct.nMoles()/this->nMoles();
@ -173,16 +166,16 @@ inline void Foam::exponentialSolidTransport<thermo>::operator-=
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
template<class thermo>
inline Foam::exponentialSolidTransport<thermo> Foam::operator*
template<class Thermo>
inline Foam::exponentialSolidTransport<Thermo> Foam::operator*
(
const scalar s,
const exponentialSolidTransport<thermo>& ct
const exponentialSolidTransport<Thermo>& ct
)
{
return exponentialSolidTransport<thermo>
return exponentialSolidTransport<Thermo>
(
s*static_cast<const thermo&>(ct),
s*static_cast<const Thermo&>(ct),
ct.kappa0_,
ct.n0_,
ct.Tref_

5
src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C
View File

@ -63,9 +63,6 @@ Foam::polynomialSolidTransport<Thermo, PolySize>::polynomialSolidTransport
template<class Thermo, int PolySize>
void Foam::polynomialSolidTransport<Thermo, PolySize>::write(Ostream& os) const
{
os << this->name() << endl;
os << token::BEGIN_BLOCK << incrIndent << nl;
Thermo::write(os);
dictionary dict("transport");
@ -76,8 +73,6 @@ void Foam::polynomialSolidTransport<Thermo, PolySize>::write(Ostream& os) const
kappaCoeffs_
);
os << indent << dict.dictName() << dict;
os << decrIndent << token::END_BLOCK << nl;
}