Renamed constAnIsoSolidTransport -> constAnisoSolidTransport for consistency with standard OpenFOAM naming convention
and the new constAnisoSolidThermo class.
This commit is contained in:
@ -36,7 +36,7 @@ mixture
|
||||
transport
|
||||
(
|
||||
constIsoSolid
|
||||
constAnIsoSolid
|
||||
constAnisoSolid
|
||||
exponentialSolid
|
||||
polynomialSolid
|
||||
tabulatedSolid
|
||||
|
||||
@ -38,7 +38,7 @@ License
|
||||
#include "sensibleInternalEnergy.H"
|
||||
|
||||
#include "constIsoSolidTransport.H"
|
||||
#include "constAnIsoSolidTransport.H"
|
||||
#include "constAnisoSolidTransport.H"
|
||||
#include "exponentialSolidTransport.H"
|
||||
#include "polynomialSolidTransport.H"
|
||||
#include "tabulatedSolidTransport.H"
|
||||
@ -62,7 +62,7 @@ License
|
||||
|
||||
#define forSolidTransports(Macro, Args...) \
|
||||
forSolidEnergiesAndThermos(constIsoSolidTransport, Macro, Args); \
|
||||
forSolidEnergiesAndThermos(constAnIsoSolidTransport, Macro, Args); \
|
||||
forSolidEnergiesAndThermos(constAnisoSolidTransport, Macro, Args); \
|
||||
forSolidEnergiesAndThermos(exponentialSolidTransport, Macro, Args); \
|
||||
forSolidEnergiesAndThermos(polynomialSolidTransport, Macro, Args) \
|
||||
forSolidEnergiesAndThermos(tabulatedSolidTransport, Macro, Args)
|
||||
|
||||
@ -23,13 +23,13 @@ License
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "constAnIsoSolidTransport.H"
|
||||
#include "constAnisoSolidTransport.H"
|
||||
#include "IOstreams.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
template<class Thermo>
|
||||
Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
|
||||
Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
|
||||
(
|
||||
const dictionary& dict
|
||||
)
|
||||
@ -42,7 +42,7 @@ Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
template<class Thermo>
|
||||
void Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport::write
|
||||
void Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport::write
|
||||
(
|
||||
Ostream& os
|
||||
) const
|
||||
@ -61,7 +61,7 @@ template<class Thermo>
|
||||
Foam::Ostream& Foam::operator<<
|
||||
(
|
||||
Ostream& os,
|
||||
const constAnIsoSolidTransport<Thermo>& ct
|
||||
const constAnisoSolidTransport<Thermo>& ct
|
||||
)
|
||||
{
|
||||
ct.write(os);
|
||||
@ -22,7 +22,7 @@ License
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Class
|
||||
Foam::constAnIsoSolidTransport
|
||||
Foam::constAnisoSolidTransport
|
||||
|
||||
Description
|
||||
Constant properties Transport package.
|
||||
@ -30,13 +30,13 @@ Description
|
||||
conductivity).
|
||||
|
||||
SourceFiles
|
||||
constAnIsoSolidTransportI.H
|
||||
constAnIsoSolidTransport.C
|
||||
constAnisoSolidTransportI.H
|
||||
constAnisoSolidTransport.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef constAnIsoSolidTransport_H
|
||||
#define constAnIsoSolidTransport_H
|
||||
#ifndef constAnisoSolidTransport_H
|
||||
#define constAnisoSolidTransport_H
|
||||
#include "vector.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -44,29 +44,29 @@ SourceFiles
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
template<class Thermo> class constAnIsoSolidTransport;
|
||||
template<class Thermo> class constAnisoSolidTransport;
|
||||
|
||||
template<class Thermo>
|
||||
inline constAnIsoSolidTransport<Thermo> operator*
|
||||
inline constAnisoSolidTransport<Thermo> operator*
|
||||
(
|
||||
const scalar,
|
||||
const constAnIsoSolidTransport<Thermo>&
|
||||
const constAnisoSolidTransport<Thermo>&
|
||||
);
|
||||
|
||||
template<class Thermo>
|
||||
Ostream& operator<<
|
||||
(
|
||||
Ostream&,
|
||||
const constAnIsoSolidTransport<Thermo>&
|
||||
const constAnisoSolidTransport<Thermo>&
|
||||
);
|
||||
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class constAnIsoSolidTransport Declaration
|
||||
Class constAnisoSolidTransport Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
template<class Thermo>
|
||||
class constAnIsoSolidTransport
|
||||
class constAnisoSolidTransport
|
||||
:
|
||||
public Thermo
|
||||
{
|
||||
@ -79,7 +79,7 @@ class constAnIsoSolidTransport
|
||||
// Private Member Functions
|
||||
|
||||
//- Construct from components
|
||||
inline constAnIsoSolidTransport(const Thermo& t, const vector kappa);
|
||||
inline constAnisoSolidTransport(const Thermo& t, const vector kappa);
|
||||
|
||||
|
||||
public:
|
||||
@ -87,20 +87,20 @@ public:
|
||||
// Constructors
|
||||
|
||||
//- Construct as named copy
|
||||
inline constAnIsoSolidTransport
|
||||
inline constAnisoSolidTransport
|
||||
(
|
||||
const word&,
|
||||
const constAnIsoSolidTransport&
|
||||
const constAnisoSolidTransport&
|
||||
);
|
||||
|
||||
//- Construct from dictionary
|
||||
constAnIsoSolidTransport(const dictionary&);
|
||||
constAnisoSolidTransport(const dictionary&);
|
||||
|
||||
//- Construct and return a clone
|
||||
inline autoPtr<constAnIsoSolidTransport> clone() const;
|
||||
inline autoPtr<constAnisoSolidTransport> clone() const;
|
||||
|
||||
// Selector from dictionary
|
||||
inline static autoPtr<constAnIsoSolidTransport> New
|
||||
inline static autoPtr<constAnisoSolidTransport> New
|
||||
(
|
||||
const dictionary& dict
|
||||
);
|
||||
@ -111,7 +111,7 @@ public:
|
||||
//- Return the instantiated type name
|
||||
static word typeName()
|
||||
{
|
||||
return "constAnIsoSolid<" + Thermo::typeName() + '>';
|
||||
return "constAnisoSolid<" + Thermo::typeName() + '>';
|
||||
}
|
||||
|
||||
//- Is the thermal conductivity isotropic
|
||||
@ -130,15 +130,15 @@ public:
|
||||
|
||||
// Member Operators
|
||||
|
||||
inline void operator+=(const constAnIsoSolidTransport&);
|
||||
inline void operator+=(const constAnisoSolidTransport&);
|
||||
|
||||
|
||||
// Friend operators
|
||||
|
||||
friend constAnIsoSolidTransport operator* <Thermo>
|
||||
friend constAnisoSolidTransport operator* <Thermo>
|
||||
(
|
||||
const scalar,
|
||||
const constAnIsoSolidTransport&
|
||||
const constAnisoSolidTransport&
|
||||
);
|
||||
|
||||
|
||||
@ -147,7 +147,7 @@ public:
|
||||
friend Ostream& operator<< <Thermo>
|
||||
(
|
||||
Ostream&,
|
||||
const constAnIsoSolidTransport&
|
||||
const constAnisoSolidTransport&
|
||||
);
|
||||
};
|
||||
|
||||
@ -158,10 +158,10 @@ public:
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#include "constAnIsoSolidTransportI.H"
|
||||
#include "constAnisoSolidTransportI.H"
|
||||
|
||||
#ifdef NoRepository
|
||||
#include "constAnIsoSolidTransport.C"
|
||||
#include "constAnisoSolidTransport.C"
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -26,7 +26,7 @@ License
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
|
||||
inline Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
|
||||
(
|
||||
const Thermo& t,
|
||||
const vector kappa
|
||||
@ -38,10 +38,10 @@ inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
|
||||
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
|
||||
inline Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
|
||||
(
|
||||
const word& name,
|
||||
const constAnIsoSolidTransport& ct
|
||||
const constAnisoSolidTransport& ct
|
||||
)
|
||||
:
|
||||
Thermo(name, ct),
|
||||
@ -50,33 +50,33 @@ inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
|
||||
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::autoPtr<Foam::constAnIsoSolidTransport<Thermo>>
|
||||
Foam::constAnIsoSolidTransport<Thermo>::clone() const
|
||||
inline Foam::autoPtr<Foam::constAnisoSolidTransport<Thermo>>
|
||||
Foam::constAnisoSolidTransport<Thermo>::clone() const
|
||||
{
|
||||
return autoPtr<constAnIsoSolidTransport<Thermo>>
|
||||
return autoPtr<constAnisoSolidTransport<Thermo>>
|
||||
(
|
||||
new constAnIsoSolidTransport<Thermo>(*this)
|
||||
new constAnisoSolidTransport<Thermo>(*this)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::autoPtr<Foam::constAnIsoSolidTransport<Thermo>>
|
||||
Foam::constAnIsoSolidTransport<Thermo>::New
|
||||
inline Foam::autoPtr<Foam::constAnisoSolidTransport<Thermo>>
|
||||
Foam::constAnisoSolidTransport<Thermo>::New
|
||||
(
|
||||
const dictionary& dict
|
||||
)
|
||||
{
|
||||
return autoPtr<constAnIsoSolidTransport<Thermo>>
|
||||
return autoPtr<constAnisoSolidTransport<Thermo>>
|
||||
(
|
||||
new constAnIsoSolidTransport<Thermo>(dict)
|
||||
new constAnisoSolidTransport<Thermo>(dict)
|
||||
);
|
||||
}
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::scalar Foam::constAnIsoSolidTransport<Thermo>::
|
||||
inline Foam::scalar Foam::constAnisoSolidTransport<Thermo>::
|
||||
kappa(const scalar p, const scalar T) const
|
||||
{
|
||||
NotImplemented;
|
||||
@ -85,7 +85,7 @@ kappa(const scalar p, const scalar T) const
|
||||
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::vector Foam::constAnIsoSolidTransport<Thermo>::
|
||||
inline Foam::vector Foam::constAnisoSolidTransport<Thermo>::
|
||||
Kappa(const scalar p, const scalar T) const
|
||||
{
|
||||
return kappa_;
|
||||
@ -95,9 +95,9 @@ Kappa(const scalar p, const scalar T) const
|
||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
||||
|
||||
template<class Thermo>
|
||||
inline void Foam::constAnIsoSolidTransport<Thermo>::operator+=
|
||||
inline void Foam::constAnisoSolidTransport<Thermo>::operator+=
|
||||
(
|
||||
const constAnIsoSolidTransport<Thermo>& ct
|
||||
const constAnisoSolidTransport<Thermo>& ct
|
||||
)
|
||||
{
|
||||
scalar Y1 = this->Y();
|
||||
@ -113,13 +113,13 @@ inline void Foam::constAnIsoSolidTransport<Thermo>::operator+=
|
||||
|
||||
|
||||
template<class Thermo>
|
||||
inline Foam::constAnIsoSolidTransport<Thermo> Foam::operator*
|
||||
inline Foam::constAnisoSolidTransport<Thermo> Foam::operator*
|
||||
(
|
||||
const scalar s,
|
||||
const constAnIsoSolidTransport<Thermo>& ct
|
||||
const constAnisoSolidTransport<Thermo>& ct
|
||||
)
|
||||
{
|
||||
return constAnIsoSolidTransport<Thermo>
|
||||
return constAnisoSolidTransport<Thermo>
|
||||
(
|
||||
s*static_cast<const Thermo&>(ct),
|
||||
ct.kappa_
|
||||
Reference in New Issue
Block a user