[Getfem-commits] (no subject)

[Tetsuo Koyama]

branch: devel-tetsuo-fix_function_name
commit 83212d0e9cfb4af11516fe0a09f2f5134442f4b3
Author: Tetsuo Koyama <address@hidden>
Date:   Fri Jul 12 22:24:56 2019 +0900

    Fix typo in source
---
 doc/sphinx/source/userdoc/gasm_high.rst      |  4 ++--
 interface/src/gf_model_set.cc                | 12 ++++++------
 src/getfem/getfem_generic_assembly.h         |  6 +++---
 src/getfem_generic_assembly_interpolation.cc | 10 +++++-----
 src/getfem_models.cc                         |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/doc/sphinx/source/userdoc/gasm_high.rst 
b/doc/sphinx/source/userdoc/gasm_high.rst
index 9119120..24c52d9 100644
--- a/doc/sphinx/source/userdoc/gasm_high.rst
+++ b/doc/sphinx/source/userdoc/gasm_high.rst
@@ -795,10 +795,10 @@ The map elt_corr should contain the correspondances 
between the elements where t
   
 The following functions allow to change the element correspondance of a 
previously added element extrapolation transformation::
 
-  set_element_extrapolation_correspondance
+  set_element_extrapolation_correspondence
   (model, transname, std::map<size_type, size_type> &elt_corr);
   
-  set_element_extrapolation_correspondance
+  set_element_extrapolation_correspondence
   (workspace, transname, std::map<size_type, size_type> &elt_corr);
 
 
diff --git a/interface/src/gf_model_set.cc b/interface/src/gf_model_set.cc
index 78a0bd7..0abb215 100644
--- a/interface/src/gf_model_set.cc
+++ b/interface/src/gf_model_set.cc
@@ -478,7 +478,7 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        getfem::mesh *sm = extract_mesh_object(in.pop());
        iarray v = in.pop().to_iarray();
        if (v.getm() != 2 || v.getp() != 1 || v.getq() != 1)
-                THROW_BADARG("Invalid format for the convex correspondance 
list");
+                THROW_BADARG("Invalid format for the convex correspondence 
list");
        elt_corr_cont elt_corr;
        for (size_type j=0; j < v.getn(); j++)
         elt_corr[v(0,j)-config::base_index()] = v(1,j)-config::base_index();
@@ -500,19 +500,19 @@ void gf_model_set(getfemint::mexargs_in& m_in,
        );
 
 
-    /*@SET ('set element extrapolation correspondance', @str transname, @mat 
elt_corr)
-      Change the correspondance map of an element extrapolation interpolate
+    /*@SET ('set element extrapolation correspondence', @str transname, @mat 
elt_corr)
+      Change the correspondence map of an element extrapolation interpolate
      transformation. @*/
     sub_command
-      ("set element extrapolation correspondance", 2, 2, 0, 0,
+      ("set element extrapolation correspondence", 2, 2, 0, 0,
        std::string transname = in.pop().to_string();
        iarray v = in.pop().to_iarray();
        if (v.getm() != 2 || v.getp() != 1 || v.getq() != 1)
-                THROW_BADARG("Invalid format for the convex correspondance 
list");
+                THROW_BADARG("Invalid format for the convex correspondence 
list");
        elt_corr_cont elt_corr;
        for (size_type j=0; j < v.getn(); j++)
         elt_corr[v(0,j)-config::base_index()] = v(1,j)-config::base_index();
-       getfem::set_element_extrapolation_correspondance(*md, transname,
+       getfem::set_element_extrapolation_correspondence(*md, transname,
                                                        elt_corr);
        );
     
diff --git a/src/getfem/getfem_generic_assembly.h 
b/src/getfem/getfem_generic_assembly.h
index 4bff2a1..3a05caa 100644
--- a/src/getfem/getfem_generic_assembly.h
+++ b/src/getfem/getfem_generic_assembly.h
@@ -788,14 +788,14 @@ namespace getfem {
   (ga_workspace &workspace, const std::string &name, const mesh &sm,
    std::map<size_type, size_type> &elt_corr);
   
-  /* Change the correspondance map of an element extrapolation interpolate
+  /* Change the correspondence map of an element extrapolation interpolate
      transformation.
   */
-  void set_element_extrapolation_correspondance
+  void set_element_extrapolation_correspondence
   (model &md, const std::string &name,
    std::map<size_type, size_type> &elt_corr);
   
-  void set_element_extrapolation_correspondance
+  void set_element_extrapolation_correspondence
   (ga_workspace &workspace, const std::string &name,
    std::map<size_type, size_type> &elt_corr);
     
diff --git a/src/getfem_generic_assembly_interpolation.cc 
b/src/getfem_generic_assembly_interpolation.cc
index 3ea6c00..9bdae33 100644
--- a/src/getfem_generic_assembly_interpolation.cc
+++ b/src/getfem_generic_assembly_interpolation.cc
@@ -925,7 +925,7 @@ namespace getfem {
       return ret_type;
     }
 
-    void set_correspondance(const std::map<size_type, size_type> &ec) {
+    void set_correspondence(const std::map<size_type, size_type> &ec) {
       elt_corr = ec;
     }
 
@@ -953,7 +953,7 @@ namespace getfem {
     workspace.add_interpolate_transformation(name, p);
   }
 
-  void set_element_extrapolation_correspondance
+  void set_element_extrapolation_correspondence
   (ga_workspace &workspace, const std::string &name,
    std::map<size_type, size_type> &elt_corr) {
     GMM_ASSERT1(workspace.interpolate_transformation_exists(name),
@@ -965,10 +965,10 @@ namespace getfem {
     GMM_ASSERT1(cpext,
                 "The transformation is not of element extrapolation type");
     const_cast<interpolate_transformation_element_extrapolation *>(cpext)
-      ->set_correspondance(elt_corr);
+      ->set_correspondence(elt_corr);
   }
 
-  void set_element_extrapolation_correspondance
+  void set_element_extrapolation_correspondence
   (model &md, const std::string &name,
    std::map<size_type, size_type> &elt_corr) {
     GMM_ASSERT1(md.interpolate_transformation_exists(name),
@@ -980,7 +980,7 @@ namespace getfem {
     GMM_ASSERT1(cpext,
                 "The transformation is not of element extrapolation type");
     const_cast<interpolate_transformation_element_extrapolation *>(cpext)
-      ->set_correspondance(elt_corr);
+      ->set_correspondence(elt_corr);
   }
 
 
diff --git a/src/getfem_models.cc b/src/getfem_models.cc
index c794c5d..d6188ff 100644
--- a/src/getfem_models.cc
+++ b/src/getfem_models.cc
@@ -1599,7 +1599,7 @@ namespace getfem {
         ost << "Brick " << std::setw(3) << std::right << i + base_id
             << " " << std::setw(20) << std::right
             << bricks[i].pbr->brick_name();
-        if (!(active_bricks[i])) ost << " (desactivated)";
+        if (!(active_bricks[i])) ost << " (deactivated)";
         if (bricks[i].pdispatch) ost << " (dispatched)";
         ost << endl << "  concerned variables: " << bricks[i].vlist[0];
         for (size_type j = 1; j < bricks[i].vlist.size(); ++j)