zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #89 from ParticulateFlow/feature/recurrenceLib_fix_predefinedPath

Browse Source 
minor fix in predefinedPath model
This commit is contained in:
tlichtenegger
2019-04-25 11:06:11 +02:00
committed by GitHub
parent 2d4fc39eef c878281031
commit ce2646c400
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/recurrence/recPath/predefinedPath/predefinedPath.C
View File

@ -56,8 +56,17 @@ predefinedPath::predefinedPath
: :
recPath(dict, base), recPath(dict, base),
propsDict_(dict.subDict(typeName + "Props")), propsDict_(dict.subDict(typeName + "Props")),
fileName_(propsDict_.lookupOrDefault<word>("recPathName", "recurrencePath")) fileName_(propsDict_.lookupOrDefault<word>("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 * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //

4
src/recurrence/recPath/predefinedPath/predefinedPath.H
View File

@ -20,6 +20,10 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with CFDEMcoupling academic. If not, see <http://www.gnu.org/licenses/>. along with CFDEMcoupling academic. If not, see <http://www.gnu.org/licenses/>.
Description
Follow a pre-defined path specified in a user-provided recurrencePath file.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef predefinedPath_H #ifndef predefinedPath_H