Changeset 17681

Timestamp:

04/08/14 17:34:23 (11 years ago)

Author:

cborstad

Message:

CHG: renamed meshtype->meshxdim for consistency (though meshxdim is a bit confusing, sounds like the x-dimension)

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -165 +165 @@
         IssmDouble      sigma_yz[NUMVERTICES]={0,0,0};
         GaussTria*  gauss=NULL;
-        int meshtype,dim=2;
+        int meshxdim,dim=2;
 
         /* Get node coordinates and dof list: */
@@ -171 +171 @@
 
         /*Retrieve all inputs we will be needing: */
-        this->FindParam(&meshtype,MeshTypeEnum);
-        if(meshtype==Mesh2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <<EnumToStringx(meshtype)<<", extrude mesh or call ComputeDeviatoricStressTensor");
+        this->FindParam(&meshxdim,MeshTypeEnum);
+        if(meshxdim==Mesh2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <<EnumToStringx(meshxdim)<<", extrude mesh or call ComputeDeviatoricStressTensor");
         Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
         Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
@@ -218 +218 @@
         IssmDouble      tau_yz[NUMVERTICES]={0,0,0};
         GaussTria*  gauss=NULL;
-        int meshtype,dim=2;
+        int meshxdim,dim=2;
 
         /* Get node coordinates and dof list: */
@@ -224 +224 @@
 
         /*Retrieve all inputs we will be needing: */
-        this->FindParam(&meshtype,MeshTypeEnum);
-        if(meshtype!=Mesh2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <<EnumToStringx(meshtype));
+        this->FindParam(&meshxdim,MeshTypeEnum);
+        if(meshxdim!=Mesh2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <<EnumToStringx(meshxdim));
         Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
         Input* vy_input=inputs->GetInput(VyEnum);             _assert_(vy_input);