add dry and wet components of NHx and NOy

ISI-MIP · Sep 25, 2024 · add52a9 · add52a9
1 parent c31f5d0
commit add52a9
Showing 1 changed file with 40 additions and 28 deletions.
diff --git a/definitions/soc_dataset.yaml b/definitions/soc_dataset.yaml
@@ -552,23 +552,29 @@
   group3: true
   path:
     ISIMIP3a:
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/histsoc/ndep-nhx_histsoc_annual_<start>_<end>.nc
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/2015soc/ndep-nhx_2015soc_annual_<start>_<end>.nc
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/1901soc/ndep-nhx_1901soc_annual_<start>_<end>.nc
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/1850soc/ndep-nhx_1850soc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/histsoc/ndep-<variable>_histsoc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/2015soc/ndep-<variable>_2015soc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/1901soc/ndep-<variable>_1901soc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/1850soc/ndep-<variable>_1850soc_annual_<start>_<end>.nc
     ISIMIP3b:
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/histsoc/ndep-nhx_histsoc_annual_<start>_<end>.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/2015soc/ndep-nhx_2015soc_annual_<start>_<end>.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/1850soc/ndep-nhx_1850soc_annual_<start>_<end>.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-noadapt/ndep-nhx_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-noadapt/ndep-nhx_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-noadapt/ndep-nhx_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-adapt/ndep-nhx_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-adapt/ndep-nhx_ssp370_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-adapt/ndep-nhx_ssp585_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/histsoc/ndep-<variable>_histsoc_annual_<start>_<end>.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/2015soc/ndep-<variable>_2015soc_annual_<start>_<end>.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/1850soc/ndep-<variable>_1850soc_annual_<start>_<end>.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-noadapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-noadapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-noadapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-adapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-adapt/ndep-<variable>_ssp370_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-adapt/ndep-<variable>_ssp585_annual_2015_2100.nc
   variables:
   - specifier: nhx
-    long_name: NHx deposition (nhx)
+    long_name: Dry and Wet NHx deposition
+    unit: g N m-2 mon-1
+  - specifier: drynhx
+    long_name: Dry NHx deposition
+    unit: g N m-2 mon-1
+  - specifier: wetnhx
+    long_name: Wet NHx deposition
     unit: g N m-2 mon-1
   comment: >-
     Input dataset documentation → [Nitrogen deposition](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/116/).
@@ -605,23 +611,29 @@
   group3: true
   path:
     ISIMIP3a:
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/histsoc/ndep-noy_histsoc_annual_<start>_<end>.nc
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/2015soc/ndep-noy_2015soc_annual_<start>_<end>.nc
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/1901soc/ndep-noy_1901soc_annual_<start>_<end>.nc
-    - ISIMIP3a/InputData/socioeconomic/n-deposition/1850soc/ndep-noy_1850soc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/histsoc/ndep-<variable>_histsoc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/2015soc/ndep-<variable>_2015soc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/1901soc/ndep-<variable>_1901soc_annual_<start>_<end>.nc
+    - ISIMIP3a/InputData/socioeconomic/n-deposition/1850soc/ndep-<variable>_1850soc_annual_<start>_<end>.nc
     ISIMIP3b:
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/histsoc/ndep-noy_histsoc_annual_<start>_<end>.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/2015soc/ndep-noy_2015soc_annual_<start>_<end>.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/1850soc/ndep-noy_1850soc_annual_<start>_<end>.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-noadapt/ndep-noy_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-noadapt/ndep-noy_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-noadapt/ndep-noy_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-adapt/ndep-noy_ssp126_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-adapt/ndep-noy_ssp370_annual_2015_2100.nc
-    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-adapt/ndep-noy_ssp585_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/histsoc/ndep-<variable>_histsoc_annual_<start>_<end>.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/2015soc/ndep-<variable>_2015soc_annual_<start>_<end>.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/1850soc/ndep-<variable>_1850soc_annual_<start>_<end>.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-noadapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-noadapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-noadapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp126soc-adapt/ndep-<variable>_ssp126_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp370soc-adapt/ndep-<variable>_ssp370_annual_2015_2100.nc
+    - ISIMIP3b/InputData/socioeconomic/n-deposition/ssp585soc-adapt/ndep-<variable>_ssp585_annual_2015_2100.nc
   variables:
   - specifier: noy
-    long_name: NOy deposition (noy)
+    long_name: Dry and Wet NOy deposition
+    unit: g N m-2 mon-1
+  - specifier: drynoy
+    long_name: Dry NOy deposition
+    unit: g N m-2 mon-1
+  - specifier: wetnoy
+    long_name: Wet NOy deposition
     unit: g N m-2 mon-1
   comment: >-
     Input dataset documentation → [Nitrogen deposition](https://www.isimip.org/gettingstarted/input-data-bias-adjustment/details/116/).