source: issm/oecreview/Archive/19101-20495/ISSM-20464-20465.diff

Last change on this file was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 8.5 KB
RevLine 
[20498]1Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20464)
4+++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20465)
5@@ -11,7 +11,7 @@
6 #include "../solutionsequences/solutionsequences.h"
7
8 void LevelsetAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
9- IoModelToConstraintsx(constraints,iomodel,SpcLevelsetEnum,LevelsetAnalysisEnum,P1Enum);
10+ IoModelToConstraintsx(constraints,iomodel,SpclevelsetEnum,LevelsetAnalysisEnum,P1Enum);
11 }
12 /*}}}*/
13 void LevelsetAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
14Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
15===================================================================
16--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20464)
17+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20465)
18@@ -1040,7 +1040,7 @@
19 LliboutryDuvalEnum,
20 /*}}}*/
21 /*Levelset related enums (will be moved to appropriate place when finished){{{*/
22- SpcLevelsetEnum,
23+ SpclevelsetEnum,
24 ExtrapolationVariableEnum,
25 IceMaskNodeActivationEnum,
26 LevelsetfunctionSlopeXEnum,
27Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
28===================================================================
29--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20464)
30+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20465)
31@@ -994,7 +994,7 @@
32 case PatersonEnum : return "Paterson";
33 case ArrheniusEnum : return "Arrhenius";
34 case LliboutryDuvalEnum : return "LliboutryDuval";
35- case SpcLevelsetEnum : return "SpcLevelset";
36+ case SpclevelsetEnum : return "Spclevelset";
37 case ExtrapolationVariableEnum : return "ExtrapolationVariable";
38 case IceMaskNodeActivationEnum : return "IceMaskNodeActivation";
39 case LevelsetfunctionSlopeXEnum : return "LevelsetfunctionSlopeX";
40Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
41===================================================================
42--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20464)
43+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20465)
44@@ -1018,7 +1018,7 @@
45 else if (strcmp(name,"Paterson")==0) return PatersonEnum;
46 else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum;
47 else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
48- else if (strcmp(name,"SpcLevelset")==0) return SpcLevelsetEnum;
49+ else if (strcmp(name,"Spclevelset")==0) return SpclevelsetEnum;
50 else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum;
51 else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
52 else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
53Index: ../trunk-jpl/src/py3/classes/calvinglevermann.py
54===================================================================
55--- ../trunk-jpl/src/py3/classes/calvinglevermann.py (revision 20464)
56+++ ../trunk-jpl/src/py3/classes/calvinglevermann.py (revision 20465)
57@@ -62,7 +62,7 @@
58 yts=365.*24.*3600.
59 WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
60 WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
61- WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
62+ WriteData(fid,'enum',SpclevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
63 WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
64 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
65 # }}}
66Index: ../trunk-jpl/src/py3/classes/calving.py
67===================================================================
68--- ../trunk-jpl/src/py3/classes/calving.py (revision 20464)
69+++ ../trunk-jpl/src/py3/classes/calving.py (revision 20465)
70@@ -65,7 +65,7 @@
71
72 WriteData(fid,'enum',CalvingLawEnum(),'data',DefaultCalvingEnum(),'format','Integer');
73 WriteData(fid,'enum',LevelsetStabilizationEnum(),'data',self.stabilization,'format','Integer');
74- WriteData(fid,'enum',SpcLevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
75+ WriteData(fid,'enum',SpclevelsetEnum(),'data',self.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
76 WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
77 WriteData(fid,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'scale',1./yts)
78 # }}}
79Index: ../trunk-jpl/src/py3/enum/EnumDefinitions.py
80===================================================================
81--- ../trunk-jpl/src/py3/enum/EnumDefinitions.py (revision 20464)
82+++ ../trunk-jpl/src/py3/enum/EnumDefinitions.py (revision 20465)
83@@ -953,7 +953,7 @@
84 def ArrheniusEnum(): return StringToEnum("Arrhenius")[0]
85 def LliboutryDuvalEnum(): return StringToEnum("LliboutryDuval")[0]
86 def TransientIslevelsetEnum(): return StringToEnum("TransientIslevelset")[0]
87-def SpcLevelsetEnum(): return StringToEnum("SpcLevelset")[0]
88+def SpclevelsetEnum(): return StringToEnum("Spclevelset")[0]
89 def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0]
90 def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0]
91 def LevelsetfunctionSlopeXEnum(): return StringToEnum("LevelsetfunctionSlopeX")[0]
92Index: ../trunk-jpl/src/m/classes/levelset.js
93===================================================================
94--- ../trunk-jpl/src/m/classes/levelset.js (revision 20464)
95+++ ../trunk-jpl/src/m/classes/levelset.js (revision 20465)
96@@ -32,7 +32,7 @@
97 } //}}}
98 this.marshall=function(md,fid) { //{{{
99 WriteData(fid,'object',self,'class','levelset','fieldname','stabilization','format','Integer');
100- WriteData(fid,'enum',SpcLevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
101+ WriteData(fid,'enum',SpclevelsetEnum(),'data',this.spclevelset,'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
102 WriteData(fid,'object',self,'class','levelset','fieldname','reinit_frequency','format','Integer');
103
104 }//}}}
105Index: ../trunk-jpl/src/m/enum/SpclevelsetEnum.m
106===================================================================
107--- ../trunk-jpl/src/m/enum/SpclevelsetEnum.m (revision 0)
108+++ ../trunk-jpl/src/m/enum/SpclevelsetEnum.m (revision 20465)
109@@ -0,0 +1,11 @@
110+function macro=SpclevelsetEnum()
111+%SPCLEVELSETENUM - Enum of Spclevelset
112+%
113+% WARNING: DO NOT MODIFY THIS FILE
114+% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
115+% Please read src/c/shared/Enum/README for more information
116+%
117+% Usage:
118+% macro=SpclevelsetEnum()
119+
120+macro=StringToEnum('Spclevelset');
121Index: ../trunk-jpl/src/m/enum/EnumDefinitions.js
122===================================================================
123--- ../trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20464)
124+++ ../trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20465)
125@@ -979,7 +979,7 @@
126 function PatersonEnum(){ return 975;}
127 function ArrheniusEnum(){ return 976;}
128 function LliboutryDuvalEnum(){ return 977;}
129-function SpcLevelsetEnum(){ return 978;}
130+function SpclevelsetEnum(){ return 978;}
131 function ExtrapolationVariableEnum(){ return 979;}
132 function IceMaskNodeActivationEnum(){ return 980;}
133 function LevelsetfunctionSlopeXEnum(){ return 981;}
134Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py
135===================================================================
136--- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20464)
137+++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20465)
138@@ -986,7 +986,7 @@
139 def PatersonEnum(): return StringToEnum("Paterson")[0]
140 def ArrheniusEnum(): return StringToEnum("Arrhenius")[0]
141 def LliboutryDuvalEnum(): return StringToEnum("LliboutryDuval")[0]
142-def SpcLevelsetEnum(): return StringToEnum("SpcLevelset")[0]
143+def SpclevelsetEnum(): return StringToEnum("Spclevelset")[0]
144 def ExtrapolationVariableEnum(): return StringToEnum("ExtrapolationVariable")[0]
145 def IceMaskNodeActivationEnum(): return StringToEnum("IceMaskNodeActivation")[0]
146 def LevelsetfunctionSlopeXEnum(): return StringToEnum("LevelsetfunctionSlopeX")[0]
Note: See TracBrowser for help on using the repository browser.