[Getfem-commits] [getfem-commits] branch master updated: Fix openmp crash due to concurrency bug

[Konstantinos Poulios]

This is an automated email from the git hooks/post-receive script.

logari81 pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new ca961cce Fix openmp crash due to concurrency bug
ca961cce is described below

commit ca961cceda4d59019b8a4ae3247dda0178f1ceca
Author: Konstantinos Poulios <logari81@gmail.com>
AuthorDate: Fri Nov 17 11:29:59 2023 +0100

    Fix openmp crash due to concurrency bug
---
 src/getfem_models.cc | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/getfem_models.cc b/src/getfem_models.cc
index 1a13a2fe..81d015cd 100644
--- a/src/getfem_models.cc
+++ b/src/getfem_models.cc
@@ -4865,15 +4865,15 @@ namespace getfem {
 
   struct simplification_Dirichlet_condition_brick : public virtual_brick {
 
-    virtual void asm_real_tangent_terms(const model &md, size_type /*ib*/,
-                                        const model::varnamelist &vl,
-                                        const model::varnamelist &dl,
-                                        const model::mimlist &mims,
-                                        model::real_matlist &matl,
-                                        model::real_veclist &vecl,
-                                        model::real_veclist &,
-                                        size_type region,
-                                        build_version /*version*/) const {
+    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,
+                                             model::real_matlist &matl,
+                                             model::real_veclist &vecl,
+                                             model::real_veclist &,
+                                             size_type region,
+                                             build_version /*version*/) const {
       if (MPI_IS_MASTER()) {
 
         GMM_ASSERT1(vecl.size() == 0 && matl.size() == 0,
@@ -4934,15 +4934,15 @@ namespace getfem {
       }
     }
 
-    virtual void asm_complex_tangent_terms(const model &md, size_type /*ib*/,
-                                           const model::varnamelist &vl,
-                                           const model::varnamelist &dl,
-                                           const model::mimlist &mims,
-                                           model::complex_matlist &matl,
-                                           model::complex_veclist &vecl,
-                                           model::complex_veclist &,
-                                           size_type region,
-                                           build_version /*version*/) const {
+    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,
+                                                model::complex_matlist &matl,
+                                                model::complex_veclist &vecl,
+                                                model::complex_veclist &,
+                                                size_type region,
+                                                build_version /*version*/) 
const {
       if (MPI_IS_MASTER()) {
         GMM_ASSERT1(vecl.size() == 0 && matl.size() == 0,
                     "Dirichlet condition brick by simplification has no term");