Update fishing effort patterns

ISI-MIP · Jun 12, 2024 · e1f214c · e1f214c
1 parent be51f5d
commit e1f214c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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})"