Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 13426) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 13427) @@ -13,11 +13,18 @@ /*Model fields {{{1*/ AutodiffIsautodiffEnum, - AutodiffDependentsEnum, AutodiffNumDependentsEnum, - AutodiffIndependentsEnum, + AutodiffNumDependentObjectsEnum, + AutodiffDependentObjectNamesEnum, + AutodiffDependentObjectTypesEnum, + AutodiffDependentObjectsEnum, AutodiffNumIndependentsEnum, + AutodiffNumIndependentObjectsEnum, + AutodiffIndependentObjectNamesEnum, + AutodiffIndependentObjectTypesEnum, + AutodiffIndependentObjectsEnum, AutodiffJacobianEnum, AutodiffXpEnum, - AutodiffFosForwardOutputEnum, + AutodiffDriverEnum, + AutodiffFosForwardIndexEnum, BalancethicknessSpcthicknessEnum, BalancethicknessStabilizationEnum, @@ -31,4 +38,5 @@ ConstantsReferencetemperatureEnum, ConstantsYtsEnum, + DependentObjectEnum, DiagnosticAbstolEnum, DiagnosticIcefrontEnum, @@ -70,4 +78,5 @@ HydrologySpcwatercolumnEnum, HydrologyStabilizationEnum, + IndependentObjectEnum, InversionControlParametersEnum, InversionCostFunctionEnum, @@ -273,4 +282,5 @@ DofIndexingEnum, DoubleInputEnum, + DataSetParamEnum, DoubleMatArrayParamEnum, DoubleMatParamEnum, Index: /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectNamesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectNamesEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectNamesEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffDependentObjectNamesEnum() +%AUTODIFFDEPENDENTOBJECTNAMESENUM - Enum of AutodiffDependentObjectNames +% +% 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=AutodiffDependentObjectNamesEnum() + +macro=StringToEnum('AutodiffDependentObjectNames'); Index: /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectTypesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectTypesEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectTypesEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffDependentObjectTypesEnum() +%AUTODIFFDEPENDENTOBJECTTYPESENUM - Enum of AutodiffDependentObjectTypes +% +% 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=AutodiffDependentObjectTypesEnum() + +macro=StringToEnum('AutodiffDependentObjectTypes'); Index: /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectsEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectsEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffDependentObjectsEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffDependentObjectsEnum() +%AUTODIFFDEPENDENTOBJECTSENUM - Enum of AutodiffDependentObjects +% +% 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=AutodiffDependentObjectsEnum() + +macro=StringToEnum('AutodiffDependentObjects'); Index: sm/trunk-jpl/src/m/enum/AutodiffDependentsEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffDependentsEnum.m (revision 13426) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=AutodiffDependentsEnum() -%AUTODIFFDEPENDENTSENUM - Enum of AutodiffDependents -% -% 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=AutodiffDependentsEnum() - -macro=StringToEnum('AutodiffDependents'); Index: /issm/trunk-jpl/src/m/enum/AutodiffDriverEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffDriverEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffDriverEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffDriverEnum() +%AUTODIFFDRIVERENUM - Enum of AutodiffDriver +% +% 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=AutodiffDriverEnum() + +macro=StringToEnum('AutodiffDriver'); Index: /issm/trunk-jpl/src/m/enum/AutodiffFosForwardIndexEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffFosForwardIndexEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffFosForwardIndexEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffFosForwardIndexEnum() +%AUTODIFFFOSFORWARDINDEXENUM - Enum of AutodiffFosForwardIndex +% +% 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=AutodiffFosForwardIndexEnum() + +macro=StringToEnum('AutodiffFosForwardIndex'); Index: sm/trunk-jpl/src/m/enum/AutodiffFosForwardOutputEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffFosForwardOutputEnum.m (revision 13426) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=AutodiffFosForwardOutputEnum() -%AUTODIFFFOSFORWARDOUTPUTENUM - Enum of AutodiffFosForwardOutput -% -% 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=AutodiffFosForwardOutputEnum() - -macro=StringToEnum('AutodiffFosForwardOutput'); Index: /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectNamesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectNamesEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectNamesEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffIndependentObjectNamesEnum() +%AUTODIFFINDEPENDENTOBJECTNAMESENUM - Enum of AutodiffIndependentObjectNames +% +% 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=AutodiffIndependentObjectNamesEnum() + +macro=StringToEnum('AutodiffIndependentObjectNames'); Index: /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectTypesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectTypesEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectTypesEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffIndependentObjectTypesEnum() +%AUTODIFFINDEPENDENTOBJECTTYPESENUM - Enum of AutodiffIndependentObjectTypes +% +% 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=AutodiffIndependentObjectTypesEnum() + +macro=StringToEnum('AutodiffIndependentObjectTypes'); Index: /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectsEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectsEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffIndependentObjectsEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffIndependentObjectsEnum() +%AUTODIFFINDEPENDENTOBJECTSENUM - Enum of AutodiffIndependentObjects +% +% 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=AutodiffIndependentObjectsEnum() + +macro=StringToEnum('AutodiffIndependentObjects'); Index: sm/trunk-jpl/src/m/enum/AutodiffIndependentsEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffIndependentsEnum.m (revision 13426) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=AutodiffIndependentsEnum() -%AUTODIFFINDEPENDENTSENUM - Enum of AutodiffIndependents -% -% 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=AutodiffIndependentsEnum() - -macro=StringToEnum('AutodiffIndependents'); Index: /issm/trunk-jpl/src/m/enum/AutodiffNumDependentObjectsEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffNumDependentObjectsEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffNumDependentObjectsEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffNumDependentObjectsEnum() +%AUTODIFFNUMDEPENDENTOBJECTSENUM - Enum of AutodiffNumDependentObjects +% +% 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=AutodiffNumDependentObjectsEnum() + +macro=StringToEnum('AutodiffNumDependentObjects'); Index: /issm/trunk-jpl/src/m/enum/AutodiffNumIndependentObjectsEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/AutodiffNumIndependentObjectsEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/AutodiffNumIndependentObjectsEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=AutodiffNumIndependentObjectsEnum() +%AUTODIFFNUMINDEPENDENTOBJECTSENUM - Enum of AutodiffNumIndependentObjects +% +% 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=AutodiffNumIndependentObjectsEnum() + +macro=StringToEnum('AutodiffNumIndependentObjects'); Index: /issm/trunk-jpl/src/m/enum/DataSetParamEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DataSetParamEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/DataSetParamEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=DataSetParamEnum() +%DATASETPARAMENUM - Enum of DataSetParam +% +% 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=DataSetParamEnum() + +macro=StringToEnum('DataSetParam'); Index: /issm/trunk-jpl/src/m/enum/DependentObjectEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DependentObjectEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/DependentObjectEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=DependentObjectEnum() +%DEPENDENTOBJECTENUM - Enum of DependentObject +% +% 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=DependentObjectEnum() + +macro=StringToEnum('DependentObject'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 13426) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 13427) @@ -19,14 +19,4 @@ return StringToEnum('AutodiffIsautodiff')[0] -def AutodiffDependentsEnum(): - """ - AUTODIFFDEPENDENTSENUM - Enum of AutodiffDependents - - Usage: - macro=AutodiffDependentsEnum() - """ - - return StringToEnum('AutodiffDependents')[0] - def AutodiffNumDependentsEnum(): """ @@ -39,13 +29,43 @@ return StringToEnum('AutodiffNumDependents')[0] -def AutodiffIndependentsEnum(): - """ - AUTODIFFINDEPENDENTSENUM - Enum of AutodiffIndependents - - Usage: - macro=AutodiffIndependentsEnum() - """ - - return StringToEnum('AutodiffIndependents')[0] +def AutodiffNumDependentObjectsEnum(): + """ + AUTODIFFNUMDEPENDENTOBJECTSENUM - Enum of AutodiffNumDependentObjects + + Usage: + macro=AutodiffNumDependentObjectsEnum() + """ + + return StringToEnum('AutodiffNumDependentObjects')[0] + +def AutodiffDependentObjectNamesEnum(): + """ + AUTODIFFDEPENDENTOBJECTNAMESENUM - Enum of AutodiffDependentObjectNames + + Usage: + macro=AutodiffDependentObjectNamesEnum() + """ + + return StringToEnum('AutodiffDependentObjectNames')[0] + +def AutodiffDependentObjectTypesEnum(): + """ + AUTODIFFDEPENDENTOBJECTTYPESENUM - Enum of AutodiffDependentObjectTypes + + Usage: + macro=AutodiffDependentObjectTypesEnum() + """ + + return StringToEnum('AutodiffDependentObjectTypes')[0] + +def AutodiffDependentObjectsEnum(): + """ + AUTODIFFDEPENDENTOBJECTSENUM - Enum of AutodiffDependentObjects + + Usage: + macro=AutodiffDependentObjectsEnum() + """ + + return StringToEnum('AutodiffDependentObjects')[0] def AutodiffNumIndependentsEnum(): @@ -59,4 +79,44 @@ return StringToEnum('AutodiffNumIndependents')[0] +def AutodiffNumIndependentObjectsEnum(): + """ + AUTODIFFNUMINDEPENDENTOBJECTSENUM - Enum of AutodiffNumIndependentObjects + + Usage: + macro=AutodiffNumIndependentObjectsEnum() + """ + + return StringToEnum('AutodiffNumIndependentObjects')[0] + +def AutodiffIndependentObjectNamesEnum(): + """ + AUTODIFFINDEPENDENTOBJECTNAMESENUM - Enum of AutodiffIndependentObjectNames + + Usage: + macro=AutodiffIndependentObjectNamesEnum() + """ + + return StringToEnum('AutodiffIndependentObjectNames')[0] + +def AutodiffIndependentObjectTypesEnum(): + """ + AUTODIFFINDEPENDENTOBJECTTYPESENUM - Enum of AutodiffIndependentObjectTypes + + Usage: + macro=AutodiffIndependentObjectTypesEnum() + """ + + return StringToEnum('AutodiffIndependentObjectTypes')[0] + +def AutodiffIndependentObjectsEnum(): + """ + AUTODIFFINDEPENDENTOBJECTSENUM - Enum of AutodiffIndependentObjects + + Usage: + macro=AutodiffIndependentObjectsEnum() + """ + + return StringToEnum('AutodiffIndependentObjects')[0] + def AutodiffJacobianEnum(): """ @@ -79,13 +139,23 @@ return StringToEnum('AutodiffXp')[0] -def AutodiffFosForwardOutputEnum(): - """ - AUTODIFFFOSFORWARDOUTPUTENUM - Enum of AutodiffFosForwardOutput - - Usage: - macro=AutodiffFosForwardOutputEnum() - """ - - return StringToEnum('AutodiffFosForwardOutput')[0] +def AutodiffDriverEnum(): + """ + AUTODIFFDRIVERENUM - Enum of AutodiffDriver + + Usage: + macro=AutodiffDriverEnum() + """ + + return StringToEnum('AutodiffDriver')[0] + +def AutodiffFosForwardIndexEnum(): + """ + AUTODIFFFOSFORWARDINDEXENUM - Enum of AutodiffFosForwardIndex + + Usage: + macro=AutodiffFosForwardIndexEnum() + """ + + return StringToEnum('AutodiffFosForwardIndex')[0] def BalancethicknessSpcthicknessEnum(): @@ -199,4 +269,14 @@ return StringToEnum('ConstantsYts')[0] +def DependentObjectEnum(): + """ + DEPENDENTOBJECTENUM - Enum of DependentObject + + Usage: + macro=DependentObjectEnum() + """ + + return StringToEnum('DependentObject')[0] + def DiagnosticAbstolEnum(): """ @@ -589,4 +669,14 @@ return StringToEnum('HydrologyStabilization')[0] +def IndependentObjectEnum(): + """ + INDEPENDENTOBJECTENUM - Enum of IndependentObject + + Usage: + macro=IndependentObjectEnum() + """ + + return StringToEnum('IndependentObject')[0] + def InversionControlParametersEnum(): """ @@ -2539,4 +2629,14 @@ return StringToEnum('DoubleInput')[0] +def DataSetParamEnum(): + """ + DATASETPARAMENUM - Enum of DataSetParam + + Usage: + macro=DataSetParamEnum() + """ + + return StringToEnum('DataSetParam')[0] + def DoubleMatArrayParamEnum(): """ @@ -4757,4 +4857,4 @@ """ - return 474 - + return 484 + Index: /issm/trunk-jpl/src/m/enum/IndependentObjectEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/IndependentObjectEnum.m (revision 13427) +++ /issm/trunk-jpl/src/m/enum/IndependentObjectEnum.m (revision 13427) @@ -0,0 +1,11 @@ +function macro=IndependentObjectEnum() +%INDEPENDENTOBJECTENUM - Enum of IndependentObject +% +% 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=IndependentObjectEnum() + +macro=StringToEnum('IndependentObject'); Index: /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 13426) +++ /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 13427) @@ -9,3 +9,3 @@ % macro=MaximumNumberOfEnums() -macro=474; +macro=484;