source:
issm/oecreview/Archive/20545-21336/ISSM-20623-20624.diff@
21337
Last change on this file since 21337 was 21337, checked in by , 8 years ago | |
---|---|
File size: 2.0 KB |
-
../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
1492 1492 for(i=0;i<numnodes;i++) B[i]=Cuffey(temperature[i]); 1493 1493 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); 1494 1494 break; 1495 case CuffeyTemperateEnum:1496 for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i], element->GetMaterialParameter(MaterialsRheologyNEnum));1497 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());1498 break;1495 // case CuffeyTemperateEnum: 1496 // for(i=0;i<numnodes;i++) B[i]=CuffeyTemperate(temperature[i], waterfraction[i], element->GetMaterialParameter(MaterialsRheologyNEnum)); 1497 // element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); 1498 // break; 1499 1499 case PatersonEnum: 1500 1500 for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]); 1501 1501 element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType()); -
../trunk-jpl/src/c/shared/Elements/elements.h
8 8 #include "../Numerics/types.h" 9 9 10 10 IssmDouble Cuffey(IssmDouble temperature); 11 IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);11 // IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp); 12 12 IssmDouble Paterson(IssmDouble temperature); 13 13 IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n); 14 14 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.