Merge pull request FreeCAD#24912 from marioalexis84/fem-elmer_solver

Author: chennes

src/Mod/Fem/App/FemMesh.cpp

@@ -2705,3 +2705,11 @@ bool FemMesh::removeGroup(int GroupId)
 {
     return this->getSMesh()->RemoveGroup(GroupId);
 }
+
+void FemMesh::renameGroup(int id, const std::string& name)
+{
+    SMESH_Group* grp = this->getSMesh()->GetGroup(id);
+    if (grp) {
+        grp->SetName(name.c_str());
+    }
+}

src/Mod/Fem/App/FemMesh.h

@@ -180,6 +180,8 @@ class FemExport FemMesh: public Data::ComplexGeoData
     void addGroupElements(int, const std::set<int>&);
     /// Remove group (Name due to similarity to SMESH basis functions)
     bool removeGroup(int);
+    /// Rename group
+    void renameGroup(int id, const std::string& name);
     //@}
 
 

src/Mod/Fem/App/FemMesh.pyi

@@ -239,6 +239,14 @@ class FemMesh(ComplexGeoData):
                             Returns boolean."""
         ...
 
+    @constmethod
+    def renameGroup(self) -> Any:
+        """Rename a group with a given group ID
+        renameGroup(id, name)
+        groupid: int
+        name: string"""
+        ...
+
     @constmethod
     def getElementType(self) -> Any:
         """Return the element type of a given ID"""

src/Mod/Fem/App/FemMeshPyImp.cpp

@@ -1718,6 +1718,18 @@ PyObject* FemMeshPy::removeGroup(PyObject* args) const
     return PyBool_FromLong((long)(getFemMeshPtr()->removeGroup(theId)));
 }
 
+PyObject* FemMeshPy::renameGroup(PyObject* args) const
+{
+    int id;
+    const char* name;
+    if (!PyArg_ParseTuple(args, "is", &id, &name)) {
+        return nullptr;
+    }
+
+    getFemMeshPtr()->renameGroup(id, name);
+
+    Py_Return;
+}
 
 PyObject* FemMeshPy::getElementType(PyObject* args) const
 {

src/Mod/Fem/App/FemPostPipeline.cpp

@@ -44,6 +44,7 @@
 #include <vtkInformationVector.h>
 
 #include <Base/Console.h>
+#include <Base/Reader.h>
 
 #include "FemMesh.h"
 #include "FemMeshObject.h"
@@ -130,10 +131,10 @@ bool FemPostPipeline::canRead(Base::FileInfo File)
 {
 
     // from FemResult only unstructural mesh is supported in femvtktoools.cpp
-    return File.hasExtension({"vtk", "vtp", "vts", "vtr", "vti", "vtu", "pvtu", "vtm"});
+    return File.hasExtension({"vtk", "vtp", "vts", "vtr", "vti", "vtu", "pvtu", "vtm", "pvd"});
 }
 
-vtkSmartPointer<vtkDataObject> FemPostPipeline::dataObjectFromFile(Base::FileInfo File)
+vtkSmartPointer<vtkDataObject> FemPostPipeline::dataObjectFromFile(const Base::FileInfo& File)
 {
     // checking on the file
     if (!File.isReadable()) {
@@ -164,10 +165,55 @@ vtkSmartPointer<vtkDataObject> FemPostPipeline::dataObjectFromFile(Base::FileInf
     else if (File.hasExtension("vtm")) {
         return readXMLFile<vtkXMLMultiBlockDataReader>(File.filePath());
     }
+    else if (File.hasExtension("pvd")) {
+        return readPVD(File);
+    }
 
     throw Base::FileException("Unknown extension");
 }
 
+vtkSmartPointer<vtkDataObject> FemPostPipeline::readPVD(const Base::FileInfo& file)
+{
+    std::string path = file.filePath();
+
+    std::ifstream ifstr(path, std::ios::in | std::ios::binary);
+    Base::XMLReader reader(path.c_str(), ifstr);
+    reader.readElement("DataSet");
+    std::map<double, std::string> values;
+    std::vector<std::string> files;
+    while (strcmp(reader.localName(), "DataSet") == 0) {
+        values.emplace(std::make_pair(reader.getAttribute<double>("timestep"),
+                                      reader.getAttribute<std::string>("file")));
+        reader.readNextElement();
+    }
+
+    auto timeInfo = vtkSmartPointer<vtkStringArray>::New();
+    timeInfo->SetName("TimeInfo");
+    timeInfo->InsertNextValue("TimeStep");
+    // set unit to empty string
+    timeInfo->InsertNextValue("");
+
+    auto multiBlock = vtkSmartPointer<vtkMultiBlockDataSet>::New();
+    multiBlock->GetFieldData()->AddArray(timeInfo);
+
+    int i = 0;
+    std::string dir = file.dirPath();
+    for (auto v : values) {
+        Base::FileInfo fi(dir + "/" + v.second);
+        auto data = dataObjectFromFile(fi);
+        auto time = vtkSmartPointer<vtkFloatArray>::New();
+        time->SetName("TimeValue");
+        time->InsertNextValue(v.first);
+        data->GetFieldData()->AddArray(time);
+        data->GetFieldData()->AddArray(timeInfo);
+
+        multiBlock->SetBlock(i, data);
+        ++i;
+    }
+
+    return multiBlock;
+}
+
 void FemPostPipeline::read(Base::FileInfo File)
 {
     Data.setValue(dataObjectFromFile(File));

src/Mod/Fem/App/FemPostPipeline.h

@@ -129,7 +129,9 @@ class FemExport FemPostPipeline: public Fem::FemPostObject, public Fem::FemPostG
         reader->Update();
         return reader->GetOutput();
     }
-    vtkSmartPointer<vtkDataObject> dataObjectFromFile(Base::FileInfo File);
+    vtkSmartPointer<vtkDataObject> dataObjectFromFile(const Base::FileInfo& File);
+    // read .pvd file into multiblock dataset
+    vtkSmartPointer<vtkDataObject> readPVD(const Base::FileInfo& file);
 };
 
 }  // namespace Fem

src/Mod/Fem/CMakeLists.txt

@@ -211,6 +211,7 @@ SET(FemObjects_SRCS
     femobjects/result_mechanical.py
     femobjects/solver_calculix.py
     femobjects/solver_ccxtools.py
+    femobjects/solver_elmer.py
 )
 
 if(BUILD_FEM_VTK_PYTHON)
@@ -285,9 +286,8 @@ SET(FemSolverCalculix_SRCS
 SET(FemSolverElmer_SRCS
     femsolver/elmer/__init__.py
     femsolver/elmer/sifio.py
-    femsolver/elmer/solver.py
-    femsolver/elmer/tasks.py
     femsolver/elmer/writer.py
+    femsolver/elmer/elmertools.py
 )
 
 SET(FemSolverElmerEquations_SRCS
@@ -631,6 +631,7 @@ SET(FemGuiTaskPanels_SRCS
     femtaskpanels/task_result_mechanical.py
     femtaskpanels/task_solver_calculix.py
     femtaskpanels/task_solver_ccxtools.py
+    femtaskpanels/task_solver_elmer.py
 )
 
 if(BUILD_FEM_VTK_PYTHON)
@@ -701,6 +702,7 @@ SET(FemGuiViewProvider_SRCS
     femviewprovider/view_result_mechanical.py
     femviewprovider/view_solver_calculix.py
     femviewprovider/view_solver_ccxtools.py
+    femviewprovider/view_solver_elmer.py
 )
 
 if(BUILD_FEM_VTK_PYTHON)

src/Mod/Fem/Gui/CMakeLists.txt

@@ -449,6 +449,7 @@ SET(FemGuiPythonUI_SRCS
     Resources/ui/ResultShow.ui
     Resources/ui/SolverCalculiX.ui
     Resources/ui/SolverCcxTools.ui
+    Resources/ui/SolverElmer.ui
     Resources/ui/TaskPostGlyph.ui
     Resources/ui/TaskPostExtraction.ui
     Resources/ui/TaskPostHistogram.ui

src/Mod/Fem/Gui/DlgSettingsFemElmer.ui

@@ -144,14 +144,14 @@
       <item>
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
-         <widget class="QLabel" name="l_num_processes">
+         <widget class="QLabel" name="l_num_tasks">
           <property name="text">
-           <string>Number of processes</string>
+           <string>Number of tasks</string>
           </property>
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="Gui::PrefSpinBox" name="sb_num_processes">
+         <widget class="Gui::PrefSpinBox" name="sb_num_tasks">
           <property name="alignment">
            <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
@@ -162,7 +162,33 @@
            <number>1</number>
           </property>
           <property name="prefEntry" stdset="0">
-           <cstring>UseNumberOfCores</cstring>
+           <cstring>NumberOfTasks</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Fem/Elmer</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="l_threads_per_task">
+          <property name="text">
+           <string>Threads per task</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="Gui::PrefSpinBox" name="sb_threads_per_task">
+          <property name="alignment">
+           <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="toolTip">
+           <string>Number of threads per task. Take effect if Elmer uses OpenMP.</string>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>ThreadsPerTask</cstring>
           </property>
           <property name="prefPath" stdset="0">
            <cstring>Mod/Fem/Elmer</cstring>

src/Mod/Fem/Gui/DlgSettingsFemElmerImp.cpp

@@ -54,7 +54,8 @@ void DlgSettingsFemElmerImp::saveSettings()
     ui->fc_elmer_binary_path->onSave();
     ui->fc_grid_binary_path->onSave();
 
-    ui->sb_num_processes->onSave();
+    ui->sb_num_tasks->onSave();
+    ui->sb_threads_per_task->onSave();
 
     ui->ckb_binary_format->onSave();
     ui->ckb_geom_id->onSave();
@@ -65,7 +66,8 @@ void DlgSettingsFemElmerImp::loadSettings()
     ui->fc_elmer_binary_path->onRestore();
     ui->fc_grid_binary_path->onRestore();
 
-    ui->sb_num_processes->onRestore();
+    ui->sb_num_tasks->onRestore();
+    ui->sb_threads_per_task->onRestore();
 
     ui->ckb_binary_format->onRestore();
     ui->ckb_geom_id->onRestore();