Changeset 85

Timestamp:

04/28/09 15:08:31 (16 years ago)

Author:

Eric.Larour

Message:

Reworte output routines. Shift by 1.0 was impacting the control solution. Also, better layout of results now

Location:

issm/trunk/src/c/parallel

Files:

• OutputControl.cpp (modified) (5 diffs)
• OutputDiagnostic.cpp (modified) (3 diffs)

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

@@ -1 @@
-
 /*
         OutputControl.c: output model results for control solution.
@@ -10 +9 @@
 #include "../io/io.h"
 #include "../objects/objects.h"
-
+                        
 void OutputControl(Vec u_g,double* p_g, double* J, int nsteps, Vec partition,char* filename,NodeSets* nodesets){
 
@@ -20 +19 @@
 
         /* standard output: */
+        Vec     partition_shifted=NULL;
         double* serial_partition=NULL;
 
-        double* serial_u_g=NULL;
+        double* serial_ug=NULL;
         int     one=1;
         int     gsize;
 
         /*serialize outputs: */
-        VecShift(partition,1.0); //matlab indexing
-        VecToMPISerial(&serial_partition,partition);
-
-        VecToMPISerial(&serial_u_g,u_g);
+        VecDuplicate(partition,&partition_shifted);
+        VecCopy(partition,partition_shifted);
+        VecShift(partition_shifted,1.0); //matlab indexing starts at 1
+        VecToMPISerial(&serial_partition,partition_shifted);
+        
+        VecToMPISerial(&serial_ug,u_g);
 
         /* Open output file to write raw binary data: */
@@ -46 +48 @@
                 /*Write partition: */
                 WriteDataToDisk(serial_partition,&gsize,&one,"Mat",fid);
-                
+        
                 /*Write solution to disk: */
-                WriteDataToDisk(serial_u_g,&gsize,&one,"Mat",fid);
+                WriteDataToDisk(serial_ug,&gsize,&one,"Mat",fid);
 
                 /*Write parameter to disk: */
@@ -56 +58 @@
                 WriteDataToDisk(&nsteps,NULL,NULL,"Integer",fid);
                 WriteDataToDisk(J,&nsteps,&one,"Mat",fid);
-        
+
                 /*Close file: */
                 if(fclose(fid)!=0)throw ErrorException(__FUNCT__,exprintf("%s%s","could not close file ",filename));
         }
 
+        VecFree(&partition_shifted);
+        xfree((void**)&serial_partition);
+        xfree((void**)&serial_ug);
+
 }       

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

@@ -20 +20 @@
 
         /* standard output: */
+        Vec partition_shifted=NULL;
         double* serial_partition=NULL;
         int    analysis_size;
 
-        double* serial_u_g=NULL;
+        double* serial_ug=NULL;
         int     one=1;
         int     gsize;
 
         /*serialize outputs: */
-        VecShift(partition,1.0); //matlab indexing
-        VecToMPISerial(&serial_partition,partition);
+        VecDuplicate(partition,&partition_shifted);
+        VecCopy(partition,partition_shifted);
+        VecShift(partition_shifted,1.0); //matlab indexing starts at 1
+        VecToMPISerial(&serial_partition,partition_shifted);
 
-        VecToMPISerial(&serial_u_g,u_g);
+        VecToMPISerial(&serial_ug,u_g);
 
         /* Open output file to write raw binary data: */
@@ -49 +52 @@
                 
                 /*Write solution to disk: */
-                WriteDataToDisk(serial_u_g,&gsize,&one,"Mat",fid);
+                WriteDataToDisk(serial_ug,&gsize,&one,"Mat",fid);
         
                 /*Close file: */
@@ -55 +58 @@
         }
 
+        /*Free ressources: */
+        VecFree(&partition_shifted);
+        xfree((void**)&serial_partition);
+        xfree((void**)&serial_ug);
 }