From c8782810310edf192c9085c20b66a6eba497f6e8 Mon Sep 17 00:00:00 2001 From: Gerhard Holzinger Date: Wed, 24 Apr 2019 15:16:42 +0200 Subject: [PATCH] minor fix in predefinedPath model * change the default file name for the pre-defined recurrencePath The previous default 'recurrencePath' is used by the recModel class to record the recurrence-path of the simulation at run-time. Thus, the previous default value conflicts with the hard-coded file name of the recModel class. By changing the default, we can use this model with its default file name --- .../recPath/predefinedPath/predefinedPath.C | 13 +++++++++++-- .../recPath/predefinedPath/predefinedPath.H | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/recurrence/recPath/predefinedPath/predefinedPath.C b/src/recurrence/recPath/predefinedPath/predefinedPath.C index 09565e6d..48ec771a 100644 --- a/src/recurrence/recPath/predefinedPath/predefinedPath.C +++ b/src/recurrence/recPath/predefinedPath/predefinedPath.C @@ -56,8 +56,17 @@ predefinedPath::predefinedPath : recPath(dict, base), propsDict_(dict.subDict(typeName + "Props")), - fileName_(propsDict_.lookupOrDefault("recPathName", "recurrencePath")) -{} + fileName_(propsDict_.lookupOrDefault("recPathName", "predefinedRecurrencePath")) +{ + if (fileName_ == "recurrencePath") + { + FatalError << "File name of the user-provided recurrencePath file is " + << fileName_ << nl + << "This is in conflict with the automatically written recurrencePath file!" << nl + << nl << "Choose a different name!" + << abort(FatalError); + } +} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/recurrence/recPath/predefinedPath/predefinedPath.H b/src/recurrence/recPath/predefinedPath/predefinedPath.H index c030aec5..55f2e4cf 100644 --- a/src/recurrence/recPath/predefinedPath/predefinedPath.H +++ b/src/recurrence/recPath/predefinedPath/predefinedPath.H @@ -20,6 +20,10 @@ License You should have received a copy of the GNU General Public License along with CFDEMcoupling academic. If not, see . + +Description + Follow a pre-defined path specified in a user-provided recurrencePath file. + \*---------------------------------------------------------------------------*/ #ifndef predefinedPath_H