From 1a998045219675bb8202f4557909f08b40c4e167 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 6 Mar 2019 08:11:31 +0100 Subject: [PATCH] FEM: elmer solver prefs, use elmer path for elmer grid prefs --- src/Mod/Fem/Gui/DlgSettingsFemElmer.ui | 4 ++-- src/Mod/Fem/femsolver/settings.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui index ea3ba1199d..238b139847 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui +++ b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui @@ -78,7 +78,7 @@ gridBinaryPath - Mod/Fem/Grid + Mod/Fem/Elmer @@ -133,7 +133,7 @@ UseStandardGridLocation - Mod/Fem/Grid + Mod/Fem/Elmer diff --git a/src/Mod/Fem/femsolver/settings.py b/src/Mod/Fem/femsolver/settings.py index 554750e45d..7914a76153 100644 --- a/src/Mod/Fem/femsolver/settings.py +++ b/src/Mod/Fem/femsolver/settings.py @@ -37,9 +37,8 @@ CUSTOM = "custom" _PARAM_PATH = "User parameter:BaseApp/Preferences/Mod/Fem/" _GENERAL_PARAM = _PARAM_PATH + "General" -_ELMER_PARAM = _PARAM_PATH + "Elmer" -_GRID_PARAM = _PARAM_PATH + "Grid" _CCX_PARAM = _PARAM_PATH + "Ccx" +_ELMER_PARAM = _PARAM_PATH + "Elmer" _Z88_PARAM = _PARAM_PATH + "Z88" @@ -72,7 +71,7 @@ _BINARIES = { customPath="elmerBinaryPath"), "ElmerGrid": _BinaryDlg( default="ElmerGrid", - param=_GRID_PARAM, + param=_ELMER_PARAM, useDefault="UseStandardGridLocation", customPath="gridBinaryPath"), "Z88": _BinaryDlg(