Changeset 24221

Timestamp:

10/14/19 20:01:32 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: bubble should not be calculated with GetInputValue, it's better to just say it's 0

File:

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

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

@@ -5107 +5107 @@
         }
 
+        /*Do NOT account for bubble using GetInputValue! This is wrong*/
+        if(element->VelocityInterpolation()==P1bubblecondensedEnum ||
+                                element->VelocityInterpolation()==P1bubbleEnum){
+                vvalues[(vnumnodes-1)*dim+0]=0.;
+                vvalues[(vnumnodes-1)*dim+1]=0.;
+                if(dim==3) vvalues[(vnumnodes-1)*dim+2]=0.;
+        }
+
         /*Add value to global vector*/
         solution->SetValues(vnumdof,vdoflist,vvalues,INS_VAL);
@@ -5265 +5273 @@
 
         /*Add vx and vy as inputs to the tria element: */
-        element->AddInput(VxEnum, vx, element->VelocityInterpolation());
-        element->AddInput(VyEnum, vy, element->VelocityInterpolation());
-        element->AddInput(VelEnum,vel,element->VelocityInterpolation());
+        int fe_v = element->VelocityInterpolation();
+        //if(fe_v == P1bubblecondensedEnum) fe_v = P1Enum;
+        //if(fe_v == P1bubbleEnum) fe_v = P1Enum;
+        element->AddInput(VxEnum, vx, fe_v);
+        element->AddInput(VyEnum, vy, fe_v);
+        element->AddInput(VelEnum,vel,fe_v);
         if(pnumdof>0) element->AddInput(PressureEnum,pressure,element->PressureInterpolation());
-        if(dim==3) element->AddInput(VzEnum,vz, element->VelocityInterpolation());
+        if(dim==3) element->AddInput(VzEnum,vz, fe_v);
 
         /*Free ressources:*/