Update biophysical forcing patterns

ISI-MIP · May 29, 2024 · da608ca · da608ca
1 parent 286dd30
commit da608ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/pattern/ISIMIP3a/OutputData/fs-n.json b/pattern/ISIMIP3a/OutputData/fs-n.json
@@ -1,7 +1,7 @@
 {
   "dataset": [
     "(?P<model>[a-z0-9-+.]+)",
-    "(?P<climate_forcing>[a-z0-9-]+)(-(?P<soc_forcing>[a-z0-9]+))?",
+    "(?P<climate_forcing>[a-z0-9-]+)+(?P<upstream_model>[a-z0-9-+.]+)",
     "(?P<climate_scenario>[a-z0-9]+)",
     "(?P<soc_scenario>[a-z0-9]+)",
     "(?P<sens_scenario>[a-z0-9-]+)",
@@ -11,8 +11,7 @@
   ],
   "file": [
     "(?P<model>[a-z0-9-+.]+)",
-    "(?P<upstream-model>[a-z0-9-+.]+)",
-    "(?P<climate_forcing>[a-z0-9-]+)",
+    "(?P<climate_forcing>[a-z0-9-]+)+(?P<upstream_model>[a-z0-9-+.]+)",
     "(?P<climate_scenario>[a-z0-9]+)",
     "(?P<soc_scenario>[a-z0-9]+)",
     "(?P<sens_scenario>[a-z0-9-]+)",

diff --git a/pattern/ISIMIP3b/OutputData/fs-n.json b/pattern/ISIMIP3b/OutputData/fs-n.json
@@ -1,8 +1,8 @@
 {
   "dataset": [
     "(?P<model>[a-z0-9-+.]+)",
-    "(?P<climate_forcing>[a-z0-9-]+)",
-    "(?P<bias_adjustment>[a-z0-9]+)(-(?P<soc_forcing>[a-z0-9]+))?",
+    "(?P<climate_forcing>[a-z0-9-]+)+(?P<upstream_model>[a-z0-9-+.]+)",
+    "(?P<bias_adjustment>[a-z0-9]+)",
     "(?P<climate_scenario>[a-z0-9-]+)",
     "(?P<soc_scenario>[a-z0-9-]+)",
     "(?P<sens_scenario>[a-z0-9-]+)",
@@ -12,8 +12,7 @@
   ],
   "file": [
     "(?P<model>[a-z0-9-+.]+)",
-    "(?P<upstream-model>[a-z0-9-+.]+)",
-    "(?P<climate_forcing>[a-z0-9-]+)",
+    "(?P<climate_forcing>[a-z0-9-]+)+(?P<upstream_model>[a-z0-9-+.]+)",
     "(?P<bias_adjustment>[a-z0-9]+)",
     "(?P<climate_scenario>[a-z0-9-]+)",
     "(?P<soc_scenario>[a-z0-9-]+)",