Changeset 4004 for issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

Timestamp:

06/02/10 20:06:37 (15 years ago)

Author:

Eric.Larour

Message:

Finished CreateFemModel with one model framework

File:

• issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters){
+int     ConfigureObjectsx( DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials,Parameters* parameters,int analysis_type){
 
         /*Intermediary*/
@@ -22 +22 @@
         for (i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
-                element->Configure(elements,loads,nodes,materials,parameters);
+                element->Configure(elements,loads,nodes,materials,parameters,analysis_counter);
         }
         //_printf_("      Configuring loads...\n");
         for (i=0;i<loads->Size();i++){
                 load=(Load*)loads->GetObjectByOffset(i);
-                load->Configure(elements,loads,nodes,vertices,materials,parameters);
+                if (load->InAnalysis(analysis_type)){
+                        load->Configure(elements,loads,nodes,vertices,materials,parameters);
+                }
         }
         //_printf_("      Configuring nodes...\n");
         for (i=0;i<nodes->Size();i++){
                 node=(Node*)nodes->GetObjectByOffset(i);
-                node->Configure(nodes,vertices);
+                if(node->InAnalysis(analysis_type)){
+                                node->Configure(nodes,vertices);
+                }
         }
-        //_printf_("      Configuring parameters...\n");
-        /*parameters ARE NOT configured!*/
-        parameters->Configure(elements,loads,nodes,vertices,materials,parameters);
 
         return noerr;