#421: make lbsVTDataWriter at parity with the lbsVTDataReader for user-defined data (#452)

* #421: add user_defined data to jsonwriter

* #421: return to original config

Author: cwschilly

src/lbaf/IO/lbsVTDataWriter.py

@@ -49,17 +49,25 @@ def __init__(
 
     def __create_tasks(self, rank_id, objects, migratable):
         """Create per-object entries to be outputted to JSON."""
-        return [{
-            "entity": {
-                "home": rank_id,
-                "id": o.get_id(),
-                "migratable": migratable,
-                "type": "object",
-            },
-            "node": rank_id,
-            "resource": "cpu",
-            "time": o.get_load()}
-            for o in objects]
+        tasks = []
+        for o in objects:
+            task_data = {
+                "entity": {
+                    "home": rank_id,
+                    "id": o.get_id(),
+                    "migratable": migratable,
+                    "type": "object",
+                },
+                "node": rank_id,
+                "resource": "cpu",
+                "time": o.get_load()
+            }
+            user_defined = o.get_user_defined()
+            if user_defined:
+                task_data["user_defined"] = user_defined
+            tasks.append(task_data)
+        return tasks
+
 
     def _json_writer(self, rank_phases_double) -> str:
         """Write one JSON per rank for list of phase instances."""

src/lbaf/Model/lbsObject.py

@@ -102,6 +102,10 @@ def get_overhead(self) -> float:
         """Return additional runtime memory of object."""
         return self.__overhead
 
+    def get_user_defined(self) -> dict:
+        """Return optionally defined fields"""
+        return self.__user_defined
+
     def get_sent(self) -> dict:
         """Return communications sent by object to other objects."""
         return self.__communicator.get_sent() if self.__communicator else {}