Changeset 27459

Timestamp:

12/09/22 02:53:01 (2 years ago)

Author:

bdef

Message:

Fixing a MPI issue arrising on UiB Saga

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (5 diffs)
• Nodes.cpp (modified) (4 diffs)
• Vertices.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1480 +1480 @@
    xDelete<IssmDouble>(recv_buffer);
    for(int rank=0;rank<num_procs;rank++){
-      if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
-      xDelete<IssmDouble>(send_buffers[rank]);
+                if(this->vertices->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
+                xDelete<IssmDouble>(send_buffers[rank]);
    }
    xDelete<IssmDouble*>(send_buffers);
@@ -1528 +1528 @@
         /*Wait until MPI is done*/
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->vertices->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
         }
 
@@ -1561 +1561 @@
         xDelete<IssmDouble>(recv_buffer);
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->vertices->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
                 xDelete<IssmDouble>(send_buffers[rank]);
         }
@@ -1624 +1624 @@
         xDelete<IssmDouble>(recv_buffer);
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->nodes->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
                 xDelete<IssmDouble>(send_buffers[rank]);
         }
@@ -1670 +1670 @@
                 basin_icefront_area[basin]=total_icefront_area;
         }
-        
+
         this->parameters->AddObject(new DoubleVecParam(FrontalForcingsBasinIcefrontAreaEnum,basin_icefront_area,numbasins));
 

issm/trunk-jpl/src/c/classes/Nodes.cpp

@@ -210 +210 @@
         xDelete<int>(recv_truedofs);
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
                 xDelete<int>(send_truedofs[rank]);
         }
@@ -299 +299 @@
         xDelete<int>(recv_truepids);
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
                 xDelete<int>(send_truepids[rank]);
         }
@@ -505 +505 @@
         /*Now send and receive ug for nodes on partition edge*/
         IssmDouble **send_buffers = xNewZeroInit<IssmDouble*>(num_procs);
-        IssmDouble  *recv_buffer  = xNewZeroInit<IssmDouble>(this->Size()*maxdofspernode,"t"); 
+        IssmDouble  *recv_buffer  = xNewZeroInit<IssmDouble>(this->Size()*maxdofspernode,"t");
         ISSM_MPI_Request  *send_requests = xNew<ISSM_MPI_Request>(num_procs);
         for (int rank = 0;rank<num_procs;rank++) send_requests[rank] = ISSM_MPI_REQUEST_NULL;
@@ -536 +536 @@
         xDelete<IssmDouble>(recv_buffer);
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
                 xDelete<IssmDouble>(send_buffers[rank]);
         }

issm/trunk-jpl/src/c/classes/Vertices.cpp

@@ -262 +262 @@
         xDelete<int>(recv_truepids);
         for(int rank=0;rank<num_procs;rank++){
-                if(rank!=my_rank) ISSM_MPI_Wait(&send_requests[rank],&status);
+                if(this->common_send[rank]) ISSM_MPI_Wait(&send_requests[rank],&status);
                 xDelete<int>(send_truepids[rank]);
         }