source: issm/oecreview/Archive/20545-21336/ISSM-20964-20965.diff@ 21337

Last change on this file since 21337 was 21337, checked in by Mathieu Morlighem, 8 years ago

CHG: added Archive/20545-21336

File size: 1.8 KB
  • ../trunk-jpl/src/c/classes/Elements/Element.cpp

     
    6262        /*Allocate arrays*/
    6363        int numvertices = this->GetNumberOfVertices();
    6464        IssmDouble* lambdas = xNew<IssmDouble>(numvertices);
    65         IssmDouble* vorticityx = xNew<IssmDouble>(numvertices);
    66         IssmDouble* vorticityy = xNew<IssmDouble>(numvertices);
    67         IssmDouble* vorticityz = xNew<IssmDouble>(numvertices);
    68         IssmDouble* omega_corrx = xNew<IssmDouble>(numvertices);
    69         IssmDouble* omega_corry = xNew<IssmDouble>(numvertices);
    70         IssmDouble* omega_corrz = xNew<IssmDouble>(numvertices);
    7165
    7266        /* Start looping on the number of vertices: */
    7367        Gauss* gauss=this->NewGauss();
     
    106100                }
    107101                EstarStrainrateQuantities(&epso,&epsprime,vx,vy,vz,vmag,&dvx[0],&dvy[0],&dvz[0],&dvmag[0]);
    108102                lambdas[iv]=EstarLambdaS(epso,epsprime);
    109                 vorticityx[iv]=dvz[1]-dvy[2];
    110                 vorticityy[iv]=dvx[2]-dvz[0];
    111                 vorticityz[iv]=dvy[0]-dvx[1];
    112                 omega_corrx[iv] = -vorticityx[iv] + 2*(dvmag[1]*vz - dvmag[2]*vy)/vmag;
    113                 omega_corry[iv] = -vorticityy[iv] + 2*(dvmag[2]*vx - dvmag[0]*vz)/vmag;
    114                 omega_corrz[iv] = -vorticityz[iv] + 2*(dvmag[0]*vy - dvmag[1]*vx)/vmag;
    115103        }
    116104
    117105        /*Add Stress tensor components into inputs*/
    118106        this->AddInput(LambdaSEnum,lambdas,P1Enum);
    119         this->AddInput(Outputdefinition21Enum,vorticityx,P1Enum);
    120         this->AddInput(Outputdefinition22Enum,vorticityy,P1Enum);
    121         this->AddInput(Outputdefinition23Enum,vorticityz,P1Enum);
    122         this->AddInput(Outputdefinition31Enum,omega_corrx,P1Enum);
    123         this->AddInput(Outputdefinition32Enum,omega_corry,P1Enum);
    124         this->AddInput(Outputdefinition33Enum,omega_corrz,P1Enum);
    125107       
    126108        /*Clean up and return*/
    127109        delete gauss;
Note: See TracBrowser for help on using the repository browser.