Changeset 17609 for issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

Timestamp:

03/31/14 16:33:33 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: InputUpdateFromSolution do not assume a P1 finite element anymore

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)

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

@@ -1743 +1743 @@
 
         /*Add vx and vy as inputs to the tria element: */
-        element->AddBasalInput(VxEnum,vx,P1Enum);
-        if(dim==2)element->AddBasalInput(VyEnum,vy,P1Enum);
-        element->AddBasalInput(VelEnum,vel,P1Enum);
+        element->AddBasalInput(VxEnum,vx,element->GetElementType());
+        if(dim==2)element->AddBasalInput(VyEnum,vy,element->GetElementType());
+        element->AddBasalInput(VelEnum,vel,element->GetElementType());
 
         /*Free ressources:*/
@@ -2063 +2063 @@
 
         /*Add vx and vy as inputs to the tria element: */
-        element->AddBasalInput(VxEnum,vx,P1Enum);
-        element->AddBasalInput(VyEnum,vy,P1Enum);
-        element->AddBasalInput(VelEnum,vel,P1Enum);
+        element->AddBasalInput(VxEnum,vx,element->GetElementType());
+        element->AddBasalInput(VyEnum,vy,element->GetElementType());
+        element->AddBasalInput(VelEnum,vel,element->GetElementType());
 
         /*Free ressources:*/
@@ -2740 +2740 @@
         //element->AddInput(VyEnum,  vy,element->GetElementType());
         //element->AddInput(VelEnum,vel,element->GetElementType());
-        element->AddInput(VxEnum,vx,P1Enum);
-        if(dim==3)element->AddInput(VyEnum,vy,P1Enum);
-        element->AddInput(VelEnum,vel,P1Enum);
+        element->AddInput(VxEnum,vx,element->GetElementType());
+        if(dim==3)element->AddInput(VyEnum,vy,element->GetElementType());
+        element->AddInput(VelEnum,vel,element->GetElementType());
 
         /*Free ressources:*/