From 55be2f0bc765af68b5ee88a9165bef468aaece19 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 13 Aug 2013 17:01:36 +0100
Subject: [PATCH] ENH: fvOptions - cache modelType so that derived classes can
generate appropriate coeffs_ dict
---
src/fvOptions/fvOptions/fvOption.C | 1 +
src/fvOptions/fvOptions/fvOption.H | 5 ++++-
src/fvOptions/fvOptions/fvOptionIO.C | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/fvOptions/fvOptions/fvOption.C b/src/fvOptions/fvOptions/fvOption.C
index 1a46a99794a..bc68775f083 100644
--- a/src/fvOptions/fvOptions/fvOption.C
+++ b/src/fvOptions/fvOptions/fvOption.C
@@ -255,6 +255,7 @@ Foam::fv::option::option
)
:
name_(name),
+ modelType_(modelType),
mesh_(mesh),
dict_(dict),
coeffs_(dict.subDict(modelType + "Coeffs")),
diff --git a/src/fvOptions/fvOptions/fvOption.H b/src/fvOptions/fvOptions/fvOption.H
index 28509ee4c06..a3cb760f5f9 100644
--- a/src/fvOptions/fvOptions/fvOption.H
+++ b/src/fvOptions/fvOptions/fvOption.H
@@ -94,7 +94,10 @@ protected:
// Protected data
//- Source name
- word name_;
+ const word name_;
+
+ //- Model type
+ const word modelType_;
//- Reference to the mesh database
const fvMesh& mesh_;
diff --git a/src/fvOptions/fvOptions/fvOptionIO.C b/src/fvOptions/fvOptions/fvOptionIO.C
index c51b6b9b483..612a5fdd4a8 100644
--- a/src/fvOptions/fvOptions/fvOptionIO.C
+++ b/src/fvOptions/fvOptions/fvOptionIO.C
@@ -96,7 +96,7 @@ bool Foam::fv::option::read(const dictionary& dict)
dict.lookup("duration") >> duration_;
}
- coeffs_ = dict.subDict(type() + "Coeffs");
+ coeffs_ = dict.subDict(modelType_ + "Coeffs");
return true;
}
--
GitLab