source: issm/oecreview/Archive/16554-17801/ISSM-17534-17535.diff@ 17802

Last change on this file since 17802 was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 20.0 KB

  • ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

     
    33883388
    33893389        int         i,tausize,meshtype,dim;
    33903390        IssmDouble  Jdet,r;
     3391        IssmDouble  epsxx,epsyy,epszz,epsxy,epsxz,epsyz;
     3392        IssmDouble  sigmapxx,sigmapyy,sigmapzz,sigmapxy,sigmapxz,sigmapyz;
    33913393        IssmDouble *xyz_list = NULL;
     3394        Gauss*      gauss    = NULL;
    33923395
    33933396        /*Get problem dimension*/
    33943397        element->FindParam(&meshtype,MeshTypeEnum);
    … …  
    34113414        int* cs_list = xNew<int>(vnumnodes+pnumnodes);
    34123415        if(dim==2) for(i=0;i<vnumnodes;i++) cs_list[i] = XYEnum;
    34133416        else       for(i=0;i<vnumnodes;i++) cs_list[i] = XYZEnum;
    3414         for(i=0;i<pnumnodes;i++) cs_list[vnumnodes+i] = PressureEnum;
     3417        for(i=0;i<pnumnodes;i++) cs_list[vnumnodes+i]  = PressureEnum;
    34153418
    34163419        /*Initialize vectors*/
    34173420        ElementVector* pe    = element->NewElementVector(FSvelocityEnum);
    3418         IssmDouble*    Dstar = xNew<IssmDouble>(tausize*tnumnodes);
    3419         IssmDouble*    tau   = xNew<IssmDouble>(tausize);
     3421        IssmDouble*    Dstar = xNew<IssmDouble>((dim*vnumnodes)*(tausize*tnumnodes));
     3422        IssmDouble*    tau   = xNew<IssmDouble>(tausize*tnumnodes);
     3423        IssmDouble*    d     = xNew<IssmDouble>(tausize*tnumnodes);
    34203424
    34213425        /*Retrieve all inputs and parameters*/
    34223426        element->GetVerticesCoordinates(&xyz_list);
    34233427
     3428        /*Get d and tau*/
     3429        Input* epsxx_input=element->GetInput(StrainRatexxEnum); _assert_(epsxx_input);
     3430        Input* epsyy_input=element->GetInput(StrainRateyyEnum); _assert_(epsyy_input);
     3431        Input* epsxy_input=element->GetInput(StrainRatexyEnum); _assert_(epsxy_input);
     3432        Input* epszz_input=NULL; Input* epsxz_input=NULL; Input* epsyz_input=NULL;
     3433        Input* sigmapxx_input=element->GetInput(DeviatoricStressxxEnum); _assert_(sigmapxx_input);
     3434        Input* sigmapyy_input=element->GetInput(DeviatoricStressyyEnum); _assert_(sigmapyy_input);
     3435        Input* sigmapxy_input=element->GetInput(DeviatoricStressxyEnum); _assert_(sigmapxy_input);
     3436        Input* sigmapzz_input=NULL; Input* sigmapxz_input=NULL; Input* sigmapyz_input=NULL;
     3437        if(dim==3){
     3438                epszz_input=element->GetInput(StrainRatezzEnum); _assert_(epszz_input);
     3439                epsxz_input=element->GetInput(StrainRatexzEnum); _assert_(epsxz_input);
     3440                epsyz_input=element->GetInput(StrainRateyzEnum); _assert_(epsyz_input);
     3441                sigmapzz_input=element->GetInput(DeviatoricStresszzEnum); _assert_(sigmapzz_input);
     3442                sigmapxz_input=element->GetInput(DeviatoricStressxzEnum); _assert_(sigmapxz_input);
     3443                sigmapyz_input=element->GetInput(DeviatoricStressyzEnum); _assert_(sigmapyz_input);
     3444        }
     3445        gauss = element->NewGauss();
     3446        for(int i=0;i<tnumnodes;i++){
     3447                gauss->GaussNode(P1DGEnum,i);
     3448
     3449                epsxx_input->GetInputValue(&epsxx,gauss); sigmapxx_input->GetInputValue(&sigmapxx,gauss);
     3450                epsyy_input->GetInputValue(&epsyy,gauss); sigmapyy_input->GetInputValue(&sigmapyy,gauss);
     3451                epsxy_input->GetInputValue(&epsxy,gauss); sigmapxy_input->GetInputValue(&sigmapxy,gauss);
     3452                if(dim==2){
     3453                        d[i*tausize+0]=epsxx;  tau[i*tausize+0]=sigmapxx;
     3454                        d[i*tausize+1]=epsyy;  tau[i*tausize+1]=sigmapyy;
     3455                        d[i*tausize+2]=epsxy;  tau[i*tausize+2]=sigmapxy;
     3456                }
     3457                else{
     3458                        epszz_input->GetInputValue(&epszz,gauss); sigmapzz_input->GetInputValue(&sigmapzz,gauss);
     3459                        epsxz_input->GetInputValue(&epsxz,gauss); sigmapxz_input->GetInputValue(&sigmapxz,gauss);
     3460                        epsyz_input->GetInputValue(&epsyz,gauss); sigmapyz_input->GetInputValue(&sigmapyz,gauss);
     3461                        d[i*tausize+0]=epsxx;  tau[i*tausize+0]=sigmapxx;
     3462                        d[i*tausize+1]=epsyy;  tau[i*tausize+1]=sigmapyy;
     3463                        d[i*tausize+2]=epszz;  tau[i*tausize+2]=sigmapzz;
     3464                        d[i*tausize+3]=epsxy;  tau[i*tausize+3]=sigmapxy;
     3465                        d[i*tausize+4]=epsxz;  tau[i*tausize+4]=sigmapxz;
     3466                        d[i*tausize+5]=epsyz;  tau[i*tausize+5]=sigmapyz;
     3467                }
     3468        }
     3469
    34243470        /* Start  looping on the number of gaussian points: */
    3425         Gauss* gauss=element->NewGauss(5);
     3471        delete gauss;
     3472        gauss=element->NewGauss(5);
    34263473        for(int ig=gauss->begin();ig<gauss->end();ig++){
    34273474                gauss->GaussPoint(ig);
    34283475                element->JacobianDeterminant(&Jdet,xyz_list,gauss);
     3476
     3477                /*Create Dstar*/
    34293478                _error_("STOP");
    34303479        }
    34313480
    … …  
    34363485        delete gauss;
    34373486        xDelete<int>(cs_list);
    34383487        xDelete<IssmDouble>(xyz_list);
     3488        xDelete<IssmDouble>(Dstar);
     3489        xDelete<IssmDouble>(d);
     3490        xDelete<IssmDouble>(tau);
    34393491        return pe;
    34403492}/*}}}*/
    34413493ElementVector* StressbalanceAnalysis::CreatePVectorFSShelf(Element* element){/*{{{*/

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

     
    538538        StressTensoryyEnum,
    539539        StressTensoryzEnum,
    540540        StressTensorzzEnum,
     541        DeviatoricStressEnum,
     542        DeviatoricStressxxEnum,
     543        DeviatoricStressxyEnum,
     544        DeviatoricStressxzEnum,
     545        DeviatoricStressyyEnum,
     546        DeviatoricStressyzEnum,
     547        DeviatoricStresszzEnum,
     548        StrainRateEnum,
     549        StrainRatexxEnum,
     550        StrainRatexyEnum,
     551        StrainRatexzEnum,
     552        StrainRateyyEnum,
     553        StrainRateyzEnum,
     554        StrainRatezzEnum,
    541555        DivergenceEnum,
    542556        GiaCrossSectionShapeEnum,
    543557        GiadWdtEnum,

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

     
    527527                case StressTensoryyEnum : return "StressTensoryy";
    528528                case StressTensoryzEnum : return "StressTensoryz";
    529529                case StressTensorzzEnum : return "StressTensorzz";
     530                case DeviatoricStressEnum : return "DeviatoricStress";
     531                case DeviatoricStressxxEnum : return "DeviatoricStressxx";
     532                case DeviatoricStressxyEnum : return "DeviatoricStressxy";
     533                case DeviatoricStressxzEnum : return "DeviatoricStressxz";
     534                case DeviatoricStressyyEnum : return "DeviatoricStressyy";
     535                case DeviatoricStressyzEnum : return "DeviatoricStressyz";
     536                case DeviatoricStresszzEnum : return "DeviatoricStresszz";
     537                case StrainRateEnum : return "StrainRate";
     538                case StrainRatexxEnum : return "StrainRatexx";
     539                case StrainRatexyEnum : return "StrainRatexy";
     540                case StrainRatexzEnum : return "StrainRatexz";
     541                case StrainRateyyEnum : return "StrainRateyy";
     542                case StrainRateyzEnum : return "StrainRateyz";
     543                case StrainRatezzEnum : return "StrainRatezz";
    530544                case DivergenceEnum : return "Divergence";
    531545                case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape";
    532546                case GiadWdtEnum : return "GiadWdt";

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

     
    539539              else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
    540540              else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
    541541              else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
     542              else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
     543              else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
     544              else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
     545              else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
     546              else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
     547              else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
     548              else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
     549              else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
     550              else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
     551              else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
     552              else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
     553              else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
     554              else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
     555              else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
    542556              else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
    543557              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
    544558              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
    … …  
    614628              else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
    615629              else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
    616630              else if (strcmp(name,"Colinear")==0) return ColinearEnum;
    617               else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
     631         else stage=6;
     632   }
     633   if(stage==6){
     634              if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
    618635              else if (strcmp(name,"Fset")==0) return FsetEnum;
    619636              else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
    620637              else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
    … …  
    628645              else if (strcmp(name,"Nodal")==0) return NodalEnum;
    629646              else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
    630647              else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
    631          else stage=6;
    632    }
    633    if(stage==6){
    634               if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
     648              else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
    635649              else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
    636650              else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
    637651              else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;

  • ../trunk-jpl/src/m/enum/DeviatoricStressxzEnum.m

     
     1function macro=DeviatoricStressxzEnum()
     2%DEVIATORICSTRESSXZENUM - Enum of DeviatoricStressxz
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStressxzEnum()
     10
     11macro=StringToEnum('DeviatoricStressxz');

  • ../trunk-jpl/src/m/enum/DeviatoricStressyyEnum.m

     
     1function macro=DeviatoricStressyyEnum()
     2%DEVIATORICSTRESSYYENUM - Enum of DeviatoricStressyy
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStressyyEnum()
     10
     11macro=StringToEnum('DeviatoricStressyy');

  • ../trunk-jpl/src/m/enum/StrainRateyzEnum.m

     
     1function macro=StrainRateyzEnum()
     2%STRAINRATEYZENUM - Enum of StrainRateyz
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRateyzEnum()
     10
     11macro=StringToEnum('StrainRateyz');

  • ../trunk-jpl/src/m/enum/DeviatoricStressyzEnum.m

     
     1function macro=DeviatoricStressyzEnum()
     2%DEVIATORICSTRESSYZENUM - Enum of DeviatoricStressyz
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStressyzEnum()
     10
     11macro=StringToEnum('DeviatoricStressyz');

  • ../trunk-jpl/src/m/enum/StrainRatezzEnum.m

     
     1function macro=StrainRatezzEnum()
     2%STRAINRATEZZENUM - Enum of StrainRatezz
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRatezzEnum()
     10
     11macro=StringToEnum('StrainRatezz');

  • ../trunk-jpl/src/m/enum/DeviatoricStresszzEnum.m

     
     1function macro=DeviatoricStresszzEnum()
     2%DEVIATORICSTRESSZZENUM - Enum of DeviatoricStresszz
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStresszzEnum()
     10
     11macro=StringToEnum('DeviatoricStresszz');

  • ../trunk-jpl/src/m/enum/StrainRatexxEnum.m

     
     1function macro=StrainRatexxEnum()
     2%STRAINRATEXXENUM - Enum of StrainRatexx
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRatexxEnum()
     10
     11macro=StringToEnum('StrainRatexx');

  • ../trunk-jpl/src/m/enum/DeviatoricStressxxEnum.m

     
     1function macro=DeviatoricStressxxEnum()
     2%DEVIATORICSTRESSXXENUM - Enum of DeviatoricStressxx
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStressxxEnum()
     10
     11macro=StringToEnum('DeviatoricStressxx');

  • ../trunk-jpl/src/m/enum/StrainRatexyEnum.m

     
     1function macro=StrainRatexyEnum()
     2%STRAINRATEXYENUM - Enum of StrainRatexy
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRatexyEnum()
     10
     11macro=StringToEnum('StrainRatexy');

  • ../trunk-jpl/src/m/enum/StrainRateEnum.m

     
     1function macro=StrainRateEnum()
     2%STRAINRATEENUM - Enum of StrainRate
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRateEnum()
     10
     11macro=StringToEnum('StrainRate');

  • ../trunk-jpl/src/m/enum/DeviatoricStressEnum.m

     
     1function macro=DeviatoricStressEnum()
     2%DEVIATORICSTRESSENUM - Enum of DeviatoricStress
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStressEnum()
     10
     11macro=StringToEnum('DeviatoricStress');

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

     
    519519def StressTensoryyEnum(): return StringToEnum("StressTensoryy")[0]
    520520def StressTensoryzEnum(): return StringToEnum("StressTensoryz")[0]
    521521def StressTensorzzEnum(): return StringToEnum("StressTensorzz")[0]
     522def DeviatoricStressEnum(): return StringToEnum("DeviatoricStress")[0]
     523def DeviatoricStressxxEnum(): return StringToEnum("DeviatoricStressxx")[0]
     524def DeviatoricStressxyEnum(): return StringToEnum("DeviatoricStressxy")[0]
     525def DeviatoricStressxzEnum(): return StringToEnum("DeviatoricStressxz")[0]
     526def DeviatoricStressyyEnum(): return StringToEnum("DeviatoricStressyy")[0]
     527def DeviatoricStressyzEnum(): return StringToEnum("DeviatoricStressyz")[0]
     528def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0]
     529def StrainRateEnum(): return StringToEnum("StrainRate")[0]
     530def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0]
     531def StrainRatexyEnum(): return StringToEnum("StrainRatexy")[0]
     532def StrainRatexzEnum(): return StringToEnum("StrainRatexz")[0]
     533def StrainRateyyEnum(): return StringToEnum("StrainRateyy")[0]
     534def StrainRateyzEnum(): return StringToEnum("StrainRateyz")[0]
     535def StrainRatezzEnum(): return StringToEnum("StrainRatezz")[0]
    522536def DivergenceEnum(): return StringToEnum("Divergence")[0]
    523537def GiaCrossSectionShapeEnum(): return StringToEnum("GiaCrossSectionShape")[0]
    524538def GiadWdtEnum(): return StringToEnum("GiadWdt")[0]

  • ../trunk-jpl/src/m/enum/DeviatoricStressxyEnum.m

     
     1function macro=DeviatoricStressxyEnum()
     2%DEVIATORICSTRESSXYENUM - Enum of DeviatoricStressxy
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=DeviatoricStressxyEnum()
     10
     11macro=StringToEnum('DeviatoricStressxy');

  • ../trunk-jpl/src/m/enum/StrainRatexzEnum.m

     
     1function macro=StrainRatexzEnum()
     2%STRAINRATEXZENUM - Enum of StrainRatexz
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRatexzEnum()
     10
     11macro=StringToEnum('StrainRatexz');

  • ../trunk-jpl/src/m/enum/StrainRateyyEnum.m

     
     1function macro=StrainRateyyEnum()
     2%STRAINRATEYYENUM - Enum of StrainRateyy
     3%
     4%   WARNING: DO NOT MODIFY THIS FILE
     5%            this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
     6%            Please read src/c/shared/Enum/README for more information
     7%
     8%   Usage:
     9%      macro=StrainRateyyEnum()
     10
     11macro=StringToEnum('StrainRateyy');
Note: See TracBrowser for help on using the repository browser.