Changeset 3984 for issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp

Timestamp:

06/01/10 14:51:09 (15 years ago)

Author:

Eric.Larour

Message:

First attempt at fusioning all models together

File:

• issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp

@@ -37 +37 @@
         /*elements created vary if we are dealing with a 2d mesh, or a 3d mesh: */
         /*2d mesh: */
-        if (strcmp(iomodel->meshtype,"2d")==0){
+        if (iomodel->dim==2){
 
                 /*Fetch data needed: */
@@ -77 +77 @@
 
         }
-        else{ //        if (strcmp(meshtype,"2d")==0)
+        else{ //        if (dim==2)
                 ISSMERROR("not implemented yet");
-        } //if (strcmp(meshtype,"2d")==0)
+        } //if (dim==2)
 
         /*Add new constrant material property tgo materials, at the end: */
@@ -95 +95 @@
         IoModelFetchData(&iomodel->gridonicesheet,NULL,NULL,iomodel_handle,"gridonicesheet");
         IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf");
-        if (strcmp(iomodel->meshtype,"3d")==0){
+        if (iomodel->dim==3){
                 IoModelFetchData(&iomodel->deadgrids,NULL,NULL,iomodel_handle,"deadgrids");
                 IoModelFetchData(&iomodel->uppernodes,NULL,NULL,iomodel_handle,"uppergrids");