[Getfem-commits] r4740 - in /trunk/getfem/src: getfem/getfem_level_set_contact.h getfem_level_set_contact.cc gmm/gmm_except.h gmm/gmm_vector.h

[Yves . Renard]

Author: renard
Date: Mon Jul 28 20:26:26 2014
New Revision: 4740

URL: http://svn.gna.org/viewcvs/getfem?rev=4740&view=rev
Log:
minor chnges

Modified:
    trunk/getfem/src/getfem/getfem_level_set_contact.h
    trunk/getfem/src/getfem_level_set_contact.cc
    trunk/getfem/src/gmm/gmm_except.h
    trunk/getfem/src/gmm/gmm_vector.h

Modified: trunk/getfem/src/getfem/getfem_level_set_contact.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_level_set_contact.h?rev=4740&r1=4739&r2=4740&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_level_set_contact.h  (original)
+++ trunk/getfem/src/getfem/getfem_level_set_contact.h  Mon Jul 28 20:26:26 2014
@@ -647,8 +647,6 @@
     
     //assembly
     getfem::generic_assembly assem_boundary;
-
-    std::cout << "assembling" << std::endl;
 
     assem_boundary.set(
                        "F=data$1(#3);"
@@ -687,8 +685,6 @@
     assem_boundary.push_mat(Ksl_small);                  //   ..     mat 5
     assem_boundary.assembly(contact_region);   
     
-    std::cout << "transfering" << std::endl;
-
     //transfering from interpolated mesh_fem into full slave mesh_fem mat's
     const gmm::sub_interval& Um_dof = gmm::sub_interval(0,mf_U_line.nb_dof());
     const gmm::unsorted_sub_index& Us_dof = 

Modified: trunk/getfem/src/getfem_level_set_contact.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_level_set_contact.cc?rev=4740&r1=4739&r2=4740&view=diff
==============================================================================
--- trunk/getfem/src/getfem_level_set_contact.cc        (original)
+++ trunk/getfem/src/getfem_level_set_contact.cc        Mon Jul 28 20:26:26 2014
@@ -678,8 +678,6 @@
                << " elements");
     
asm_level_set_contact_tangent_matrix(matl,mcb,scb,LM,active_contact_region);
   }
-  
-  std::cout << "before asm" <<  std::endl;
 
   //Assemble RHS
   if (version & model::BUILD_RHS ) {
@@ -690,9 +688,6 @@
     for(size_type i=0;i<vecl.size();i++)       
       gmm::scale(vecl[i], scalar_type(-1));
   }
-
-  std::cout << "after asm " <<  std::endl;
-
 }
 
 

Modified: trunk/getfem/src/gmm/gmm_except.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/gmm/gmm_except.h?rev=4740&r1=4739&r2=4740&view=diff
==============================================================================
--- trunk/getfem/src/gmm/gmm_except.h   (original)
+++ trunk/getfem/src/gmm/gmm_except.h   Mon Jul 28 20:26:26 2014
@@ -124,15 +124,12 @@
 # define GMM_ASSERT3(test, errormsg) {}
 #elif !defined(GMM_FULL_NDEBUG)
 # define GMM_ASSERT2(test, errormsg)                                   \
-  { if (!(test)) gmm::short_error_throw(__FILE__, __LINE__,            \
-                                  GMM_PRETTY_FUNCTION, errormsg); }
+  { if (!(test)) GMM_THROW_(gmm::gmm_error, errormsg); }
 # define GMM_ASSERT3(test, errormsg)                                   \
-  { if (!(test)) gmm::short_error_throw(__FILE__, __LINE__,            \
-                                  GMM_PRETTY_FUNCTION, errormsg); }
+  { if (!(test)) GMM_THROW_(gmm::gmm_error, errormsg); }
 #else
 # define GMM_ASSERT2(test, errormsg)                                   \
-  { if (!(test)) gmm::short_error_throw(__FILE__, __LINE__,            \
-                                  GMM_PRETTY_FUNCTION, errormsg); }
+  { if (!(test)) GMM_THROW_(gmm::gmm_error, errormsg); }
 # define GMM_ASSERT3(test, errormsg)
 #endif
 

Modified: trunk/getfem/src/gmm/gmm_vector.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/gmm/gmm_vector.h?rev=4740&r1=4739&r2=4740&view=diff
==============================================================================
--- trunk/getfem/src/gmm/gmm_vector.h   (original)
+++ trunk/getfem/src/gmm/gmm_vector.h   Mon Jul 28 20:26:26 2014
@@ -530,7 +530,7 @@
   }
   
   template <typename T> T rsvector<T>::r(size_type c) const {
-    GMM_ASSERT1(c < nbl, "out of range. Index " << c << " for a length of " << 
nbl);
+    GMM_ASSERT2(c < nbl, "out of range. Index " << c << " for a length of " << 
nbl);
     if (nb_stored() != 0) {
       elt_rsvector_<T> ev(c);
       const_iterator it = std::lower_bound(this->begin(), this->end(), ev);