Commit 767e5b96 authored by Christophe Geuzaine's avatar Christophe Geuzaine

- option to make reconstructing topology optional when reading cgns files

- reinstated (alpha quality) cgns exporter
parent ebef1bfb
Pipeline #1854 passed with stage
in 15 minutes 47 seconds
......@@ -43,7 +43,7 @@ struct contextMeshOptions {
int saveAll, saveTri, saveGroupsOfNodes, binary, bdfFieldFormat;
int saveParametric, saveTopology, zoneDefinition;
int saveElementTagType, switchElementTags;
int cgnsImportOrder;
int cgnsImportOrder, cgnsConstructTopology;
int preserveNumberingMsh2;
// partitioning
int numPartitions, partitionCreateTopology, partitionCreateGhostCells;
......
......@@ -866,9 +866,9 @@ StringXNumber GeometryOptions_Number[] = {
"Matches geometries and meshes" },
{ F|O, "MatchMeshScaleFactor" , opt_geometry_match_mesh_scale_factor, 1 ,
"Rescaling factor for the mesh to correspond to size of the geometry" },
{ F|O, "MatchMeshTolerance", opt_geometry_match_mesh_tolerance, 1e-6,
{ F|O, "MatchMeshTolerance", opt_geometry_match_mesh_tolerance, 1e-6,
"Tolerance for matching mesh and geometry"},
{ F|O, "Normals" , opt_geometry_normals , 0. ,
"Display size of normal vectors (in pixels)" },
{ F|O, "NumSubEdges" , opt_geometry_num_sub_edges , 40. ,
......@@ -999,6 +999,8 @@ StringXNumber MeshOptions_Number[] = {
{ F|O, "CgnsImportOrder" , opt_mesh_cgns_import_order , 1. ,
"Enable the creation of high-order mesh from CGNS structured meshes"
"(1, 2, 4, 8, ...)" },
{ F|O, "CgnsConstructTopology" , opt_mesh_cgns_construct_topology , 0. ,
"Reconstruct the model topology (BREP) after reading a CGNS file" },
{ F|O, "CharacteristicLengthExtendFromBoundary" ,
opt_mesh_lc_extend_from_boundary, 1. ,
"Extend computation of mesh element sizes from the boundaries into the surfaces/volumes" },
......
......@@ -6258,6 +6258,14 @@ double opt_mesh_cgns_import_order(OPT_ARGS_NUM)
return CTX::instance()->mesh.cgnsImportOrder;
}
double opt_mesh_cgns_construct_topology(OPT_ARGS_NUM)
{
if(action & GMSH_SET) {
CTX::instance()->mesh.cgnsConstructTopology = (int)val;
}
return CTX::instance()->mesh.cgnsConstructTopology;
}
double opt_mesh_dual(OPT_ARGS_NUM)
{
if(action & GMSH_SET) {
......
......@@ -523,6 +523,7 @@ double opt_mesh_second_order_experimental(OPT_ARGS_NUM);
double opt_mesh_second_order_linear(OPT_ARGS_NUM);
double opt_mesh_second_order_incomplete(OPT_ARGS_NUM);
double opt_mesh_cgns_import_order(OPT_ARGS_NUM);
double opt_mesh_cgns_construct_topology(OPT_ARGS_NUM);
double opt_mesh_dual(OPT_ARGS_NUM);
double opt_mesh_voronoi(OPT_ARGS_NUM);
double opt_mesh_draw_skin_only(OPT_ARGS_NUM);
......
This diff is collapsed.
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