Changeset 18196

Timestamp:

06/30/14 14:37:21 (11 years ago)

Author:

seroussi

Message:

NEW: improving lagrange pressure

File:

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

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

@@ -108 +108 @@
         parameters->AddObject(iomodel->CopyConstantObject(FrictionLawEnum));
 
-        /*XTH parameters*/
+        /*XTH LATH parameters*/
         iomodel->Constant(&fe_FS,FlowequationFeFSEnum);
-        if(fe_FS==XTaylorHoodEnum){
+        if(fe_FS==XTaylorHoodEnum || fe_FS==LATaylorHoodEnum){
                 parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianREnum));
                 parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianThetaEnum));
@@ -125 +125 @@
 
         /*Intermediaries*/
-        int    materials_type,finiteelement;
+        int    materials_type,finiteelement,fe_FS;
         int    approximation,frictionlaw;
         int*   finiteelement_list=NULL;
@@ -236 +236 @@
         if(islevelset){
                 iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
+        }
+        /*LATH parameters*/
+        iomodel->Constant(&fe_FS,FlowequationFeFSEnum);
+        if(fe_FS==LATaylorHoodEnum){
+                iomodel->FetchDataToInput(elements,PressureEnum);
         }
 
@@ -4568 +4573 @@
         element->InputChangeName(VxEnum,VxPicardEnum);
         element->InputChangeName(VyEnum,VyPicardEnum);
-        element->InputChangeName(PressureEnum,PressurePicardEnum);
+        if(pnumdof>0) element->InputChangeName(PressureEnum,PressurePicardEnum);
         if(dim==3) element->InputChangeName(VzEnum,VzPicardEnum);
 
@@ -4575 +4580 @@
         element->AddInput(VyEnum,      vy,      element->VelocityInterpolation());
         element->AddInput(VelEnum,     vel,     element->VelocityInterpolation());
-        element->AddInput(PressureEnum,pressure,element->PressureInterpolation());
+        if(pnumdof>0) element->AddInput(PressureEnum,pressure,element->PressureInterpolation());
         if(dim==3) element->AddInput(VzEnum,vz, element->VelocityInterpolation());