Mercurial > fem-fenics-eugenio
diff src/Mesh.cc @ 268:61830a4f9ab9
Improve formatting
| author | Eugenio Gianniti <eugenio.gianniti@mail.polimi.it> |
|---|---|
| date | Thu, 14 Aug 2014 12:26:55 +0200 |
| parents | a61fc34334ca |
| children |
line wrap: on
line diff
--- a/src/Mesh.cc Tue Aug 12 15:42:50 2014 +0200 +++ b/src/Mesh.cc Thu Aug 14 12:26:55 2014 +0200 @@ -29,7 +29,7 @@ compute_cell_markers (dolfin::Mesh const &, Array <octave_idx_type> const &, std::size_t const); -DEFUN_DLD (Mesh, args, nargout,"-*- texinfo -*-\n\ +DEFUN_DLD (Mesh, args, nargout, "-*- texinfo -*-\n\ @deftypefn {Function File} {[@var{mesh_out}, \ @var{facet_markers}, @var{cell_markers}]} = \ Mesh (@var{mesh_in}) \n\ @@ -55,7 +55,7 @@ octave_value_list retval; if (nargin < 1 || nargin > 1 || nargout > 3) - print_usage (); + { print_usage (); } else { if (!error_state) @@ -102,26 +102,26 @@ retval(1) = compute_facet_markers (msh, e, D); if (nargout == 3) - retval(2) = compute_cell_markers (msh, t, D); + { retval(2) = compute_cell_markers (msh, t, D); } } } } else - error ("Mesh: the argument you provide is invalid"); + { error ("Mesh: the argument you provide is invalid"); } } } return retval; } -mesh::mesh (Array<double>& p, - Array<octave_idx_type>& e, - Array<octave_idx_type>& t) +mesh::mesh (Array<double> & p, + Array<octave_idx_type> & e, + Array<octave_idx_type> & t) { std::size_t D = p.rows (); if (D < 2 || D > 3) - error ("Mesh constructor: only 2D or 3D meshes are supported"); + { error ("Mesh constructor: only 2D or 3D meshes are supported"); } else { dolfin::MeshEditor editor; @@ -164,7 +164,7 @@ // store information associated with e msh->init (D - 1); - dolfin::MeshValueCollection<std::size_t> facet(*msh, D - 1); + dolfin::MeshValueCollection<std::size_t> facet (*msh, D - 1); std::size_t num_side_edges = e.cols (); unsigned const size = @@ -223,7 +223,7 @@ && (*f).entities(0)[1] == e.xelem (1, i) - 1 && (*f).entities(0)[2] == e.xelem (0, i) - 1) { - std::pair <std::size_t, std::size_t> + std::pair <std::size_t, std::size_t> idxvl ((*f).index (), e.xelem (9, i)); msh->domains ().set_marker (idxvl, D - 1); break; @@ -400,14 +400,14 @@ Array <octave_idx_type> const & e, std::size_t const D) { - dolfin::MeshFunction <std::size_t> facet (_msh, D-1, + dolfin::MeshFunction <std::size_t> facet (_msh, D - 1, std::numeric_limits <std::size_t> ::max ()); std::size_t const num_side_edges = e.cols (); std::vector <std::size_t> const & global_vertices = _msh.topology ().global_indices (0); std::vector <std::size_t> const & global_facets = - _msh.topology ().global_indices (D-1); + _msh.topology ().global_indices (D - 1); if (D == 2) { @@ -417,7 +417,7 @@ std::size_t const e_index = e.xelem (0, i) - 1; while (local_vertex < global_vertices.size () && e_index != global_vertices[local_vertex]) - ++local_vertex; + { ++local_vertex; } if (local_vertex < global_vertices.size ()) { @@ -450,7 +450,7 @@ std::size_t const e_index = e.xelem (0, i) - 1; while (local_vertex < global_vertices.size () && e_index != global_vertices[local_vertex]) - ++local_vertex; + { ++local_vertex; } if (local_vertex < global_vertices.size ()) { @@ -464,7 +464,7 @@ std::size_t const & vertex2 = global_vertices[f->entities(0)[2]]; - if (vertex0 == e(0, i) - 1 + if (vertex0 == e.xelem (0, i) - 1 && vertex1 == e.xelem (1, i) - 1 && vertex2 == e.xelem (2, i) - 1 || vertex0 == e.xelem (0, i) - 1 @@ -517,7 +517,7 @@ std::size_t const t_index = t.xelem (0, i) - 1; while (local_vertex < global_vertices.size () && t_index != global_vertices[local_vertex]) - ++local_vertex; + { ++local_vertex; } if (local_vertex < global_vertices.size ()) { @@ -566,7 +566,7 @@ std::size_t const t_index = t.xelem (0, i) - 1; while (local_vertex < global_vertices.size () && t_index != global_vertices[local_vertex]) - ++local_vertex; + { ++local_vertex; } if (local_vertex < global_vertices.size ()) { @@ -583,104 +583,104 @@ global_vertices[f->entities(0)[3]]; if (vertex0 == t.xelem (0, i) - 1 - && vertex1 == t.xelem (1, i) - 1 - && vertex2 == t.xelem (2, i) - 1 - && vertex3 == t.xelem (3, i) - 1 - || vertex0 == t.xelem (0, i) - 1 - && vertex1 == t.xelem (1, i) - 1 - && vertex2 == t.xelem (3, i) - 1 - && vertex3 == t.xelem (2, i) - 1 - || vertex0 == t.xelem (0, i) - 1 - && vertex1 == t.xelem (2, i) - 1 - && vertex2 == t.xelem (1, i) - 1 - && vertex3 == t.xelem (3, i) - 1 - || vertex0 == t.xelem (0, i) - 1 - && vertex1 == t.xelem (2, i) - 1 - && vertex2 == t.xelem (3, i) - 1 - && vertex3 == t.xelem (1, i) - 1 - || vertex0 == t.xelem (0, i) - 1 - && vertex1 == t.xelem (3, i) - 1 - && vertex2 == t.xelem (1, i) - 1 - && vertex3 == t.xelem (2, i) - 1 - || vertex0 == t.xelem (0, i) - 1 - && vertex1 == t.xelem (3, i) - 1 - && vertex2 == t.xelem (2, i) - 1 - && vertex3 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (1, i) - 1 + && vertex2 == t.xelem (2, i) - 1 + && vertex3 == t.xelem (3, i) - 1 + || vertex0 == t.xelem (0, i) - 1 + && vertex1 == t.xelem (1, i) - 1 + && vertex2 == t.xelem (3, i) - 1 + && vertex3 == t.xelem (2, i) - 1 + || vertex0 == t.xelem (0, i) - 1 + && vertex1 == t.xelem (2, i) - 1 + && vertex2 == t.xelem (1, i) - 1 + && vertex3 == t.xelem (3, i) - 1 + || vertex0 == t.xelem (0, i) - 1 + && vertex1 == t.xelem (2, i) - 1 + && vertex2 == t.xelem (3, i) - 1 + && vertex3 == t.xelem (1, i) - 1 + || vertex0 == t.xelem (0, i) - 1 + && vertex1 == t.xelem (3, i) - 1 + && vertex2 == t.xelem (1, i) - 1 + && vertex3 == t.xelem (2, i) - 1 + || vertex0 == t.xelem (0, i) - 1 + && vertex1 == t.xelem (3, i) - 1 + && vertex2 == t.xelem (2, i) - 1 + && vertex3 == t.xelem (1, i) - 1 - || vertex0 == t.xelem (1, i) - 1 - && vertex1 == t.xelem (0, i) - 1 - && vertex2 == t.xelem (2, i) - 1 - && vertex3 == t.xelem (3, i) - 1 - || vertex0 == t.xelem (1, i) - 1 - && vertex1 == t.xelem (0, i) - 1 - && vertex2 == t.xelem (3, i) - 1 - && vertex3 == t.xelem (2, i) - 1 - || vertex0 == t.xelem (1, i) - 1 - && vertex1 == t.xelem (2, i) - 1 - && vertex2 == t.xelem (0, i) - 1 - && vertex3 == t.xelem (3, i) - 1 - || vertex0 == t.xelem (1, i) - 1 - && vertex1 == t.xelem (2, i) - 1 - && vertex2 == t.xelem (3, i) - 1 - && vertex3 == t.xelem (0, i) - 1 - || vertex0 == t.xelem (1, i) - 1 - && vertex1 == t.xelem (3, i) - 1 - && vertex2 == t.xelem (0, i) - 1 - && vertex3 == t.xelem (2, i) - 1 - || vertex0 == t.xelem (1, i) - 1 - && vertex1 == t.xelem (3, i) - 1 - && vertex2 == t.xelem (2, i) - 1 - && vertex3 == t.xelem (0, i) - 1 + || vertex0 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (0, i) - 1 + && vertex2 == t.xelem (2, i) - 1 + && vertex3 == t.xelem (3, i) - 1 + || vertex0 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (0, i) - 1 + && vertex2 == t.xelem (3, i) - 1 + && vertex3 == t.xelem (2, i) - 1 + || vertex0 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (2, i) - 1 + && vertex2 == t.xelem (0, i) - 1 + && vertex3 == t.xelem (3, i) - 1 + || vertex0 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (2, i) - 1 + && vertex2 == t.xelem (3, i) - 1 + && vertex3 == t.xelem (0, i) - 1 + || vertex0 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (3, i) - 1 + && vertex2 == t.xelem (0, i) - 1 + && vertex3 == t.xelem (2, i) - 1 + || vertex0 == t.xelem (1, i) - 1 + && vertex1 == t.xelem (3, i) - 1 + && vertex2 == t.xelem (2, i) - 1 + && vertex3 == t.xelem (0, i) - 1 - || vertex0 == t.xelem (2, i) - 1 - && vertex1 == t.xelem (0, i) - 1 - && vertex2 == t.xelem (1, i) - 1 - && vertex3 == t.xelem (3, i) - 1 - || vertex0 == t.xelem (2, i) - 1 - && vertex1 == t.xelem (0, i) - 1 - && vertex2 == t.xelem (3, i) - 1 - && vertex3 == t.xelem (1, i) - 1 - || vertex0 == t.xelem (2, i) - 1 - && vertex1 == t.xelem (1, i) - 1 - && vertex2 == t.xelem (0, i) - 1 - && vertex3 == t.xelem (3, i) - 1 - || vertex0 == t.xelem (2, i) - 1 - && vertex1 == t.xelem (1, i) - 1 - && vertex2 == t.xelem (3, i) - 1 - && vertex3 == t.xelem (0, i) - 1 - || vertex0 == t.xelem (2, i) - 1 - && vertex1 == t.xelem (3, i) - 1 - && vertex2 == t.xelem (0, i) - 1 - && vertex3 == t.xelem (1, i) - 1 - || vertex0 == t.xelem (2, i) - 1 - && vertex1 == t.xelem (3, i) - 1 - && vertex2 == t.xelem (1, i) - 1 - && vertex3 == t.xelem (0, i) - 1 + || vertex0 == t.xelem (2, i) - 1 + && vertex1 == t.xelem (0, i) - 1 + && vertex2 == t.xelem (1, i) - 1 + && vertex3 == t.xelem (3, i) - 1 + || vertex0 == t.xelem (2, i) - 1 + && vertex1 == t.xelem (0, i) - 1 + && vertex2 == t.xelem (3, i) - 1 + && vertex3 == t.xelem (1, i) - 1 + || vertex0 == t.xelem (2, i) - 1 + && vertex1 == t.xelem (1, i) - 1 + && vertex2 == t.xelem (0, i) - 1 + && vertex3 == t.xelem (3, i) - 1 + || vertex0 == t.xelem (2, i) - 1 + && vertex1 == t.xelem (1, i) - 1 + && vertex2 == t.xelem (3, i) - 1 + && vertex3 == t.xelem (0, i) - 1 + || vertex0 == t.xelem (2, i) - 1 + && vertex1 == t.xelem (3, i) - 1 + && vertex2 == t.xelem (0, i) - 1 + && vertex3 == t.xelem (1, i) - 1 + || vertex0 == t.xelem (2, i) - 1 + && vertex1 == t.xelem (3, i) - 1 + && vertex2 == t.xelem (1, i) - 1 + && vertex3 == t.xelem (0, i) - 1 - || vertex0 == t.xelem (3, i) - 1 - && vertex1 == t.xelem (0, i) - 1 - && vertex2 == t.xelem (1, i) - 1 - && vertex3 == t.xelem (2, i) - 1 - || vertex0 == t.xelem (3, i) - 1 - && vertex1 == t.xelem (0, i) - 1 - && vertex2 == t.xelem (2, i) - 1 - && vertex3 == t.xelem (1, i) - 1 - || vertex0 == t.xelem (3, i) - 1 - && vertex1 == t.xelem (1, i) - 1 - && vertex2 == t.xelem (0, i) - 1 - && vertex3 == t.xelem (2, i) - 1 - || vertex0 == t.xelem (3, i) - 1 - && vertex1 == t.xelem (1, i) - 1 - && vertex2 == t.xelem (2, i) - 1 - && vertex3 == t.xelem (0, i) - 1 - || vertex0 == t.xelem (3, i) - 1 - && vertex1 == t.xelem (2, i) - 1 - && vertex2 == t.xelem (0, i) - 1 - && vertex3 == t.xelem (1, i) - 1 - || vertex0 == t.xelem (3, i) - 1 - && vertex1 == t.xelem (2, i) - 1 - && vertex2 == t.xelem (1, i) - 1 - && vertex3 == t.xelem (0, i) - 1) + || vertex0 == t.xelem (3, i) - 1 + && vertex1 == t.xelem (0, i) - 1 + && vertex2 == t.xelem (1, i) - 1 + && vertex3 == t.xelem (2, i) - 1 + || vertex0 == t.xelem (3, i) - 1 + && vertex1 == t.xelem (0, i) - 1 + && vertex2 == t.xelem (2, i) - 1 + && vertex3 == t.xelem (1, i) - 1 + || vertex0 == t.xelem (3, i) - 1 + && vertex1 == t.xelem (1, i) - 1 + && vertex2 == t.xelem (0, i) - 1 + && vertex3 == t.xelem (2, i) - 1 + || vertex0 == t.xelem (3, i) - 1 + && vertex1 == t.xelem (1, i) - 1 + && vertex2 == t.xelem (2, i) - 1 + && vertex3 == t.xelem (0, i) - 1 + || vertex0 == t.xelem (3, i) - 1 + && vertex1 == t.xelem (2, i) - 1 + && vertex2 == t.xelem (0, i) - 1 + && vertex3 == t.xelem (1, i) - 1 + || vertex0 == t.xelem (3, i) - 1 + && vertex1 == t.xelem (2, i) - 1 + && vertex2 == t.xelem (1, i) - 1 + && vertex3 == t.xelem (0, i) - 1) { cell[*f] = t.xelem (4, i); break;