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
  • ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

     
    14921492                                for(i=0;i<numnodes;i++) B[i]=Cuffey(temperature[i]);
    14931493                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
    14941494                                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;
    14991499                        case PatersonEnum:
    15001500                                for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]);
    15011501                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
  • ../trunk-jpl/src/c/shared/Elements/elements.h

     
    88#include "../Numerics/types.h"
    99
    1010IssmDouble Cuffey(IssmDouble temperature);
    11 IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
     11// IssmDouble CuffeyTemperate(IssmDouble temperature, IssmDouble waterfraction, IssmDouble stressexp);
    1212IssmDouble Paterson(IssmDouble temperature);
    1313IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n);
    1414IssmDouble 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.