Minor updates to support RCE CMDOWS parser and OpenLEGO.

Former-commit-id: 7dfad51c1757aa562978d1732e3853031c7c53a4

examples/knowledgebases/tu_delft_wing_design/CNSTRNT-input.xml

@@ -38,17 +38,12 @@
   </vehicles>
   <toolspecific>
     <cNSTRNT>
-      <modes>wingLoading;fuelTankVolume</modes>
       <wingLoading modes="wingLoading">
-        <modelUID>agile_v13_modelID</modelUID>
-        <wingUID>MainWing_wingID</wingUID>
         <maxWingLoading unit="N/m^2">5343.4083</maxWingLoading>
       </wingLoading>
       <fuelTankVolume modes="fuelTankVolume">
-        <fuelTankUID>MainWingFuelTank</fuelTankUID>
         <fuelDensity unit="kg/m^3">8.171500e+002</fuelDensity>
         <fuelTankEfficiencyFactor unit="-">0.93</fuelTankEfficiencyFactor>
-        <modelUID>agile_v13_modelID</modelUID>
       </fuelTankVolume>
     </cNSTRNT>
   </toolspecific>

examples/knowledgebases/tu_delft_wing_design/CNSTRNT-output.xml

@@ -4,11 +4,9 @@
     <constraints>
       <wingLoading modes="wingLoading">
         <latestValue>-0.021568</latestValue>
-        <listOfValues mapType="vector">-0.021568</listOfValues>
       </wingLoading>
       <fuelTankVolume modes="fuelTankVolume">
         <latestValue>-0.551235</latestValue>
-        <listOfValues mapType="vector">-0.551235</listOfValues>
       </fuelTankVolume>
     </constraints>
   </mdodata>

examples/knowledgebases/tu_delft_wing_design/OBJ-input.xml

@@ -17,9 +17,7 @@
   </vehicles>
   <toolspecific>
     <oBJ>
-      <modes>MTOW</modes>
       <MTOW modes="MTOW">
-        <modelUID>agile_v13_modelID</modelUID>
         <mtow_ref>45045.858310</mtow_ref>
       </MTOW>
     </oBJ>

examples/knowledgebases/tu_delft_wing_design/OBJ-output.xml

@@ -4,7 +4,6 @@
     <objectives>
       <mtow modes="MTOW">
         <normalized_mtow>1.000000</normalized_mtow>
-        <normalized_mtow_list mapType="vector">1.000000</normalized_mtow_list>
       </mtow>
     </objectives>
   </mdodata>

examples/scripts/tu_delft_wing_design.py

@@ -74,7 +74,6 @@ rcg.node['MTOW']['general_info'].update({'owner': {'contact_u_i_d': 'ivangent'}}
 
 # Add some (optional) equations
 rcg.add_equation_labels(rcg.get_function_nodes())
-rcg.remove_edge('OBJ', '/cpacs/mdodata/objectives/mtow/normalized_mtow_list')
 rcg.add_equation('OBJ', 'mass/mtow_ref', 'Python')
 rcg.add_equation('OBJ', 'mass/mtow\_ref', 'LaTeX')
 rcg.add_equation('OBJ', '<math xmlns="http://www.w3.org/1998/Math/MathML"><mi>m</mi><mi>a</mi><mi>s</mi><mi>s</mi><mo>/</mo><mi>m</mi><mi>t</mi><mi>o</mi><mi>w</mi><mi>_</mi><mi>r</mi><mi>e</mi><mi>f</mi></math>', 'MathML')
@@ -170,8 +169,11 @@ for mdao_definition in mdao_definitions:
     # This is only done here as merging functions with equations does not yet work in KADMOS
     # TODO: Include this functionality in the merge_function_nodes method
     fpg.add_equation_labels(fpg.get_function_nodes())
-    fpg.remove_edge('CNSTRNT-merged[2modes]', '/cpacs/mdodata/constraints/wingLoading/listOfValues')
-    fpg.remove_edge('CNSTRNT-merged[2modes]', '/cpacs/mdodata/constraints/fuelTankVolume/listOfValues')
+    # Manually adjust labels for two masses
+    # TODO: Improve this functionality by checking label duplicates
+    fpg.edge['/cpacs/vehicles[@uID="AGILE_DC1_vehicleID"]/aircraft/model[@uID="agile_v13_modelID"]/analyses/massBreakdown/fuel/massDescription/mass']['CNSTRNT-merged[2modes]']['equation_label'] = 'mass_fuel'
+    fpg.edge['/cpacs/vehicles[@uID="AGILE_DC1_vehicleID"]/aircraft/model[@uID="agile_v13_modelID"]/analyses/massBreakdown/designMasses/mTOM/mass']['CNSTRNT-merged[2modes]']['equation_label'] = 'mass_mtow'
+
     fpg.add_equation(('CNSTRNT-merged[2modes]', '/cpacs/mdodata/constraints/fuelTankVolume/latestValue'), 'mass_mtow*9.81/area/maxWingLoading-1.0', 'Python')
     fpg.add_equation(('CNSTRNT-merged[2modes]', '/cpacs/mdodata/constraints/fuelTankVolume/latestValue'), 'mass\_mtow\times9.81/area/maxWingLoading-1.0', 'LaTeX'),
     fpg.add_equation(('CNSTRNT-merged[2modes]', '/cpacs/mdodata/constraints/wingLoading/latestValue'), '(mass_fuel/fuelDensity)/(optimalVolume*fuelTankEfficiencyFactor)-1.0', 'Python')