Changeset 22011

Timestamp:

08/25/17 16:08:32 (8 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing AD, GetMNaterialsParameter returns a double, not an int

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• analyses/ThermalAnalysis.cpp (modified) (1 diff)
• classes/Materials/Matpar.cpp (modified) (2 diffs)
• classes/Materials/Matpar.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -1525 +1525 @@
                 /*Update Rheology only if converged (we must make sure that the temperature is below melting point
                  * otherwise the rheology could be negative*/
-                rheology_law=element->GetMaterialParameter(MaterialsRheologyLawEnum);
+                rheology_law=element->GetIntegerMaterialParameter(MaterialsRheologyLawEnum);
                 element->GetInputListOnNodes(&surface[0],SurfaceEnum);
                 switch(rheology_law){

issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

@@ -809 +809 @@
                 /*Update Rheology only if converged (we must make sure that the temperature is below melting point
                  * otherwise the rheology could be negative*/
-                rheology_law=element->GetMaterialParameter(MaterialsRheologyLawEnum);
+                rheology_law=element->GetIntegerMaterialParameter(MaterialsRheologyLawEnum);
                 element->GetInputListOnNodes(&surface[0],SurfaceEnum);
                 switch(rheology_law){

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

@@ -646 +646 @@
                 case SmbRlapslgmEnum:                        return this->rlapslgm;
                 case SmbDpermilEnum:                         return this->dpermil;
-                case MaterialsRheologyLawEnum:               return this->rheology_law;
                 case MaterialsLithosphereShearModulusEnum:   return this->lithosphere_shear_modulus;
                 case MaterialsLithosphereDensityEnum:        return this->lithosphere_density;
@@ -657 +656 @@
 }
 /*}}}*/
+IssmDouble Matpar::GetIntegerMaterialParameter(int enum_in){/*{{{*/
+
+        switch(enum_in){
+                case MaterialsRheologyLawEnum:               return this->rheology_law;
+                default: _error_("Enum "<<EnumToStringx(enum_in)<<" not supported yet");
+        }
+
+}
+/*}}}*/
 IssmDouble Matpar::PureIceEnthalpy(IssmDouble pressure){/*{{{*/
         return heatcapacity*(TMeltingPoint(pressure)-referencetemperature);

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); 
                 IssmDouble PureIceEnthalpy(IssmDouble pressure);
                 void       ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure);