diff --git a/src/fvOptions/fvOptions/fvOption.C b/src/fvOptions/fvOptions/fvOption.C index 6cd5c770f4e90b95e03c88ca66479d186f45a86a..2dcd845eee7833d5b0080114ae78bfb6d728c23c 100644 --- a/src/fvOptions/fvOptions/fvOption.C +++ b/src/fvOptions/fvOptions/fvOption.C @@ -86,7 +86,6 @@ void Foam::fv::option::setSelection(const dictionary& dict) } case smMapRegion: { - dict.lookup("nbrModelName") >> nbrModelName_; dict.lookup("nbrRegionName") >> nbrRegionName_; master_ = readBool(dict.lookup("master")); break; @@ -264,7 +263,6 @@ Foam::fv::option::option cellSetName_("none"), V_(0.0), meshInterpPtr_(), - nbrModelName_("none"), nbrRegionName_("none"), master_(false), fieldNames_(), diff --git a/src/fvOptions/fvOptions/fvOption.H b/src/fvOptions/fvOptions/fvOption.H index 3501fdfa45f9393706ea128cbfe35da09884ffeb..657f760233d3a51b817953e30afca68e189bf503 100644 --- a/src/fvOptions/fvOptions/fvOption.H +++ b/src/fvOptions/fvOptions/fvOption.H @@ -134,9 +134,6 @@ protected: //- Mesh to mesh interpolation object autoPtr<meshToMeshNew> meshInterpPtr_; - //- Name of the model in the neighbour mesh - word nbrModelName_; - //- Name of the neighbour region to map word nbrRegionName_; @@ -288,9 +285,6 @@ public: //- Return const access to the total cell volume inline scalar V() const; - //- Return const access to the neighbour model name - inline const word& nbrModelName() const; - //- Return const access to the neighbour region name inline const word& nbrRegionName() const; diff --git a/src/fvOptions/fvOptions/fvOptionI.H b/src/fvOptions/fvOptions/fvOptionI.H index aed4c14e552259ee077cbbaf7abd9885368c424a..796b2fdbc91a6f5a346598fe1aaf79856794e2e0 100644 --- a/src/fvOptions/fvOptions/fvOptionI.H +++ b/src/fvOptions/fvOptions/fvOptionI.H @@ -126,12 +126,6 @@ inline Foam::scalar& Foam::fv::option::duration() } -inline const Foam::word& Foam::fv::option::nbrModelName() const -{ - return nbrModelName_; -} - - inline const Foam::word& Foam::fv::option::nbrRegionName() const { return nbrRegionName_; diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C index 31a684afb9681ff041c8d2846e3e210519204e0e..8858a81949300846763066eb23760a6b34e2b8df 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C @@ -111,6 +111,7 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel : option(name, modelType, dict, mesh), nbrModel_(NULL), + nbrModelName_(word::null), firstIter_(true), timeIndex_(-1), htc_ @@ -138,6 +139,8 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel { if (active()) { + coeffs_.lookup("nbrModelName") >> nbrModelName_; + coeffs_.lookup("fieldNames") >> fieldNames_; applied_.setSize(fieldNames_.size(), false); diff --git a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H index 736bd094fb22d94c6236fedc6e7e37313f796524..55aabd45e1e8ffd16fedb86daa795bb33d06a4d5 100644 --- a/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H +++ b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H @@ -65,6 +65,9 @@ private: //- Pointer to neighbour interRegionHeatTransferModel interRegionHeatTransferModel* nbrModel_; + //- Name of the model in the neighbour mesh + word nbrModelName_; + //- First iteration bool firstIter_;