diff --git a/FileIO/GMSInterface.cpp b/FileIO/GMSInterface.cpp index a65c3cd22984813df4c96d3f1f73a237004d5121..0a100dc0fb5af33992fbf19dfbc9e2264e080717 100644 --- a/FileIO/GMSInterface.cpp +++ b/FileIO/GMSInterface.cpp @@ -328,6 +328,6 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(std::string filename) in.close(); std::cout << "finished" << std::endl; - std::string mesh_name (BaseLib::getFileNameFromPath(filename)); + std::string mesh_name (BaseLib::getFileNameFromPath(filename, false)); return new MeshLib::Mesh(mesh_name, nodes, elements); } diff --git a/FileIO/Legacy/MeshIO.cpp b/FileIO/Legacy/MeshIO.cpp index 0717314aaf01c4d973167b7486b8d3423f409e51..6c20b1b12cd3201fd3b99c5d5ca6216a2408e23d 100644 --- a/FileIO/Legacy/MeshIO.cpp +++ b/FileIO/Legacy/MeshIO.cpp @@ -107,7 +107,7 @@ MeshLib::Mesh* MeshIO::loadMeshFromFile(const std::string& file_name) } - MeshLib::Mesh* mesh (new MeshLib::Mesh(BaseLib::getFileNameFromPath(file_name), nodes, elements)); + MeshLib::Mesh* mesh (new MeshLib::Mesh(BaseLib::getFileNameFromPath(file_name, false), nodes, elements)); mesh->setEdgeLengthRange(sqrt(edge_length[0]), sqrt(edge_length[1])); std::cout << "finished." << std::endl; diff --git a/FileIO/MeshIO/GMSHInterface.cpp b/FileIO/MeshIO/GMSHInterface.cpp index 7c60bad6f89ebe029638bafd24b6113b8dfb0b1e..3aa6e5cad64f6f15116d75367b7283d848e13b5d 100644 --- a/FileIO/MeshIO/GMSHInterface.cpp +++ b/FileIO/MeshIO/GMSHInterface.cpp @@ -211,7 +211,7 @@ MeshLib::Mesh* GMSHInterface::readGMSHMesh(std::string const& fname) } } in.close(); - return new MeshLib::Mesh(BaseLib::getFileNameFromPath(fname), nodes, elements); + return new MeshLib::Mesh(BaseLib::getFileNameFromPath(fname, false), nodes, elements); } void GMSHInterface::readNodeIDs(std::ifstream &in, unsigned n_nodes, std::vector<unsigned> &node_ids, std::map<unsigned, unsigned> &id_map) diff --git a/FileIO/RapidXmlIO/RapidVtuInterface.cpp b/FileIO/RapidXmlIO/RapidVtuInterface.cpp index 1dc0bd180c83eb653ab08f5289ebf52d40eb658b..65738ea028f07a92f897c1eeadd3db15b3d11081 100644 --- a/FileIO/RapidXmlIO/RapidVtuInterface.cpp +++ b/FileIO/RapidXmlIO/RapidVtuInterface.cpp @@ -178,7 +178,7 @@ MeshLib::Mesh* RapidVtuInterface::readVTUFile(const std::string &file_name) std::cout << "Nr. Nodes: " << nodes.size() << std::endl; std::cout << "Nr. Elements: " << elements.size() << std::endl; delete [] buffer; - return new MeshLib::Mesh(BaseLib::getFileNameFromPath(file_name), nodes, elements); + return new MeshLib::Mesh(BaseLib::getFileNameFromPath(file_name, false), nodes, elements); } else { std::cout << "Error in RapidVtuInterface::readVTUFile() - Number of nodes and elements not specified." << std::endl; diff --git a/Utils/FileConverter/generateMatPropsFromMatID.cpp b/Utils/FileConverter/generateMatPropsFromMatID.cpp index 1361a6d0891215cf7f5196729780c5104f30d9a5..9a9aec192ef8223a0781d739389fecd71f8c285b 100644 --- a/Utils/FileConverter/generateMatPropsFromMatID.cpp +++ b/Utils/FileConverter/generateMatPropsFromMatID.cpp @@ -28,7 +28,7 @@ int main (int argc, char* argv[]) // create file std::string filename(argv[1]); - std::string name(BaseLib::getFileNameFromPath(filename)); + std::string name(BaseLib::getFileNameFromPath(filename, false)); std::string new_matname(name + "_prop"); std::ofstream out_prop( new_matname.c_str(), std::ios::out );