cetk 0.0.6.dev0__tar.gz → 0.0.8.dev0__tar.gz

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/CONTRIBUTING.md

@@ -11,7 +11,7 @@
 ``` console
 $ git clone https://git.smhi.se/foclair/cetk.git
 $ cd cetk
-$ python3.9 -m venv --prompt cetk .venv
+$ python3.11 -m venv --prompt cetk .venv
 $ . .venv/bin/activate
 $ pip install -U pip setuptools wheel
 $ pip install -r requirements.txt
@@ -23,7 +23,7 @@ $ pip install -e .
 ``` console
 $ git clone https://git.smhi.se/foclair/cetk.git
 $ cd cetk
-$ python3.9 -m venv --prompt cetk .venv
+$ python3.11 -m venv --prompt cetk .venv
 $ . .venv/Scripts/activate
 $ pip install pre-commit
 $ pip install -e .
@@ -41,5 +41,5 @@ Dependencies are organized in the following files:
 | Filename                           | Contents                                                                  |
 | ---------------------------------- | ------------------------------------------------------------------------- |
 | constraints.txt                    | Version constraints for pinned requirements                               |
-| requirements.txt                   | Pinned requirements for _using_ cetk (don't edit)                   |
-| setup.py                    	     | Loose requirements for _using_ cetk
+| requirements.txt                   | Pinned requirements for _using_ cetk (don't edit)                         |
+| setup.py                    	     | Loose requirements for _using_ cetk                                       |

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/PKG-INFO

@@ -1,25 +1,26 @@
 Metadata-Version: 2.4
 Name: cetk
-Version: 0.0.6.dev0
+Version: 0.0.8.dev0
 Summary: CLAIRs Emission ToolKit cetk
 Author: Christian Asker, Mattias Jakobsson, David Segersson, Eef van Dongen
 Maintainer-email: FO Luft <foluftadmin@smhi.se>
 License-Expression: Apache-2.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: django<6,>=4.2
-Requires-Dist: fiona>=1.8.18
+Requires-Dist: affine<3.0.1
+Requires-Dist: django<6,>=5.2.16
+Requires-Dist: fiona>=1.8.22
 Requires-Dist: geopandas>=0.12
-Requires-Dist: netCDF4>=1.5.4
-Requires-Dist: numpy>=1.20.3
+Requires-Dist: netCDF4>=1.6.1
+Requires-Dist: numpy<2.5,>=1.20.3
 Requires-Dist: openpyxl>=3.0.7
 Requires-Dist: pandas>=2.0
-Requires-Dist: pyogrio>=0.4.2
-Requires-Dist: rastafari>=0.4
-Requires-Dist: rasterio>=1.3
+Requires-Dist: pyogrio>=0.5.0
+Requires-Dist: rastafari2>=0.4
+Requires-Dist: rasterio>=1.3.3
 Requires-Dist: shapely>=2.0
 Dynamic: license-file
 

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/constraints-lowest.txt

@@ -1,28 +1,30 @@
 # This file was autogenerated by uv via the following command:
 #    nox -s constraints-lowest
-affine==2.4.0
-    # via rasterio
-asgiref==3.8.1
+affine==1.0
+    # via
+    #   cetk (pyproject.toml)
+    #   rasterio
+asgiref==3.12.1
     # via django
-attrs==25.3.0
+attrs==26.1.0
     # via
     #   fiona
     #   rasterio
-certifi==2025.4.26
+certifi==2026.7.22
     # via
     #   fiona
     #   pyogrio
     #   pyproj
     #   rasterio
-cftime==1.6.4.post1
+cftime==1.6.5
     # via netcdf4
-click==7.1.2
+click==8.5.0
     # via
     #   click-plugins
     #   cligj
     #   fiona
     #   rasterio
-click-plugins==1.1.1
+click-plugins==1.1.1.2
     # via
     #   fiona
     #   rasterio
@@ -30,11 +32,11 @@ cligj==0.7.2
     # via
     #   fiona
     #   rasterio
-django==4.2
+django==5.2.16
     # via cetk (pyproject.toml)
 et-xmlfile==2.0.0
     # via openpyxl
-fiona==1.8.18
+fiona==1.8.22
     # via
     #   cetk (pyproject.toml)
     #   geopandas
@@ -42,45 +44,47 @@ geopandas==0.12.1
     # via cetk (pyproject.toml)
 munch==4.0.0
     # via fiona
-netcdf4==1.5.4
+netcdf4==1.6.1
     # via cetk (pyproject.toml)
-numpy==1.20.3
+numpy==1.23.2
     # via
     #   cetk (pyproject.toml)
     #   cftime
     #   netcdf4
     #   pandas
     #   pyogrio
-    #   rastafari
+    #   rastafari2
     #   rasterio
     #   shapely
     #   snuggs
 openpyxl==3.0.7
     # via cetk (pyproject.toml)
-packaging==25.0
+packaging==26.3
     # via geopandas
 pandas==2.0.0
     # via
     #   cetk (pyproject.toml)
     #   geopandas
-pyogrio==0.4.2
+pyogrio==0.5.0
     # via cetk (pyproject.toml)
-pyparsing==3.2.3
+pyparsing==3.3.2
     # via snuggs
-pyproj==3.6.1
+pyproj==3.7.2
     # via
     #   geopandas
-    #   rastafari
+    #   rastafari2
 python-dateutil==2.9.0.post0
     # via pandas
-pytz==2025.2
+pytz==2026.3.post1
     # via pandas
-rastafari==0.4.0
+rastafari2==0.4.1.2
     # via cetk (pyproject.toml)
-rasterio==1.3.0
+rasterio==1.3.3
     # via cetk (pyproject.toml)
-setuptools==80.9.0
-    # via rasterio
+setuptools==84.0.0
+    # via
+    #   fiona
+    #   rasterio
 shapely==2.0.0
     # via
     #   cetk (pyproject.toml)
@@ -91,9 +95,7 @@ six==1.17.0
     #   python-dateutil
 snuggs==1.4.7
     # via rasterio
-sqlparse==0.5.3
+sqlparse==0.6.0
     # via django
-typing-extensions==4.14.0
-    # via asgiref
-tzdata==2025.2
+tzdata==2026.4
     # via pandas

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/noxfile.py

@@ -19,7 +19,7 @@ def requirements_dev(session):
     pip_compile(session, "requirements-dev.txt", "requirements-dev.in")
 
 
-@nox.session(name="constraints-lowest", python="3.9")
+@nox.session(name="constraints-lowest", python="3.11")
 def constraints_lowest(session):
     """Re-compile the constraints for the lowest allowed dependency versions"""
     session.install("-c", "requirements-dev.txt", "uv")
@@ -58,7 +58,7 @@ def test(session):
     session.run("pytest", *session.posargs)
 
 
-@nox.session(name="test-lowest", python="3.9")
+@nox.session(name="test-lowest", python="3.11")
 def test_lowest(session):
     """Run the unit and regression tests with the lowest allowed versions."""
     session.install("-c", "requirements-dev.txt", *TEST_REQUIREMENTS)

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/pyproject.toml

@@ -15,7 +15,7 @@ maintainers = [
 ]
 description = "CLAIRs Emission ToolKit cetk"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 license = "Apache-2.0"
 license-files = ["LICENSE"]
 classifiers = [
@@ -23,16 +23,17 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Atmospheric Science",
 ]
 dependencies = [       # Release date  Comment
-  "django >=4.2,<6",   # 2023-04-03    current LTS
-  "fiona >=1.8.18",    # 2020-11-17    first version with cp39 wheel
+  "affine<3.0.1",      # 2026-08-28    required by rasterio - support for 3.0.1+ pending
+  "django >=5.2.16,<6",# 2026-07-07    due to dependabot alerts
+  "fiona >=1.8.22",    # 2022-10-17    first version with cp311 wheel
   "geopandas >=0.12",  # 2022-10-24    first version with shapely 2 support
-  "netCDF4 >=1.5.4",   # 2020-07-23    first version with cp39 wheel
-  "numpy >=1.20.3",    # 2021-05-10    required by pandas 2.0.0
+  "netCDF4 >=1.6.1",   # 2022-09-15    first version with cp311 wheel
+  "numpy >=1.20.3, <2.5",    # 2021-05-10    required by pandas 2.0.0, numpy 2.5 not compatible with NetCDF4
   "openpyxl >=3.0.7",  # 2021-03-09    required by pandas 2.0.0
   "pandas >=2.0",      # 2023-04-03    cetk import test fails with earlier versions
-  "pyogrio >=0.4.2",   # 2022-10-06    cetk export test fails with earlier versions
-  "rastafari >=0.4",
-  "rasterio >=1.3",    # 2022-07-06    rasterio.CRS is missing in earlier versions
+  "pyogrio >=0.5.0",   # 2023-01-16    first version with cp311 wheel
+  "rastafari2 >=0.4",
+  "rasterio >=1.3.3",  # 2022-10-19    first version with cp311 wheel
   "shapely >=2.0",     # 2022-12-12    cetk calc --rasterize fails with earlier versions
 ]
 dynamic = ["version"]

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/requirements-dev.in

@@ -1,7 +1,7 @@
 # CI/CD and development requirements for the Gadget
 build
 coverage[toml]
-django >=4.2,<6
+django >=5.2.16,<6
 nox
 pip-tools
 pre-commit

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/requirements-dev.txt

@@ -24,7 +24,7 @@ dependency-groups==1.3.1
     # via nox
 distlib==0.3.7
     # via virtualenv
-django==5.2.1
+django==5.2.17
     # via -r requirements-dev.in
 filelock==3.12.3
     # via virtualenv

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/__init__.py

@@ -1,6 +1,6 @@
 """cetk, a python library for editing Clair emission inventories offline."""
 
-__version__ = "0.0.6.dev"
+__version__ = "0.0.8.dev0"
 
 import os
 

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/const.py

@@ -3,7 +3,7 @@ DEFAULT_SRID = 3857
 CHAR_FIELD_LENGTH = 100
 CODE_FIELD_LENGTH = 50
 NODATA = -9999.0
-DEFAULT_EMISSION_UNIT = "kg/year"
+DEFAULT_EMISSION_UNIT = "kg/s"
 
 # sheet names which are valid for data import
 SHEET_NAMES = [

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/importers/activity_import.py

@@ -248,6 +248,13 @@ def import_emissionfactorsheet(workbook, validation):
                             validation=validation,
                         )
                     )
+            except Exception:
+                return_message.append(
+                    import_error(
+                        f"Failed to import sheet 'EmissionFactor'. Check row {row_nr + 2} for errors.",
+                        validation=validation,
+                    )
+                )
         except KeyError:
             return_message.append(
                 import_error(

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/importers/codeset_import.py

@@ -1,3 +1,5 @@
+import pandas as pd
+
 from cetk.edb.models import ActivityCode, CodeSet, VerticalDist
 
 from .utils import import_error, worksheet_to_dataframe
@@ -76,7 +78,7 @@ def import_activitycodesheet(workbook, validation):
         try:
             codeset = CodeSet.objects.get(slug=row_dict["codeset_slug"])
             if "vertical_distribution_slug" in row_dict:
-                if row_dict["vertical_distribution_slug"] is not None:
+                if not pd.isna(row_dict["vertical_distribution_slug"]):
                     try:
                         vdist = VerticalDist.objects.get(
                             slug=row_dict["vertical_distribution_slug"]

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/importers/gridsource_import.py

@@ -105,7 +105,7 @@ def validate_gridsources(df, timevars, code_sets, raster_names, datadir):
         messages += validate_activitycodes(row_dict, code_sets, row_nr=row_nr)
         messages += validate_timevar(row_dict, timevars, row_nr=row_nr)
         messages += validate_unit(row_dict, row_nr)
-        for col in filter(lambda x: row_dict[x] is not None, subst_cols):
+        for col in filter(lambda x: not pd.isna(row_dict[x]), subst_cols):
             subst_slug = col[6:]
             messages += validate_raster(
                 row_dict, raster_names, datadir, rasters, row_nr, subst_slug
@@ -121,7 +121,7 @@ def validate_gridsources(df, timevars, code_sets, raster_names, datadir):
                         subst_slug,
                     )
                 )
-        for col in filter(lambda x: row_dict[x] is not None, act_cols):
+        for col in filter(lambda x: not pd.isna(row_dict[x]), act_cols):
             act_name = col[4:].strip()
             messages += validate_raster(
                 row_dict, raster_names, datadir, rasters, row_nr, subst_slug
@@ -205,7 +205,7 @@ def import_gridsources(filepath, encoding=None):
         # set tags
         tag_keys = [key for key in row_dict.keys() if key.startswith("tag:")]
         src.tags = {
-            key[4:]: row_dict[key] for key in tag_keys if row_dict[key] is not None
+            key[4:]: row_dict[key] for key in tag_keys if not pd.isna(row_dict[key])
         }
         validate_activitycodes(row_dict, code_sets, row_nr, src)
         validate_timevar(row_dict, timevars, row_nr, src)
@@ -216,7 +216,7 @@ def import_gridsources(filepath, encoding=None):
             src.substances.all().delete()
             src.activities.all().delete()
 
-        for col in filter(lambda x: row_dict[x] is not None, subst_cols):
+        for col in filter(lambda x: not pd.isna(row_dict[x]), subst_cols):
             subst = col[6:]
             # if sum is specified instead of an emission total,
             # the emission value is calculated as the sum of the raster
@@ -232,7 +232,7 @@ def import_gridsources(filepath, encoding=None):
                 emis["value"] = emission_unit_to_si(float(emis_value), unit)
             src.substances.create(**emis)
 
-        for col in filter(lambda x: row_dict[x] is not None, act_cols):
+        for col in filter(lambda x: not pd.isna(row_dict[x]), act_cols):
             activity_name = col[4:]
             rname, rpath = data_to_raster(
                 row_dict["rastername"], row_dict["path"], datadir, subst

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/importers/source_import.py

@@ -261,9 +261,7 @@ def create_or_update_sources(
 
     # set dataframe index
     try:
-        df.set_index(
-            ["facility_id", "source_name"], verify_integrity=True, inplace=True
-        )
+        df.set_index(["facility_id", "source_name"], inplace=True)
     except ValueError as err:
         return_message.append(
             import_error(
@@ -601,7 +599,7 @@ def create_or_update_sources(
                 else:
                     return_message.append(
                         import_error(
-                            f"multiple rows for the same point-source '{source_name}'",
+                            f"Multiple rows have the same source_name '{source_name}' in the PointSource sheet. Correct duplicates under facility_id or source_name before import.",
                             validation=validation,
                         )
                     )
@@ -812,7 +810,14 @@ def import_sourceactivities(
         log.debug("validating/importing sheet PointSource")
         data = workbook["PointSource"].values
         df_pointsource = worksheet_to_dataframe(data)
-        df_pointsource = set_datatypes(df_pointsource, "point")
+
+        try:
+            df_pointsource = set_datatypes(df_pointsource, "point")
+        except ValueError as exc:
+            return_message.append(
+                import_error(str(exc) + " in spreadsheet 'PointSource'", validation)
+            )
+
         # import pointsources and pointsourcesubstances
         caching_sources = len(df_pointsource) > PointSource.objects.count()
         ps, msgs = create_or_update_sources(

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/importers/utils.py

@@ -68,10 +68,15 @@ def cache_codesets():
 
 
 def worksheet_to_dataframe(data):
+    # breakpoint()
     data = list(data)
     if not data:
         raise EmptySheet("Sheet is empty")
-    df = pd.DataFrame(data)
+    # df = pd.DataFrame(data)
+    df = pd.DataFrame(data, dtype=object)
+    # Convert all NaN to None
+    df = df.where(pd.notna(df), None)
+
     # Set the first row as the header
     df.columns = df.iloc[0]
     df = df[1:].reset_index(drop=True)

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/importers/validation.py

@@ -99,9 +99,9 @@ def validate_timevar(values, timevars, row_nr, src=None):
 
 
 def data_to_raster(raster_name, raster_path, datadir, substance):
-    if raster_path is not None:
+    if not pd.isna(raster_path):
         # generate raster name form path
-        if raster_name is None:
+        if pd.isna(raster_name):
             raster_name = splitext(basename(raster_path))[0]
         # if placeholder is used for substance in path
         # the raster-name will be given a suffix

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/migrations/0001_initial.py

@@ -1445,7 +1445,7 @@ class Migration(migrations.Migration):
         migrations.AddConstraint(
             model_name="fleet",
             constraint=models.CheckConstraint(
-                check=models.Q(("default_heavy_vehicle_share__range", (0, 1))),
+                condition=models.Q(("default_heavy_vehicle_share__range", (0, 1))),
                 name="fleet_default_heavy_vehicle_share_between_0_and_1",
             ),
         ),
@@ -1594,25 +1594,25 @@ class Migration(migrations.Migration):
         migrations.AddConstraint(
             model_name="roadsource",
             constraint=models.CheckConstraint(
-                check=models.Q(("aadt__gte", 0)), name="road_source_aadt_gte_0"
+                condition=models.Q(("aadt__gte", 0)), name="road_source_aadt_gte_0"
             ),
         ),
         migrations.AddConstraint(
             model_name="roadsource",
             constraint=models.CheckConstraint(
-                check=models.Q(("nolanes__gt", 0)), name="road_source_nolanes_gt_0"
+                condition=models.Q(("nolanes__gt", 0)), name="road_source_nolanes_gt_0"
             ),
         ),
         migrations.AddConstraint(
             model_name="roadsource",
             constraint=models.CheckConstraint(
-                check=models.Q(("width__gt", 0)), name="road_source_width_gt_0"
+                condition=models.Q(("width__gt", 0)), name="road_source_width_gt_0"
             ),
         ),
         migrations.AddConstraint(
             model_name="roadsource",
             constraint=models.CheckConstraint(
-                check=models.Q(
+                condition=models.Q(
                     ("median_strip_width__gte", 0),
                     ("median_strip_width__lt", models.F("width")),
                 ),
@@ -1622,7 +1622,7 @@ class Migration(migrations.Migration):
         migrations.AddConstraint(
             model_name="roadsource",
             constraint=models.CheckConstraint(
-                check=models.Q(("heavy_vehicle_share__range", (0, 1))),
+                condition=models.Q(("heavy_vehicle_share__range", (0, 1))),
                 name="road_source_heavy_vehicle_share_between_0_and_1",
             ),
         ),

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/models/fleets.py

@@ -25,7 +25,6 @@ class FleetManager(models.Manager):
         for f in data:
             for m in f["members"]:
                 for fu in m["fuels"]:
-                    # breakpoint()
                     if (m["vehicle"], fu["fuel"]) not in validcombinations:
                         raise ValueError(
                             f"{m['vehicle']}/{fu['fuel']} is not a valid vehicle/fuel"
@@ -87,7 +86,7 @@ class Fleet(models.Model):
         default_related_name = "fleets"
         constraints = [
             models.CheckConstraint(
-                check=Q(default_heavy_vehicle_share__range=(0, 1)),
+                condition=Q(default_heavy_vehicle_share__range=(0, 1)),
                 name="fleet_default_heavy_vehicle_share_between_0_and_1",
             ),
         ]

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/models/road_models.py

@@ -228,19 +228,23 @@ class RoadSource(SourceBase):
     class Meta:
         default_related_name = "roadsources"
         constraints = [
-            models.CheckConstraint(check=Q(aadt__gte=0), name="road_source_aadt_gte_0"),
             models.CheckConstraint(
-                check=Q(nolanes__gt=0), name="road_source_nolanes_gt_0"
+                condition=Q(aadt__gte=0), name="road_source_aadt_gte_0"
             ),
-            models.CheckConstraint(check=Q(width__gt=0), name="road_source_width_gt_0"),
             models.CheckConstraint(
-                check=(
+                condition=Q(nolanes__gt=0), name="road_source_nolanes_gt_0"
+            ),
+            models.CheckConstraint(
+                condition=Q(width__gt=0), name="road_source_width_gt_0"
+            ),
+            models.CheckConstraint(
+                condition=(
                     Q(median_strip_width__gte=0) & Q(median_strip_width__lt=F("width"))
                 ),
                 name="road_source_median_strip_width_between_0_and_width",
             ),
             models.CheckConstraint(
-                check=Q(heavy_vehicle_share__range=(0, 1)),
+                condition=Q(heavy_vehicle_share__range=(0, 1)),
                 name="road_source_heavy_vehicle_share_between_0_and_1",
             ),
         ]

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/edb/rasterize/rasterizer.py

@@ -318,15 +318,7 @@ class EmissionRasterizer:
         """Get querysets for emissions."""
 
         sourcetypes = sourcetypes or SOURCETYPES
-        # not used; srid = Settings.get_current().srid
-
-        # if ac1 is not None or ac2 is not None or ac3 is not None:
-        #     breakpoint()
-        #     # raise ValueError(
-        #     #     "filtering for ac not implemented in source_emissions_query yet!"
-        #     # )
-        # if activity codes are given as strings, get the corresponding
-        # activity code instances
+
         if ac1 is not None and len(ac1) > 0 and isinstance(ac1[0], str):
             # TODO why code__in= not code= ?
             codeset1 = Settings.get_current().codeset1
@@ -708,10 +700,12 @@ class EmissionRasterizer:
                         name=var_name,
                         unit=self.unit,
                         instance=self.instance,
+                        substance=substance.slug,
                         cell_methods=cell_methods,
                         parameter=param.name,
                         time=time,
                         chunksizes=chunking,
+                        quantity="emission",
                     )
                     subst_vars["field2d"] = {"emission": var_name}
             else:
@@ -890,6 +884,7 @@ class EmissionRasterizer:
         # rasterizing chunks and writing to dataset
         chunk_begin = begin
         chunk_end = begin
+        chunk_time_ind = 0
         while chunk_end < end:
             if min_time_chunksize == 1e9:
                 # means no result_files exist
@@ -934,13 +929,19 @@ class EmissionRasterizer:
                                 substance,
                                 emis_chunk,
                                 timestamps=[chunk_begin, chunk_end],
+                                chunk_time_ind=chunk_time_ind,
                             )
                         # update time-span of variable and dataset
 
             # update chunk time interval
+            chunk_time_ind = (
+                chunk_time_ind
+                + int((chunk_end - chunk_begin).total_seconds() / 3600)
+                + 1
+            )
             chunk_begin = chunk_end + datetime.timedelta(hours=1)
 
-    def set_data(self, dset, substance, data, timestamps=None):
+    def set_data(self, dset, substance, data, timestamps=None, chunk_time_ind=0):
         """Add chunk of data to variable."""
 
         var = dset[f"emission_{substance.slug}"]
@@ -951,12 +952,12 @@ class EmissionRasterizer:
         else:
             time_var = dset["time"]
             # map_oriented, np.fliplr flips 3d data along second dimension
-            var[:, :, :] = np.fliplr(data)
+            var[chunk_time_ind:, :, :] = np.fliplr(data)
             times = pd.date_range(timestamps[0], timestamps[1], freq=self.time_step)
             hours_since_1970 = (
                 times - pd.to_datetime("1970-01-01").tz_localize(self.timezone)
             ).total_seconds() / 3600
-            time_var[:] = hours_since_1970
+            time_var[chunk_time_ind:] = hours_since_1970
 
     def _timeseries_emis(self, substance, begin, end, sourcetype):
         """Get emission timeseries data chunk for sources.
@@ -1398,7 +1399,7 @@ class EmissionRasterizer:
             self.log.info(
                 f"No exact match for EPSG and spatial ref, using best guess: {epsg}"
             )
-            grid_mapping.srid = epsg
+        grid_mapping.srid = epsg
         grid_mapping.crs_wkt = crs.to_wkt()  # for CF Conventions 1.7
         return grid_mapping
 
@@ -1409,6 +1410,7 @@ def create_variable(
     name: str,
     unit: Optional[str] = None,
     quantity: Optional[str] = None,
+    substance: Optional[str] = None,
     instance: Optional[str] = None,
     cell_methods: Optional[str] = None,
     parameter: Optional[str] = None,
@@ -1437,6 +1439,8 @@ def create_variable(
         var.parameter = parameter
     if quantity is not None:
         var.quantity = quantity
+    if substance is not None:
+        var.substance = substance
     if instance is not None:
         var.instance = instance
     if cell_methods is not None:

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/emissions/calc.py

@@ -125,7 +125,7 @@ def aggregate_emissions(
         code_labels = dict(codeset.codes.values_list("code", "label"))
         for ind in df.index:
             code = df.loc[ind, "activitycode"]
-            if code is not None:
+            if not pd.isna(code):
                 df.loc[ind, "activity"] = code_labels[code]
         # add to index (to remain also after pivoting)
         df.set_index(["activitycode", "activity"], inplace=True)

{cetk-0.0.6.dev0 → cetk-0.0.8.dev0}/src/cetk/emissions/filters.py

@@ -89,8 +89,6 @@ def create_activitycode_where_clauses(ac1, ac2, ac3):
     """
 
     sql_list = []  # return list of sql strings
-    # TODO
-    # breakpoint()
 
     # ac1, ac2, ac3 can be either a single code or an iterable
     if ac1 is not None: