Changeset 16750

Timestamp:

11/13/13 19:29:34 (11 years ago)

Author:

seroussi

Message:

CHG: finished changes of InputUpdateFromSolution in enthalpy analysis

File:

• issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)

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

@@ -246 +246 @@
                                 break;
                         case LliboutryDuvalEnum:
-                                //for(i=0;i<numnodes;i++) B[i]=LliboutryDuval(values[i],pressure[i],material->GetN(),matpar->GetBeta(),matpar->GetReferenceTemperature(),matpar->GetHeatCapacity(),matpar->GetLatentHeat()); for(i=0;i<numnodes;i++) B[i]=Paterson(values[i]); 
-                                for(i=0;i<numnodes;i++) B[i]=Paterson(temperature[i]);
+                                for(i=0;i<numnodes;i++) B[i]=LliboutryDuval(values[i],pressure[i],element->GetMaterialParameter(MaterialsRheologyNEnum),element->GetMaterialParameter(MaterialsBetaEnum),element->GetMaterialParameter(ConstantsReferencetemperatureEnum),element->GetMaterialParameter(MaterialsHeatcapacityEnum),element->GetMaterialParameter(MaterialsLatentheatEnum)); 
                                 element->AddMaterialInput(MaterialsRheologyBEnum,&B[0],P1Enum); 
                                 break;