Changeset 16102

Timestamp:

09/06/13 14:27:06 (12 years ago)

Author:

Eric.Larour

Message:

CHG: get svn to ignore some files. Fixed some issues with miscast ISSM_MPI_DOUBLE and ISSM_MPI_PDOUBLE types.

Location:

issm/trunk-jpl

Files:

• externalpackages/cython (modified) (1 prop)
• externalpackages/matplotlib/install-macosx64.sh (modified) (2 diffs)
• src/c/classes/Elements/Elements.cpp (modified) (1 diff)
• src/c/modules/Krigingx/pKrigingx.cpp (modified) (4 diffs)
• src/c/toolkits/petsc/patches/MatToSerial.cpp (modified) (1 diff)
• src/c/toolkits/petsc/patches/VecToMPISerial.cpp (modified) (2 diffs)
• src/m/exp/expcoarsen.py (modified) (1 diff)
• startup.py (modified) (1 diff)

issm/trunk-jpl/externalpackages/matplotlib/install-macosx64.sh

@@ -1 +1 @@
 #/bin/bash
 set -eu
+
+rm -rf src deps 
 
 export C_INCLUDE_PATH="$C_INCLUDE_PATH:/usr/include/c++/4.2.1"
@@ -23 +25 @@
 #python -c "import matplotlib; print 'Installed matplotlib', matplotlib.__version__, matplotlib.__file__"
 
+#comments: try exporting this first before calling python setup.py build
+CFLAGS=-mmacosx-version-min=10.7 
+
 #to be tried:  first get freetype and zlib and libpng installed in sudo mode
 python setup.py build

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

@@ -194 +194 @@
                         element->ListResultsInfo(&resultsenums,&resultssizes,&resultstimes,&resultssteps,&numberofresults);
                 }
-                ISSM_MPI_Bcast(&numberofresults,1,ISSM_MPI_DOUBLE,minrank,IssmComm::GetComm());
+                ISSM_MPI_Bcast(&numberofresults,1,ISSM_MPI_INT,minrank,IssmComm::GetComm());
 
                 /*Get out if there is no results. Otherwise broadcast info*/

issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

@@ -75 +75 @@
                 double *sumpredictions =xNew<double>(n_interp);
                 double *sumerror       =xNew<double>(n_interp);
-                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
-                ISSM_MPI_Allreduce(error,sumerror,n_interp,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                ISSM_MPI_Allreduce(error,sumerror,n_interp,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
                 xDelete<double>(error); error=sumerror;
                 xDelete<double>(predictions); predictions=sumpredictions;
@@ -90 +90 @@
 
                 double *sumpredictions =xNew<double>(n_interp);
-                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
                 xDelete<double>(predictions); predictions=sumpredictions;
         }
@@ -103 +103 @@
 
                 double *sumpredictions =xNew<double>(n_interp);
-                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
                 xDelete<double>(predictions); predictions=sumpredictions;
         }
@@ -118 +118 @@
 
                 double *sumpredictions =xNew<double>(n_interp);
-                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+                ISSM_MPI_Allreduce(predictions,sumpredictions,n_interp,ISSM_MPI_PDOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
                 xDelete<double>(predictions); predictions=sumpredictions;
         }

issm/trunk-jpl/src/c/toolkits/petsc/patches/MatToSerial.cpp

@@ -70 +70 @@
                         buffer[2]=range;
                         ISSM_MPI_Send(buffer,3,ISSM_MPI_INT,0,1,comm);   
-                        if (range)ISSM_MPI_Send(local_matrix,N*range,ISSM_MPI_DOUBLE,0,1,comm); 
+                        if (range)ISSM_MPI_Send(local_matrix,N*range,ISSM_MPI_PDOUBLE,0,1,comm); 
                 }
                 if (my_rank==0){
                         ISSM_MPI_Recv(buffer,3,ISSM_MPI_INT,i,1,comm,&status); 
-                        if (buffer[2])ISSM_MPI_Recv(outmatrix+(buffer[1]*N),N*buffer[2],ISSM_MPI_DOUBLE,i,1,comm,&status);
+                        if (buffer[2])ISSM_MPI_Recv(outmatrix+(buffer[1]*N),N*buffer[2],ISSM_MPI_PDOUBLE,i,1,comm,&status);
                 }
         } 

issm/trunk-jpl/src/c/toolkits/petsc/patches/VecToMPISerial.cpp

@@ -70 +70 @@
                         buffer[2]=range;
                         ISSM_MPI_Send(buffer,3,ISSM_MPI_INT,0,1,comm);  
-                        if (range)ISSM_MPI_Send(local_vector,range,ISSM_MPI_DOUBLE,0,1,comm); 
+                        if (range)ISSM_MPI_Send(local_vector,range,ISSM_MPI_PDOUBLE,0,1,comm); 
                 }
                 if (my_rank==0){
                         ISSM_MPI_Recv(buffer,3,ISSM_MPI_INT,i,1,comm,&status); 
-                        if (buffer[2])ISSM_MPI_Recv(gathered_vector+buffer[1],buffer[2],ISSM_MPI_DOUBLE,i,1,comm,&status);
+                        if (buffer[2])ISSM_MPI_Recv(gathered_vector+buffer[1],buffer[2],ISSM_MPI_PDOUBLE,i,1,comm,&status);
                 }
         }
@@ -84 +84 @@
 
         /*Now, broadcast gathered_vector from node 0 to other nodes: */
-        ISSM_MPI_Bcast(gathered_vector,vector_size,ISSM_MPI_DOUBLE,0,comm);
+        ISSM_MPI_Bcast(gathered_vector,vector_size,ISSM_MPI_PDOUBLE,0,comm);
 
         /*Assign output pointers: */

issm/trunk-jpl/src/m/exp/expcoarsen.py

@@ -46 +46 @@
                         #see whether we keep this point or not
                         distance=npy.sqrt((x[j]-x[j+1])**2+(y[j]-y[j+1])**2)
-                        print j,distance,numpoints
                         if distance<resolution and j<numpoints-2:   #do not remove last point
                                 x=npy.delete(x,j+1,0)

issm/trunk-jpl/startup.py

@@ -31 +31 @@
 from plotmodel import plotmodel
 
-#print("\n  To get started with ISSM, type issmdoc at the command prompt.\n\n")
+print("\n  ISSM python modules loaded properly. You are now ready to start using ISSM.\n\n");