source: issm/oecreview/Archive/20545-21336/ISSM-20623-20624.diff@ 21337

Last change on this file since 21337 was 21337, checked in by Mathieu Morlighem, 8 years ago

CHG: added Archive/20545-21336

File size: 2.0 KB
RevLine 
[21337]1Index: ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 20623)
4+++ ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 20624)
5@@ -1492,10 +1492,10 @@
6 for(i=0;i<numnodes;i++) B[i]=Cuffey(temperature[i]);
7 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
8 break;
9- case CuffeyTemperateEnum:
10- for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i], element->GetMaterialParameter(MaterialsRheologyNEnum));
11- element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
12- break;
13+// case CuffeyTemperateEnum:
14+// for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i], element->GetMaterialParameter(MaterialsRheologyNEnum));
15+// element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
16+// break;
17 case PatersonEnum:
18 for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]);
19 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
20Index: ../trunk-jpl/src/c/shared/Elements/elements.h
21===================================================================
22--- ../trunk-jpl/src/c/shared/Elements/elements.h (revision 20623)
23+++ ../trunk-jpl/src/c/shared/Elements/elements.h (revision 20624)
24@@ -8,7 +8,7 @@
25 #include "../Numerics/types.h"
26
27 IssmDouble Cuffey(IssmDouble temperature);
28-IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
29+// IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
30 IssmDouble Paterson(IssmDouble temperature);
31 IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n);
32 IssmDouble LliboutryDuval(IssmDouble enthalpy, IssmDouble pressure, IssmDouble n, IssmDouble betaCC, IssmDouble referencetemperature, IssmDouble heatcapacity, IssmDouble latentheat);
Note: See TracBrowser for help on using the repository browser.