Changeset 24035

Timestamp:

06/24/19 02:21:37 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: split vector syncing with clones

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (3 diffs)
• FemModel.h (modified) (1 diff)

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

@@ -1314 +1314 @@
 void FemModel::GetLocalVectorWithClonesVertices(IssmDouble** plocal_vector,Vector<IssmDouble> *vector){/*{{{*/
 
-        /*recover my_rank:*/
-        ISSM_MPI_Status status;
-        int my_rank   = IssmComm::GetRank();
-        int num_procs = IssmComm::GetSize();
-
         /*retrieve vertex info*/
         int localsize         = this->vertices->NumberOfVerticesLocalAll();
@@ -1334 +1329 @@
         xMemCpy<IssmDouble>(local_vector,local_vector_masters,localsize_masters);
         xDelete<IssmDouble>(local_vector_masters);
+
+        /*Now send and receive vector for vertices on partition edge*/
+        SyncLocalVectorWithClonesVertices(local_vector);
+
+        /*Assign output pointer*/
+        *plocal_vector = local_vector;
+}/*}}}*/
+void FemModel::SyncLocalVectorWithClonesVertices(IssmDouble* local_vector){/*{{{*/
+
+        /*recover my_rank:*/
+        ISSM_MPI_Status status;
+        int my_rank   = IssmComm::GetRank();
+        int num_procs = IssmComm::GetSize();
 
         /*Now send and receive vector for vertices on partition edge*/
@@ -1366 +1374 @@
         }
         xDelete<IssmDouble>(buffer);
-
-        /*Assign output pointer*/
-        *plocal_vector = local_vector;
 }/*}}}*/
 void FemModel::GetLocalVectorWithClonesNodes(IssmDouble** plocal_vector,Vector<IssmDouble> *vector){/*{{{*/

issm/trunk-jpl/src/c/classes/FemModel.h ¶

@@ -98 +98 @@
                 void GetLocalVectorWithClonesGset(IssmDouble** plocal_ug,Vector<IssmDouble> *ug);
                 void GetLocalVectorWithClonesVertices(IssmDouble** plocal_vector,Vector<IssmDouble> *vector);
+                void SyncLocalVectorWithClonesVertices(IssmDouble* local_vector);
                 void GetLocalVectorWithClonesNodes(IssmDouble** plocal_vector,Vector<IssmDouble> *vector);
                 void GroundedAreax(IssmDouble* pV, bool scaled);