Changeset 24335 for issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

Timestamp:

11/15/19 16:28:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Inputs2, TODO: still AMR, GEMB and DC do not work, and need to delete current Inputs

File:

• issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 #include "../../classes/classes.h"
 
-int     ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
-
-        /*Intermediary*/
-        int       i;
-        int       noerr = 1;
-        int       configuration_type;
-        Element  *element            = NULL;
-        Load     *load               = NULL;
-        Material *material           = NULL;
+int     ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters,Inputs2* inputs2){
 
         /*Get analysis type: */
+        int configuration_type;
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
         if(VerboseMProcessor()) _printf0_("      Configuring elements...\n");
-        for(i=0;i<elements->Size();i++){
-                element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->Configure(elements,loads,nodes,vertices,materials,parameters);
+        for(int i=0;i<elements->Size();i++){
+                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+                element->Configure(elements,loads,nodes,vertices,materials,parameters,inputs2);
         }
         if(VerboseMProcessor()) _printf0_("      Configuring loads...\n");
-        for(i=0;i<loads->Size();i++){
-                load=(Load*)loads->GetObjectByOffset(i);
+        for(int i=0;i<loads->Size();i++){
+                Load* load=(Load*)loads->GetObjectByOffset(i);
                 load->Configure(elements,loads,nodes,vertices,materials,parameters);
         }
         if(VerboseMProcessor()) _printf0_("      Configuring materials...\n");
-        for(i=0;i<materials->Size();i++){
-                material=(Material*)materials->GetObjectByOffset(i);
+        for(int i=0;i<materials->Size();i++){
+                Material* material=(Material*)materials->GetObjectByOffset(i);
                 material->Configure(elements);
         }
-        return noerr;
+        if(VerboseMProcessor()) _printf0_("      Configuring inputs...\n");
+        inputs2->Configure(parameters);
+
+        return 1;
 }