mathieumorlighem
Sure! Here is the output:
MU00154019X:trunk cjia0019$ svn diff $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp
Index: /Users/cjia0019/trunk/src/c/shared/Enum/StringToEnumx.cpp
--- /Users/cjia0019/trunk/src/c/shared/Enum/StringToEnumx.cpp (revision 28030)
+++ /Users/cjia0019/trunk/src/c/shared/Enum/StringToEnumx.cpp (working copy)
@@ -854,6 +854,7 @@
else if (strcmp(name,"EplHeadSlopeY")==0) return EplHeadSlopeYEnum;
else if (strcmp(name,"EplHeadSubstep")==0) return EplHeadSubstepEnum;
else if (strcmp(name,"EplHeadTransient")==0) return EplHeadTransientEnum;
- else if (strcmp(name,"Epsprime")==0) return EpsprimeEnum;
else if (strcmp(name,"EsaEmotion")==0) return EsaEmotionEnum;
else if (strcmp(name,"EsaNmotion")==0) return EsaNmotionEnum;
else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
@@ -945,9 +946,14 @@
else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
- else if (strcmp(name,"LambdaS")==0) return LambdaSEnum;
else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
- else if (strcmp(name,"LevelsetObservation")==0) return LevelsetObservationEnum;
- else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
- else stage=8;
- }
- if(stage==8){
- if (strcmp(name,"LevelsetObservation")==0) return LevelsetObservationEnum;
else if (strcmp(name,"LoadingforceX")==0) return LoadingforceXEnum;
else if (strcmp(name,"LoadingforceY")==0) return LoadingforceYEnum;
else if (strcmp(name,"LoadingforceZ")==0) return LoadingforceZEnum;
@@ -1070,7 +1076,11 @@
else if (strcmp(name,"SedimentHeadTransient")==0) return SedimentHeadTransientEnum;
else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum;
else if (strcmp(name,"SedimentHeadStacked")==0) return SedimentHeadStackedEnum;
- else if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum;
- else if (strcmp(name,"SmbAccumulatedEC")==0) return SmbAccumulatedECEnum;
- else stage=9;
- }
- if(stage==9){
- if (strcmp(name,"SigmaNN")==0) return SigmaNNEnum;
else if (strcmp(name,"SigmaVM")==0) return SigmaVMEnum;
else if (strcmp(name,"SmbAccumulatedEC")==0) return SmbAccumulatedECEnum;
else if (strcmp(name,"SmbAccumulatedMassBalance")==0) return SmbAccumulatedMassBalanceEnum;
@@ -1219,7 +1229,11 @@
else if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum;
else if (strcmp(name,"SolidearthExternalGeoidRate")==0) return SolidearthExternalGeoidRateEnum;
else if (strcmp(name,"StochasticForcingDefaultId")==0) return StochasticForcingDefaultIdEnum;
- else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
- else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
- else stage=10;
- }
- if(stage==10){
- if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
@@ -1351,7 +1365,11 @@
else if (strcmp(name,"Outputdefinition42")==0) return Outputdefinition42Enum;
else if (strcmp(name,"Outputdefinition43")==0) return Outputdefinition43Enum;
else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum;
- else if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum;
- else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
- else stage=11;
- }
- if(stage==11){
- if (strcmp(name,"Outputdefinition45")==0) return Outputdefinition45Enum;
else if (strcmp(name,"Outputdefinition46")==0) return Outputdefinition46Enum;
else if (strcmp(name,"Outputdefinition47")==0) return Outputdefinition47Enum;
else if (strcmp(name,"Outputdefinition48")==0) return Outputdefinition48Enum;
@@ -1483,8 +1501,15 @@
else if (strcmp(name,"ControlInputValues")==0) return ControlInputValuesEnum;
else if (strcmp(name,"ControlParam")==0) return ControlParamEnum;
else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
- else stage=12;
else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
- }
- if(stage==12){
- if (strcmp(name,"ControlInputValues")==0) return ControlInputValuesEnum;
- else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
- else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
- else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
else if (strcmp(name,"DataSet")==0) return DataSetEnum;
@@ -1605,10 +1630,13 @@
else if (strcmp(name,"L2ProjectionEPLAnalysis")==0) return L2ProjectionEPLAnalysisEnum;
else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
else if (strcmp(name,"LATaylorHood")==0) return LATaylorHoodEnum;
- else if (strcmp(name,"LambdaS")==0) return LambdaSEnum;
else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
- else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
- else stage=13;
- }
- if(stage==13){
- if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
- else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
else if (strcmp(name,"LinearFloatingMeltRatearma")==0) return LinearFloatingMeltRatearmaEnum;
else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
else if (strcmp(name,"Loads")==0) return LoadsEnum;
@@ -1730,8 +1758,12 @@
else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum;
else if (strcmp(name,"SMBgemb")==0) return SMBgembEnum;
else if (strcmp(name,"SMBgradients")==0) return SMBgradientsEnum;
- else if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum;
else if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum;
- else stage=14;
- }
- if(stage==14){
- if (strcmp(name,"SMBgradientscomponents")==0) return SMBgradientscomponentsEnum;
- else if (strcmp(name,"SMBgradientsela")==0) return SMBgradientselaEnum;
else if (strcmp(name,"SMBhenning")==0) return SMBhenningEnum;
else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
Actually, I got the cue when updating the repository, which let me to choose merge or something else becasue ISSM detected that there are differences between the latest version and my ISSM version. I chose merge for all the differences and then in 'make' step, the error generated.