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

ENH: Clean-up after latest Foundation integrations

Browse Source
This commit is contained in:
Andrew Heather
2017-03-31 15:36:28 +01:00
parent fb724ce113
commit 332c8acdcd
138 changed files with 280 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,9 +241,9 @@ void pointNoise::calculate()
if (!fName.isAbsolute())
{
fName = "$FOAM_CASE"/fName;
fName.expand();
}
fName.expand();
Function1Types::CSV<scalar> data("pressure", dict_, "Data", fName);
Function1Types::CSV<scalar> data("pressure", dict_, fName);
processData(filei, data);
}
}
@ -253,13 +253,12 @@ bool pointNoise::read(const dictionary& dict)
{
if (noiseModel::read(dict))
{
if (!dict.readIfPresent("inputFiles", inputFileNames_))
if (!dict.readIfPresent("files", inputFileNames_))
{
inputFileNames_.setSize(1);
// Note: unsafe lookup of file name from pressureData sub-dict!
dict.subDict("pressureData").lookup("fileName")
>> inputFileNames_[0];
// Note: lookup uses same keyword as used by the CSV constructor
dict.lookup("file") >> inputFileNames_[0];
}
return true;

16
src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H
View File

@ -53,15 +53,13 @@ Description
}
// Pressure data supplied in CSV file format
csvFileData
{
fileName "pressureData";
nHeaderLine 1;
refColumn 0;
componentColumns (1);
separator " ";
mergeSeparators yes;
}
file "pressureData";
//files ("pressureData1" "pressureData2");
nHeaderLine 1;
refColumn 0;
componentColumns (1);
separator " ";
mergeSeparators yes;
graphFormat raw;

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

@ -431,14 +431,14 @@ bool surfaceNoise::read(const dictionary& dict)
{
if (noiseModel::read(dict))
{
if (dict.found("inputFile"))
if (dict.found("file"))
{
inputFileNames_.setSize(1);
dict.lookup("inputFile") >> inputFileNames_[0];
dict.lookup("file") >> inputFileNames_[0];
}
else
{
dict.lookup("inputFiles") >> inputFileNames_;
dict.lookup("files") >> inputFileNames_;
}
dict.readIfPresent("fftWriteInterval", fftWriteInterval_);

3
src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H
View File

@ -53,7 +53,8 @@ Description
}
// Input file
inputFiles ("postProcessing/faceSource1/surface/patch/patch.case");
file "postProcessing/faceSource1/surface/patch/patch.case";
//files ("postProcessing/faceSource1/surface/patch/patch.case");
// Write interval for FFT data, default = 1
fftWriteInterval 100;