Merge branch 'main' into fem_2d_analyses

FEA-eng · Mar 2, 2024 · d9a05a1 · d9a05a1
2 parents 94682cc + 6c8ee59
commit d9a05a1
Show file tree

Hide file tree

Showing 486 changed files with 53,950 additions and 47,712 deletions.
diff --git a/cMake/ConfigureChecks.cmake b/cMake/ConfigureChecks.cmake
@@ -9,33 +9,8 @@ include(CheckCSourceCompiles)
 include(CheckIncludeFileCXX)
 include(CheckCXXSourceCompiles)
 
-#check_include_file(dlfcn.h HAVE_DLFCN_H)
 check_include_file(GL/gl.h HAVE_GL_GL_H)
 
-#check_include_file(iomanip.h HAVE_IOMANIP_H)
-#check_include_file(limits.h HAVE_LIMITS_H)
-#check_include_file(values.h HAVE_VALUES_H)
-#check_include_file(float.h HAVE_FLOAT_H)
-#check_include_file(inttypes.h HAVE_INTTYPES_H)
-
-#check_include_file(libc.h HAVE_LIBC_H)
-#check_include_file(memory.h HAVE_MEMORY_H)
-#check_include_file(stdint.h HAVE_STDINT_H)
-#check_include_file(stdlib.h HAVE_STDLIB_H)
-#check_include_file(unistd.h HAVE_UNISTD_H)
-#check_include_file(strings.h HAVE_STRINGS_H)
-#check_include_file(string.h HAVE_STRING_H)
-
-#check_include_file(bstring.h HAVE_BSTRING_H)
-#check_include_file(siginfo.h HAVE_SIGINFO_H)
-#check_include_file(bits/sigset.h HAVE_BITS_SIGSET_H)
-#check_include_file(sys/dir.h HAVE_SYS_DIR_H)
-#check_include_file(sys/filio.h HAVE_SYS_FILIO_H)
-#check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
-#check_include_file(sys/select.h HAVE_SYS_SELECT_H)
-#check_include_file(sys/stat.h HAVE_SYS_STAT_H)
-#check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-
 # i/o streams
 check_include_file_cxx(istream HAVE_ISTREAM)
 check_include_file_cxx(ostream HAVE_OSTREAM)

diff --git a/cMake/FindNETGEN.cmake b/cMake/FindNETGEN.cmake
@@ -27,29 +27,7 @@ else(Netgen_FOUND)
 
   SET(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
 
-  IF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
-      # We haven't supported Netgen prior to 5.3.1 on MacOS, and the current
-      # plan is for the next Netgen version to be 6.1 (currently unreleased).
-      IF(DEFINED HOMEBREW_PREFIX)
-          SET(NGLIB_PREFIX ${HOMEBREW_PREFIX})
-      ELSE(DEFINED HOMEBREW_PREFIX)
-          SET(NGLIB_PREFIX ${MACPORTS_PREFIX})
-      ENDIF(DEFINED HOMEBREW_PREFIX)
-
-      FIND_PATH(NGLIB_INCLUDE_DIR nglib.h ${NGLIB_PREFIX}/include)
-
-      FIND_LIBRARY(NGLIB_LIBNGLIB nglib ${NGLIB_PREFIX}/lib)
-      FIND_LIBRARY(NGLIB_LIBMESH mesh ${NGLIB_PREFIX}/lib)
-      FIND_LIBRARY(NGLIB_LIBOCC occ ${NGLIB_PREFIX}/lib)
-      FIND_LIBRARY(NGLIB_LIBINTERFACE interface ${NGLIB_PREFIX}/lib)
-      SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB} ${NGLIB_LIBMESH}
-                          ${NGLIB_LIBOCC} ${NGLIB_LIBINTERFACE})
-
-      IF(NOT NETGENDATA)
-          SET(NETGENDATA ${NGLIB_PREFIX}/include/netgen)
-      ENDIF(NOT NETGENDATA)
-
-  ELSEIF(WIN32)
+  IF(WIN32)
       FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR})
       SET(NETGEN_LIBS nglib mesh occ interface)
       SET(NGLIB_LIBRARIES "")
@@ -72,7 +50,7 @@ else(Netgen_FOUND)
           SET(NETGENDATA netgen)
       ENDIF(NOT NETGENDATA)
 
-  ELSE(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
+  ELSEIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
       IF(NETGEN_ROOT)
           SET(NETGEN_INCLUDEDIR ${NETGEN_ROOT}/include)
           SET(NETGEN_LIBDIR ${NETGEN_ROOT}/lib)
@@ -101,17 +79,14 @@ else(Netgen_FOUND)
       IF(NOT NETGENDATA)
           SET(NETGENDATA /usr/share/netgen/libsrc)
       ENDIF(NOT NETGENDATA)
-
   ENDIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
 
   FIND_PATH(NETGEN_DIR_include NAMES mydefs.hpp     NO_DEFAULT_PATH PATHS ${NGLIB_INCLUDE_DIR}/include ${NETGENDATA}/include ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR})
 
   IF(NOT NGLIB_INCLUDE_DIR AND NOT NETGEN_DIR_include)
       MESSAGE(STATUS "Cannot find NETGEN header files.")
   ELSEIF(NOT NETGEN_VERSION)
-      file(STRINGS ${NETGEN_DIR_include}/mydefs.hpp NETGEN_VERSION
-          REGEX "#define PACKAGE_VERSION.*"
-      )
+      file(STRINGS ${NETGEN_DIR_include}/mydefs.hpp NETGEN_VERSION REGEX "#define PACKAGE_VERSION.*")
   ENDIF()
 
   IF(NOT NGLIB_LIBRARIES)

diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h
@@ -270,12 +270,8 @@ class AppExport ComplexGeoData: public Base::Persistence, public Base::Handled
      *
      * @return Returns the existing element map.
      */
-    virtual ElementMapPtr resetElementMap(ElementMapPtr elementMap = ElementMapPtr(),
-                                          ElementMapResetPolicy forceEmpty = ForceEmptyMap)
+    virtual ElementMapPtr resetElementMap(ElementMapPtr elementMap = ElementMapPtr())
     {
-        if (!elementMap && forceEmpty == ForceEmptyMap) {
-            elementMap = std::make_shared<Data::ElementMap>();
-        }
         _elementMap.swap(elementMap);
         return elementMap;
     }

diff --git a/src/App/ElementMap.cpp b/src/App/ElementMap.cpp
@@ -562,6 +562,13 @@ MappedName ElementMap::setElementName(const IndexedName& element, const MappedNa
         }
     }
 
+    // Originally in ComplexGeoData::setElementName
+    // LinkStable/src/App/ComplexGeoData.cpp#L1631
+    // No longer possible after map separated in ElementMap.cpp
+
+    // if(!_ElementMap)
+    //     resetElementMap(std::make_shared<ElementMap>());
+
     ElementIDRefs _sid;
     if (!sid) {
         sid = &_sid;

diff --git a/src/App/GeoFeature.cpp b/src/App/GeoFeature.cpp
@@ -25,6 +25,7 @@
 
 #include <App/GeoFeaturePy.h>
 
+#include "ComplexGeoData.h"
 #include "GeoFeature.h"
 #include "GeoFeatureGroupExtension.h"
 #include "ElementNamingUtils.h"
@@ -78,17 +79,52 @@ PyObject* GeoFeature::getPyObject()
     return Py::new_reference_to(PythonObject);
 }
 
-
-std::pair<std::string,std::string> GeoFeature::getElementName(
-        const char *name, ElementNameType type) const
+std::pair<std::string,std::string>
+GeoFeature::getElementName(const char *name, ElementNameType type) const
 {
     (void)type;
 
     std::pair<std::string,std::string> ret;
     if(!name)
         return ret;
+    auto prop = getPropertyOfGeometry();
+    if (!prop) {
+        return std::make_pair("", name);
+    }
+
+    auto geo = prop->getComplexData();
+    if (!geo) {
+        return std::make_pair("", name);
+    }
+
+    return _getElementName(name, geo->getElementName(name));
+}
+
+std::pair<std::string, std::string>
+GeoFeature::_getElementName(const char* name, const Data::MappedElement& mapped) const
+{
+    std::pair<std::string, std::string> ret;
+    if (mapped.index && mapped.name) {
+        std::ostringstream ss;
+        ss << Data::ComplexGeoData::elementMapPrefix() << mapped.name << '.' << mapped.index;
+        ret.first = ss.str();
+        mapped.index.appendToStringBuffer(ret.second);
+    }
+    else if (mapped.name) {
+        //        FC_TRACE("element mapped name " << name << " not found in " << getFullName());
+        ret.first = name;
+        const char* dot = strrchr(name, '.');
+        if (dot) {
+            // deliberately mangle the old style element name to signal a
+            // missing reference
+            ret.second = Data::MISSING_PREFIX;
+            ret.second += dot + 1;
+        }
+    }
+    else {
+        mapped.index.appendToStringBuffer(ret.second);
+    }
 
-    ret.second = name;
     return ret;
 }
 

diff --git a/src/App/GeoFeature.h b/src/App/GeoFeature.h
@@ -26,7 +26,7 @@
 
 #include "DocumentObject.h"
 #include "PropertyGeo.h"
-
+#include "MappedElement.h"
 
 namespace App
 {
@@ -120,6 +120,10 @@ class AppExport GeoFeature : public App::DocumentObject
      * @return Base::Placement The transformation from the global reference coordinate system
      */
     Base::Placement globalPlacement() const;
+
+protected:
+    std::pair<std::string, std::string> _getElementName(const char* name,
+                                                        const Data::MappedElement& mapped) const;
 };
 
 } //namespace App

diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h
@@ -44,7 +44,6 @@ class ComplexGeoData;
 
 namespace App
 {
-class Feature;
 class Placement;
 
 

diff --git a/src/App/Resources/translations/App.ts b/src/App/Resources/translations/App.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../Application.cpp" line="446"/>
+        <location filename="../../Application.cpp" line="448"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/App/Resources/translations/App_be.ts b/src/App/Resources/translations/App_be.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Без назвы</translation>
     </message>

diff --git a/src/App/Resources/translations/App_ca.ts b/src/App/Resources/translations/App_ca.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Sense nom</translation>
     </message>

diff --git a/src/App/Resources/translations/App_cs.ts b/src/App/Resources/translations/App_cs.ts
@@ -14,7 +14,7 @@ které odkazují na stejný konfigurovatelný objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Nepojmenovaný</translation>
     </message>

diff --git a/src/App/Resources/translations/App_de.ts b/src/App/Resources/translations/App_de.ts
@@ -14,7 +14,7 @@ angewendet werden soll, die das gleiche konfigurierbare Objekt referenzieren</tr
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Unbenannt</translation>
     </message>

diff --git a/src/App/Resources/translations/App_el.ts b/src/App/Resources/translations/App_el.ts
@@ -14,7 +14,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Ανώνυμο</translation>
     </message>

diff --git a/src/App/Resources/translations/App_es-AR.ts b/src/App/Resources/translations/App_es-AR.ts
@@ -14,7 +14,7 @@ que hacen referencia al mismo objeto configurable</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

diff --git a/src/App/Resources/translations/App_es-ES.ts b/src/App/Resources/translations/App_es-ES.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

diff --git a/src/App/Resources/translations/App_eu.ts b/src/App/Resources/translations/App_eu.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Izenik gabea</translation>
     </message>

diff --git a/src/App/Resources/translations/App_fi.ts b/src/App/Resources/translations/App_fi.ts
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Nimetön</translation>
     </message>

diff --git a/src/App/Resources/translations/App_fr.ts b/src/App/Resources/translations/App_fr.ts
@@ -7,13 +7,13 @@
       <location filename="../../Link.cpp" line="118"/>
       <source>Stores the last user choice of whether to apply CopyOnChange setup to all links
 that reference the same configurable object</source>
-      <translation>Enregistre le dernier choix de l'utilisateur concernant l'application de la configuration CopyOnChange à tous les liens qui font référence au même objet configurable</translation>
+      <translation>Enregistre le dernier choix de l'utilisateur concernant la configuration de CopyOnChange sur tous les liens qui font référence au même objet configurable.</translation>
     </message>
   </context>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Sans nom</translation>
     </message>

diff --git a/src/App/Resources/translations/App_gl.ts b/src/App/Resources/translations/App_gl.ts
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Sen nome</translation>
     </message>

diff --git a/src/App/Resources/translations/App_hr.ts b/src/App/Resources/translations/App_hr.ts
@@ -14,7 +14,7 @@ na sve veze koje referenciraju isti konfigurabilni objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Neimenovano</translation>
     </message>

diff --git a/src/App/Resources/translations/App_hu.ts b/src/App/Resources/translations/App_hu.ts
@@ -14,7 +14,7 @@ amelyek ugyanarra a konfigurálható tárgyra hivatkoznak</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Névtelen</translation>
     </message>

diff --git a/src/App/Resources/translations/App_id.ts b/src/App/Resources/translations/App_id.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Tanpa nama</translation>
     </message>

diff --git a/src/App/Resources/translations/App_it.ts b/src/App/Resources/translations/App_it.ts
@@ -14,7 +14,7 @@ che fanno riferimento allo stesso oggetto configurabile</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>Senza nome</translation>
     </message>

diff --git a/src/App/Resources/translations/App_ja.ts b/src/App/Resources/translations/App_ja.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>名称未設定</translation>
     </message>

diff --git a/src/App/Resources/translations/App_ka.ts b/src/App/Resources/translations/App_ka.ts
@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>უსახელო</translation>
     </message>

diff --git a/src/App/Resources/translations/App_ko.ts b/src/App/Resources/translations/App_ko.ts
@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="446"/>
+      <location filename="../../Application.cpp" line="448"/>
       <source>Unnamed</source>
       <translation>이름없음</translation>
     </message>
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,6 @@ class ComplexGeoData; @@
     namespace App
     {
-    class Feature;
     class Placement;
@@ Expand Down @@