Solving IDF issues

Former-commit-id: d4ba376ebe564209622cc6df7649b07a328e90e6

examples/scripts/sellar_problem.py

@@ -24,8 +24,8 @@ mdao_definitions = ['unconverged-MDA-J',    # 0
                     'IDF']                  # 10
 
 # Settings for scripting
-mdao_definitions_loop_all = True    # Option for looping through all MDAO definitions
-mdao_definition_id = 4              # Option for selecting a MDAO definitions (in case mdao_definitions_loop_all=False)
+mdao_definitions_loop_all = True     # Option for looping through all MDAO definitions
+mdao_definition_id = 10              # Option for selecting a MDAO definitions (in case mdao_definitions_loop_all=False)
 
 # Settings for saving
 pdf_dir = 'sellar_problem/(X)DSM'
@@ -227,8 +227,6 @@ for mdao_definition in mdao_definitions:
     if mdao_architecture == 'IDF':
         fpg.node['/data_schema/analyses/y1']['valid_ranges'] = {'limit_range': {'minimum': -100., 'maximum': 100.}}
         fpg.node['/data_schema/analyses/y2']['valid_ranges'] = {'limit_range': {'minimum': -100., 'maximum': 100.}}
-        #fpg.node['/data_schema/analyses/y1']['problem_role'] = 'design variable'
-        #fpg.node['/data_schema/analyses/y2']['problem_role'] = 'design variable'
 
     # Search for problem roles
     fpg.add_function_problem_roles()
@@ -265,9 +263,11 @@ for mdao_definition in mdao_definitions:
         mdg.edge['G2']['/data_schema/architectureNodes/finalOutputVariables/data_schemaCopy/analyses/g2']['equations'] = mdg.edge['G2']['/data_schema/analyses/g2']['equations']
 
     # Add some more problem roles to avoid undefined uIDs in the CMDOWS file
-    #if mdao_architecture == 'IDF':
-    #    mdg.node['/data_schema/architectureNodes/consistencyConstraintVariables/data_schemaCopy/analyses/gc_y1']['problem_role'] = 'constraint'
-    #    mdg.node['/data_schema/architectureNodes/consistencyConstraintVariables/data_schemaCopy/analyses/gc_y2']['problem_role'] = 'constraint'
+    if mdao_architecture == 'IDF':
+        mdg.node['/data_schema/architectureNodes/consistencyConstraintVariables/data_schemaCopy/analyses/gc_y1']['problem_role'] = 'constraint'
+        mdg.node['/data_schema/architectureNodes/consistencyConstraintVariables/data_schemaCopy/analyses/gc_y2']['problem_role'] = 'constraint'
+        mdg.node['/data_schema/analyses/y1']['problem_role'] = 'design variable'
+        mdg.node['/data_schema/analyses/y2']['problem_role'] = 'design variable'
 
     # Create a DSM visualization of the Mdao
     mdg.create_dsm(file_name='Mdao_'+mdao_definition, include_system_vars=True, destination_folder=pdf_dir, mpg=mpg)
@@ -283,6 +283,7 @@ for mdao_definition in mdao_definitions:
              creator='Imco van Gent',
              version='0.1',
              pretty_print=True,
-             integrity=True)
+             #integrity=True
+             )
 
 print 'Done!'