Add OilGasAsset (#347)

* Add OilGasAsset Signed-off-by: Joe Moorhouse <[email protected]> * Update to geopandas needed (fiona clash); requires 3.9 minimum. Signed-off-by: Joe Moorhouse <[email protected]> * Use 3.9 in tox Signed-off-by: Joe Moorhouse <[email protected]> * Relax test slightly (small differences from numerical libraries). Signed-off-by: Joe Moorhouse <[email protected]> --------- Signed-off-by: Joe Moorhouse <[email protected]>
os-climate · Sep 5, 2024 · a8fb879 · a8fb879
1 parent b037118
commit a8fb879
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 114 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  python-version: "3.8"
+  python-version: "3.9"
 
 jobs:
   ci:

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ description = "OS-Climate Physical Risk Library"
 authors = [
     {name = "Joe Moorhouse",email = "[email protected]"},
 ]
-requires-python = ">=3.8,<3.11"
+requires-python = ">=3.9,<3.11"
 readme = "README.md"
 license = {file = "LICENSE"}
 keywords = ["Physical", "Climate", "Risk", "Finance"]
@@ -46,7 +46,7 @@ dependencies = [
     "shapely>=2.0.1",
     "s3fs>=2022.1.0",
     "zarr>=2.10.3",
-    "geopandas>=0.13.2",
+    "geopandas>=0.14.4",
     "h3>=3.7.7",
     "lmdbm>=0.0.6",
 ]

diff --git a/src/physrisk/kernel/assets.py b/src/physrisk/kernel/assets.py
@@ -148,6 +148,21 @@ def __init__(
         self.type = type
 
 
+class OilGasAsset(Asset):
+    def __init__(
+        self,
+        latitude: float,
+        longitude: float,
+        *,
+        location: Optional[str] = None,
+        type: Optional[str] = None,
+        **kwargs,
+    ):
+        super().__init__(latitude, longitude, **kwargs)
+        self.location = location
+        self.type = type
+
+
 class PowerGeneratingAsset(Asset):
     def __init__(
         self,
@@ -164,9 +179,9 @@ def __init__(
         self.type: Optional[str] = type
         self.location: Optional[str] = location
         self.capacity: Optional[float] = capacity
+        self.primary_fuel: Optional[FuelKind] = None
 
         if type is not None:
-            self.primary_fuel: Optional[FuelKind] = None
             archetypes = type.split("/")
             if 0 < len(archetypes):
                 self.primary_fuel = FuelKind[archetypes[0]]

diff --git a/tests/kernel/chronic_asset_impact_test.py b/tests/kernel/chronic_asset_impact_test.py
@@ -250,4 +250,4 @@ def test_chronic_vulnerability_model(self):
             ]
         )
         value_diff = np.sum(np.abs(value_test - value_exp))
-        self.assertAlmostEqual(value_diff, 0.0, places=8)
+        self.assertAlmostEqual(value_diff, 0.0, places=6)
diff --git a/tests/vulnerability_models/wbgt_model_test.py b/tests/vulnerability_models/wbgt_model_test.py
@@ -285,4 +285,4 @@ def test_wbgt_vulnerability(self):
                 0.00000000000,
             ]
         )
-        np.testing.assert_almost_equal(value_test, value_exp, decimal=8)
+        np.testing.assert_almost_equal(value_test, value_exp, decimal=6)
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38, static
+envlist = py39, static
 
 [testenv]
 deps =
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ on: @@
         branches: [ main ]
     env:
-      python-version: "3.8"
+      python-version: "3.9"
     jobs:
       ci:
@@ Expand Down @@