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

STYLE: use <case> instead of $FOAM_CASE expansion in more places

Browse Source
This commit is contained in:
Mark Olesen
2018-10-15 21:19:13 +02:00
parent c6520033c9
commit 5c8a1b746d
11 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
View File

@ -25,6 +25,7 @@ License
#include "noiseModel.H"
#include "functionObject.H"
#include "stringOps.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -140,17 +141,15 @@ Foam::label Foam::noiseModel::findStartTimeIndex
Foam::fileName Foam::noiseModel::baseFileDir(const label dataseti) const
{
fileName baseDir("$FOAM_CASE");
word datasetName("input" + Foam::name(dataseti));
baseDir =
baseDir.expand()
/functionObject::outputPrefix
/"noise"
/outputPrefix_
/type()
/datasetName;
return baseDir;
return
(
stringOps::expand("<case>") // ie, globalPath()
/ functionObject::outputPrefix
/ "noise"
/ outputPrefix_
/ type()
/ ("input" + Foam::name(dataseti))
);
}

7
src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
View File

@ -25,6 +25,7 @@ License
#include "pointNoise.H"
#include "noiseFFT.H"
#include "stringOps.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -240,11 +241,13 @@ void pointNoise::calculate()
{
fileName fName = inputFileNames_[filei];
fName.expand();
if (!fName.isAbsolute())
{
fName = "$FOAM_CASE"/fName;
fName.expand();
// ie, globalPath() / name
fName = stringOps::expand("<case>")/fName;
}
Function1Types::CSV<scalar> data("pressure", dict_, fName);
processData(filei, data);
}

6
src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
View File

@ -28,6 +28,7 @@ License
#include "surfaceWriter.H"
#include "noiseFFT.H"
#include "graph.H"
#include "stringOps.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -464,10 +465,11 @@ void surfaceNoise::calculate()
if (!fName.isAbsolute())
{
fName = "$FOAM_CASE"/fName;
// ie, globalPath() / name
fName = stringOps::expand("<case>")/fName;
}
initialise(fName.expand());
initialise(fName);
// Container for pressure time history data per face
List<scalarField> pData;