Author: andrico
Date: Thu Apr 3 19:35:03 2014
New Revision: 4588
URL: http://svn.gna.org/viewcvs/getfem?rev=4588&view=rev
Log:
Moved assemby of all have_private_data_brick derived classes into
serial part of assembly, as it shouldn't be parallelized, similar to MPI.
Modified:
trunk/getfem/src/getfem/getfem_models.h
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=4588&r1=4587&r2=4588&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_models.h (original)
+++ trunk/getfem/src/getfem/getfem_models.h Thu Apr 3 19:35:03 2014
@@ -1064,7 +1064,7 @@
model::real_veclist &,
model::real_veclist &,
size_type, build_version) const
- { GMM_ASSERT1(false, "Brick has no real tangent terms !"); }
+ {/**doesn't have to be overriden if serial pre- post- assemblies are
defined*/}
/**Assembly of bricks complex tangent terms.
@@ -1087,7 +1087,7 @@
model::complex_veclist &,
model::complex_veclist &,
size_type, build_version) const
- { GMM_ASSERT1(false, "Brick has no complex tangent terms !"); }
+ {/**doesn't have to be overriden if serial pre- post- assemblies are
defined*/ }
/**Peform any pre assembly action for real term assembly. The purpose of
this method
Modified: trunk/getfem/src/getfem_models.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=4588&r1=4587&r2=4588&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc (original)
+++ trunk/getfem/src/getfem_models.cc Thu Apr 3 19:35:03 2014
@@ -5134,7 +5134,7 @@
struct constraint_brick : public have_private_data_brick {
- virtual void asm_real_tangent_terms(const model &md, size_type,
+ virtual void real_pre_assembly_in_serial(const model &md, size_type,
const model::varnamelist &vl,
const model::varnamelist &dl,
const model::mimlist &mims,
@@ -5170,7 +5170,7 @@
}
}
- virtual void asm_complex_tangent_terms(const model &md, size_type,
+ virtual void complex_pre_assembly_in_serial(const model &md, size_type,
const model::varnamelist &vl,
const model::varnamelist &dl,
const model::mimlist &mims,
@@ -5294,7 +5294,7 @@
struct explicit_matrix_brick : public have_private_data_brick {
- virtual void asm_real_tangent_terms(const model &, size_type,
+ virtual void real_pre_assembly_in_serial(const model &, size_type,
const model::varnamelist &vl,
const model::varnamelist &dl,
const model::mimlist &mims,
@@ -5310,7 +5310,7 @@
gmm::copy(rB, matl[0]);
}
- virtual void asm_complex_tangent_terms(const model &, size_type,
+ virtual void complex_pre_assembly_in_serial(const model &, size_type,
const model::varnamelist &vl,
const model::varnamelist &dl,
const model::mimlist &mims,
@@ -5357,7 +5357,7 @@
struct explicit_rhs_brick : public have_private_data_brick {
- virtual void asm_real_tangent_terms(const model &, size_type,
+ virtual void real_pre_assembly_in_serial(const model &, size_type,
const model::varnamelist &vl,
const model::varnamelist &dl,
const model::mimlist &mims,
@@ -5375,7 +5375,7 @@
}
}
- virtual void asm_complex_tangent_terms(const model &, size_type,
+ virtual void complex_pre_assembly_in_serial(const model &, size_type,
const model::varnamelist &vl,
const model::varnamelist &dl,
const model::mimlist &mims,
_______________________________________________
Getfem-commits mailing list
[email protected]
https://mail.gna.org/listinfo/getfem-commits
