From bfafc1d73b5484035fe4535d1759f293ad4e3354 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 9 Aug 2012 14:57:24 +0100 Subject: [PATCH] STYLE: consistent naming for cloud source fields --- .../clouds/Templates/KinematicCloud/KinematicCloud.C | 8 ++++---- .../clouds/Templates/KinematicCloud/KinematicCloudI.H | 6 +++--- .../clouds/Templates/ReactingCloud/ReactingCloud.C | 4 ++-- .../clouds/Templates/ReactingCloud/ReactingCloudI.H | 10 +++++----- .../clouds/Templates/ThermoCloud/ThermoCloudI.H | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index 3ca019fa4e..ef332fa673 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -346,7 +346,7 @@ Foam::KinematicCloud::KinematicCloud ( IOobject ( - this->name() + "UTrans", + this->name() + "::UTrans", this->db().time().timeName(), this->db(), IOobject::READ_IF_PRESENT, @@ -362,7 +362,7 @@ Foam::KinematicCloud::KinematicCloud ( IOobject ( - this->name() + "UCoeff", + this->name() + "::UCoeff", this->db().time().timeName(), this->db(), IOobject::READ_IF_PRESENT, @@ -426,7 +426,7 @@ Foam::KinematicCloud::KinematicCloud ( IOobject ( - this->name() + "UTrans", + this->name() + "::UTrans", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -442,7 +442,7 @@ Foam::KinematicCloud::KinematicCloud ( IOobject ( - name + "UCoeff", + name + "::UCoeff", this->db().time().timeName(), this->db(), IOobject::NO_READ, diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 106ff158a7..a6bdf47cc4 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -539,7 +539,7 @@ Foam::KinematicCloud::theta() const ( IOobject ( - this->name() + "Theta", + this->name() + "::theta", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -578,7 +578,7 @@ Foam::KinematicCloud::alpha() const ( IOobject ( - this->name() + "Alpha", + this->name() + "::alpha", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -615,7 +615,7 @@ Foam::KinematicCloud::rhoEff() const ( IOobject ( - this->name() + "RhoEff", + this->name() + "::rhoEff", this->db().time().timeName(), this->db(), IOobject::NO_READ, diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 0f98e8b935..1bc817a4c1 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -132,7 +132,7 @@ Foam::ReactingCloud::ReactingCloud ( IOobject ( - this->name() + "rhoTrans_" + specieName, + this->name() + "::rhoTrans_" + specieName, this->db().time().timeName(), this->db(), IOobject::READ_IF_PRESENT, @@ -176,7 +176,7 @@ Foam::ReactingCloud::ReactingCloud ( IOobject ( - this->name() + "rhoTrans_" + specieName, + this->name() + "::rhoTrans_" + specieName, this->db().time().timeName(), this->db(), IOobject::NO_READ, diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H index 2a9bbb2423..66cb73b85f 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ inline Foam::tmp Foam::ReactingCloud::SYi ( IOobject ( - this->name() + "rhoTrans", + this->name() + "::rhoTrans", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -155,7 +155,7 @@ Foam::ReactingCloud::Srho(const label i) const ( IOobject ( - this->name() + "rhoTrans", + this->name() + "::rhoTrans", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -192,7 +192,7 @@ Foam::ReactingCloud::Srho() const ( IOobject ( - this->name() + "rhoTrans", + this->name() + "::rhoTrans", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -236,7 +236,7 @@ Foam::ReactingCloud::Srho(volScalarField& rho) const ( IOobject ( - this->name() + "rhoTrans", + this->name() + "::rhoTrans", this->db().time().timeName(), this->db(), IOobject::NO_READ, diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index 764595fece..a75f1f64d8 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -278,7 +278,7 @@ inline Foam::tmp Foam::ThermoCloud::Ep() const ( IOobject ( - this->name() + "radiation::Ep", + this->name() + "::radiation::Ep", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -314,7 +314,7 @@ inline Foam::tmp Foam::ThermoCloud::ap() const ( IOobject ( - this->name() + "radiation::ap", + this->name() + "::radiation::ap", this->db().time().timeName(), this->db(), IOobject::NO_READ, @@ -351,7 +351,7 @@ Foam::ThermoCloud::sigmap() const ( IOobject ( - this->name() + "radiation::sigmap", + this->name() + "::radiation::sigmap", this->db().time().timeName(), this->db(), IOobject::NO_READ,