Changeset 4685
- Timestamp:
- 07/21/10 08:38:33 (15 years ago)
- Location:
- issm/trunk/src/c/objects
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r4672 r4685 2642 2642 int doflist[numdof]; 2643 2643 double values[numdof]; 2644 2644 double B[numdof]; 2645 double B_average; 2646 2647 bool collapse; 2645 2648 int dummy; 2646 2649 … … 2651 2654 for(i=0;i<numdof;i++){ 2652 2655 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; 2653 2662 } 2654 2663 2655 2664 /*Add thickness as inputs to the tria element: */ 2656 2665 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 2657 2671 } 2658 2672 /*}}}*/ -
issm/trunk/src/c/objects/Materials/Matice.h
r4550 r4685 16 16 private: 17 17 int mid; 18 Inputs* inputs;19 18 20 19 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; 21 22 22 23 /*Matice constructors, destructors: {{{1*/
Note:
See TracChangeset
for help on using the changeset viewer.