Changeset 4508

Timestamp:

07/09/10 14:26:31 (15 years ago)

Author:

seroussi

Message:

fixed patch and InputToResult when no elements in a patch

Location:

issm/trunk/src/c

Files:

• modules/InputToResultx/InputToResultx.cpp (modified) (1 diff)
• modules/OutputResultsx/ElementResultsToPatch.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Patch.cpp (modified) (1 diff)
• solutions/steadystate_core.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/InputToResultx/InputToResultx.cpp

@@ -19 +19 @@
 
         /*Go through elemnets, and ask each element to transfer the enum_type input into the results dataset, with step and time information: */
-         
         for(i=0;i<elements->Size();i++){
 

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

@@ -83 +83 @@
         #endif
 
-        /*Check that results have been found*/
-        if (numrows*numvertices==0) ISSMERROR("No results found in elements");
-
         /*Ok, initialize Patch object: */
         patch=new Patch(numrows,numvertices,numnodes);

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1208 +1208 @@
                 input=(Input*)this->inputs->GetObjectByOffset(i);
                 if (input->EnumType()==enum_type){
-                        found=true;
-                        break;
+                        found=true; break;
                 }
         }
+        if (!found) ISSMERROR("Input %s not found in penta->inputs",EnumAsString(enum_type));
 
         /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1507 +1507 @@
                 }
         }
+        if (!found) ISSMERROR("Input %s not found in tria->inputs",EnumAsString(enum_type));
 
         /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 

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

@@ -46 +46 @@
                 +maxnodes;   //nodes
 
-        //allocate and fill with NaN:
-        this->values=(double*)xmalloc(this->numcols*this->numrows*sizeof(double));
-        for(i=0;i<this->numrows;i++){
-                for(j=0;j<this->numcols;j++){
-                        this->values[i*this->numcols+j]=NAN;
+        //Allocate values and fill with NaN:
+        if (this->numcols*this->numrows==0){
+                this->values=NULL;
+        }
+        else{
+                this->values=(double*)xmalloc(this->numcols*this->numrows*sizeof(double));
+                for(i=0;i<this->numrows;i++){
+                        for(j=0;j<this->numcols;j++){
+                                this->values[i*this->numcols+j]=NAN;
+                        }
                 }
         }

issm/trunk/src/c/solutions/steadystate_core.cpp

@@ -47 +47 @@
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,VxOldEnum);
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,VyOldEnum);
-                if(dim==3)InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,VzOldEnum);
+                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum,VzOldEnum);
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum,PressureOldEnum);
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,TemperatureOldEnum);
@@ -61 +61 @@
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);
+                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
+                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VelEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
-                if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
+                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum);
         }
 }