Merge pull request #34 from SINTEF/hotfix/convert-engine-emission-error

error converting engine fixed
SINTEF · Dec 17, 2024 · dfddc9b · dfddc9b
2 parents a0f407f + bab88f6
commit dfddc9b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/machinery-system-structure/01_ConvertToProtobuf.ipynb b/machinery-system-structure/01_ConvertToProtobuf.ipynb
@@ -282,7 +282,7 @@
     "                    for each_point in each_curve.points_per_kwh\n",
     "                ]\n",
     "            ),\n",
-    "            emission_type=proto.EmissionType.Value(each_curve.emission_type.value),\n",
+    "            emission_type=each_curve.emission.value,\n",
     "        )\n",
     "        for each_curve in emission_curves_feems\n",
     "    ]\n",
@@ -560,7 +560,7 @@
     "                f\"imcompatible type ({component.type}) for conversion.\"\n",
     "            )\n",
     "        shaftline_proto.subsystems.append(subsystem)\n",
-    "    return shaftline_proto\n"
+    "    return shaftline_proto"
    ]
   },
   {

diff --git a/machinery-system-structure/MachSysS/__init__.py b/machinery-system-structure/MachSysS/__init__.py
@@ -1 +1 @@
-__version__ = "0.6.9"
+__version__ = "0.6.10"
diff --git a/machinery-system-structure/MachSysS/convert_to_protobuf.py b/machinery-system-structure/MachSysS/convert_to_protobuf.py
@@ -264,7 +264,7 @@ def convert_emission_curves_to_protobuf(
                     for each_point in each_curve.points_per_kwh
                 ]
             ),
-            emission_type=proto.EmissionType.Value(each_curve.emission_type.value),
+            emission_type=each_curve.emission.value,
         )
         for each_curve in emission_curves_feems
     ]

diff --git a/machinery-system-structure/settings.ini b/machinery-system-structure/settings.ini
@@ -12,7 +12,7 @@ user = keviny
 author = Kevin Koosup Yum
 author_email = [email protected]
 copyright = SINTEF Ocean
-version = 0.6.9
+version = 0.6.10
 min_python = 3.10
 audience = Developers
 language = English