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

Timestamp:

04/09/14 17:49:39 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renamed Mesh3D Domain3D etc and simplified the way we get the dimension when possible

File:

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

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

@@ -104 +104 @@
         parameters->FindParam(&domaintype,DomainTypeEnum);
         switch(domaintype){
-                case Mesh2DhorizontalEnum:
+                case Domain2DhorizontalEnum:
                         this->inputs->AddInput(new TriaInput(input_enum,values,interpolation_enum));
                         break;
-                case Mesh2DverticalEnum:{
+                case Domain2DverticalEnum:{
                         if(interpolation_enum==P1Enum){
                                 IssmDouble values2[NUMVERTICES]={0.};
@@ -172 +172 @@
         /*Retrieve all inputs we will be needing: */
         this->FindParam(&domaintype,DomainTypeEnum);
-        if(domaintype==Mesh2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <<EnumToStringx(domaintype)<<", extrude mesh or call ComputeDeviatoricStressTensor");
+        if(domaintype==Domain2DhorizontalEnum) _error_("stress tensor calculation not supported for mesh of type " <<EnumToStringx(domaintype)<<", extrude mesh or call ComputeDeviatoricStressTensor");
         Input* pressure_input=inputs->GetInput(PressureEnum); _assert_(pressure_input);
         Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
@@ -225 +225 @@
         /*Retrieve all inputs we will be needing: */
         this->FindParam(&domaintype,DomainTypeEnum);
-        if(domaintype!=Mesh2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <<EnumToStringx(domaintype));
+        if(domaintype!=Domain2DhorizontalEnum) _error_("deviatoric stress tensor calculation not implemented for mesh of type " <<EnumToStringx(domaintype));
         Input* vx_input=inputs->GetInput(VxEnum);             _assert_(vx_input);
         Input* vy_input=inputs->GetInput(VyEnum);             _assert_(vy_input);
@@ -529 +529 @@
         if(gl[2]==0.) gl[2]=gl[2]+epsilon;
 
-        if(domaintype==Mesh2DverticalEnum){
+        if(domaintype==Domain2DverticalEnum){
                 this->EdgeOnBaseIndices(&index1,&index2);
                 if(gl[index1]>0 && gl[index2]>0) phi=1; // All grounded
@@ -541 +541 @@
 
         }
-        else if(domaintype==Mesh2DhorizontalEnum || domaintype==Mesh3DEnum){
+        else if(domaintype==Domain2DhorizontalEnum || domaintype==Domain3DEnum){
                 /*Check that not all nodes are grounded or floating*/
                 if(gl[0]>0 && gl[1]>0 && gl[2]>0){ // All grounded
@@ -1166 +1166 @@
         this->parameters->FindParam(&domaintype,DomainTypeEnum);
         switch(domaintype){
-                case Mesh2DverticalEnum:
+                case Domain2DverticalEnum:
                         return HasEdgeOnBase();
-                case Mesh2DhorizontalEnum:
+                case Domain2DhorizontalEnum:
                         return true;
                 default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");
@@ -1180 +1180 @@
         this->parameters->FindParam(&domaintype,DomainTypeEnum);
         switch(domaintype){
-                case Mesh2DverticalEnum:
+                case Domain2DverticalEnum:
                         return HasEdgeOnSurface();
-                case Mesh2DhorizontalEnum:
+                case Domain2DhorizontalEnum:
                         return true;
                 default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");
@@ -1845 +1845 @@
         this->parameters->FindParam(&domaintype,DomainTypeEnum);
         switch(domaintype){
-                case Mesh2DhorizontalEnum:
+                case Domain2DhorizontalEnum:
                         return this;
-                case Mesh2DverticalEnum:
+                case Domain2DverticalEnum:
                         _assert_(HasEdgeOnBase());
                         this->EdgeOnBaseIndices(&index1,&index2);
@@ -1864 +1864 @@
         this->parameters->FindParam(&domaintype,DomainTypeEnum);
         switch(domaintype){
-                case Mesh2DhorizontalEnum:
+                case Domain2DhorizontalEnum:
                         return this;
-                case Mesh2DverticalEnum:
+                case Domain2DverticalEnum:
                         _assert_(HasEdgeOnSurface());
                         this->EdgeOnSurfaceIndices(&index1,&index2);
@@ -2221 +2221 @@
         int domaintype;
         parameters->FindParam(&domaintype,DomainTypeEnum);
-        if(domaintype==Mesh2DverticalEnum){
+        if(domaintype==Domain2DverticalEnum){
           return base;
         }
@@ -2297 +2297 @@
         Input* vx_input=NULL;
         Input* vy_input=NULL;
-        if(domaintype==Mesh2DhorizontalEnum){
+        if(domaintype==Domain2DhorizontalEnum){
                 vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
                 vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
@@ -2364 +2364 @@
         Input* vx_input=NULL;
         Input* vy_input=NULL;
-        if(domaintype==Mesh2DhorizontalEnum){
+        if(domaintype==Domain2DhorizontalEnum){
                 vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
                 vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);