[cig-commits] r5525 - in long/3D/Gale/trunk/src/StgFEM: . plugins/Output/PeakMemory

[walter at geodynamics.org]

Author: walter
Date: 2006-12-07 14:16:19 -0800 (Thu, 07 Dec 2006)
New Revision: 5525

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c
Log:
 r880 at earth:  boo | 2006-12-07 14:15:28 -0800
  r877 at earth (orig r669):  EinatLev | 2006-11-20 13:20:58 -0800
  Fixed an issue in PeakMemory plugin: 
   it was using the Fortran MPI_INTEGER instead of the
   C MPI_INT, which caused problems on Einat's machine which
   has LAM MPI and no Fortran bindings.
   -- Pat & Einat.
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:879
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:668
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:880
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:669

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c	2006-12-07 22:16:16 UTC (rev 5524)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c	2006-12-07 22:16:19 UTC (rev 5525)
@@ -59,12 +59,12 @@
 	
 	/* Note: because we don't know which proc is used for writing (at time of writing it was hardcoded to 0), we all-reduce */
 	stgMem = stgMemory->stgCurrentMemory;
-	MPI_Allreduce( &stgMem, &ave, 1, MPI_INTEGER, MPI_SUM, context->communicator );
+	MPI_Allreduce( &stgMem, &ave, 1, MPI_INT, MPI_SUM, context->communicator );
 	ave /= context->nproc * 1000 * 1000;
 	StgFEM_FrequentOutput_PrintValue( context, ave );
 	
 	laMem = LinearAlgebra_GetMemoryUsage();
-	MPI_Allreduce( &laMem, &ave, 1, MPI_INTEGER, MPI_SUM, context->communicator );
+	MPI_Allreduce( &laMem, &ave, 1, MPI_INT, MPI_SUM, context->communicator );
 	ave /= context->nproc * 1000 * 1000;
 	StgFEM_FrequentOutput_PrintValue( context, ave );
 }