Changeset 22016

Timestamp:

08/26/17 21:05:35 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: returning int instead of double

Location:

issm/trunk-jpl/src/c/classes/Materials

Files:

• Matpar.cpp (modified) (1 diff)
• Matpar.h (modified) (1 diff)

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

@@ -656 +656 @@
 }
 /*}}}*/
-IssmDouble Matpar::GetIntegerMaterialParameter(int enum_in){/*{{{*/
+int        Matpar::GetIntegerMaterialParameter(int enum_in){/*{{{*/
 
         switch(enum_in){

issm/trunk-jpl/src/c/classes/Materials/Matpar.h

@@ -124 +124 @@
                 IssmDouble GetEnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure);
                 IssmDouble GetMaterialParameter(int in_enum); 
-                IssmDouble GetIntegerMaterialParameter(int in_enum); 
+                int        GetIntegerMaterialParameter(int in_enum); 
                 IssmDouble PureIceEnthalpy(IssmDouble pressure);
                 void       ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure);