source: issm/oecreview/Archive/17802-17983/ISSM-17909-17910.diff@ 17986

Last change on this file since 17986 was 17986, checked in by Mathieu Morlighem, 11 years ago

New release
File size: 9.8 KB

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

     
    140140        InversionMaxiterPerStepEnum,
    141141        InversionMinParametersEnum,
    142142        InversionNstepsEnum,
     143        InversionDxminEnum,
     144        InversionEpsrelEnum,
    143145        InversionNumControlParametersEnum,
    144146        InversionNumCostFunctionsEnum,
    145147        InversionStepThresholdEnum,

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

     
    148148                case InversionMaxiterPerStepEnum : return "InversionMaxiterPerStep";
    149149                case InversionMinParametersEnum : return "InversionMinParameters";
    150150                case InversionNstepsEnum : return "InversionNsteps";
     151                case InversionDxminEnum : return "InversionDxmin";
     152                case InversionEpsrelEnum : return "InversionEpsrel";
    151153                case InversionNumControlParametersEnum : return "InversionNumControlParameters";
    152154                case InversionNumCostFunctionsEnum : return "InversionNumCostFunctions";
    153155                case InversionStepThresholdEnum : return "InversionStepThreshold";

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

     
    151151              else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
    152152              else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
    153153              else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
     154              else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum;
     155              else if (strcmp(name,"InversionEpsrel")==0) return InversionEpsrelEnum;
    154156              else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
    155157              else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum;
    156158              else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum;
    … …  
    257259              else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
    258260              else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
    259261              else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
    260               else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
    261               else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
     265              if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum;
     266              else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum;
     267              else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum;
    266268              else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum;
    267269              else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum;
    268270              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    … …  
    380382              else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum;
    381383              else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
    382384              else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
    383               else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
    384               else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
     388              if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
     389              else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
     390              else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
    389391              else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
    390392              else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
    391393              else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
    … …  
    503505              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
    504506              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    505507              else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    506               else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
    507               else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
     511              if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
     512              else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
     513              else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
    512514              else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
    513515              else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    514516              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    … …  
    626628              else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
    627629              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
    628630              else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
    629               else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
    630               else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
     634              if (strcmp(name,"Incremental")==0) return IncrementalEnum;
     635              else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
     636              else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
    635637              else if (strcmp(name,"None")==0) return NoneEnum;
    636638              else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
    637639              else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;

  • ../trunk-jpl/src/wrappers/IssmConfig/IssmConfig.cpp

     
    3636        if(strcmp(name,"_HAVE_MPI_")==0){
    3737                #ifdef _HAVE_MPI_
    3838                value = 1.;
    39                 #else
    40                 value = 0.;
    4139                #endif
    4240        }
    4341        else if(strcmp(name,"_HAVE_DAKOTA_")==0){
    4442                #ifdef _HAVE_DAKOTA_
    4543                value = 1.;
    46                 #else
    47                 value = 0.;
    4844                #endif
    4945        }
    5046        else if(strcmp(name,"_HAVE_MUMPS_")==0){
    5147                #ifdef _HAVE_MUMPS_
    5248                value = 1.;
    53                 #else
    54                 value = 0.;
    5549                #endif
    5650        }
    5751        else if(strcmp(name,"_HAVE_GSL_")==0){
    5852                #ifdef _HAVE_GSL_
    5953                value = 1.;
    60                 #else
    61                 value = 0.;
    6254                #endif
    6355        }
    6456        else if(strcmp(name,"_HAVE_TAO_")==0){
    6557                #ifdef _HAVE_TAO_
    6658                value = 1.;
    67                 #else
    68                 value = 0.;
    6959                #endif
    7060        }
     61        else if(strcmp(name,"_HAVE_M1QN3_")==0){
     62                #ifdef _HAVE_M1QN3_
     63                value = 1.;
     64                #endif
     65        }
    7166        else if(strcmp(name,"_HAVE_PETSC_")==0){
    7267                #ifdef _HAVE_PETSC_
    7368                value = 1.;
    74                 #else
    75                 value = 0.;
    7669                #endif
    7770        }
    7871        else if(strcmp(name,"_PETSC_MAJOR_")==0){

  • ../trunk-jpl/src/m/enum/InversionDxminEnum.m

     
     1function macro=InversionDxminEnum()
     2%INVERSIONDXMINENUM - Enum of InversionDxmin
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=InversionDxminEnum()
     10
     11macro=StringToEnum('InversionDxmin');

  • ../trunk-jpl/src/m/enum/EnumDefinitions.py

     
    140140def InversionMaxiterPerStepEnum(): return StringToEnum("InversionMaxiterPerStep")[0]
    141141def InversionMinParametersEnum(): return StringToEnum("InversionMinParameters")[0]
    142142def InversionNstepsEnum(): return StringToEnum("InversionNsteps")[0]
     143def InversionDxminEnum(): return StringToEnum("InversionDxmin")[0]
     144def InversionEpsrelEnum(): return StringToEnum("InversionEpsrel")[0]
    143145def InversionNumControlParametersEnum(): return StringToEnum("InversionNumControlParameters")[0]
    144146def InversionNumCostFunctionsEnum(): return StringToEnum("InversionNumCostFunctions")[0]
    145147def InversionStepThresholdEnum(): return StringToEnum("InversionStepThreshold")[0]

  • ../trunk-jpl/src/m/enum/InversionEpsrelEnum.m

     
     1function macro=InversionEpsrelEnum()
     2%INVERSIONEPSRELENUM - Enum of InversionEpsrel
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=InversionEpsrelEnum()
     10
     11macro=StringToEnum('InversionEpsrel');
Note: See TracBrowser for help on using the repository browser.