Changeset 8500

Timestamp:

06/03/11 14:01:57 (14 years ago)

Author:

seroussi

Message:

src: some enthalpy work

Location:

issm/trunk/src

Files:

• c/objects/Elements/Penta.cpp (modified) (2 diffs)
• c/solutions/enthalpy_core.cpp (modified) (1 diff)
• m/solutions/enthalpy_core.m (added)

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

@@ -6096 +6096 @@
         
 
-        this->inputs->GetParameterValue(&converged,ConvergedEnum);
-        if(converged){
+//      this->inputs->GetParameterValue(&converged,ConvergedEnum);
+//      if(converged){
                 /*Convert enthalpy into temperature and water fraction*/
                 for(i=0;i<numdof;i++) matpar->EnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]);
@@ -6129 +6129 @@
 
                 }
-        }
-        else{
-                this->inputs->AddInput(new PentaVertexInput(EnthalpyPicardEnum,values));
-        }
+//      }
+//      else{
+//              this->inputs->AddInput(new PentaVertexInput(EnthalpyPicardEnum,values));
+//      }
 
         /*Free ressources:*/

issm/trunk/src/c/solutions/enthalpy_core.cpp

@@ -52 +52 @@
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i+1,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,i+1,time);
-                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,i+1,time);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterFractionEnum,i+1,time);
                 }