Changeset 23999


Ignore:
Timestamp:
06/07/19 11:53:40 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: added 2 new output

Location:
issm/trunk-jpl/src/c
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r23992 r23999  
    28952895                case DeviatoricStressyzEnum:
    28962896                case DeviatoricStresszzEnum:
     2897                case DeviatoricStress1Enum:
     2898                case DeviatoricStress2Enum:
    28972899                case DeviatoricStresseffectiveEnum: this->ComputeDeviatoricStressTensor(); break;
    28982900                case EsaStrainratexxEnum:

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

    r23993 r23999  
    496496
    497497        IssmDouble  xyz_list[NUMVERTICES][3];
    498         IssmDouble  viscosity;
     498        IssmDouble  viscosity,lambda1,lambda2;
    499499        IssmDouble  epsilon[3]; /* epsilon=[exx,eyy,exy];*/
    500500        IssmDouble  tau_xx[NUMVERTICES];
    … …  
    505505        IssmDouble      tau_yz[NUMVERTICES]={0,0,0};
    506506        IssmDouble  tau_e[NUMVERTICES];
     507        IssmDouble  tau_1[NUMVERTICES];
     508        IssmDouble  tau_2[NUMVERTICES];
    507509        GaussTria*  gauss=NULL;
    508510        int domaintype,dim=2;
    … …  
    546548                tau_xy[iv]=2*viscosity*epsilon[2];
    547549                tau_e[iv]=1/sqrt(2)*sqrt(pow(tau_xx[iv],2)+pow(tau_yy[iv],2)+2*pow(tau_xy[iv],2));
     550
     551                /*Get Eigen values*/
     552                Matrix2x2Eigen(&tau_1[iv],&tau_2[iv],NULL,NULL,epsilon[0],epsilon[2],epsilon[1]);
    548553        }
    549554
    … …  
    556561        this->inputs->AddInput(new TriaInput(DeviatoricStresszzEnum,&tau_zz[0],P1Enum));
    557562        this->inputs->AddInput(new TriaInput(DeviatoricStresseffectiveEnum,&tau_e[0],P1Enum));
     563        this->inputs->AddInput(new TriaInput(DeviatoricStress1Enum,&tau_1[0],P1Enum));
     564        this->inputs->AddInput(new TriaInput(DeviatoricStress2Enum,&tau_2[0],P1Enum));
    558565
    559566        /*Clean up and return*/

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

    r23993 r23999  
    486486        DeviatoricStressyzEnum,
    487487        DeviatoricStresszzEnum,
     488        DeviatoricStress1Enum,
     489        DeviatoricStress2Enum,
    488490        DistanceToCalvingfrontEnum,
    489491        DistanceToGroundinglineEnum,

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

    r23994 r23999  
    492492                case DeviatoricStressyzEnum : return "DeviatoricStressyz";
    493493                case DeviatoricStresszzEnum : return "DeviatoricStresszz";
     494                case DeviatoricStress1Enum : return "DeviatoricStress1";
     495                case DeviatoricStress2Enum : return "DeviatoricStress2";
    494496                case DistanceToCalvingfrontEnum : return "DistanceToCalvingfront";
    495497                case DistanceToGroundinglineEnum : return "DistanceToGroundingline";

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

    r23994 r23999  
    501501              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
    502502              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
     503              else if (strcmp(name,"DeviatoricStress1")==0) return DeviatoricStress1Enum;
     504              else if (strcmp(name,"DeviatoricStress2")==0) return DeviatoricStress2Enum;
    503505              else if (strcmp(name,"DistanceToCalvingfront")==0) return DistanceToCalvingfrontEnum;
    504506              else if (strcmp(name,"DistanceToGroundingline")==0) return DistanceToGroundinglineEnum;
    505507              else if (strcmp(name,"Domain2Dhorizontal")==0) return Domain2DhorizontalEnum;
    506               else if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
    507               else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
     511              if (strcmp(name,"Domain2Dvertical")==0) return Domain2DverticalEnum;
     512              else if (strcmp(name,"Domain3D")==0) return Domain3DEnum;
     513              else if (strcmp(name,"DragCoefficientAbsGradient")==0) return DragCoefficientAbsGradientEnum;
    512514              else if (strcmp(name,"DrivingStressX")==0) return DrivingStressXEnum;
    513515              else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
    … …  
    627629              else if (strcmp(name,"P1")==0) return P1Enum;
    628630              else if (strcmp(name,"Pressure")==0) return PressureEnum;
    629               else if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
    630               else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
     634              if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
     635              else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
     636              else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
    635637              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    636638              else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
    … …  
    750752              else if (strcmp(name,"SmbZY")==0) return SmbZYEnum;
    751753              else if (strcmp(name,"StrainRateeffective")==0) return StrainRateeffectiveEnum;
    752               else if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
    753               else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
    754754         else stage=7;
    755755   }
    756756   if(stage==7){
    757               if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
     757              if (strcmp(name,"StrainRateparallel")==0) return StrainRateparallelEnum;
     758              else if (strcmp(name,"StrainRateperpendicular")==0) return StrainRateperpendicularEnum;
     759              else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
    758760              else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
    759761              else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
    … …  
    873875              else if (strcmp(name,"Outputdefinition64")==0) return Outputdefinition64Enum;
    874876              else if (strcmp(name,"Outputdefinition65")==0) return Outputdefinition65Enum;
    875               else if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
    876               else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
     880              if (strcmp(name,"Outputdefinition66")==0) return Outputdefinition66Enum;
     881              else if (strcmp(name,"Outputdefinition67")==0) return Outputdefinition67Enum;
     882              else if (strcmp(name,"Outputdefinition68")==0) return Outputdefinition68Enum;
    881883              else if (strcmp(name,"Outputdefinition69")==0) return Outputdefinition69Enum;
    882884              else if (strcmp(name,"Outputdefinition6")==0) return Outputdefinition6Enum;
    … …  
    996998              else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
    997999              else if (strcmp(name,"EsaTransitions")==0) return EsaTransitionsEnum;
    998               else if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
    999               else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
     1003              if (strcmp(name,"ExternalResult")==0) return ExternalResultEnum;
     1004              else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
     1005              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    10041006              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    10051007              else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
    … …  
    11191121              else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
    11201122              else if (strcmp(name,"Melange")==0) return MelangeEnum;
    1121               else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
    1122               else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"MeshX")==0) return MeshXEnum;
     1126              if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum;
     1127              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
     1128              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    11271129              else if (strcmp(name,"MeshY")==0) return MeshYEnum;
    11281130              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    … …  
    12421244              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
    12431245              else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
    1244               else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
    1245               else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
    12461246         else stage=11;
    12471247   }
    12481248   if(stage==11){
    1249               if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
     1249              if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
     1250              else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
     1251              else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
    12501252              else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
    12511253              else if (strcmp(name,"TransientArrayParam")==0) return TransientArrayParamEnum;

  • issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

    r23066 r23999  
    424424        *plambda1 = lambda1;
    425425        *plambda2 = lambda2;
    426         *pvx      = vx;
    427         *pvy      = vy;
     426        if(pvx) *pvx = vx;
     427        if(pvy) *pvy = vy;
    428428
    429429}/*}}}*/
Note: See TracChangeset for help on using the changeset viewer.