Changeset 13318


Ignore:
Timestamp:
09/11/12 09:25:42 (13 years ago)
Author:
Eric.Larour
Message:

NEW: Added AutodiffFosForwardOutputEnum

Location:
issm/trunk-jpl/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

    r13283 r13318  
    1919        AutodiffJacobianEnum,
    2020        AutodiffXpEnum,
     21        AutodiffFosForwardOutputEnum,
    2122        BalancethicknessSpcthicknessEnum,
    2223        BalancethicknessStabilizationEnum,

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

    r13283 r13318  
    2424                case AutodiffJacobianEnum : return "AutodiffJacobian";
    2525                case AutodiffXpEnum : return "AutodiffXp";
     26                case AutodiffFosForwardOutputEnum : return "AutodiffFosForwardOutput";
    2627                case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
    2728                case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization";

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

    r13283 r13318  
    2525              else if (strcmp(name,"AutodiffJacobian")==0) return AutodiffJacobianEnum;
    2626              else if (strcmp(name,"AutodiffXp")==0) return AutodiffXpEnum;
     27              else if (strcmp(name,"AutodiffFosForwardOutput")==0) return AutodiffFosForwardOutputEnum;
    2728              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
    2829              else if (strcmp(name,"BalancethicknessStabilization")==0) return BalancethicknessStabilizationEnum;
    … …  
    137138              else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
    138139              else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum;
    139               else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
    140140         else stage=2;
    141141   }
    142142   if(stage==2){
    143               if (strcmp(name,"MeshX")==0) return MeshXEnum;
     143              if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
     144              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    144145              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    145146              else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
    … …  
    260261              else if (strcmp(name,"Loads")==0) return LoadsEnum;
    261262              else if (strcmp(name,"Materials")==0) return MaterialsEnum;
    262               else if (strcmp(name,"Nodes")==0) return NodesEnum;
    263263         else stage=3;
    264264   }
    265265   if(stage==3){
    266               if (strcmp(name,"Parameters")==0) return ParametersEnum;
     266              if (strcmp(name,"Nodes")==0) return NodesEnum;
     267              else if (strcmp(name,"Parameters")==0) return ParametersEnum;
    267268              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
    268269              else if (strcmp(name,"Results")==0) return ResultsEnum;
    … …  
    383384              else if (strcmp(name,"Vz")==0) return VzEnum;
    384385              else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum;
    385               else if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
    386386         else stage=4;
    387387   }
    388388   if(stage==4){
    389               if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
     389              if (strcmp(name,"VzPattyn")==0) return VzPattynEnum;
     390              else if (strcmp(name,"VzPicard")==0) return VzPicardEnum;
    390391              else if (strcmp(name,"VzStokes")==0) return VzStokesEnum;
    391392              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;

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

    r13283 r13318  
    7979        return StringToEnum('AutodiffXp')[0]
    8080
     81def AutodiffFosForwardOutputEnum():
     82        """
     83        AUTODIFFFOSFORWARDOUTPUTENUM - Enum of AutodiffFosForwardOutput
     84
     85           Usage:
     86              macro=AutodiffFosForwardOutputEnum()
     87        """
     88
     89        return StringToEnum('AutodiffFosForwardOutput')[0]
     90
    8191def BalancethicknessSpcthicknessEnum():
    8292        """
    … …  
    47374747        """
    47384748
    4739         return 472
    4740 
     4749        return 473
     4750

  • issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

    r13283 r13318  
    99%      macro=MaximumNumberOfEnums()
    1010
    11 macro=472;
     11macro=473;
Note: See TracChangeset for help on using the changeset viewer.