Changeset 16137 for issm/trunk/src/c/classes/Patch.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes (modified) (1 prop)
• src/c/classes/Patch.cpp (modified) (4 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

issm/trunk/src/c/classes/Patch.cpp

@@ -111 +111 @@
         int         node_numrows;
         IssmDouble     *total_values  = NULL;
-        #ifdef _HAVE_MPI_
-        MPI_Status  status;
-        #endif
+        ISSM_MPI_Status  status;
 
         /*recover my_rank:*/
@@ -120 +118 @@
 
         /*First, figure out total number of rows combining all the cpus: */
-        #ifdef _HAVE_MPI_
-        MPI_Reduce(&this->numrows,&total_numrows,1,MPI_INT,MPI_SUM,0,IssmComm::GetComm() );
-        MPI_Bcast(&total_numrows,1,MPI_INT,0,IssmComm::GetComm());
-        #else
-        total_numrows=this->numrows;
-        #endif
+        ISSM_MPI_Reduce(&this->numrows,&total_numrows,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() );
+        ISSM_MPI_Bcast(&total_numrows,1,ISSM_MPI_INT,0,IssmComm::GetComm());
 
         /*return if patch empty*/
@@ -141 +135 @@
 
         /*Now, ask other nodes to send their values: */
-        #ifdef _HAVE_MPI_
         for(int i=1;i<num_procs;i++){
                 if (my_rank==i){ 
-                        MPI_Send(&this->numrows,1,MPI_INT,0,1,IssmComm::GetComm());   
-                        if (this->numrows)MPI_Send(this->values,this->numrows*this->numcols,MPI_DOUBLE,0,1,IssmComm::GetComm()); 
+                        ISSM_MPI_Send(&this->numrows,1,ISSM_MPI_INT,0,1,IssmComm::GetComm());   
+                        if (this->numrows)ISSM_MPI_Send(this->values,this->numrows*this->numcols,ISSM_MPI_DOUBLE,0,1,IssmComm::GetComm()); 
                 }
                 if (my_rank==0){
-                        MPI_Recv(&node_numrows,1,MPI_INT,i,1,IssmComm::GetComm(),&status); 
-                        if (node_numrows)MPI_Recv(total_values+count,node_numrows*this->numcols,MPI_DOUBLE,i,1,IssmComm::GetComm(),&status);
+                        ISSM_MPI_Recv(&node_numrows,1,ISSM_MPI_INT,i,1,IssmComm::GetComm(),&status); 
+                        if (node_numrows)ISSM_MPI_Recv(total_values+count,node_numrows*this->numcols,ISSM_MPI_DOUBLE,i,1,IssmComm::GetComm(),&status);
                         count+=node_numrows*this->numcols;
                 }
         }       
-        #endif
 
         /*Now, node 0 has total_values, of size total_numrows*this->numcols. Update the fields in the patch, to reflect this new 
@@ -162 +154 @@
                 this->values=total_values;
         }
-        #ifdef _HAVE_MPI_
         else{
                 this->numrows=0;
                 xDelete<IssmDouble>(this->values);
         }
-        #endif
 }/*}}}*/

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp