[Getfem-commits] (no subject)
branch: upgrading_getfem_to_cpp14
commit b998578ae157e4f3de01daa56b951fb417cd5923
Author: aa
Date: Thu Mar 21 15:08:15 2019 +0100
no need for a smart pointer here. Value semantics will do.
---
src/getfem/dal_basic.h | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/getfem/dal_basic.h b/src/getfem/dal_basic.h
index 6c59064..f3acbd5 100644
--- a/src/getfem/dal_basic.h
+++ b/src/getfem/dal_basic.h
@@ -282,7 +282,7 @@ namespace dal
/* * */
- /* Menbers functions*/
+ /* Member functions */
/* * */
@@ -324,9 +324,8 @@ namespace dal
template
typename dynamic_array::const_reference
dynamic_array::operator [](size_type ii) const {
-THREAD_SAFE_STATIC std::unique_ptr pf = nullptr;
-if (!pf) pf = std::make_unique();
-return (ii>pks])[ii&DNAMPKS__] : *pf;
+THREAD_SAFE_STATIC T f;
+return (ii>pks])[ii&DNAMPKS__] : f;
}
template typename dynamic_array::reference
@@ -336,13 +335,14 @@ namespace dal
last_accessed = ii + 1;
if (ii >= last_ind) {
- if ((ii >> (pks+ppks)) > 0) {
- while ((ii >> (pks+ppks)) > 0) ppks++;
- array.resize(m_ppks = (size_type(1) << ppks)); m_ppks--;
- }
- for (size_type jj = (last_ind >> pks); ii >= last_ind;
-jj++, last_ind += (DNAMPKS__ + 1))
- { array[jj] = std::unique_ptr(new T[DNAMPKS__+1]); } //
std::make_unique(DNAMPKS__ + 1); }
+ if ((ii >> (pks+ppks)) > 0) {
+while ((ii >> (pks+ppks)) > 0) ppks++;
+array.resize(m_ppks = (size_type(1) << ppks)); m_ppks--;
+ }
+ for (size_type jj = (last_ind >> pks); ii >= last_ind;
+jj++, last_ind += (DNAMPKS__ + 1)){
+array[jj] = std::unique_ptr(new T[DNAMPKS__+1]);
+ } // std::make_unique(DNAMPKS__ + 1); }
}
}
return (array[ii >> pks])[ii & DNAMPKS__];
[Getfem-commits] (no subject)
branch: upgrading_getfem_to_cpp14
commit b93e8190cb6ccbaeea36521503f1e164e2a29274
Author: aa
Date: Thu Mar 21 14:58:57 2019 +0100
keyword spelling
---
src/gmm/gmm_domain_decomp.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gmm/gmm_domain_decomp.h b/src/gmm/gmm_domain_decomp.h
index fd787c3..f2a4f69 100644
--- a/src/gmm/gmm_domain_decomp.h
+++ b/src/gmm/gmm_domain_decomp.h
@@ -81,7 +81,7 @@ namespace gmm {
std::vector ns(dim), na(dim), nu(dim);
for (size_type i = 0; i < nbpts; ++i) {
for (int k = 0; k < dim; ++k) {
- ouble a = (pts[i][k] - pmin[k]) / msize;
+ double a = (pts[i][k] - pmin[k]) / msize;
ns[k] = size_type(a) - 1; na[k] = 0;
pts1[k] = int(a + overlap); pts2[k] = int(ceil(a-1.0-overlap));
}
[Getfem-commits] [getfem-commits] upgrading_getfem_to_cpp14 updated (e7126d9 -> b998578)
andrico pushed a change to branch upgrading_getfem_to_cpp14. from e7126d9 Merge branch 'master' of git.sv.gnu.org:/srv/git/getfem into upgrading_getfem_to_cpp14 new b93e819 keyword spelling new b998578 no need for a smart pointer here. Value semantics will do. Summary of changes: src/getfem/dal_basic.h | 22 +++--- src/gmm/gmm_domain_decomp.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-)
[Getfem-commits] (no subject)
branch: upgrading_getfem_to_cpp14
commit cefabdb823513a0221d1468f76f6363cc3360929
Author: aa
Date: Mon Mar 18 14:50:00 2019 +0100
returning the fix that disappeared after the merge
---
src/getfem_generic_assembly_workspace.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/getfem_generic_assembly_workspace.cc
b/src/getfem_generic_assembly_workspace.cc
index 9d95991..2e66c16 100644
--- a/src/getfem_generic_assembly_workspace.cc
+++ b/src/getfem_generic_assembly_workspace.cc
@@ -606,7 +606,7 @@ namespace getfem {
if (tree.root) {
GMM_ASSERT1(tree.root->nb_test_functions() == 0,
"Invalid expression containing test functions");
- add_tree(tree, m, mim, rg, expr, order+1, false,
+ add_tree(tree, m, mim, rg, expr, order, false,
before ? ga_workspace::PRE_ASSIGNMENT
: ga_workspace::POST_ASSIGNMENT,
varname);
[Getfem-commits] (no subject)
branch: upgrading_getfem_to_cpp14 commit e7126d980fd9e8585054cdfcdcb15520e65d95b9 Merge: cefabdb 30d3f39 Author: aa Date: Thu Mar 21 14:30:39 2019 +0100 Merge branch 'master' of git.sv.gnu.org:/srv/git/getfem into upgrading_getfem_to_cpp14
[Getfem-commits] [getfem-commits] upgrading_getfem_to_cpp14 updated (8f8b8a2 -> e7126d9)
andrico pushed a change to branch upgrading_getfem_to_cpp14. from 8f8b8a2 Merge branch 'debug_assembly_breakage' of git.sv.gnu.org:/srv/git/getfem into upgrading_getfem_to_cpp14 new cefabdb returning the fix that disappeared after the merge adds 30d3f39 Fix regression in assembly with assignment expressions new e7126d9 Merge branch 'master' of git.sv.gnu.org:/srv/git/getfem into upgrading_getfem_to_cpp14 Summary of changes: src/getfem_generic_assembly_workspace.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
