Changeset 4201

Timestamp:

06/24/10 15:15:13 (15 years ago)

Author:

Mathieu Morlighem

Message:

1. now all printf_ are synchronized in debugging mode
2. fixed printarray display
3. fixes DoubleMat Write

Location:

issm/trunk/src/c

Files:

• include/macros.h (modified) (2 diffs)
• objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (4 diffs)
• shared/Elements/elements.h (modified) (2 diffs)

issm/trunk/src/c/include/macros.h

@@ -3 +3 @@
  */
 
+/*Header {{{1*/
 #ifndef _MACROS_H_
 #define _MACROS_H_
@@ -13 +14 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
+/*}}}*/
 
-/*Printing macro: */
+/*Printing macro: call MPI_Barrier in debugging mode so that prints are synchronized*/
+#ifdef _ISSM_DEBUG_ 
 #define _printf_(...) PrintfFunction(__VA_ARGS__)
+#else
+#define _printf_(...) MPI_Barrier(MPI_COMM_WORLD); PrintfFunction(__VA_ARGS__)
+#endif
 
 /*Error exception macro*/

issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

@@ -64 +64 @@
 void DoubleMatExternalResult::DeepEcho(void){
 
-        int i;
+        int i,j;
         
         printf("DoubleMatExternalResult:\n");
         printf("   id: %i\n",this->id);
         printf("   enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type));
-        printf("   matrix size: %i-%i\n",this->M,this->N);
-        for(i=0;i<this->M;i++){
-                printf("%i %g\n",i,this->values[i]);
-        }
         printf("   step: %i\n",this->step);
         printf("   time: %g\n",this->time);
+        printf("   matrix size: %i-%i\n",this->M,this->N);
+        for (i=0;i<this->M;i++){  
+                printf("   [ ");
+                for (j=0;j<this->N;j++){
+                        printf(" %12.6g ",this->values[i*this->N+j]);
+                }  
+                printf(" ]\n");
+        }  
+        printf("\n");
+
 }
 /*}}}*/
@@ -109 +115 @@
         printf("DoubleMatExternalResult:\n");
         printf("   enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type));
-        printf("   matrix size: %i-%i\n",this->M,this->N);
         printf("   step: %i\n",this->step);
         printf("   time: %g\n",this->time);
+        printf("   matrix size: %i-%i\n",this->M,this->N);
 
 }
@@ -178 +184 @@
         int     length;
         int     type;
-        int     size;
+        int     rows,cols;
         char   *name    = NULL;
         extern  int my_rank;
 
         /*return if now on cpu 0: */
-        if(my_rank)return;
+        if(my_rank) return;
 
         /*First write enum: */
@@ -197 +203 @@
         /*writing a double array, type is 3:*/
         type=3;
-        size=this->M*this->N;
         fwrite(&type,sizeof(int),1,fid);
-        fwrite(&size,sizeof(int),1,fid);
-        fwrite(this->values,size*sizeof(double),1,fid);
+        rows=this->M;
+        fwrite(&rows,sizeof(int),1,fid);
+        cols=this->N;
+        fwrite(&cols,sizeof(int),1,fid);
+        fwrite(this->values,cols*rows*sizeof(double),1,fid);
 
 }

issm/trunk/src/c/shared/Elements/elements.h

@@ -18 +18 @@
                 printf("   [ ");
                 for (j=0;j<cols;j++){
-                        printf(" %10.10g ",array[i*cols+j]);
+                        printf(" %12.6g ",array[i*cols+j]);
                 }  
                 printf(" ]\n");
@@ -30 +30 @@
                 printf("   [ ");
                 for (j=0;j<cols;j++){
-                        printf(" %i",array[i*cols+j]);
+                        printf(" %6i",array[i*cols+j]);
                 }  
                 printf(" ]\n");