Merge pull request #157 from metno/156-remove-height-from-cloud_area_fraction

Set leveltype and level to None.

Author: ways

.github/workflows/python-package.yml

@@ -18,60 +18,72 @@ jobs:
         python-version: ["3.10"]
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: Cache tox dir
-      id: cache-tox
-      uses: actions/cache@v4
-      env:
-        cache-name: cache-tox-data
-      with:
-        path: .tox
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('pyproject.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - if: ${{ steps.cache-tox-data.outputs.cache-hit != 'true' }}
-      name: List the state of tox
-      continue-on-error: true
-      run: ls -lha .tox/py310/
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: 'pip' # caching pip dependencies
-
-    - name: Install python dependencies
-      run: |
-        python -m pip install tox
-
-    - name: Run ruff format check
-      run: |
-        tox -e ruff_checkformat
-
-    - name: Run ruff check
-      run: |
-        tox -e ruff_check
-
-    - name: Fetch dataset
-      run: |
-        tox -e trainingdata
-
-    - name: Run tox unit tests
-      run: |
-        tox -e py310
-
-    - name: Run tox security check
-      run: |
-        tox -e bandit
-
-    - name: Run inference
-      run: |
-        tox -e inference_CI
-
-    - name: Run inference_multi_CI
-      run: |
-        tox -e inference_multi_CI
+      # Clean out runner data we don't use, should free up ~15 GB
+      - run: df -h
+      - name: "node-cleanup"
+        run: |
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          sudo docker image prune --all --force
+          sudo docker builder prune -a
+      - run: df -h
+
+      - uses: actions/checkout@v4
+
+      - name: Cache tox dir
+        id: cache-tox
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-tox-data
+        with:
+          path: .tox
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('pyproject.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - if: ${{ steps.cache-tox-data.outputs.cache-hit != 'true' }}
+        name: List the state of tox
+        continue-on-error: true
+        run: ls -lha .tox/py310/
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip' # caching pip dependencies
+
+      - name: Install python dependencies
+        run: |
+          python -m pip install tox
+
+      - name: Run ruff format check
+        run: |
+          tox -e ruff_checkformat
+
+      - name: Run ruff check
+        run: |
+          tox -e ruff_check
+
+      - name: Fetch dataset
+        run: |
+          tox -e trainingdata
+
+      - name: Run tox unit tests
+        run: |
+          tox -e py310
+
+      - name: Run tox security check
+        run: |
+          tox -e bandit
+
+      - name: Run inference
+        run: |
+          tox -e inference_CI
+
+      - name: Run inference_multi_CI
+        run: |
+          tox -e inference_multi_CI
+
+      # To warn us when we get close to disk capacity again
+      - run: df -h

bris/conventions/metno.py

@@ -24,6 +24,11 @@ def get_ncname(self, cfname: str, leveltype: str, level: int):
             "air_pressure_at_sea_level",
             "wind_speed_of_gust",
             "land_sea_mask",
+            "fog_type_cloud_area_fraction",
+            "high_type_cloud_area_fraction",
+            "low_type_cloud_area_fraction",
+            "medium_type_cloud_area_fraction",
+            "cloud_area_fraction",
         ]:
             # Prevent _0m from being added at the end of variable name
             ncname = f"{cfname}"