FEM: elmer solver prefs, use elmer path for elmer grid prefs

FreeCAD · Mar 6, 2019 · 3f6149a · 3f6149a
1 parent e40ee28
commit 3f6149a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui
@@ -78,7 +78,7 @@
              <cstring>gridBinaryPath</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Grid</cstring>
+             <cstring>Mod/Fem/Elmer</cstring>
             </property>
            </widget>
           </item>
@@ -133,7 +133,7 @@
              <cstring>UseStandardGridLocation</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Grid</cstring>
+             <cstring>Mod/Fem/Elmer</cstring>
             </property>
            </widget>
           </item>

diff --git a/src/Mod/Fem/femsolver/settings.py b/src/Mod/Fem/femsolver/settings.py
@@ -37,9 +37,8 @@
 
 _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 @@ def getBinary(self):
         customPath="elmerBinaryPath"),
     "ElmerGrid": _BinaryDlg(
         default="ElmerGrid",
-        param=_GRID_PARAM,
+        param=_ELMER_PARAM,
         useDefault="UseStandardGridLocation",
         customPath="gridBinaryPath"),
     "Z88": _BinaryDlg(