Merge remote-tracking branch 'origin/main' into tutorials

gismo · Jan 9, 2025 · 9196ac0 · 9196ac0
2 parents 5b82d32 + 63ee2ea
commit 9196ac0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/gsStructuralAnalysis.h b/gsStructuralAnalysis.h
@@ -1,13 +1,12 @@
 #include <gsCore/gsTemplateTools.h>
+#include <gsStructuralAnalysis/src/gsStructuralAnalysisTools/gsPanelCreator.h>
+
 
 namespace gismo
 {
-
 #ifdef GISMO_WITH_PYBIND11
 
-  namespace py = pybind11;
-
-  void pybind11_init_gsStructuralAnalysis(py::module &m);
+  void pybind11_init_gsStructuralAnalysis(pybind11::module &m);
 
 #endif
 }

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -14,6 +14,11 @@ if (GISMO_BUILD_PCH)
   add_precompiled_header(gsPrecompiledHeader misc/gsPrecompiledHeader.h)
 endif()
 
+  ## Add module
+  add_library(gsStructuralAnalysis_pybind OBJECT
+    gsStructuralAnalysis_.cpp
+    )
+
 FOREACH(subdir ${SUBDIRS})
 
   get_filename_component(GM_NAME ${subdir} NAME)

diff --git a/src/gsStaticSolvers/gsStaticOpt.hpp b/src/gsStaticSolvers/gsStaticOpt.hpp
@@ -66,8 +66,8 @@ void gsStaticOpt<T,Optimizer>::getOptions()
 #ifdef gsHLBFGS_ENABLED
     else if (dynamic_cast<gsHLBFGS<T>*>(&m_optimizer))
     {
-        m_optimizer.options().setReal("MinGradientLength",m_tolF);
-        m_optimizer.options().setReal("MinStepLength",m_tolU);
+        m_optimizer.options().setReal("MinGradLen",m_tolF);
+        m_optimizer.options().setReal("MinStepLen",m_tolU);
     }
 #endif
 #ifdef gsOptim_ENABLED

diff --git a/gsStructuralAnalysis_.cpp → src/gsStructuralAnalysis_.cpp b/gsStructuralAnalysis_.cpp → src/gsStructuralAnalysis_.cpp
@@ -14,6 +14,7 @@ namespace gismo
   {
     gismo::pybind11_init_gsPanelCreator( m );
     /*Bindings for gsStructuralAnalysis go here*/
+
   }
 
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ namespace gismo @@
       {
         gismo::pybind11_init_gsPanelCreator( m );
         /*Bindings for gsStructuralAnalysis go here*/
       }
     #endif
@@ Expand Down @@