Changeset 11393

Timestamp:

02/10/12 10:05:41 (13 years ago)

Author:

seroussi

Message:

minor enthalpy

File:

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

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

@@ -3708 +3708 @@
         double rho_ice,heatcapacity;
         double thermalconductivity,kappa;
-        double viscosity,enthalpy,pressure;
+        double viscosity,pressure;
+        double enthalpy,enthalpypicard;
         double tau_parameter,diameter;
         double u,v,w;
@@ -3733 +3734 @@
         Input* vz_input=inputs->GetInput(VzEnum);                                  _assert_(vz_input);
         Input* pressure_input=inputs->GetInput(PressureEnum);                      _assert_(pressure_input);
-        Input* enthalpy_input=NULL; enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input);
-        if (stabilization==2) diameter=MinEdgeLength(xyz_list);
+        Input* enthalpy_input=NULL; 
+        Input* enthalpypicard_input=NULL; 
+        if(dt){
+                enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input);
+        }
+        if (stabilization==2){
+                diameter=MinEdgeLength(xyz_list);
+                enthalpypicard_input=inputs->GetInput(EnthalpyPicardEnum); _assert_(enthalpypicard_input);
+        }
 
         /* Start  looping on the number of gaussian points: */
@@ -3747 +3755 @@
                 this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input);
                 matice->GetViscosity3dStokes(&viscosity,&epsilon[0]);
-                enthalpy_input->GetInputValue(&enthalpy, gauss);
                 GetPhi(&phi, &epsilon[0], viscosity);
 
@@ -3757 +3764 @@
                 /* Build transient now */
                 if(dt){
+                        enthalpy_input->GetInputValue(&enthalpy, gauss);
                         scalar_transient=enthalpy*Jdet*gauss->weight;
                         for(i=0;i<NUMVERTICES;i++)  pe->values[i]+=scalar_transient*L[i];
@@ -3768 +3776 @@
                         vz_input->GetInputValue(&w, gauss);
                         pressure_input->GetInputValue(&pressure, gauss);
+                        enthalpypicard_input->GetInputValue(&enthalpypicard, gauss);
                         kappa=matpar->GetEnthalpyDiffusionParameter(enthalpy,pressure);
                         tau_parameter=GetStabilizationParameter(u,v,w,diameter,kappa);
@@ -4332 +4341 @@
                         matpar->EnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]);
                         if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector");
-                        if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector");
+                        //if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector");
                 }