Changeset 5326

Timestamp:

08/17/10 15:59:39 (15 years ago)

Author:

Eric.Larour

Message:

Materials were not being configured in serial mode

Location:

issm/trunk/src

Files:

• c/Container/DataSet.cpp (modified) (2 diffs)
• mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp (modified) (1 diff)

issm/trunk/src/c/Container/DataSet.cpp

@@ -537 +537 @@
         Load* load=NULL;
         Node* node=NULL;
+        Material* material=NULL;
 
         for ( object=objects.begin() ; object < objects.end(); object++ ){
@@ -554 +555 @@
                         node->Configure(nodes,vertices);
                 }
+                if (EnumIsMaterial((*object)->Enum())){
+                        material=(Material*)(*object);
+                        material->Configure(elements);
+                }
         }
 

issm/trunk/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp

@@ -57 +57 @@
         nodes->     Configure(elements,loads, nodes,vertices, materials,parameters);
         loads->     Configure(elements, loads, nodes,vertices, materials,parameters);
+        materials-> Configure(elements, loads, nodes,vertices, materials,parameters);
 
         /*!Generate internal degree of freedom numbers: */