[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
|
From: |
Andriy Andreykiv |
|
Subject: |
[Getfem-commits] (no subject) |
|
Date: |
Mon, 18 Mar 2019 06:54:26 -0400 (EDT) |
branch: upgrading_getfem_to_cpp14
commit 0213e2dc50e0a20f0c032c0820f5ca3b276acd1c
Merge: 776b81d 00ddea3
Author: aa <address@hidden>
Date: Fri Mar 15 11:01:31 2019 +0100
Merge branch 'master' of git.sv.gnu.org:/srv/git/getfem into
upgrading_getfem_to_cpp14
interface/src/gf_asm.cc | 80 +--
src/getfem/bgeot_mesh.h | 4 +-
src/getfem/bgeot_mesh_structure.h | 6 +-
src/getfem/bgeot_rtree.h | 44 +-
src/getfem/bgeot_tensor.h | 25 +-
src/getfem/getfem_assembling.h | 8 +-
src/getfem/getfem_deformable_mesh.h | 2 +-
src/getfem/getfem_generic_assembly.h | 78 ++-
.../getfem_generic_assembly_compile_and_exec.h | 35 +-
src/getfem/getfem_generic_assembly_semantic.h | 34 +-
src/getfem/getfem_generic_assembly_tree.h | 16 +-
src/getfem/getfem_mesh_fem.h | 8 +-
src/getfem/getfem_model_solvers.h | 272 +++++-----
src/getfem/getfem_models.h | 114 +++--
src/getfem/getfem_partial_mesh_fem.h | 2 +-
src/getfem_contact_and_friction_common.cc | 6 +-
src/getfem_generic_assembly_compile_and_exec.cc | 387 +++++++-------
src/getfem_generic_assembly_interpolation.cc | 34 +-
src/getfem_generic_assembly_semantic.cc | 11 +-
src/getfem_generic_assembly_tree.cc | 2 +-
src/getfem_generic_assembly_workspace.cc | 192 ++++---
src/getfem_mesh.cc | 2 +-
src/getfem_model_solvers.cc | 25 +-
src/getfem_models.cc | 426 ++++++++-------
src/getfem_plasticity.cc | 7 +-
src/gmm/gmm_matrix.h | 330 ++++++------
src/gmm/gmm_vector.h | 570 ++++++++++-----------
27 files changed, 1386 insertions(+), 1334 deletions(-)
diff --cc src/getfem/bgeot_rtree.h
index d4c4ee2,baf7eb2..630d030
--- a/src/getfem/bgeot_rtree.h
+++ b/src/getfem/bgeot_rtree.h
@@@ -67,12 -105,8 +105,12 @@@ namespace bgeot
public:
typedef std::deque<box_index> box_cont;
typedef std::vector<const box_index*> pbox_cont;
- typedef std::set<const box_index*> pbox_set;
+ typedef std::set<box_index_ptr> pbox_set;
+ rtree() = default;
+ rtree(const rtree&) = delete;
+ rtree& operator = (const rtree&) = delete;
+
void add_box(base_node min, base_node max, size_type id=size_type(-1)) {
box_index bi; bi.min = min; bi.max = max;
bi.id = (id + 1) ? id : boxes.size();