merge main

Author: MAfarrag

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.11", "3.12"]
+        python-version: ["3.9", "3.11", "3.12", "3.13"]
         os: [ubuntu-latest, windows-latest, macos-13]
     runs-on: ${{ matrix.os }}
     steps:
@@ -23,7 +23,7 @@ jobs:
       - name: Run image
         uses: abatilo/[email protected]
         with:
-          poetry-version: 1.8.3
+          poetry-version: 1.8.4
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4
         id: cache
@@ -49,7 +49,7 @@ jobs:
         run: poetry run pytest --cov . --cov-report xml:coverage-reports/coverage-hydrolib-core.xml --junitxml=xunit-reports/xunit-result-hydrolib-core.xml
 
       - name: Autoformat code if the check fails
-        if: ${{ (matrix.os == 'ubuntu-latest') && (matrix.python-version == 3.12) }}
+        if: ${{ (matrix.os == 'ubuntu-latest') && (matrix.python-version == 3.13) }}
         run: |
           poetry run isort .
           poetry run black .

.github/workflows/docs.yml

@@ -12,12 +12,12 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.13
 
       - name: Run image
         uses: abatilo/[email protected]
         with:
-          poetry-version: 1.8.3
+          poetry-version: 1.8.4
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4
         id: cache

.github/workflows/docs_release.yml

@@ -13,12 +13,12 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.13
 
       - name: Run image
         uses: abatilo/[email protected]
         with:
-          poetry-version: 1.8.3
+          poetry-version: 1.8.4
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4
         id: cache

.github/workflows/integration.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.12]
+        python-version: [3.13]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,7 +29,7 @@ jobs:
       - name: Run image
         uses: abatilo/[email protected]
         with:
-          poetry-version: 1.8.3
+          poetry-version: 1.8.4
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4

.github/workflows/release.yml

@@ -36,12 +36,12 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.13
 
       - name: Run image
         uses: abatilo/[email protected]
         with:
-          poetry-version: 1.8.3
+          poetry-version: 1.8.4
 
       - name: Cache Poetry virtualenv
         uses: actions/cache@v4

hydrolib/core/dflowfm/tim/models.py

@@ -8,6 +8,7 @@
 from hydrolib.core.basemodel import BaseModel, ModelSaveSettings, ParsableFileModel
 from hydrolib.core.dflowfm.tim.parser import TimParser
 from hydrolib.core.dflowfm.tim.serializer import TimSerializer, TimSerializerConfig
+from hydrolib.core.utils import FortranUtils
 
 
 class TimRecord(BaseModel):
@@ -161,6 +162,26 @@ def _get_serializer(
     def _get_parser(cls) -> Callable[[Path], Dict]:
         return TimParser.parse
 
+    @validator("timeseries", pre=True, check_fields=True, allow_reuse=True)
+    def replace_fortran_scientific_notation_for_floats(cls, value, field):
+        for record in value:
+            if isinstance(record, dict):
+                record["time"] = FortranUtils.replace_fortran_scientific_notation(
+                    record["time"]
+                )
+                record["data"] = FortranUtils.replace_fortran_scientific_notation(
+                    record["data"]
+                )
+            elif isinstance(record, TimRecord):
+                record.time = FortranUtils.replace_fortran_scientific_notation(
+                    record.time
+                )
+                record.data = FortranUtils.replace_fortran_scientific_notation(
+                    record.data
+                )
+
+        return value
+
     @validator("timeseries")
     @classmethod
     def _validate_timeseries_values(cls, v: List[TimRecord]) -> List[TimRecord]:

hydrolib/core/utils.py

@@ -6,6 +6,8 @@
 from pathlib import Path
 from typing import Any, Callable, List, Optional
 
+from pydantic import validator
+from pydantic.v1.fields import ModelField
 from strenum import StrEnum
 
 
@@ -332,3 +334,23 @@ def _calculate_md5_checksum(filepath: Path) -> str:
             for chunk in iter(lambda: file.read(4096), b""):
                 md5_hash.update(chunk)
         return md5_hash.hexdigest()
+
+
+class FortranUtils:
+    """Utility class for Fortran specific conventions."""
+
+    _scientific_exp_d_notation_regex = re.compile(
+        r"([\d.]+)([dD])([+-]?\d{1,3})"
+    )  # matches a float: 1d9, 1D-3, 1.D+4, etc.
+
+    @staticmethod
+    def replace_fortran_scientific_notation(value):
+        """Replace Fortran scientific notation ("D" in exponent) with standard
+        scientific notation ("e" in exponent).
+        """
+        if isinstance(value, str):
+            return FortranUtils._scientific_exp_d_notation_regex.sub(r"\1e\3", value)
+        elif isinstance(value, list):
+            return list(map(FortranUtils.replace_fortran_scientific_notation, value))
+
+        return value

mkdocs.yml

@@ -22,11 +22,11 @@ theme:
     - navigation.top
 plugins:
   - search
-  - mkdocs-jupyter
   - autorefs
-  - table-reader
+
   - macros:
       module_name: docs/include/mkdocs-macros/main
+  - table-reader
   - mkdocstrings:
       default_handler: python
       handlers:
@@ -41,18 +41,15 @@ plugins:
           selection:
             inherited_members: false
 
-      custom_templates: templates
-      watch:
-        - hydrolib/core
 markdown_extensions:
   - pymdownx.highlight
   - pymdownx.superfences
   - admonition
   - toc:
       permalink: true
   - pymdownx.emoji:
-      emoji_index: !!python/name:materialx.emoji.twemoji
-      emoji_generator: !!python/name:materialx.emoji.to_svg
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
 repo_url: https://github.com/Deltares/hydrolib-core
 repo_name: deltares/hydrolib-core
 edit_uri: edit/main/docs/