From bab88f66de74fa0a32eb3227ac8da91d5be688a5 Mon Sep 17 00:00:00 2001 From: keviny Date: Tue, 17 Dec 2024 07:51:04 +0100 Subject: [PATCH] error converting engine fixed --- machinery-system-structure/01_ConvertToProtobuf.ipynb | 4 ++-- machinery-system-structure/MachSysS/__init__.py | 2 +- machinery-system-structure/MachSysS/convert_to_protobuf.py | 2 +- machinery-system-structure/settings.ini | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/machinery-system-structure/01_ConvertToProtobuf.ipynb b/machinery-system-structure/01_ConvertToProtobuf.ipynb index 815aac9..0e2c6f1 100644 --- 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 index 5c2c6c5..54149df 100644 --- 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 index 90db7f1..da9539e 100644 --- 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 index d6227cf..b9863f4 100644 --- a/machinery-system-structure/settings.ini +++ b/machinery-system-structure/settings.ini @@ -12,7 +12,7 @@ user = keviny author = Kevin Koosup Yum author_email = kevinkoosup.yum@sintef.no copyright = SINTEF Ocean -version = 0.6.9 +version = 0.6.10 min_python = 3.10 audience = Developers language = English