source: issm/oecreview/Archive/21724-22754/ISSM-22607-22608.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 9.2 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
2===================================================================
3--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22607)
4+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22608)
5@@ -648,7 +648,6 @@
6 CrouzeixRaviartEnum,
7 CuffeyEnum,
8 CuffeyTemperateEnum,
9- DamageC4Enum,
10 DamageEvolutionAnalysisEnum,
11 DamageEvolutionSolutionEnum,
12 DataSetEnum,
13@@ -934,7 +933,6 @@
14 SMBhenningEnum,
15 SmbMAddEnum,
16 SMBmeltcomponentsEnum,
17- SmbOutputFreqEnum,
18 SMBpddEnum,
19 SmbRlapsEnum,
20 SmbRlapslgmEnum,
21Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
22===================================================================
23--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22607)
24+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22608)
25@@ -652,7 +652,6 @@
26 case CrouzeixRaviartEnum : return "CrouzeixRaviart";
27 case CuffeyEnum : return "Cuffey";
28 case CuffeyTemperateEnum : return "CuffeyTemperate";
29- case DamageC4Enum : return "DamageC4";
30 case DamageEvolutionAnalysisEnum : return "DamageEvolutionAnalysis";
31 case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution";
32 case DataSetEnum : return "DataSet";
33@@ -938,7 +937,6 @@
34 case SMBhenningEnum : return "SMBhenning";
35 case SmbMAddEnum : return "SmbMAdd";
36 case SMBmeltcomponentsEnum : return "SMBmeltcomponents";
37- case SmbOutputFreqEnum : return "SmbOutputFreq";
38 case SMBpddEnum : return "SMBpdd";
39 case SmbRlapsEnum : return "SmbRlaps";
40 case SmbRlapslgmEnum : return "SmbRlapslgm";
41Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
42===================================================================
43--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22607)
44+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22608)
45@@ -667,7 +667,6 @@
46 else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
47 else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
48 else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
49- else if (strcmp(name,"DamageC4")==0) return DamageC4Enum;
50 else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
51 else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
52 else if (strcmp(name,"DataSet")==0) return DataSetEnum;
53@@ -751,11 +750,11 @@
54 else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
55 else if (strcmp(name,"Hook")==0) return HookEnum;
56 else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
57+ else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
58 else stage=7;
59 }
60 if(stage==7){
61- if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
62- else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
63+ if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
64 else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
65 else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
66 else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum;
67@@ -874,11 +873,11 @@
68 else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
69 else if (strcmp(name,"Mpi")==0) return MpiEnum;
70 else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
71+ else if (strcmp(name,"Mumps")==0) return MumpsEnum;
72 else stage=8;
73 }
74 if(stage==8){
75- if (strcmp(name,"Mumps")==0) return MumpsEnum;
76- else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
77+ if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
78 else if (strcmp(name,"Nodal")==0) return NodalEnum;
79 else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
80 else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
81@@ -959,7 +958,6 @@
82 else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
83 else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum;
84 else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
85- else if (strcmp(name,"SmbOutputFreq")==0) return SmbOutputFreqEnum;
86 else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
87 else if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum;
88 else if (strcmp(name,"SmbRlapslgm")==0) return SmbRlapslgmEnum;
89@@ -997,12 +995,12 @@
90 else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
91 else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
92 else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
93+ else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
94+ else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
95 else stage=9;
96 }
97 if(stage==9){
98- if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
99- else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
100- else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
101+ if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
102 else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
103 else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
104 else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;
105@@ -1120,12 +1118,12 @@
106 else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
107 else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
108 else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
109+ else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
110+ else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
111 else stage=10;
112 }
113 if(stage==10){
114- if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
115- else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
116- else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
117+ if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
118 else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
119 else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
120 else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
121Index: ../trunk-jpl/src/c/analyses/SmbAnalysis.cpp
122===================================================================
123--- ../trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 22607)
124+++ ../trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 22608)
125@@ -160,7 +160,6 @@
126 parameters->AddObject(iomodel->CopyConstantObject("md.smb.aIdx",SmbAIdxEnum));
127 parameters->AddObject(iomodel->CopyConstantObject("md.smb.swIdx",SmbSwIdxEnum));
128 parameters->AddObject(iomodel->CopyConstantObject("md.smb.denIdx",SmbDenIdxEnum));
129- parameters->AddObject(iomodel->CopyConstantObject("md.smb.outputFreq",SmbOutputFreqEnum));
130 parameters->AddObject(iomodel->CopyConstantObject("md.smb.cldFrac",SmbCldFracEnum));
131 parameters->AddObject(iomodel->CopyConstantObject("md.smb.t0wet",SmbT0wetEnum));
132 parameters->AddObject(iomodel->CopyConstantObject("md.smb.t0dry",SmbT0dryEnum));
133@@ -218,13 +217,11 @@
134 iomodel->FindConstant(&isd18opd,"md.smb.isd18opd");
135 iomodel->FindConstant(&issetpddfac,"md.smb.issetpddfac");
136 if(isd18opd){
137+ parameters->AddObject(iomodel->CopyConstantObject("md.smb.f",SmbFEnum));
138 parameters->AddObject(iomodel->CopyConstantObject("md.smb.istemperaturescaled",SmbIstemperaturescaledEnum));
139 iomodel->FetchData(&temp,&N,&M,"md.smb.delta18o"); _assert_(N==2);
140 parameters->AddObject(new TransientParam(SmbDelta18oEnum,&temp[0],&temp[M],interp,M));
141 iomodel->DeleteData(temp,"md.smb.delta18o");
142-
143- parameters->AddObject(iomodel->CopyConstantObject("md.smb.dpermil",SmbDpermilEnum));
144- parameters->AddObject(iomodel->CopyConstantObject("md.smb.f",SmbFEnum));
145 }
146 break;
147 case SMBgradientsEnum:
148Index: ../trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp
149===================================================================
150--- ../trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 22607)
151+++ ../trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 22608)
152@@ -96,7 +96,6 @@
153 parameters->AddObject(iomodel->CopyConstantObject("md.damage.c1",DamageC1Enum));
154 parameters->AddObject(iomodel->CopyConstantObject("md.damage.c2",DamageC2Enum));
155 parameters->AddObject(iomodel->CopyConstantObject("md.damage.c3",DamageC3Enum));
156- parameters->AddObject(iomodel->CopyConstantObject("md.damage.c4",DamageC4Enum));
157 parameters->AddObject(iomodel->CopyConstantObject("md.damage.stress_threshold",DamageStressThresholdEnum));
158 parameters->AddObject(iomodel->CopyConstantObject("md.damage.kappa",DamageKappaEnum));
159 parameters->AddObject(iomodel->CopyConstantObject("md.damage.healing",DamageHealingEnum));
Note: See TracBrowser for help on using the repository browser.