From 68c320fd53ed22ea323b4c070baff43cec294dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Sch=C3=B6berl?= Date: Mon, 11 Feb 2019 07:57:09 +0100 Subject: [PATCH] less ifdef PARALLEL --- libsrc/include/nginterface_v2.hpp | 3 +-- libsrc/interface/nginterface_v2.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libsrc/include/nginterface_v2.hpp b/libsrc/include/nginterface_v2.hpp index b0dcfe89..bd432a43 100644 --- a/libsrc/include/nginterface_v2.hpp +++ b/libsrc/include/nginterface_v2.hpp @@ -363,9 +363,8 @@ namespace netgen int * const indices = NULL, int numind = 0) const; -#ifdef PARALLEL + // for MPI-parallel std::tuple GetDistantProcs (int nodetype, int locnum) const; -#endif shared_ptr GetMesh () const { return mesh; } shared_ptr SelectMesh () const; diff --git a/libsrc/interface/nginterface_v2.cpp b/libsrc/interface/nginterface_v2.cpp index 9be47b57..7fe34c1b 100644 --- a/libsrc/interface/nginterface_v2.cpp +++ b/libsrc/interface/nginterface_v2.cpp @@ -1245,11 +1245,11 @@ void Ngx_Mesh::SetSurfaceElementOrders (int enr, int ox, int oy) -#ifdef PARALLEL + std::tuple Ngx_Mesh :: GetDistantProcs (int nodetype, int locnum) const { - +#ifdef PARALLEL switch (nodetype) { case 0: @@ -1270,10 +1270,10 @@ void Ngx_Mesh::SetSurfaceElementOrders (int enr, int ox, int oy) default: return std::tuple(0,nullptr); } - } - +#else + return std::tuple(0,nullptr); #endif - + } }