Changeset 13506

Timestamp:

10/02/12 15:35:53 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new AutodiffFosReverseIndexEnum for reverse mode.
Also changed name of driver from jacobian to fov_reverse_all and fov_forward_all.

Location:

issm/trunk-jpl/src/c/modules

Files:

• EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• StringToEnumx/StringToEnumx.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp ¶

@@ -34 +34 @@
                 case AutodiffFosForwardIndexEnum : return "AutodiffFosForwardIndex";
                 case AutodiffFovForwardIndicesEnum : return "AutodiffFovForwardIndices";
+                case AutodiffFosReverseIndexEnum : return "AutodiffFosReverseIndex";
                 case AutodiffMassFluxSegmentsPresentEnum : return "AutodiffMassFluxSegmentsPresent";
                 case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp ¶

@@ -35 +35 @@
               else if (strcmp(name,"AutodiffFosForwardIndex")==0) return AutodiffFosForwardIndexEnum;
               else if (strcmp(name,"AutodiffFovForwardIndices")==0) return AutodiffFovForwardIndicesEnum;
+              else if (strcmp(name,"AutodiffFosReverseIndex")==0) return AutodiffFosReverseIndexEnum;
               else if (strcmp(name,"AutodiffMassFluxSegmentsPresent")==0) return AutodiffMassFluxSegmentsPresentEnum;
               else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
@@ -137 +138 @@
               else if (strcmp(name,"MeshEdges")==0) return MeshEdgesEnum;
               else if (strcmp(name,"MeshElementconnectivity")==0) return MeshElementconnectivityEnum;
-              else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
+              if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum;
+              else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum;
               else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum;
               else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
@@ -260 +261 @@
               else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
               else if (strcmp(name,"SurfaceSlopeXAnalysis")==0) return SurfaceSlopeXAnalysisEnum;
-              else if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
+              if (strcmp(name,"SurfaceSlopeYAnalysis")==0) return SurfaceSlopeYAnalysisEnum;
+              else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum;
               else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
               else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
@@ -383 +384 @@
               else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
               else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
-              else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
+              if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
+              else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
               else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
               else if (strcmp(name,"TemperatureOld")==0) return TemperatureOldEnum;
@@ -506 +507 @@
               else if (strcmp(name,"TriangleInterp")==0) return TriangleInterpEnum;
               else if (strcmp(name,"BilinearInterp")==0) return BilinearInterpEnum;
-              else if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"XY")==0) return XYEnum;
+              if (strcmp(name,"NearestInterp")==0) return NearestInterpEnum;
+              else if (strcmp(name,"XY")==0) return XYEnum;
               else if (strcmp(name,"XYZP")==0) return XYZPEnum;
               else if (strcmp(name,"Option")==0) return OptionEnum;