Changeset 20625

Timestamp:

05/18/16 20:51:53 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed problem with CuffeyTemperate. The actual code was not included in Makefile.am

Location:

issm/trunk-jpl/src/c

Files:

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

issm/trunk-jpl/src/c/Makefile.am

@@ -116 +116 @@
                                         ./shared/Sorting/binary_search.cpp\
                                         ./shared/Elements/Cuffey.cpp\
+                                        ./shared/Elements/CuffeyTemperate.cpp\
                                         ./shared/Elements/StressIntensityIntegralWeight.cpp\
                                         ./shared/Elements/Paterson.cpp\

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);