From cb3a7eaecc4bd983fd638492407025008c569ec0 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 23 Jan 2014 13:15:32 +0000
Subject: [PATCH] ENH: createZeroFolder - updated to use central file path
---
.../createZeroDirectory/createZeroDirectory.C | 4 ++--
.../preProcessing/createZeroDirectory/solverTemplate.C | 10 ++++++----
.../preProcessing/createZeroDirectory/solverTemplate.H | 7 ++++++-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
index db5d226c254..0de9eff1792 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
@@ -213,14 +213,14 @@ int main(int argc, char *argv[])
)
);
- fileName baseDir("${WM_PROJECT_USER_DIR}/etc/templates");
+ fileName baseDir("${WM_PROJECT_DIR}/etc/templates");
baseDir.expand();
// read the solver
const word& solverName = controlDict.lookup("application");
// generate solver template
- const solverTemplate solver(runTime, solverName);
+ const solverTemplate solver(baseDir, runTime, solverName);
// read the boundary condition templates
const boundaryTemplates bcTemplates
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
index f5a4e8328aa..c0a4a5e4b59 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
@@ -186,11 +186,15 @@ Foam::dictionary Foam::solverTemplate::readFluidFieldTemplates
"const Time&"
") const"
)
- << "Unhandled turbulence model option"
+ << "Unhandled turbulence model option. Valid options are "
+ << "turbulenceModel, RASModel, LESModel"
<< abort(FatalError);
}
}
+ Info<< " Selecting " << turbulenceType << ": " << turbulenceModel
+ << endl;
+
IOdictionary turbModelDict
(
IOobject
@@ -271,6 +275,7 @@ void Foam::solverTemplate::setRegionProperties
Foam::solverTemplate::solverTemplate
(
+ const fileName& baseDir,
const Time& runTime,
const word& solverName
)
@@ -282,9 +287,6 @@ Foam::solverTemplate::solverTemplate
fieldTypes_(),
fieldDimensions_()
{
- fileName baseDir("${WM_PROJECT_USER_DIR}/etc/templates");
- baseDir.expand();
-
IOdictionary solverDict
(
IOobject
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
index d78ac533a17..40b28638dfb 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
+++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
@@ -135,7 +135,12 @@ private:
public:
//- Constructor
- solverTemplate(const Time& runTime, const word& regionName);
+ solverTemplate
+ (
+ const fileName& baseDir,
+ const Time& runTime,
+ const word& regionName
+ );
// Public member functions
--
GitLab