Changeset 11827 for issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

Timestamp:

03/30/12 15:00:51 (13 years ago)

Author:

Mathieu Morlighem

Message:

Now each core saves its results depending on SaveResults parameter
Added support for Boolean in parameters
In outputResuts: do not take Results as argument

File:

• issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -378 +378 @@
               else if (strcmp(name,"P1")==0) return P1Enum;
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;
+              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum;
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
-              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
+              if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
               else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;
@@ -395 +396 @@
               else if (strcmp(name,"PetscVecExternalResult")==0) return PetscVecExternalResultEnum;
               else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
+              else if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;