Changeset 16291 for issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateConstraintsStressbalance.cpp

Timestamp:

10/03/13 14:53:55 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed mesh dimension and replaced by meshtype (I know... type is not good but I could not come up with anything better), prepare changes for flowband model

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateConstraintsStressbalance.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateConstraintsStressbalance.cpp

@@ -161 +161 @@
         iomodel->FetchData(&spcvz,&Mz,&Nz,StressbalanceSpcvzEnum);
         iomodel->FetchData(&nodeonSSA,NULL,NULL,FlowequationBorderSSAEnum);
-        if(iomodel->dim==3)iomodel->FetchData(&nodeonHO,NULL,NULL,FlowequationBorderHOEnum);
-        if(iomodel->dim==3)iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum);
-        if(iomodel->dim==3)iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
-        if(iomodel->dim==3)iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&nodeonHO,NULL,NULL,FlowequationBorderHOEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum);
         iomodel->FetchData(&vertices_type,NULL,NULL,FlowequationVertexEquationEnum);
         iomodel->FetchData(&surface,NULL,NULL,SurfaceEnum);
@@ -385 +385 @@
 
                         /*Constraint at the bedrock interface (v.n = vz = 0) (Coordinates will be updated according to the bed slope)*/
-                        if (iomodel->dim==3) if(nodeonbed[i]>0. && groundedice_ls[i]>=0. && nodeonFS[i]>0.){
+                        if (iomodel->meshtype==Mesh3DEnum) if(nodeonbed[i]>0. && groundedice_ls[i]>=0. && nodeonFS[i]>0.){
                                  switch(reCast<int,IssmDouble>(vertices_type[i])){
                                         case SSAFSApproximationEnum:
@@ -410 +410 @@
         iomodel->DeleteData(spcvz,StressbalanceSpcvzEnum);
         iomodel->DeleteData(nodeonSSA,FlowequationBorderSSAEnum);
-        if(iomodel->dim==3)iomodel->DeleteData(nodeonHO,FlowequationBorderHOEnum);
-        if(iomodel->dim==3)iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum);
-        if(iomodel->dim==3)iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum);
-        if(iomodel->dim==3)iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(nodeonHO,FlowequationBorderHOEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum);
+        if(iomodel->meshtype==Mesh3DEnum)iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum);
         iomodel->DeleteData(vertices_type,FlowequationVertexEquationEnum);
         iomodel->DeleteData(surface,SurfaceEnum);