Update patterns and definitions for group3

definitions/soc_dataset.yaml

@@ -8,18 +8,22 @@
     ISIMIP3a: ISIMIP3a/InputData/socioeconomic/landuse/<soc_scenario>/<soc_scenario>_landuse-totals_annual_<start_year>_<end_year>.nc
     ISIMIP3b: ISIMIP3b/InputData/socioeconomic/landuse/<soc_scenario>/<soc_scenario>_landuse-totals_annual_<start_year>_<end_year>.nc
   variables:
+  - specifier: pastures
+    long_name: share of managed pastures or rangeland
+    unit: '1'
+  - specifier: forests_and_natural_vegetation
+    long_name: share of forests and natural vegetation
+    unit: '1'
   - specifier: cropland_rainfed
-    long_name: all of the rainfed cropland
+    long_name: share of the rainfed cropland
     unit: '1'
   - specifier: cropland_irrigated
     long_name: all of the irrigated cropland
     unit: '1'
   - specifier: cropland_total
     long_name: share of the total cropland
     unit: '1'
-  - specifier: pastures
-    long_name: share of managed pastures or rangeland
-    unit: '1'
+
   comment: >-
     Input dataset documentation → [Historical, gridded land use](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/82/).
   sectors:
@@ -333,6 +337,64 @@
     ISIMIP3b:
     - 1850-2014
 
+- specifier: landuse-forests-and-natural-vegetation
+  title: Forests and natural vegetation
+  group: landuse
+  mandatory: true
+  frequency: annual
+  resolution: 0.5° grid
+  path:
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/landuse/<soc_scenario>/<soc_scenario>_landuse-forests-and-natural-vegetation_annual_<start_year>_<end_year>.nc
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/landuse/<soc_scenario>/<soc_scenario>_landuse-forests-and-natural-vegetation_annual_<start_year>_<end_year>.nc
+  variables:
+  - specifier: primary_forests
+    long_name: primary vegetation on LUH2 potential forest land
+    unit: '1'
+  - specifier: primary_nonforests
+    long_name: primary vegetation on LUH2 potential non-forest land
+    unit: '1'
+  - specifier: secondary_forests
+    long_name: secondary vegetation on LUH2 potential forest land
+    unit: '1'
+  - specifier: secondary_nonforests
+    long_name: secondary vegetation on LUH2 potential non-forest land
+    unit: '1'
+  - specifier: secondary_mean_biomass
+    long_name: secondary mean biomass carbon density
+    unit: 'kg m-2'
+  - specifier: secondary_mean_age
+    long_name: secondary mean age
+    unit: 'years'
+  comment: >-
+    Input dataset documentation → [Historical, gridded land use](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/82/).
+  sectors:
+  - agriculture
+  - biodiversity
+  - biomes
+  - coastal
+  - diarrhea
+  - energy
+  - fire
+  - forestry
+  - groundwater
+  - health
+  - fs-n
+  - labour
+  - lakes_global
+  - lakes_local
+  - peat
+  - permafrost
+  - water_global
+  - water_regional
+  - water_quality
+  time_periods:
+    ISIMIP3a:
+    - 1850-1900
+    - 1901-2021
+    ISIMIP3b:
+    - 1850-2014
+  hidden: true
+
 - specifier: n-fertilizer-5crops
   title: Nitrogen deposited by fertilizers on croplands
   group: n-fertilizer
@@ -463,7 +525,7 @@
     - 1850-2014
     - 2015-2100
 
-- specifier: ggcmi-crop-calendar-phase3
+- specifier: ggcmi-crop-calendar
   title: GGCMI crop calendar for Phase 3
   group: crop-calendar
   frequency: fixed

pattern/ISIMIP3b/InputData/socioeconomic/crop_calendar.json

@@ -4,19 +4,21 @@
     "(?P<product>[A-Za-z]+)",
     "(?P<category>[a-z0-9-_]+)",
     "(?P<subcategory>[a-z0-9-_]+)",
-    "(?P<soc_scenario>[a-z0-9]+)"
+    "(?P<soc_scenario>[a-z0-9-]+)"
   ],
   "dataset": [
-    "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>[a-z0-9]+)",
-    "(?P<crop>[a-z0-9]+)",
-    "(?P<irrigation>[a-z]+)"
+    "(?P<soc_dataset>[a-z0-9-]+?)(-phase3)?(_(?P<climate_forcing>[a-z0-9-]+))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?",
+    "(?P<crop>[a-z0-9]+)-(?P<irrigation>[a-z]+)",
+    "(?P<time_step>[a-z0-9-]+)"
   ],
   "file": [
-    "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>[a-z0-9]+)",
-    "(?P<crop>[a-z0-9]+)",
-    "(?P<irrigation>[a-z]+)"
+    "(?P<soc_dataset>[a-z0-9-]+?)(-phase3)?(_(?P<climate_forcing>[a-z0-9-]+))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?",
+    "(?P<crop>[a-z0-9]+)-(?P<irrigation>[a-z]+)",
+    "(?P<time_step>[a-z0-9-]+)",
+    "(?P<start_year>\\d{4})",
+    "(?P<end_year>\\d{4})"
   ],
   "suffix": [
     ".nc"

pattern/ISIMIP3b/InputData/socioeconomic/gdp.json

@@ -8,12 +8,12 @@
   ],
   "dataset": [
     "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?",
     "(?P<time_step>[a-z0-9-]+)"
   ],
   "file": [
     "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?",
     "(?P<time_step>[a-z0-9-]+)",
     "(?P<start_year>\\d{4})",
     "(?P<end_year>\\d{4})"

pattern/ISIMIP3b/InputData/socioeconomic/land-transformation.json

@@ -4,16 +4,16 @@
     "(?P<product>[A-Za-z]+)",
     "(?P<category>[a-z0-9-_]+)",
     "(?P<subcategory>[a-z0-9-_]+)",
-    "(?P<soc_scenario>[a-z0-9]+)"
+    "(?P<soc_scenario>[a-z0-9-]+)"
   ],
   "dataset": [
-    "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>[a-z0-9]+)",
+    "(?P<soc_dataset>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<time_step>[a-z0-9-]+)"
   ],
   "file": [
-    "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>[a-z0-9]+)",
+    "(?P<soc_dataset>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<time_step>[a-z0-9-]+)",
     "(?P<start_year>\\d{4})",
     "(?P<end_year>\\d{4})"

pattern/ISIMIP3b/InputData/socioeconomic/landuse.json

@@ -8,12 +8,12 @@
   ],
   "dataset": [
     "(?P<soc_dataset>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<time_step>[a-z]+)"
   ],
   "file": [
     "(?P<soc_dataset>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<time_step>[a-z]+)",
     "(?P<start_year>\\d{4})",
     "(?P<end_year>\\d{4})"

pattern/ISIMIP3b/InputData/socioeconomic/n-fertilizer.json

@@ -8,12 +8,12 @@
   ],
   "dataset": [
     "(?P<soc_dataset>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<time_step>[a-z]+)"
   ],
   "file": [
     "(?P<soc_dataset>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<time_step>[a-z]+)",
     "(?P<start_year>\\d{4})",
     "(?P<end_year>\\d{4})"

pattern/ISIMIP3b/InputData/socioeconomic/pop.json

@@ -8,13 +8,13 @@
   ],
   "dataset": [
     "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?",
     "(?P<resolution>[a-z0-9-]+)",
     "(?P<time_step>[a-z0-9-]+)"
   ],
   "file": [
     "(?P<soc_dataset>[a-z0-9-]+)",
-    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(noco2)))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?",
     "(?P<resolution>[a-z0-9-]+)",
     "(?P<time_step>[a-z0-9-]+)",
     "(?P<start_year>\\d{4})",

pattern/ISIMIP3b/InputData/socioeconomic/wood_harvesting.json

@@ -4,17 +4,17 @@
     "(?P<product>[A-Za-z]+)",
     "(?P<category>[a-z0-9-_]+)",
     "(?P<subcategory>[a-z0-9-_]+)",
-    "(?P<soc_scenario>[a-z0-9]+)"
+    "(?P<soc_scenario>[a-z0-9-]+)"
   ],
   "dataset": [
-    "(?P<soc_variable>[a-z0-9-]+)",
-    "(?P<soc_scenario>[a-z0-9]+)",
+    "(?P<soc_variable>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<resolution>[a-z0-9-]+)",
     "(?P<time_step>[a-z0-9-]+)"
   ],
   "file": [
-    "(?P<soc_variable>[a-z0-9-]+)",
-    "(?P<soc_scenario>[a-z0-9]+)",
+    "(?P<soc_variable>[a-z0-9-]+)(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?",
+    "(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<soc_pathway>(ssp1|ssp3|ssp5))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?(_(?P<sens_scenario>(2015co2)))?",
     "(?P<resolution>[a-z0-9-]+)",
     "(?P<time_step>[a-z0-9-]+)",
     "(?P<start_year>\\d{4})",

tree/ISIMIP3b/InputData/socioeconomic.json

@@ -3,6 +3,5 @@
   "product",
   "category",
   "subcategory",
-  "soc_scenario",
-  "soc_dataset"
+  "soc_scenario"
 ]

tree/ISIMIP3b/InputData/socioeconomic/landuse.json

@@ -0,0 +1,8 @@
+[
+  "simulation_round",
+  "product",
+  "category",
+  "subcategory",
+  "soc_scenario",
+  "soc_dataset"
+]