Changeset 4685

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:

• Elements/Penta.cpp (modified) (2 diffs)
• Materials/Matice.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -2642 +2642 @@
         int          doflist[numdof];
         double       values[numdof];
-
+        double       B[numdof];
+        double       B_average;
+
+        bool         collapse;
         int          dummy;
 
@@ -2651 +2654 @@
         for(i=0;i<numdof;i++){
                 values[i]=solution[doflist[i]];
+                //B[i]=Paterson(values[i]);
+        }
+
+        B_average=Paterson((values[0]+values[1]+values[2]+values[3]+values[4]+values[5])/6.0);
+        for(i=0;i<numdof;i++){
+                B[i]=B_average;
         }
 
         /*Add thickness as inputs to the tria element: */
         this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,values));
+
+        /*Also update the rheology WARNING: ONLY FOR PATTYN and STOKES FOR NOW*/
+        inputs->GetParameterValue(&collapse,CollapseEnum);
+        if (!collapse) this->matice->inputs->AddInput(new PentaVertexInput(RheologyBEnum,B));
+
 }
 /*}}}*/

issm/trunk/src/c/objects/Materials/Matice.h

@@ -16 +16 @@
         private: 
                 int        mid;
-                Inputs*  inputs;
 
         public:
+                /*WARNIN: input should not be public but it is an easy way to update B from T (using UpdateFromSolution) from Pentas*/
+                Inputs*  inputs;
 
                 /*Matice constructors, destructors: {{{1*/