zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed constAnIsoSolidTransport -> constAnisoSolidTransport for consistency with standard OpenFOAM naming convention

Browse Source 
and the new constAnisoSolidThermo class.
This commit is contained in:
Henry Weller
2022-11-28 17:53:24 +00:00
parent 5c296cbc8e
commit c0ce311444
8 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/codeTemplates/dynamicCode/solidThermo
View File

@ -36,7 +36,7 @@ mixture
transport transport
( (
constIsoSolid constIsoSolid
constAnIsoSolid constAnisoSolid
exponentialSolid exponentialSolid
polynomialSolid polynomialSolid
tabulatedSolid tabulatedSolid

4
src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H
View File

@ -38,7 +38,7 @@ License
#include "sensibleInternalEnergy.H" #include "sensibleInternalEnergy.H"
#include "constIsoSolidTransport.H" #include "constIsoSolidTransport.H"
#include "constAnIsoSolidTransport.H" #include "constAnisoSolidTransport.H"
#include "exponentialSolidTransport.H" #include "exponentialSolidTransport.H"
#include "polynomialSolidTransport.H" #include "polynomialSolidTransport.H"
#include "tabulatedSolidTransport.H" #include "tabulatedSolidTransport.H"
@ -62,7 +62,7 @@ License
#define forSolidTransports(Macro, Args...) \ #define forSolidTransports(Macro, Args...) \
forSolidEnergiesAndThermos(constIsoSolidTransport, Macro, Args); \ forSolidEnergiesAndThermos(constIsoSolidTransport, Macro, Args); \
forSolidEnergiesAndThermos(constAnIsoSolidTransport, Macro, Args); \ forSolidEnergiesAndThermos(constAnisoSolidTransport, Macro, Args); \
forSolidEnergiesAndThermos(exponentialSolidTransport, Macro, Args); \ forSolidEnergiesAndThermos(exponentialSolidTransport, Macro, Args); \
forSolidEnergiesAndThermos(polynomialSolidTransport, Macro, Args) \ forSolidEnergiesAndThermos(polynomialSolidTransport, Macro, Args) \
forSolidEnergiesAndThermos(tabulatedSolidTransport, Macro, Args) forSolidEnergiesAndThermos(tabulatedSolidTransport, Macro, Args)

8
src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.C → src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.C
View File

@ -23,13 +23,13 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "constAnIsoSolidTransport.H" #include "constAnisoSolidTransport.H"
#include "IOstreams.H" #include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo> template<class Thermo>
Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
( (
const dictionary& dict const dictionary& dict
) )
@ -42,7 +42,7 @@ Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Thermo> template<class Thermo>
void Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport::write void Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport::write
( (
Ostream& os Ostream& os
) const ) const
@ -61,7 +61,7 @@ template<class Thermo>
Foam::Ostream& Foam::operator<< Foam::Ostream& Foam::operator<<
( (
Ostream& os, Ostream& os,
const constAnIsoSolidTransport<Thermo>& ct const constAnisoSolidTransport<Thermo>& ct
) )
{ {
ct.write(os); ct.write(os);

48
src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H → src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::constAnIsoSolidTransport Foam::constAnisoSolidTransport
Description Description
Constant properties Transport package. Constant properties Transport package.
@ -30,13 +30,13 @@ Description
conductivity). conductivity).
SourceFiles SourceFiles
constAnIsoSolidTransportI.H constAnisoSolidTransportI.H
constAnIsoSolidTransport.C constAnisoSolidTransport.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef constAnIsoSolidTransport_H #ifndef constAnisoSolidTransport_H
#define constAnIsoSolidTransport_H #define constAnisoSolidTransport_H
#include "vector.H" #include "vector.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,29 +44,29 @@ SourceFiles
namespace Foam namespace Foam
{ {
template<class Thermo> class constAnIsoSolidTransport; template<class Thermo> class constAnisoSolidTransport;
template<class Thermo> template<class Thermo>
inline constAnIsoSolidTransport<Thermo> operator* inline constAnisoSolidTransport<Thermo> operator*
( (
const scalar, const scalar,
const constAnIsoSolidTransport<Thermo>& const constAnisoSolidTransport<Thermo>&
); );
template<class Thermo> template<class Thermo>
Ostream& operator<< Ostream& operator<<
( (
Ostream&, Ostream&,
const constAnIsoSolidTransport<Thermo>& const constAnisoSolidTransport<Thermo>&
); );
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class constAnIsoSolidTransport Declaration Class constAnisoSolidTransport Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class Thermo> template<class Thermo>
class constAnIsoSolidTransport class constAnisoSolidTransport
: :
public Thermo public Thermo
{ {
@ -79,7 +79,7 @@ class constAnIsoSolidTransport
// Private Member Functions // Private Member Functions
//- Construct from components //- Construct from components
inline constAnIsoSolidTransport(const Thermo& t, const vector kappa); inline constAnisoSolidTransport(const Thermo& t, const vector kappa);
public: public:
@ -87,20 +87,20 @@ public:
// Constructors // Constructors
//- Construct as named copy //- Construct as named copy
inline constAnIsoSolidTransport inline constAnisoSolidTransport
( (
const word&, const word&,
const constAnIsoSolidTransport& const constAnisoSolidTransport&
); );
//- Construct from dictionary //- Construct from dictionary
constAnIsoSolidTransport(const dictionary&); constAnisoSolidTransport(const dictionary&);
//- Construct and return a clone //- Construct and return a clone
inline autoPtr<constAnIsoSolidTransport> clone() const; inline autoPtr<constAnisoSolidTransport> clone() const;
// Selector from dictionary // Selector from dictionary
inline static autoPtr<constAnIsoSolidTransport> New inline static autoPtr<constAnisoSolidTransport> New
( (
const dictionary& dict const dictionary& dict
); );
@ -111,7 +111,7 @@ public:
//- Return the instantiated type name //- Return the instantiated type name
static word typeName() static word typeName()
{ {
return "constAnIsoSolid<" + Thermo::typeName() + '>'; return "constAnisoSolid<" + Thermo::typeName() + '>';
} }
//- Is the thermal conductivity isotropic //- Is the thermal conductivity isotropic
@ -130,15 +130,15 @@ public:
// Member Operators // Member Operators
inline void operator+=(const constAnIsoSolidTransport&); inline void operator+=(const constAnisoSolidTransport&);
// Friend operators // Friend operators
friend constAnIsoSolidTransport operator* <Thermo> friend constAnisoSolidTransport operator* <Thermo>
( (
const scalar, const scalar,
const constAnIsoSolidTransport& const constAnisoSolidTransport&
); );
@ -147,7 +147,7 @@ public:
friend Ostream& operator<< <Thermo> friend Ostream& operator<< <Thermo>
( (
Ostream&, Ostream&,
const constAnIsoSolidTransport& const constAnisoSolidTransport&
); );
}; };
@ -158,10 +158,10 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "constAnIsoSolidTransportI.H" #include "constAnisoSolidTransportI.H"
#ifdef NoRepository #ifdef NoRepository
#include "constAnIsoSolidTransport.C" #include "constAnisoSolidTransport.C"
#endif #endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

36
src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.H → src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransportI.H
View File

@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo> template<class Thermo>
inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport inline Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
( (
const Thermo& t, const Thermo& t,
const vector kappa const vector kappa
@ -38,10 +38,10 @@ inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
template<class Thermo> template<class Thermo>
inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport inline Foam::constAnisoSolidTransport<Thermo>::constAnisoSolidTransport
( (
const word& name, const word& name,
const constAnIsoSolidTransport& ct const constAnisoSolidTransport& ct
) )
: :
Thermo(name, ct), Thermo(name, ct),
@ -50,33 +50,33 @@ inline Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
template<class Thermo> template<class Thermo>
inline Foam::autoPtr<Foam::constAnIsoSolidTransport<Thermo>> inline Foam::autoPtr<Foam::constAnisoSolidTransport<Thermo>>
Foam::constAnIsoSolidTransport<Thermo>::clone() const Foam::constAnisoSolidTransport<Thermo>::clone() const
{ {
return autoPtr<constAnIsoSolidTransport<Thermo>> return autoPtr<constAnisoSolidTransport<Thermo>>
( (
new constAnIsoSolidTransport<Thermo>(*this) new constAnisoSolidTransport<Thermo>(*this)
); );
} }
template<class Thermo> template<class Thermo>
inline Foam::autoPtr<Foam::constAnIsoSolidTransport<Thermo>> inline Foam::autoPtr<Foam::constAnisoSolidTransport<Thermo>>
Foam::constAnIsoSolidTransport<Thermo>::New Foam::constAnisoSolidTransport<Thermo>::New
( (
const dictionary& dict const dictionary& dict
) )
{ {
return autoPtr<constAnIsoSolidTransport<Thermo>> return autoPtr<constAnisoSolidTransport<Thermo>>
( (
new constAnIsoSolidTransport<Thermo>(dict) new constAnisoSolidTransport<Thermo>(dict)
); );
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Thermo> template<class Thermo>
inline Foam::scalar Foam::constAnIsoSolidTransport<Thermo>:: inline Foam::scalar Foam::constAnisoSolidTransport<Thermo>::
kappa(const scalar p, const scalar T) const kappa(const scalar p, const scalar T) const
{ {
NotImplemented; NotImplemented;
@ -85,7 +85,7 @@ kappa(const scalar p, const scalar T) const
template<class Thermo> template<class Thermo>
inline Foam::vector Foam::constAnIsoSolidTransport<Thermo>:: inline Foam::vector Foam::constAnisoSolidTransport<Thermo>::
Kappa(const scalar p, const scalar T) const Kappa(const scalar p, const scalar T) const
{ {
return kappa_; return kappa_;
@ -95,9 +95,9 @@ Kappa(const scalar p, const scalar T) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Thermo> 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(); scalar Y1 = this->Y();
@ -113,13 +113,13 @@ inline void Foam::constAnIsoSolidTransport<Thermo>::operator+=
template<class Thermo> template<class Thermo>
inline Foam::constAnIsoSolidTransport<Thermo> Foam::operator* inline Foam::constAnisoSolidTransport<Thermo> Foam::operator*
( (
const scalar s, const scalar s,
const constAnIsoSolidTransport<Thermo>& ct const constAnisoSolidTransport<Thermo>& ct
) )
{ {
return constAnIsoSolidTransport<Thermo> return constAnisoSolidTransport<Thermo>
( (
s*static_cast<const Thermo&>(ct), s*static_cast<const Thermo&>(ct),
ct.kappa_ ct.kappa_

0
src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.C → src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.C
View File

0
src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.H → src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.H
View File

0
src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransportI.H → src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransportI.H
View File