source: issm/oecreview/Archive/18296-19100/ISSM-18746-18747.diff@ 19102

Last change on this file since 19102 was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100
File size: 7.3 KB
RevLine 
[19102]1Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18746)
4+++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 18747)
5@@ -663,7 +663,7 @@
6 Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
7 active_element_input->GetInputValue(&active_element);
8
9- basalelement->parameters->FindParam(&penalty_lock,HydrologydcPenaltyLockEnum);
10+ basalelement->parameters->FindParam(&penalty_lock,HydrologydcEplflipLockEnum);
11
12 basalelement-> GetInputListOnVertices(&old_active[0],HydrologydcMaskEplactiveNodeEnum);
13 basalelement-> GetInputListOnVertices(&epl_thickness[0],HydrologydcEplThicknessEnum);
14Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
15===================================================================
16--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18746)
17+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18747)
18@@ -136,6 +136,7 @@
19 HydrologydcLeakageFactorEnum,
20 HydrologydcPenaltyFactorEnum,
21 HydrologydcPenaltyLockEnum,
22+ HydrologydcEplflipLockEnum,
23 HydrologydcBasalMoulinInputEnum,
24 HydrologyLayerEnum,
25 HydrologySedimentEnum,
26Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
27===================================================================
28--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18746)
29+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18747)
30@@ -144,6 +144,7 @@
31 case HydrologydcLeakageFactorEnum : return "HydrologydcLeakageFactor";
32 case HydrologydcPenaltyFactorEnum : return "HydrologydcPenaltyFactor";
33 case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock";
34+ case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock";
35 case HydrologydcBasalMoulinInputEnum : return "HydrologydcBasalMoulinInput";
36 case HydrologyLayerEnum : return "HydrologyLayer";
37 case HydrologySedimentEnum : return "HydrologySediment";
38Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
39===================================================================
40--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18746)
41+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18747)
42@@ -147,6 +147,7 @@
43 else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
44 else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
45 else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
46+ else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
47 else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
48 else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
49 else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
50@@ -258,11 +259,11 @@
51 else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
52 else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
53 else if (strcmp(name,"MiscellaneousName")==0) return MiscellaneousNameEnum;
54- else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
55 else stage=3;
56 }
57 if(stage==3){
58- if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
59+ if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum;
60+ else if (strcmp(name,"MasstransportIscalvingrate")==0) return MasstransportIscalvingrateEnum;
61 else if (strcmp(name,"MasstransportLevermannCalvingCoeff")==0) return MasstransportLevermannCalvingCoeffEnum;
62 else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum;
63 else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum;
64@@ -381,11 +382,11 @@
65 else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
66 else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
67 else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
68- else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
69 else stage=4;
70 }
71 if(stage==4){
72- if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
73+ if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
74+ else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
75 else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
76 else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
77 else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
78@@ -504,11 +505,11 @@
79 else if (strcmp(name,"SegInput")==0) return SegInputEnum;
80 else if (strcmp(name,"Tria")==0) return TriaEnum;
81 else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
82- else if (strcmp(name,"Tetra")==0) return TetraEnum;
83 else stage=5;
84 }
85 if(stage==5){
86- if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
87+ if (strcmp(name,"Tetra")==0) return TetraEnum;
88+ else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
89 else if (strcmp(name,"Penta")==0) return PentaEnum;
90 else if (strcmp(name,"PentaInput")==0) return PentaInputEnum;
91 else if (strcmp(name,"Vertex")==0) return VertexEnum;
92@@ -627,11 +628,11 @@
93 else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
94 else if (strcmp(name,"P1xP3")==0) return P1xP3Enum;
95 else if (strcmp(name,"P2xP4")==0) return P2xP4Enum;
96- else if (strcmp(name,"P1P1")==0) return P1P1Enum;
97 else stage=6;
98 }
99 if(stage==6){
100- if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
101+ if (strcmp(name,"P1P1")==0) return P1P1Enum;
102+ else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
103 else if (strcmp(name,"MINI")==0) return MINIEnum;
104 else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
105 else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
106@@ -750,11 +751,11 @@
107 else if (strcmp(name,"IceMaskNodeActivation")==0) return IceMaskNodeActivationEnum;
108 else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
109 else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
110- else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
111 else stage=7;
112 }
113 if(stage==7){
114- if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
115+ if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
116+ else if (strcmp(name,"Seaiceatm")==0) return SeaiceatmEnum;
117 else if (strcmp(name,"Seaiceocean")==0) return SeaiceoceanEnum;
118 else if (strcmp(name,"SeaiceThickness")==0) return SeaiceThicknessEnum;
119 else if (strcmp(name,"SeaiceConcentration")==0) return SeaiceConcentrationEnum;
Note: See TracBrowser for help on using the repository browser.