Changeset 6099


Ignore:
Timestamp:
09/30/10 09:56:32 (14 years ago)
Author:
Mathieu Morlighem
Message:

removed some enums

Location:
issm/trunk/src/c/EnumDefinitions
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r6079 r6099  
    174174        ConvergedEnum,
    175175        DhDtEnum,
    176         DhDtObsEnum,
    177176        DragCoefficientEnum,
    178177        DragPEnum,
     
    194193        ExtToIuEnum,
    195194        MassFluxEnum,
    196         DhDtAbsMisfitEnum,
    197195        ThicknessAbsMisfitEnum,
    198196        SurfaceAbsVelMisfitEnum,
  • issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp

    r5521 r6099  
    1818                case RheologyBbarEnum : return "rheology_B";
    1919                case DhDtEnum : return "dhdt";
     20                case VxEnum : return "vx";
    2021                case VxObsEnum : return "vx_obs";
     22                case VyEnum : return "vy";
    2123                case VyObsEnum : return "vy_obs";
    2224                default : ISSMERROR("No model field is associated to enum %s",EnumToString(en));
  • issm/trunk/src/c/EnumDefinitions/EnumToString.cpp

    r6079 r6099  
    148148                case ConvergedEnum : return "Converged";
    149149                case DhDtEnum : return "DhDt";
    150                 case DhDtObsEnum : return "DhDtObs";
    151150                case DragCoefficientEnum : return "DragCoefficient";
    152151                case DragPEnum : return "DragP";
     
    168167                case ExtToIuEnum : return "ExtToIu";
    169168                case MassFluxEnum : return "MassFlux";
    170                 case DhDtAbsMisfitEnum : return "DhDtAbsMisfit";
    171169                case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit";
    172170                case SurfaceAbsVelMisfitEnum : return "SurfaceAbsVelMisfit";
  • issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp

    r6079 r6099  
    146146        else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    147147        else if (strcmp(name,"DhDt")==0) return DhDtEnum;
    148         else if (strcmp(name,"DhDtObs")==0) return DhDtObsEnum;
    149148        else if (strcmp(name,"DragCoefficient")==0) return DragCoefficientEnum;
    150149        else if (strcmp(name,"DragP")==0) return DragPEnum;
     
    166165        else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
    167166        else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    168         else if (strcmp(name,"DhDtAbsMisfit")==0) return DhDtAbsMisfitEnum;
    169167        else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
    170168        else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
Note: See TracChangeset for help on using the changeset viewer.