Changeset 22787

Timestamp:

05/15/18 15:44:59 (7 years ago)

Author:

seroussi

Message:

CHG: no need to have lat/long enums

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -179 +179 @@
         }
 
-        if(isoceancoupling){
-                iomodel->FetchDataToInput(elements,"md.mesh.lat",MeshLatEnum);
-                iomodel->FetchDataToInput(elements,"md.mesh.long",MeshLongEnum);
-        }
         if(!issmb){
                 iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum);

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -855 +855 @@
         MeltingAnalysisEnum,
         MeshElementsEnum,
-        MeshLatEnum,
-        MeshLongEnum,
         MeshXEnum,
         MeshYEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -859 +859 @@
                 case MeltingAnalysisEnum : return "MeltingAnalysis";
                 case MeshElementsEnum : return "MeshElements";
-                case MeshLatEnum : return "MeshLat";
-                case MeshLongEnum : return "MeshLong";
                 case MeshXEnum : return "MeshX";
                 case MeshYEnum : return "MeshY";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -880 +880 @@
               if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
               else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
-              else if (strcmp(name,"MeshLat")==0) return MeshLatEnum;
-              else if (strcmp(name,"MeshLong")==0) return MeshLongEnum;
               else if (strcmp(name,"MeshX")==0) return MeshXEnum;
               else if (strcmp(name,"MeshY")==0) return MeshYEnum;
@@ -998 +996 @@
               else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
               else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
+              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
+              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
-              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
-              else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
+              if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
               else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
               else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;
@@ -1121 +1119 @@
               else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
+              else if (strcmp(name,"Tria")==0) return TriaEnum;
+              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"Tria")==0) return TriaEnum;
-              else if (strcmp(name,"TriaInput")==0) return TriaInputEnum;
-              else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
+              if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
               else if (strcmp(name,"Vertex")==0) return VertexEnum;