Loading tools/mesh_converter/parsers/SilvacoParser.cpp +19 −40 Original line number Diff line number Diff line Loading @@ -17,8 +17,8 @@ #include <iostream> #include <regex> #include <set> #include <string> #include <sstream> #include <string> #include "TFile.h" #include "TTree.h" Loading @@ -28,15 +28,6 @@ using namespace mesh_converter; MeshMap SilvacoParser::read_meshes(const std::string& file_name) { /*// changing file extension std::string original_file_name = file_name; // save a copy just in case std::string silvaco_extension = "dat"; string::size_type i = file_name.rfind('.', file_name.length()); if (i != string::npos) { file_name.replace(i+1, silvaco_extension.length(), silvaco_extension); } */ std::ifstream file(file_name); if(!file) { Loading @@ -49,7 +40,6 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { file.seekg(0, std::ios::beg); LOG(DEBUG) << "Grid file contains " << num_lines << " lines to parse"; std::vector<Point> vertices; std::string region = "Silicon"; Loading Loading @@ -83,7 +73,6 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { iss.clear(); } // Handle data std::stringstream sstr(line); // Read vertex points Loading @@ -99,13 +88,9 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { vertices.emplace_back(y, z); } } } 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 Loading @@ -126,7 +111,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { file.seekg(0, std::ios::beg); LOG(DEBUG) << "Field data file contains " << num_lines << " lines to parse"; // std::map<std::string, std::vector<Point>> region_electric_field_map; std::map<std::string, std::map<std::string, std::vector<Point>>> region_electric_field_map; std::vector<double> region_electric_field_num; Loading Loading @@ -178,9 +162,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { iss.clear(); } // Handle data std::stringstream sstr(line); double num = NAN; Loading @@ -197,7 +178,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { region_electric_field_num.clear(); } if(dimension == 3) { for(size_t i = 0; i < region_electric_field_num.size(); i += 3) { auto x = region_electric_field_num[i]; Loading @@ -218,7 +198,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { region_electric_field_num.clear(); } LOG_PROGRESS(STATUS, "fieldlines") << "Parsing field data file: done."; return region_electric_field_map; Loading Loading
tools/mesh_converter/parsers/SilvacoParser.cpp +19 −40 Original line number Diff line number Diff line Loading @@ -17,8 +17,8 @@ #include <iostream> #include <regex> #include <set> #include <string> #include <sstream> #include <string> #include "TFile.h" #include "TTree.h" Loading @@ -28,15 +28,6 @@ using namespace mesh_converter; MeshMap SilvacoParser::read_meshes(const std::string& file_name) { /*// changing file extension std::string original_file_name = file_name; // save a copy just in case std::string silvaco_extension = "dat"; string::size_type i = file_name.rfind('.', file_name.length()); if (i != string::npos) { file_name.replace(i+1, silvaco_extension.length(), silvaco_extension); } */ std::ifstream file(file_name); if(!file) { Loading @@ -49,7 +40,6 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { file.seekg(0, std::ios::beg); LOG(DEBUG) << "Grid file contains " << num_lines << " lines to parse"; std::vector<Point> vertices; std::string region = "Silicon"; Loading Loading @@ -83,7 +73,6 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { iss.clear(); } // Handle data std::stringstream sstr(line); // Read vertex points Loading @@ -99,13 +88,9 @@ MeshMap SilvacoParser::read_meshes(const std::string& file_name) { vertices.emplace_back(y, z); } } } 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 Loading @@ -126,7 +111,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { file.seekg(0, std::ios::beg); LOG(DEBUG) << "Field data file contains " << num_lines << " lines to parse"; // std::map<std::string, std::vector<Point>> region_electric_field_map; std::map<std::string, std::map<std::string, std::vector<Point>>> region_electric_field_map; std::vector<double> region_electric_field_num; Loading Loading @@ -178,9 +162,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { iss.clear(); } // Handle data std::stringstream sstr(line); double num = NAN; Loading @@ -197,7 +178,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { region_electric_field_num.clear(); } if(dimension == 3) { for(size_t i = 0; i < region_electric_field_num.size(); i += 3) { auto x = region_electric_field_num[i]; Loading @@ -218,7 +198,6 @@ FieldMap SilvacoParser::read_fields(const std::string& file_name) { region_electric_field_num.clear(); } LOG_PROGRESS(STATUS, "fieldlines") << "Parsing field data file: done."; return region_electric_field_map; Loading