From e1f214c42f1fde19d69d04348107fcd0faea759e Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Wed, 12 Jun 2024 13:47:46 +0200
Subject: [PATCH] Update fishing effort patterns

---
 definitions/soc_dataset.yaml                          | 4 ++--
 pattern/ISIMIP3a/InputData/socioeconomic/fishing.json | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/definitions/soc_dataset.yaml b/definitions/soc_dataset.yaml
index a321cbd9b9..5e5d8725ca 100644
--- a/definitions/soc_dataset.yaml
+++ b/definitions/soc_dataset.yaml
@@ -676,7 +676,7 @@
   - 1841-2010
 
 - specifier: gridded_artisanal_fishing_effort
-  specifier_file: gridded_artisanal_effort
+  specifier_file: effort-artisanal-gridded
   title: Gridded artisanal fishing effort
   group: fishing
   mandatory: true
@@ -699,7 +699,7 @@
   - 1961-2010
 
 - specifier: gridded_industrial_fishing_effort
-  specifier_file: gridded_industrial_effort
+  specifier_file: effort-industrial-gridded
   title: Gridded industrial fishing effort
   group: fishing
   mandatory: true
diff --git a/pattern/ISIMIP3a/InputData/socioeconomic/fishing.json b/pattern/ISIMIP3a/InputData/socioeconomic/fishing.json
index a323361f6e..57b2cc1823 100644
--- a/pattern/ISIMIP3a/InputData/socioeconomic/fishing.json
+++ b/pattern/ISIMIP3a/InputData/socioeconomic/fishing.json
@@ -7,11 +7,13 @@
     "(?P<soc_scenario>[a-z0-9]+)"
   ],
   "dataset": [
-    "(?P<soc_dataset>[a-z0-9_]+)?",
+    "(?P<soc_dataset>[a-z0-9_-]+)?",
+    "(isimip3a)",
     "(?P<soc_scenario>[a-z]+)"
   ],
   "file": [
-    "(?P<soc_dataset>[a-z0-9_]+)?",
+    "(?P<soc_dataset>[a-z0-9_-]+)?",
+    "(isimip3a)",
     "(?P<soc_scenario>[a-z]+)",
     "(?P<start_year>\\d{4})",
     "(?P<end_year>\\d{4})"