Ignore:
Timestamp:
08/02/13 13:41:59 (12 years ago)
Author:
Mathieu Morlighem
Message:

NEW: Added P1bubble and P1bubblecondensed elements for all solutions (to be tested) and replaced MaximumNumberOfEnums by MaximumNumberOfDefinitionsEnum so that Enum synchronization errors are detected for people using mki

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r15654 r15689  
    504504              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    505505              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
     506              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    506507              else if (strcmp(name,"P2")==0) return P2Enum;
    507               else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
     511              if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
     512              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    512513              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    513514              else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     
    600601              else if (strcmp(name,"Paterson")==0) return PatersonEnum;
    601602              else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
     603              else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
    602604         else stage=6;
    603605   }
Note: See TracChangeset for help on using the changeset viewer.