Merge branch 'default-zip-pcurve' into 'master'

makes zip_pcurve opt-in See merge request fun3d-developers/refine!731
nasa · Apr 21, 2021 · d017e02 · d017e02
2 parents a0de0c8 + c3782d6
commit d017e02
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/ref_geom.c b/src/ref_geom.c
@@ -85,7 +85,7 @@ REF_STATUS ref_geom_create(REF_GEOM *ref_geom_ptr) {
   ref_geom->nnode = REF_EMPTY;
   ref_geom->nedge = REF_EMPTY;
   ref_geom->nface = REF_EMPTY;
-  ref_geom->zip_pcurve = REF_TRUE;
+  ref_geom->zip_pcurve = REF_FALSE;
   ref_geom->effective = REF_FALSE;
   ref_geom->effective_curvature = REF_TRUE;
   ref_geom->manifold = REF_TRUE;

diff --git a/src/ref_subcommand.c b/src/ref_subcommand.c
@@ -449,11 +449,11 @@ static REF_STATUS adapt(REF_MPI ref_mpi_orig, int argc, char *argv[]) {
       printf("--ratio-method %d\n", ref_grid_node(ref_grid)->ratio_method);
   }
 
-  RXS(ref_args_find(argc, argv, "--no-zip-pcurve", &pos), REF_NOT_FOUND,
+  RXS(ref_args_find(argc, argv, "--zip-pcurve", &pos), REF_NOT_FOUND,
       "arg search");
   if (REF_EMPTY != pos) {
-    ref_geom_zip_pcurve(ref_grid_geom(ref_grid)) = REF_FALSE;
-    if (ref_mpi_once(ref_mpi)) printf("--no-zip-pcurve pcurve zipping off\n");
+    ref_geom_zip_pcurve(ref_grid_geom(ref_grid)) = REF_TRUE;
+    if (ref_mpi_once(ref_mpi)) printf("--zip-pcurve pcurve zipping\n");
   }
 
   RXS(ref_args_find(argc, argv, "--topo", &pos), REF_NOT_FOUND, "arg search");
@@ -682,11 +682,11 @@ static REF_STATUS bootstrap(REF_MPI ref_mpi, int argc, char *argv[]) {
 
   RSS(ref_grid_create(&ref_grid, ref_mpi), "create");
 
-  RXS(ref_args_find(argc, argv, "--no-zip-pcurve", &pos), REF_NOT_FOUND,
+  RXS(ref_args_find(argc, argv, "--zip-pcurve", &pos), REF_NOT_FOUND,
       "arg search");
   if (REF_EMPTY != pos) {
-    ref_geom_zip_pcurve(ref_grid_geom(ref_grid)) = REF_FALSE;
-    if (ref_mpi_once(ref_mpi)) printf("--no-zip-pcurve pcurve zipping off\n");
+    ref_geom_zip_pcurve(ref_grid_geom(ref_grid)) = REF_TRUE;
+    if (ref_mpi_once(ref_mpi)) printf("--zip-pcurve pcurve zipping\n");
   }
 
   RXS(ref_args_find(argc, argv, "--partitioner", &pos), REF_NOT_FOUND,
@@ -1868,11 +1868,11 @@ static REF_STATUS loop(REF_MPI ref_mpi_orig, int argc, char *argv[]) {
       printf("--ratio-method %d\n", ref_grid_node(ref_grid)->ratio_method);
   }
 
-  RXS(ref_args_find(argc, argv, "--no-zip-pcurve", &pos), REF_NOT_FOUND,
+  RXS(ref_args_find(argc, argv, "--zip-pcurve", &pos), REF_NOT_FOUND,
       "arg search");
   if (REF_EMPTY != pos) {
-    ref_geom_zip_pcurve(ref_grid_geom(ref_grid)) = REF_FALSE;
-    if (ref_mpi_once(ref_mpi)) printf("--no-zip-pcurve pcurve zipping off\n");
+    ref_geom_zip_pcurve(ref_grid_geom(ref_grid)) = REF_TRUE;
+    if (ref_mpi_once(ref_mpi)) printf("--zip-pcurve pcurve zipping\n");
   }
 
   RXS(ref_args_find(argc, argv, "--topo", &pos), REF_NOT_FOUND, "arg search");