Commit 90191a11 authored by Marco Bomben's avatar Marco Bomben
Browse files

fixing style

parent 26292e67

tools/mesh_converter/MeshParser.cpp

+3 −3
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ using namespace mesh_converter; 
std::shared_ptr<MeshParser> MeshParser::factory(const allpix::Configuration& config) {

    auto parser = config.get<std::string>("parser", "df-ise");

    std::transform(parser.begin(), parser.end(), parser.begin(), ::tolower);

    LOG(DEBUG) << "Parser \"" << parser << "\"\n";

    LOG(DEBUG) << "Parser \"" << parser << "\"";

    if(parser == "df-ise" || parser == "dfise") {

        return std::make_shared<DFISEParser>();

    } else if(parser == "silvaco" || parser == "Silvaco") {

    } else if(parser == "silvaco") {

        return std::make_shared<SilvacoParser>();

    } else {

        throw allpix::InvalidValueError(config, "parser", "Unknown parser type");
@@ -82,7 +82,7 @@ MeshParser::getField(const std::string& file, const std::string& observable, con 
    for(const auto& region : regions) {

        if(field_map_[file].find(region) != field_map_[file].end() &&

           field_map_[file][region].find(observable) != field_map_[file][region].end()) {

            LOG(DEBUG) << "Region \"" << region << "\"\n";

            LOG(DEBUG) << "Region \"" << region << "\"";

            field.insert(

                field.end(), field_map_[file][region][observable].begin(), field_map_[file][region][observable].end());

        } else {

tools/mesh_converter/parsers/SilvacoParser.cpp

+1 −7
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { 


    std::vector<Point> vertices;



    std::string region = "Silicon";

    long unsigned int dimension = 1;

    long unsigned int columns_count = 0;

    long long num_lines_parsed = 0;
@@ -91,12 +90,7 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { 
    }

    LOG_PROGRESS(STATUS, "gridlines") << "Parsing grid file: done.";



    std::map<std::string, std::vector<Point>> ret_map;

    // std::vector<Point> ret_vector; // same thing as vertices for Silvaco



    ret_map[region] = vertices;



    return ret_map;

    return {{"Silicon", vertices}};

}



FieldMap SilvacoParser::read_fields(const std::string& file_name) {