Commit 2223d509 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

MeshParser/DF-ISE: generate points in place.

parent bc4ef867

tools/mesh_converter/MeshElement.hpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ namespace mesh_converter { 
    public:

        Point() noexcept = default;

        Point(double px, double py, double pz) noexcept : x(px), y(py), z(pz), dim(3){};

        Point(double px, double py) noexcept : x(px), y(py), dim(2){};

        Point(double py, double pz) noexcept : y(py), z(pz), dim(2){};



        double x{0}, y{0}, z{0};

        unsigned int dim{0};

tools/mesh_converter/parsers/DFISEParser.cpp

+6 −12
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ MeshMap DFISEParser::read_meshes(const std::string& file_name) { 


    std::map<std::string, std::vector<long unsigned int>> regions_vertices;



    Point point(-1.0, -1.0, -1.0);



    std::string region;

    long unsigned int dimension = 1;

    long unsigned int data_count = 0;
@@ -192,19 +190,15 @@ MeshMap DFISEParser::read_meshes(const std::string& file_name) { 
        case DFSection::VERTICES: {

            // Read vertex points

            if(dimension == 3) {

                point.x = -1.0;

                point.y = -1.0;

                point.z = -1.0;

                while(sstr >> point.x >> point.y >> point.z) {

                    vertices.push_back(point);

                double x = 0, y = 0, z = 0;

                while(sstr >> x >> y >> z) {

                    vertices.emplace_back(x, y, z);

                }

            }

            if(dimension == 2) {

                point.x = -1.0;

                point.y = -1.0;

                point.z = -1.0;

                while(sstr >> point.y >> point.z) {

                    vertices.push_back(point);

                double y = 0, z = 0;

                while(sstr >> y >> z) {

                    vertices.emplace_back(y, z);

                }

            }

        } break;