Changeset 5290

Timestamp:

08/16/10 15:27:07 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed CM problem (bug that has been there for a long time)

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (4 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1694 +1694 @@
          * -> Non MacAyeal and not on the surface
          * -> MacAyeal (2d model) and not on bed) */
-        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
                 return 0;
         }
-        else if (MacAyealApproximationEnum){
+        else if (approximation==MacAyealApproximationEnum){
 
                 /*This element should be collapsed into a tria element at its base. Create this tria element, 
@@ -1739 +1739 @@
          * -> Non MacAyeal and not on the surface
          * -> MacAyeal (2d model) and not on bed) */
-        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
                 return 0;
         }
-        else if (MacAyealApproximationEnum){
+        else if (approximation==MacAyealApproximationEnum){
 
                 /*This element should be collapsed into a tria element at its base. Create this tria element, 
@@ -1784 +1784 @@
          * -> Non MacAyeal and not on the surface
          * -> MacAyeal (2d model) and not on bed) */
-        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
                 return 0;
         }
-        else if (MacAyealApproximationEnum){
+        else if (approximation==MacAyealApproximationEnum){
 
                 /*This element should be collapsed into a tria element at its base. Create this tria element, 
@@ -1829 +1829 @@
          * -> Non MacAyeal and not on the surface
          * -> MacAyeal (2d model) and not on bed) */
-        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
+        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
                 return 0;
         }
-        else if (MacAyealApproximationEnum){
+        else if (approximation==MacAyealApproximationEnum){
 
                 /*This element should be collapsed into a tria element at its base. Create this tria element,