[Getfem-commits] (no subject)

[Yves Renard]

branch: master
commit 982ccbd09c04764bdb16251d1dadd2201dfeac54
Merge: cd0c759 65ebcac
Author: Yves Renard <address@hidden>
Date:   Thu Feb 21 20:07:59 2019 +0100

    Merge remote-tracking branch 'origin/devel-tetsuo-code-cleanup'

 src/getfem/getfem_mesh_fem.h |  6 ++++--
 src/getfem/getfem_models.h   |  3 +++
 src/getfem_models.cc         | 28 ++++++++++------------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --cc src/getfem_models.cc
index b65c468,3424c8e..efd65e0
--- a/src/getfem_models.cc
+++ b/src/getfem_models.cc
@@@ -860,19 -873,20 +860,20 @@@ namespace getfem 
      add_dependency(mf);
    }
  
-   void model::disable_variable(const std::string &name) {
 -  inline void model::set_is_disabled_of_variable(const std::string &name, 
bool flag) {
++  inline void model::set_is_disabled_of_variable(const std::string &name,
++                                                 bool flag) {
      VAR_SET::iterator it = variables.find(name);
      GMM_ASSERT1(it != variables.end(), "Undefined variable " << name);
-     it->second.is_disabled = true;
+     it->second.is_disabled = flag;
 -    for (VAR_SET::iterator itv = variables.begin();
 -         itv != variables.end(); ++itv) {
 -      if (((itv->second.filter & VDESCRFILTER_INFSUP) ||
 -           (itv->second.filter & VDESCRFILTER_CTERM))
 -          && (name.compare(itv->second.filter_var) == 0)) {
 -        itv->second.is_disabled = flag;
 +    for (auto &&v : variables) {
 +      if (((v.second.filter & VDESCRFILTER_INFSUP) ||
 +           (v.second.filter & VDESCRFILTER_CTERM))
 +          && name.compare(v.second.filter_var) == 0) {
-         v.second.is_disabled = true;
++        v.second.is_disabled = flag;
        }
 -      if (itv->second.is_variable && itv->second.is_affine_dependent
 -          && name.compare(itv->second.org_name) == 0)
 -        itv->second.is_disabled = flag;
 +      if (v.second.is_variable && v.second.is_affine_dependent
 +          && name.compare(v.second.org_name) == 0)
-         v.second.is_disabled = true;
++        v.second.is_disabled = flag;
      }
      if (!act_size_to_be_done) resize_global_system();
    }