Changeset 11363

Timestamp:

02/08/12 14:09:56 (13 years ago)

Author:

seroussi

Message:

switch back geothermal flux for NR

File:

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

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

@@ -3903 +3903 @@
                 enthalpy_input->GetInputValue(&enthalpy,gauss);
                 pressure_input->GetInputValue(&pressure,gauss);
-                if(enthalpy>matpar->PureIceEnthalpy(pressure)){
-                        enthalpy_input->GetInputValue(&enthalpyup,gaussup);
-                        pressure_input->GetInputValue(&pressureup,gaussup);
-                        if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){
-                                //do nothing, don't add heatflux
-                        }
-                        else{
-                                //need to change spcenthalpy according to Aschwanden 
-                                //NEED TO UPDATE
-                        }
-                }
-                else{
+//              if(enthalpy>matpar->PureIceEnthalpy(pressure)){
+//                      enthalpy_input->GetInputValue(&enthalpyup,gaussup);
+//                      pressure_input->GetInputValue(&pressureup,gaussup);
+//                      if(enthalpyup>matpar->PureIceEnthalpy(pressureup)){
+//                              //do nothing, don't add heatflux
+//                      }
+//                      else{
+//                              //need to change spcenthalpy according to Aschwanden 
+//                              //NEED TO UPDATE
+//                      }
+//              }
+//              else{
                         geothermalflux_input->GetInputValue(&geothermalflux_value,gauss);
                         friction->GetAlpha2(&alpha2,gauss,VxEnum,VyEnum,VzEnum);
@@ -3925 +3925 @@
 
                         for(i=0;i<numdof;i++) pe->values[i]+=scalar*basis[i];
-                }
+//              }
         }