Changeset 16162 for issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

Timestamp:

09/17/13 18:44:22 (12 years ago)

Author:

cborstad

Message:

CHG: working toward damage class implementation. As long as md.damage.isdamage flag is set to zero, all NR should ignore damage and run okay

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)

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

@@ -64 +64 @@
                         break;
                 case MatdamageiceEnum:
-                        iomodel->FetchData(3,MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsDamageDEnum);
+                        iomodel->FetchData(3,MaterialsRheologyBEnum,MaterialsRheologyNEnum,DamageDEnum);
                         for (i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matdamageice(i+1,i,iomodel));
                         break;
@@ -73 +73 @@
         /*Free data: */
         iomodel->DeleteData(8,MeshUpperelementsEnum,MeshLowerelementsEnum,
-                                MaterialsRheologyBEnum,MaterialsRheologyNEnum,MaterialsDamageDEnum,InversionControlParametersEnum,InversionMinParametersEnum,
+                                MaterialsRheologyBEnum,MaterialsRheologyNEnum,DamageDEnum,InversionControlParametersEnum,InversionMinParametersEnum,
                                 InversionMaxParametersEnum);