Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9546) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9547) @@ -63,10 +63,6 @@ //melting MeltingAnalysisEnum, - //parameters - ParametersSolutionEnum, - ParametersAnalysisEnum, //steadystate SteadystateSolutionEnum, - SteadystateAnalysisEnum, //flaim FlaimSolutionEnum, Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9546) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9547) @@ -23,4 +23,5 @@ case ParametersEnum : return "Parameters"; case VerticesEnum : return "Vertices"; + case ResultsEnum : return "Results"; case SolutionTypeEnum : return "SolutionType"; case AnalysisTypeEnum : return "AnalysisType"; @@ -54,8 +55,5 @@ case PrognosticAnalysisEnum : return "PrognosticAnalysis"; case MeltingAnalysisEnum : return "MeltingAnalysis"; - case ParametersSolutionEnum : return "ParametersSolution"; - case ParametersAnalysisEnum : return "ParametersAnalysis"; case SteadystateSolutionEnum : return "SteadystateSolution"; - case SteadystateAnalysisEnum : return "SteadystateAnalysis"; case FlaimSolutionEnum : return "FlaimSolution"; case FlaimAnalysisEnum : return "FlaimAnalysis"; @@ -72,4 +70,5 @@ case HookEnum : return "Hook"; case SegmentEnum : return "Segment"; + case ElementEnum : return "Element"; case DofIndexingEnum : return "DofIndexing"; case PentaEnum : return "Penta"; @@ -119,4 +118,5 @@ case AirEnum : return "Air"; case MelangeEnum : return "Melange"; + case FreeEnum : return "Free"; case OpenEnum : return "Open"; case ClosedEnum : return "Closed"; @@ -317,7 +317,10 @@ case BilinearInterpEnum : return "BilinearInterp"; case NearestInterpEnum : return "NearestInterp"; + case OptionEnum : return "Option"; case OptionCellEnum : return "OptionCell"; case OptionCharEnum : return "OptionChar"; case OptionStructEnum : return "OptionStruct"; + case OptionDoubleEnum : return "OptionDouble"; + case OptionLogicalEnum : return "OptionLogical"; case RheologyLawEnum : return "RheologyLaw"; case PatersonEnum : return "Paterson"; Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9546) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9547) @@ -21,4 +21,5 @@ else if (strcmp(name,"Parameters")==0) return ParametersEnum; else if (strcmp(name,"Vertices")==0) return VerticesEnum; + else if (strcmp(name,"Results")==0) return ResultsEnum; else if (strcmp(name,"SolutionType")==0) return SolutionTypeEnum; else if (strcmp(name,"AnalysisType")==0) return AnalysisTypeEnum; @@ -52,8 +53,5 @@ else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; - else if (strcmp(name,"ParametersSolution")==0) return ParametersSolutionEnum; - else if (strcmp(name,"ParametersAnalysis")==0) return ParametersAnalysisEnum; else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; - else if (strcmp(name,"SteadystateAnalysis")==0) return SteadystateAnalysisEnum; else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; @@ -70,4 +68,5 @@ else if (strcmp(name,"Hook")==0) return HookEnum; else if (strcmp(name,"Segment")==0) return SegmentEnum; + else if (strcmp(name,"Element")==0) return ElementEnum; else if (strcmp(name,"DofIndexing")==0) return DofIndexingEnum; else if (strcmp(name,"Penta")==0) return PentaEnum; @@ -117,4 +116,5 @@ else if (strcmp(name,"Air")==0) return AirEnum; else if (strcmp(name,"Melange")==0) return MelangeEnum; + else if (strcmp(name,"Free")==0) return FreeEnum; else if (strcmp(name,"Open")==0) return OpenEnum; else if (strcmp(name,"Closed")==0) return ClosedEnum; @@ -315,7 +315,10 @@ else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum; else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum; + else if (strcmp(name,"Option")==0) return OptionEnum; else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; else if (strcmp(name,"OptionChar")==0) return OptionCharEnum; else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; + else if (strcmp(name,"OptionDouble")==0) return OptionDoubleEnum; + else if (strcmp(name,"OptionLogical")==0) return OptionLogicalEnum; else if (strcmp(name,"RheologyLaw")==0) return RheologyLawEnum; else if (strcmp(name,"Paterson")==0) return PatersonEnum; Index: /issm/trunk/src/m/enum/ElementEnum.m =================================================================== --- /issm/trunk/src/m/enum/ElementEnum.m (revision 9547) +++ /issm/trunk/src/m/enum/ElementEnum.m (revision 9547) @@ -0,0 +1,11 @@ +function macro=ElementEnum() +%ELEMENTENUM - Enum of Element +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=ElementEnum() + +macro=StringToEnum('Element'); Index: /issm/trunk/src/m/enum/FreeEnum.m =================================================================== --- /issm/trunk/src/m/enum/FreeEnum.m (revision 9547) +++ /issm/trunk/src/m/enum/FreeEnum.m (revision 9547) @@ -0,0 +1,11 @@ +function macro=FreeEnum() +%FREEENUM - Enum of Free +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=FreeEnum() + +macro=StringToEnum('Free'); Index: /issm/trunk/src/m/enum/OptionDoubleEnum.m =================================================================== --- /issm/trunk/src/m/enum/OptionDoubleEnum.m (revision 9547) +++ /issm/trunk/src/m/enum/OptionDoubleEnum.m (revision 9547) @@ -0,0 +1,11 @@ +function macro=OptionDoubleEnum() +%OPTIONDOUBLEENUM - Enum of OptionDouble +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=OptionDoubleEnum() + +macro=StringToEnum('OptionDouble'); Index: /issm/trunk/src/m/enum/OptionEnum.m =================================================================== --- /issm/trunk/src/m/enum/OptionEnum.m (revision 9547) +++ /issm/trunk/src/m/enum/OptionEnum.m (revision 9547) @@ -0,0 +1,11 @@ +function macro=OptionEnum() +%OPTIONENUM - Enum of Option +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=OptionEnum() + +macro=StringToEnum('Option'); Index: /issm/trunk/src/m/enum/OptionLogicalEnum.m =================================================================== --- /issm/trunk/src/m/enum/OptionLogicalEnum.m (revision 9547) +++ /issm/trunk/src/m/enum/OptionLogicalEnum.m (revision 9547) @@ -0,0 +1,11 @@ +function macro=OptionLogicalEnum() +%OPTIONLOGICALENUM - Enum of OptionLogical +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=OptionLogicalEnum() + +macro=StringToEnum('OptionLogical'); Index: sm/trunk/src/m/enum/ParametersAnalysisEnum.m =================================================================== --- /issm/trunk/src/m/enum/ParametersAnalysisEnum.m (revision 9546) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=ParametersAnalysisEnum() -%PARAMETERSANALYSISENUM - Enum of ParametersAnalysis -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=ParametersAnalysisEnum() - -macro=StringToEnum('ParametersAnalysis'); Index: sm/trunk/src/m/enum/ParametersSolutionEnum.m =================================================================== --- /issm/trunk/src/m/enum/ParametersSolutionEnum.m (revision 9546) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=ParametersSolutionEnum() -%PARAMETERSSOLUTIONENUM - Enum of ParametersSolution -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=ParametersSolutionEnum() - -macro=StringToEnum('ParametersSolution'); Index: /issm/trunk/src/m/enum/ResultsEnum.m =================================================================== --- /issm/trunk/src/m/enum/ResultsEnum.m (revision 9547) +++ /issm/trunk/src/m/enum/ResultsEnum.m (revision 9547) @@ -0,0 +1,11 @@ +function macro=ResultsEnum() +%RESULTSENUM - Enum of Results +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=ResultsEnum() + +macro=StringToEnum('Results'); Index: sm/trunk/src/m/enum/SteadystateAnalysisEnum.m =================================================================== --- /issm/trunk/src/m/enum/SteadystateAnalysisEnum.m (revision 9546) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=SteadystateAnalysisEnum() -%STEADYSTATEANALYSISENUM - Enum of SteadystateAnalysis -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=SteadystateAnalysisEnum() - -macro=StringToEnum('SteadystateAnalysis');