[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Yves Renard |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Tue, 17 Oct 2017 09:00:32 -0400 (EDT) |
branch: mb-ga_interpolate_filter
commit 9d7b1682e79103b4281f72cc7e9327f5f8a05e1f
Author: Yves Renard <address@hidden>
Date: Tue Oct 17 15:00:09 2017 +0200
Add the max_dof update at he interpolate_test cases
---
src/getfem_generic_assembly.cc | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/getfem_generic_assembly.cc b/src/getfem_generic_assembly.cc
index ba23cc9..ee3aba1 100644
--- a/src/getfem_generic_assembly.cc
+++ b/src/getfem_generic_assembly.cc
@@ -11485,20 +11485,9 @@ namespace getfem {
case GA_NODE_PREDEF_FUNC: case GA_NODE_OPERATOR: case GA_NODE_SPEC_FUNC:
case GA_NODE_CONSTANT: case GA_NODE_ALLINDICES: case GA_NODE_ZERO:
- case GA_NODE_RESHAPE:
+ case GA_NODE_RESHAPE: case GA_NODE_INTERPOLATE_FILTER:
break;
- case GA_NODE_INTERPOLATE_FILTER:
- {
- if (pnode->name_test1 != "")
- gis.max_dof = std::max(gis.max_dof,
-
workspace.interval_of_variable(pnode->name_test1).last());
- if (pnode->name_test2 != "")
- gis.max_dof = std::max(gis.max_dof,
-
workspace.interval_of_variable(pnode->name_test2).last());
- break;
- }
-
case GA_NODE_X:
GMM_ASSERT1(!function_case,
"No use of X is allowed in scalar functions");
@@ -12195,6 +12184,9 @@ namespace getfem {
rmi.interpolate_infos[intn], gis.fp_pool);
}
rmi.instructions.push_back(std::move(pgai));
+ add_interval_to_gis(workspace, pnode->name, gis);
+ gis.max_dof = std::max
+ (gis.max_dof, workspace.interval_of_variable(pnode->name).last());
}
break;