Changeset 16739

Timestamp:

11/13/13 15:23:43 (11 years ago)

Author:

seroussi

Message:

CHG: changes input update of thermal

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (4 diffs)
• PentaRef.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -158 +158 @@
 
         _assert_(this->material);
-        this->material->inputs->AddInput(new TriaInput(input_enum,values,interpolation_enum));
+        this->material->inputs->AddInput(new PentaInput(input_enum,values,interpolation_enum));
 }
 /*}}}*/
@@ -2021 +2021 @@
                         else if (original_input->ObjectEnum()==DoubleInputEnum)
                          total_integrated_input=new DoubleInput(average_enum_type,0.0);
-                        else
+                        else{
+                                printf("id %i \n",this->id);
+                                printf("enum %i \n",average_enum_type);
                          _error_("object " << EnumToStringx(original_input->ObjectEnum()) << " not supported yet");
+                        }
                 }
 
@@ -4853 +4856 @@
         IssmDouble  xyz_list[NUMVERTICES][3];
         IssmDouble  values[numdof];
-        IssmDouble  B[numdof];
-        IssmDouble  B_average,s_average;
+        IssmDouble  B[numdof],surface[numdof];
+        IssmDouble  B_average;
         int        *doflist = NULL;
         bool        hack    = false;
@@ -4903 +4906 @@
                                 break;
                         case ArrheniusEnum:
-                                surface_input->GetInputAverage(&s_average);
-                                B_average=Arrhenius((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0,
-                                                        s_average-((xyz_list[0][2]+xyz_list[1][2]+xyz_list[2][2]+xyz_list[3][2]+xyz_list[4][2]+xyz_list[5][2])/6.0),
-                                                        material->GetN());
-                                for(i=0;i<numdof;i++) B[i]=B_average;
+                                GetInputListOnVertices(&surface[0],SurfaceEnum);
+                                for(i=0;i<numdof;i++) B[i]=Arrhenius(values[i],surface[i]-xyz_list[i][2],material->GetN());
                                 this->material->inputs->AddInput(new PentaInput(MaterialsRheologyBEnum,B,P1Enum));
                                 break;

issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp

@@ -16 +16 @@
 
 /*Element macros*/
+#define NUMNODESP0    1
 #define NUMNODESP1    6
 #define NUMNODESP1_2d 3
@@ -1962 +1963 @@
 
         switch(this->element_type){
+                case P0Enum:                return NUMNODESP0;
                 case P1Enum:                return NUMNODESP1;
                 case P1bubbleEnum:          return NUMNODESP1b;