ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

remove old mpi-wrapper

Browse Source
This commit is contained in:
Joachim Schoeberl 2022-05-06 18:21:37 +02:00
parent 9b44069e54
commit 4f09633b80
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsrc/general/CMakeLists.txt
View File

@ -2,7 +2,6 @@ target_sources(nglib PRIVATE
dynamicmem.cpp dynamicmem.cpp
gzstream.cpp gzstream.cpp
hashtabl.cpp hashtabl.cpp
mpi_interface.cpp
mystring.cpp mystring.cpp
ngarray.cpp ngarray.cpp
ngbitarray.cpp ngbitarray.cpp

2
libsrc/general/mpi_interface.cpp
View File

@ -4,6 +4,7 @@
/* Date: 04. Apr. 97 */ /* Date: 04. Apr. 97 */
/**************************************************************************/ /**************************************************************************/
#ifdef OLD
#include <mystdlib.h> #include <mystdlib.h>
#include <myadt.hpp> #include <myadt.hpp>
@ -50,3 +51,4 @@ namespace netgen
#endif

1
libsrc/general/mpi_interface.hpp
View File

@ -2,7 +2,6 @@
#define FILE_PARALLEL #define FILE_PARALLEL
#ifdef VTRACE #ifdef VTRACE
#include "vt_user.h" #include "vt_user.h"
#else #else

2
libsrc/general/myadt.hpp
View File

@ -43,7 +43,7 @@ namespace netgen
#include "stack.hpp" #include "stack.hpp"
#include "mystring.hpp" #include "mystring.hpp"
#include "mpi_interface.hpp" // #include "mpi_interface.hpp"
#include "netgenout.hpp" #include "netgenout.hpp"

2
libsrc/general/netgenout.hpp
View File

@ -4,7 +4,7 @@
// #include <ostream> // #include <ostream>
// #include <mystdlib.h> // #include <mystdlib.h>
// #include <meshing.hpp> // #include <meshing.hpp>
#include "mpi_interface.hpp" // #include "mpi_interface.hpp"
namespace netgen namespace netgen
{ {

3
libsrc/meshing/meshclass.hpp
View File

@ -17,6 +17,9 @@ namespace netgen
{ {
using namespace std; using namespace std;
static constexpr int MPI_TAG_MESH = 210;
enum resthtype { RESTRICTH_FACE, RESTRICTH_EDGE, enum resthtype { RESTRICTH_FACE, RESTRICTH_EDGE,
RESTRICTH_SURFACEELEMENT, RESTRICTH_POINT, RESTRICTH_SEGMENT }; RESTRICTH_SURFACEELEMENT, RESTRICTH_POINT, RESTRICTH_SEGMENT };

9
libsrc/meshing/paralleltop.cpp
View File

@ -500,7 +500,8 @@ namespace netgen
} }
DynamicTable<int> recv_verts(ntasks); DynamicTable<int> recv_verts(ntasks);
MyMPI_ExchangeTable (send_verts, recv_verts, MPI_TAG_MESH+9, comm); // MyMPI_ExchangeTable (send_verts, recv_verts, MPI_TAG_MESH+9, comm);
comm.ExchangeTable (send_verts, recv_verts, MPI_TAG_MESH+9);
for (int dest = 0; dest < ntasks; dest++) for (int dest = 0; dest < ntasks; dest++)
if (dest != id) if (dest != id)
@ -692,7 +693,8 @@ namespace netgen
// cout << "UpdateCoarseGrid - edges mpi-exchange" << endl; // cout << "UpdateCoarseGrid - edges mpi-exchange" << endl;
// TABLE<int> recv_edges(ntasks); // TABLE<int> recv_edges(ntasks);
DynamicTable<int> recv_edges(ntasks); DynamicTable<int> recv_edges(ntasks);
MyMPI_ExchangeTable (send_edges, recv_edges, MPI_TAG_MESH+9, comm); // MyMPI_ExchangeTable (send_edges, recv_edges, MPI_TAG_MESH+9, comm);
comm.ExchangeTable (send_edges, recv_edges, MPI_TAG_MESH+9);
// cout << "UpdateCoarseGrid - edges mpi-exchange done" << endl; // cout << "UpdateCoarseGrid - edges mpi-exchange done" << endl;
for (int dest = 0; dest < ntasks; dest++) for (int dest = 0; dest < ntasks; dest++)
@ -800,7 +802,8 @@ namespace netgen
// cout << "UpdateCoarseGrid - faces mpi-exchange" << endl; // cout << "UpdateCoarseGrid - faces mpi-exchange" << endl;
// TABLE<int> recv_faces(ntasks); // TABLE<int> recv_faces(ntasks);
DynamicTable<int> recv_faces(ntasks); DynamicTable<int> recv_faces(ntasks);
MyMPI_ExchangeTable (send_faces, recv_faces, MPI_TAG_MESH+9, comm); // MyMPI_ExchangeTable (send_faces, recv_faces, MPI_TAG_MESH+9, comm);
comm.ExchangeTable (send_faces, recv_faces, MPI_TAG_MESH+9);
// cout << "UpdateCoarseGrid - faces mpi-exchange done" << endl; // cout << "UpdateCoarseGrid - faces mpi-exchange done" << endl;
for (int dest = 0; dest < ntasks; dest++) for (int dest = 0; dest < ntasks; dest++)