Changeset 21779

Timestamp:

07/04/17 14:03:22 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed Viscous Heating output (was crashing because we are not looking for the right nodes) and fixed also memory leak

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -1074 +1074 @@
                 xDelete<IssmDouble>(watercolumn);
                 xDelete<IssmDouble>(drainage_int);
-        }
-        xDelete<int>(basalnodeindices);
+                xDelete<int>(basalnodeindices);
+        }
 }/*}}}*/
 void                            EnthalpyAnalysis::DrainageUpdateEnthalpy(FemModel* femmodel){/*{{{*/

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -3179 +3179 @@
         /*Intermediaries*/
         IssmDouble phi;
-        IssmDouble viscosity;
-        IssmDouble epsilon[6];
         IssmDouble thickness;
         IssmDouble *xyz_list = NULL;
@@ -3189 +3187 @@
 
         /*Retrieve all inputs and parameters*/
-        this->GetVerticesCoordinatesBase(&xyz_list);
+        this->GetVerticesCoordinates(&xyz_list);
         Input* vx_input        = this->GetInput(VxEnum); _assert_(vx_input);
         Input* vy_input        = this->GetInput(VyEnum); _assert_(vy_input);
         Input* vz_input        = this->GetInput(VzEnum); _assert_(vz_input);
-        Input* thickness_input = this->GetInput(ThicknessEnum); _assert_(thickness_input);
 
         /*loop over vertices: */
@@ -3200 +3197 @@
                 gauss->GaussVertex(iv);
 
-                thickness_input->GetInputValue(&thickness,gauss);
-
-                this->StrainRateFS(&epsilon[0],xyz_list,gauss,vx_input,vy_input,vz_input);
-                this->material->ViscosityFS(&viscosity,3,xyz_list,gauss,vx_input,vy_input,vz_input);
-                this->GetPhi(&phi,&epsilon[0],viscosity);
-
-                viscousheating[iv]=phi*thickness;
+                this->ViscousHeating(&phi,xyz_list,gauss,vx_input,vy_input,vz_input);
+
+                viscousheating[iv]=phi;
         }