[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Konstantinos Poulios |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Sat, 2 Feb 2019 18:43:39 -0500 (EST) |
branch: fix-skipped-update-pfp-in-interpolate-filter
commit 8a4a34b4084c1adff767ad2be2423140cd9547f0
Author: Konstantinos Poulios <address@hidden>
Date: Sun Feb 3 00:43:31 2019 +0100
Minor coding style and whitespace changes
---
.../getfem_generic_assembly_compile_and_exec.h | 15 +++----
src/getfem_generic_assembly_compile_and_exec.cc | 51 +++++++++++++---------
2 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/src/getfem/getfem_generic_assembly_compile_and_exec.h
b/src/getfem/getfem_generic_assembly_compile_and_exec.h
index e960446..e64a1d5 100644
--- a/src/getfem/getfem_generic_assembly_compile_and_exec.h
+++ b/src/getfem/getfem_generic_assembly_compile_and_exec.h
@@ -45,17 +45,14 @@ namespace getfem {
public:
void increment() { (back())++; }
- void child_of(const ga_if_hierarchy &gih)
- { *this = gih; push_back(0); }
+ void child_of(const ga_if_hierarchy &gih) { *this = gih; push_back(0); }
bool is_compatible(const std::list<ga_if_hierarchy> &gihl) {
-
- std::list<ga_if_hierarchy>::const_iterator it = gihl.begin();
- for (; it != gihl.end(); ++it) {
- if (it->size() <= size()) {
+ for (const auto &gih : gihl) {
+ if (gih.size() <= size()) {
bool ok = true;
- for (size_type i = 0; i+1 < it->size(); ++i)
- if ((*it)[i] != (*this)[i]) { ok = false; break; }
- if (it->back() > (*this)[it->size()-1]) { ok = false; break; }
+ for (size_type i = 0; i+1 < gih.size(); ++i)
+ if (gih[i] != (*this)[i]) { ok = false; break; }
+ if (gih.back() > (*this)[gih.size()-1]) { ok = false; break; }
if (ok) return true;
}
}
diff --git a/src/getfem_generic_assembly_compile_and_exec.cc
b/src/getfem_generic_assembly_compile_and_exec.cc
index f70b6d6..6df384d 100644
--- a/src/getfem_generic_assembly_compile_and_exec.cc
+++ b/src/getfem_generic_assembly_compile_and_exec.cc
@@ -5152,7 +5152,7 @@ namespace getfem {
switch (pnode->node_type) {
case GA_NODE_VAL: case GA_NODE_ELEMENTARY_VAL:
if (rmi.base.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.base_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.base_hierarchy[mf])) {
rmi.base_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_val_base>
(rmi.base[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5160,7 +5160,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_PLUS_VAL:
if (rmi.xfem_plus_base.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_plus_base_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_plus_base_hierarchy[mf]))
+ {
rmi.xfem_plus_base_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_plus_val_base>
(rmi.xfem_plus_base[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5168,7 +5169,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_MINUS_VAL:
if (rmi.xfem_minus_base.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_minus_base_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_minus_base_hierarchy[mf]))
+ {
rmi.xfem_minus_base_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_minus_val_base>
(rmi.xfem_minus_base[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5177,7 +5179,7 @@ namespace getfem {
case GA_NODE_GRAD: case GA_NODE_DIVERG:
case GA_NODE_ELEMENTARY_GRAD: case GA_NODE_ELEMENTARY_DIVERG:
if (rmi.grad.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.grad_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.grad_hierarchy[mf])) {
rmi.grad_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_grad_base>
(rmi.grad[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5185,7 +5187,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_PLUS_GRAD: case GA_NODE_XFEM_PLUS_DIVERG:
if (rmi.xfem_plus_grad.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_plus_grad_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_plus_grad_hierarchy[mf]))
+ {
rmi.xfem_plus_grad_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_plus_grad_base>
(rmi.xfem_plus_grad[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5193,7 +5196,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_MINUS_GRAD: case GA_NODE_XFEM_MINUS_DIVERG:
if (rmi.xfem_minus_grad.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_minus_grad_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_minus_grad_hierarchy[mf]))
+ {
rmi.xfem_minus_grad_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_minus_grad_base>
(rmi.xfem_minus_grad[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5201,7 +5205,7 @@ namespace getfem {
break;
case GA_NODE_HESS: case GA_NODE_ELEMENTARY_HESS:
if (rmi.hess.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.hess_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.hess_hierarchy[mf])) {
rmi.hess_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_hess_base>
(rmi.hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5209,7 +5213,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_PLUS_HESS:
if (rmi.xfem_plus_hess.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_plus_hess_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_plus_hess_hierarchy[mf]))
+ {
rmi.xfem_plus_hess_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_plus_hess_base>
(rmi.xfem_plus_hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5217,7 +5222,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_MINUS_HESS:
if (rmi.xfem_minus_hess.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_minus_hess_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_minus_hess_hierarchy[mf]))
+ {
rmi.xfem_minus_hess_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_minus_hess_base>
(rmi.xfem_minus_hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5557,7 +5563,7 @@ namespace getfem {
switch (pnode->node_type) {
case GA_NODE_VAL_TEST: case GA_NODE_ELEMENTARY_VAL_TEST:
if (rmi.base.find(mf) == rmi.base.end() ||
- !(if_hierarchy.is_compatible(rmi.base_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.base_hierarchy[mf])) {
rmi.base_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_val_base>
(rmi.base[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5565,7 +5571,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_PLUS_VAL_TEST:
if (rmi.xfem_plus_base.find(mf) == rmi.xfem_plus_base.end() ||
- !(if_hierarchy.is_compatible(rmi.xfem_plus_base_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_plus_base_hierarchy[mf]))
+ {
rmi.xfem_plus_base_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_plus_val_base>
(rmi.xfem_plus_base[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5573,7 +5580,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_MINUS_VAL_TEST:
if (rmi.xfem_minus_base.find(mf) == rmi.xfem_minus_base.end() ||
- !(if_hierarchy.is_compatible(rmi.xfem_minus_base_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_minus_base_hierarchy[mf]))
+ {
rmi.xfem_minus_base_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_minus_val_base>
(rmi.xfem_minus_base[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5583,7 +5591,7 @@ namespace getfem {
case GA_NODE_ELEMENTARY_GRAD_TEST:
case GA_NODE_ELEMENTARY_DIVERG_TEST:
if (rmi.grad.find(mf) == rmi.grad.end() ||
- !(if_hierarchy.is_compatible(rmi.grad_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.grad_hierarchy[mf])) {
rmi.grad_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_grad_base>
(rmi.grad[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5591,7 +5599,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_PLUS_GRAD_TEST: case GA_NODE_XFEM_PLUS_DIVERG_TEST:
if (rmi.xfem_plus_grad.find(mf) == rmi.xfem_plus_grad.end() ||
- !(if_hierarchy.is_compatible(rmi.xfem_plus_grad_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_plus_grad_hierarchy[mf]))
+ {
rmi.xfem_plus_grad_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_plus_grad_base>
(rmi.xfem_plus_grad[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5600,7 +5609,8 @@ namespace getfem {
case GA_NODE_XFEM_MINUS_GRAD_TEST:
case GA_NODE_XFEM_MINUS_DIVERG_TEST:
if (rmi.xfem_minus_grad.find(mf) == rmi.xfem_minus_grad.end() ||
- !(if_hierarchy.is_compatible(rmi.xfem_minus_grad_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_minus_grad_hierarchy[mf]))
+ {
rmi.xfem_minus_grad_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_minus_grad_base>
(rmi.xfem_minus_grad[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5608,7 +5618,7 @@ namespace getfem {
break;
case GA_NODE_HESS_TEST: case GA_NODE_ELEMENTARY_HESS_TEST:
if (rmi.hess.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.hess_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.hess_hierarchy[mf])) {
rmi.hess_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_hess_base>
(rmi.hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5616,8 +5626,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_PLUS_HESS_TEST:
if (rmi.xfem_plus_hess.count(mf) == 0 ||
- !(if_hierarchy.is_compatible(rmi.xfem_plus_hess_hierarchy[mf]))
- ) {
+ !if_hierarchy.is_compatible(rmi.xfem_plus_hess_hierarchy[mf]))
+ {
rmi.xfem_plus_hess_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_plus_hess_base>
(rmi.xfem_plus_hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -5625,7 +5635,8 @@ namespace getfem {
break;
case GA_NODE_XFEM_MINUS_HESS_TEST:
if (rmi.xfem_minus_hess.find(mf) == rmi.xfem_minus_hess.end() ||
- !(if_hierarchy.is_compatible(rmi.xfem_minus_hess_hierarchy[mf]))) {
+ !if_hierarchy.is_compatible(rmi.xfem_minus_hess_hierarchy[mf]))
+ {
rmi.xfem_minus_hess_hierarchy[mf].push_back(if_hierarchy);
pgai = std::make_shared<ga_instruction_xfem_minus_hess_base>
(rmi.xfem_minus_hess[mf], gis.ctx, *mf, rmi.pfps[mf]);
@@ -6726,7 +6737,7 @@ namespace getfem {
if ((version == td.interpolation) &&
((version == 0 && td.order == order) || // Assembly
((version > 0 && (td.order == size_type(-1) || // Assignment
- td.order == size_type(-2) - order))))) {
+ td.order == size_type(-2) - order))))) {
ga_tree *added_tree = 0;
if (td.interpolation) {
gis.interpolation_trees.push_back(*(td.ptree));