diff --git a/GeoLib/Grid.h b/GeoLib/Grid.h index 0982d4ed1315b6b1b93cc45dfc3336230f97fff6..da8a896e385c2045a1ad3dc4d107d96a52815da1 100644 --- a/GeoLib/Grid.h +++ b/GeoLib/Grid.h @@ -319,7 +319,7 @@ private: POINT* &nearest_pnt) const { const std::size_t grid_idx (coords[0] + coords[1] * _n_steps[0] + coords[2] * _n_steps[0] * _n_steps[1]); - std::vector<typename std::tr1::add_pointer<typename std::tr1::remove_pointer<POINT>::type>::type> const& pnts(_grid_cell_nodes_map[grid_idx]); + std::vector<typename std::add_pointer<typename std::remove_pointer<POINT>::type>::type> const& pnts(_grid_cell_nodes_map[grid_idx]); if (pnts.empty()) return false; const std::size_t n_pnts(pnts.size()); diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp index f11cf4d36e5a812dd1c053fdfc4d3a506eb5dd0c..2db846e49945a7011a862729f3b0e7f06f2b447d 100644 --- a/MeshLib/Mesh.cpp +++ b/MeshLib/Mesh.cpp @@ -165,13 +165,7 @@ void Mesh::setEdgeLengthRange(const double &min_length, const double &max_length void Mesh::setElementsConnectedToElements() { const size_t nElements = _elements.size(); -#ifdef _OPENMP - OPENMP_LOOP_TYPE m; - #pragma omp parallel for -#else - unsigned m(0); -#endif - for (m=0; m<nElements; ++m) + for (unsigned m(0); m<nElements; ++m) { // create vector with all elements connected to current element (includes lots of doubles!) std::vector<Element*> neighbors; diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp index 8e8554429ad61c21602df73e74472300349938d7..440240fd21c9e89d9c199d3ca8393e347ccc8638 100644 --- a/SimpleTests/MeshTests/MeshRead.cpp +++ b/SimpleTests/MeshTests/MeshRead.cpp @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) // std::cout << "time for reading: " << run_time.elapsed() << " s" << std::endl; INFO ("time for reading: %f s", run_time.elapsed()); - +/* unsigned elem_id = 25000; const MeshLib::Element* e = mesh->getElement(elem_id); const size_t nElems = mesh->getNElements(); @@ -64,8 +64,9 @@ int main(int argc, char *argv[]) { for (unsigned j=0; j< nElems; j++) if (mesh->getElement(j) == e->getNeighbor(i)) - std::cout << "neighbour of element " << elem_id << elem_id << " : " << j << std::endl; + std::cout << "neighbour of element " << elem_id << " : " << j << std::endl; } +*/ delete mesh; delete logogCout;