Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -46 +46 @@
         /*Fetch data needed: */
         iomodel->FetchData(5,MeshElementsEnum,MeshElementconnectivityEnum,MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsRheologyZEnum);
-        #ifdef _HAVE_THREED_
+        #ifdef _HAVE_3D_
         if(dim==3)iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum);
         #endif
@@ -57 +57 @@
                         /*Create and add tria element to elements dataset: */
                         if(dim==2) elements->AddObject(new Tria(i+1,i,i,iomodel,nummodels));
-                #ifdef _HAVE_THREED_
+                #ifdef _HAVE_3D_
                         else       elements->AddObject(new Penta(i+1,i,i,iomodel,nummodels));
                 #endif