Changeset 11351

Timestamp:

02/07/12 15:22:58 (13 years ago)

Author:

seroussi

Message:

minor

Location:

issm/trunk-jpl/src/c/objects

Files:

• Elements/Penta.cpp (modified) (1 diff)
• Materials/Matpar.cpp (modified) (1 diff)

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

@@ -4331 +4331 @@
                         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");
                 }
                         

issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp

@@ -420 +420 @@
         }
         else{
-                return 1*thermalconductivity/(rho_ice*heatcapacity);
+                return 0.1*thermalconductivity/(rho_ice*heatcapacity);
         }
 }