Changeset 23182

Timestamp:

08/24/18 15:26:30 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do NOT use the same interpolation for the pressure as for the velocity

File:

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

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

@@ -15 +15 @@
         /*Intermediary*/
         int        i,j;
-        int        count,finiteelement;
+        int        count,finiteelement,pfiniteelement;
         IssmDouble g;
         IssmDouble rho_ice;
@@ -69 +69 @@
                         /*Deduce velocity interpolation from finite element*/
                         switch(finiteelement){
-                                case P1P1Enum              : finiteelement = P1Enum;       break;
-                                case P1P1GLSEnum           : finiteelement = P1Enum;       break;
-                                case MINIcondensedEnum     : finiteelement = P1bubbleEnum; break;
-                                case MINIEnum              : finiteelement = P1bubbleEnum; break;
-                                case TaylorHoodEnum        : finiteelement = P2Enum;       break;
-                                case XTaylorHoodEnum       : finiteelement = P2Enum;       break;
-                                case LATaylorHoodEnum      : finiteelement = P2Enum;       break;
-                                case LACrouzeixRaviartEnum : finiteelement = P2bubbleEnum; break;
-                                case OneLayerP4zEnum       : finiteelement = P2xP4Enum;    break;
-                                case CrouzeixRaviartEnum   : finiteelement = P2bubbleEnum; break;
+                                case P1P1Enum              : finiteelement = P1Enum;       pfiniteelement = P1Enum;   break;
+                                case P1P1GLSEnum           : finiteelement = P1Enum;       pfiniteelement = P1Enum;   break;
+                                case MINIcondensedEnum     : finiteelement = P1bubbleEnum; pfiniteelement = P1Enum;   break;
+                                case MINIEnum              : finiteelement = P1bubbleEnum; pfiniteelement = P1Enum;   break;
+                                case TaylorHoodEnum        : finiteelement = P2Enum;       pfiniteelement = P1Enum;   break;
+                                case XTaylorHoodEnum       : finiteelement = P2Enum;       pfiniteelement = P1Enum;   break;
+                                case LATaylorHoodEnum      : finiteelement = P2Enum;       pfiniteelement = NoneEnum; break;
+                                case LACrouzeixRaviartEnum : finiteelement = P2bubbleEnum; pfiniteelement = NoneEnum; break;
+                                case OneLayerP4zEnum       : finiteelement = P2xP4Enum;    pfiniteelement = P1Enum;   break;
+                                case CrouzeixRaviartEnum   : finiteelement = P2bubbleEnum; pfiniteelement = P1DGEnum; break;
                                 default: _error_("finite element "<<EnumToStringx(finiteelement)<<" not supported");
                         }
@@ -126 +126 @@
                         iomodel->FetchData(&surface,NULL,NULL,"md.geometry.surface");
                         iomodel->FetchData(&z,NULL,NULL,"md.mesh.z");
-                        switch(finiteelement){
+                        switch(pfiniteelement){
                                 case P1Enum:
                                         for(i=0;i<iomodel->numberofvertices;i++){