Merge pull request #97 from ISI-MIP/soc_updates

Soc updates

definitions/group.yaml

@@ -103,7 +103,7 @@
   identifier: soc_dataset
 
 - specifier: land-transformation
-  title: Not forest-related land transformation
+  title: Land transformation
   identifier: soc_dataset
 
 - specifier: n-fertilizer

definitions/soc_dataset.yaml

@@ -657,8 +657,8 @@
   frequency: annual
   resolution: 0.5° grid
   path:
-    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/water_abstraction/[domw|indw][w|c]_<soc_scenario>_annual_<start-year>_<end-year>.nc
-    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/water_abstraction/[domw|indw][w|c]_<soc_scenario>_annual_<start-year>_<end-year>.nc
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/water_abstraction/<soc_scenario>/[domw|indw][w|c]_<soc_scenario>_annual_<start-year>_<end-year>.nc
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/water_abstraction/<soc_scenario>/[domw|indw][w|c]_<soc_scenario>_annual_<start-year>_<end-year>.nc
   variables:
   - specifier: domww
     long_name: domestic water withdrawal
@@ -704,7 +704,10 @@
   mandatory: true
   frequency: annual
   resolution: Marine ecosystems or exclusive economic zones
-  path: ISIMIP3a/InputData/socioeconomic/fishing/histsoc/effort_isimip3a_histsoc_1841_2010.csv
+  path:
+  - ISIMIP3a/InputData/socioeconomic/fishing/histsoc/effort_isimip3a_histsoc_1841_2010.csv
+  - ISIMIP3a/InputData/socioeconomic/fishing/histsoc/effort-artisanal-gridded_isimip3a_histsoc_1961_2010.csv
+  - ISIMIP3a/InputData/socioeconomic/fishing/histsoc/effort-industrial-gridded_isimip3a_histsoc_1961_2010.csv
   variables:
   - specifier: Sector
     long_name: Fishing sector (artisanal/industrial), defined by the law of the country
@@ -790,7 +793,7 @@
   mandatory: true
   frequency: annual
   resolution: Marine ecosystems or exclusive economic zones
-  path: ISIMIP3b/InputData/socioeconomic/fishing/effort_histsoc_1950_2014.csv
+  path: ISIMIP3b/InputData/socioeconomic/fishing/histsoc/effort_isimip3b-phase1_histsoc_1950_2014.csv
   variables:
   - specifier: FAO
     long_name: The generic name of the FAO area in which the Effort/Catch is occurring
@@ -880,10 +883,12 @@
   title: Wood harvesting
   group: wood_harvesting
   frequency: annual
-  resolution: national
+  resolution:
+  - 0.5° grid
+  - national
   path:
-    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/wood_harvesting/<variable>_<soc_scenario>_national_annual_<start_year>_<end_year>.nc
-    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/wood_harvesting/<variable>_<soc_scenario>_national_annual_<start_year>_<end_year>.nc
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/wood_harvesting/<soc_scenario>/<variable>_<soc_scenario>_national_annual_<start_year>_<end_year>.nc
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/wood_harvesting/<soc_scenario>/<variable>_<soc_scenario>_national_annual_<start_year>_<end_year>.nc
   variables:
   - specifier: primf-harv
     long_name: wood harvest area from primary forest land
@@ -915,8 +920,9 @@
   - specifier: secnf-bioh
     long_name: wood harvest biomass carbon from secondary non forest land
     unit: kg
-  comment: >-
-    Input dataset documentation → [Wood harvesting](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/83/).
+  comment:
+    ISIMIP3a: Input dataset documentation → [Wood harvesting](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/83/).
+    ISIMIP3b: Input dataset documentation → [Wood harvesting (group I+II)](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/141/), [Wood harvesting (group III)](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/185/).
   sectors:
   - biomes
   - fire
@@ -927,29 +933,27 @@
   time_periods:
     ISIMIP3a:
     - 1850-1900
-    - 1901-2020
+    - 1901-2021
     ISIMIP3b:
     - 1850-2014
+    - 2015-2099
 
 - specifier: land-transformation
-  title: Not forest-related land transformation
+  title: Land transformation
   group: land-transformation
   frequency: annual
-  resolution: national
+  resolution: 0.5° grid
   path:
     ISIMIP3a: ISIMIP3a/InputData/socioeconomic/land-transformation/<soc_scenario>/land-transformation_<soc_scenario>_annual_<start_year>_<end_year>.nc
     ISIMIP3b: ISIMIP3b/InputData/socioeconomic/land-transformation/<soc_scenario>/land-transformation_<soc_scenario>_annual_<start_year>_<end_year>.nc
   variables:
   - specifier: <type>_to_<type>
     long_name: One variable for each transition from one type of land use to another.
     unit: '1'
-  comment: "The data set consists of 115 land transformation categories, one for each\
-    \ transition from one type of land use to another. Considered land use types:\
-    \ **secdf** (potentially forested secondary land), **secdn** (potentially non-forested\
-    \ secondary land), **urban** (urban land), **c3ann** (C3 annual crops), **c4ann**\
-    \ (C4 annual crops), **c3per** (C3 perennial crops), **c4per** (C4 perennial crops),\
-    \ **c3nfx** (C3 nitrogen-fixing crops), **pastr** (managed asture), **range**\
-    \ (rangeland). Input dataset documentation → [Gridded historical land transformation](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/142/). "
+  comment:
+    ISIMIP3a: Input dataset documentation → [Gridded historical land transformation](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/142/).
+    ISIMIP3b: Input dataset documentation → [Gridded historical land transformation (group I+II)](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/186/), [Gridded historical land transformation (group III)](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/187/).
+
   sectors:
   - agriculture
   - biodiversity
@@ -970,9 +974,10 @@
   time_periods:
     ISIMIP3a:
     - 1850-1900
-    - 1901-2020
+    - 1901-2021
     ISIMIP3b:
     - 1850-2014
+    - 2015-2099
 
 - specifier: pctlake
   title: Lake area fraction