From ce79182495961cb9b25fa84be57cf402f945bb81 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 14 Jul 2009 21:11:36 +0100
Subject: [PATCH] Minor reformatting.
---
.../fieldAverage/fieldAverageTemplates.C | 49 ++++++++++---------
.../fixedEnthalpyFvPatchScalarField.C | 5 +-
2 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
index a69dce41b7d..4e59e8a30bc 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
@@ -63,22 +63,23 @@ void Foam::fieldAverage::addMeanField
const fieldType& baseField =
obr_.lookupObject<fieldType>(fieldName);
- fieldType* fPtr = new fieldType
+ // Store on registry
+ obr_.store
(
- IOobject
+ new fieldType
(
- meanFieldName,
- obr_.time().timeName(),
- obr_,
- IOobject::READ_IF_PRESENT,
- IOobject::NO_WRITE
- ),
- baseField
+ IOobject
+ (
+ meanFieldName,
+ obr_.time().timeName(),
+ obr_,
+ IOobject::READ_IF_PRESENT,
+ IOobject::NO_WRITE
+ ),
+ 1*baseField
+ )
);
- // Store on registry
- fPtr->store();
-
meanFieldList[fieldI] = meanFieldName;
}
}
@@ -121,22 +122,22 @@ void Foam::fieldAverage::addPrime2MeanField
const fieldType1& meanField =
obr_.lookupObject<fieldType1>(meanFieldList[fieldI]);
- fieldType2* fPtr = new fieldType2
+ obr_.store
(
- IOobject
+ new fieldType2
(
- meanFieldName,
- obr_.time().timeName(),
- obr_,
- IOobject::READ_IF_PRESENT,
- IOobject::NO_WRITE
- ),
- sqr(baseField) - sqr(meanField)
+ IOobject
+ (
+ meanFieldName,
+ obr_.time().timeName(),
+ obr_,
+ IOobject::READ_IF_PRESENT,
+ IOobject::NO_WRITE
+ ),
+ sqr(baseField) - sqr(meanField)
+ )
);
- // Store on registry
- fPtr->store();
-
prime2MeanFieldList[fieldI] = meanFieldName;
}
}
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
index e409d243c8e..19e345abe0b 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
@@ -102,12 +102,13 @@ void fixedEnthalpyFvPatchScalarField::updateCoeffs()
(
"thermophysicalProperties"
);
-
+
const label patchi = patch().index();
- fvPatchScalarField& Tw =
+ fvPatchScalarField& Tw =
const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
Tw.evaluate();
+
operator==(thermo.h(Tw, patchi));
fixedValueFvPatchScalarField::updateCoeffs();
--
GitLab