Changeset 27720

Timestamp:

05/03/23 12:08:06 (23 months ago)

Author:

Mathieu Morlighem

Message:

CHG: added P1Bubble back for NR

File:

• issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp ¶

@@ -298 +298 @@
                         basis[5]=gauss->coord3*(1.+zeta)/2.;
                         return;
-                        #ifndef _HAVE_AD_
                 case P1bubbleEnum: case P1bubblecondensedEnum:
                         basis[0]=gauss->coord1*(1.-zeta)/2.;
@@ -308 +307 @@
                         basis[6]=27.*gauss->coord1*gauss->coord2*gauss->coord3*(1.+zeta)*(1.-zeta);
                         return;
+                        #ifndef _HAVE_AD_
                 case P2xP1Enum:
                         /*Corner nodes*/
@@ -543 +543 @@
                         dbasis[NUMNODESP1*2+5]   = .5*gauss->coord3;
                         return;
-                        #ifndef _HAVE_AD_
                 case P1bubbleEnum: case P1bubblecondensedEnum:
                         /*Nodal function 1*/
@@ -574 +573 @@
                         dbasis[NUMNODESP1b*2+6] = -54*gauss->coord1*gauss->coord2*gauss->coord3*zeta;
                         return;
+                        #ifndef _HAVE_AD_
                 case P2xP1Enum:
                         /*Nodal function 1*/