source: issm/oecreview/Archive/12678-13393/ISSM-13348-13349.diff@ 13394

Last change on this file since 13394 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 4.8 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 13348)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 13349)
5@@ -263,6 +263,7 @@
6 ResultsEnum,
7 /*}}}*/
8 /*Objects {{{1*/
9+ GenericParamEnum,
10 AdolcParamEnum,
11 BoolInputEnum,
12 BoolParamEnum,
13Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp
14===================================================================
15--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 13348)
16+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 13349)
17@@ -267,6 +267,7 @@
18 else if (strcmp(name,"Parameters")==0) return ParametersEnum;
19 else if (strcmp(name,"Vertices")==0) return VerticesEnum;
20 else if (strcmp(name,"Results")==0) return ResultsEnum;
21+ else if (strcmp(name,"GenericParam")==0) return GenericParamEnum;
22 else if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
23 else if (strcmp(name,"BoolInput")==0) return BoolInputEnum;
24 else if (strcmp(name,"BoolParam")==0) return BoolParamEnum;
25@@ -382,11 +383,11 @@
26 else if (strcmp(name,"Vy")==0) return VyEnum;
27 else if (strcmp(name,"VyPicard")==0) return VyPicardEnum;
28 else if (strcmp(name,"Vz")==0) return VzEnum;
29- else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
30 else stage=4;
31 }
32 if(stage==4){
33- if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
34+ if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
35+ else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
36 else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
37 else if (strcmp(name,"VzStokes")==0) return VzStokesEnum;
38 else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
39Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp
40===================================================================
41--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 13348)
42+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 13349)
43@@ -260,6 +260,7 @@
44 case ParametersEnum : return "Parameters";
45 case VerticesEnum : return "Vertices";
46 case ResultsEnum : return "Results";
47+ case GenericParamEnum : return "GenericParam";
48 case AdolcParamEnum : return "AdolcParam";
49 case BoolInputEnum : return "BoolInput";
50 case BoolParamEnum : return "BoolParam";
51Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/GenericParamEnum.m
52===================================================================
53--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/GenericParamEnum.m (revision 0)
54+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/GenericParamEnum.m (revision 13349)
55@@ -0,0 +1,11 @@
56+function macro=GenericParamEnum()
57+%GENERICPARAMENUM - Enum of GenericParam
58+%
59+% WARNING: DO NOT MODIFY THIS FILE
60+% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh
61+% Please read src/c/EnumDefinitions/README for more information
62+%
63+% Usage:
64+% macro=GenericParamEnum()
65+
66+macro=StringToEnum('GenericParam');
67Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/MaximumNumberOfEnums.m
68===================================================================
69--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 13348)
70+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 13349)
71@@ -8,4 +8,4 @@
72 % Usage:
73 % macro=MaximumNumberOfEnums()
74
75-macro=473;
76+macro=474;
77Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py
78===================================================================
79--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 13348)
80+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 13349)
81@@ -2448,6 +2448,16 @@
82
83 return StringToEnum('Results')[0]
84
85+def GenericParamEnum():
86+ """
87+ GENERICPARAMENUM - Enum of GenericParam
88+
89+ Usage:
90+ macro=GenericParamEnum()
91+ """
92+
93+ return StringToEnum('GenericParam')[0]
94+
95 def AdolcParamEnum():
96 """
97 ADOLCPARAMENUM - Enum of AdolcParam
98@@ -4746,5 +4756,5 @@
99 macro=MaximumNumberOfEnums()
100 """
101
102- return 473
103+ return 474
104
Note: See TracBrowser for help on using the repository browser.