COMP: Updated for 64 bit labels

This commit is contained in:
Andrew Heather
2019-02-18 11:20:40 +00:00
parent c4242efde4
commit 27973d7ab5
2 changed files with 5 additions and 5 deletions

View File

@ -62,7 +62,7 @@ void Foam::functionObjects::energySpectrum::calcAndWriteSpectrum
const vectorField& C, const vectorField& C,
const vector& c0, const vector& c0,
const vector& deltaC, const vector& deltaC,
const Vector<label>& N, const Vector<int>& N,
const scalar kappaNorm const scalar kappaNorm
) )
{ {
@ -72,7 +72,7 @@ void Foam::functionObjects::energySpectrum::calcAndWriteSpectrum
fft::forwardTransform fft::forwardTransform
( (
ReComplexField(U), ReComplexField(U),
List<label>({N.x(), N.y(), N.z()}) List<int>({N.x(), N.y(), N.z()})
) )
/scalar(cmptProduct(N)) /scalar(cmptProduct(N))
); );
@ -159,7 +159,7 @@ bool Foam::functionObjects::energySpectrum::read(const dictionary& dict)
const vector L(meshBb.max() - meshBb.min()); const vector L(meshBb.max() - meshBb.min());
const vector nCellXYZ(cmptDivide(L, cellBb.max() - cellBb.min())); const vector nCellXYZ(cmptDivide(L, cellBb.max() - cellBb.min()));
N_ = Vector<label> N_ = Vector<int>
( (
round(nCellXYZ.x()), round(nCellXYZ.x()),
round(nCellXYZ.z()), round(nCellXYZ.z()),

View File

@ -96,7 +96,7 @@ protected:
word UName_; word UName_;
//- Number of cells in I-J-K directions //- Number of cells in I-J-K directions
Vector<label> N_; Vector<int> N_;
//- Reference point //- Reference point
vector c0_; vector c0_;
@ -121,7 +121,7 @@ protected:
const vectorField& C, const vectorField& C,
const vector& c0, const vector& c0,
const vector& deltaC, const vector& deltaC,
const Vector<label>& N, const Vector<int>& N,
const scalar kappaNorm const scalar kappaNorm
); );