Update definitions

ISI-MIP · Jul 4, 2024 · 0adaaac · 0adaaac
1 parent 1c571f1
commit 0adaaac
Show file tree

Hide file tree

Showing 6 changed files with 308 additions and 194 deletions.
diff --git a/definitions/forcing_data/histsoc.yaml b/definitions/forcing_data/histsoc.yaml
@@ -61,40 +61,6 @@
   - water_regional
   - water_quality
 
-- specifier: histsoc_n_fertilizer
-  group: histsoc-forcing
-  title: N-fertilizer inputs
-  status: mandatory
-  doi:
-    ISIMIP3a: https://doi.org/10.48364/ISIMIP.311496.2
-    ISIMIP3b: https://doi.org/10.48364/ISIMIP.301537
-  path:
-    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/n-fertilizer/histsoc/
-    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/n-fertilizer/histsoc/
-  comment:
-    ISIMIP3a: >-
-      Input dataset documentation → [Nitrogen Fertilizer](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/108/).
-    ISIMIP3b: >-
-      Input dataset documentation → [Nitrogen Fertilizer](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/112/).
-  sectors:
-  - agriculture
-  - biodiversity
-  - biomes
-  - diarrhea
-  - energy
-  - fire
-  - forestry
-  - groundwater
-  - health
-  - labour
-  - lakes_global
-  - lakes_local
-  - peat
-  - permafrost
-  - water_global
-  - water_regional
-  - water_quality
-
 - specifier: histsoc_wood_harvest
   group: histsoc-forcing
   title: Wood harvest
@@ -120,7 +86,7 @@
 - specifier: histsoc_land_transformation
   group: histsoc-forcing
   title: Land transformation
-  status: mandatory
+  status: optional
   doi:
     ISIMIP3a: https://doi.org/10.48364/ISIMIP.249531
     ISIMIP3b: https://doi.org/10.48364/ISIMIP.537686
@@ -146,6 +112,40 @@
   - water_global
   - water_regional
 
+- specifier: histsoc_n_fertilizer
+  group: histsoc-forcing
+  title: Synthetic fertilizers N
+  status: mandatory
+  doi:
+    ISIMIP3a: https://doi.org/10.48364/ISIMIP.311496.2
+    ISIMIP3b: https://doi.org/10.48364/ISIMIP.301537
+  path:
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/n-fertilizer/histsoc/
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/n-fertilizer/histsoc/
+  comment:
+    ISIMIP3a: >-
+      Input dataset documentation → [Nitrogen Fertilizer](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/108/).
+    ISIMIP3b: >-
+      Input dataset documentation → [Nitrogen Fertilizer](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/112/).
+  sectors:
+  - agriculture
+  - biodiversity
+  - biomes
+  - diarrhea
+  - energy
+  - fire
+  - forestry
+  - groundwater
+  - health
+  - labour
+  - lakes_global
+  - lakes_local
+  - peat
+  - permafrost
+  - water_global
+  - water_regional
+  - water_quality
+
 - specifier: histsoc_ndep
   group: histsoc-forcing
   title: N-deposition
@@ -180,11 +180,11 @@
 - specifier: histsoc_crop_calendar
   group: histsoc-forcing
   title: Crop calendar
-  status: optional
+  status: mandatory
   doi: https://doi.org/10.5281/zenodo.5062513
   path:
-    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/crop_calendar/histsoc/
-    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/crop_calendar/histsoc/
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/crop_calendar/2015soc/
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/crop_calendar/2015soc/
   comment: >-
     Input dataset documentation → [Crop calendar](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/115/).
   sectors:
@@ -193,6 +193,25 @@
   - groundwater
   - water_global
 
+- specifier: histsoc_fishing
+  group: histsoc-forcing
+  title: Marine fishing effort
+  status: mandatory
+  doi:
+    ISIMIP3a:
+    ISIMIP3b: https://doi.org/10.48364/ISIMIP.911570
+  path:
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/fishing/histsoc/
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/fishing/histsoc/
+  comment:
+    ISIMIP3a: >-
+      Input dataset documentation → [Fishing effort](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/128).
+    ISIMIP3b: >-
+      Input dataset documentation → [Fishing effort](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/127).
+  sectors:
+  - marine-fishery_global
+  - marine-fishery_regional
+
 - specifier: histsoc_reservoirs_dams
   group: histsoc-forcing
   title: Dams and reservoirs
@@ -225,28 +244,6 @@
   - water_regional
   - water_quality
 
-- specifier: histsoc_pctlake
-  group: histsoc-forcing
-  title: Lake and reservoir surface area
-  status: optional
-  doi:
-    ISIMIP3a: https://doi.org/10.48364/ISIMIP.263794.2
-    ISIMIP3b: https://doi.org/10.48364/ISIMIP.383948.1
-  path:
-    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/lakes/histsoc/
-    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/lakes/histsoc/
-  comment:
-    ISIMIP3a: >-
-      Input dataset documentation → [Lake area fraction](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/132).
-    ISIMIP3b: >-
-      Input dataset documentation → [Lake area fraction](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/133).
-  sectors:
-  - groundwater
-  - lakes_global
-  - lakes_local
-  - water_global
-  - water_quality
-
 - specifier: histsoc_water_abstraction
   group: histsoc-forcing
   title: Water abstraction
@@ -276,24 +273,27 @@
   - water_regional
   - water_quality
 
-- specifier: histsoc_fishing
+- specifier: histsoc_pctlake
   group: histsoc-forcing
-  title: Marine fishing effort
-  status: mandatory
+  title: Lake and reservoir surface area
+  status: optional
   doi:
-    ISIMIP3a:
-    ISIMIP3b: https://doi.org/10.48364/ISIMIP.911570
+    ISIMIP3a: https://doi.org/10.48364/ISIMIP.263794.2
+    ISIMIP3b: https://doi.org/10.48364/ISIMIP.383948.1
   path:
-    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/fishing/histsoc/
-    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/fishing/histsoc/
+    ISIMIP3a: ISIMIP3a/InputData/socioeconomic/lakes/histsoc/
+    ISIMIP3b: ISIMIP3b/InputData/socioeconomic/lakes/histsoc/
   comment:
     ISIMIP3a: >-
-      Input dataset documentation → [Fishing effort](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/128).
+      Input dataset documentation → [Lake area fraction](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/132).
     ISIMIP3b: >-
-      Input dataset documentation → [Fishing effort](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/127).
+      Input dataset documentation → [Lake area fraction](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/133).
   sectors:
-  - marine-fishery_global
-  - marine-fishery_regional
+  - groundwater
+  - lakes_global
+  - lakes_local
+  - water_global
+  - water_quality
 
 - specifier: histsoc_forest_management_3a
   group: histsoc-forcing