[Getfem-commits] r4598 - in /trunk/getfem/src: getfem_fourth_order.cc getfem_models.cc

[andriy . andreykiv]

Author: andrico
Date: Thu Apr 10 14:56:57 2014
New Revision: 4598

URL: http://svn.gna.org/viewcvs/getfem?rev=4598&view=rev
Log:
- distributing private data for normal_derivative_Dirichlet_condition_brick 
- forcing serial only assembly for pointwise_constraints_brick

Modified:
    trunk/getfem/src/getfem_fourth_order.cc
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/src/getfem_fourth_order.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_fourth_order.cc?rev=4598&r1=4597&r2=4598&view=diff
==============================================================================
--- trunk/getfem/src/getfem_fourth_order.cc     (original)
+++ trunk/getfem/src/getfem_fourth_order.cc     Thu Apr 10 14:56:57 2014
@@ -21,6 +21,7 @@
 
 
 #include "getfem/getfem_fourth_order.h"
+#include "getfem/getfem_omp.h"
 
 
 namespace getfem {
@@ -424,10 +425,10 @@
   struct normal_derivative_Dirichlet_condition_brick : public virtual_brick {
 
     bool R_must_be_derivated;
-    mutable model_real_sparse_matrix rB;
-    mutable model_real_plain_vector rV;
-    mutable model_complex_sparse_matrix cB;
-    mutable model_complex_plain_vector cV;
+    mutable getfem::omp_distribute<model_real_sparse_matrix> rB_th;
+    mutable getfem::omp_distribute<model_real_plain_vector> rV_th;
+    mutable getfem::omp_distribute<model_complex_sparse_matrix> cB_th;
+    mutable getfem::omp_distribute<model_complex_plain_vector> cV_th;
 
     virtual void asm_real_tangent_terms(const model &md, size_type ib,
                                        const model::varnamelist &vl,
@@ -447,6 +448,9 @@
       GMM_ASSERT1(vl.size() >= 1 && vl.size() <= 2 && dl.size() <= 2,
                  "Wrong number of variables for normal derivative Dirichlet "
                  "condition brick");
+
+      model_real_sparse_matrix& rB = rB_th;
+      model_real_plain_vector&  rV = rV_th;
 
       bool penalized = (vl.size() == 1);
       const mesh_fem &mf_u = md.mesh_fem_of_variable(vl[0]);
@@ -555,6 +559,9 @@
                  "Wrong number of variables for normal derivative Dirichlet "
                  "condition brick");
 
+      model_complex_sparse_matrix& cB = cB_th;
+      model_complex_plain_vector&  cV = cV_th;
+
       bool penalized = (vl.size() == 1);
       const mesh_fem &mf_u = md.mesh_fem_of_variable(vl[0]);
       const mesh_fem &mf_mult = md.mesh_fem_of_variable(vl[vl.size()-1]);

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4598&r1=4597&r2=4598&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Thu Apr 10 14:56:57 2014
@@ -4432,7 +4432,7 @@
     mutable gmm::row_matrix<model_real_sparse_vector> rB;
     mutable gmm::row_matrix<model_complex_sparse_vector> cB;
 
-    virtual void asm_real_tangent_terms(const model &md, size_type ib,
+    virtual void  real_pre_assembly_in_serial(const model &md, size_type ib,
                                         const model::varnamelist &vl,
                                         const model::varnamelist &dl,
                                         const model::mimlist &mims,
@@ -4526,7 +4526,7 @@
       }
     }
 
-    virtual void asm_complex_tangent_terms(const model &md, size_type ib,
+    virtual void complex_pre_assembly_in_serial(const model &md, size_type ib,
                                            const model::varnamelist &vl,
                                            const model::varnamelist &dl,
                                            const model::mimlist &mims,