Changeset 19066

Timestamp:

02/02/15 14:47:47 (10 years ago)

Author:

Eric.Larour

Message:

CHG: new enums for ice mass computation and misfit object.

Location:

issm/trunk-jpl/src/c/shared/Enum

Files:

• EnumDefinitions.h (modified) (2 diffs)
• EnumToStringx.cpp (modified) (2 diffs)
• StringToEnumx.cpp (modified) (3 diffs)

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

@@ -791 +791 @@
         MisfitObservationEnum,
         MisfitObservationEnumEnum,
+        MisfitLocalEnum,
         MisfitTimeinterpolationEnum,
         MisfitWeightsEnum,
@@ -813 +814 @@
         MaxVzEnum,
         MaxAbsVzEnum,
+        IceMassEnum,
         IceVolumeEnum,
         IceVolumeAboveFloatationEnum,

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

@@ -776 +776 @@
                 case MisfitObservationEnum : return "MisfitObservation";
                 case MisfitObservationEnumEnum : return "MisfitObservationEnum";
+                case MisfitLocalEnum : return "MisfitLocal";
                 case MisfitTimeinterpolationEnum : return "MisfitTimeinterpolation";
                 case MisfitWeightsEnum : return "MisfitWeights";
@@ -796 +797 @@
                 case MaxVzEnum : return "MaxVz";
                 case MaxAbsVzEnum : return "MaxAbsVz";
+                case IceMassEnum : return "IceMass";
                 case IceVolumeEnum : return "IceVolume";
                 case IceVolumeAboveFloatationEnum : return "IceVolumeAboveFloatation";

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

@@ -794 +794 @@
               else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
               else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
+              else if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum;
               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
               else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
@@ -814 +815 @@
               else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
               else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
+              else if (strcmp(name,"IceMass")==0) return IceMassEnum;
               else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
               else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
@@ -873 +875 @@
               else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZ")==0) return XYZEnum;
-              else if (strcmp(name,"Dense")==0) return DenseEnum;
-              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
+              if (strcmp(name,"Dense")==0) return DenseEnum;
+              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
+              else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
               else if (strcmp(name,"Seq")==0) return SeqEnum;
               else if (strcmp(name,"Mpi")==0) return MpiEnum;