[Getfem-commits] r4705 - in /trunk/getfem: interface/src/ src/

[logari81]

Author: logari81
Date: Wed Jul  9 09:31:24 2014
New Revision: 4705

URL: http://svn.gna.org/viewcvs/getfem?rev=4705&view=rev
Log:
improve error and info messages

Modified:
    trunk/getfem/interface/src/gf_mesh_fem_get.cc
    trunk/getfem/interface/src/gf_mesh_get.cc
    trunk/getfem/interface/src/gf_mesh_im_get.cc
    trunk/getfem/interface/src/gf_mesh_levelset_get.cc
    trunk/getfem/src/getfem_generic_assembly.cc

Modified: trunk/getfem/interface/src/gf_mesh_fem_get.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_fem_get.cc?rev=4705&r1=4704&r2=4705&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_fem_get.cc       (original)
+++ trunk/getfem/interface/src/gf_mesh_fem_get.cc       Wed Jul  9 09:31:24 2014
@@ -665,7 +665,7 @@
       ("display", 0, 0, 0, 0,
        infomsg() << "gfMeshFem object in dimension "
        << int(mf->linked_mesh().dim())
-       << "with " << mf->linked_mesh().nb_points() << " points, "
+       << " with " << mf->linked_mesh().nb_points() << " points, "
        << mf->linked_mesh().convex_index().card() << " elements and "
        << mf->nb_dof() << " degrees of freedom\n";
        );

Modified: trunk/getfem/interface/src/gf_mesh_get.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_get.cc?rev=4705&r1=4704&r2=4705&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_get.cc   (original)
+++ trunk/getfem/interface/src/gf_mesh_get.cc   Wed Jul  9 09:31:24 2014
@@ -1073,7 +1073,7 @@
     sub_command
       ("display", 0, 0, 0, 0,
        infomsg() << "gfMesh object in dimension " << int(pmesh->dim())
-       << "with " << pmesh->nb_points() << " points and "
+       << " with " << pmesh->nb_points() << " points and "
        << pmesh->convex_index().card() << " elements\n";
        );
 

Modified: trunk/getfem/interface/src/gf_mesh_im_get.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_im_get.cc?rev=4705&r1=4704&r2=4705&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_im_get.cc        (original)
+++ trunk/getfem/interface/src/gf_mesh_im_get.cc        Wed Jul  9 09:31:24 2014
@@ -261,7 +261,7 @@
       ("display", 0, 0, 0, 0,
        infomsg() << "gfMeshIm object in dimension "
        << int(mim->linked_mesh().dim())
-       << "with " << mim->linked_mesh().nb_points() << " points and "
+       << " with " << mim->linked_mesh().nb_points() << " points and "
        << mim->linked_mesh().convex_index().card() << " elements\n";
        );
 

Modified: trunk/getfem/interface/src/gf_mesh_levelset_get.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/interface/src/gf_mesh_levelset_get.cc?rev=4705&r1=4704&r2=4705&view=diff
==============================================================================
--- trunk/getfem/interface/src/gf_mesh_levelset_get.cc  (original)
+++ trunk/getfem/interface/src/gf_mesh_levelset_get.cc  Wed Jul  9 09:31:24 2014
@@ -150,7 +150,7 @@
       ("display", 0, 0, 0, 0,
        infomsg() << "gfMeshLevelSet object in dimension "
        << int(mls.linked_mesh().dim())
-       << "with " << mls.linked_mesh().nb_points() << " points and "
+       << " with " << mls.linked_mesh().nb_points() << " points and "
        << mls.linked_mesh().convex_index().card() << " elements\n";
        );
 

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=4705&r1=4704&r2=4705&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Wed Jul  9 09:31:24 2014
@@ -250,7 +250,8 @@
   }
 
 #define ga_throw_error(expr, pos, msg)               \
-  { ga_throw_error_msg(expr, pos, msg);              \
+  { std::stringstream ss; ss << msg;                 \
+    ga_throw_error_msg(expr, pos, ss.str());         \
     GMM_ASSERT1(false, "Error in assembly string" ); \
   }
 
@@ -5018,7 +5019,8 @@
           size_type s0 = dim0 == 0 ? 1 : size0.back();
           size_type s1 = dim1 == 0 ? 1 : size1.back();
           if (s0 != s1) ga_throw_error(expr, pnode->pos, "Dot product "
-                                       "of expressions of different sizes");
+                                       "of expressions of different sizes ("
+                                       << s0 << " != " << s1 << ").");
           if (child0->tensor_order() <= 1) pnode->symmetric_op = true;
           pnode->mult_test(child0, child1, expr);
           if (dim0 > 1) {
@@ -5061,7 +5063,8 @@
           size_type s11 = (dim1 >= 2) ? size1.back() : 1;
           if (s00 != s10 || s01 != s11)
             ga_throw_error(expr, pnode->pos, "Frobenius product "
-                            "of expressions of different sizes");
+                           "of expressions of different sizes ("
+                           << s00 << "," << s01 << " != " << s10 << "," << s11 
<< ").");
           if (child0->tensor_order() <= 2) pnode->symmetric_op = true;
           pnode->mult_test(child0, child1, expr);
           if (dim0 > 2) {
@@ -5165,8 +5168,8 @@
           } else if (dim0 == 2 && dim1 == 1) {
             size_type m = child0->t.size(0), n = child0->t.size(1);
             if (n != child1->t.size(0))
-              ga_throw_error(expr, pnode->pos, "Incompatible sizes in "
-                              "matrix-vector multiplication.");
+              ga_throw_error(expr, pnode->pos, "Incompatible sizes in 
matrix-vector "
+              "multiplication (" << n << " != " << child1->t.size(0) << ").");
             pnode->init_vector_tensor(m);
             gmm::clear(pnode->t.as_vector());
             for (size_type i = 0; i < m; ++i)
@@ -5177,8 +5180,8 @@
             size_type n = child0->t.size(1);
             size_type p = child1->t.size(1);
             if (n != child1->t.size(0))
-              ga_throw_error(expr, pnode->pos, "Incompatible sizes in "
-                              "matrix-matrix multiplication.");
+              ga_throw_error(expr, pnode->pos, "Incompatible sizes in 
matrix-matrix "
+              "multiplication (" << n << " != " << child1->t.size(0) << ").");
             pnode->init_matrix_tensor(m,p);
             gmm::clear(pnode->t.as_vector());
             for (size_type i = 0; i < m; ++i)
@@ -5190,8 +5193,9 @@
             size_type m = child0->t.size(0), n = child0->t.size(1);
             size_type o = child0->t.size(2), p = child0->t.size(3);
             if (o != child1->t.size(0) || p != child1->t.size(1))
-              ga_throw_error(expr, pnode->pos, "Incompatible sizes in "
-                              "tensor-matrix multiplication.");
+              ga_throw_error(expr, pnode->pos, "Incompatible sizes in 
tensor-matrix "
+              "multiplication (" << o << "," << p << " != "
+              << child1->t.size(0) << "," << child1->t.size(1) << ").");
             pnode->init_matrix_tensor(m,n);
             gmm::clear(pnode->t.as_vector());
             for (size_type i = 0; i < m; ++i)
@@ -5223,8 +5227,9 @@
             size_type n = child0->tensor_proper_size(1);
             mi.push_back(m);
             if (n != child1->tensor_proper_size(0))
-              ga_throw_error(expr, pnode->pos, "Incompatible sizes in "
-                              "matrix-vector multiplication.");
+              ga_throw_error(expr, pnode->pos, "Incompatible sizes in 
matrix-vector "
+              "multiplication (" << n << " != "
+              << child1->tensor_proper_size(0) << ").");
           } else if (child0->tensor_order() == 2 &&
                      child1->tensor_order() == 2) {
             size_type m = child0->tensor_proper_size(0);
@@ -5232,8 +5237,9 @@
             size_type p = child1->tensor_proper_size(1);
             mi.push_back(m); mi.push_back(p);
             if (n != child1->tensor_proper_size(0))
-              ga_throw_error(expr, pnode->pos, "Incompatible sizes in "
-                              "matrix-matrix multiplication.");
+              ga_throw_error(expr, pnode->pos, "Incompatible sizes in 
matrix-matrix "
+              "multiplication (" << n << " != "
+              << child1->tensor_proper_size(0) << ").");
           }
           else if (pnode->children[0]->tensor_order() == 4 &&
                    pnode->children[1]->tensor_order() == 2) {
@@ -5244,8 +5250,9 @@
             mi.push_back(m); mi.push_back(n);
             if (o != child1->tensor_proper_size(0) ||
                 p != child1->tensor_proper_size(1))
-              ga_throw_error(expr, pnode->pos, "Incompatible sizes in "
-                              "tensor-matrix multiplication.");
+              ga_throw_error(expr, pnode->pos, "Incompatible sizes in 
tensor-matrix "
+              "multiplication (" << o << "," << p << " != "
+              << child1->tensor_proper_size(0) << "," << 
child1->tensor_proper_size(1) << ").");
           } else ga_throw_error(expr, pnode->pos,
                                  "Unauthorized multiplication.");
           pnode->t.adjust_sizes(mi);
@@ -5706,11 +5713,9 @@
         const ga_predef_function &F = it->second;
         size_type nbargs = F.nbargs;
         if (nbargs+1 != pnode->children.size()) {
-            std::stringstream msg;
-            msg << "Bad number of arguments for predefined function "
-                << name << ". Found " << pnode->children.size()-1
-                << " should be " << nbargs << ".";
-            ga_throw_error(expr, pnode->pos, msg.str());
+            ga_throw_error(expr, pnode->pos, "Bad number of arguments for "
+                "predefined function " << name << ". Found "
+                 << pnode->children.size()-1 << ", should be " << nbargs << 
".");
         }
         pnode->test_function_type = 0;
         pga_tree_node child2 = (nbargs == 2) ? pnode->children[2] : child1;