Merge pull request #221 from CLOVER-energy/220-grid-prioritisation-bug

220 grid prioritisation bug

Author: BenWinchester

.zenodo.json

@@ -23,8 +23,8 @@
         "id": "MIT"
     },
     "notes": "If you use this software, please cite it as below.",
-    "publication_date": "2023-07-18",
+    "publication_date": "2023-07-25",
     "title": "CLOVER",
     "upload_type": "software",
-    "version": "v5.1.0.post1"
+    "version": "v5.1.1"
 }

CITATION.cff

@@ -14,6 +14,6 @@ authors:
     given-names: Philip
     orcid: https://orcid.org/0000-0003-1117-5095
 title: CLOVER
-version: v5.1.0.post1
+version: v5.1.1
 doi: 10.5281/zenodo.6925535
 date-released: 2023-07-18

codemeta.json

@@ -34,11 +34,11 @@
   "identifier": "https://zenodo.org/badge/latestdoi/476703736",
   "codeRepository": "https://github.com/CLOVER-energy/CLOVER",
   "datePublished": "2022-08-17",
-  "dateModified": "2023-07-14",
+  "dateModified": "2023-07-25",
   "dateCreated": "2022-08-17",
   "description": "A modelling framework for sustainable community-scale energy systems",
   "keywords": "minigrid,optimisation,pv,simulation",
   "license": "MIT",
   "title": "CLOVER",
-  "version": "v5.1.0.post1"
+  "version": "v5.1.1"
 }

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = clover-energy
-version = 5.1.0.post1
+version = 5.1.1
 author = Phil Sandwell, Ben Winchester and Hamish Beath
 author_email = [email protected],[email protected],[email protected]
 description = Continuous Lifetime Optimisation of Variable Electricity Resources

src/clover/__main__.py

@@ -17,7 +17,7 @@
 
 """
 
-__version__ = "5.1.0.post1"
+__version__ = "5.1.1"
 
 import collections
 import datetime

src/clover/simulation/storage.py

@@ -656,7 +656,9 @@ def get_electric_battery_storage_profile(  # pylint: disable=too-many-locals, to
     else:
         # Take energy from grid first if available
         if scenario.grid:
-            grid_energy = pd.DataFrame(grid_profile.mul(load_energy[0]))  # type: ignore
+            grid_energy = pd.DataFrame(  # type: ignore
+                grid_profile.mul(load_energy[0].values).values
+            )
         else:
             grid_energy = pd.DataFrame([0] * (end_hour - start_hour))
         # as needed for load