Commit 027da641 authored by Christophe Geuzaine's avatar Christophe Geuzaine

Merge branch 'preserveNumberingMsh2' into 'master'

Add preserveNumberingMsh2 as a command line option See merge request !73
parents 8865487f 4d807c10
Pipeline #1100 passed with stage
in 60 minutes 10 seconds
......@@ -76,7 +76,7 @@ std::vector<std::pair<std::string, std::string> > GetUsage()
s.push_back(mp("-format string", "Select output mesh format (auto (default), msh, "
"msh1, msh2, msh3, msh4, unv, vrml, ply2, stl, mesh, bdf, cgns, "
"p3d, diff, med, neu, ...)"));
s.push_back(mp("-bin", "Use binary format when available"));
s.push_back(mp("-bin", "Create binary files when possible"));
s.push_back(mp("-refine", "Perform uniform mesh refinement, then exit"));
s.push_back(mp("-reclassify", "Reclassify mesh, then exit"));
s.push_back(mp("-part int", "Partition after batch mesh generation"));
......@@ -86,6 +86,7 @@ std::vector<std::pair<std::string, std::string> > GetUsage()
s.push_back(mp("-part_[no_]topo", "Create the partition topology"));
s.push_back(mp("-part_[no_]ghosts", "Create ghost cells"));
s.push_back(mp("-part_topo_pro", "Save the partition topology .pro file"));
s.push_back(mp("-preserve_numbering_msh2", "Preserve element numbering in MSH2 format"));
s.push_back(mp("-save_all", "Save all elements (discard physical group definitions)"));
s.push_back(mp("-save_parametric", "Save vertices with their parametric coordinates"));
s.push_back(mp("-save_topology", "Save model topology"));
......@@ -98,7 +99,6 @@ std::vector<std::pair<std::string, std::string> > GetUsage()
"quality less than a threshold"));
s.push_back(mp("-optimize_ho", "Optimize high order meshes"));
s.push_back(mp("-ho_[min,max,nlayers]", "High-order optimization parameters"));
s.push_back(mp("-optimize_lloyd", "Optimize 2D meshes using Lloyd algorithm"));
s.push_back(mp("-clscale float", "Set global mesh element size scaling factor"));
s.push_back(mp("-clmin float", "Set minimum mesh element size"));
s.push_back(mp("-clmax float", "Set maximum mesh element size"));
......@@ -456,6 +456,10 @@ void GetOptions(int argc, char *argv[], bool readConfigFiles)
opt_mesh_partition_split_mesh_files(0, GMSH_SET, 1.);
i++;
}
else if(!strcmp(argv[i] + 1, "preserveNumberingMsh2")) {
opt_mesh_preserve_numbering_msh2(0, GMSH_SET, 1.);
i++;
}
else if(!strcmp(argv[i] + 1, "part_topo_pro") ||
!strcmp(argv[i] + 1, "savePartTopology")){
opt_mesh_partition_save_topology_file(0, GMSH_SET, 1.);
......@@ -569,13 +573,6 @@ void GetOptions(int argc, char *argv[], bool readConfigFiles)
else
Msg::Fatal("Missing number");
}
else if(!strcmp(argv[i] + 1, "optimize_lloyd")) {
i++;
if(argv[i])
CTX::instance()->mesh.optimizeLloyd = atoi(argv[i++]);
else
Msg::Fatal("Missing number of lloyd iterations");
}
else if(!strcmp(argv[i] + 1, "nopopup")) {
CTX::instance()->noPopup = 1;
i++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment