Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 19824) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 19825) @@ -1925,4 +1925,5 @@ case DeviatoricStressyzEnum: case DeviatoricStresszzEnum: + case DeviatoricStresseffectiveEnum: this->ComputeDeviatoricStressTensor(); input=this->inputs->GetInput(output_enum); Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 19824) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 19825) @@ -549,4 +549,5 @@ IssmDouble tau_xz[NUMVERTICES]={0,0,0}; IssmDouble tau_yz[NUMVERTICES]={0,0,0}; + IssmDouble tau_e[NUMVERTICES]; GaussTria* gauss=NULL; int domaintype,dim=2; @@ -574,4 +575,5 @@ tau_yy[iv]=2*viscosity*epsilon[1]; tau_xy[iv]=2*viscosity*epsilon[2]; + tau_e[iv]=1/sqrt(2)*sqrt(pow(tau_xx[iv],2)+pow(tau_yy[iv],2)+2*pow(tau_xy[iv],2)); } @@ -583,4 +585,5 @@ this->inputs->AddInput(new TriaInput(DeviatoricStressyzEnum,&tau_yz[0],P1Enum)); this->inputs->AddInput(new TriaInput(DeviatoricStresszzEnum,&tau_zz[0],P1Enum)); + this->inputs->AddInput(new TriaInput(DeviatoricStresseffectiveEnum,&tau_e[0],P1Enum)); /*Clean up and return*/ Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 19824) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 19825) @@ -717,4 +717,5 @@ DeviatoricStressyzEnum, DeviatoricStresszzEnum, + DeviatoricStresseffectiveEnum, StrainRateEnum, StrainRatexxEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 19824) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 19825) @@ -703,4 +703,5 @@ case DeviatoricStressyzEnum : return "DeviatoricStressyz"; case DeviatoricStresszzEnum : return "DeviatoricStresszz"; + case DeviatoricStresseffectiveEnum : return "DeviatoricStresseffective"; case StrainRateEnum : return "StrainRate"; case StrainRatexxEnum : return "StrainRatexx"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 19824) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 19825) @@ -718,4 +718,5 @@ else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum; else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; + else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; else if (strcmp(name,"StrainRate")==0) return StrainRateEnum; else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum; @@ -751,9 +752,9 @@ else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum; else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum; - else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum; + if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum; + else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum; else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"MisfitName")==0) return MisfitNameEnum; else if (strcmp(name,"MisfitDefinitionenum")==0) return MisfitDefinitionenumEnum; - else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum; + if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum; + else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum; else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum; else if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum; Index: /issm/trunk-jpl/src/m/enum/DeviatoricStresseffectiveEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DeviatoricStresseffectiveEnum.m (revision 19825) +++ /issm/trunk-jpl/src/m/enum/DeviatoricStresseffectiveEnum.m (revision 19825) @@ -0,0 +1,11 @@ +function macro=DeviatoricStresseffectiveEnum() +%DEVIATORICSTRESSEFFECTIVEENUM - Enum of DeviatoricStresseffective +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=DeviatoricStresseffectiveEnum() + +macro=StringToEnum('DeviatoricStresseffective'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.js =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 19824) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 19825) @@ -688,267 +688,268 @@ function DeviatoricStressyzEnum(){ return 684;} function DeviatoricStresszzEnum(){ return 685;} -function StrainRateEnum(){ return 686;} -function StrainRatexxEnum(){ return 687;} -function StrainRatexyEnum(){ return 688;} -function StrainRatexzEnum(){ return 689;} -function StrainRateyyEnum(){ return 690;} -function StrainRateyzEnum(){ return 691;} -function StrainRatezzEnum(){ return 692;} -function DivergenceEnum(){ return 693;} -function MaxDivergenceEnum(){ return 694;} -function GiaCrossSectionShapeEnum(){ return 695;} -function GiadWdtEnum(){ return 696;} -function GiaWEnum(){ return 697;} -function P0Enum(){ return 698;} -function P0ArrayEnum(){ return 699;} -function P1Enum(){ return 700;} -function P1DGEnum(){ return 701;} -function P1bubbleEnum(){ return 702;} -function P1bubblecondensedEnum(){ return 703;} -function P2Enum(){ return 704;} -function P2bubbleEnum(){ return 705;} -function P2bubblecondensedEnum(){ return 706;} -function P2xP1Enum(){ return 707;} -function P1xP2Enum(){ return 708;} -function P1xP3Enum(){ return 709;} -function P2xP4Enum(){ return 710;} -function P1P1Enum(){ return 711;} -function P1P1GLSEnum(){ return 712;} -function MINIEnum(){ return 713;} -function MINIcondensedEnum(){ return 714;} -function TaylorHoodEnum(){ return 715;} -function LATaylorHoodEnum(){ return 716;} -function XTaylorHoodEnum(){ return 717;} -function OneLayerP4zEnum(){ return 718;} -function CrouzeixRaviartEnum(){ return 719;} -function LACrouzeixRaviartEnum(){ return 720;} -function SaveResultsEnum(){ return 721;} -function BoolExternalResultEnum(){ return 722;} -function DoubleExternalResultEnum(){ return 723;} -function DoubleMatExternalResultEnum(){ return 724;} -function IntExternalResultEnum(){ return 725;} -function JEnum(){ return 726;} -function StringExternalResultEnum(){ return 727;} -function StepEnum(){ return 728;} -function TimeEnum(){ return 729;} -function WaterColumnOldEnum(){ return 730;} -function OutputdefinitionEnum(){ return 731;} -function Outputdefinition1Enum(){ return 732;} -function Outputdefinition2Enum(){ return 733;} -function Outputdefinition3Enum(){ return 734;} -function Outputdefinition4Enum(){ return 735;} -function Outputdefinition5Enum(){ return 736;} -function Outputdefinition6Enum(){ return 737;} -function Outputdefinition7Enum(){ return 738;} -function Outputdefinition8Enum(){ return 739;} -function Outputdefinition9Enum(){ return 740;} -function Outputdefinition10Enum(){ return 741;} -function Outputdefinition11Enum(){ return 742;} -function Outputdefinition12Enum(){ return 743;} -function Outputdefinition13Enum(){ return 744;} -function Outputdefinition14Enum(){ return 745;} -function Outputdefinition15Enum(){ return 746;} -function Outputdefinition16Enum(){ return 747;} -function Outputdefinition17Enum(){ return 748;} -function Outputdefinition18Enum(){ return 749;} -function Outputdefinition19Enum(){ return 750;} -function Outputdefinition20Enum(){ return 751;} -function Outputdefinition21Enum(){ return 752;} -function Outputdefinition22Enum(){ return 753;} -function Outputdefinition23Enum(){ return 754;} -function Outputdefinition24Enum(){ return 755;} -function Outputdefinition25Enum(){ return 756;} -function Outputdefinition26Enum(){ return 757;} -function Outputdefinition27Enum(){ return 758;} -function Outputdefinition28Enum(){ return 759;} -function Outputdefinition29Enum(){ return 760;} -function Outputdefinition30Enum(){ return 761;} -function Outputdefinition31Enum(){ return 762;} -function Outputdefinition32Enum(){ return 763;} -function Outputdefinition33Enum(){ return 764;} -function Outputdefinition34Enum(){ return 765;} -function Outputdefinition35Enum(){ return 766;} -function Outputdefinition36Enum(){ return 767;} -function Outputdefinition37Enum(){ return 768;} -function Outputdefinition38Enum(){ return 769;} -function Outputdefinition39Enum(){ return 770;} -function Outputdefinition40Enum(){ return 771;} -function Outputdefinition41Enum(){ return 772;} -function Outputdefinition42Enum(){ return 773;} -function Outputdefinition43Enum(){ return 774;} -function Outputdefinition44Enum(){ return 775;} -function Outputdefinition45Enum(){ return 776;} -function Outputdefinition46Enum(){ return 777;} -function Outputdefinition47Enum(){ return 778;} -function Outputdefinition48Enum(){ return 779;} -function Outputdefinition49Enum(){ return 780;} -function Outputdefinition50Enum(){ return 781;} -function Outputdefinition51Enum(){ return 782;} -function Outputdefinition52Enum(){ return 783;} -function Outputdefinition53Enum(){ return 784;} -function Outputdefinition54Enum(){ return 785;} -function Outputdefinition55Enum(){ return 786;} -function Outputdefinition56Enum(){ return 787;} -function Outputdefinition57Enum(){ return 788;} -function Outputdefinition58Enum(){ return 789;} -function Outputdefinition59Enum(){ return 790;} -function Outputdefinition60Enum(){ return 791;} -function Outputdefinition61Enum(){ return 792;} -function Outputdefinition62Enum(){ return 793;} -function Outputdefinition63Enum(){ return 794;} -function Outputdefinition64Enum(){ return 795;} -function Outputdefinition65Enum(){ return 796;} -function Outputdefinition66Enum(){ return 797;} -function Outputdefinition67Enum(){ return 798;} -function Outputdefinition68Enum(){ return 799;} -function Outputdefinition69Enum(){ return 800;} -function Outputdefinition70Enum(){ return 801;} -function Outputdefinition71Enum(){ return 802;} -function Outputdefinition72Enum(){ return 803;} -function Outputdefinition73Enum(){ return 804;} -function Outputdefinition74Enum(){ return 805;} -function Outputdefinition75Enum(){ return 806;} -function Outputdefinition76Enum(){ return 807;} -function Outputdefinition77Enum(){ return 808;} -function Outputdefinition78Enum(){ return 809;} -function Outputdefinition79Enum(){ return 810;} -function Outputdefinition80Enum(){ return 811;} -function Outputdefinition81Enum(){ return 812;} -function Outputdefinition82Enum(){ return 813;} -function Outputdefinition83Enum(){ return 814;} -function Outputdefinition84Enum(){ return 815;} -function Outputdefinition85Enum(){ return 816;} -function Outputdefinition86Enum(){ return 817;} -function Outputdefinition87Enum(){ return 818;} -function Outputdefinition88Enum(){ return 819;} -function Outputdefinition89Enum(){ return 820;} -function Outputdefinition90Enum(){ return 821;} -function Outputdefinition91Enum(){ return 822;} -function Outputdefinition92Enum(){ return 823;} -function Outputdefinition93Enum(){ return 824;} -function Outputdefinition94Enum(){ return 825;} -function Outputdefinition95Enum(){ return 826;} -function Outputdefinition96Enum(){ return 827;} -function Outputdefinition97Enum(){ return 828;} -function Outputdefinition98Enum(){ return 829;} -function Outputdefinition99Enum(){ return 830;} -function Outputdefinition100Enum(){ return 831;} -function OutputdefinitionListEnum(){ return 832;} -function MassfluxatgateEnum(){ return 833;} -function MassfluxatgateNameEnum(){ return 834;} -function MassfluxatgateDefinitionenumEnum(){ return 835;} -function MassfluxatgateSegmentsEnum(){ return 836;} -function MisfitNameEnum(){ return 837;} -function MisfitDefinitionenumEnum(){ return 838;} -function MisfitModelEnum(){ return 839;} -function MisfitObservationEnum(){ return 840;} +function DeviatoricStresseffectiveEnum(){ return 686;} +function StrainRateEnum(){ return 687;} +function StrainRatexxEnum(){ return 688;} +function StrainRatexyEnum(){ return 689;} +function StrainRatexzEnum(){ return 690;} +function StrainRateyyEnum(){ return 691;} +function StrainRateyzEnum(){ return 692;} +function StrainRatezzEnum(){ return 693;} +function DivergenceEnum(){ return 694;} +function MaxDivergenceEnum(){ return 695;} +function GiaCrossSectionShapeEnum(){ return 696;} +function GiadWdtEnum(){ return 697;} +function GiaWEnum(){ return 698;} +function P0Enum(){ return 699;} +function P0ArrayEnum(){ return 700;} +function P1Enum(){ return 701;} +function P1DGEnum(){ return 702;} +function P1bubbleEnum(){ return 703;} +function P1bubblecondensedEnum(){ return 704;} +function P2Enum(){ return 705;} +function P2bubbleEnum(){ return 706;} +function P2bubblecondensedEnum(){ return 707;} +function P2xP1Enum(){ return 708;} +function P1xP2Enum(){ return 709;} +function P1xP3Enum(){ return 710;} +function P2xP4Enum(){ return 711;} +function P1P1Enum(){ return 712;} +function P1P1GLSEnum(){ return 713;} +function MINIEnum(){ return 714;} +function MINIcondensedEnum(){ return 715;} +function TaylorHoodEnum(){ return 716;} +function LATaylorHoodEnum(){ return 717;} +function XTaylorHoodEnum(){ return 718;} +function OneLayerP4zEnum(){ return 719;} +function CrouzeixRaviartEnum(){ return 720;} +function LACrouzeixRaviartEnum(){ return 721;} +function SaveResultsEnum(){ return 722;} +function BoolExternalResultEnum(){ return 723;} +function DoubleExternalResultEnum(){ return 724;} +function DoubleMatExternalResultEnum(){ return 725;} +function IntExternalResultEnum(){ return 726;} +function JEnum(){ return 727;} +function StringExternalResultEnum(){ return 728;} +function StepEnum(){ return 729;} +function TimeEnum(){ return 730;} +function WaterColumnOldEnum(){ return 731;} +function OutputdefinitionEnum(){ return 732;} +function Outputdefinition1Enum(){ return 733;} +function Outputdefinition2Enum(){ return 734;} +function Outputdefinition3Enum(){ return 735;} +function Outputdefinition4Enum(){ return 736;} +function Outputdefinition5Enum(){ return 737;} +function Outputdefinition6Enum(){ return 738;} +function Outputdefinition7Enum(){ return 739;} +function Outputdefinition8Enum(){ return 740;} +function Outputdefinition9Enum(){ return 741;} +function Outputdefinition10Enum(){ return 742;} +function Outputdefinition11Enum(){ return 743;} +function Outputdefinition12Enum(){ return 744;} +function Outputdefinition13Enum(){ return 745;} +function Outputdefinition14Enum(){ return 746;} +function Outputdefinition15Enum(){ return 747;} +function Outputdefinition16Enum(){ return 748;} +function Outputdefinition17Enum(){ return 749;} +function Outputdefinition18Enum(){ return 750;} +function Outputdefinition19Enum(){ return 751;} +function Outputdefinition20Enum(){ return 752;} +function Outputdefinition21Enum(){ return 753;} +function Outputdefinition22Enum(){ return 754;} +function Outputdefinition23Enum(){ return 755;} +function Outputdefinition24Enum(){ return 756;} +function Outputdefinition25Enum(){ return 757;} +function Outputdefinition26Enum(){ return 758;} +function Outputdefinition27Enum(){ return 759;} +function Outputdefinition28Enum(){ return 760;} +function Outputdefinition29Enum(){ return 761;} +function Outputdefinition30Enum(){ return 762;} +function Outputdefinition31Enum(){ return 763;} +function Outputdefinition32Enum(){ return 764;} +function Outputdefinition33Enum(){ return 765;} +function Outputdefinition34Enum(){ return 766;} +function Outputdefinition35Enum(){ return 767;} +function Outputdefinition36Enum(){ return 768;} +function Outputdefinition37Enum(){ return 769;} +function Outputdefinition38Enum(){ return 770;} +function Outputdefinition39Enum(){ return 771;} +function Outputdefinition40Enum(){ return 772;} +function Outputdefinition41Enum(){ return 773;} +function Outputdefinition42Enum(){ return 774;} +function Outputdefinition43Enum(){ return 775;} +function Outputdefinition44Enum(){ return 776;} +function Outputdefinition45Enum(){ return 777;} +function Outputdefinition46Enum(){ return 778;} +function Outputdefinition47Enum(){ return 779;} +function Outputdefinition48Enum(){ return 780;} +function Outputdefinition49Enum(){ return 781;} +function Outputdefinition50Enum(){ return 782;} +function Outputdefinition51Enum(){ return 783;} +function Outputdefinition52Enum(){ return 784;} +function Outputdefinition53Enum(){ return 785;} +function Outputdefinition54Enum(){ return 786;} +function Outputdefinition55Enum(){ return 787;} +function Outputdefinition56Enum(){ return 788;} +function Outputdefinition57Enum(){ return 789;} +function Outputdefinition58Enum(){ return 790;} +function Outputdefinition59Enum(){ return 791;} +function Outputdefinition60Enum(){ return 792;} +function Outputdefinition61Enum(){ return 793;} +function Outputdefinition62Enum(){ return 794;} +function Outputdefinition63Enum(){ return 795;} +function Outputdefinition64Enum(){ return 796;} +function Outputdefinition65Enum(){ return 797;} +function Outputdefinition66Enum(){ return 798;} +function Outputdefinition67Enum(){ return 799;} +function Outputdefinition68Enum(){ return 800;} +function Outputdefinition69Enum(){ return 801;} +function Outputdefinition70Enum(){ return 802;} +function Outputdefinition71Enum(){ return 803;} +function Outputdefinition72Enum(){ return 804;} +function Outputdefinition73Enum(){ return 805;} +function Outputdefinition74Enum(){ return 806;} +function Outputdefinition75Enum(){ return 807;} +function Outputdefinition76Enum(){ return 808;} +function Outputdefinition77Enum(){ return 809;} +function Outputdefinition78Enum(){ return 810;} +function Outputdefinition79Enum(){ return 811;} +function Outputdefinition80Enum(){ return 812;} +function Outputdefinition81Enum(){ return 813;} +function Outputdefinition82Enum(){ return 814;} +function Outputdefinition83Enum(){ return 815;} +function Outputdefinition84Enum(){ return 816;} +function Outputdefinition85Enum(){ return 817;} +function Outputdefinition86Enum(){ return 818;} +function Outputdefinition87Enum(){ return 819;} +function Outputdefinition88Enum(){ return 820;} +function Outputdefinition89Enum(){ return 821;} +function Outputdefinition90Enum(){ return 822;} +function Outputdefinition91Enum(){ return 823;} +function Outputdefinition92Enum(){ return 824;} +function Outputdefinition93Enum(){ return 825;} +function Outputdefinition94Enum(){ return 826;} +function Outputdefinition95Enum(){ return 827;} +function Outputdefinition96Enum(){ return 828;} +function Outputdefinition97Enum(){ return 829;} +function Outputdefinition98Enum(){ return 830;} +function Outputdefinition99Enum(){ return 831;} +function Outputdefinition100Enum(){ return 832;} +function OutputdefinitionListEnum(){ return 833;} +function MassfluxatgateEnum(){ return 834;} +function MassfluxatgateNameEnum(){ return 835;} +function MassfluxatgateDefinitionenumEnum(){ return 836;} +function MassfluxatgateSegmentsEnum(){ return 837;} +function MisfitNameEnum(){ return 838;} +function MisfitDefinitionenumEnum(){ return 839;} +function MisfitModelEnum(){ return 840;} function MisfitObservationEnum(){ return 841;} -function MisfitLocalEnum(){ return 842;} -function MisfitTimeinterpolationEnum(){ return 843;} -function MisfitWeightsEnum(){ return 844;} +function MisfitObservationEnum(){ return 842;} +function MisfitLocalEnum(){ return 843;} +function MisfitTimeinterpolationEnum(){ return 844;} function MisfitWeightsEnum(){ return 845;} -function SurfaceObservationEnum(){ return 846;} -function WeightsSurfaceObservationEnum(){ return 847;} -function VxObsEnum(){ return 848;} -function WeightsVxObsEnum(){ return 849;} -function VyObsEnum(){ return 850;} -function WeightsVyObsEnum(){ return 851;} -function MinVelEnum(){ return 852;} -function MaxVelEnum(){ return 853;} -function MinVxEnum(){ return 854;} -function MaxVxEnum(){ return 855;} -function MaxAbsVxEnum(){ return 856;} -function MinVyEnum(){ return 857;} -function MaxVyEnum(){ return 858;} -function MaxAbsVyEnum(){ return 859;} -function MinVzEnum(){ return 860;} -function MaxVzEnum(){ return 861;} -function MaxAbsVzEnum(){ return 862;} -function FloatingAreaEnum(){ return 863;} -function GroundedAreaEnum(){ return 864;} -function IceMassEnum(){ return 865;} -function IceVolumeEnum(){ return 866;} -function IceVolumeAboveFloatationEnum(){ return 867;} -function TotalSmbEnum(){ return 868;} -function AbsoluteEnum(){ return 869;} -function IncrementalEnum(){ return 870;} -function AugmentedLagrangianREnum(){ return 871;} -function AugmentedLagrangianRhopEnum(){ return 872;} -function AugmentedLagrangianRlambdaEnum(){ return 873;} -function AugmentedLagrangianRholambdaEnum(){ return 874;} -function AugmentedLagrangianThetaEnum(){ return 875;} -function NoneEnum(){ return 876;} -function AggressiveMigrationEnum(){ return 877;} -function SoftMigrationEnum(){ return 878;} -function SubelementMigrationEnum(){ return 879;} -function SubelementMigration2Enum(){ return 880;} -function ContactEnum(){ return 881;} -function GroundingOnlyEnum(){ return 882;} -function MaskGroundediceLevelsetEnum(){ return 883;} -function GaussSegEnum(){ return 884;} -function GaussTriaEnum(){ return 885;} -function GaussTetraEnum(){ return 886;} -function GaussPentaEnum(){ return 887;} -function FSSolverEnum(){ return 888;} -function AdjointEnum(){ return 889;} -function ColinearEnum(){ return 890;} -function ControlSteadyEnum(){ return 891;} -function FsetEnum(){ return 892;} -function Gradient1Enum(){ return 893;} -function Gradient2Enum(){ return 894;} -function Gradient3Enum(){ return 895;} -function GradientEnum(){ return 896;} -function GroundinglineMigrationEnum(){ return 897;} -function GsetEnum(){ return 898;} -function IndexEnum(){ return 899;} -function IndexedEnum(){ return 900;} -function IntersectEnum(){ return 901;} -function NodalEnum(){ return 902;} -function OldGradientEnum(){ return 903;} -function OutputBufferPointerEnum(){ return 904;} -function OutputBufferSizePointerEnum(){ return 905;} -function OutputFilePointerEnum(){ return 906;} -function ToolkitsFileNameEnum(){ return 907;} -function RootPathEnum(){ return 908;} -function OutputFileNameEnum(){ return 909;} -function InputFileNameEnum(){ return 910;} -function LockFileNameEnum(){ return 911;} -function RestartFileNameEnum(){ return 912;} -function ToolkitsOptionsAnalysesEnum(){ return 913;} -function ToolkitsOptionsStringsEnum(){ return 914;} -function QmuErrNameEnum(){ return 915;} -function QmuInNameEnum(){ return 916;} -function QmuOutNameEnum(){ return 917;} -function RegularEnum(){ return 918;} -function ScaledEnum(){ return 919;} -function SeparateEnum(){ return 920;} -function SsetEnum(){ return 921;} -function VerboseEnum(){ return 922;} -function TriangleInterpEnum(){ return 923;} -function BilinearInterpEnum(){ return 924;} -function NearestInterpEnum(){ return 925;} -function XYEnum(){ return 926;} -function XYZEnum(){ return 927;} -function DenseEnum(){ return 928;} -function MpiDenseEnum(){ return 929;} -function MpiSparseEnum(){ return 930;} -function SeqEnum(){ return 931;} -function MpiEnum(){ return 932;} -function MumpsEnum(){ return 933;} -function GslEnum(){ return 934;} -function OptionEnum(){ return 935;} -function GenericOptionEnum(){ return 936;} -function OptionCellEnum(){ return 937;} -function OptionStructEnum(){ return 938;} -function CuffeyEnum(){ return 939;} -function PatersonEnum(){ return 940;} -function ArrheniusEnum(){ return 941;} -function LliboutryDuvalEnum(){ return 942;} -function TransientIslevelsetEnum(){ return 943;} -function SpcLevelsetEnum(){ return 944;} -function ExtrapolationVariableEnum(){ return 945;} -function IceMaskNodeActivationEnum(){ return 946;} -function LevelsetfunctionSlopeXEnum(){ return 947;} -function LevelsetfunctionSlopeYEnum(){ return 948;} -function LevelsetfunctionPicardEnum(){ return 949;} -function MaximumNumberOfDefinitionsEnum(){ return 950;} +function MisfitWeightsEnum(){ return 846;} +function SurfaceObservationEnum(){ return 847;} +function WeightsSurfaceObservationEnum(){ return 848;} +function VxObsEnum(){ return 849;} +function WeightsVxObsEnum(){ return 850;} +function VyObsEnum(){ return 851;} +function WeightsVyObsEnum(){ return 852;} +function MinVelEnum(){ return 853;} +function MaxVelEnum(){ return 854;} +function MinVxEnum(){ return 855;} +function MaxVxEnum(){ return 856;} +function MaxAbsVxEnum(){ return 857;} +function MinVyEnum(){ return 858;} +function MaxVyEnum(){ return 859;} +function MaxAbsVyEnum(){ return 860;} +function MinVzEnum(){ return 861;} +function MaxVzEnum(){ return 862;} +function MaxAbsVzEnum(){ return 863;} +function FloatingAreaEnum(){ return 864;} +function GroundedAreaEnum(){ return 865;} +function IceMassEnum(){ return 866;} +function IceVolumeEnum(){ return 867;} +function IceVolumeAboveFloatationEnum(){ return 868;} +function TotalSmbEnum(){ return 869;} +function AbsoluteEnum(){ return 870;} +function IncrementalEnum(){ return 871;} +function AugmentedLagrangianREnum(){ return 872;} +function AugmentedLagrangianRhopEnum(){ return 873;} +function AugmentedLagrangianRlambdaEnum(){ return 874;} +function AugmentedLagrangianRholambdaEnum(){ return 875;} +function AugmentedLagrangianThetaEnum(){ return 876;} +function NoneEnum(){ return 877;} +function AggressiveMigrationEnum(){ return 878;} +function SoftMigrationEnum(){ return 879;} +function SubelementMigrationEnum(){ return 880;} +function SubelementMigration2Enum(){ return 881;} +function ContactEnum(){ return 882;} +function GroundingOnlyEnum(){ return 883;} +function MaskGroundediceLevelsetEnum(){ return 884;} +function GaussSegEnum(){ return 885;} +function GaussTriaEnum(){ return 886;} +function GaussTetraEnum(){ return 887;} +function GaussPentaEnum(){ return 888;} +function FSSolverEnum(){ return 889;} +function AdjointEnum(){ return 890;} +function ColinearEnum(){ return 891;} +function ControlSteadyEnum(){ return 892;} +function FsetEnum(){ return 893;} +function Gradient1Enum(){ return 894;} +function Gradient2Enum(){ return 895;} +function Gradient3Enum(){ return 896;} +function GradientEnum(){ return 897;} +function GroundinglineMigrationEnum(){ return 898;} +function GsetEnum(){ return 899;} +function IndexEnum(){ return 900;} +function IndexedEnum(){ return 901;} +function IntersectEnum(){ return 902;} +function NodalEnum(){ return 903;} +function OldGradientEnum(){ return 904;} +function OutputBufferPointerEnum(){ return 905;} +function OutputBufferSizePointerEnum(){ return 906;} +function OutputFilePointerEnum(){ return 907;} +function ToolkitsFileNameEnum(){ return 908;} +function RootPathEnum(){ return 909;} +function OutputFileNameEnum(){ return 910;} +function InputFileNameEnum(){ return 911;} +function LockFileNameEnum(){ return 912;} +function RestartFileNameEnum(){ return 913;} +function ToolkitsOptionsAnalysesEnum(){ return 914;} +function ToolkitsOptionsStringsEnum(){ return 915;} +function QmuErrNameEnum(){ return 916;} +function QmuInNameEnum(){ return 917;} +function QmuOutNameEnum(){ return 918;} +function RegularEnum(){ return 919;} +function ScaledEnum(){ return 920;} +function SeparateEnum(){ return 921;} +function SsetEnum(){ return 922;} +function VerboseEnum(){ return 923;} +function TriangleInterpEnum(){ return 924;} +function BilinearInterpEnum(){ return 925;} +function NearestInterpEnum(){ return 926;} +function XYEnum(){ return 927;} +function XYZEnum(){ return 928;} +function DenseEnum(){ return 929;} +function MpiDenseEnum(){ return 930;} +function MpiSparseEnum(){ return 931;} +function SeqEnum(){ return 932;} +function MpiEnum(){ return 933;} +function MumpsEnum(){ return 934;} +function GslEnum(){ return 935;} +function OptionEnum(){ return 936;} +function GenericOptionEnum(){ return 937;} +function OptionCellEnum(){ return 938;} +function OptionStructEnum(){ return 939;} +function CuffeyEnum(){ return 940;} +function PatersonEnum(){ return 941;} +function ArrheniusEnum(){ return 942;} +function LliboutryDuvalEnum(){ return 943;} +function TransientIslevelsetEnum(){ return 944;} +function SpcLevelsetEnum(){ return 945;} +function ExtrapolationVariableEnum(){ return 946;} +function IceMaskNodeActivationEnum(){ return 947;} +function LevelsetfunctionSlopeXEnum(){ return 948;} +function LevelsetfunctionSlopeYEnum(){ return 949;} +function LevelsetfunctionPicardEnum(){ return 950;} +function MaximumNumberOfDefinitionsEnum(){ return 951;} Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 19824) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 19825) @@ -695,4 +695,5 @@ def DeviatoricStressyzEnum(): return StringToEnum("DeviatoricStressyz")[0] def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0] +def DeviatoricStresseffectiveEnum(): return StringToEnum("DeviatoricStresseffective")[0] def StrainRateEnum(): return StringToEnum("StrainRate")[0] def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0]