branch: devel-logari81 commit da4bee71c620cb12cfe60ba199b890d02b9cab76 Author: Konstantinos Poulios <logar...@gmail.com> Date: Mon Aug 7 11:00:38 2017 +0200
substitute use of bgeot::Comma_initializer with standard C++11 syntax --- src/bgeot_convex_ref.cc | 30 +++++++++++++++--------------- src/bgeot_convex_structure.cc | 40 ++++++++++++++++++++-------------------- src/bgeot_poly_composite.cc | 16 ++++++++-------- src/getfem_export.cc | 16 ++++++++-------- tests/test_mesh.cc | 8 +++----- tests/test_slice.cc | 16 ++++++++-------- 6 files changed, 62 insertions(+), 64 deletions(-) diff --git a/src/bgeot_convex_ref.cc b/src/bgeot_convex_ref.cc index 00386c8..8fe7002 100644 --- a/src/bgeot_convex_ref.cc +++ b/src/bgeot_convex_ref.cc @@ -230,10 +230,10 @@ namespace bgeot { basic_convex_ref_ = parallelepiped_of_reference(nc); if(nc==2) { - sc(normals_[0]) = 1, 0; - sc(normals_[1]) = -1, 0; - sc(normals_[2]) = 0, 1; - sc(normals_[3]) = 0,-1; + normals_[0] = { 1, 0}; + normals_[1] = {-1, 0}; + normals_[2] = { 0, 1}; + normals_[3] = { 0,-1}; convex<base_node>::points()[0] = base_node(0.0, 0.0); convex<base_node>::points()[1] = base_node(0.5, 0.0); @@ -245,12 +245,12 @@ namespace bgeot { convex<base_node>::points()[7] = base_node(1.0, 1.0); } else { - sc(normals_[0]) = 1, 0, 0; - sc(normals_[1]) = -1, 0, 0; - sc(normals_[2]) = 0, 1, 0; - sc(normals_[3]) = 0,-1, 0; - sc(normals_[4]) = 0, 0, 1; - sc(normals_[5]) = 0, 0,-1; + normals_[0] = { 1, 0, 0}; + normals_[1] = {-1, 0, 0}; + normals_[2] = { 0, 1, 0}; + normals_[3] = { 0,-1, 0}; + normals_[4] = { 0, 0, 1}; + normals_[5] = { 0, 0,-1}; convex<base_node>::points()[0] = base_node(0.0, 0.0, 0.0); convex<base_node>::points()[1] = base_node(0.5, 0.0, 0.0); @@ -329,11 +329,11 @@ namespace bgeot { else basic_convex_ref_ = pyramid_of_reference(1); - sc(normals_[0]) = 0., 0., -1.; - sc(normals_[1]) = 0.,-1., 1.; - sc(normals_[2]) = 1., 0., 1.; - sc(normals_[3]) = 0., 1., 1.; - sc(normals_[4]) = -1., 0., 1.; + normals_[0] = { 0., 0., -1.}; + normals_[1] = { 0.,-1., 1.}; + normals_[2] = { 1., 0., 1.}; + normals_[3] = { 0., 1., 1.}; + normals_[4] = {-1., 0., 1.}; for (size_type i = 0; i < normals_.size(); ++i) gmm::scale(normals_[i], 1. / gmm::vect_norm2(normals_[i])); diff --git a/src/bgeot_convex_structure.cc b/src/bgeot_convex_structure.cc index cfa49fa..06a19cb 100644 --- a/src/bgeot_convex_structure.cc +++ b/src/bgeot_convex_structure.cc @@ -414,10 +414,10 @@ namespace bgeot { // 3 4 // | | // 0--1--2 - sc(p->faces[0]) = 2,4,7; - sc(p->faces[1]) = 0,3,5; - sc(p->faces[2]) = 5,6,7; - sc(p->faces[3]) = 0,1,2; + p->faces[0] = {2,4,7}; + p->faces[1] = {0,3,5}; + p->faces[2] = {5,6,7}; + p->faces[3] = {0,1,2}; p->dir_points_[0] = 0; p->dir_points_[1] = 2; @@ -434,14 +434,14 @@ namespace bgeot { // 8 / 9 / // |/ |/ // 0----1----2 - sc(p->faces[0]) = 2,4,7,9,11,14,16,19; - sc(p->faces[1]) = 0,3,5,8,10,12,15,17; + p->faces[0] = {2,4,7,9,11,14,16,19}; + p->faces[1] = {0,3,5,8,10,12,15,17}; - sc(p->faces[2]) = 5,6,7,10,11,17,18,19; - sc(p->faces[3]) = 0,1,2,8,9,12,13,14; + p->faces[2] = {5,6,7,10,11,17,18,19}; + p->faces[3] = {0,1,2,8,9,12,13,14}; - sc(p->faces[4]) = 12,13,14,15,16,17,18,19; - sc(p->faces[5]) = 0,1,2,3,4,5,6,7; + p->faces[4] = {12,13,14,15,16,17,18,19}; + p->faces[5] = {0,1,2,3,4,5,6,7}; p->dir_points_[0] = 0; p->dir_points_[1] = 2; @@ -500,11 +500,11 @@ namespace bgeot { // 0------1 p->faces_struct.resize(p->nbf); p->faces = std::vector< std::vector<short_type> >(p->nbf); - sc(p->faces[0]) = 0,1,2,3; - sc(p->faces[1]) = 0,1,4; - sc(p->faces[2]) = 1,3,4; - sc(p->faces[3]) = 3,2,4; - sc(p->faces[4]) = 2,0,4; + p->faces[0] = {0,1,2,3}; + p->faces[1] = {0,1,4}; + p->faces[2] = {1,3,4}; + p->faces[3] = {3,2,4}; + p->faces[4] = {2,0,4}; p->dir_points_[0] = 0; p->dir_points_[1] = 1; @@ -536,11 +536,11 @@ namespace bgeot { // 0--1--2 p->faces_struct.resize(p->nbf); p->faces = std::vector< std::vector<short_type> >(p->nbf); - sc(p->faces[0]) = 0,1,2,3,4,5,6,7,8; - sc(p->faces[1]) = 0,1,2,9,10,13; - sc(p->faces[2]) = 2,5,8,10,12,13; - sc(p->faces[3]) = 8,7,6,12,11,13; - sc(p->faces[4]) = 6,3,0,11,9,13; + p->faces[0] = {0,1,2,3,4,5,6,7,8}; + p->faces[1] = {0,1,2,9,10,13}; + p->faces[2] = {2,5,8,10,12,13}; + p->faces[3] = {8,7,6,12,11,13}; + p->faces[4] = {6,3,0,11,9,13}; p->dir_points_[0] = 0; p->dir_points_[1] = 2; diff --git a/src/bgeot_poly_composite.cc b/src/bgeot_poly_composite.cc index f832031..a5d8418 100644 --- a/src/bgeot_poly_composite.cc +++ b/src/bgeot_poly_composite.cc @@ -245,14 +245,14 @@ namespace bgeot { for (short_type ck = 0; ck < k-ci-cj; ck++) { scalar_type z=ck*h; - sc(A) = x,y,z; - sc(B) = x+h,y,z; - sc(C) = x,y+h,z; - sc(D) = x+h,y+h,z; - sc(E) = x,y,z+h; - sc(F) = x+h,y,z+h; - sc(G) = x,y+h,z+h; - sc(H) = x+h,y+h,z+h; + A = {x, y, z}; + B = {x+h, y, z}; + C = {x, y+h, z}; + D = {x+h, y+h, z}; + E = {x, y, z+h}; + F = {x+h, y, z+h}; + G = {x, y+h, z+h}; + H = {x+h, y+h, z+h}; if (opt_gt) { A = opt_gt->transform(A, *opt_gt_pts); B = opt_gt->transform(B, *opt_gt_pts); diff --git a/src/getfem_export.cc b/src/getfem_export.cc index 7edd6cf..2f67f6d 100644 --- a/src/getfem_export.cc +++ b/src/getfem_export.cc @@ -804,14 +804,14 @@ namespace getfem gf2pos_dof_mapping &dm = dal::singleton<gf2pos_dof_mapping>::instance(); if (dm.size() == 0) { dm.resize(8); - bgeot::sc(dm[pos_export::POS_PT]) = 0; - bgeot::sc(dm[pos_export::POS_LN]) = 0, 1; - bgeot::sc(dm[pos_export::POS_TR]) = 0, 1, 2; - bgeot::sc(dm[pos_export::POS_QU]) = 0, 1, 3, 2; - bgeot::sc(dm[pos_export::POS_SI]) = 0, 1, 2, 3; - bgeot::sc(dm[pos_export::POS_HE]) = 0, 1, 3, 2, 4, 5, 7, 6; - bgeot::sc(dm[pos_export::POS_PR]) = 0, 1, 2, 3, 4, 5; - bgeot::sc(dm[pos_export::POS_PY]) = 0, 1, 3, 2, 4; + dm[pos_export::POS_PT] = {0}; + dm[pos_export::POS_LN] = {0, 1}; + dm[pos_export::POS_TR] = {0, 1, 2}; + dm[pos_export::POS_QU] = {0, 1, 3, 2}; + dm[pos_export::POS_SI] = {0, 1, 2, 3}; + dm[pos_export::POS_HE] = {0, 1, 3, 2, 4, 5, 7, 6}; + dm[pos_export::POS_PR] = {0, 1, 2, 3, 4, 5}; + dm[pos_export::POS_PY] = {0, 1, 3, 2, 4}; } return dm[t]; } diff --git a/tests/test_mesh.cc b/tests/test_mesh.cc index acdb0b3..7755195 100644 --- a/tests/test_mesh.cc +++ b/tests/test_mesh.cc @@ -268,15 +268,13 @@ test_convex_simplif(void) { getfem::mesh(*mprr).write_to_file(cout); } -using bgeot::sc; - void test_convex_quality(getfem::scalar_type dx, getfem::scalar_type dy) { getfem::mesh m; getfem::base_node A,B,C; getfem::scalar_type h = sqrt(3.0); - sc(B)+=0,0; - sc(C)+=2,0; - sc(A)+=0,h; + B = {0,0}; + C = {2,0}; + A = {0,h}; cout << "quality of triangles, and their radius estimates " << " (should decrease): "; for (size_type i=0; i < 10; ++i) { diff --git a/tests/test_slice.cc b/tests/test_slice.cc index 21dce10..92ced8a 100644 --- a/tests/test_slice.cc +++ b/tests/test_slice.cc @@ -70,17 +70,17 @@ main() { FE_ENABLE_EXCEPT; // Enable floating point exception for Nan. getfem::mesh m; - getfem::base_node A; bgeot::sc(A)=0,0; - getfem::base_node B; bgeot::sc(B)=1,0; - getfem::base_node C; bgeot::sc(C)=0,2; - getfem::base_node D; bgeot::sc(D)=1,1; + getfem::base_node A{0,0}; + getfem::base_node B{1,0}; + getfem::base_node C{0,2}; + getfem::base_node D{1,1}; m.add_triangle_by_points(A,B,C); m.add_triangle_by_points(B,C,D); - getfem::base_node x0; bgeot::sc(x0) = .4,0; - getfem::base_node n0; bgeot::sc(n0) = 1,0; - getfem::base_node x1; bgeot::sc(x1) = 0,0.1; - getfem::base_node n1; bgeot::sc(n1) = 1,-1; + getfem::base_node x0{.4,0}; + getfem::base_node n0{1,0}; + getfem::base_node x1{0,0.1}; + getfem::base_node n1{1,-1}; getfem::mesh_region cvlst; cvlst.add(0);