[Getfem-commits] r4814 - in /trunk/getfem/src: getfem/getfem_models.h getfem_import.cc getfem_models.cc

[logari81]

Author: logari81
Date: Wed Nov 12 13:46:53 2014
New Revision: 4814

URL: http://svn.gna.org/viewcvs/getfem?rev=4814&view=rev
Log:
add model::listresiduals method and a structured ball import mesh option

Modified:
    trunk/getfem/src/getfem/getfem_models.h
    trunk/getfem/src/getfem_import.cc
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/src/getfem/getfem_models.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_models.h?rev=4814&r1=4813&r2=4814&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_models.h     (original)
+++ trunk/getfem/src/getfem/getfem_models.h     Wed Nov 12 13:46:53 2014
@@ -996,6 +996,8 @@
     /** List the model variables and constant. */
     void listvar(std::ostream &ost) const;
 
+    void listresiduals(std::ostream &ost) const;
+
     /** List the model bricks. */
     void listbricks(std::ostream &ost, size_type base_id = 0) const;
 

Modified: trunk/getfem/src/getfem_import.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_import.cc?rev=4814&r1=4813&r2=4814&view=diff
==============================================================================
--- trunk/getfem/src/getfem_import.cc   (original)
+++ trunk/getfem/src/getfem_import.cc   Wed Nov 12 13:46:53 2014
@@ -1137,6 +1137,8 @@
 
       if (bgeot::casecmp(format,"structured")==0)
         { regular_mesh(m, filename); return; }
+      else if (bgeot::casecmp(format,"structured_ball")==0)
+        { regular_ball_mesh(m, filename); return; }
 
       std::ifstream f(filename.c_str());
       GMM_ASSERT1(f.good(), "can't open file " << filename);

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4814&r1=4813&r2=4814&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Wed Nov 12 13:46:53 2014
@@ -463,6 +463,25 @@
         if (it->second.is_affine_dependent) ost << "\t (is affine dependent)";
         ost << endl;
       }
+    }
+  }
+
+  void model::listresiduals(std::ostream &ost) const {
+    if (variables.size() == 0)
+      ost << "Model with no variable nor data" << endl;
+    else {
+      bool firstvar(true);
+      for (VAR_SET::const_iterator it = variables.begin();
+           it != variables.end(); ++it) {
+        if (it->second.is_variable) {
+          const gmm::sub_interval &II = interval_of_variable(it->first);
+          scalar_type res = gmm::vect_norm2(gmm::sub_vector(rrhs, II));
+          if (!firstvar) cout << ", ";
+          ost << "res_" << it->first << "= " << std::setw(11) << res;
+          firstvar = false;
+        }
+      }
+      ost << endl;
     }
   }