Changeset 12630

Timestamp:

07/11/12 14:05:15 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed PDD crash in 3d by extruding SurfaceForcingMassBalance and added some checks on results

Location:

issm/trunk/src/c

Files:

• Container/Elements.cpp (modified) (1 diff)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (2 diffs)
• objects/Elements/Tria.h (modified) (1 diff)

issm/trunk/src/c/Container/Elements.cpp

@@ -237 +237 @@
                         for(int j=0;j<this->Size();j++){
                                 Element* element=(Element*)this->GetObjectByOffset(j);
-                                element->GetVectorFromResults(vector,i,resultssizes[i]);
+                                element->GetVectorFromResults(vector,i,resultsenums[i],resultssizes[i]);
                         }
                         vector->Assemble();

issm/trunk/src/c/objects/Elements/Element.h

@@ -63 +63 @@
                 virtual void   InputScale(int enum_type,double scale_factor)=0;
                 virtual void   GetVectorFromInputs(Vector* vector, int name_enum)=0;
-                virtual void   GetVectorFromResults(Vector* vector,int id,int interp)=0;
+                virtual void   GetVectorFromResults(Vector* vector,int id,int enum_in,int interp)=0;
                 virtual void   InputArtificialNoise(int enum_type,double min,double max)=0;
                 virtual bool   InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0;

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

@@ -1080 +1080 @@
 /*}}}*/
 /*FUNCTION Penta::GetVectorFromResults{{{1*/
-void  Penta::GetVectorFromResults(Vector* vector,int offset,int interp){
+void  Penta::GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){
 
         /*Get result*/
         ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
+        if(elementresult->InstanceEnum()!=enum_in){
+                _error_("Results of offset %i is %s, when %s was expected",offset,EnumToStringx(elementresult->InstanceEnum()),EnumToStringx(enum_in));
+        }  
         if(interp==P1Enum){
                 int doflist1[NUMVERTICES];
@@ -2478 +2481 @@
      agd[i] = agd[i]/yts;
      pddtj[i]=pddt;
-     /*Update inputs*/    
-     this->inputs->AddInput(new PentaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0]));
-     // this->inputs->AddInput(new PentaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0]));
-   }       //end of the for loop over the vertices
+   }//end of the for loop over the vertices
+
+        /*Update inputs*/    
+        this->inputs->AddInput(new PentaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0]));
+        //this->inputs->AddInput(new PentaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0]));
+        this->InputExtrude(SurfaceforcingsMassBalanceEnum,ElementEnum);
 }
 /*}}}*/

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

@@ -89 +89 @@
                 double GetZcoord(GaussPenta* gauss);
                 void   GetVectorFromInputs(Vector* vector,int name_enum);
-                void   GetVectorFromResults(Vector* vector,int offset,int interp);
+                void   GetVectorFromResults(Vector* vector,int offset,int name_enum,int interp);
                 
                 int    Sid();

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

@@ -1192 +1192 @@
 /*}}}*/
 /*FUNCTION Tria::GetVectorFromResults{{{1*/
-void  Tria::GetVectorFromResults(Vector* vector,int offset,int interp){
+void  Tria::GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp){
 
         /*Get result*/
         ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
+        if(elementresult->InstanceEnum()!=enum_in){
+                _error_("Results of offset %i is %s, when %s was expected",offset,EnumToStringx(elementresult->InstanceEnum()),EnumToStringx(enum_in));
+        }
         if(interp==P1Enum){
                 int doflist1[NUMVERTICES];
@@ -2308 +2311 @@
      agd[i] = agd[i]/yts;
      pddtj[i]=pddt;
-     /*Update inputs*/    
-     this->inputs->AddInput(new TriaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0]));
-     // this->inputs->AddInput(new TriaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0]));
-   }       //end of the for loop over the vertices
+
+   } //end of the for loop over the vertices
+
+        /*Update inputs*/    
+        this->inputs->AddInput(new TriaP1Input(SurfaceforcingsMassBalanceEnum,&agd[0]));
+        // this->inputs->AddInput(new TriaVertexInput(ThermalSpcTemperatureEnum,&Tsurf[0]));
 }
 /*}}}*/

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

@@ -89 +89 @@
                 void   GetSolutionFromInputs(Vector* solution);
                 void   GetVectorFromInputs(Vector* vector, int name_enum);
-                void   GetVectorFromResults(Vector* vector,int offset,int interp);
+                void   GetVectorFromResults(Vector* vector,int offset,int enum_in,int interp);
                 void   InputArtificialNoise(int enum_type,double min, double max);
                 bool   InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);