Changeset 561

Timestamp:

05/21/09 12:00:30 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed output (do not use VecToMPISerial when my_rank==0 only)

Location:

issm/trunk/src/c/parallel

Files:

• OutputThermal.cpp (modified) (4 diffs)
• thermal.cpp (modified) (1 diff)

issm/trunk/src/c/parallel/OutputThermal.cpp

@@ -30 +30 @@
         double* serial_partition=NULL;
 
-        double* serial_tg=NULL;
-        int     t_g_size;
-        double* serial_mg=NULL;
+        double** serial_tg=NULL;
+        double** serial_mg=NULL;
 
         double ndt,dt;
@@ -59 +58 @@
         VecGetSize(partition,&nods);
 
+
         if(sub_analysis_type==SteadyAnalysisEnum()){
                 nsteps=0;
@@ -66 +66 @@
         }
 
+        /*allocate t_g and m_g arrays: */
+        serial_tg=(double**)xmalloc((nsteps+1)*sizeof(double*));
+        serial_mg=(double**)xmalloc((nsteps+1)*sizeof(double*));
+
+        /*get tg_i*/
+        for(i=0;i<=nsteps;i++){
+                VecToMPISerial(&serial_tg[i],t_g[i]);
+                VecToMPISerial(&serial_mg[i],m_g[i]);
+        }
+        
         /* Open output file to write raw binary data: */
         if(my_rank==0){
+
                 fid=pfopen(filename,"wb");
 
@@ -81 +92 @@
                 /*Write solutions to disk: */
                 for(i=0;i<=nsteps;i++){
-        
-                        xfree((void**)&serial_tg);
-                        xfree((void**)&serial_mg);
-                        VecToMPISerial(&serial_tg,t_g[i]);
-                        VecToMPISerial(&serial_mg,m_g[i]);
-
-                        WriteDataToDisk(serial_tg,&nods,&one,"Mat",fid);
-                        WriteDataToDisk(serial_mg,&nods,&one,"Mat",fid);
+                        WriteDataToDisk(serial_tg[i],&nods,&one,"Mat",fid);
+                        WriteDataToDisk(serial_mg[i],&nods,&one,"Mat",fid);
                 }
         

issm/trunk/src/c/parallel/thermal.cpp

@@ -149 +149 @@
         _printf_("write lock file:\n");
         femmodels[0].parameters->FindParam((void*)&waitonlock,"waitonlock");
+
         if (waitonlock){
                 WriteLockFile(lockname);