Changeset 17609 for issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

Timestamp:

03/31/14 16:33:33 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: InputUpdateFromSolution do not assume a P1 finite element anymore

File:

• issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (modified) (3 diffs)

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

@@ -673 +673 @@
         element->GetInputValue(&converged,ConvergedEnum);
         if(converged){
-                element->AddInput(TemperatureEnum,values,P1Enum);
+                element->AddInput(TemperatureEnum,values,element->GetElementType());
 
                 /*Update Rheology only if converged (we must make sure that the temperature is below melting point
@@ -685 +685 @@
                         case CuffeyEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Cuffey(values[i]);
-                                element->AddInput(MaterialsRheologyBEnum,&B[0],P1Enum);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
                                 break;
                         case PatersonEnum:
                                 for(i=0;i<numnodes;i++) B[i]=Paterson(values[i]);
-                                element->AddInput(MaterialsRheologyBEnum,&B[0],P1Enum);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
                                 break;
                         case ArrheniusEnum:{
                                 element->GetVerticesCoordinates(&xyz_list);
                                 for(i=0;i<numnodes;i++) B[i]=Arrhenius(values[i],surface[i]-xyz_list[i*3+2],element->GetMaterialParameter(MaterialsRheologyNEnum));
-                                element->AddInput(MaterialsRheologyBEnum,&B[0],P1Enum);
+                                element->AddInput(MaterialsRheologyBEnum,&B[0],element->GetElementType());
                                 break;
                                 }
@@ -702 +702 @@
         }
         else{
-                element->AddInput(TemperaturePicardEnum,values,P1Enum);
+                element->AddInput(TemperaturePicardEnum,values,element->GetElementType());
         }