[Getfem-commits] r5203 - in /trunk/getfem/src: getfem_mesh_level_set.cc getfem_mesher.cc

[Yves . Renard]

Author: renard
Date: Fri Dec 18 19:54:15 2015
New Revision: 5203

URL: http://svn.gna.org/viewcvs/getfem?rev=5203&view=rev
Log:
small fix

Modified:
    trunk/getfem/src/getfem_mesh_level_set.cc
    trunk/getfem/src/getfem_mesher.cc

Modified: trunk/getfem/src/getfem_mesh_level_set.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_level_set.cc?rev=5203&r1=5202&r2=5203&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_level_set.cc   (original)
+++ trunk/getfem/src/getfem_mesh_level_set.cc   Fri Dec 18 19:54:15 2015
@@ -120,22 +120,25 @@
       }
     }
 
-    // cout << "ipts.size() = " << ipts.size() << endl;
-    // cout << " nb_vertices = " <<  nb_vertices << endl;
+    if (noisy) {
+      cout << "ipts.size() = " << ipts.size() << endl;
+      cout << " nb_vertices = " <<  nb_vertices << endl;
+    }
 
     dal::bit_vector cts; size_type cnt = 0;
     for (size_type i=0; i < ipts.size(); ++i) {
       // cout << "ipts[i] = " << ipts[i] << endl;
       if (ipts[i] < nb_vertices) {
-       cout << "point " << i << " constraints[ipts[i]] = " << 
constraints[ipts[i]] << endl;
+       if (noisy) cout << "point " << i << " coordinates " << 
m.points()[ipts[i]]<< " constraints[ipts[i]] = " << constraints[ipts[i]] << 
endl;
        if (cnt == 0) cts = constraints[ipts[i]];
        else cts &= constraints[ipts[i]];
        ++cnt;
       }
     }
 
+    if (noisy) cout << "cts = " << cts << endl;
+      
     if (cts.card()) {
-      // cout << "cts = " << cts << endl;
       // dal::bit_vector new_cts;
       for (size_type i=0; i < ipts.size(); ++i) {
        if (ipts[i] >= nb_vertices && !ptdone[ipts[i]]) {

Modified: trunk/getfem/src/getfem_mesher.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesher.cc?rev=5203&r1=5202&r2=5203&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesher.cc   (original)
+++ trunk/getfem/src/getfem_mesher.cc   Fri Dec 18 19:54:15 2015
@@ -141,7 +141,7 @@
         }
         // cout << "G = " << G << endl;
         
-        if (info || gmm::abs(det) < 1E-40) {
+        if (info || gmm::abs(det) < 1E-20) {
           dal::bit_vector cts_red = cts;
           int eliminated = 0;
           i = 0;
@@ -175,8 +175,8 @@
           }
         }
         
-        if (gmm::vect_norm2(d) > 1e-14) {
-          if (info || gmm::abs(det) < 1E-40) {
+        if (gmm::vect_norm2(d) > 1e-11) {
+          if (info || gmm::abs(det) < 1E-20) {
             for (i = 0; i < nbco; ++i)
               try_projection(*(ls[i]), X, true);
             for (i = 0; i < nbco; ++i) d[i] = -(ls[i]->grad(X, G[i]));