Changeset 17935

Timestamp:

05/05/14 16:00:22 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: temperature is back to P1

File:

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

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

@@ -34 +34 @@
 
         /*Update elements: */
+        int finiteelement = P1Enum;
         int counter=0;
         for(int i=0;i<iomodel->numberofelements;i++){
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(i,iomodel,analysis_counter,analysis_type,P2Enum);
+                        element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement);
                         counter++;
                 }
@@ -87 +88 @@
 void ThermalAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
 
+        int finiteelement = P1Enum;
         if(iomodel->domaintype==Domain3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
-        ::CreateNodes(nodes,iomodel,ThermalAnalysisEnum,P2Enum);
+        ::CreateNodes(nodes,iomodel,ThermalAnalysisEnum,finiteelement);
         iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
 }/*}}}*/
@@ -94 +96 @@
 
         /*Only 3d mesh supported*/
+        int finiteelement = P1Enum;
         if(iomodel->domaintype==Domain3DEnum){
-                IoModelToConstraintsx(constraints,iomodel,ThermalSpctemperatureEnum,ThermalAnalysisEnum,P2Enum);
+                IoModelToConstraintsx(constraints,iomodel,ThermalSpctemperatureEnum,ThermalAnalysisEnum,finiteelement);
         }