From f2a13e6d7dc9f7d96513c55d7da1be3e342d6e1d Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 2 Jun 2008 19:27:48 +0100 Subject: [PATCH] general cleaning up for warning messages generated by gcc 4.3.0 --- .../Templates/KinematicCloud/KinematicCloud.H | 14 +++--- .../KinematicCloud/KinematicCloudI.H | 14 +++--- .../Templates/ThermoCloud/ThermoCloud.H | 2 +- .../Templates/ThermoCloud/ThermoCloudI.H | 2 +- .../KinematicParcel/KinematicParcel.H | 14 +++--- .../KinematicParcel/KinematicParcelI.H | 14 +++--- .../Templates/ReactingParcel/ReactingParcel.H | 12 +++-- .../ReactingParcel/ReactingParcelI.H | 6 +-- .../Templates/ThermoParcel/ThermoParcel.H | 21 +++++--- .../Templates/ThermoParcel/ThermoParcelI.H | 12 ++--- .../Kinematic/DragModel/DragModel/DragModel.C | 2 +- .../Kinematic/DragModel/DragModel/DragModel.H | 2 +- .../InjectionModel/InjectionModel.C | 10 ++-- .../InjectionModel/InjectionModel.H | 10 ++-- .../CompositionModel/CompositionModel.H | 10 ++-- .../SingleMixtureFraction.C | 49 ++++++++++--------- .../SingleMixtureFraction.H | 16 +++--- 17 files changed, 113 insertions(+), 97 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index f4a9dc2419..f29e8eb455 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -298,7 +298,7 @@ public: inline const word& cloudType() const; //- Return the parcel type id - inline const label parcelTypeId() const; + inline label parcelTypeId() const; //- Return refernce to the mesh inline const fvMesh& mesh() const; @@ -316,10 +316,10 @@ public: inline Random& rndGen(); //- Return the start of injection interval time - inline const scalar time0() const; + inline scalar time0() const; //- Return a reference to the mass of particles to introduce - inline const scalar massTotal() const; + inline scalar massTotal() const; // References to the carrier gas fields @@ -398,10 +398,10 @@ public: // Check //- Total mass injected - inline const scalar massInjected() const; + inline scalar massInjected() const; //- Total mass in system - inline const scalar massInSystem() const; + inline scalar massInSystem() const; //- Print cloud information void info() const; @@ -413,10 +413,10 @@ public: // Counters //- Return the number of injections - inline const label nInjections() const; + inline label nInjections() const; //- Return the total number parcels added - inline const label nParcelsAddedTotal() const; + inline label nParcelsAddedTotal() const; // Fields diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 9acc55a562..b09c4d0e87 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -34,7 +34,7 @@ inline const Foam::word& Foam::KinematicCloud::cloudType() const template -inline const Foam::label Foam::KinematicCloud::parcelTypeId() const +inline Foam::label Foam::KinematicCloud::parcelTypeId() const { return parcelTypeId_; } @@ -164,42 +164,42 @@ Foam::KinematicCloud::UIntegrator() const template -inline const Foam::label Foam::KinematicCloud::nInjections() const +inline Foam::label Foam::KinematicCloud::nInjections() const { return nInjections_; } template -inline const Foam::label Foam::KinematicCloud::nParcelsAddedTotal() const +inline Foam::label Foam::KinematicCloud::nParcelsAddedTotal() const { return nParcelsAddedTotal_; } template -inline const Foam::scalar Foam::KinematicCloud::time0() const +inline Foam::scalar Foam::KinematicCloud::time0() const { return time0_; } template -inline const Foam::scalar Foam::KinematicCloud::massTotal() const +inline Foam::scalar Foam::KinematicCloud::massTotal() const { return massTotal_; } template -inline const Foam::scalar Foam::KinematicCloud::massInjected() const +inline Foam::scalar Foam::KinematicCloud::massInjected() const { return massInjected_; } template -inline const Foam::scalar Foam::KinematicCloud::massInSystem() const +inline Foam::scalar Foam::KinematicCloud::massInSystem() const { scalar sysMass = 0.0; forAllConstIter(typename KinematicCloud, *this, iter) diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H index 98a2e496a6..df587f6bb3 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H @@ -175,7 +175,7 @@ public: // Modelling options //- Radiation flag - inline const bool radiation() const; + inline bool radiation() const; // Sources diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index cb8321c37e..be93f689b5 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -61,7 +61,7 @@ Foam::ThermoCloud::TIntegrator() const template -inline const bool Foam::ThermoCloud::radiation() const +inline bool Foam::ThermoCloud::radiation() const { return radiation_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 3c21589622..9d3bd2e513 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -101,10 +101,10 @@ public: // Member functions //- Return const access to the particle density - inline const scalar rho0() const; + inline scalar rho0() const; //- Return const access to the minimum particle mass - inline const scalar minParticleMass() const; + inline scalar minParticleMass() const; }; @@ -275,10 +275,10 @@ public: // Access //- Return type id - inline const label typeId() const; + inline label typeId() const; //- Return const access to diameter - inline const scalar d() const; + inline scalar d() const; //- Return const access to velocity inline const vector& U() const; @@ -287,13 +287,13 @@ public: inline const vector& Ur() const; //- Return const access to number of particles - inline const scalar nParticle() const; + inline scalar nParticle() const; //- Return const access to density - inline const scalar rho() const; + inline scalar rho() const; //- Return const access to time spent in turbulent eddy - inline const scalar tTurb() const; + inline scalar tTurb() const; //- Return const access to turbulent velocity fluctuation inline const vector& UTurb() const; diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H index daecf8d405..7952f4edc8 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H @@ -88,7 +88,7 @@ inline Foam::KinematicParcel::KinematicParcel // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * // template -inline const Foam::scalar +inline Foam::scalar Foam::KinematicParcel::constantProperties::rho0() const { return rho0_; @@ -96,7 +96,7 @@ Foam::KinematicParcel::constantProperties::rho0() const template -inline const Foam::scalar +inline Foam::scalar Foam::KinematicParcel::constantProperties::minParticleMass() const { return minParticleMass_; @@ -156,14 +156,14 @@ Foam::KinematicParcel::trackData::g() const // * * * * * * * * * * KinematicParcel Member Functions * * * * * * * * * * // template -inline const Foam::label Foam::KinematicParcel::typeId() const +inline Foam::label Foam::KinematicParcel::typeId() const { return typeId_; } template -inline const Foam::scalar Foam::KinematicParcel::d() const +inline Foam::scalar Foam::KinematicParcel::d() const { return d_; } @@ -216,7 +216,7 @@ inline Foam::vector& Foam::KinematicParcel::U() template -inline const Foam::scalar Foam::KinematicParcel::nParticle() const +inline Foam::scalar Foam::KinematicParcel::nParticle() const { return nParticle_; } @@ -230,7 +230,7 @@ inline Foam::scalar& Foam::KinematicParcel::nParticle() template -inline const Foam::scalar Foam::KinematicParcel::rho() const +inline Foam::scalar Foam::KinematicParcel::rho() const { return rho_; } @@ -244,7 +244,7 @@ inline Foam::scalar& Foam::KinematicParcel::rho() template -inline const Foam::scalar Foam::KinematicParcel::tTurb() const +inline Foam::scalar Foam::KinematicParcel::tTurb() const { return tTurb_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index cc1348e7e4..8a8d7c6d50 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -95,11 +95,13 @@ public: //- Constructor constantProperties(const dictionary& dict); - //- Return const access to the vapourisation temperature - inline const scalar Tvap() const; + // Access - //- Return const access to the boiling point - inline const scalar Tbp() const; + //- Return const access to the vapourisation temperature + inline scalar Tvap() const; + + //- Return const access to the boiling point + inline scalar Tbp() const; }; @@ -272,7 +274,7 @@ public: inline const scalarField& YMixture() const; //- Return const access to initial mass - inline const scalar mass0() const; + inline scalar mass0() const; // Edit diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index a29906a815..3e3f83b1a0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -112,7 +112,7 @@ inline Foam::ReactingParcel::ReactingParcel // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * // template -inline const Foam::scalar +inline Foam::scalar Foam::ReactingParcel::constantProperties::Tvap() const { return Tvap_; @@ -120,7 +120,7 @@ Foam::ReactingParcel::constantProperties::Tvap() const template -inline const Foam::scalar +inline Foam::scalar Foam::ReactingParcel::constantProperties::Tbp() const { return Tbp_; @@ -212,7 +212,7 @@ inline Foam::scalarField& Foam::ReactingParcel::YMixture() template -inline const Foam::scalar Foam::ReactingParcel::mass0() const +inline Foam::scalar Foam::ReactingParcel::mass0() const { return mass0_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index 2be7e9547b..7b55bb98c7 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -105,10 +105,19 @@ public: // Access - inline const scalar T0() const; - inline const scalar cp0() const; - inline const scalar epsilon0() const; - inline const scalar f0() const; + //- Return const access to particle initial temperature [K] + inline scalar T0() const; + + //- Return const access to particle specific heat capacity + // [J/(kg.K)] + inline scalar cp0() const; + + //- Return const access to Particle emissivity [] (radiation) + inline scalar epsilon0() const; + + //- Return const access to Particle scattering factor [] + // (radiation) + inline scalar f0() const; }; @@ -250,10 +259,10 @@ public: // Access //- Return const access to temperature - inline const scalar T() const; + inline scalar T() const; //- Return const access to specific heat capacity - inline const scalar cp() const; + inline scalar cp() const; // Edit diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index e2621bda8d..acedf0ae1a 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -103,7 +103,7 @@ inline Foam::ThermoParcel::ThermoParcel // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * // template -inline const Foam::scalar +inline Foam::scalar Foam::ThermoParcel::constantProperties::T0() const { return T0_; @@ -111,7 +111,7 @@ Foam::ThermoParcel::constantProperties::T0() const template -inline const Foam::scalar +inline Foam::scalar Foam::ThermoParcel::constantProperties::cp0() const { return cp0_; @@ -119,7 +119,7 @@ Foam::ThermoParcel::constantProperties::cp0() const template -inline const Foam::scalar +inline Foam::scalar Foam::ThermoParcel::constantProperties::epsilon0() const { return epsilon0_; @@ -127,7 +127,7 @@ Foam::ThermoParcel::constantProperties::epsilon0() const template -inline const Foam::scalar +inline Foam::scalar Foam::ThermoParcel::constantProperties::f0() const { return f0_; @@ -171,7 +171,7 @@ Foam::ThermoParcel::trackData::cpInterp() const // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * // template -inline const Foam::scalar Foam::ThermoParcel::T() const +inline Foam::scalar Foam::ThermoParcel::T() const { return T_; } @@ -185,7 +185,7 @@ inline Foam::scalar& Foam::ThermoParcel::T() template -inline const Foam::scalar Foam::ThermoParcel::cp() const +inline Foam::scalar Foam::ThermoParcel::cp() const { return cp_; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C index b2926abe39..f8ce8fe669 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C @@ -63,7 +63,7 @@ const Foam::dictionary& Foam::DragModel::dict() const template -const Foam::scalar Foam::DragModel::Cu +Foam::scalar Foam::DragModel::Cu ( const vector& Ur, const scalar d, diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H index 87ef306240..d7e89bac3c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H @@ -126,7 +126,7 @@ public: //- Return linearised coefficient for velocity equation // Drag force per unit particle mass = Cu(U - Up) - const scalar Cu + scalar Cu ( const vector& Ur, const scalar d, diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 254d85a7fe..a288b191bd 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -84,35 +84,35 @@ const Foam::dictionary& Foam::InjectionModel::coeffDict() const template -const Foam::scalar Foam::InjectionModel::timeStart() const +Foam::scalar Foam::InjectionModel::timeStart() const { return SOI_; } template -const Foam::scalar Foam::InjectionModel::volumeTotal() const +Foam::scalar Foam::InjectionModel::volumeTotal() const { return volumeTotal_; } template -const Foam::label Foam::InjectionModel::nParcels() const +Foam::label Foam::InjectionModel::nParcels() const { return nParcels_; } template -const Foam::scalar Foam::InjectionModel::volume() const +Foam::scalar Foam::InjectionModel::volume() const { return volume_; } template -const Foam::scalar Foam::InjectionModel::volumeFraction() const +Foam::scalar Foam::InjectionModel::volumeFraction() const { return volume_/volumeTotal_; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H index 5a31b36d7c..e2acd52343 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H @@ -178,10 +178,10 @@ public: // Global information //- Return the start-of-injection time - const scalar timeStart() const; + scalar timeStart() const; //- Return the total volume to be injected across the event - const scalar volumeTotal() const; + scalar volumeTotal() const; //- Return the end-of-injection time virtual scalar timeEnd() const = 0; @@ -197,13 +197,13 @@ public: ); //- Return the number of parcels to introduce - const label nParcels() const; + label nParcels() const; //- Return the volume of parcels to introduce - const scalar volume() const; + scalar volume() const; //- Return the volume fraction to introduce - const scalar volumeFraction() const; + scalar volumeFraction() const; // Injection geometry diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H index ada5d2e380..7809ef9390 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H @@ -207,24 +207,24 @@ public: virtual const scalarField& YMixture0() const = 0; //- Return the gas constant for the gas mixture - virtual const scalar RGas(const scalarField& YGas) const = 0; + virtual scalar RGas(const scalarField& YGas) const = 0; //- Return enthalpy for the gas mixture - virtual const scalar HGas + virtual scalar HGas ( const scalarField& YGas, const scalar T ) const = 0; //- Return specific heat caparcity for the gas mixture - virtual const scalar cpGas + virtual scalar cpGas ( const scalarField& YGas, const scalar T ) const = 0; //- Return specific heat caparcity for the liquid mixture - virtual const scalar cpLiquid + virtual scalar cpLiquid ( const scalarField& YLiquid, const scalar p, @@ -232,7 +232,7 @@ public: ) const = 0; //- Return specific heat caparcity for the solid mixture - virtual const scalar cpSolid + virtual scalar cpSolid ( const scalarField& YSolid ) const = 0; diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C index 39bc2bf76b..a9bdbc01ad 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C @@ -307,8 +307,7 @@ Foam::SingleMixtureFraction::YGas0() const template -const Foam::scalar -Foam::SingleMixtureFraction::YGasTot0() const +Foam::scalar Foam::SingleMixtureFraction::YGasTot0() const { return YGasTot0_; } @@ -323,8 +322,10 @@ Foam::SingleMixtureFraction::liquidNames() const template -Foam::label -Foam::SingleMixtureFraction::liquidLocalId(const word& liquidName) const +Foam::label Foam::SingleMixtureFraction::liquidLocalId +( + const word& liquidName +) const { forAll(liquidNames_, i) { @@ -346,8 +347,10 @@ Foam::SingleMixtureFraction::liquidLocalId(const word& liquidName) co template -Foam::label -Foam::SingleMixtureFraction::liquidGlobalId(const word& liquidName) const +Foam::label Foam::SingleMixtureFraction::liquidGlobalId +( + const word& liquidName +) const { forAll(liquidNames_, i) { @@ -385,8 +388,7 @@ Foam::SingleMixtureFraction::YLiquid0() const template -const Foam::scalar -Foam::SingleMixtureFraction::YLiquidTot0() const +Foam::scalar Foam::SingleMixtureFraction::YLiquidTot0() const { return YLiquidTot0_; } @@ -401,8 +403,10 @@ Foam::SingleMixtureFraction::solidNames() const template -Foam::label -Foam::SingleMixtureFraction::solidLocalId(const word& solidName) const +Foam::label Foam::SingleMixtureFraction::solidLocalId +( + const word& solidName +) const { forAll(solidNames_, i) { @@ -425,7 +429,10 @@ Foam::SingleMixtureFraction::solidLocalId(const word& solidName) cons template Foam::label -Foam::SingleMixtureFraction::solidGlobalId(const word& solidName) const +Foam::SingleMixtureFraction::solidGlobalId +( + const word& solidName +) const { forAll(solidNames_, i) { @@ -463,7 +470,7 @@ Foam::SingleMixtureFraction::YSolid0() const template -const Foam::scalar +Foam::scalar Foam::SingleMixtureFraction::YSolidTot0() const { return YSolidTot0_; @@ -479,8 +486,10 @@ Foam::SingleMixtureFraction::YMixture0() const template -const Foam::scalar -Foam::SingleMixtureFraction::RGas(const scalarField& YGas) const +Foam::scalar Foam::SingleMixtureFraction::RGas +( + const scalarField& YGas +) const { scalar RGasMixture = 0.0; forAll(YGas, i) @@ -493,8 +502,7 @@ Foam::SingleMixtureFraction::RGas(const scalarField& YGas) const template -const Foam::scalar -Foam::SingleMixtureFraction::HGas +Foam::scalar Foam::SingleMixtureFraction::HGas ( const scalarField& YGas, const scalar T @@ -512,8 +520,7 @@ const template -const Foam::scalar -Foam::SingleMixtureFraction::cpGas +Foam::scalar Foam::SingleMixtureFraction::cpGas ( const scalarField& YGas, const scalar T @@ -531,8 +538,7 @@ const template -const Foam::scalar -Foam::SingleMixtureFraction::cpLiquid +Foam::scalar Foam::SingleMixtureFraction::cpLiquid ( const scalarField& YLiquid, const scalar p, @@ -552,8 +558,7 @@ const template -const Foam::scalar -Foam::SingleMixtureFraction::cpSolid +Foam::scalar Foam::SingleMixtureFraction::cpSolid ( const scalarField& YSolid ) diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H index 070e41e727..b25ffd61d3 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H @@ -156,7 +156,7 @@ public: const scalarField& YGas0() const; //- Return the total gas mass fraction - const scalar YGasTot0() const; + scalar YGasTot0() const; //- Return the list of liquid names const wordList& liquidNames() const; @@ -168,7 +168,7 @@ public: const scalarField& YLiquid0() const; //- Return the total liquid mass fraction - const scalar YLiquidTot0() const; + scalar YLiquidTot0() const; //- Return the list of solid names const wordList& solidNames() const; @@ -180,22 +180,22 @@ public: const scalarField& YSolid0() const; //- Return the total solid mass fraction - const scalar YSolidTot0() const; + scalar YSolidTot0() const; //- Return the list of mixture mass fractions const scalarField& YMixture0() const; //- Return the gas constant for the gas mixture - const scalar RGas(const scalarField& YGas) const; + scalar RGas(const scalarField& YGas) const; //- Return enthalpy for the gas mixture - const scalar HGas(const scalarField& YGas, const scalar T) const; + scalar HGas(const scalarField& YGas, const scalar T) const; //- Return specific heat caparcity for the gas mixture - const scalar cpGas(const scalarField& YGas, const scalar T) const; + scalar cpGas(const scalarField& YGas, const scalar T) const; //- Return specific heat caparcity for the liquid mixture - const scalar cpLiquid + scalar cpLiquid ( const scalarField& YLiquid, const scalar p, @@ -203,7 +203,7 @@ public: ) const; //- Return specific heat caparcity for the solid mixture - const scalar cpSolid(const scalarField& YSolid) const; + scalar cpSolid(const scalarField& YSolid) const; };