From b9f3547e8a86ac152e0513a677bdac9ba09401d3 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Wed, 15 May 2024 14:55:18 +0200
Subject: [PATCH] Update biophysical forcing patterns

---
 pattern/ISIMIP3a/OutputData/fs-n.json | 5 ++---
 pattern/ISIMIP3b/OutputData/fs-n.json | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pattern/ISIMIP3a/OutputData/fs-n.json b/pattern/ISIMIP3a/OutputData/fs-n.json
index 876f654a1d..e98696f871 100644
--- 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
index acaafefcd1..6e98257524 100644
--- 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-]+)",