Changeset 16636

Timestamp:

11/06/13 14:00:16 (11 years ago)

Author:

seroussi

Message:

BUG: use EnthalpyPicard for Enthalpy non linear iterations

File:

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

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

@@ -3804 +3804 @@
         this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
         this->parameters->FindParam(&stabilization,ThermalStabilizationEnum);
-        Input* pressure_input=inputs->GetInput(PressureEnum);      _assert_(pressure_input);
-        Input* enthalpy_input=inputs->GetInput(EnthalpyPicardEnum);_assert_(enthalpy_input); //for this iteration of the step
         Input* vx_input=inputs->GetInput(VxEnum);                  _assert_(vx_input);
         Input* vy_input=inputs->GetInput(VyEnum);                  _assert_(vy_input);
@@ -3824 +3822 @@
                 /*Conduction: */  
                 GetBConduct(&B_conduct[0][0],&xyz_list[0][0],gauss); 
-                GetInputListOnVertices(&enthalpy[0],EnthalpyEnum);
+                GetInputListOnVertices(&enthalpy[0],EnthalpyPicardEnum);
                 GetInputListOnVertices(&pressure[0],PressureEnum);
                 kappa=matpar->GetEnthalpyDiffusionParameterVolume(enthalpy,pressure); _assert_(kappa>0.);
@@ -4253 +4251 @@
         Input* vy_input=inputs->GetInput(VyEnum);                                  _assert_(vy_input);
         Input* vz_input=inputs->GetInput(VzEnum);                                  _assert_(vz_input);
-        Input* pressure_input=inputs->GetInput(PressureEnum);                      _assert_(pressure_input);
         Input* enthalpy_input=NULL; 
-        Input* enthalpypicard_input=NULL; 
         if(reCast<bool,IssmDouble>(dt)){
                 enthalpy_input=inputs->GetInput(EnthalpyEnum); _assert_(enthalpy_input);
@@ -4261 +4257 @@
         if (stabilization==2){
                 diameter=MinEdgeLength(xyz_list);
-                enthalpypicard_input=inputs->GetInput(EnthalpyPicardEnum); _assert_(enthalpypicard_input);
         }
 
@@ -4410 +4405 @@
         Input* vy_input=inputs->GetInput(VyEnum);                         _assert_(vy_input);
         Input* vz_input=inputs->GetInput(VzEnum);                         _assert_(vz_input);
-        Input* enthalpy_input=inputs->GetInput(EnthalpyEnum);             _assert_(enthalpy_input);
+        Input* enthalpy_input=inputs->GetInput(EnthalpyPicardEnum);       _assert_(enthalpy_input);
         Input* pressure_input=inputs->GetInput(PressureEnum);             _assert_(pressure_input);
         Input* geothermalflux_input=inputs->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input);
-        Input* watercolumn_input=inputs->GetInput(WatercolumnEnum); _assert_(watercolumn_input);
+        Input* watercolumn_input=inputs->GetInput(WatercolumnEnum);       _assert_(watercolumn_input);
 
         /*Build friction element, needed later: */