Changeset 11273

Timestamp:

01/31/12 11:44:29 (13 years ago)

Author:

seroussi

Message:

fixed major problem for transient enthalpy

File:

• issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (modified) (3 diffs)

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

@@ -3672 +3672 @@
         double rho_ice,heatcapacity;
         double thermalconductivity;
-        double viscosity,temperature;
+        double viscosity,enthalpy;
         double tau_parameter,diameter;
         double u,v,w;
@@ -3696 +3696 @@
         Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
         Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input);
-        Input* temperature_input=NULL;
-        if (dt) temperature_input=inputs->GetInput(TemperatureEnum); _assert_(inputs);
+        Input* enthalpy_input=NULL;
+        if (dt) enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(inputs);
         if (stabilization==2) diameter=MinEdgeLength(xyz_list);
 
@@ -3720 +3720 @@
                 /* Build transient now */
                 if(dt){
-                        temperature_input->GetInputValue(&temperature, gauss);
-                        scalar_transient=temperature*Jdet*gauss->weight;
+                        enthalpy_input->GetInputValue(&enthalpy, gauss);
+                        scalar_transient=enthalpy*Jdet*gauss->weight;
                         for(i=0;i<NUMVERTICES;i++)  pe->values[i]+=scalar_transient*L[i];
                 }