Changeset 5290
- Timestamp:
- 08/16/10 15:27:07 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r5286 r5290 1694 1694 * -> Non MacAyeal and not on the surface 1695 1695 * -> MacAyeal (2d model) and not on bed) */ 1696 if ((approximation!=MacAyealApproximationEnum && !onsurface) || ( MacAyealApproximationEnum && !onbed)){1696 if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){ 1697 1697 return 0; 1698 1698 } 1699 else if ( MacAyealApproximationEnum){1699 else if (approximation==MacAyealApproximationEnum){ 1700 1700 1701 1701 /*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 1740 1740 * -> MacAyeal (2d model) and not on bed) */ 1741 if ((approximation!=MacAyealApproximationEnum && !onsurface) || ( MacAyealApproximationEnum && !onbed)){1741 if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){ 1742 1742 return 0; 1743 1743 } 1744 else if ( MacAyealApproximationEnum){1744 else if (approximation==MacAyealApproximationEnum){ 1745 1745 1746 1746 /*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 1785 1785 * -> MacAyeal (2d model) and not on bed) */ 1786 if ((approximation!=MacAyealApproximationEnum && !onsurface) || ( MacAyealApproximationEnum && !onbed)){1786 if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){ 1787 1787 return 0; 1788 1788 } 1789 else if ( MacAyealApproximationEnum){1789 else if (approximation==MacAyealApproximationEnum){ 1790 1790 1791 1791 /*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 1830 1830 * -> MacAyeal (2d model) and not on bed) */ 1831 if ((approximation!=MacAyealApproximationEnum && !onsurface) || ( MacAyealApproximationEnum && !onbed)){1831 if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){ 1832 1832 return 0; 1833 1833 } 1834 else if ( MacAyealApproximationEnum){1834 else if (approximation==MacAyealApproximationEnum){ 1835 1835 1836 1836 /*This element should be collapsed into a tria element at its base. Create this tria element,
Note:
See TracChangeset
for help on using the changeset viewer.