BUG: noise - updated creation of control dictionary to allow -case option and env variables. Fixes #402

This commit is contained in:
Andrew Heather
2017-02-10 13:57:36 +00:00
parent 7e20157d95
commit 84aa391403

View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -106,21 +106,12 @@ int main(int argc, char *argv[])
#include "setRootCase.H" #include "setRootCase.H"
#include "createTime.H" #include "createTime.H"
fileName dictName(runTime.system()/"noiseDict"); const word dictName("noiseDict");
if (args.optionFound("dict")) #include "setSystemRunTimeDictionaryIO.H"
{
dictName = args["dict"];
}
IOdictionary dict Info<< "Reading " << dictName << "\n" << endl;
(
IOobject IOdictionary dict(dictIO);
(
dictName.expand(),
runTime,
IOobject::MUST_READ
)
);
autoPtr<noiseModel> model(noiseModel::New(dict)); autoPtr<noiseModel> model(noiseModel::New(dict));
model->calculate(); model->calculate();