Changeset 13528


Ignore:
Timestamp:
10/03/12 20:58:05 (12 years ago)
Author:
Mathieu Morlighem
Message:

BUG: reverted back to original regularization

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

    r13521 r13528  
    36593659                        vel=sqrt(pow(vx,2.)+pow(vy,2.)+pow(vz,2.))+1.e-14;
    36603660                        h=sqrt( pow(hx*vx/vel,2.) + pow(hy*vy/vel,2.) + pow(hz*vz/vel,2.));
    3661                         vz=0;
    3662                         K[0][0]=h/(2*vel)*(vx*vx);  K[0][1]=h/(2*vel)*(vx*vy); K[0][2]=h/(2*vel)*(vx*vz);
    3663                         K[1][0]=h/(2*vel)*(vy*vx);  K[1][1]=h/(2*vel)*(vy*vy); K[1][2]=h/(2*vel)*(vy*vz);
    3664                         K[2][0]=h/(2*vel)*(vz*vx);  K[2][1]=h/(2*vel)*(vz*vy); K[2][2]=h/(2*vel)*(vz*vz);
     3661
     3662                        K[0][0]=h/(2*vel)*fabs(vx*vx);  K[0][1]=h/(2*vel)*fabs(vx*vy); K[0][2]=h/(2*vel)*fabs(vx*vz);
     3663                        K[1][0]=h/(2*vel)*fabs(vy*vx);  K[1][1]=h/(2*vel)*fabs(vy*vy); K[1][2]=h/(2*vel)*fabs(vy*vz);
     3664                        K[2][0]=h/(2*vel)*fabs(vz*vx);  K[2][1]=h/(2*vel)*fabs(vz*vy); K[2][2]=h/(2*vel)*fabs(vz*vz);
    36653665
    36663666                        D_scalar_stab=gauss->weight*Jdet;
     
    43194319        IssmDouble B_average,s_average;
    43204320        int*   doflist=NULL;
    4321         IssmDouble pressure[numdof];
     4321        //IssmDouble pressure[numdof];
    43224322
    43234323        /*Get dof list: */
     
    43274327        for(i=0;i<numdof;i++){
    43284328                values[i]=solution[doflist[i]];
    4329                 GetInputListOnVertices(&pressure[0],PressureEnum);
    4330                 if(values[i]>matpar->TMeltingPoint(pressure[i])) values[i]=matpar->TMeltingPoint(pressure[i]);
    4331                 if(values[i]<matpar->TMeltingPoint(pressure[i])-50) values[i]=matpar->TMeltingPoint(pressure[i])-50;
     4329                //GetInputListOnVertices(&pressure[0],PressureEnum);
     4330                //if(values[i]>matpar->TMeltingPoint(pressure[i])) values[i]=matpar->TMeltingPoint(pressure[i]);
     4331                //if(values[i]<matpar->TMeltingPoint(pressure[i])-50) values[i]=matpar->TMeltingPoint(pressure[i])-50;
    43324332
    43334333                /*Check solution*/
Note: See TracChangeset for help on using the changeset viewer.