source: issm/oecreview/Archive/22755-22818/ISSM-22786-22787.diff

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

CHG: added Archive/22755-22818
File size: 4.4 KB
RevLine 
[22819]1Index: ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 22786)
4+++ ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 22787)
5@@ -178,10 +178,6 @@
6 _error_("Basal forcing model "<<EnumToStringx(basalforcing_model)<<" not supported yet");
7 }
8
9- if(isoceancoupling){
10- iomodel->FetchDataToInput(elements,"md.mesh.lat",MeshLatEnum);
11- iomodel->FetchDataToInput(elements,"md.mesh.long",MeshLongEnum);
12- }
13 if(!issmb){
14 iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum);
15 }
16Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
17===================================================================
18--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22786)
19+++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22787)
20@@ -854,8 +854,6 @@
21 MelangeEnum,
22 MeltingAnalysisEnum,
23 MeshElementsEnum,
24- MeshLatEnum,
25- MeshLongEnum,
26 MeshXEnum,
27 MeshYEnum,
28 MINIcondensedEnum,
29Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
30===================================================================
31--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22786)
32+++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22787)
33@@ -858,8 +858,6 @@
34 case MelangeEnum : return "Melange";
35 case MeltingAnalysisEnum : return "MeltingAnalysis";
36 case MeshElementsEnum : return "MeshElements";
37- case MeshLatEnum : return "MeshLat";
38- case MeshLongEnum : return "MeshLong";
39 case MeshXEnum : return "MeshX";
40 case MeshYEnum : return "MeshY";
41 case MINIcondensedEnum : return "MINIcondensed";
42Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
43===================================================================
44--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22786)
45+++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22787)
46@@ -879,8 +879,6 @@
47 if(stage==8){
48 if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
49 else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
50- else if (strcmp(name,"MeshLat")==0) return MeshLatEnum;
51- else if (strcmp(name,"MeshLong")==0) return MeshLongEnum;
52 else if (strcmp(name,"MeshX")==0) return MeshXEnum;
53 else if (strcmp(name,"MeshY")==0) return MeshYEnum;
54 else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
55@@ -997,12 +995,12 @@
56 else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
57 else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
58 else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
59+ else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
60+ else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
61 else stage=9;
62 }
63 if(stage==9){
64- if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
65- else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
66- else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
67+ if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
68 else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
69 else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
70 else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
71@@ -1120,12 +1118,12 @@
72 else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
73 else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
74 else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
75+ else if (strcmp(name,"Tria")==0) return TriaEnum;
76+ else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
77 else stage=10;
78 }
79 if(stage==10){
80- if (strcmp(name,"Tria")==0) return TriaEnum;
81- else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
82- else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
83+ if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
84 else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
85 else if (strcmp(name,"Vertex")==0) return VertexEnum;
86 else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;
Note: See TracBrowser for help on using the repository browser.