Beam embedding feature

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
@@ -43,4 +43,4 @@ jobs:
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C $BUILD_TYPE
+      run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure

.gitignore

@@ -55,3 +55,8 @@ tests/sm/crack0Step0.vtk
 tests/sm/crack1Step0.vtk
 tests/sm/crack2Step0.vtk
 tests/sm/t3d.bmf
+/.vs/oofem/v17/Browse.VC.db
+*.db-shm
+*.db-wal
+*.opendb
+/.vs/oofem/v17/DocumentLayout.backup.json

.vs/CMakeWorkspaceSettings.json

@@ -0,0 +1,2 @@
+{
+}

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": "x64-Debug"
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,12 @@
+{
+  "OutputFoldersPerTargetSystem": {
+    "Local Machine": [
+      "..\\oofem_Build2",
+      "..\\oofem_Build"
+    ]
+  },
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

.vs/oofem/v17/DocumentLayout.json

@@ -0,0 +1,90 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\",
+  "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\oofemlib\\hangingnode.C||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\oofemlib\\hangingnode.C||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\main\\main.C||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\main\\main.C||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\CMourlas001\\source\\repos\\oofem\\CMakeLists.txt||{8B382828-6202-11D1-8870-0000F87579D2}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:CMakeLists.txt||{8B382828-6202-11D1-8870-0000F87579D2}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\oofemlib\\vtkxmlexportmodule.C||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\oofemlib\\vtkxmlexportmodule.C||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+    }
+  ],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 3,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
+              "Title": "main.C",
+              "DocumentMoniker": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\main\\main.C",
+              "RelativeDocumentMoniker": "src\\main\\main.C",
+              "ToolTip": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\main\\main.C",
+              "RelativeToolTip": "src\\main\\main.C",
+              "ViewState": "AgIAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
+              "WhenOpened": "2025-04-07T12:57:46.717Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
+              "Title": "vtkxmlexportmodule.C",
+              "DocumentMoniker": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\oofemlib\\vtkxmlexportmodule.C",
+              "RelativeDocumentMoniker": "src\\oofemlib\\vtkxmlexportmodule.C",
+              "ToolTip": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\oofemlib\\vtkxmlexportmodule.C",
+              "RelativeToolTip": "src\\oofemlib\\vtkxmlexportmodule.C",
+              "ViewState": "AgIAAFoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
+              "WhenOpened": "2025-04-07T12:51:33.388Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "hangingnode.C",
+              "DocumentMoniker": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\oofemlib\\hangingnode.C",
+              "RelativeDocumentMoniker": "src\\oofemlib\\hangingnode.C",
+              "ToolTip": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\src\\oofemlib\\hangingnode.C",
+              "RelativeToolTip": "src\\oofemlib\\hangingnode.C",
+              "ViewState": "AgIAAB4AAAAAAAAAAAAAAJMAAAAHAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
+              "WhenOpened": "2025-04-07T11:28:23.575Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 2,
+              "Title": "CMakeLists.txt",
+              "DocumentMoniker": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\CMakeLists.txt",
+              "RelativeDocumentMoniker": "CMakeLists.txt",
+              "ToolTip": "C:\\Users\\CMourlas001\\source\\repos\\oofem\\CMakeLists.txt",
+              "RelativeToolTip": "CMakeLists.txt",
+              "ViewState": "AgIAABUAAAAAAAAAAAAAAH4AAAASAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
+              "WhenOpened": "2024-10-09T22:21:10.591Z"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

.vs/tasks.vs.json

@@ -0,0 +1,10 @@
+{
+  "version": "0.2.1",
+  "tasks": [
+    {
+      "taskLabel": "task-oofem",
+      "appliesTo": "/",
+      "type": "launch"
+    }
+  ]
+}

CMakeLists.txt

@@ -110,11 +110,20 @@ option (USE_OOFEG "Enable OOFEG" OFF)
 option (USE_SHARED_LIB "Build shared library" ON)
 option (USE_MFRONT "Build shared library" OFF)
 
+option (BUILD_EXTRA_BENCHMARKS "Build benchmark target" OFF)
+mark_as_advanced(BUILD_EXTRA_BENCHMARKS)
+option (BUILD_EXTRA_EXAMPLES "Build examples (beam2d_1)" OFF)
+mark_as_advanced(BUILD_EXTRA_EXAMPLES)
+option (BUILD_EXTRA_HEXGRID "Build hexgrid" OFF)
+mark_as_advanced(BUILD_EXTRA_HEXGRID)
+option (BUILD_EXTRA_DREAM3D "Build dream3d" OFF)
+mark_as_advanced(BUILD_EXTRA_DREAM3D)
+
 # Parallel stuff
-option (USE_PARALLEL "Enable parallel support" OFF)
+option (USE_MPI_PARALLEL "Enable MPI-based, distributed memory parallel support" OFF)
 option (USE_METIS "Enable metis support" OFF)
 option (USE_PARMETIS "Enable Parmetis support" OFF)
-option (USE_OPENMP "Compile with OpenMP support (for parallel assembly)" OFF)
+option (USE_OPENMP_PARALLEL "Enable OpenMP, shared memory parallelism" OFF)
 # Solvers and such
 option (USE_DSS "Enable DSS module" OFF) # No reason to use this
 option (USE_IML "Enable iml++ solvers" OFF) # or this
@@ -144,8 +153,8 @@ option (USE_PYTHON_EXTENSION "Enable Python extension for exposing C++ code to p
 option (USE_HDF5 "HDF5 support" OFF)
 option (USE_MPM "Enable experimental multiphysics module" OFF)
 
-if (USE_PARALLEL)
-    add_definitions (-D__PARALLEL_MODE)
+if (USE_MPI_PARALLEL)
+    add_definitions (-D__MPI_PARALLEL_MODE)
     set (USE_MPI ON)
 endif ()
 
@@ -225,7 +234,7 @@ if (USE_DSS)
     list (APPEND MODULE_LIST "dss")
 endif ()
 
-if (USE_OPENMP)
+if (USE_OPENMP_PARALLEL)
     include (FindOpenMP)
     if (OPENMP_FOUND)
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
@@ -809,24 +818,33 @@ if (USE_OOFEG)
 endif ()
 
 
-add_executable(liboofem_benchmark ${oofem_SOURCE_DIR}/src/main/benchmark.C)
-add_dependencies(liboofem_benchmark version)
-set_target_properties(liboofem_benchmark PROPERTIES EXCLUDE_FROM_ALL TRUE)
-target_link_libraries (liboofem_benchmark liboofem benchmark)
+if (BUILD_EXTRA_BENCHMARKS)
+    find_package(benchmark REQUIRED)
+    add_executable(liboofem_benchmark ${oofem_SOURCE_DIR}/src/main/benchmark.C)
+    add_dependencies(liboofem_benchmark version)
+    set_target_properties(liboofem_benchmark PROPERTIES EXCLUDE_FROM_ALL TRUE)
+    target_link_libraries (liboofem_benchmark liboofem benchmark)
+endif ()
 
-# Example of using liboofem with dynamic input record:
-add_executable(beam2d_1 ${oofem_SOURCE_DIR}/bindings/oofemlib/beam2d_1.C)
-add_dependencies(beam2d_1 version)
-set_target_properties(beam2d_1 PROPERTIES EXCLUDE_FROM_ALL TRUE)
-target_link_libraries (beam2d_1 liboofem)
+if (BUILD_EXTRA_EXAMPLES)
+    # Example of using liboofem with dynamic input record:
+    add_executable(beam2d_1 ${oofem_SOURCE_DIR}/bindings/oofemlib/beam2d_1.C)
+    add_dependencies(beam2d_1 version)
+    set_target_properties(beam2d_1 PROPERTIES EXCLUDE_FROM_ALL TRUE)
+    target_link_libraries (beam2d_1 liboofem)
+endif ()
 
-add_executable(hexgrid ${oofem_SOURCE_DIR}/bindings/oofemlib/hexgrid.C)
-set_target_properties(hexgrid PROPERTIES EXCLUDE_FROM_ALL TRUE)
-target_link_libraries (hexgrid liboofem)
+if (BUILD_EXTRA_HEXGRID)
+    add_executable(hexgrid ${oofem_SOURCE_DIR}/bindings/oofemlib/hexgrid.C)
+    set_target_properties(hexgrid PROPERTIES EXCLUDE_FROM_ALL TRUE)
+    target_link_libraries (hexgrid liboofem)
+endif ()
 
-add_executable(dream3d_analysis ${oofem_SOURCE_DIR}/bindings/oofemlib/dream3d_analysis.C)
-set_target_properties(dream3d_analysis PROPERTIES EXCLUDE_FROM_ALL TRUE)
-target_link_libraries(dream3d_analysis liboofem)
+if (BUILD_EXTRA_DREAM3D)
+    add_executable(dream3d_analysis ${oofem_SOURCE_DIR}/bindings/oofemlib/dream3d_analysis.C)
+    set_target_properties(dream3d_analysis PROPERTIES EXCLUDE_FROM_ALL TRUE)
+    target_link_libraries(dream3d_analysis liboofem)
+endif ()
 
 # CppCheck target (not built by default)
 add_custom_target(cppcheck)
@@ -898,7 +916,7 @@ include (CTest)
 
 #set (CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${oofem_TEST_DIR}/tests/valgrind.supp)
 
-if (USE_PARALLEL)
+if (USE_MPI_PARALLEL)
     set (par_dir ${oofem_TEST_DIR}/partests)
     file (GLOB parallel_tests RELATIVE "${par_dir}" "${par_dir}/*/")
     foreach (case ${parallel_tests})
@@ -1031,7 +1049,7 @@ endif()
 if (N EQUAL 0)
   set (N 1)
 endif ()
-if (USE_OPENMP) # OPENMP will use all processors by default
+if (USE_OPENMP_PARALLEL) # OPENMP will use all processors by default
   set (N 1)
 endif ()
 

CMakeSettings.json

@@ -0,0 +1,42 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Visual Studio 17 2022 Win64",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_arm64_x64" ],
+      "buildRoot": "C:\\Users\\CMourlas001\\Source\\Repos\\oofem_Build2",
+      "intelliSenseMode": "windows-msvc-x64",
+      "cmakeCommandArgs": "C:\\Users\\CMourlas001\\Source\\Repos\\oofem_Build2",
+      "installRoot": "C:\\Users\\CMourlas001\\Source\\Repos\\oofem_Build2",
+      "variables": [
+        {
+          "name": "CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL",
+          "value": "/INCREMENTAL:YES",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_SHARED_LINKER_FLAGS_RELEASE",
+          "value": "/INCREMENTAL:YES",
+          "type": "STRING"
+        },
+        {
+          "name": "USE_SHARED_LIB",
+          "value": "true",
+          "type": "BOOL"
+        }
+      ]
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Visual Studio 17 2022 Win64",
+      "configurationType": "Release",
+      "buildRoot": "C:\\Users\\CMourlas001\\Source\\Repos\\oofem_Build",
+      "installRoot": "C:\\Users\\CMourlas001\\Source\\Repos\\oofem_Build",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ]
+    }
+  ]
+}

bindings/oofemlib/dream3d_analysis.C

@@ -3,6 +3,7 @@
 #include "dynamicdatareader.h"
 #include "intarray.h"
 #include "floatarray.h"
+#include "inputrecord.h"
 #include "timer.h"
 
 // Optional (only need the input fields defines)
@@ -75,7 +76,7 @@ public:
     void giveRecordKeywordField(std :: string &answer) override { answer = "node";  }
     void giveField(FloatArray &answer, InputFieldType id) override {
         if (std::string(id) == _IFT_Node_coords) answer = coords;
-        else throw MissingKeywordInputException(this*, id, recordNumber);
+        else throw MissingKeywordInputException(*this, id, recordNumber);
     }
 
     bool hasField(InputFieldType id) override { return std::string(id) == _IFT_Node_coords; }
@@ -96,7 +97,7 @@ public:
     void giveRecordKeywordField(std :: string &answer) override { answer = _IFT_Brick1_ht_Name; }
     void giveField(IntArray &answer, InputFieldType id) override { 
         if (std::string(id) == _IFT_Element_nodes) answer = enodes;
-        else throw MissingKeywordInputException(this*, id, recordNumber);
+        else throw MissingKeywordInputException(*this, id, recordNumber);
     }
 
     bool hasField(InputFieldType id) override { return std::string(id) == _IFT_Element_nodes; }
@@ -111,12 +112,12 @@ public:
 
     virtual void giveField(IntArray &answer, InputFieldType id) {
         if (std::string(id) == _IFT_Element_nodes) answer = enodes;
-        else throw MissingKeywordInputException(this*, id, recordNumber);
+        else throw MissingKeywordInputException(*this, id, recordNumber);
     }
     virtual void giveField(int &answer, InputFieldType id) { 
         if (std::string(id) == _IFT_Element_activityTimeFunction) answer = 2;
         else if (std::string(id) == _IFT_Element_nip) answer = 0;
-        else throw MissingKeywordInputException(this*, id, recordNumber);
+        else throw MissingKeywordInputException(*this, id, recordNumber);
     }
     virtual bool hasField(InputFieldType id) { return std::string(id) == _IFT_Element_activityTimeFunction || 
         std::string(id) == _IFT_Element_nip || std::string(id) == _IFT_Element_nodes; }
@@ -155,7 +156,7 @@ IntArray read_int_dataset(const DataSet &d)
 
 int main(int argc, char *argv[])
 {
-#ifdef __PARALLEL_MODE
+#ifdef __MPI_PARALLEL_MODE
  #ifdef __USE_MPI
     int rank;
     MPI_Init(& argc, & argv);

bindings/oofemlib/hexgrid.C

@@ -63,7 +63,7 @@ std :: vector< inclusion > getInclusionsInBox(FloatArray corner, double rveSize,
 
 int main(int argc, char *argv[])
 {
-#ifdef __PARALLEL_MODE
+#ifdef __MPI_PARALLEL_MODE
  #ifdef __USE_MPI
     int rank;
     MPI_Init(& argc, & argv);

bindings/python/examples/vtkdemo.py

@@ -15,13 +15,13 @@
     print ("Piece:", p)
     print(p.getVertices())
     print(p.getCellConnectivity())
-    print(p.getCellTypes(vtkxmlPy))
+    print(p.getCellTypes())
     disp = p.getPrimaryVertexValues(oofempy.UnknownType.DisplacementVector)
     sig = p.getInternalVertexValues(oofempy.InternalStateType.IST_StressTensor)
     sigx = sig[:, 0]
 
-    grid = pv.UnstructuredGrid(p.getCellConnectivity(), p.getCellTypes(vtkxmlPy), p.getVertices())
-    grid.point_arrays['Sigma_xx'] = sigx
+    grid = pv.UnstructuredGrid(p.getCellConnectivity(), p.getCellTypes(), p.getVertices())
+    grid.point_data['Sigma_xx'] = sigx
     grid['Disp'] = disp
     print(grid.active_vectors)
     warped = grid.warp_by_vector('Disp', factor=1000.)