Changeset 17674 for issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp

Timestamp:

04/08/14 14:59:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renamed meshtype->meshxdim (Extended Dimension) and added meshdim (2 or 3) and meshtype (Tria Penta Tetra)

File:

• issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (modified) (5 diffs)

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

@@ -6 +6 @@
 
 /*Model processing*/
-int  SmoothedSurfaceSlopeXAnalysis::DofsPerNode(int** doflist,int meshtype,int approximation){/*{{{*/
+int  SmoothedSurfaceSlopeXAnalysis::DofsPerNode(int** doflist,int meshxdim,int approximation){/*{{{*/
         return 1;
 }/*}}}*/
@@ -26 +26 @@
         iomodel->FetchDataToInput(elements,BaseEnum);
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
-        if(iomodel->meshtype==Mesh3DEnum){
+        if(iomodel->meshxdim==Mesh3DEnum){
                 iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
                 iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
         }
-        if(iomodel->meshtype==Mesh2DverticalEnum){
+        if(iomodel->meshxdim==Mesh2DverticalEnum){
                 iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum);
         }
 }/*}}}*/
 void SmoothedSurfaceSlopeXAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
-        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum);
+        if(iomodel->meshxdim==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum);
         ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeXAnalysisEnum,P1Enum);
-        if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbaseEnum);
+        if(iomodel->meshxdim==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbaseEnum);
 }/*}}}*/
 void SmoothedSurfaceSlopeXAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
@@ -105 +105 @@
 
         /*Intermediaries*/
-        int      meshtype;
+        int      meshxdim;
         Element* basalelement;
 
         /*Get basal element*/
-        element->FindParam(&meshtype,MeshTypeEnum);
-        switch(meshtype){
+        element->FindParam(&meshxdim,MeshXDimEnum);
+        switch(meshxdim){
                 case Mesh2DhorizontalEnum:
                         basalelement = element;
@@ -118 +118 @@
                         basalelement = element->SpawnBasalElement();
                         break;
-                default: _error_("mesh "<<EnumToStringx(meshtype)<<" not supported yet");
+                default: _error_("mesh "<<EnumToStringx(meshxdim)<<" not supported yet");
         }
 
@@ -169 +169 @@
         xDelete<IssmDouble>(basis);
         delete gauss;
-        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
+        if(meshxdim!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
         return pe;
 }/*}}}*/