Changeset 4470

Timestamp:

07/08/10 14:42:11 (15 years ago)

Author:

seroussi

Message:

some problems in thermal

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Penta.h (modified) (1 diff)
• solvers/solver_thermal_nonlinear.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

@@ -42 +42 @@
         IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
         IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
+        IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz");
 
         /*Update elements: */
@@ -74 +75 @@
         xfree((void**)&iomodel->vx);
         xfree((void**)&iomodel->vy);
+        xfree((void**)&iomodel->vz);
 }

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

@@ -397 +397 @@
         else if (analysis_type==BalancedvelocitiesAnalysisEnum){
                 InputUpdateFromSolutionBalancedvelocities( solution);
+        }
+        else if (analysis_type==ThermalAnalysisEnum){
+                InputUpdateFromSolutionThermal( solution);
+        }
+        else if (analysis_type==MeltingAnalysisEnum){
+                InputUpdateFromSolutionMelting( solution);
         }
         else{
@@ -2468 +2474 @@
 void  Penta::InputUpdateFromSolutionBalancedvelocities(double* solution){
         ISSMERROR(" not supported yet!");
+}
+/*}}}*/
+/*FUNCTION Penta::InputUpdateFromSolutionThermal {{{1*/
+void  Penta::InputUpdateFromSolutionThermal(double* solution){
+
+        int i;
+
+        const int    numvertices=6;
+        const int    numdofpervertex=1;
+        const int    numdof=numdofpervertex*numvertices;
+
+        int          doflist[numdof];
+        double       values[numdof];
+
+        int          dummy;
+
+        /*Get dof list: */
+        GetDofList(&doflist[0],&dummy);
+
+        /*Use the dof list to index into the solution vector: */
+        for(i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+        }
+
+        /*Add thickness as inputs to the tria element: */
+        this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,values));
+}
+/*}}}*/
+/*FUNCTION Penta::InputUpdateFromSolutionMelting {{{1*/
+void  Penta::InputUpdateFromSolutionMelting(double* solution){
+
+        int i;
+
+        const int    numvertices=6;
+        const int    numdofpervertex=1;
+        const int    numdof=numdofpervertex*numvertices;
+
+        int          doflist[numdof];
+        double       values[numdof];
+
+        int          dummy;
+
+        /*Get dof list: */
+        GetDofList(&doflist[0],&dummy);
+
+        /*Use the dof list to index into the solution vector: */
+        for(i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+        }
+
+        /*Add thickness as inputs to the tria element: */
+        this->inputs->AddInput(new PentaVertexInput(MeltingRateEnum,values));
 }
 /*}}}*/

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

@@ -181 +181 @@
                 void    InputUpdateFromSurfaceSlopeX( double* solutiong);
                 void    InputUpdateFromSurfaceSlopeY( double* solutiong);
+                void    InputUpdateFromSolutionThermal( double* solutiong);
+                void    InputUpdateFromSolutionMelting( double* solutiong);
                 bool      IsInput(int name);
                 bool      IsOnSurface(void);

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -121 +121 @@
         }
 
+        //add melting_offset to inputs:
+        InputUpdateFromConstantx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,melting_offset,MeltingOffsetEnum);
+
         /*Free ressources: */
         MatFree(&Kgg_nopenalty);