Changeset 18866 for issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

Timestamp:

11/26/14 11:34:30 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: Syncing Enums

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -629 +629 @@
               else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
               else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
-              else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Divergence")==0) return DivergenceEnum;
+              if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
+              else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
               else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
               else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
@@ -711 +711 @@
               else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
               else if (strcmp(name,"Contact")==0) return ContactEnum;
+              else if (strcmp(name,"GroundingOnly")==0) return GroundingOnlyEnum;
               else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum;
               else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum;
@@ -751 +752 @@
               else if (strcmp(name,"XYZ")==0) return XYZEnum;
               else if (strcmp(name,"Dense")==0) return DenseEnum;
-              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
-              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Seq")==0) return SeqEnum;
+              if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
+              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
+              else if (strcmp(name,"Seq")==0) return SeqEnum;
               else if (strcmp(name,"Mpi")==0) return MpiEnum;
               else if (strcmp(name,"Mumps")==0) return MumpsEnum;