Changeset 18039

Timestamp:

05/21/14 13:57:25 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added support for P0Interpolation

Location:

issm/trunk-jpl/src/c

Files:

• analyses/Balancethickness2Analysis.cpp (modified) (3 diffs)
• classes/Elements/Element.cpp (modified) (1 diff)
• classes/Inputs/PentaInput.cpp (modified) (1 diff)
• classes/Inputs/TetraInput.cpp (modified) (1 diff)
• classes/Inputs/TriaInput.cpp (modified) (1 diff)
• classes/gauss/GaussTria.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp

@@ -199 +199 @@
 
         /*Intermediaries */
+        int         Hinterpolation;
         IssmDouble  vx,vy,vbar,nux,nuy,normdphi,dphi[2];
         IssmDouble* xyz_list = NULL;
@@ -232 +233 @@
         Input* nuy_input       = element->GetInput(BalancethicknessNuyEnum);   _assert_(nuy_input);
 
+        switch(element->GetElementType()){
+                case P1Enum: Hinterpolation = P0Enum; break;
+                default:     _error_("not implemented");
+        }
+
         Gauss* gauss=element->NewGauss();
-        for (int iv=0;iv<numvertices;iv++){
-                gauss->GaussVertex(iv);
+        for (int iv=0;iv<1;iv++){
+                gauss->GaussNode(Hinterpolation,iv);//P0 Only for now
 
                 vx_input->GetInputValue(&vx,gauss);
@@ -250 +256 @@
                 vy_list[iv]        = -1./thickness_list[iv] * dphi[1];
         }
-        element->AddInput(ThicknessEnum,thickness_list,P1Enum);
-        element->AddInput(VxEnum,vx_list,P1Enum);
-        element->AddInput(VyEnum,vy_list,P1Enum);
+        element->AddInput(ThicknessEnum,thickness_list,Hinterpolation);
+        element->AddInput(VxEnum,vx_list,Hinterpolation);
+        element->AddInput(VyEnum,vy_list,Hinterpolation);
 
         /*Clean up and return*/

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

@@ -904 +904 @@
                                         break;
                                 default:
-                                        _error_("Input of type "<<EnumToStringx(input->GetResultInterpolation())<<" not supported");
+                                        Gauss* gauss = this->NewGauss();
+                                        input->GetInputValue(&value,gauss);
+                                        delete gauss;
                         }
                         vector->SetValue(this->Sid(),value,INS_VAL);

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

@@ -121 +121 @@
 int  PentaInput::GetResultInterpolation(void){
 
+        if(this->element_type==P0Enum){
+                return P0Enum;
+        }
         return P1Enum;
 

issm/trunk-jpl/src/c/classes/Inputs/TetraInput.cpp

@@ -84 +84 @@
 int  TetraInput::GetResultInterpolation(void){
 
+        if(this->element_type==P0Enum){
+                return P0Enum;
+        }
         return P1Enum;
 

issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

@@ -124 +124 @@
 int  TriaInput::GetResultInterpolation(void){
 
+        if(this->element_type==P0Enum){
+                return P0Enum;
+        }
         return P1Enum;
 

issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

@@ -442 +442 @@
         /*update static arrays*/
         switch(finiteelement){
+                case P0Enum:
+                        switch(iv){
+                                case 0: coord1=1./3.; coord2=1./3.; coord3=1./3.; break;
+                                default: _error_("node index should be 0");
+                        }
+                        break;
                 case P1Enum: case P1DGEnum:
                         switch(iv){