[Getfem-commits] [getfem-commits] branch master updated: Fix deprecation warnings

[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 03b82cc  Fix deprecation warnings
03b82cc is described below

commit 03b82ccab94cbfdf262f000cfc31660d8b6955fd
Author: Konstantinos Poulios <address@hidden>
AuthorDate: Sat Apr 4 14:40:50 2020 +0200

    Fix deprecation warnings
---
 contrib/aposteriori/aposteriori_laplacian.cc | 4 ++--
 contrib/xfem_contact/xfem_stokes.cc          | 2 +-
 src/getfem/bgeot_mesh_structure.h            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/aposteriori/aposteriori_laplacian.cc 
b/contrib/aposteriori/aposteriori_laplacian.cc
index 5deb7c1..c7f78f7 100644
--- a/contrib/aposteriori/aposteriori_laplacian.cc
+++ b/contrib/aposteriori/aposteriori_laplacian.cc
@@ -352,12 +352,12 @@ void crack_problem::error_estimate(const plain_vector &U, 
plain_vector &ERR) {
     
     scalar_type ee2 = ERR[cv] - ee1;
  
-    // jump of the stress between the element ant its neighbours.
+    // jump of the stress between the element ant its neighbors.
     for (short_type f1=0; f1 < mesh.structure_of_convex(cv)->nb_faces(); ++f1) 
{
 
       if 
(gmm::abs((*mmls)(mesh.trans_of_convex(cv)->convex_ref()->points_of_face(f1)[0]))
 < 1E-7 * radius) continue;
 
-      size_type cvn = mesh.neighbour_of_convex(cv, f1);
+      size_type cvn = mesh.neighbor_of_convex(cv, f1);
       if (cvn == size_type(-1)) continue;
        
       bgeot::pgeometric_trans pgt2 = mesh.trans_of_convex(cvn);
diff --git a/contrib/xfem_contact/xfem_stokes.cc 
b/contrib/xfem_contact/xfem_stokes.cc
index 8d69ecd..50400f5 100644
--- a/contrib/xfem_contact/xfem_stokes.cc
+++ b/contrib/xfem_contact/xfem_stokes.cc
@@ -680,7 +680,7 @@ int main(int argc, char *argv[]) {
       bgeot::mesh_structure::ind_set is;
       base_matrix Mloc;
       for (dal::bv_visitor i(elt_black_list); !i.finished(); ++i) {
-       mesh.neighbours_of_convex(i, is);
+       mesh.neighbors_of_convex(i, is);
        size_type cv2 = size_type(-1);
        scalar_type ratio = scalar_type(0);
        for (size_type j = 0; j < is.size(); ++j) {
diff --git a/src/getfem/bgeot_mesh_structure.h 
b/src/getfem/bgeot_mesh_structure.h
index 1cadee6..69b5d65 100644
--- a/src/getfem/bgeot_mesh_structure.h
+++ b/src/getfem/bgeot_mesh_structure.h
@@ -209,8 +209,8 @@ namespace bgeot {
         @param s the resulting ind_set.
      */
     void neighbors_of_convex(size_type ic,
-                              const std::vector<short_type> &ftab,
-                              ind_set &s) const;
+                             const std::vector<short_type> &ftab,
+                             ind_set &s) const;
     void neighbours_of_convex(size_type ic,
                               const std::vector<short_type> &ftab,
                               ind_set &s) const IS_DEPRECATED