First part of planned process determination improvements. Check warnings and...

First part of planned process determination improvements. Check warnings and update assertions to finish.


Former-commit-id: 2d93ba257aa5549101646687d3870f50d572d3f8

examples/scripts/sellar_problem.py

@@ -21,13 +21,15 @@ mdao_definitions = ['unconverged-MDA-J',    # 0
                     'converged-DOE-J',      # 5
                     'converged-MDA-J',      # 6
                     'converged-MDA-GS',     # 7
-                    'MDF-GS',               # 8
-                    'MDF-J',                # 9
-                    'IDF']                  # 10
+                    'unconverged-OPT-J',    # 8
+                    'unconverged-OPT-GS',   # 9
+                    'MDF-GS',               # 10
+                    'MDF-J',                # 11
+                    'IDF']                  # 12
 
 # Settings for scripting
-mdao_definitions_loop_all = True       # Option for looping through all MDAO definitions
-mdao_definition_id = 10                # Option for selecting a MDAO definition (in case mdao_definitions_loop_all=False)
+mdao_definitions_loop_all = True     # Option for looping through all MDAO definitions
+mdao_definition_id = 9                # Option for selecting a MDAO definition (in case mdao_definitions_loop_all=False)
 
 # Settings for saving
 pdf_dir = 'sellar_problem/(X)DSM'
@@ -189,7 +191,7 @@ for mdao_definition in mdao_definitions:
 
     # Depending on the architecture, different additional node attributes have to be specified. This is automated here
     # to allow direct execution of all different options.
-    if mdao_architecture in ['IDF', 'MDF']:
+    if mdao_architecture in ['IDF', 'MDF', 'unconverged-OPT']:
         fpg.mark_as_objective('/data_schema/analyses/f')
         fpg.mark_as_constraints(['/data_schema/analyses/g1','/data_schema/analyses/g2'], '>=', 0.0)
         fpg.mark_as_design_variables(['/data_schema/geometry/z1','/data_schema/geometry/z2','/data_schema/geometry/x1'],
@@ -236,8 +238,8 @@ for mdao_definition in mdao_definitions:
              integrity=True)
 
     # Get Mdao graphs
-    mpg = fpg.get_mpg(name='mpg Sellar problem')
     mdg = fpg.get_mdg(name='mdg Sellar problem')
+    mpg = mdg.get_mpg(name='mpg Sellar problem')
     mdg.graph['name'] = 'XDSM - ' + mdao_definition
     mdg.graph['description'] = 'Solution strategy to solve the Sellar problem using the strategy: ' \
                                + str(mdao_architecture) + ('_' + str(convergence_type) if convergence_type else '') + '.'