Changeset 20624

Timestamp:

05/18/16 18:31:13 (9 years ago)

Author:

jbondzio

Message:

BUG: temporary fix compilationerror

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• shared/Elements/elements.h (modified) (1 diff)

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

@@ -1493 +1493 @@
                                 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
                                 break;
-                        case CuffeyTemperateEnum:
-                                for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i], element->GetMaterialParameter(MaterialsRheologyNEnum));
-                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
-                                break;
+//                      case CuffeyTemperateEnum:
+//                              for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i], element->GetMaterialParameter(MaterialsRheologyNEnum));
+//                              element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
+//                              break;
                         case PatersonEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]);

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -9 +9 @@
 
 IssmDouble Cuffey(IssmDouble temperature);
-IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
+// IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
 IssmDouble Paterson(IssmDouble temperature);
 IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n);