Merge pull request #197 from milenaveneziani/add_IlulissatFjord_blockage

Add land blockage to entrance of Ilulissat, Humboldt, and Petermann Glaciers
MPAS-Dev · Aug 28, 2023 · 18fbd71 · 18fbd71
2 parents 8ab3506 + af06eae
commit 18fbd71
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 52 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -114,54 +114,3 @@ jobs:
       fi
     condition: eq(variables['python.version'], '3.10')
     displayName: build and deploy docs
-
-- job:
-  displayName: osx
-  pool:
-    vmImage: 'macOS-latest'
-  strategy:
-    matrix:
-      Python39:
-        python.version: '3.9'
-      Python310:
-        python.version: '3.10'
-      Python311:
-        python.version: '3.11'
-
-  steps:
-  - bash: echo "##vso[task.prependpath]$CONDA/bin"
-    displayName: Add conda to PATH
-
-  - bash: sudo chown -R 501:20 /usr/local/miniconda/pkgs
-    displayName: Fix permissions
-
-  - bash: |
-      set -e
-      eval "$(conda shell.bash hook)"
-      conda config --add channels conda-forge
-      conda config --set channel_priority strict
-      conda update --yes --all
-      conda install --yes mamba
-      mamba install --yes conda-build boa
-    displayName: Update conda base environment
-
-  - bash: |
-      set -e
-      eval "$(conda shell.bash hook)"
-      conda mambabuild -m "ci/python${PYTHON_VERSION}.yaml" "recipe"
-    displayName: Build geometric_features
-
-  - bash: |
-      set -e
-      eval "$(conda shell.bash hook)"
-      mamba create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \
-          python=$PYTHON_VERSION geometric_features pytest
-    displayName: Create Anaconda test environment
-
-  - bash: |
-      set -e
-      eval "$(conda shell.bash hook)"
-      conda activate test
-      pytest --pyargs geometric_features
-    displayName: pytest
-
diff --git a/...etric_data/ocean/transect/Humboldt_Petermann_Glaciers_blockage/transect.geojson b/...etric_data/ocean/transect/Humboldt_Petermann_Glaciers_blockage/transect.geojson
@@ -0,0 +1,41 @@
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "Humboldt Petermann Glaciers blockage",
+                "tags": "Critical_Land_Blockage",
+                "object": "transect",
+                "component": "ocean",
+                "author": "Milena Veneziani",
+                "height": "100.0"
+            },
+            "geometry": {
+                "type": "LineString",
+                "coordinates": [
+                    [
+                        -67.25,
+                        79.03
+                    ],
+                    [
+                        -64.0,
+                        78.72
+                    ],
+                    [
+                        -59.58,
+                        79.87
+                    ],
+                    [
+                        -53.46,
+                        80.9
+                    ],
+                    [
+                        -56.75,
+                        82.03
+                    ]
+                ]
+            }
+        }
+    ]
+}
diff --git a/geometric_data/ocean/transect/Ilulissat_Glacier_blockage/transect.geojson b/geometric_data/ocean/transect/Ilulissat_Glacier_blockage/transect.geojson
@@ -0,0 +1,41 @@
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "Ilulissat Glacier blockage",
+                "tags": "Critical_Land_Blockage",
+                "object": "transect",
+                "component": "ocean",
+                "height": "100.0",
+                "author": "Milena Veneziani"
+            },
+            "geometry": {
+                "type": "LineString",
+                "coordinates": [
+                    [
+                        -50.33,
+                        69.31
+                    ],
+                    [
+                        -49.62,
+                        69.34
+                    ],
+                    [
+                        -49.04,
+                        69.26
+                    ],
+                    [
+                        -49.25,
+                        69.01
+                    ],
+                    [
+                        -50.18,
+                        69.05
+                    ]
+                ]
+            }
+        }
+    ]
+}
diff --git a/geometric_features/features_and_tags.json b/geometric_features/features_and_tags.json
@@ -1667,10 +1667,16 @@
       "Hudson Bay-Labrador Sea": [
         "arctic_transport_sections"
       ],
+      "Humboldt Petermann Glaciers blockage": [
+        "Critical_Land_Blockage"
+      ],
       "Iceland-Faroe-Scotland": [
         "standard_transport_sections",
         "arctic_transport_sections"
       ],
+      "Ilulissat Glacier blockage": [
+        "Critical_Land_Blockage"
+      ],
       "Indonesian Throughflow": [
         "standard_transport_sections"
       ],
@@ -1815,4 +1821,4 @@
       ]
     }
   }
-}
+}