Merge pull request #4 from grouperenault/dev

Fix ModelStructure and Python 3.9 specific code

fmutool/cli.py

@@ -51,7 +51,7 @@ def fmutool():
 
     parser = argparse.ArgumentParser(prog='fmutool',
                                      description="Manipulate a FMU by modifying its 'modelDescription.xml'",
-                                     formatter_class=make_wide(argparse.ArgumentDefaultsHelpFormatter),
+                                     formatter_class=make_wide(argparse.HelpFormatter),
                                      add_help=False,
                                      epilog="see: https://github.com/grouperenault/fmutool/blob/main/README.md")
 
@@ -156,6 +156,8 @@ def fmucontainer():
                                      epilog="see: https://github.com/grouperenault/fmutool/blob/main/"
                                             "container/README.md")
 
+    parser.add_argument('-h', '-help', action="help")
+
     parser.add_argument("-fmu-directory", action="store", dest="fmu_directory", required=True,
                         help="Directory containing initial FMU’s and used to generate containers.")
 

fmutool/fmu_container.py

@@ -56,7 +56,8 @@ def xml(self, vr: int, name=None, causality=None, start=None):
             "name": name,
             "valueReference": vr,
             "causality": causality
-        } | self.attrs
+        }
+        scalar_attrs.update(self.attrs)
 
         scalar_attrs_str = " ".join([f'{key}="{value}"' for (key, value) in scalar_attrs.items()])
 
@@ -436,6 +437,18 @@ def make_fmu_xml(self, xml_file, step_size):
         xml_file.write("""  </ModelVariables>
 
   <ModelStructure>
+    <Outputs>
+""")
+
+        index_offset = len(self.locals) + len(self.inputs) + 1
+        for i, _ in enumerate(self.outputs.keys()):
+            print(f'      <Unknown index="{index_offset+i}"/>', file=xml_file)
+        xml_file.write("""    </Outputs>
+    <InitialUnknowns>
+""")
+        for i, _ in enumerate(self.outputs.keys()):
+            print(f'      <Unknown index="{index_offset+i}"/>', file=xml_file)
+        xml_file.write("""    </InitialUnknowns>
   </ModelStructure>
 
 </fmiModelDescription>