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

Timestamp:

03/01/17 23:26:48 (8 years ago)

Author:

adhikari

Message:

CHG: GiaIvins switched back to Gia

File:

• issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -347 +347 @@
               else if (strcmp(name,"ThermalNumRequestedOutputs")==0) return ThermalNumRequestedOutputsEnum;
               else if (strcmp(name,"ThermalRequestedOutputs")==0) return ThermalRequestedOutputsEnum;
-              else if (strcmp(name,"GiaIvinsMantleViscosity")==0) return GiaIvinsMantleViscosityEnum;
-              else if (strcmp(name,"GiaIvinsLithosphereThickness")==0) return GiaIvinsLithosphereThicknessEnum;
+              else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
+              else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
               else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
               else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
@@ -362 +362 @@
               else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
               else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
-              else if (strcmp(name,"TransientIsgiaivins")==0) return TransientIsgiaivinsEnum;
+              else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
               else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum;
               else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum;
@@ -578 +578 @@
               else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
               else if (strcmp(name,"MaxDivergence")==0) return MaxDivergenceEnum;
-              else if (strcmp(name,"GiaIvinsCrossSectionShape")==0) return GiaIvinsCrossSectionShapeEnum;
-              else if (strcmp(name,"GiaIvinsdWdt")==0) return GiaIvinsdWdtEnum;
-              else if (strcmp(name,"GiaIvinsW")==0) return GiaIvinsWEnum;
+              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
+              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
+              else if (strcmp(name,"GiaW")==0) return GiaWEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
@@ -922 +922 @@
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
               else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum;
-              else if (strcmp(name,"GiaIvinsSolution")==0) return GiaIvinsSolutionEnum;
+              else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
               else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum;
               else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;