From 872f78f0363a2cb5e0c9e1711abbde7b1e4857ca Mon Sep 17 00:00:00 2001 From: Sergio Ferraris Date: Fri, 21 Feb 2014 10:39:57 +0000 Subject: [PATCH 1/4] BUG: Removing duplicated entry in turbulentTemperatureRadCoupledMixedFvPatchScalarField --- .../turbulentTemperatureRadCoupledMixedFvPatchScalarField.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C index 2e683187..91282106 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C @@ -277,7 +277,6 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::write os.writeKeyword("Tnbr")<< TnbrName_ << token::END_STATEMENT << nl; os.writeKeyword("QrNbr")<< QrNbrName_ << token::END_STATEMENT << nl; os.writeKeyword("Qr")<< QrName_ << token::END_STATEMENT << nl; - os.writeKeyword("Qr")<< QrName_ << token::END_STATEMENT << nl; thicknessLayers_.writeEntry("thicknessLayers", os); thicknessLayers_.writeEntry("kappaLayers", os); From ed7c86f87cf4c29ebaadeed148b98950b0d47ed9 Mon Sep 17 00:00:00 2001 From: Sergio Ferraris Date: Fri, 21 Feb 2014 11:03:15 +0000 Subject: [PATCH 2/4] ENH: Adding PengRobinsonGas real gas Eq of State --- .../basic/psiThermo/psiThermos.C | 41 ++- .../basic/rhoThermo/rhoThermos.C | 38 ++- .../PengRobinsonGas/PengRobinsonGas.C | 164 ++++++++++++ .../PengRobinsonGas/PengRobinsonGas.H | 240 ++++++++++++++++++ .../PengRobinsonGas/PengRobinsonGasI.H | 239 +++++++++++++++++ 5 files changed, 720 insertions(+), 2 deletions(-) create mode 100644 src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C create mode 100644 src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H create mode 100644 src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermos.C b/src/thermophysicalModels/basic/psiThermo/psiThermos.C index add4c88c..c5f8e390 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermos.C +++ b/src/thermophysicalModels/basic/psiThermo/psiThermos.C @@ -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-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,6 +28,7 @@ License #include "specie.H" #include "perfectGas.H" +#include "PengRobinsonGas.H" #include "hConstThermo.H" #include "eConstThermo.H" #include "janafThermo.H" @@ -38,6 +39,9 @@ License #include "constTransport.H" #include "sutherlandTransport.H" +#include "hPolynomialThermo.H" +#include "polynomialTransport.H" + #include "hePsiThermo.H" #include "pureMixture.H" @@ -84,6 +88,41 @@ makeThermo specie ); +makeThermo +( + psiThermo, + hePsiThermo, + pureMixture, + sutherlandTransport, + sensibleEnthalpy, + hConstThermo, + PengRobinsonGas, + specie +); + +makeThermo +( + psiThermo, + hePsiThermo, + pureMixture, + polynomialTransport, + sensibleEnthalpy, + hPolynomialThermo, + PengRobinsonGas, + specie +); + +makeThermo +( + psiThermo, + hePsiThermo, + pureMixture, + polynomialTransport, + sensibleEnthalpy, + janafThermo, + PengRobinsonGas, + specie +); /* * * * * * * * * * * * * * Internal-energy-based * * * * * * * * * * * * * */ diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C index beaa43b7..9d91fdee 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C @@ -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-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,6 +31,7 @@ License #include "incompressiblePerfectGas.H" #include "rhoConst.H" #include "perfectFluid.H" +#include "PengRobinsonGas.H" #include "hConstThermo.H" #include "janafThermo.H" #include "sensibleEnthalpy.H" @@ -162,6 +163,41 @@ makeThermo specie ); +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + sutherlandTransport, + sensibleEnthalpy, + hConstThermo, + PengRobinsonGas, + specie +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + polynomialTransport, + sensibleEnthalpy, + hPolynomialThermo, + PengRobinsonGas, + specie +); + +makeThermo +( + rhoThermo, + heRhoThermo, + pureMixture, + polynomialTransport, + sensibleEnthalpy, + janafThermo, + PengRobinsonGas, + specie +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C new file mode 100644 index 00000000..68b3d0ec --- /dev/null +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C @@ -0,0 +1,164 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Description + Perfect gas equation of state. + +\*---------------------------------------------------------------------------*/ + +#include "PengRobinsonGas.H" +#include "IOstreams.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +PengRobinsonGas::PengRobinsonGas(Istream& is) +: + Specie(is), + Tc_(readScalar(is)), + Pc_(readScalar(is)), + omega_(readScalar(is)) +{ + is.check("PengRobinsonGas::PengRobinsonGas(Istream& is)"); +} + + +template +Foam::PengRobinsonGas::PengRobinsonGas +( + const dictionary& dict +) +: + Specie(dict), + Tc_(readScalar(dict.subDict("equationOfState").lookup("Tc"))), + Pc_(readScalar(dict.subDict("equationOfState").lookup("Pc"))), + omega_(readScalar(dict.subDict("equationOfState").lookup("omega"))) +{} + + +// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // + +template +PengRobinsonGas operator+ +( + const PengRobinsonGas& pg1, + const PengRobinsonGas& pg2 +) +{ + scalar nMoles = pg1.nMoles() + pg2.nMoles(); + scalar molr1 = pg1.nMoles()/nMoles; + scalar molr2 = pg2.nMoles()/nMoles; + + return PengRobinsonGas + ( + static_cast(pg1) + + static_cast(pg2), + molr1*pg1.Tc_ + molr2*pg2.Tc_, + molr1*pg1.Pc_ + molr2*pg2.Pc_, + molr1*pg1.omega_ + molr2*pg2.omega_ + ); +} + + +template +PengRobinsonGas operator- +( + const PengRobinsonGas& pg1, + const PengRobinsonGas& pg2 +) +{ + scalar nMoles = pg1.nMoles() + pg2.nMoles(); + scalar molr1 = pg1.nMoles()/nMoles; + scalar molr2 = pg2.nMoles()/nMoles; + + return PengRobinsonGas + ( + static_cast(pg1) + - static_cast(pg2), + molr1*pg1.Tc_ - molr2*pg2.Tc_, + molr1*pg1.Pc_ - molr2*pg2.Pc_, + molr1*pg1.omega_ - molr2*pg2.omega_ + ); +} + + +template +PengRobinsonGas operator* +( + const scalar s, + const PengRobinsonGas& pg +) +{ + return PengRobinsonGas + ( + s*static_cast(pg), + pg.Tc_, + pg.Pc_, + pg.omega_ + ); +} + + +template +PengRobinsonGas operator== +( + const PengRobinsonGas& pg1, + const PengRobinsonGas& pg2 +) +{ + return pg2 - pg1; +} + +// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // + +template +Ostream& operator<< +( + Ostream& os, + const PengRobinsonGas& pg +) +{ + os << static_cast(pg) + << token::SPACE << pg.Tc_ + << token::SPACE << pg.Pc_ + << token::SPACE << pg.omega_; + + os.check + ( + "Ostream& operator<<(Ostream& os, const PengRobinsonGas& st)" + ); + return os; +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H new file mode 100644 index 00000000..926b308b --- /dev/null +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H @@ -0,0 +1,240 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::PengRobinsonGas + +Description + PengRobinsonGas gas equation of state. + +SourceFiles + PengRobinsonGasI.H + PengRobinsonGas.C + +\*---------------------------------------------------------------------------*/ + +#ifndef PengRobinsonGas_H +#define PengRobinsonGas_H + +#include "autoPtr.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of friend functions and operators + +template class PengRobinsonGas; + +template +inline PengRobinsonGas operator+ +( + const PengRobinsonGas&, + const PengRobinsonGas& +); + +template +inline PengRobinsonGas operator- +( + const PengRobinsonGas&, + const PengRobinsonGas& +); + +template +inline PengRobinsonGas operator* +( + const scalar, + const PengRobinsonGas& +); + +template +inline PengRobinsonGas operator== +( + const PengRobinsonGas&, + const PengRobinsonGas& +); + +template +Ostream& operator<< +( + Ostream&, + const PengRobinsonGas& +); + + + +/*---------------------------------------------------------------------------*\ + Class PengRobinsonGas Declaration +\*---------------------------------------------------------------------------*/ + +template +class PengRobinsonGas +: + public Specie +{ +private: + // Private data + + //- Critical Temperature [K] + scalar Tc_; + + //- Critical Pressure [Pa] + scalar Pc_; + + //- Accentric factor [-] + scalar omega_; + + +public: + + // Constructors + + //- Construct from components + inline PengRobinsonGas + ( + const Specie& sp, + const scalar& Tc, + const scalar& Pc, + const scalar& omega + ); + + //- Construct from Istream + PengRobinsonGas(Istream&); + + //- Construct from dictionary + PengRobinsonGas(const dictionary& dict); + + //- Construct as named copy + inline PengRobinsonGas(const word& name, const PengRobinsonGas&); + + //- Construct and return a clone + inline autoPtr clone() const; + + // Selector from Istream + inline static autoPtr New(Istream& is); + + // Selector from dictionary + inline static autoPtr New + ( + const dictionary& dict + ); + + + // Member functions + + //- Return the instantiated type name + static word typeName() + { + return "PengRobinsonGas<" + word(Specie::typeName_()) + '>'; + } + + // Fundamental properties + + + //- Is the equation of state is incompressible i.e. rho != f(p) + static const bool incompressible = false; + + //- Is the equation of state is isochoric i.e. rho = const + static const bool isochoric = false; + + //- Return density [kg/m^3] + inline scalar rho(scalar p, scalar T) const; + + //- Return compressibility rho/p [s^2/m^2] + inline scalar psi(scalar p, scalar T) const; + + //- Return compression factor [] + inline scalar Z(scalar p, scalar T) const; + + //- Return (cp - cv) [J/(kmol K] + inline scalar cpMcv(scalar p, scalar T) const; + + + // IO + + //- Write to Ostream + void write(Ostream& os) const; + + // Member operators + + inline void operator+=(const PengRobinsonGas&); + inline void operator-=(const PengRobinsonGas&); + + inline void operator*=(const scalar); + + + // Friend operators + + friend PengRobinsonGas operator+ + ( + const PengRobinsonGas&, + const PengRobinsonGas& + ); + + friend PengRobinsonGas operator- + ( + const PengRobinsonGas&, + const PengRobinsonGas& + ); + + friend PengRobinsonGas operator* + ( + const scalar s, + const PengRobinsonGas& + ); + + friend PengRobinsonGas operator== + ( + const PengRobinsonGas&, + const PengRobinsonGas& + ); + + + // Ostream Operator + + friend Ostream& operator<< + ( + Ostream&, + const PengRobinsonGas& + ); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "PengRobinsonGasI.H" + +#ifdef NoRepository +# include "PengRobinsonGas.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H new file mode 100644 index 00000000..55ac419c --- /dev/null +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H @@ -0,0 +1,239 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + + +\*---------------------------------------------------------------------------*/ + +#include "PengRobinsonGas.H" +#include "mathematicalConstants.H" + +namespace Foam +{ + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +inline PengRobinsonGas::PengRobinsonGas +( + const Specie& sp, + const scalar& Tc, + const scalar& Pc, + const scalar& omega +) +: + Specie(sp), + Tc_(Tc), + Pc_(Pc), + omega_(omega) +{} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +inline PengRobinsonGas::PengRobinsonGas +( + const word& name, + const PengRobinsonGas& pg +) +: + Specie(name, pg), + Tc_(pg.Tc), + Pc_(pg.Pc), + omega_(pg.omega) +{} + + +template +inline autoPtr > PengRobinsonGas::clone() const +{ + return autoPtr > + ( + new PengRobinsonGas(*this) + ); +} + + +template +inline autoPtr > PengRobinsonGas::New +( + Istream& is +) +{ + return autoPtr >(new PengRobinsonGas(is)); +} + + +template +inline Foam::autoPtr > +Foam::PengRobinsonGas::New +( + const dictionary& dict +) +{ + return autoPtr > + ( + new PengRobinsonGas(dict) + ); +} + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +inline scalar PengRobinsonGas::rho(scalar p, scalar T) const +{ + scalar z = Z(p, T); + return p/(z*this->R()*T); +} + + +template +inline scalar PengRobinsonGas::psi(scalar p, scalar T) const +{ + scalar z = Z(p, T); + return 1.0/(z*this->R()*T); +} + + +template +inline scalar PengRobinsonGas::Z(scalar p, scalar T) const +{ + scalar a = 0.45724*sqr(this->R())*sqr(Tc_)/Pc_; + scalar b = 0.07780*this->R()*Tc_/Pc_; + scalar Tr = T/Tc_; + + scalar alpha = + sqr + ( + 1.0 + + (0.37464 + 1.54226*omega_- 0.26992*sqr(omega_)) + * (1.0 - sqrt(Tr)) + ); + + scalar B = b*p/(this->R()*T); + scalar A = a*alpha*p/sqr(this->R()*T); + + scalar a2 = B - 1.0; + scalar a1 = A - 2.0*B - 3.0*sqr(B); + scalar a0 = -A*B + sqr(B) + pow3(B); + + scalar Q = (3.0*a1 - a2*a2)/9.0; + scalar Rl = (9.0*a2*a1 - 27.0*a0 - 2.0*a2*a2*a2)/54; + + scalar Q3 = Q*Q*Q; + scalar D = Q3 + Rl*Rl; + + scalar root = -1.0; + + if (D <= 0.0) + { + scalar th = ::acos(Rl/sqrt(-Q3)); + scalar qm = 2.0*sqrt(-Q); + scalar r1 = qm*cos(th/3.0) - a2/3.0; + scalar r2 = qm*cos((th + 2.0*constant::mathematical::pi)/3.0) - a2/3.0; + scalar r3 = qm*cos((th + 4.0*constant::mathematical::pi)/3.0) - a2/3.0; + + root = max(r1, max(r2, r3)); + } + else + { + // one root is real + scalar D05 = sqrt(D); + scalar S = pow(Rl + D05, 1.0/3.0); + scalar Tl = 0; + if (D05 > Rl) + { + Tl = -pow(mag(Rl - D05), 1.0/3.0); + } + else + { + Tl = pow(Rl - D05, 1.0/3.0); + } + + root = S + Tl - a2/3.0; + } + + return root; +} + + +template +inline Foam::scalar Foam::PengRobinsonGas::cpMcv +( + scalar p, + scalar T +) const +{ + return this->RR*Z(p, T); +} + + +// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // + +template +inline void PengRobinsonGas::operator+= +( + const PengRobinsonGas& pg +) +{ + scalar molr1 = this->nMoles(); + Specie::operator+=(pg); + + molr1 /= this->nMoles(); + scalar molr2 = pg.nMoles()/this->nMoles(); + + Tc_ = molr1*Tc_ + molr2*pg.Tc_; + Pc_ = molr1*Pc_ + molr2*pg.Pc_; + omega_ = molr1*omega_ + molr2*pg.omega_; +} + +template +inline void PengRobinsonGas::operator-= +( + const PengRobinsonGas& pg +) +{ + scalar molr1 = this->nMoles(); + + Specie::operator-=(pg); + + molr1 /= this->nMoles(); + scalar molr2 = pg.nMoles()/this->nMoles(); + + Tc_ = molr1*Tc_ - molr2*pg.Tc_; + Pc_ = molr1*Pc_ - molr2*pg.Pc_; + omega_ = molr1*omega_ - molr2*pg.omega_; +} + +template +inline void PengRobinsonGas::operator*=(const scalar s) +{ + Specie::operator*=(s); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // From 97cf0c03179cf58765f40dfb2ccfd82d82d666f1 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 21 Feb 2014 11:17:31 +0000 Subject: [PATCH 3/4] STYLE: Updated copyright year --- .../postProcessing/dataConversion/foamToEnsight/ensightMesh.C | 2 +- .../CloudFunctionObjectList/CloudFunctionObjectList.C | 2 +- .../CloudFunctionObjectList/CloudFunctionObjectList.H | 2 +- .../submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C | 2 +- .../submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H | 2 +- .../submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C | 2 +- .../submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H | 2 +- .../makeBasicKinematicCollidingParcelSubmodels.C | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C index bae7d395..64ce70b6 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C index 1b1b579d..84d2c7d4 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H index 86ea9779..9448d255 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C index 1e02c0c3..b26d7766 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H index 588ffd40..fc03b0c9 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C index e8c628ba..7314d531 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H index a24ac9fb..a5fb8726 100644 --- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H +++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/VoidFraction/VoidFraction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C index cf78c33c..c0d2f76c 100644 --- a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C +++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License From 68c52a8adb6b4668434e01a22084c5e93146763e Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 21 Feb 2014 11:33:40 +0000 Subject: [PATCH 4/4] STY: change date copyright --- .../functionObjects/IO/partialWrite/partialWrite.C | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C index 5325f246..cb3cfc7d 100644 --- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C +++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,15 +70,12 @@ void Foam::partialWrite::read(const dictionary& dict) writeInstance_ = 0; Info<< type() << " " << name() << ":" << nl - << " dumping every outputTime :"; + << " dumping every " << writeInterval_ + << " th outputTime : " << nl << endl ; forAllConstIter(HashSet, objectNames_, iter) { Info<< ' ' << iter.key(); } - Info<< nl - << " dumping all other fields every " - << writeInterval_ << "th outputTime" << nl - << endl; if (writeInterval_ < 1) {