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

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

@@ -178 +178 @@
                         _error_("Basal forcing model "<<EnumToStringx(basalforcing_model)<<" not supported yet");
         }
 
-        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);
         }

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

@@ -854 +854 @@
         MelangeEnum,
         MeltingAnalysisEnum,
         MeshElementsEnum,
-        MeshLatEnum,
-        MeshLongEnum,
         MeshXEnum,
         MeshYEnum,
         MINIcondensedEnum,

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

@@ -858 +858 @@
                 case MelangeEnum : return "Melange";
                 case MeltingAnalysisEnum : return "MeltingAnalysis";
                 case MeshElementsEnum : return "MeshElements";
-                case MeshLatEnum : return "MeshLat";
-                case MeshLongEnum : return "MeshLong";
                 case MeshXEnum : return "MeshX";
                 case MeshYEnum : return "MeshY";
                 case MINIcondensedEnum : return "MINIcondensed";

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

@@ -879 +879 @@
    if(stage==8){
               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;
               else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;
@@ -997 +995 @@
               else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
               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;
               else if (strcmp(name,"Outputdefinition97")==0) return Outputdefinition97Enum;
@@ -1120 +1118 @@
               else if (strcmp(name,"TransientInput")==0) return TransientInputEnum;
               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;
               else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;