toto

zguoch · Nov 25, 2019 · 46f89e1 · 46f89e1
1 parent 0c7db86
commit 46f89e1
Show file tree

Hide file tree

Showing 6 changed files with 311 additions and 221 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1159,11 +1159,12 @@ if(HAVE_SOLVER)
     if(NOT ENABLE_MPI)
       list(APPEND MUMPS_LIBS_REQUIRED mpiseq)
     endif()
-    find_all_libraries(MUMPS_LIBRARIES MUMPS_LIBS_REQUIRED "" "lib")
+    find_all_libraries(MUMPS_LIBRARIES MUMPS_LIBS_REQUIRED "" "lib" "/Users/jf/SOURCES/MUMPS_5.2.1/lib")
     find_path(SMUMPS_INC "smumps_c.h" PATH_SUFFIXES src include)
     find_path(DMUMPS_INC "dmumps_c.h" PATH_SUFFIXES src include)
     find_path(CMUMPS_INC "cmumps_c.h" PATH_SUFFIXES src include)
     find_path(ZMUMPS_INC "zmumps_c.h" PATH_SUFFIXES src include)
+#    message("here"  ${MUMPS_LIBRARIES} ${MUMPS_LIBS_REQUIRED} )
     if(MUMPS_LIBRARIES AND SMUMPS_INC AND DMUMPS_INC AND CMUMPS_INC AND ZMUMPS_INC)
       set_config_option(HAVE_MUMPS "MUMPS")
       list(APPEND EXTERNAL_LIBRARIES ${MUMPS_LIBRARIES})

diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
@@ -754,21 +754,28 @@ bool BDS_Mesh::split_edge(BDS_Edge *e, BDS_Point *mid)
   if(p1->iD == CHECK1 && p2->iD == CHECK2)
     printf("splitting edge %d %d opp %d %d new %d\n", p1->iD, p2->iD, op[0]->iD,
            op[1]->iD, mid->iD);
-
-  //  double ori0 = fabs(surface_triangle_param(p2, p1, op[0])) +
-  //                fabs(surface_triangle_param(p2, p1, op[1]));
+  
+  double ori0 = fabs(surface_triangle_param(p2, p1, op[0])) +
+    fabs(surface_triangle_param(p2, p1, op[1]));
   //  double ori1 = fabs(surface_triangle_param(mid, p1, op[1]));
   //  double ori2 = fabs(surface_triangle_param(mid, op[1], p2));
   //  double ori3 = fabs(surface_triangle_param(mid, p2, op[0]));
   //  double ori4 = fabs(surface_triangle_param(mid, op[0], p1));
-  //
-  //  double eps = 1.e-21;
-  //  if(ori1 < eps * ori0 || ori2 < eps * ori0 || ori3 < eps * ori0 ||
-  //     ori4 < eps * ori0) {
-  //    // printf("%g %g %g %g %g\n",ori0,ori1,ori2,ori3,ori4);
-  //    return false;
-  //  }
 
+  /*
+  double ori1 = fabs(vector_triangle_parametric(mid, p1, op[1]));
+  double ori2 = fabs(vector_triangle_parametric(mid, op[1], p2));
+  double ori3 = fabs(vector_triangle_parametric(mid, p2, op[0]));
+  double ori4 = fabs(vector_triangle_parametric(mid, op[0], p1));
+
+  //
+  double eps = 1.e-8;
+  printf("%g %g %g %g %g\n",ori0,ori1,ori2,ori3,ori4);
+  if(ori1 < eps  || ori2 < eps  || ori3 < eps  ||
+     ori4 < eps ) {
+    return false;
+  }
+  */
   if(p1->iD == CHECK1 && p2->iD == CHECK2)
     printf("%d %d %d %d\n", p1->iD, p2->iD, op[0]->iD, op[1]->iD);