Changeset 19825


Ignore:
Timestamp:
11/27/15 04:15:48 (9 years ago)
Author:
cborstad
Message:

NEW: enabled effective deviatoric stress as a requested output

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Element.cpp

    r19613 r19825  
    19251925                        case DeviatoricStressyzEnum:
    19261926                        case DeviatoricStresszzEnum:
     1927                        case DeviatoricStresseffectiveEnum:
    19271928                                this->ComputeDeviatoricStressTensor();
    19281929                                input=this->inputs->GetInput(output_enum);

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r19764 r19825  
    549549        IssmDouble      tau_xz[NUMVERTICES]={0,0,0};
    550550        IssmDouble      tau_yz[NUMVERTICES]={0,0,0};
     551        IssmDouble  tau_e[NUMVERTICES];
    551552        GaussTria*  gauss=NULL;
    552553        int domaintype,dim=2;
    … …  
    574575                tau_yy[iv]=2*viscosity*epsilon[1];
    575576                tau_xy[iv]=2*viscosity*epsilon[2];
     577                tau_e[iv]=1/sqrt(2)*sqrt(pow(tau_xx[iv],2)+pow(tau_yy[iv],2)+2*pow(tau_xy[iv],2));
    576578        }
    577579
    … …  
    583585        this->inputs->AddInput(new TriaInput(DeviatoricStressyzEnum,&tau_yz[0],P1Enum));
    584586        this->inputs->AddInput(new TriaInput(DeviatoricStresszzEnum,&tau_zz[0],P1Enum));
     587        this->inputs->AddInput(new TriaInput(DeviatoricStresseffectiveEnum,&tau_e[0],P1Enum));
    585588
    586589        /*Clean up and return*/

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

    r19804 r19825  
    717717        DeviatoricStressyzEnum,
    718718        DeviatoricStresszzEnum,
     719        DeviatoricStresseffectiveEnum,
    719720        StrainRateEnum,
    720721        StrainRatexxEnum,

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

    r19804 r19825  
    703703                case DeviatoricStressyzEnum : return "DeviatoricStressyz";
    704704                case DeviatoricStresszzEnum : return "DeviatoricStresszz";
     705                case DeviatoricStresseffectiveEnum : return "DeviatoricStresseffective";
    705706                case StrainRateEnum : return "StrainRate";
    706707                case StrainRatexxEnum : return "StrainRatexx";

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

    r19804 r19825  
    718718              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    719719              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
     720              else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum;
    720721              else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
    721722              else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
    … …  
    751752              else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;
    752753              else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
    753               else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
     757              if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
     758              else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
    758759              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    759760              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
    … …  
    874875              else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum;
    875876              else if (strcmp(name,"MisfitDefinitionenum")==0) return MisfitDefinitionenumEnum;
    876               else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
     880              if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
     881              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
    881882              else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
    882883              else if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum;

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

    r19809 r19825  
    688688function DeviatoricStressyzEnum(){ return 684;}
    689689function DeviatoricStresszzEnum(){ return 685;}
    690 function StrainRateEnum(){ return 686;}
    691 function StrainRatexxEnum(){ return 687;}
    692 function StrainRatexyEnum(){ return 688;}
    693 function StrainRatexzEnum(){ return 689;}
    694 function StrainRateyyEnum(){ return 690;}
    695 function StrainRateyzEnum(){ return 691;}
    696 function StrainRatezzEnum(){ return 692;}
    697 function DivergenceEnum(){ return 693;}
    698 function MaxDivergenceEnum(){ return 694;}
    699 function GiaCrossSectionShapeEnum(){ return 695;}
    700 function GiadWdtEnum(){ return 696;}
    701 function GiaWEnum(){ return 697;}
    702 function P0Enum(){ return 698;}
    703 function P0ArrayEnum(){ return 699;}
    704 function P1Enum(){ return 700;}
    705 function P1DGEnum(){ return 701;}
    706 function P1bubbleEnum(){ return 702;}
    707 function P1bubblecondensedEnum(){ return 703;}
    708 function P2Enum(){ return 704;}
    709 function P2bubbleEnum(){ return 705;}
    710 function P2bubblecondensedEnum(){ return 706;}
    711 function P2xP1Enum(){ return 707;}
    712 function P1xP2Enum(){ return 708;}
    713 function P1xP3Enum(){ return 709;}
    714 function P2xP4Enum(){ return 710;}
    715 function P1P1Enum(){ return 711;}
    716 function P1P1GLSEnum(){ return 712;}
    717 function MINIEnum(){ return 713;}
    718 function MINIcondensedEnum(){ return 714;}
    719 function TaylorHoodEnum(){ return 715;}
    720 function LATaylorHoodEnum(){ return 716;}
    721 function XTaylorHoodEnum(){ return 717;}
    722 function OneLayerP4zEnum(){ return 718;}
    723 function CrouzeixRaviartEnum(){ return 719;}
    724 function LACrouzeixRaviartEnum(){ return 720;}
    725 function SaveResultsEnum(){ return 721;}
    726 function BoolExternalResultEnum(){ return 722;}
    727 function DoubleExternalResultEnum(){ return 723;}
    728 function DoubleMatExternalResultEnum(){ return 724;}
    729 function IntExternalResultEnum(){ return 725;}
    730 function JEnum(){ return 726;}
    731 function StringExternalResultEnum(){ return 727;}
    732 function StepEnum(){ return 728;}
    733 function TimeEnum(){ return 729;}
    734 function WaterColumnOldEnum(){ return 730;}
    735 function OutputdefinitionEnum(){ return 731;}
    736 function Outputdefinition1Enum(){ return 732;}
    737 function Outputdefinition2Enum(){ return 733;}
    738 function Outputdefinition3Enum(){ return 734;}
    739 function Outputdefinition4Enum(){ return 735;}
    740 function Outputdefinition5Enum(){ return 736;}
    741 function Outputdefinition6Enum(){ return 737;}
    742 function Outputdefinition7Enum(){ return 738;}
    743 function Outputdefinition8Enum(){ return 739;}
    744 function Outputdefinition9Enum(){ return 740;}
    745 function Outputdefinition10Enum(){ return 741;}
    746 function Outputdefinition11Enum(){ return 742;}
    747 function Outputdefinition12Enum(){ return 743;}
    748 function Outputdefinition13Enum(){ return 744;}
    749 function Outputdefinition14Enum(){ return 745;}
    750 function Outputdefinition15Enum(){ return 746;}
    751 function Outputdefinition16Enum(){ return 747;}
    752 function Outputdefinition17Enum(){ return 748;}
    753 function Outputdefinition18Enum(){ return 749;}
    754 function Outputdefinition19Enum(){ return 750;}
    755 function Outputdefinition20Enum(){ return 751;}
    756 function Outputdefinition21Enum(){ return 752;}
    757 function Outputdefinition22Enum(){ return 753;}
    758 function Outputdefinition23Enum(){ return 754;}
    759 function Outputdefinition24Enum(){ return 755;}
    760 function Outputdefinition25Enum(){ return 756;}
    761 function Outputdefinition26Enum(){ return 757;}
    762 function Outputdefinition27Enum(){ return 758;}
    763 function Outputdefinition28Enum(){ return 759;}
    764 function Outputdefinition29Enum(){ return 760;}
    765 function Outputdefinition30Enum(){ return 761;}
    766 function Outputdefinition31Enum(){ return 762;}
    767 function Outputdefinition32Enum(){ return 763;}
    768 function Outputdefinition33Enum(){ return 764;}
    769 function Outputdefinition34Enum(){ return 765;}
    770 function Outputdefinition35Enum(){ return 766;}
    771 function Outputdefinition36Enum(){ return 767;}
    772 function Outputdefinition37Enum(){ return 768;}
    773 function Outputdefinition38Enum(){ return 769;}
    774 function Outputdefinition39Enum(){ return 770;}
    775 function Outputdefinition40Enum(){ return 771;}
    776 function Outputdefinition41Enum(){ return 772;}
    777 function Outputdefinition42Enum(){ return 773;}
    778 function Outputdefinition43Enum(){ return 774;}
    779 function Outputdefinition44Enum(){ return 775;}
    780 function Outputdefinition45Enum(){ return 776;}
    781 function Outputdefinition46Enum(){ return 777;}
    782 function Outputdefinition47Enum(){ return 778;}
    783 function Outputdefinition48Enum(){ return 779;}
    784 function Outputdefinition49Enum(){ return 780;}
    785 function Outputdefinition50Enum(){ return 781;}
    786 function Outputdefinition51Enum(){ return 782;}
    787 function Outputdefinition52Enum(){ return 783;}
    788 function Outputdefinition53Enum(){ return 784;}
    789 function Outputdefinition54Enum(){ return 785;}
    790 function Outputdefinition55Enum(){ return 786;}
    791 function Outputdefinition56Enum(){ return 787;}
    792 function Outputdefinition57Enum(){ return 788;}
    793 function Outputdefinition58Enum(){ return 789;}
    794 function Outputdefinition59Enum(){ return 790;}
    795 function Outputdefinition60Enum(){ return 791;}
    796 function Outputdefinition61Enum(){ return 792;}
    797 function Outputdefinition62Enum(){ return 793;}
    798 function Outputdefinition63Enum(){ return 794;}
    799 function Outputdefinition64Enum(){ return 795;}
    800 function Outputdefinition65Enum(){ return 796;}
    801 function Outputdefinition66Enum(){ return 797;}
    802 function Outputdefinition67Enum(){ return 798;}
    803 function Outputdefinition68Enum(){ return 799;}
    804 function Outputdefinition69Enum(){ return 800;}
    805 function Outputdefinition70Enum(){ return 801;}
    806 function Outputdefinition71Enum(){ return 802;}
    807 function Outputdefinition72Enum(){ return 803;}
    808 function Outputdefinition73Enum(){ return 804;}
    809 function Outputdefinition74Enum(){ return 805;}
    810 function Outputdefinition75Enum(){ return 806;}
    811 function Outputdefinition76Enum(){ return 807;}
    812 function Outputdefinition77Enum(){ return 808;}
    813 function Outputdefinition78Enum(){ return 809;}
    814 function Outputdefinition79Enum(){ return 810;}
    815 function Outputdefinition80Enum(){ return 811;}
    816 function Outputdefinition81Enum(){ return 812;}
    817 function Outputdefinition82Enum(){ return 813;}
    818 function Outputdefinition83Enum(){ return 814;}
    819 function Outputdefinition84Enum(){ return 815;}
    820 function Outputdefinition85Enum(){ return 816;}
    821 function Outputdefinition86Enum(){ return 817;}
    822 function Outputdefinition87Enum(){ return 818;}
    823 function Outputdefinition88Enum(){ return 819;}
    824 function Outputdefinition89Enum(){ return 820;}
    825 function Outputdefinition90Enum(){ return 821;}
    826 function Outputdefinition91Enum(){ return 822;}
    827 function Outputdefinition92Enum(){ return 823;}
    828 function Outputdefinition93Enum(){ return 824;}
    829 function Outputdefinition94Enum(){ return 825;}
    830 function Outputdefinition95Enum(){ return 826;}
    831 function Outputdefinition96Enum(){ return 827;}
    832 function Outputdefinition97Enum(){ return 828;}
    833 function Outputdefinition98Enum(){ return 829;}
    834 function Outputdefinition99Enum(){ return 830;}
    835 function Outputdefinition100Enum(){ return 831;}
    836 function OutputdefinitionListEnum(){ return 832;}
    837 function MassfluxatgateEnum(){ return 833;}
    838 function MassfluxatgateNameEnum(){ return 834;}
    839 function MassfluxatgateDefinitionenumEnum(){ return 835;}
    840 function MassfluxatgateSegmentsEnum(){ return 836;}
    841 function MisfitNameEnum(){ return 837;}
    842 function MisfitDefinitionenumEnum(){ return 838;}
    843 function MisfitModelEnum(){ return 839;}
    844 function MisfitObservationEnum(){ return 840;}
     690function DeviatoricStresseffectiveEnum(){ return 686;}
     691function StrainRateEnum(){ return 687;}
     692function StrainRatexxEnum(){ return 688;}
     693function StrainRatexyEnum(){ return 689;}
     694function StrainRatexzEnum(){ return 690;}
     695function StrainRateyyEnum(){ return 691;}
     696function StrainRateyzEnum(){ return 692;}
     697function StrainRatezzEnum(){ return 693;}
     698function DivergenceEnum(){ return 694;}
     699function MaxDivergenceEnum(){ return 695;}
     700function GiaCrossSectionShapeEnum(){ return 696;}
     701function GiadWdtEnum(){ return 697;}
     702function GiaWEnum(){ return 698;}
     703function P0Enum(){ return 699;}
     704function P0ArrayEnum(){ return 700;}
     705function P1Enum(){ return 701;}
     706function P1DGEnum(){ return 702;}
     707function P1bubbleEnum(){ return 703;}
     708function P1bubblecondensedEnum(){ return 704;}
     709function P2Enum(){ return 705;}
     710function P2bubbleEnum(){ return 706;}
     711function P2bubblecondensedEnum(){ return 707;}
     712function P2xP1Enum(){ return 708;}
     713function P1xP2Enum(){ return 709;}
     714function P1xP3Enum(){ return 710;}
     715function P2xP4Enum(){ return 711;}
     716function P1P1Enum(){ return 712;}
     717function P1P1GLSEnum(){ return 713;}
     718function MINIEnum(){ return 714;}
     719function MINIcondensedEnum(){ return 715;}
     720function TaylorHoodEnum(){ return 716;}
     721function LATaylorHoodEnum(){ return 717;}
     722function XTaylorHoodEnum(){ return 718;}
     723function OneLayerP4zEnum(){ return 719;}
     724function CrouzeixRaviartEnum(){ return 720;}
     725function LACrouzeixRaviartEnum(){ return 721;}
     726function SaveResultsEnum(){ return 722;}
     727function BoolExternalResultEnum(){ return 723;}
     728function DoubleExternalResultEnum(){ return 724;}
     729function DoubleMatExternalResultEnum(){ return 725;}
     730function IntExternalResultEnum(){ return 726;}
     731function JEnum(){ return 727;}
     732function StringExternalResultEnum(){ return 728;}
     733function StepEnum(){ return 729;}
     734function TimeEnum(){ return 730;}
     735function WaterColumnOldEnum(){ return 731;}
     736function OutputdefinitionEnum(){ return 732;}
     737function Outputdefinition1Enum(){ return 733;}
     738function Outputdefinition2Enum(){ return 734;}
     739function Outputdefinition3Enum(){ return 735;}
     740function Outputdefinition4Enum(){ return 736;}
     741function Outputdefinition5Enum(){ return 737;}
     742function Outputdefinition6Enum(){ return 738;}
     743function Outputdefinition7Enum(){ return 739;}
     744function Outputdefinition8Enum(){ return 740;}
     745function Outputdefinition9Enum(){ return 741;}
     746function Outputdefinition10Enum(){ return 742;}
     747function Outputdefinition11Enum(){ return 743;}
     748function Outputdefinition12Enum(){ return 744;}
     749function Outputdefinition13Enum(){ return 745;}
     750function Outputdefinition14Enum(){ return 746;}
     751function Outputdefinition15Enum(){ return 747;}
     752function Outputdefinition16Enum(){ return 748;}
     753function Outputdefinition17Enum(){ return 749;}
     754function Outputdefinition18Enum(){ return 750;}
     755function Outputdefinition19Enum(){ return 751;}
     756function Outputdefinition20Enum(){ return 752;}
     757function Outputdefinition21Enum(){ return 753;}
     758function Outputdefinition22Enum(){ return 754;}
     759function Outputdefinition23Enum(){ return 755;}
     760function Outputdefinition24Enum(){ return 756;}
     761function Outputdefinition25Enum(){ return 757;}
     762function Outputdefinition26Enum(){ return 758;}
     763function Outputdefinition27Enum(){ return 759;}
     764function Outputdefinition28Enum(){ return 760;}
     765function Outputdefinition29Enum(){ return 761;}
     766function Outputdefinition30Enum(){ return 762;}
     767function Outputdefinition31Enum(){ return 763;}
     768function Outputdefinition32Enum(){ return 764;}
     769function Outputdefinition33Enum(){ return 765;}
     770function Outputdefinition34Enum(){ return 766;}
     771function Outputdefinition35Enum(){ return 767;}
     772function Outputdefinition36Enum(){ return 768;}
     773function Outputdefinition37Enum(){ return 769;}
     774function Outputdefinition38Enum(){ return 770;}
     775function Outputdefinition39Enum(){ return 771;}
     776function Outputdefinition40Enum(){ return 772;}
     777function Outputdefinition41Enum(){ return 773;}
     778function Outputdefinition42Enum(){ return 774;}
     779function Outputdefinition43Enum(){ return 775;}
     780function Outputdefinition44Enum(){ return 776;}
     781function Outputdefinition45Enum(){ return 777;}
     782function Outputdefinition46Enum(){ return 778;}
     783function Outputdefinition47Enum(){ return 779;}
     784function Outputdefinition48Enum(){ return 780;}
     785function Outputdefinition49Enum(){ return 781;}
     786function Outputdefinition50Enum(){ return 782;}
     787function Outputdefinition51Enum(){ return 783;}
     788function Outputdefinition52Enum(){ return 784;}
     789function Outputdefinition53Enum(){ return 785;}
     790function Outputdefinition54Enum(){ return 786;}
     791function Outputdefinition55Enum(){ return 787;}
     792function Outputdefinition56Enum(){ return 788;}
     793function Outputdefinition57Enum(){ return 789;}
     794function Outputdefinition58Enum(){ return 790;}
     795function Outputdefinition59Enum(){ return 791;}
     796function Outputdefinition60Enum(){ return 792;}
     797function Outputdefinition61Enum(){ return 793;}
     798function Outputdefinition62Enum(){ return 794;}
     799function Outputdefinition63Enum(){ return 795;}
     800function Outputdefinition64Enum(){ return 796;}
     801function Outputdefinition65Enum(){ return 797;}
     802function Outputdefinition66Enum(){ return 798;}
     803function Outputdefinition67Enum(){ return 799;}
     804function Outputdefinition68Enum(){ return 800;}
     805function Outputdefinition69Enum(){ return 801;}
     806function Outputdefinition70Enum(){ return 802;}
     807function Outputdefinition71Enum(){ return 803;}
     808function Outputdefinition72Enum(){ return 804;}
     809function Outputdefinition73Enum(){ return 805;}
     810function Outputdefinition74Enum(){ return 806;}
     811function Outputdefinition75Enum(){ return 807;}
     812function Outputdefinition76Enum(){ return 808;}
     813function Outputdefinition77Enum(){ return 809;}
     814function Outputdefinition78Enum(){ return 810;}
     815function Outputdefinition79Enum(){ return 811;}
     816function Outputdefinition80Enum(){ return 812;}
     817function Outputdefinition81Enum(){ return 813;}
     818function Outputdefinition82Enum(){ return 814;}
     819function Outputdefinition83Enum(){ return 815;}
     820function Outputdefinition84Enum(){ return 816;}
     821function Outputdefinition85Enum(){ return 817;}
     822function Outputdefinition86Enum(){ return 818;}
     823function Outputdefinition87Enum(){ return 819;}
     824function Outputdefinition88Enum(){ return 820;}
     825function Outputdefinition89Enum(){ return 821;}
     826function Outputdefinition90Enum(){ return 822;}
     827function Outputdefinition91Enum(){ return 823;}
     828function Outputdefinition92Enum(){ return 824;}
     829function Outputdefinition93Enum(){ return 825;}
     830function Outputdefinition94Enum(){ return 826;}
     831function Outputdefinition95Enum(){ return 827;}
     832function Outputdefinition96Enum(){ return 828;}
     833function Outputdefinition97Enum(){ return 829;}
     834function Outputdefinition98Enum(){ return 830;}
     835function Outputdefinition99Enum(){ return 831;}
     836function Outputdefinition100Enum(){ return 832;}
     837function OutputdefinitionListEnum(){ return 833;}
     838function MassfluxatgateEnum(){ return 834;}
     839function MassfluxatgateNameEnum(){ return 835;}
     840function MassfluxatgateDefinitionenumEnum(){ return 836;}
     841function MassfluxatgateSegmentsEnum(){ return 837;}
     842function MisfitNameEnum(){ return 838;}
     843function MisfitDefinitionenumEnum(){ return 839;}
     844function MisfitModelEnum(){ return 840;}
    845845function MisfitObservationEnum(){ return 841;}
    846 function MisfitLocalEnum(){ return 842;}
    847 function MisfitTimeinterpolationEnum(){ return 843;}
    848 function MisfitWeightsEnum(){ return 844;}
     846function MisfitObservationEnum(){ return 842;}
     847function MisfitLocalEnum(){ return 843;}
     848function MisfitTimeinterpolationEnum(){ return 844;}
    849849function MisfitWeightsEnum(){ return 845;}
    850 function SurfaceObservationEnum(){ return 846;}
    851 function WeightsSurfaceObservationEnum(){ return 847;}
    852 function VxObsEnum(){ return 848;}
    853 function WeightsVxObsEnum(){ return 849;}
    854 function VyObsEnum(){ return 850;}
    855 function WeightsVyObsEnum(){ return 851;}
    856 function MinVelEnum(){ return 852;}
    857 function MaxVelEnum(){ return 853;}
    858 function MinVxEnum(){ return 854;}
    859 function MaxVxEnum(){ return 855;}
    860 function MaxAbsVxEnum(){ return 856;}
    861 function MinVyEnum(){ return 857;}
    862 function MaxVyEnum(){ return 858;}
    863 function MaxAbsVyEnum(){ return 859;}
    864 function MinVzEnum(){ return 860;}
    865 function MaxVzEnum(){ return 861;}
    866 function MaxAbsVzEnum(){ return 862;}
    867 function FloatingAreaEnum(){ return 863;}
    868 function GroundedAreaEnum(){ return 864;}
    869 function IceMassEnum(){ return 865;}
    870 function IceVolumeEnum(){ return 866;}
    871 function IceVolumeAboveFloatationEnum(){ return 867;}
    872 function TotalSmbEnum(){ return 868;}
    873 function AbsoluteEnum(){ return 869;}
    874 function IncrementalEnum(){ return 870;}
    875 function AugmentedLagrangianREnum(){ return 871;}
    876 function AugmentedLagrangianRhopEnum(){ return 872;}
    877 function AugmentedLagrangianRlambdaEnum(){ return 873;}
    878 function AugmentedLagrangianRholambdaEnum(){ return 874;}
    879 function AugmentedLagrangianThetaEnum(){ return 875;}
    880 function NoneEnum(){ return 876;}
    881 function AggressiveMigrationEnum(){ return 877;}
    882 function SoftMigrationEnum(){ return 878;}
    883 function SubelementMigrationEnum(){ return 879;}
    884 function SubelementMigration2Enum(){ return 880;}
    885 function ContactEnum(){ return 881;}
    886 function GroundingOnlyEnum(){ return 882;}
    887 function MaskGroundediceLevelsetEnum(){ return 883;}
    888 function GaussSegEnum(){ return 884;}
    889 function GaussTriaEnum(){ return 885;}
    890 function GaussTetraEnum(){ return 886;}
    891 function GaussPentaEnum(){ return 887;}
    892 function FSSolverEnum(){ return 888;}
    893 function AdjointEnum(){ return 889;}
    894 function ColinearEnum(){ return 890;}
    895 function ControlSteadyEnum(){ return 891;}
    896 function FsetEnum(){ return 892;}
    897 function Gradient1Enum(){ return 893;}
    898 function Gradient2Enum(){ return 894;}
    899 function Gradient3Enum(){ return 895;}
    900 function GradientEnum(){ return 896;}
    901 function GroundinglineMigrationEnum(){ return 897;}
    902 function GsetEnum(){ return 898;}
    903 function IndexEnum(){ return 899;}
    904 function IndexedEnum(){ return 900;}
    905 function IntersectEnum(){ return 901;}
    906 function NodalEnum(){ return 902;}
    907 function OldGradientEnum(){ return 903;}
    908 function OutputBufferPointerEnum(){ return 904;}
    909 function OutputBufferSizePointerEnum(){ return 905;}
    910 function OutputFilePointerEnum(){ return 906;}
    911 function ToolkitsFileNameEnum(){ return 907;}
    912 function RootPathEnum(){ return 908;}
    913 function OutputFileNameEnum(){ return 909;}
    914 function InputFileNameEnum(){ return 910;}
    915 function LockFileNameEnum(){ return 911;}
    916 function RestartFileNameEnum(){ return 912;}
    917 function ToolkitsOptionsAnalysesEnum(){ return 913;}
    918 function ToolkitsOptionsStringsEnum(){ return 914;}
    919 function QmuErrNameEnum(){ return 915;}
    920 function QmuInNameEnum(){ return 916;}
    921 function QmuOutNameEnum(){ return 917;}
    922 function RegularEnum(){ return 918;}
    923 function ScaledEnum(){ return 919;}
    924 function SeparateEnum(){ return 920;}
    925 function SsetEnum(){ return 921;}
    926 function VerboseEnum(){ return 922;}
    927 function TriangleInterpEnum(){ return 923;}
    928 function BilinearInterpEnum(){ return 924;}
    929 function NearestInterpEnum(){ return 925;}
    930 function XYEnum(){ return 926;}
    931 function XYZEnum(){ return 927;}
    932 function DenseEnum(){ return 928;}
    933 function MpiDenseEnum(){ return 929;}
    934 function MpiSparseEnum(){ return 930;}
    935 function SeqEnum(){ return 931;}
    936 function MpiEnum(){ return 932;}
    937 function MumpsEnum(){ return 933;}
    938 function GslEnum(){ return 934;}
    939 function OptionEnum(){ return 935;}
    940 function GenericOptionEnum(){ return 936;}
    941 function OptionCellEnum(){ return 937;}
    942 function OptionStructEnum(){ return 938;}
    943 function CuffeyEnum(){ return 939;}
    944 function PatersonEnum(){ return 940;}
    945 function ArrheniusEnum(){ return 941;}
    946 function LliboutryDuvalEnum(){ return 942;}
    947 function TransientIslevelsetEnum(){ return 943;}
    948 function SpcLevelsetEnum(){ return 944;}
    949 function ExtrapolationVariableEnum(){ return 945;}
    950 function IceMaskNodeActivationEnum(){ return 946;}
    951 function LevelsetfunctionSlopeXEnum(){ return 947;}
    952 function LevelsetfunctionSlopeYEnum(){ return 948;}
    953 function LevelsetfunctionPicardEnum(){ return 949;}
    954 function MaximumNumberOfDefinitionsEnum(){ return 950;}
     850function MisfitWeightsEnum(){ return 846;}
     851function SurfaceObservationEnum(){ return 847;}
     852function WeightsSurfaceObservationEnum(){ return 848;}
     853function VxObsEnum(){ return 849;}
     854function WeightsVxObsEnum(){ return 850;}
     855function VyObsEnum(){ return 851;}
     856function WeightsVyObsEnum(){ return 852;}
     857function MinVelEnum(){ return 853;}
     858function MaxVelEnum(){ return 854;}
     859function MinVxEnum(){ return 855;}
     860function MaxVxEnum(){ return 856;}
     861function MaxAbsVxEnum(){ return 857;}
     862function MinVyEnum(){ return 858;}
     863function MaxVyEnum(){ return 859;}
     864function MaxAbsVyEnum(){ return 860;}
     865function MinVzEnum(){ return 861;}
     866function MaxVzEnum(){ return 862;}
     867function MaxAbsVzEnum(){ return 863;}
     868function FloatingAreaEnum(){ return 864;}
     869function GroundedAreaEnum(){ return 865;}
     870function IceMassEnum(){ return 866;}
     871function IceVolumeEnum(){ return 867;}
     872function IceVolumeAboveFloatationEnum(){ return 868;}
     873function TotalSmbEnum(){ return 869;}
     874function AbsoluteEnum(){ return 870;}
     875function IncrementalEnum(){ return 871;}
     876function AugmentedLagrangianREnum(){ return 872;}
     877function AugmentedLagrangianRhopEnum(){ return 873;}
     878function AugmentedLagrangianRlambdaEnum(){ return 874;}
     879function AugmentedLagrangianRholambdaEnum(){ return 875;}
     880function AugmentedLagrangianThetaEnum(){ return 876;}
     881function NoneEnum(){ return 877;}
     882function AggressiveMigrationEnum(){ return 878;}
     883function SoftMigrationEnum(){ return 879;}
     884function SubelementMigrationEnum(){ return 880;}
     885function SubelementMigration2Enum(){ return 881;}
     886function ContactEnum(){ return 882;}
     887function GroundingOnlyEnum(){ return 883;}
     888function MaskGroundediceLevelsetEnum(){ return 884;}
     889function GaussSegEnum(){ return 885;}
     890function GaussTriaEnum(){ return 886;}
     891function GaussTetraEnum(){ return 887;}
     892function GaussPentaEnum(){ return 888;}
     893function FSSolverEnum(){ return 889;}
     894function AdjointEnum(){ return 890;}
     895function ColinearEnum(){ return 891;}
     896function ControlSteadyEnum(){ return 892;}
     897function FsetEnum(){ return 893;}
     898function Gradient1Enum(){ return 894;}
     899function Gradient2Enum(){ return 895;}
     900function Gradient3Enum(){ return 896;}
     901function GradientEnum(){ return 897;}
     902function GroundinglineMigrationEnum(){ return 898;}
     903function GsetEnum(){ return 899;}
     904function IndexEnum(){ return 900;}
     905function IndexedEnum(){ return 901;}
     906function IntersectEnum(){ return 902;}
     907function NodalEnum(){ return 903;}
     908function OldGradientEnum(){ return 904;}
     909function OutputBufferPointerEnum(){ return 905;}
     910function OutputBufferSizePointerEnum(){ return 906;}
     911function OutputFilePointerEnum(){ return 907;}
     912function ToolkitsFileNameEnum(){ return 908;}
     913function RootPathEnum(){ return 909;}
     914function OutputFileNameEnum(){ return 910;}
     915function InputFileNameEnum(){ return 911;}
     916function LockFileNameEnum(){ return 912;}
     917function RestartFileNameEnum(){ return 913;}
     918function ToolkitsOptionsAnalysesEnum(){ return 914;}
     919function ToolkitsOptionsStringsEnum(){ return 915;}
     920function QmuErrNameEnum(){ return 916;}
     921function QmuInNameEnum(){ return 917;}
     922function QmuOutNameEnum(){ return 918;}
     923function RegularEnum(){ return 919;}
     924function ScaledEnum(){ return 920;}
     925function SeparateEnum(){ return 921;}
     926function SsetEnum(){ return 922;}
     927function VerboseEnum(){ return 923;}
     928function TriangleInterpEnum(){ return 924;}
     929function BilinearInterpEnum(){ return 925;}
     930function NearestInterpEnum(){ return 926;}
     931function XYEnum(){ return 927;}
     932function XYZEnum(){ return 928;}
     933function DenseEnum(){ return 929;}
     934function MpiDenseEnum(){ return 930;}
     935function MpiSparseEnum(){ return 931;}
     936function SeqEnum(){ return 932;}
     937function MpiEnum(){ return 933;}
     938function MumpsEnum(){ return 934;}
     939function GslEnum(){ return 935;}
     940function OptionEnum(){ return 936;}
     941function GenericOptionEnum(){ return 937;}
     942function OptionCellEnum(){ return 938;}
     943function OptionStructEnum(){ return 939;}
     944function CuffeyEnum(){ return 940;}
     945function PatersonEnum(){ return 941;}
     946function ArrheniusEnum(){ return 942;}
     947function LliboutryDuvalEnum(){ return 943;}
     948function TransientIslevelsetEnum(){ return 944;}
     949function SpcLevelsetEnum(){ return 945;}
     950function ExtrapolationVariableEnum(){ return 946;}
     951function IceMaskNodeActivationEnum(){ return 947;}
     952function LevelsetfunctionSlopeXEnum(){ return 948;}
     953function LevelsetfunctionSlopeYEnum(){ return 949;}
     954function LevelsetfunctionPicardEnum(){ return 950;}
     955function MaximumNumberOfDefinitionsEnum(){ return 951;}

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

    r19809 r19825  
    695695def DeviatoricStressyzEnum(): return StringToEnum("DeviatoricStressyz")[0]
    696696def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0]
     697def DeviatoricStresseffectiveEnum(): return StringToEnum("DeviatoricStresseffective")[0]
    697698def StrainRateEnum(): return StringToEnum("StrainRate")[0]
    698699def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0]
Note: See TracChangeset for help on using the changeset viewer.