Removes Map (unused)

OpenSEMBA · Jan 15, 2025 · 21f3269 · 21f3269
1 parent ac112a3
commit 21f3269
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 129 deletions.
diff --git a/src/types/Map.h b/src/types/Map.h
diff --git a/src/types/Mesher.h b/src/types/Mesher.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Mesh.h"
-#include "Map.h"
 
 namespace meshlib {
 
@@ -11,23 +10,8 @@ class Mesher {
     virtual ~Mesher() = default;
 
     virtual Mesh mesh() const = 0;
-    virtual Map getMap() const = 0;
-    virtual bool isStructured() const = 0;
-
-    static Mesh getNotMeshedElems(const Mesh& input, const Map& map) 
-    {
-        Mesh res;
-        res.coordinates = input.coordinates;
-        res.groups.resize(input.groups.size());
-        for (GroupId g = 0; g < input.groups.size(); g++) {
-            for (ElementId e = 0; e < input.groups[g].elements.size(); e++) {
-                if (map.groups[g].elements[e].empty()) {
-                    res.groups[g].elements.push_back(input.groups[g].elements[e]);
-                }
-            }
-        }
-        return res;
-    }
+    virtual bool isStructured() const = 0;  
+
 };
 
 }
diff --git a/src/utils/Cleaner.cpp b/src/utils/Cleaner.cpp
@@ -13,18 +13,6 @@
 namespace meshlib {
 namespace utils {
 
-void Cleaner::clean(Mesh& output, Map& map) 
-{
-    cleanElems_ (output, map);
-    cleanCoords_(output, map);
-}
-
-void Cleaner::cleanCoords(Mesh& output) 
-{
-    Map map;
-    cleanCoords_(output, map);
-}
-
 void Cleaner::removeRepeatedElementsIgnoringOrientation(Mesh& m)
 {
     std::vector<std::set<ElementId>> toRemove(m.groups.size());
@@ -179,51 +167,8 @@ void Cleaner::fuseCoords(Mesh& mesh)
     });
 }
 
-
-void Cleaner::cleanElems_(Mesh& output, Map& map) 
-{
-    std::size_t numUnstrElems = 0;
-    std::size_t numStrElems = 0;
-    for (GroupId g = 0; g < map.groups.size(); g++) {
-        numUnstrElems += map.groups[g].elements.size();
-        numStrElems   += output.groups[g].elements.size();
-    }
-
-    for (GroupId g = 0; g < map.groups.size(); g++) {
-        std::vector<bool> elemsUsed(output.groups[g].elements.size(), false);
-        for (ElementId e = 0; e < map.groups[g].elements.size(); e++) {
-            for (ElementId
-                 mE = 0; mE < map.groups[g].elements[e].size(); mE++) {
-                elemsUsed[map.groups[g].elements[e][mE]] = true;
-            }
-        }
-        std::map<ElementId, ElementId> elemsMap;
-        std::vector<Element> aux = output.groups[g].elements;
-        output.groups[g].elements.clear();
-        for (ElementId e = 0; e < aux.size(); e++) {
-            if (elemsUsed[e]) {
-                elemsMap[e] = output.groups[g].elements.size();
-                output.groups[g].elements.push_back(aux[e]);
-            }
-
-        }
-        for (ElementId e = 0; e < map.groups[g].elements.size(); e++) {
-            Map::Element aux = map.groups[g].elements[e];
-            map.groups[g].elements[e].clear();
-            for (ElementId mE = 0; mE < aux.size(); mE++) {
-                if (elemsMap.count(aux[mE]) != 0) {
-                    map.groups[g].elements[e].push_back(elemsMap[aux[mE]]);
-                }
-            }
-
-        }
-    }
-
-}
-
-void Cleaner::cleanCoords_(Mesh& output, Map& map) 
+void Cleaner::cleanCoords(Mesh& output) 
 {
-    const std::size_t& numUnstrCoords = map.coordinates.size();
     const std::size_t& numStrCoords = output.coordinates.size();
 
     IdSet coordsUsed;
@@ -233,9 +178,6 @@ void Cleaner::cleanCoords_(Mesh& output, Map& map)
                 coordsUsed.insert(e.vertices.begin(), e.vertices.end());
         }
     }
-    for (auto const strCoords: map.coordinates) {
-            coordsUsed.insert(strCoords.begin(), strCoords.end());
-    }
 
     std::map<CoordinateId, CoordinateId> remap;
     std::vector<Coordinate> aux = output.coordinates;
@@ -256,12 +198,6 @@ void Cleaner::cleanCoords_(Mesh& output, Map& map)
 
         }
     }
-
-    for (CoordinateId c = 0; c < map.coordinates.size(); c++) {
-        for (std::size_t i = 0; i < map.coordinates[c].size(); i++) {
-            map.coordinates[c][i] = remap[map.coordinates[c][i]];
-        }       
-    }
 
 }
 

diff --git a/src/utils/Cleaner.h b/src/utils/Cleaner.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../types/Map.h"
 #include "../types/Mesh.h"
+#include "Types.h"
 
 #include <functional>
 
@@ -10,7 +10,6 @@ namespace utils {
 
 class Cleaner {
 public:
-    static void clean(Mesh&, Map&);
     static void cleanCoords(Mesh&);
     static void fuseCoords(Mesh&);
     static void removeElementsWithCondition(Mesh&, std::function<bool(const Element&)>);
@@ -19,8 +18,6 @@ class Cleaner {
     static void removeRepeatedElementsIgnoringOrientation(Mesh&);
     static void removeElements(Mesh&, const std::vector<IdSet>&);
 private:
-    static void cleanElems_(Mesh&, Map&);
-    static void cleanCoords_(Mesh&, Map&);
     static void fuseCoords_(Mesh&);
 
     static Elements findDegenerateElements_(const Group&, const Coordinates&);