Changeset 598

Timestamp:

05/26/09 14:08:51 (15 years ago)

Author:

seroussi

Message:

forgot to define elements_width

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• CreateParameters.cpp (modified) (5 diffs)
• DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -11 +11 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
+#include "../MeshPartitionx/MeshPartitionx.h"
 #include "./Model.h"
 
@@ -24 +25 @@
         int      numberofdofspernode;
         int      dim;
-        double*  epart=NULL;
-        double*  part=NULL;
+        int*  epart=NULL;
+        int*  part=NULL;
 
 
@@ -219 +220 @@
                 char** descriptors=NULL;
                 char*  descriptor=NULL;
-                char* tag=NULL;
+                char*  tag=NULL;
+                int    elements_width; //size of elements
 
                 descriptors=(char**)xmalloc(model->numberofresponses*sizeof(char*));
@@ -245 +247 @@
                 xfree((void**)&descriptors);
 
+                /*Width of elements: */
+                if(strcmp(model->meshtype,"2d")==0){
+                        elements_width=3; //tria elements
+                }
+                else{
+                        elements_width=6; //penta elements
+                }
+
                 #ifdef _PARALLEL_
                 /*partition grids in model->qmu_npart parts: */
@@ -259 +269 @@
                 count++;
                 param= new Param(count,"qmu_part",DOUBLEVEC);
-                param->SetDoubleVec(part,model->numberofnodes);
+                param->SetDoubleVec((double*)part,model->numberofnodes);
                 parameters->AddObject(param);
 

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

@@ -181 +181 @@
         }
 
-
         MeshPartitionx(&epart, &npart,model->numberofelements,model->numberofnodes,model->elements, model->numberofelements2d,model->numberofnodes2d,model->elements2d,model->numlayers,elements_width, model->meshtype,num_procs);