Skip to content

Commit df8e105

Browse files
committed
Use lu_model for soc datasets
1 parent 34f5799 commit df8e105

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

pattern/ISIMIP3b/InputData/socioeconomic/irrigation-techniques.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ path: >-
77
88
dataset: >-
99
(?P<soc_dataset>[a-z0-9-]+)
10-
(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?
10+
(_(?P<lu_model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?
1111
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
1212
(_(?P<sens_scenario>(2015co2)))?
1313
_(?P<time_step>[a-z0-9-]+)
1414
1515
file: >-
1616
(?P<soc_dataset>[a-z0-9-]+)
17-
(_(?P<model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?
17+
(_(?P<lu_model>[a-z0-9-]+))?(_(?P<climate_forcing>[a-z0-9-]+))?
1818
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
1919
(_(?P<sens_scenario>(2015co2)))?
2020
_(?P<time_step>[a-z0-9-]+)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ path: >-
77
88
dataset: >-
99
(?P<soc_dataset>[a-z0-9-]+)
10-
(_(?P<model>[a-z0-9-]+))?
10+
(_(?P<lu_model>[a-z0-9-]+))?
1111
(_(?P<climate_forcing>[a-z0-9-]+))?
1212
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
1313
(_(?P<sens_scenario>(2015co2)))?
1414
_(?P<time_step>[a-z0-9-]+)
1515
1616
file: >-
1717
(?P<soc_dataset>[a-z0-9-]+)
18-
(_(?P<model>[a-z0-9-]+))?
18+
(_(?P<lu_model>[a-z0-9-]+))?
1919
(_(?P<climate_forcing>[a-z0-9-]+))?
2020
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
2121
(_(?P<sens_scenario>(2015co2)))?

pattern/ISIMIP3b/InputData/socioeconomic/landuse.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ path: >-
77
88
dataset: >-
99
(?P<soc_dataset>[a-z0-9-]+)
10-
(_(?P<model>[a-z0-9-]+))?
10+
(_(?P<lu_model>[a-z0-9-]+))?
1111
(_(?P<climate_forcing>[a-z0-9-]+))?
1212
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
1313
(_(?P<sens_scenario>(2015co2)))?
1414
_(?P<time_step>[a-z]+)
1515
1616
file: >-
1717
(?P<soc_dataset>[a-z0-9-]+)
18-
(_(?P<model>[a-z0-9-]+))?
18+
(_(?P<lu_model>[a-z0-9-]+))?
1919
(_(?P<climate_forcing>[a-z0-9-]+))?
2020
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
2121
(_(?P<sens_scenario>(2015co2)))?

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ path: >-
77
88
dataset: >-
99
(?P<soc_dataset>[a-z0-9-]+)
10-
(_(?P<model>[a-z0-9-]+))?
10+
(_(?P<lu_model>[a-z0-9-]+))?
1111
(_(?P<climate_forcing>[a-z0-9-]+))?
1212
_(2015soc|1850soc|histsoc)?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
1313
(_(?P<sens_scenario>(2015co2)))?
1414
_(?P<time_step>[a-z]+)
1515
1616
file: >-
1717
(?P<soc_dataset>[a-z0-9-]+)
18-
(_(?P<model>[a-z0-9-]+))?
18+
(_(?P<lu_model>[a-z0-9-]+))?
1919
(_(?P<climate_forcing>[a-z0-9-]+))?
2020
_(2015soc|1850soc|histsoc)?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
2121
(_(?P<sens_scenario>(2015co2)))?

pattern/ISIMIP3b/InputData/socioeconomic/wood_harvesting.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ path: >-
77
88
dataset: >-
99
(?P<soc_variable>[a-z0-9-]+)
10-
(_(?P<model>[a-z0-9-]+))?
10+
(_(?P<lu_model>[a-z0-9-]+))?
1111
(_(?P<climate_forcing>[a-z0-9-]+))?
1212
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
1313
(_(?P<sens_scenario>(2015co2)))?
@@ -16,7 +16,7 @@ dataset: >-
1616
1717
file: >-
1818
(?P<soc_variable>[a-z0-9-]+)
19-
(_(?P<model>[a-z0-9-]+))?
19+
(_(?P<lu_model>[a-z0-9-]+))?
2020
(_(?P<climate_forcing>[a-z0-9-]+))?
2121
_(?P<soc_scenario>(histsoc|2015soc|1850soc))?(?P<climate_scenario>(ssp126|ssp370|ssp585))?
2222
(_(?P<sens_scenario>(2015co2)))?

0 commit comments

Comments
 (0)