Changeset 4685


Ignore:
Timestamp:
07/21/10 08:38:33 (15 years ago)
Author:
seroussi
Message:

update B in matice for thermal solutions

Location:
issm/trunk/src/c/objects
Files:
2 edited

Legend:

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

    r4672 r4685  
    26422642        int          doflist[numdof];
    26432643        double       values[numdof];
    2644 
     2644        double       B[numdof];
     2645        double       B_average;
     2646
     2647        bool         collapse;
    26452648        int          dummy;
    26462649
     
    26512654        for(i=0;i<numdof;i++){
    26522655                values[i]=solution[doflist[i]];
     2656                //B[i]=Paterson(values[i]);
     2657        }
     2658
     2659        B_average=Paterson((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0);
     2660        for(i=0;i<numdof;i++){
     2661                B[i]=B_average;
    26532662        }
    26542663
    26552664        /*Add thickness as inputs to the tria element: */
    26562665        this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,values));
     2666
     2667        /*Also update the rheology WARNING: ONLY FOR PATTYN and STOKES FOR NOW*/
     2668        inputs->GetParameterValue(&collapse,CollapseEnum);
     2669        if (!collapse) this->matice->inputs->AddInput(new PentaVertexInput(RheologyBEnum,B));
     2670
    26572671}
    26582672/*}}}*/
  • issm/trunk/src/c/objects/Materials/Matice.h

    r4550 r4685  
    1616        private:
    1717                int        mid;
    18                 Inputs*  inputs;
    1918
    2019        public:
     20                /*WARNIN: input should not be public but it is an easy way to update B from T (using UpdateFromSolution) from Pentas*/
     21                Inputs*  inputs;
    2122
    2223                /*Matice constructors, destructors: {{{1*/
Note: See TracChangeset for help on using the changeset viewer.