diff --git a/etc/codeTemplates/dynamicCode/solidThermo b/etc/codeTemplates/dynamicCode/solidThermo index 1b6a505211..ca1ffc4462 100644 --- a/etc/codeTemplates/dynamicCode/solidThermo +++ b/etc/codeTemplates/dynamicCode/solidThermo @@ -36,7 +36,7 @@ mixture transport ( constIsoSolid - constAnIsoSolid + constAnisoSolid exponentialSolid polynomialSolid tabulatedSolid diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H b/src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H index 8f44aa085f..612a966464 100644 --- a/src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H @@ -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) diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.C similarity index 90% rename from src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.C index 0a90bba1e7..6a5fe5ae13 100644 --- a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.C +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.C @@ -23,13 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "constAnIsoSolidTransport.H" +#include "constAnisoSolidTransport.H" #include "IOstreams.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::constAnIsoSolidTransport::constAnIsoSolidTransport +Foam::constAnisoSolidTransport::constAnisoSolidTransport ( const dictionary& dict ) @@ -42,7 +42,7 @@ Foam::constAnIsoSolidTransport::constAnIsoSolidTransport // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void Foam::constAnIsoSolidTransport::constAnIsoSolidTransport::write +void Foam::constAnisoSolidTransport::constAnisoSolidTransport::write ( Ostream& os ) const @@ -61,7 +61,7 @@ template Foam::Ostream& Foam::operator<< ( Ostream& os, - const constAnIsoSolidTransport& ct + const constAnisoSolidTransport& ct ) { ct.write(os); diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.H similarity index 75% rename from src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.H index 28afabe7d7..abdd8399d1 100644 --- a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransport.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . 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 constAnIsoSolidTransport; +template class constAnisoSolidTransport; template -inline constAnIsoSolidTransport operator* +inline constAnisoSolidTransport operator* ( const scalar, - const constAnIsoSolidTransport& + const constAnisoSolidTransport& ); template Ostream& operator<< ( Ostream&, - const constAnIsoSolidTransport& + const constAnisoSolidTransport& ); /*---------------------------------------------------------------------------*\ - Class constAnIsoSolidTransport Declaration + Class constAnisoSolidTransport Declaration \*---------------------------------------------------------------------------*/ template -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 clone() const; + inline autoPtr clone() const; // Selector from dictionary - inline static autoPtr New + inline static autoPtr 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* + friend constAnisoSolidTransport operator* ( const scalar, - const constAnIsoSolidTransport& + const constAnisoSolidTransport& ); @@ -147,7 +147,7 @@ public: friend Ostream& operator<< ( 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 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransportI.H similarity index 71% rename from src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransportI.H index 6cd0305e73..160447696c 100644 --- a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constAniso/constAnisoSolidTransportI.H @@ -26,7 +26,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -inline Foam::constAnIsoSolidTransport::constAnIsoSolidTransport +inline Foam::constAnisoSolidTransport::constAnisoSolidTransport ( const Thermo& t, const vector kappa @@ -38,10 +38,10 @@ inline Foam::constAnIsoSolidTransport::constAnIsoSolidTransport template -inline Foam::constAnIsoSolidTransport::constAnIsoSolidTransport +inline Foam::constAnisoSolidTransport::constAnisoSolidTransport ( const word& name, - const constAnIsoSolidTransport& ct + const constAnisoSolidTransport& ct ) : Thermo(name, ct), @@ -50,33 +50,33 @@ inline Foam::constAnIsoSolidTransport::constAnIsoSolidTransport template -inline Foam::autoPtr> -Foam::constAnIsoSolidTransport::clone() const +inline Foam::autoPtr> +Foam::constAnisoSolidTransport::clone() const { - return autoPtr> + return autoPtr> ( - new constAnIsoSolidTransport(*this) + new constAnisoSolidTransport(*this) ); } template -inline Foam::autoPtr> -Foam::constAnIsoSolidTransport::New +inline Foam::autoPtr> +Foam::constAnisoSolidTransport::New ( const dictionary& dict ) { - return autoPtr> + return autoPtr> ( - new constAnIsoSolidTransport(dict) + new constAnisoSolidTransport(dict) ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -inline Foam::scalar Foam::constAnIsoSolidTransport:: +inline Foam::scalar Foam::constAnisoSolidTransport:: kappa(const scalar p, const scalar T) const { NotImplemented; @@ -85,7 +85,7 @@ kappa(const scalar p, const scalar T) const template -inline Foam::vector Foam::constAnIsoSolidTransport:: +inline Foam::vector Foam::constAnisoSolidTransport:: 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 -inline void Foam::constAnIsoSolidTransport::operator+= +inline void Foam::constAnisoSolidTransport::operator+= ( - const constAnIsoSolidTransport& ct + const constAnisoSolidTransport& ct ) { scalar Y1 = this->Y(); @@ -113,13 +113,13 @@ inline void Foam::constAnIsoSolidTransport::operator+= template -inline Foam::constAnIsoSolidTransport Foam::operator* +inline Foam::constAnisoSolidTransport Foam::operator* ( const scalar s, - const constAnIsoSolidTransport& ct + const constAnisoSolidTransport& ct ) { - return constAnIsoSolidTransport + return constAnisoSolidTransport ( s*static_cast(ct), ct.kappa_ diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.C similarity index 100% rename from src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.C diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.H similarity index 100% rename from src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransport.H diff --git a/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransportI.H similarity index 100% rename from src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/constIso/constIsoSolidTransportI.H