Changeset 4316

Timestamp:

06/29/10 13:50:59 (15 years ago)

Author:

Mathieu Morlighem

Message:

Now PatchSize is added to results

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumAsString.cpp (modified) (1 diff)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• EnumDefinitions/StringAsEnum.cpp (modified) (1 diff)
• modules/OutputResultsx/ElementResultsToPatch.cpp (modified) (2 diffs)
• modules/OutputResultsx/FileWriteResults.cpp (modified) (2 diffs)
• objects/Patch.cpp (modified) (1 diff)
• objects/Patch.h (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -237 +237 @@
                 case JEnum : return "J";
                 case PatchEnum : return "Patch";
+                case PatchVerticesEnum : return "PatchVertices";
+                case PatchNodesEnum : return "PatchNodes";
                 case TimeEnum : return "Time";
                 case RelativeEnum : return "Relative";

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -269 +269 @@
         JEnum,
         PatchEnum,
+        PatchVerticesEnum,
+        PatchNodesEnum,
         TimeEnum,
         /*}}}*/

issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

@@ -235 +235 @@
         else if (strcmp(name,"J")==0) return JEnum;
         else if (strcmp(name,"Patch")==0) return PatchEnum;
+        else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
+        else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
         else if (strcmp(name,"Time")==0) return TimeEnum;
         else if (strcmp(name,"Relative")==0) return RelativeEnum;

issm/trunk/src/c/modules/OutputResultsx/ElementResultsToPatch.cpp

@@ -45 +45 @@
          * For example, we could build the following patch table, for velocities: 
          * 
-         * VxEnum 1  .5  1 P0  1 2       4.5 NaN  NaN //on a Beam element, Vx, at step 1, time .5, element id 1, interpolation type P0 (constant value on a beam element), vertices ids 1 and 2, one constant value 4.5
-         * VzEnum 2  .8  2 P1  1 3 4     4.5 3.2  2.5 //on a Tria element, Vz, at step 2, time .8, element id 2, interpolation type P1  (linear values on a tria element), vertices ids 1 3 and 4, with values at 3 nodes 4.5, 3.2, 2.5
+         1. on a Beam element, Vx, at step 1, time .5, element id 1, interpolation type P0 (constant), vertices ids 1 and 2, one constant value 4.5
+         VxEnum 1  .5  1 P0  1 2       4.5 NaN  NaN
+         2. on a Tria element, Vz, at step 2, time .8, element id 2, interpolation type P1 (linear), vertices ids 1 3 and 4, with values at 3 nodes 4.5, 3.2, 2.5
+         VzEnum 2  .8  2 P1  1 3 4     4.5 3.2  2.5
          * ... etc ...
          *
@@ -95 +97 @@
 
         /*create result object and add to results dataset: */
+        results->AddObject(new       IntExternalResult(results->Size()+1,PatchVerticesEnum,patch->maxvertices,1,0));
+        results->AddObject(new       IntExternalResult(results->Size()+1,PatchNodesEnum,   patch->maxnodes,1,0));
         results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,patch->values,patch->numrows,patch->numcols,1,0));
 

issm/trunk/src/c/modules/OutputResultsx/FileWriteResults.cpp

@@ -13 +13 @@
 #include "../../shared/shared.h"
 #include "../../include/include.h"
-
 
 void FileWriteResults(Parameters* parameters, DataSet* results){
@@ -36 +35 @@
 
         /*Close file: */
-        if(my_rank==0)pfclose(fid,filename);
+        if(my_rank==0) pfclose(fid,filename);
 
         /*Free ressources:*/

issm/trunk/src/c/objects/Patch.cpp

@@ -164 +164 @@
 }
 /*}}}*/
-/*FUNCTION Patch::WriteToDisk(int solutiontype,char* filename);{{{1*/
-void Patch::WriteToDisk(int solutiontype,char* filename){
-
-        extern int my_rank;
-        FILE* fid=NULL;
-
-        
-        if(my_rank!=0)return; //do not output on other nodes!
-
-        /* Open output file to write raw binary data: */
-        fid=pfopen(filename,"wb");
-
-        /*Now, write solutiontype: */
-        fwrite(&solutiontype,sizeof(int),1,fid);
-
-        /*Write dimensions of patch: */
-        fwrite(&this->numrows,sizeof(int),1,fid);
-        fwrite(&this->numcols,sizeof(int),1,fid);
-
-        /*Write patch: */
-        fwrite(this->values,this->numrows*this->numcols*sizeof(double),1,fid);
-        
-        /*Close file: */
-        pfclose(fid,filename);
-
-}
-/*}}}*/

issm/trunk/src/c/objects/Patch.h

@@ -45 +45 @@
                 void fillresultinfo(int row,int enum_type,int step, double time, int interpolation, double* nodal_values, int num_nodes);
                 void MPI_Gather(void);
-                void WriteToDisk(int solutiontype,char* filename);
 
 };