diff --git a/lib/mesh/mesh.cpp b/lib/mesh/mesh.cpp index ccfe9ad..8808404 100644 --- a/lib/mesh/mesh.cpp +++ b/lib/mesh/mesh.cpp @@ -306,14 +306,10 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out { if (out_mode == OverWrite) save_gmsh(filename, packed); - //std::ofstream outfile; - //gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); - for (size_t i = 0; i < datalist_.size(); i++) { if (datalist_[i].loctype_ == NodeData) { - //gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::NodeData, packed); if (datalist_[i].valtype_ == Scalar) meshio_.save_data(datalist_[i].name_, datalist_[i].datval_, NodeData); else if (datalist_[i].valtype_ == Vector) { @@ -325,32 +321,12 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out vec_data[j].z = datalist_[i].datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::NodeData, packed); meshio_.save_data(datalist_[i].name_, vec_data, NodeData); } - //else if (datalist_[i].valtype_ == Tensor) - //{ - // array ten_data(node_num_); - // for (size_t j = 0; j < node_num_; j++) - // { - // ten_data[j].val[0][0] = datalist_[i].datval_[9*j]; - // ten_data[j].val[0][1] = datalist_[i].datval_[9*j+1]; - // ten_data[j].val[0][2] = datalist_[i].datval_[9*j+2]; - // ten_data[j].val[1][0] = datalist_[i].datval_[9*j+3]; - // ten_data[j].val[1][1] = datalist_[i].datval_[9*j+4]; - // ten_data[j].val[1][2] = datalist_[i].datval_[9*j+5]; - // ten_data[j].val[2][0] = datalist_[i].datval_[9*j+6]; - // ten_data[j].val[2][1] = datalist_[i].datval_[9*j+7]; - // ten_data[j].val[2][2] = datalist_[i].datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, datalist_[i].name_, ten_data, gctl::NodeData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else if (datalist_[i].loctype_ == ElemData) { - //gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::ElemData, packed); if (datalist_[i].valtype_ == Scalar) meshio_.save_data(datalist_[i].name_, datalist_[i].datval_, ElemData); else if (datalist_[i].valtype_ == Vector) { @@ -362,27 +338,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out vec_data[j].z = datalist_[i].datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::ElemData, packed); meshio_.save_data(datalist_[i].name_, vec_data, ElemData); } - //else if (datalist_[i].valtype_ == Tensor) - //{ - // array ten_data(ele_num_); - // for (size_t j = 0; j < ele_num_; j++) - // { - // ten_data[j].val[0][0] = datalist_[i].datval_[9*j]; - // ten_data[j].val[0][1] = datalist_[i].datval_[9*j+1]; - // ten_data[j].val[0][2] = datalist_[i].datval_[9*j+2]; - // ten_data[j].val[1][0] = datalist_[i].datval_[9*j+3]; - // ten_data[j].val[1][1] = datalist_[i].datval_[9*j+4]; - // ten_data[j].val[1][2] = datalist_[i].datval_[9*j+5]; - // ten_data[j].val[2][0] = datalist_[i].datval_[9*j+6]; - // ten_data[j].val[2][1] = datalist_[i].datval_[9*j+7]; - // ten_data[j].val[2][2] = datalist_[i].datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, datalist_[i].name_, ten_data, gctl::ElemData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); @@ -394,13 +351,9 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna { if (out_mode == OverWrite) save_gmsh(filename, packed); - //std::ofstream outfile; - //gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); - const meshdata &data = get_data(datname); if (data.loctype_ == NodeData) { - //gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::NodeData, packed); if (data.valtype_ == Scalar) meshio_.save_data(data.name_, data.datval_, NodeData); else if (data.valtype_ == Vector) { @@ -412,27 +365,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna vec_data[j].z = data.datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::NodeData, packed); meshio_.save_data(data.name_, vec_data, NodeData); } - //else if (data.valtype_ == Tensor) - //{ - // array ten_data(node_num_); - // for (size_t j = 0; j < node_num_; j++) - // { - // ten_data[j].val[0][0] = data.datval_[9*j]; - // ten_data[j].val[0][1] = data.datval_[9*j+1]; - // ten_data[j].val[0][2] = data.datval_[9*j+2]; - // ten_data[j].val[1][0] = data.datval_[9*j+3]; - // ten_data[j].val[1][1] = data.datval_[9*j+4]; - // ten_data[j].val[1][2] = data.datval_[9*j+5]; - // ten_data[j].val[2][0] = data.datval_[9*j+6]; - // ten_data[j].val[2][1] = data.datval_[9*j+7]; - // ten_data[j].val[2][2] = data.datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, data.name_, ten_data, gctl::NodeData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else if (data.loctype_ == ElemData) @@ -449,27 +383,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna vec_data[j].z = data.datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::ElemData, packed); meshio_.save_data(data.name_, vec_data, ElemData); } - //else if (data.valtype_ == Tensor) - //{ - // array ten_data(ele_num_); - // for (size_t j = 0; j < ele_num_; j++) - // { - // ten_data[j].val[0][0] = data.datval_[9*j]; - // ten_data[j].val[0][1] = data.datval_[9*j+1]; - // ten_data[j].val[0][2] = data.datval_[9*j+2]; - // ten_data[j].val[1][0] = data.datval_[9*j+3]; - // ten_data[j].val[1][1] = data.datval_[9*j+4]; - // ten_data[j].val[1][2] = data.datval_[9*j+5]; - // ten_data[j].val[2][0] = data.datval_[9*j+6]; - // ten_data[j].val[2][1] = data.datval_[9*j+7]; - // ten_data[j].val[2][2] = data.datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, data.name_, ten_data, gctl::ElemData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); diff --git a/lib/mesh/tri2d_mesh.cpp b/lib/mesh/tri2d_mesh.cpp index 9793084..1ab8173 100644 --- a/lib/mesh/tri2d_mesh.cpp +++ b/lib/mesh/tri2d_mesh.cpp @@ -214,11 +214,6 @@ void gctl::triangle2d_mesh::load_gmsh_groups() void gctl::triangle2d_mesh::save_gmsh(std::string filename, index_packed_e packed) { - std::ofstream outfile; - gctl::open_outfile(outfile, filename, ".msh"); - gctl::save2gmsh(outfile, elems_, nodes_, packed); - outfile.close(); - meshio_.init_file(filename, Output); meshio_.set_packed(packed, Output); meshio_.save_mesh(elems_, nodes_);