Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 20677) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 20678) @@ -128,4 +128,5 @@ ./shared/Elements/ComputeD18OTemperaturePrecipitationFromPD.cpp\ ./shared/Elements/DrainageFunctionWaterfraction.cpp\ + ./shared/Elements/EarlComponents.cpp\ ./shared/String/DescriptorIndex.cpp\ ./toolkits/issm/IssmToolkitUtils.cpp\ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 20677) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 20678) @@ -218,4 +218,61 @@ xDelete(eps_yz); xDelete(eps_ef); + +} +/*}}}*/ +void Element::ComputeLambdaS(){/*{{{*/ + + /*Intermediaries*/ + IssmDouble vx,vy,vz; + IssmDouble dvx[3],dvy[3],dvz[3]; + IssmDouble epso,epsprime; + int dim; + IssmDouble *xyz_list = NULL; + + /*Retrieve all inputs we will be needing: */ + this->GetVerticesCoordinates(&xyz_list); + parameters->FindParam(&dim,DomainDimensionEnum); + Input* vx_input=this->GetInput(VxEnum); _assert_(vx_input); + Input* vy_input=this->GetInput(VyEnum); _assert_(vy_input); + Input* vz_input=NULL; + if(dim==3){vz_input=this->GetInput(VzEnum); _assert_(vz_input);} + + /*Allocate arrays*/ + int numvertices = this->GetNumberOfVertices(); + IssmDouble* lambdas = xNew(numvertices); + + /* Start looping on the number of vertices: */ + Gauss* gauss=this->NewGauss(); + for (int iv=0;ivGaussVertex(iv); + + /*Get velocity derivatives in all directions*/ + _assert_(dim>1); + _assert_(vx_input); + vx_input->GetInputValue(&vx,gauss); + vx_input->GetInputDerivativeValue(&dvx[0],xyz_list,gauss); + _assert_(vy_input); + vy_input->GetInputValue(&vy,gauss); + vy_input->GetInputDerivativeValue(&dvy[0],xyz_list,gauss); + if(dim==3){ + _assert_(vz_input); + vz_input->GetInputValue(&vz,gauss); + vz_input->GetInputDerivativeValue(&dvz[0],xyz_list,gauss); + } + else{ + vz = 0.; + dvz[0] = 0.; dvz[1] = 0.; dvz[2] = 0.; + } + EarlStrainrateQuantities(&epso,&epsprime,vx,vy,vz,&dvx[0],&dvy[0],&dvz[0]); + lambdas[iv]=EarlLambdaS(epso,epsprime); + } + + /*Add Stress tensor components into inputs*/ + this->AddInput(LambdaSEnum,lambdas,P1Enum); + + /*Clean up and return*/ + delete gauss; + xDelete(xyz_list); + xDelete(lambdas); } @@ -1969,4 +2026,5 @@ case DeviatoricStresseffectiveEnum: this->ComputeDeviatoricStressTensor(); break; case SigmaNNEnum: this->ComputeSigmaNN(); break; + case LambdaSEnum: this->ComputeLambdaS(); break; case NewDamageEnum: this->ComputeNewDamage(); break; case StressIntensityFactorEnum: this->StressIntensityFactor(); break; Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 20677) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 20678) @@ -59,4 +59,5 @@ /*bool AllActive(void);*/ /*bool AnyActive(void);*/ + void ComputeLambdaS(void); void ComputeNewDamage(); void ComputeStrainRate(); Index: /issm/trunk-jpl/src/c/classes/Materials/Matearl.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matearl.cpp (revision 20677) +++ /issm/trunk-jpl/src/c/classes/Materials/Matearl.cpp (revision 20678) @@ -407,91 +407,9 @@ /*Intermediaries*/ IssmDouble viscosity; - IssmDouble vorticity[3],vorticity_norm; - IssmDouble nrsp[3],nrsp_norm; - IssmDouble eps[3][3],epso; - IssmDouble epsprime[3],epsprime_norm; IssmDouble E,lambdas; - - /*Create vorticity vector*/ - _assert_(dvx && dvy && dvz); - vorticity[0] = dvz[1] - dvy[2]; - vorticity[1] = dvx[2] - dvz[0]; - vorticity[2] = dvy[0] - dvx[1]; - - /*Normalize*/ - vorticity_norm = sqrt(vorticity[0]*vorticity[0] + vorticity[1]*vorticity[1] + vorticity[2]*vorticity[2]); - if(vorticity_norm==0){ - vorticity[0] = 0.; - vorticity[1] = 0.; - vorticity[2] = 1.; - } - else{ - vorticity[0] =vorticity[0]/vorticity_norm; - vorticity[1] =vorticity[1]/vorticity_norm; - vorticity[2] =vorticity[2]/vorticity_norm; - } - - /*Non-rotating shear plane*/ - nrsp[0] = vy*vorticity[2] - vz*vorticity[1]; - nrsp[1] = vz*vorticity[0] - vx*vorticity[2]; - nrsp[2] = vx*vorticity[1] - vy*vorticity[0]; - - /*Normalize*/ - nrsp_norm = sqrt(nrsp[0]*nrsp[0] + nrsp[1]*nrsp[1] + nrsp[2]*nrsp[2]); - if(nrsp_norm==0){ - nrsp[0] = 0.; - nrsp[1] = 0.; - nrsp[2] = 1.; - } - else{ - nrsp[0] =nrsp[0]/nrsp_norm; - nrsp[1] =nrsp[1]/nrsp_norm; - nrsp[2] =nrsp[2]/nrsp_norm; - } - - /*Build strain rate tensor*/ - eps[0][0] = dvx[0]; eps[0][1] = .5*(dvx[1]+dvy[0]); eps[0][2] = .5*(dvx[2]+dvz[0]); - eps[1][0] = .5*(dvx[1]+dvy[0]); eps[1][1] = dvy[1]; eps[1][2] = .5*(dvy[2]+dvz[1]); - eps[2][0] = .5*(dvx[2]+dvz[0]); eps[2][1] = .5*(dvy[2]+dvz[1]); eps[2][2] = dvz[2]; - - /*octahedral strain rate*/ - epso = 0.; - for(int i=0;i<3;i++) for(int j=0;j<3;j++) epso += eps[i][j]*eps[i][j]; - if(epso==0.) epso=1.e-14; - epso=sqrt(epso)/sqrt(3.); - - /*Compute the shear strain rate on the non ratating shear plane*/ - epsprime[0]=0.; - epsprime[1]=0.; - epsprime[2]=0.; - /*term #1: eps'.n */ - for(int i=0;i<3;i++){ - for(int j=0;j<3;j++){ - epsprime[i] += eps[i][j]*nrsp[j]; - } - } - /*term #2: ((eps'.n).n)n */ - for(int i=0;i<3;i++){ - for(int j=0;j<3;j++){ - for(int k=0;k<3;k++){ - epsprime[j] += -nrsp[i]*eps[i][k]*nrsp[k]*nrsp[j]; - } - } - } - /*term #3: ((eps'.n).omega)omega */ - for(int i=0;i<3;i++){ - for(int j=0;j<3;j++){ - for(int k=0;k<3;k++){ - epsprime[j] += -nrsp[i]*eps[i][k]*vorticity[k]*vorticity[j]; - } - } - } - - /*Get norm of epsprime*/ - epsprime_norm = sqrt(epsprime[0]*epsprime[0] + epsprime[1]*epsprime[1] + epsprime[2]*epsprime[2]); - - /*Compute lambda_s*/ - _assert_(epso>0.); - lambdas = sqrt(2*epsprime_norm*epsprime_norm/(3*epso*epso)); + IssmDouble epso,epsprime_norm; + + EarlStrainrateQuantities(&epso,&epsprime_norm,vx,vy,vz,&dvx[0],&dvy[0],&dvz[0]); + lambdas=EarlLambdaS(epso,epsprime_norm); /*Get total enhancement factor E(lambdas)*/ Index: /issm/trunk-jpl/src/c/shared/Elements/EarlComponents.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/EarlComponents.cpp (revision 20678) +++ /issm/trunk-jpl/src/c/shared/Elements/EarlComponents.cpp (revision 20678) @@ -0,0 +1,99 @@ +#include +#include "../Numerics/types.h" +#include "../Exceptions/exceptions.h" + +void EarlStrainrateQuantities(IssmDouble *pepso, IssmDouble *pepsprime_norm, IssmDouble vx,IssmDouble vy,IssmDouble vz,IssmDouble* dvx,IssmDouble* dvy,IssmDouble* dvz){/*{{{*/ + + /*Intermediaries*/ + IssmDouble vorticity[3],vorticity_norm; + IssmDouble nrsp[3],nrsp_norm; + IssmDouble eps[3][3],epso; + IssmDouble epsprime[3],epsprime_norm; + + /*Create vorticity vector*/ + _assert_(dvx && dvy && dvz); + vorticity[0] = dvz[1] - dvy[2]; + vorticity[1] = dvx[2] - dvz[0]; + vorticity[2] = dvy[0] - dvx[1]; + + /*Normalize*/ + vorticity_norm = sqrt(vorticity[0]*vorticity[0] + vorticity[1]*vorticity[1] + vorticity[2]*vorticity[2]); + if(vorticity_norm==0){ + vorticity[0] = 0.; + vorticity[1] = 0.; + vorticity[2] = 1.; + } + else{ + vorticity[0] =vorticity[0]/vorticity_norm; + vorticity[1] =vorticity[1]/vorticity_norm; + vorticity[2] =vorticity[2]/vorticity_norm; + } + + /*Non-rotating shear plane*/ + nrsp[0] = vy*vorticity[2] - vz*vorticity[1]; + nrsp[1] = vz*vorticity[0] - vx*vorticity[2]; + nrsp[2] = vx*vorticity[1] - vy*vorticity[0]; + + /*Normalize*/ + nrsp_norm = sqrt(nrsp[0]*nrsp[0] + nrsp[1]*nrsp[1] + nrsp[2]*nrsp[2]); + if(nrsp_norm==0){ + nrsp[0] = 0.; + nrsp[1] = 0.; + nrsp[2] = 1.; + } + else{ + nrsp[0] =nrsp[0]/nrsp_norm; + nrsp[1] =nrsp[1]/nrsp_norm; + nrsp[2] =nrsp[2]/nrsp_norm; + } + + /*Build strain rate tensor*/ + eps[0][0] = dvx[0]; eps[0][1] = .5*(dvx[1]+dvy[0]); eps[0][2] = .5*(dvx[2]+dvz[0]); + eps[1][0] = .5*(dvx[1]+dvy[0]); eps[1][1] = dvy[1]; eps[1][2] = .5*(dvy[2]+dvz[1]); + eps[2][0] = .5*(dvx[2]+dvz[0]); eps[2][1] = .5*(dvy[2]+dvz[1]); eps[2][2] = dvz[2]; + + /*octahedral strain rate*/ + epso = 0.; + for(int i=0;i<3;i++) for(int j=0;j<3;j++) epso += eps[i][j]*eps[i][j]; + if(epso==0.) epso=1.e-14; + epso=sqrt(epso)/sqrt(3.); + + /*Compute the shear strain rate on the non ratating shear plane*/ + epsprime[0]=0.; + epsprime[1]=0.; + epsprime[2]=0.; + /*term #1: eps'.n */ + for(int i=0;i<3;i++){ + for(int j=0;j<3;j++){ + epsprime[i] += eps[i][j]*nrsp[j]; + } + } + /*term #2: ((eps'.n).n)n */ + for(int i=0;i<3;i++){ + for(int j=0;j<3;j++){ + for(int k=0;k<3;k++){ + epsprime[j] += -nrsp[i]*eps[i][k]*nrsp[k]*nrsp[j]; + } + } + } + /*term #3: ((eps'.n).omega)omega */ + for(int i=0;i<3;i++){ + for(int j=0;j<3;j++){ + for(int k=0;k<3;k++){ + epsprime[j] += -nrsp[i]*eps[i][k]*vorticity[k]*vorticity[j]; + } + } + } + + /*Get norm of epsprime*/ + epsprime_norm = sqrt(epsprime[0]*epsprime[0] + epsprime[1]*epsprime[1] + epsprime[2]*epsprime[2]); + + /*Assign output pointers*/ + *pepso=epso; + *pepsprime_norm=epsprime_norm; +}/*}}}*/ +IssmDouble EarlLambdaS(IssmDouble epso, IssmDouble epsprime_norm){/*{{{*/ + _assert_(epso>0.); + _assert_(epsprime_norm>=0.); + return sqrt(2*epsprime_norm*epsprime_norm/(3*epso*epso)); +}/*}}}*/ Index: /issm/trunk-jpl/src/c/shared/Elements/elements.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/elements.h (revision 20677) +++ /issm/trunk-jpl/src/c/shared/Elements/elements.h (revision 20678) @@ -15,4 +15,6 @@ IssmDouble LliboutryDuval(IssmDouble enthalpy, IssmDouble pressure, IssmDouble n, IssmDouble betaCC, IssmDouble referencetemperature, IssmDouble heatcapacity, IssmDouble latentheat); // IssmDouble LliboutryDuval(IssmDouble temperature, IssmDouble waterfraction, IssmDouble depth,IssmDouble n); +IssmDouble EarlLambdaS(IssmDouble epso, IssmDouble epsprime_norm); +void EarlStrainrateQuantities(IssmDouble *pepso, IssmDouble *pepsprime_norm, IssmDouble vx,IssmDouble vy,IssmDouble vz,IssmDouble* dvx,IssmDouble* dvy,IssmDouble* dvz); IssmDouble PddSurfaceMassBalance(IssmDouble* monthlytemperatures, IssmDouble* monthlyprec, IssmDouble* pdds, IssmDouble* pds, IssmDouble* melt, IssmDouble* accu, IssmDouble signorm, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20677) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 20678) @@ -755,4 +755,5 @@ DeviatoricStresszzEnum, DeviatoricStresseffectiveEnum, + LambdaSEnum, StrainRateEnum, StrainRatexxEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20677) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 20678) @@ -739,4 +739,5 @@ case DeviatoricStresszzEnum : return "DeviatoricStresszz"; case DeviatoricStresseffectiveEnum : return "DeviatoricStresseffective"; + case LambdaSEnum : return "LambdaS"; 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 20677) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 20678) @@ -757,4 +757,5 @@ if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum; else if (strcmp(name,"DeviatoricStresseffective")==0) return DeviatoricStresseffectiveEnum; + else if (strcmp(name,"LambdaS")==0) return LambdaSEnum; else if (strcmp(name,"StrainRate")==0) return StrainRateEnum; else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum; @@ -874,9 +875,9 @@ else if (strcmp(name,"Outputdefinition70")==0) return Outputdefinition70Enum; else if (strcmp(name,"Outputdefinition71")==0) return Outputdefinition71Enum; - else if (strcmp(name,"Outputdefinition72")==0) return Outputdefinition72Enum; else stage=8; } if(stage==8){ - if (strcmp(name,"Outputdefinition73")==0) return Outputdefinition73Enum; + if (strcmp(name,"Outputdefinition72")==0) return Outputdefinition72Enum; + else if (strcmp(name,"Outputdefinition73")==0) return Outputdefinition73Enum; else if (strcmp(name,"Outputdefinition74")==0) return Outputdefinition74Enum; else if (strcmp(name,"Outputdefinition75")==0) return Outputdefinition75Enum; @@ -997,9 +998,9 @@ else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum; else if (strcmp(name,"QmuErrName")==0) return QmuErrNameEnum; - else if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; + if (strcmp(name,"QmuInName")==0) return QmuInNameEnum; + else if (strcmp(name,"QmuOutName")==0) return QmuOutNameEnum; else if (strcmp(name,"Regular")==0) return RegularEnum; else if (strcmp(name,"Scaled")==0) return ScaledEnum; Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.js =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20677) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.js (revision 20678) @@ -724,297 +724,298 @@ function DeviatoricStresszzEnum(){ return 720;} function DeviatoricStresseffectiveEnum(){ return 721;} -function StrainRateEnum(){ return 722;} -function StrainRatexxEnum(){ return 723;} -function StrainRatexyEnum(){ return 724;} -function StrainRatexzEnum(){ return 725;} -function StrainRateyyEnum(){ return 726;} -function StrainRateyzEnum(){ return 727;} -function StrainRatezzEnum(){ return 728;} -function DivergenceEnum(){ return 729;} -function MaxDivergenceEnum(){ return 730;} -function GiaCrossSectionShapeEnum(){ return 731;} -function GiadWdtEnum(){ return 732;} -function GiaWEnum(){ return 733;} -function P0Enum(){ return 734;} -function P0ArrayEnum(){ return 735;} -function P1Enum(){ return 736;} -function P1DGEnum(){ return 737;} -function P1bubbleEnum(){ return 738;} -function P1bubblecondensedEnum(){ return 739;} -function P2Enum(){ return 740;} -function P2bubbleEnum(){ return 741;} -function P2bubblecondensedEnum(){ return 742;} -function P2xP1Enum(){ return 743;} -function P1xP2Enum(){ return 744;} -function P1xP3Enum(){ return 745;} -function P2xP4Enum(){ return 746;} -function P1P1Enum(){ return 747;} -function P1P1GLSEnum(){ return 748;} -function MINIEnum(){ return 749;} -function MINIcondensedEnum(){ return 750;} -function TaylorHoodEnum(){ return 751;} -function LATaylorHoodEnum(){ return 752;} -function XTaylorHoodEnum(){ return 753;} -function OneLayerP4zEnum(){ return 754;} -function CrouzeixRaviartEnum(){ return 755;} -function LACrouzeixRaviartEnum(){ return 756;} -function SaveResultsEnum(){ return 757;} -function BoolExternalResultEnum(){ return 758;} -function DoubleExternalResultEnum(){ return 759;} -function DoubleMatExternalResultEnum(){ return 760;} -function IntExternalResultEnum(){ return 761;} -function JEnum(){ return 762;} -function StringExternalResultEnum(){ return 763;} -function StepEnum(){ return 764;} -function TimeEnum(){ return 765;} -function WaterColumnOldEnum(){ return 766;} -function OutputdefinitionEnum(){ return 767;} -function Outputdefinition1Enum(){ return 768;} -function Outputdefinition2Enum(){ return 769;} -function Outputdefinition3Enum(){ return 770;} -function Outputdefinition4Enum(){ return 771;} -function Outputdefinition5Enum(){ return 772;} -function Outputdefinition6Enum(){ return 773;} -function Outputdefinition7Enum(){ return 774;} -function Outputdefinition8Enum(){ return 775;} -function Outputdefinition9Enum(){ return 776;} -function Outputdefinition10Enum(){ return 777;} -function Outputdefinition11Enum(){ return 778;} -function Outputdefinition12Enum(){ return 779;} -function Outputdefinition13Enum(){ return 780;} -function Outputdefinition14Enum(){ return 781;} -function Outputdefinition15Enum(){ return 782;} -function Outputdefinition16Enum(){ return 783;} -function Outputdefinition17Enum(){ return 784;} -function Outputdefinition18Enum(){ return 785;} -function Outputdefinition19Enum(){ return 786;} -function Outputdefinition20Enum(){ return 787;} -function Outputdefinition21Enum(){ return 788;} -function Outputdefinition22Enum(){ return 789;} -function Outputdefinition23Enum(){ return 790;} -function Outputdefinition24Enum(){ return 791;} -function Outputdefinition25Enum(){ return 792;} -function Outputdefinition26Enum(){ return 793;} -function Outputdefinition27Enum(){ return 794;} -function Outputdefinition28Enum(){ return 795;} -function Outputdefinition29Enum(){ return 796;} -function Outputdefinition30Enum(){ return 797;} -function Outputdefinition31Enum(){ return 798;} -function Outputdefinition32Enum(){ return 799;} -function Outputdefinition33Enum(){ return 800;} -function Outputdefinition34Enum(){ return 801;} -function Outputdefinition35Enum(){ return 802;} -function Outputdefinition36Enum(){ return 803;} -function Outputdefinition37Enum(){ return 804;} -function Outputdefinition38Enum(){ return 805;} -function Outputdefinition39Enum(){ return 806;} -function Outputdefinition40Enum(){ return 807;} -function Outputdefinition41Enum(){ return 808;} -function Outputdefinition42Enum(){ return 809;} -function Outputdefinition43Enum(){ return 810;} -function Outputdefinition44Enum(){ return 811;} -function Outputdefinition45Enum(){ return 812;} -function Outputdefinition46Enum(){ return 813;} -function Outputdefinition47Enum(){ return 814;} -function Outputdefinition48Enum(){ return 815;} -function Outputdefinition49Enum(){ return 816;} -function Outputdefinition50Enum(){ return 817;} -function Outputdefinition51Enum(){ return 818;} -function Outputdefinition52Enum(){ return 819;} -function Outputdefinition53Enum(){ return 820;} -function Outputdefinition54Enum(){ return 821;} -function Outputdefinition55Enum(){ return 822;} -function Outputdefinition56Enum(){ return 823;} -function Outputdefinition57Enum(){ return 824;} -function Outputdefinition58Enum(){ return 825;} -function Outputdefinition59Enum(){ return 826;} -function Outputdefinition60Enum(){ return 827;} -function Outputdefinition61Enum(){ return 828;} -function Outputdefinition62Enum(){ return 829;} -function Outputdefinition63Enum(){ return 830;} -function Outputdefinition64Enum(){ return 831;} -function Outputdefinition65Enum(){ return 832;} -function Outputdefinition66Enum(){ return 833;} -function Outputdefinition67Enum(){ return 834;} -function Outputdefinition68Enum(){ return 835;} -function Outputdefinition69Enum(){ return 836;} -function Outputdefinition70Enum(){ return 837;} -function Outputdefinition71Enum(){ return 838;} -function Outputdefinition72Enum(){ return 839;} -function Outputdefinition73Enum(){ return 840;} -function Outputdefinition74Enum(){ return 841;} -function Outputdefinition75Enum(){ return 842;} -function Outputdefinition76Enum(){ return 843;} -function Outputdefinition77Enum(){ return 844;} -function Outputdefinition78Enum(){ return 845;} -function Outputdefinition79Enum(){ return 846;} -function Outputdefinition80Enum(){ return 847;} -function Outputdefinition81Enum(){ return 848;} -function Outputdefinition82Enum(){ return 849;} -function Outputdefinition83Enum(){ return 850;} -function Outputdefinition84Enum(){ return 851;} -function Outputdefinition85Enum(){ return 852;} -function Outputdefinition86Enum(){ return 853;} -function Outputdefinition87Enum(){ return 854;} -function Outputdefinition88Enum(){ return 855;} -function Outputdefinition89Enum(){ return 856;} -function Outputdefinition90Enum(){ return 857;} -function Outputdefinition91Enum(){ return 858;} -function Outputdefinition92Enum(){ return 859;} -function Outputdefinition93Enum(){ return 860;} -function Outputdefinition94Enum(){ return 861;} -function Outputdefinition95Enum(){ return 862;} -function Outputdefinition96Enum(){ return 863;} -function Outputdefinition97Enum(){ return 864;} -function Outputdefinition98Enum(){ return 865;} -function Outputdefinition99Enum(){ return 866;} -function Outputdefinition100Enum(){ return 867;} -function OutputdefinitionListEnum(){ return 868;} -function MassfluxatgateEnum(){ return 869;} -function MassfluxatgateNameEnum(){ return 870;} -function MassfluxatgateDefinitionenumEnum(){ return 871;} -function MassfluxatgateSegmentsEnum(){ return 872;} -function NodalvalueEnum(){ return 873;} -function NodalvalueNameEnum(){ return 874;} -function NodalvalueDefinitionenumEnum(){ return 875;} -function NodalvalueModelEnum(){ return 876;} -function NodalvalueNodeEnum(){ return 877;} -function MisfitNameEnum(){ return 878;} -function MisfitDefinitionenumEnum(){ return 879;} -function MisfitModelEnum(){ return 880;} -function MisfitObservationEnum(){ return 881;} +function LambdaSEnum(){ return 722;} +function StrainRateEnum(){ return 723;} +function StrainRatexxEnum(){ return 724;} +function StrainRatexyEnum(){ return 725;} +function StrainRatexzEnum(){ return 726;} +function StrainRateyyEnum(){ return 727;} +function StrainRateyzEnum(){ return 728;} +function StrainRatezzEnum(){ return 729;} +function DivergenceEnum(){ return 730;} +function MaxDivergenceEnum(){ return 731;} +function GiaCrossSectionShapeEnum(){ return 732;} +function GiadWdtEnum(){ return 733;} +function GiaWEnum(){ return 734;} +function P0Enum(){ return 735;} +function P0ArrayEnum(){ return 736;} +function P1Enum(){ return 737;} +function P1DGEnum(){ return 738;} +function P1bubbleEnum(){ return 739;} +function P1bubblecondensedEnum(){ return 740;} +function P2Enum(){ return 741;} +function P2bubbleEnum(){ return 742;} +function P2bubblecondensedEnum(){ return 743;} +function P2xP1Enum(){ return 744;} +function P1xP2Enum(){ return 745;} +function P1xP3Enum(){ return 746;} +function P2xP4Enum(){ return 747;} +function P1P1Enum(){ return 748;} +function P1P1GLSEnum(){ return 749;} +function MINIEnum(){ return 750;} +function MINIcondensedEnum(){ return 751;} +function TaylorHoodEnum(){ return 752;} +function LATaylorHoodEnum(){ return 753;} +function XTaylorHoodEnum(){ return 754;} +function OneLayerP4zEnum(){ return 755;} +function CrouzeixRaviartEnum(){ return 756;} +function LACrouzeixRaviartEnum(){ return 757;} +function SaveResultsEnum(){ return 758;} +function BoolExternalResultEnum(){ return 759;} +function DoubleExternalResultEnum(){ return 760;} +function DoubleMatExternalResultEnum(){ return 761;} +function IntExternalResultEnum(){ return 762;} +function JEnum(){ return 763;} +function StringExternalResultEnum(){ return 764;} +function StepEnum(){ return 765;} +function TimeEnum(){ return 766;} +function WaterColumnOldEnum(){ return 767;} +function OutputdefinitionEnum(){ return 768;} +function Outputdefinition1Enum(){ return 769;} +function Outputdefinition2Enum(){ return 770;} +function Outputdefinition3Enum(){ return 771;} +function Outputdefinition4Enum(){ return 772;} +function Outputdefinition5Enum(){ return 773;} +function Outputdefinition6Enum(){ return 774;} +function Outputdefinition7Enum(){ return 775;} +function Outputdefinition8Enum(){ return 776;} +function Outputdefinition9Enum(){ return 777;} +function Outputdefinition10Enum(){ return 778;} +function Outputdefinition11Enum(){ return 779;} +function Outputdefinition12Enum(){ return 780;} +function Outputdefinition13Enum(){ return 781;} +function Outputdefinition14Enum(){ return 782;} +function Outputdefinition15Enum(){ return 783;} +function Outputdefinition16Enum(){ return 784;} +function Outputdefinition17Enum(){ return 785;} +function Outputdefinition18Enum(){ return 786;} +function Outputdefinition19Enum(){ return 787;} +function Outputdefinition20Enum(){ return 788;} +function Outputdefinition21Enum(){ return 789;} +function Outputdefinition22Enum(){ return 790;} +function Outputdefinition23Enum(){ return 791;} +function Outputdefinition24Enum(){ return 792;} +function Outputdefinition25Enum(){ return 793;} +function Outputdefinition26Enum(){ return 794;} +function Outputdefinition27Enum(){ return 795;} +function Outputdefinition28Enum(){ return 796;} +function Outputdefinition29Enum(){ return 797;} +function Outputdefinition30Enum(){ return 798;} +function Outputdefinition31Enum(){ return 799;} +function Outputdefinition32Enum(){ return 800;} +function Outputdefinition33Enum(){ return 801;} +function Outputdefinition34Enum(){ return 802;} +function Outputdefinition35Enum(){ return 803;} +function Outputdefinition36Enum(){ return 804;} +function Outputdefinition37Enum(){ return 805;} +function Outputdefinition38Enum(){ return 806;} +function Outputdefinition39Enum(){ return 807;} +function Outputdefinition40Enum(){ return 808;} +function Outputdefinition41Enum(){ return 809;} +function Outputdefinition42Enum(){ return 810;} +function Outputdefinition43Enum(){ return 811;} +function Outputdefinition44Enum(){ return 812;} +function Outputdefinition45Enum(){ return 813;} +function Outputdefinition46Enum(){ return 814;} +function Outputdefinition47Enum(){ return 815;} +function Outputdefinition48Enum(){ return 816;} +function Outputdefinition49Enum(){ return 817;} +function Outputdefinition50Enum(){ return 818;} +function Outputdefinition51Enum(){ return 819;} +function Outputdefinition52Enum(){ return 820;} +function Outputdefinition53Enum(){ return 821;} +function Outputdefinition54Enum(){ return 822;} +function Outputdefinition55Enum(){ return 823;} +function Outputdefinition56Enum(){ return 824;} +function Outputdefinition57Enum(){ return 825;} +function Outputdefinition58Enum(){ return 826;} +function Outputdefinition59Enum(){ return 827;} +function Outputdefinition60Enum(){ return 828;} +function Outputdefinition61Enum(){ return 829;} +function Outputdefinition62Enum(){ return 830;} +function Outputdefinition63Enum(){ return 831;} +function Outputdefinition64Enum(){ return 832;} +function Outputdefinition65Enum(){ return 833;} +function Outputdefinition66Enum(){ return 834;} +function Outputdefinition67Enum(){ return 835;} +function Outputdefinition68Enum(){ return 836;} +function Outputdefinition69Enum(){ return 837;} +function Outputdefinition70Enum(){ return 838;} +function Outputdefinition71Enum(){ return 839;} +function Outputdefinition72Enum(){ return 840;} +function Outputdefinition73Enum(){ return 841;} +function Outputdefinition74Enum(){ return 842;} +function Outputdefinition75Enum(){ return 843;} +function Outputdefinition76Enum(){ return 844;} +function Outputdefinition77Enum(){ return 845;} +function Outputdefinition78Enum(){ return 846;} +function Outputdefinition79Enum(){ return 847;} +function Outputdefinition80Enum(){ return 848;} +function Outputdefinition81Enum(){ return 849;} +function Outputdefinition82Enum(){ return 850;} +function Outputdefinition83Enum(){ return 851;} +function Outputdefinition84Enum(){ return 852;} +function Outputdefinition85Enum(){ return 853;} +function Outputdefinition86Enum(){ return 854;} +function Outputdefinition87Enum(){ return 855;} +function Outputdefinition88Enum(){ return 856;} +function Outputdefinition89Enum(){ return 857;} +function Outputdefinition90Enum(){ return 858;} +function Outputdefinition91Enum(){ return 859;} +function Outputdefinition92Enum(){ return 860;} +function Outputdefinition93Enum(){ return 861;} +function Outputdefinition94Enum(){ return 862;} +function Outputdefinition95Enum(){ return 863;} +function Outputdefinition96Enum(){ return 864;} +function Outputdefinition97Enum(){ return 865;} +function Outputdefinition98Enum(){ return 866;} +function Outputdefinition99Enum(){ return 867;} +function Outputdefinition100Enum(){ return 868;} +function OutputdefinitionListEnum(){ return 869;} +function MassfluxatgateEnum(){ return 870;} +function MassfluxatgateNameEnum(){ return 871;} +function MassfluxatgateDefinitionenumEnum(){ return 872;} +function MassfluxatgateSegmentsEnum(){ return 873;} +function NodalvalueEnum(){ return 874;} +function NodalvalueNameEnum(){ return 875;} +function NodalvalueDefinitionenumEnum(){ return 876;} +function NodalvalueModelEnum(){ return 877;} +function NodalvalueNodeEnum(){ return 878;} +function MisfitNameEnum(){ return 879;} +function MisfitDefinitionenumEnum(){ return 880;} +function MisfitModelEnum(){ return 881;} function MisfitObservationEnum(){ return 882;} -function MisfitLocalEnum(){ return 883;} -function MisfitTimeinterpolationEnum(){ return 884;} -function MisfitWeightsEnum(){ return 885;} +function MisfitObservationEnum(){ return 883;} +function MisfitLocalEnum(){ return 884;} +function MisfitTimeinterpolationEnum(){ return 885;} function MisfitWeightsEnum(){ return 886;} -function SurfaceObservationEnum(){ return 887;} -function WeightsSurfaceObservationEnum(){ return 888;} -function VxObsEnum(){ return 889;} -function WeightsVxObsEnum(){ return 890;} -function VyObsEnum(){ return 891;} -function WeightsVyObsEnum(){ return 892;} -function MinVelEnum(){ return 893;} -function MaxVelEnum(){ return 894;} -function MinVxEnum(){ return 895;} -function MaxVxEnum(){ return 896;} -function MaxAbsVxEnum(){ return 897;} -function MinVyEnum(){ return 898;} -function MaxVyEnum(){ return 899;} -function MaxAbsVyEnum(){ return 900;} -function MinVzEnum(){ return 901;} -function MaxVzEnum(){ return 902;} -function MaxAbsVzEnum(){ return 903;} -function FloatingAreaEnum(){ return 904;} -function GroundedAreaEnum(){ return 905;} -function IceMassEnum(){ return 906;} -function IceVolumeEnum(){ return 907;} -function IceVolumeAboveFloatationEnum(){ return 908;} -function TotalFloatingBmbEnum(){ return 909;} -function TotalGroundedBmbEnum(){ return 910;} -function TotalSmbEnum(){ return 911;} -function AbsoluteEnum(){ return 912;} -function IncrementalEnum(){ return 913;} -function AugmentedLagrangianREnum(){ return 914;} -function AugmentedLagrangianRhopEnum(){ return 915;} -function AugmentedLagrangianRlambdaEnum(){ return 916;} -function AugmentedLagrangianRholambdaEnum(){ return 917;} -function AugmentedLagrangianThetaEnum(){ return 918;} -function NoneEnum(){ return 919;} -function AggressiveMigrationEnum(){ return 920;} -function SoftMigrationEnum(){ return 921;} -function SubelementMigrationEnum(){ return 922;} -function SubelementMigration2Enum(){ return 923;} -function ContactEnum(){ return 924;} -function GroundingOnlyEnum(){ return 925;} -function MaskGroundediceLevelsetEnum(){ return 926;} -function GaussSegEnum(){ return 927;} -function GaussTriaEnum(){ return 928;} -function GaussTetraEnum(){ return 929;} -function GaussPentaEnum(){ return 930;} -function FSSolverEnum(){ return 931;} -function AdjointEnum(){ return 932;} -function ColinearEnum(){ return 933;} -function ControlSteadyEnum(){ return 934;} -function FsetEnum(){ return 935;} -function Gradient1Enum(){ return 936;} -function Gradient2Enum(){ return 937;} -function Gradient3Enum(){ return 938;} -function GradientEnum(){ return 939;} -function GroundinglineMigrationEnum(){ return 940;} -function GsetEnum(){ return 941;} -function IndexEnum(){ return 942;} -function IndexedEnum(){ return 943;} -function IntersectEnum(){ return 944;} -function NodalEnum(){ return 945;} -function OldGradientEnum(){ return 946;} -function OutputBufferPointerEnum(){ return 947;} -function OutputBufferSizePointerEnum(){ return 948;} -function OutputFilePointerEnum(){ return 949;} -function ToolkitsFileNameEnum(){ return 950;} -function RootPathEnum(){ return 951;} -function OutputFileNameEnum(){ return 952;} -function InputFileNameEnum(){ return 953;} -function LockFileNameEnum(){ return 954;} -function RestartFileNameEnum(){ return 955;} -function ToolkitsOptionsAnalysesEnum(){ return 956;} -function ToolkitsOptionsStringsEnum(){ return 957;} -function QmuErrNameEnum(){ return 958;} -function QmuInNameEnum(){ return 959;} -function QmuOutNameEnum(){ return 960;} -function RegularEnum(){ return 961;} -function ScaledEnum(){ return 962;} -function SeparateEnum(){ return 963;} -function SsetEnum(){ return 964;} -function VerboseEnum(){ return 965;} -function TriangleInterpEnum(){ return 966;} -function BilinearInterpEnum(){ return 967;} -function NearestInterpEnum(){ return 968;} -function XYEnum(){ return 969;} -function XYZEnum(){ return 970;} -function DenseEnum(){ return 971;} -function MpiDenseEnum(){ return 972;} -function MpiSparseEnum(){ return 973;} -function SeqEnum(){ return 974;} -function MpiEnum(){ return 975;} -function MumpsEnum(){ return 976;} -function GslEnum(){ return 977;} -function OptionEnum(){ return 978;} -function GenericOptionEnum(){ return 979;} -function OptionCellEnum(){ return 980;} -function OptionStructEnum(){ return 981;} -function CuffeyEnum(){ return 982;} -function BuddJackaEnum(){ return 983;} -function CuffeyTemperateEnum(){ return 984;} -function PatersonEnum(){ return 985;} -function ArrheniusEnum(){ return 986;} -function LliboutryDuvalEnum(){ return 987;} -function SpclevelsetEnum(){ return 988;} -function ExtrapolationVariableEnum(){ return 989;} -function IceMaskNodeActivationEnum(){ return 990;} -function LevelsetfunctionSlopeXEnum(){ return 991;} -function LevelsetfunctionSlopeYEnum(){ return 992;} -function LevelsetfunctionPicardEnum(){ return 993;} -function LevelsetReinitFrequencyEnum(){ return 994;} -function SealevelriseSolutionEnum(){ return 995;} -function SealevelriseAnalysisEnum(){ return 996;} -function SealevelEnum(){ return 997;} -function SealevelEustaticEnum(){ return 998;} -function SealevelriseDeltathicknessEnum(){ return 999;} -function SealevelriseMaxiterEnum(){ return 1000;} -function SealevelriseReltolEnum(){ return 1001;} -function SealevelriseAbstolEnum(){ return 1002;} -function SealevelriseLoveHEnum(){ return 1003;} -function SealevelriseLoveKEnum(){ return 1004;} -function SealevelriseTideLoveHEnum(){ return 1005;} -function SealevelriseTideLoveKEnum(){ return 1006;} -function SealevelriseRigidEnum(){ return 1007;} -function SealevelriseElasticEnum(){ return 1008;} -function SealevelriseRotationEnum(){ return 1009;} -function SealevelriseGElasticEnum(){ return 1010;} -function SealevelriseDegaccEnum(){ return 1011;} -function SealevelriseTransitionsEnum(){ return 1012;} -function SealevelriseRequestedOutputsEnum(){ return 1013;} -function SealevelriseNumRequestedOutputsEnum(){ return 1014;} -function ParametersENDEnum(){ return 1015;} -function MaximumNumberOfDefinitionsEnum(){ return 1016;} +function MisfitWeightsEnum(){ return 887;} +function SurfaceObservationEnum(){ return 888;} +function WeightsSurfaceObservationEnum(){ return 889;} +function VxObsEnum(){ return 890;} +function WeightsVxObsEnum(){ return 891;} +function VyObsEnum(){ return 892;} +function WeightsVyObsEnum(){ return 893;} +function MinVelEnum(){ return 894;} +function MaxVelEnum(){ return 895;} +function MinVxEnum(){ return 896;} +function MaxVxEnum(){ return 897;} +function MaxAbsVxEnum(){ return 898;} +function MinVyEnum(){ return 899;} +function MaxVyEnum(){ return 900;} +function MaxAbsVyEnum(){ return 901;} +function MinVzEnum(){ return 902;} +function MaxVzEnum(){ return 903;} +function MaxAbsVzEnum(){ return 904;} +function FloatingAreaEnum(){ return 905;} +function GroundedAreaEnum(){ return 906;} +function IceMassEnum(){ return 907;} +function IceVolumeEnum(){ return 908;} +function IceVolumeAboveFloatationEnum(){ return 909;} +function TotalFloatingBmbEnum(){ return 910;} +function TotalGroundedBmbEnum(){ return 911;} +function TotalSmbEnum(){ return 912;} +function AbsoluteEnum(){ return 913;} +function IncrementalEnum(){ return 914;} +function AugmentedLagrangianREnum(){ return 915;} +function AugmentedLagrangianRhopEnum(){ return 916;} +function AugmentedLagrangianRlambdaEnum(){ return 917;} +function AugmentedLagrangianRholambdaEnum(){ return 918;} +function AugmentedLagrangianThetaEnum(){ return 919;} +function NoneEnum(){ return 920;} +function AggressiveMigrationEnum(){ return 921;} +function SoftMigrationEnum(){ return 922;} +function SubelementMigrationEnum(){ return 923;} +function SubelementMigration2Enum(){ return 924;} +function ContactEnum(){ return 925;} +function GroundingOnlyEnum(){ return 926;} +function MaskGroundediceLevelsetEnum(){ return 927;} +function GaussSegEnum(){ return 928;} +function GaussTriaEnum(){ return 929;} +function GaussTetraEnum(){ return 930;} +function GaussPentaEnum(){ return 931;} +function FSSolverEnum(){ return 932;} +function AdjointEnum(){ return 933;} +function ColinearEnum(){ return 934;} +function ControlSteadyEnum(){ return 935;} +function FsetEnum(){ return 936;} +function Gradient1Enum(){ return 937;} +function Gradient2Enum(){ return 938;} +function Gradient3Enum(){ return 939;} +function GradientEnum(){ return 940;} +function GroundinglineMigrationEnum(){ return 941;} +function GsetEnum(){ return 942;} +function IndexEnum(){ return 943;} +function IndexedEnum(){ return 944;} +function IntersectEnum(){ return 945;} +function NodalEnum(){ return 946;} +function OldGradientEnum(){ return 947;} +function OutputBufferPointerEnum(){ return 948;} +function OutputBufferSizePointerEnum(){ return 949;} +function OutputFilePointerEnum(){ return 950;} +function ToolkitsFileNameEnum(){ return 951;} +function RootPathEnum(){ return 952;} +function OutputFileNameEnum(){ return 953;} +function InputFileNameEnum(){ return 954;} +function LockFileNameEnum(){ return 955;} +function RestartFileNameEnum(){ return 956;} +function ToolkitsOptionsAnalysesEnum(){ return 957;} +function ToolkitsOptionsStringsEnum(){ return 958;} +function QmuErrNameEnum(){ return 959;} +function QmuInNameEnum(){ return 960;} +function QmuOutNameEnum(){ return 961;} +function RegularEnum(){ return 962;} +function ScaledEnum(){ return 963;} +function SeparateEnum(){ return 964;} +function SsetEnum(){ return 965;} +function VerboseEnum(){ return 966;} +function TriangleInterpEnum(){ return 967;} +function BilinearInterpEnum(){ return 968;} +function NearestInterpEnum(){ return 969;} +function XYEnum(){ return 970;} +function XYZEnum(){ return 971;} +function DenseEnum(){ return 972;} +function MpiDenseEnum(){ return 973;} +function MpiSparseEnum(){ return 974;} +function SeqEnum(){ return 975;} +function MpiEnum(){ return 976;} +function MumpsEnum(){ return 977;} +function GslEnum(){ return 978;} +function OptionEnum(){ return 979;} +function GenericOptionEnum(){ return 980;} +function OptionCellEnum(){ return 981;} +function OptionStructEnum(){ return 982;} +function CuffeyEnum(){ return 983;} +function BuddJackaEnum(){ return 984;} +function CuffeyTemperateEnum(){ return 985;} +function PatersonEnum(){ return 986;} +function ArrheniusEnum(){ return 987;} +function LliboutryDuvalEnum(){ return 988;} +function SpclevelsetEnum(){ return 989;} +function ExtrapolationVariableEnum(){ return 990;} +function IceMaskNodeActivationEnum(){ return 991;} +function LevelsetfunctionSlopeXEnum(){ return 992;} +function LevelsetfunctionSlopeYEnum(){ return 993;} +function LevelsetfunctionPicardEnum(){ return 994;} +function LevelsetReinitFrequencyEnum(){ return 995;} +function SealevelriseSolutionEnum(){ return 996;} +function SealevelriseAnalysisEnum(){ return 997;} +function SealevelEnum(){ return 998;} +function SealevelEustaticEnum(){ return 999;} +function SealevelriseDeltathicknessEnum(){ return 1000;} +function SealevelriseMaxiterEnum(){ return 1001;} +function SealevelriseReltolEnum(){ return 1002;} +function SealevelriseAbstolEnum(){ return 1003;} +function SealevelriseLoveHEnum(){ return 1004;} +function SealevelriseLoveKEnum(){ return 1005;} +function SealevelriseTideLoveHEnum(){ return 1006;} +function SealevelriseTideLoveKEnum(){ return 1007;} +function SealevelriseRigidEnum(){ return 1008;} +function SealevelriseElasticEnum(){ return 1009;} +function SealevelriseRotationEnum(){ return 1010;} +function SealevelriseGElasticEnum(){ return 1011;} +function SealevelriseDegaccEnum(){ return 1012;} +function SealevelriseTransitionsEnum(){ return 1013;} +function SealevelriseRequestedOutputsEnum(){ return 1014;} +function SealevelriseNumRequestedOutputsEnum(){ return 1015;} +function ParametersENDEnum(){ return 1016;} +function MaximumNumberOfDefinitionsEnum(){ return 1017;} Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20677) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 20678) @@ -731,4 +731,5 @@ def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0] def DeviatoricStresseffectiveEnum(): return StringToEnum("DeviatoricStresseffective")[0] +def LambdaSEnum(): return StringToEnum("LambdaS")[0] def StrainRateEnum(): return StringToEnum("StrainRate")[0] def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0] Index: /issm/trunk-jpl/src/m/enum/LambdaSEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/LambdaSEnum.m (revision 20678) +++ /issm/trunk-jpl/src/m/enum/LambdaSEnum.m (revision 20678) @@ -0,0 +1,11 @@ +function macro=LambdaSEnum() +%LAMBDASENUM - Enum of LambdaS +% +% 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=LambdaSEnum() + +macro=StringToEnum('LambdaS');