zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change field loop index from "fieldI" to "fieldi"

Browse Source
This commit is contained in:
Henry Weller
2016-05-02 18:20:48 +01:00
parent 0534a225fd
commit 32762aa1f9
67 changed files with 378 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
View File

@ -71,20 +71,20 @@ void Foam::functionObjects::fieldAverage::initialize()
Info<< type() << " " << name_ << ":" << nl;
// Add mean fields to the field lists
forAll(faItems_, fieldI)
forAll(faItems_, fieldi)
{
addMeanField<scalar>(fieldI);
addMeanField<vector>(fieldI);
addMeanField<sphericalTensor>(fieldI);
addMeanField<symmTensor>(fieldI);
addMeanField<tensor>(fieldI);
addMeanField<scalar>(fieldi);
addMeanField<vector>(fieldi);
addMeanField<sphericalTensor>(fieldi);
addMeanField<symmTensor>(fieldi);
addMeanField<tensor>(fieldi);
}
// Add prime-squared mean fields to the field lists
forAll(faItems_, fieldI)
forAll(faItems_, fieldi)
{
addPrime2MeanField<scalar, scalar>(fieldI);
addPrime2MeanField<vector, symmTensor>(fieldI);
addPrime2MeanField<scalar, scalar>(fieldi);
addPrime2MeanField<vector, symmTensor>(fieldi);
}
// ensure first averaging works unconditionally
@ -152,10 +152,10 @@ void Foam::functionObjects::fieldAverage::calcAverages()
calculatePrime2MeanFields<scalar, scalar>();
calculatePrime2MeanFields<vector, symmTensor>();
forAll(faItems_, fieldI)
forAll(faItems_, fieldi)
{
totalIter_[fieldI]++;
totalTime_[fieldI] += obr_.time().deltaTValue();
totalIter_[fieldi]++;
totalTime_[fieldi] += obr_.time().deltaTValue();
}
}
@ -188,12 +188,12 @@ void Foam::functionObjects::fieldAverage::writeAveragingProperties() const
)
);
forAll(faItems_, fieldI)
forAll(faItems_, fieldi)
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
propsDict.add(fieldName, dictionary());
propsDict.subDict(fieldName).add("totalIter", totalIter_[fieldI]);
propsDict.subDict(fieldName).add("totalTime", totalTime_[fieldI]);
propsDict.subDict(fieldName).add("totalIter", totalIter_[fieldi]);
propsDict.subDict(fieldName).add("totalTime", totalTime_[fieldi]);
}
propsDict.regIOobject::write();
@ -236,18 +236,18 @@ void Foam::functionObjects::fieldAverage::readAveragingProperties()
IOdictionary propsDict(propsDictHeader);
Info<< " Restarting averaging for fields:" << nl;
forAll(faItems_, fieldI)
forAll(faItems_, fieldi)
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
if (propsDict.found(fieldName))
{
dictionary fieldDict(propsDict.subDict(fieldName));
totalIter_[fieldI] = readLabel(fieldDict.lookup("totalIter"));
totalTime_[fieldI] = readScalar(fieldDict.lookup("totalTime"));
totalIter_[fieldi] = readLabel(fieldDict.lookup("totalIter"));
totalTime_[fieldi] = readScalar(fieldDict.lookup("totalTime"));
Info<< " " << fieldName
<< " iters = " << totalIter_[fieldI]
<< " time = " << totalTime_[fieldI] << nl;
<< " iters = " << totalIter_[fieldi]
<< " time = " << totalTime_[fieldi] << nl;
}
}
}

14
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
View File

@ -211,19 +211,19 @@ protected:
//- Add mean average field to database
template<class Type>
void addMeanFieldType(const label fieldI);
void addMeanFieldType(const label fieldi);
//- Add mean average field to database
template<class Type>
void addMeanField(const label fieldI);
void addMeanField(const label fieldi);
//- Add prime-squared average field to database
template<class Type1, class Type2>
void addPrime2MeanFieldType(const label fieldI);
void addPrime2MeanFieldType(const label fieldi);
//- Add prime-squared average field to database
template<class Type1, class Type2>
void addPrime2MeanField(const label fieldI);
void addPrime2MeanField(const label fieldi);
// Calculation functions
@ -233,7 +233,7 @@ protected:
//- Calculate mean average fields
template<class Type>
void calculateMeanFieldType(const label fieldI) const;
void calculateMeanFieldType(const label fieldi) const;
//- Calculate mean average fields
template<class Type>
@ -241,7 +241,7 @@ protected:
//- Calculate prime-squared average fields
template<class Type1, class Type2>
void calculatePrime2MeanFieldType(const label fieldI) const;
void calculatePrime2MeanFieldType(const label fieldi) const;
//- Calculate prime-squared average fields
template<class Type1, class Type2>
@ -249,7 +249,7 @@ protected:
//- Add mean-squared field value to prime-squared mean field
template<class Type1, class Type2>
void addMeanSqrToPrime2MeanType(const label fieldI) const;
void addMeanSqrToPrime2MeanType(const label fieldi) const;
//- Add mean-squared field value to prime-squared mean field
template<class Type1, class Type2>

82
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
View File

@ -31,10 +31,10 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
void Foam::functionObjects::fieldAverage::addMeanFieldType(const label fieldI)
void Foam::functionObjects::fieldAverage::addMeanFieldType(const label fieldi)
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& meanFieldName = faItems_[fieldI].meanFieldName();
const word& fieldName = faItems_[fieldi].fieldName();
const word& meanFieldName = faItems_[fieldi].meanFieldName();
Info<< " Reading/initialising field " << meanFieldName << endl;
@ -48,7 +48,7 @@ void Foam::functionObjects::fieldAverage::addMeanFieldType(const label fieldI)
<< " since an object with that name already exists."
<< " Disabling averaging for field." << endl;
faItems_[fieldI].mean() = false;
faItems_[fieldi].mean() = false;
}
else
{
@ -77,22 +77,22 @@ void Foam::functionObjects::fieldAverage::addMeanFieldType(const label fieldI)
template<class Type>
void Foam::functionObjects::fieldAverage::addMeanField(const label fieldI)
void Foam::functionObjects::fieldAverage::addMeanField(const label fieldi)
{
if (faItems_[fieldI].mean())
if (faItems_[fieldi].mean())
{
typedef GeometricField<Type, fvPatchField, volMesh> volFieldType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> surfFieldType;
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
if (obr_.foundObject<volFieldType>(fieldName))
{
addMeanFieldType<volFieldType>(fieldI);
addMeanFieldType<volFieldType>(fieldi);
}
else if (obr_.foundObject<surfFieldType>(fieldName))
{
addMeanFieldType<surfFieldType>(fieldI);
addMeanFieldType<surfFieldType>(fieldi);
}
}
}
@ -101,12 +101,12 @@ void Foam::functionObjects::fieldAverage::addMeanField(const label fieldI)
template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::addPrime2MeanFieldType
(
const label fieldI
const label fieldi
)
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& meanFieldName = faItems_[fieldI].meanFieldName();
const word& prime2MeanFieldName = faItems_[fieldI].prime2MeanFieldName();
const word& fieldName = faItems_[fieldi].fieldName();
const word& meanFieldName = faItems_[fieldi].meanFieldName();
const word& prime2MeanFieldName = faItems_[fieldi].prime2MeanFieldName();
Info<< " Reading/initialising field " << prime2MeanFieldName << nl;
@ -120,7 +120,7 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanFieldType
<< " since an object with that name already exists."
<< " Disabling averaging for field." << nl;
faItems_[fieldI].prime2Mean() = false;
faItems_[fieldi].prime2Mean() = false;
}
else
{
@ -150,7 +150,7 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanFieldType
template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldI)
void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldi)
{
typedef GeometricField<Type1, fvPatchField, volMesh> volFieldType1;
typedef GeometricField<Type1, fvsPatchField, surfaceMesh> surfFieldType1;
@ -158,11 +158,11 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldI)
typedef GeometricField<Type2, fvPatchField, volMesh> volFieldType2;
typedef GeometricField<Type2, fvsPatchField, surfaceMesh> surfFieldType2;
if (faItems_[fieldI].prime2Mean())
if (faItems_[fieldi].prime2Mean())
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
if (!faItems_[fieldI].mean())
if (!faItems_[fieldi].mean())
{
FatalErrorInFunction
<< "To calculate the prime-squared average, the "
@ -172,11 +172,11 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldI)
if (obr_.foundObject<volFieldType1>(fieldName))
{
addPrime2MeanFieldType<volFieldType1, volFieldType2>(fieldI);
addPrime2MeanFieldType<volFieldType1, volFieldType2>(fieldi);
}
else if (obr_.foundObject<surfFieldType1>(fieldName))
{
addPrime2MeanFieldType<surfFieldType1, surfFieldType2>(fieldI);
addPrime2MeanFieldType<surfFieldType1, surfFieldType2>(fieldi);
}
}
}
@ -185,10 +185,10 @@ void Foam::functionObjects::fieldAverage::addPrime2MeanField(const label fieldI)
template<class Type>
void Foam::functionObjects::fieldAverage::calculateMeanFieldType
(
const label fieldI
const label fieldi
) const
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
if (obr_.foundObject<Type>(fieldName))
{
@ -196,24 +196,24 @@ void Foam::functionObjects::fieldAverage::calculateMeanFieldType
Type& meanField = const_cast<Type&>
(
obr_.lookupObject<Type>(faItems_[fieldI].meanFieldName())
obr_.lookupObject<Type>(faItems_[fieldi].meanFieldName())
);
scalar dt = obr_.time().deltaTValue();
scalar Dt = totalTime_[fieldI];
scalar Dt = totalTime_[fieldi];
if (faItems_[fieldI].iterBase())
if (faItems_[fieldi].iterBase())
{
dt = 1.0;
Dt = scalar(totalIter_[fieldI]);
Dt = scalar(totalIter_[fieldi]);
}
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt;
if (faItems_[fieldI].window() > 0)
if (faItems_[fieldi].window() > 0)
{
const scalar w = faItems_[fieldI].window();
const scalar w = faItems_[fieldi].window();
if (Dt - dt >= w)
{
@ -247,37 +247,37 @@ void Foam::functionObjects::fieldAverage::calculateMeanFields() const
template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::calculatePrime2MeanFieldType
(
const label fieldI
const label fieldi
) const
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
if (obr_.foundObject<Type1>(fieldName))
{
const Type1& baseField = obr_.lookupObject<Type1>(fieldName);
const Type1& meanField =
obr_.lookupObject<Type1>(faItems_[fieldI].meanFieldName());
obr_.lookupObject<Type1>(faItems_[fieldi].meanFieldName());
Type2& prime2MeanField = const_cast<Type2&>
(
obr_.lookupObject<Type2>(faItems_[fieldI].prime2MeanFieldName())
obr_.lookupObject<Type2>(faItems_[fieldi].prime2MeanFieldName())
);
scalar dt = obr_.time().deltaTValue();
scalar Dt = totalTime_[fieldI];
scalar Dt = totalTime_[fieldi];
if (faItems_[fieldI].iterBase())
if (faItems_[fieldi].iterBase())
{
dt = 1.0;
Dt = scalar(totalIter_[fieldI]);
Dt = scalar(totalIter_[fieldi]);
}
scalar alpha = (Dt - dt)/Dt;
scalar beta = dt/Dt;
if (faItems_[fieldI].window() > 0)
if (faItems_[fieldi].window() > 0)
{
const scalar w = faItems_[fieldI].window();
const scalar w = faItems_[fieldi].window();
if (Dt - dt >= w)
{
@ -317,19 +317,19 @@ void Foam::functionObjects::fieldAverage::calculatePrime2MeanFields() const
template<class Type1, class Type2>
void Foam::functionObjects::fieldAverage::addMeanSqrToPrime2MeanType
(
const label fieldI
const label fieldi
) const
{
const word& fieldName = faItems_[fieldI].fieldName();
const word& fieldName = faItems_[fieldi].fieldName();
if (obr_.foundObject<Type1>(fieldName))
{
const Type1& meanField =
obr_.lookupObject<Type1>(faItems_[fieldI].meanFieldName());
obr_.lookupObject<Type1>(faItems_[fieldi].meanFieldName());
Type2& prime2MeanField = const_cast<Type2&>
(
obr_.lookupObject<Type2>(faItems_[fieldI].prime2MeanFieldName())
obr_.lookupObject<Type2>(faItems_[fieldi].prime2MeanFieldName())
);
prime2MeanField += sqr(meanField);

16
src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
View File

@ -96,14 +96,14 @@ void Foam::functionObjects::fieldCoordinateSystemTransform::execute()
{
Info<< type() << " " << name_ << " output:" << nl;
forAll(fieldSet_, fieldI)
forAll(fieldSet_, fieldi)
{
// If necessary load field
transform<scalar>(fieldSet_[fieldI]);
transform<vector>(fieldSet_[fieldI]);
transform<sphericalTensor>(fieldSet_[fieldI]);
transform<symmTensor>(fieldSet_[fieldI]);
transform<tensor>(fieldSet_[fieldI]);
transform<scalar>(fieldSet_[fieldi]);
transform<vector>(fieldSet_[fieldi]);
transform<sphericalTensor>(fieldSet_[fieldi]);
transform<symmTensor>(fieldSet_[fieldi]);
transform<tensor>(fieldSet_[fieldi]);
}
}
@ -122,9 +122,9 @@ void Foam::functionObjects::fieldCoordinateSystemTransform::write()
{
Info<< type() << " " << name_ << " output:" << nl;
forAll(fieldSet_, fieldI)
forAll(fieldSet_, fieldi)
{
const word fieldName = fieldSet_[fieldI] + ":Transformed";
const word fieldName = fieldSet_[fieldi] + ":Transformed";
const regIOobject& field =
obr_.lookupObject<regIOobject>(fieldName);

18
src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
View File

@ -132,10 +132,10 @@ void Foam::functionObjects::fieldMinMax::writeFileHeader(const label i)
}
else
{
forAll(fieldSet_, fieldI)
forAll(fieldSet_, fieldi)
{
writeTabbed(file, "min(" + fieldSet_[fieldI] + ')');
writeTabbed(file, "max(" + fieldSet_[fieldI] + ')');
writeTabbed(file, "min(" + fieldSet_[fieldi] + ')');
writeTabbed(file, "max(" + fieldSet_[fieldi] + ')');
}
}
@ -162,13 +162,13 @@ void Foam::functionObjects::fieldMinMax::write()
if (!location_) writeTime(file());
if (log_) Info<< type() << " " << name_ << " output:" << nl;
forAll(fieldSet_, fieldI)
forAll(fieldSet_, fieldi)
{
calcMinMaxFields<scalar>(fieldSet_[fieldI], mdCmpt);
calcMinMaxFields<vector>(fieldSet_[fieldI], mode_);
calcMinMaxFields<sphericalTensor>(fieldSet_[fieldI], mode_);
calcMinMaxFields<symmTensor>(fieldSet_[fieldI], mode_);
calcMinMaxFields<tensor>(fieldSet_[fieldI], mode_);
calcMinMaxFields<scalar>(fieldSet_[fieldi], mdCmpt);
calcMinMaxFields<vector>(fieldSet_[fieldi], mode_);
calcMinMaxFields<sphericalTensor>(fieldSet_[fieldi], mode_);
calcMinMaxFields<symmTensor>(fieldSet_[fieldi], mode_);
calcMinMaxFields<tensor>(fieldSet_[fieldi], mode_);
}
if (!location_) file()<< endl;

4
src/postProcessing/functionObjects/field/readFields/readFields.C
View File

@ -97,9 +97,9 @@ void Foam::functionObjects::readFields::execute()
sSymmtf_.clear();
stf_.clear();
forAll(fieldSet_, fieldI)
forAll(fieldSet_, fieldi)
{
const word& fieldName = fieldSet_[fieldI];
const word& fieldName = fieldSet_[fieldi];
// If necessary load field
loadField<scalar>(fieldName, vsf_, ssf_);