Changeset 5290


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r5286 r5290  
    16941694         * -> Non MacAyeal and not on the surface
    16951695         * -> MacAyeal (2d model) and not on bed) */
    1696         if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
     1696        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
    16971697                return 0;
    16981698        }
    1699         else if (MacAyealApproximationEnum){
     1699        else if (approximation==MacAyealApproximationEnum){
    17001700
    17011701                /*This element should be collapsed into a tria element at its base. Create this tria element,
     
    17391739         * -> Non MacAyeal and not on the surface
    17401740         * -> MacAyeal (2d model) and not on bed) */
    1741         if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
     1741        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
    17421742                return 0;
    17431743        }
    1744         else if (MacAyealApproximationEnum){
     1744        else if (approximation==MacAyealApproximationEnum){
    17451745
    17461746                /*This element should be collapsed into a tria element at its base. Create this tria element,
     
    17841784         * -> Non MacAyeal and not on the surface
    17851785         * -> MacAyeal (2d model) and not on bed) */
    1786         if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
     1786        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
    17871787                return 0;
    17881788        }
    1789         else if (MacAyealApproximationEnum){
     1789        else if (approximation==MacAyealApproximationEnum){
    17901790
    17911791                /*This element should be collapsed into a tria element at its base. Create this tria element,
     
    18291829         * -> Non MacAyeal and not on the surface
    18301830         * -> MacAyeal (2d model) and not on bed) */
    1831         if ((approximation!=MacAyealApproximationEnum && !onsurface) || (MacAyealApproximationEnum && !onbed)){
     1831        if ((approximation!=MacAyealApproximationEnum && !onsurface) || (approximation==MacAyealApproximationEnum && !onbed)){
    18321832                return 0;
    18331833        }
    1834         else if (MacAyealApproximationEnum){
     1834        else if (approximation==MacAyealApproximationEnum){
    18351835
    18361836                /*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.