Sync data files between hindcast and future directories

data/country_groups.csv

@@ -62,10 +62,10 @@ Azerbaijan,9.054332,Europe & Central Asia,Upper middle income,Other former USSR
 Belarus,9.49,Europe & Central Asia,Upper middle income,Other former USSR
 Kazakhstan,16.321581,Europe & Central Asia,Upper middle income,Other former USSR
 Uzbekistan,28.5624,Europe & Central Asia,Lower middle income,Other former USSR
-Poland,38.042794,Europe & Central Asia,High income: OECD,Poland & Baltic states
-Estonia,1.331475,Europe & Central Asia,High income: OECD,Poland & Baltic states
-Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Poland & Baltic states
-Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Poland & Baltic states
+Poland,38.042794,Europe & Central Asia,High income: OECD,Poland
+Estonia,1.331475,Europe & Central Asia,High income: OECD,Scandinavia
+Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Scandinavia
+Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Scandinavia
 Russian Federation,142.849449,Europe & Central Asia,High income: nonOECD,Russian Federation
 Greenland,0.056905,Europe & Central Asia,High income: nonOECD,Scandinavia
 Iceland,0.318041,Europe & Central Asia,High income: OECD,Scandinavia
@@ -137,14 +137,14 @@ Libya,6.265697,Middle East & North Africa,Upper middle income,North Africa other
 Tunisia,10.5471,Middle East & North Africa,Upper middle income,North Africa other
 Canada,34.005274,North America,High income: OECD,Canada
 United States of America,309.346863,North America,High income: OECD,United States of America
-Afghanistan,27.962207,South Asia,Low income,Afghanistan
+Afghanistan,27.962207,South Asia,Low income,Pakistan & Afghanistan
 Bangladesh,151.616777,South Asia,Low income,Bangladesh
 Maldives,0.367,South Asia,Upper middle income,India  & Sri Lanka
 Sri Lanka,20.118,South Asia,Lower middle income,India  & Sri Lanka
 India,1230.984504,South Asia,Lower middle income,India  & Sri Lanka
 Bhutan,0.720246,South Asia,Lower middle income,Nepal & Butan
 Nepal,26.87591,South Asia,Low income,Nepal & Butan
-Pakistan,170.043918,South Asia,Lower middle income,Pakistan
+Pakistan,170.043918,South Asia,Lower middle income,Pakistan & Afghanistan
 Sao Tome and Principe,0.17088,Sub-Saharan Africa,Lower middle income,Central Africa
 Comoros,0.698695,Sub-Saharan Africa,Low income,Central Africa
 Equatorial Guinea,0.72871,Sub-Saharan Africa,High income: nonOECD,Central Africa

hind1970/data/bioenergy_futures_BAU.csv

@@ -6,10 +6,10 @@ PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2015
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2020,31
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2025,23
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2030,33
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2035,125
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2040,221
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2045,166
-PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2050,61
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2035,40
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2040,45
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2045,40
+PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2050,30
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2055,25
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2060,24
 PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2065,23
@@ -23,21 +23,21 @@ PLUM,BAU,World,Agricultural Demand|Bioenergy|1st generation,million t DM/yr,2100
 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2000,0
 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2005,0
 PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2010,0
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2015,45
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2020,114
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2025,249
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2030,509
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2035,856
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2040,1241
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2045,1659
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2050,1927
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2055,1934
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2060,1797
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2065,1599
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2070,1591
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2075,1798
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2080,1913
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2085,1920
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2090,1962
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2095,1995
-PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2100,2014
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2015,90
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2020,230
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2025,500
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2030,1000
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2035,1700
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2040,2500
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2045,2700
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2050,2900
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2055,2950
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2060,2800
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2065,3000
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2070,3100
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2075,3300
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2080,3700
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2085,3800
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2090,3900
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2095,4000
+PLUM,BAU,World,Agricultural Demand|Bioenergy|2nd generation,million t DM/yr,2100,4000

hind1970/data/country_groups.csv

@@ -54,9 +54,6 @@ Switzerland,7.824909,Europe & Central Asia,High income: OECD,Germany Austria & S
 Austria,8.363404,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
 Germany,81.77693,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
 Italy,59.277417,Europe & Central Asia,High income: OECD,Italy
-Estonia,1.331475,Europe & Central Asia,High income: OECD,Scandinavia
-Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Scandinavia
-Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Scandinavia
 Georgia,3.926,Europe & Central Asia,Lower middle income,Other former USSR
 Turkmenistan,5.041995,Europe & Central Asia,Upper middle income,Other former USSR
 Kyrgyzstan,5.4479,Europe & Central Asia,Low income,Other former USSR
@@ -66,6 +63,9 @@ Belarus,9.49,Europe & Central Asia,Upper middle income,Other former USSR
 Kazakhstan,16.321581,Europe & Central Asia,Upper middle income,Other former USSR
 Uzbekistan,28.5624,Europe & Central Asia,Lower middle income,Other former USSR
 Poland,38.042794,Europe & Central Asia,High income: OECD,Poland
+Estonia,1.331475,Europe & Central Asia,High income: OECD,Scandinavia
+Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Scandinavia
+Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Scandinavia
 Russian Federation,142.849449,Europe & Central Asia,High income: nonOECD,Russian Federation
 Greenland,0.056905,Europe & Central Asia,High income: nonOECD,Scandinavia
 Iceland,0.318041,Europe & Central Asia,High income: OECD,Scandinavia
@@ -137,14 +137,14 @@ Libya,6.265697,Middle East & North Africa,Upper middle income,North Africa other
 Tunisia,10.5471,Middle East & North Africa,Upper middle income,North Africa other
 Canada,34.005274,North America,High income: OECD,Canada
 United States of America,309.346863,North America,High income: OECD,United States of America
-Afghanistan,27.962207,South Asia,Low income,Afghanistan
+Afghanistan,27.962207,South Asia,Low income,Pakistan & Afghanistan
 Bangladesh,151.616777,South Asia,Low income,Bangladesh
 Maldives,0.367,South Asia,Upper middle income,India  & Sri Lanka
 Sri Lanka,20.118,South Asia,Lower middle income,India  & Sri Lanka
 India,1230.984504,South Asia,Lower middle income,India  & Sri Lanka
 Bhutan,0.720246,South Asia,Lower middle income,Nepal & Butan
 Nepal,26.87591,South Asia,Low income,Nepal & Butan
-Pakistan,170.043918,South Asia,Lower middle income,Pakistan
+Pakistan,170.043918,South Asia,Lower middle income,Pakistan & Afghanistan
 Sao Tome and Principe,0.17088,Sub-Saharan Africa,Lower middle income,Central Africa
 Comoros,0.698695,Sub-Saharan Africa,Low income,Central Africa
 Equatorial Guinea,0.72871,Sub-Saharan Africa,High income: nonOECD,Central Africa

hind1970/data/other_water_uses.csv

@@ -40169,3 +40169,312 @@ FPU,Year,Value
 307,2099,0.161867397257906
 308,2099,0.398715070512395
 309,2099,0.197570261548918
+1,2100,1.88687808718898e-05
+2,2100,0.206564808367889
+3,2100,0.0444486195702849
+4,2100,0.174522488202001
+5,2100,0.030832672264296
+6,2100,0.0172927181433096
+7,2100,0.188520490030896
+8,2100,0.575141081831689
+9,2100,1.0205137597597
+10,2100,0.518566466179873
+11,2100,0.130999641650533
+12,2100,0.340730698635411
+13,2100,0.81978929275963
+14,2100,5.00678887062895
+15,2100,0.00124871744796451
+16,2100,0.522774953504268
+17,2100,0.189367675047881
+18,2100,0.852362059561678
+19,2100,1.17846341796511
+20,2100,0.301327849470972
+21,2100,0.196070608324439
+22,2100,0.969064405245717
+23,2100,0.387708748146636
+24,2100,0.344043591744082
+25,2100,0.492618069304399
+26,2100,1.45981875338862
+27,2100,0.441474804935297
+28,2100,0.223270617252638
+29,2100,0.413291826451143
+30,2100,0.29786722346832
+31,2100,4.2104586123005
+32,2100,0.0260551298606515
+33,2100,0.0777100088299107
+34,2100,2.39660865380847
+35,2100,4.0583820003659
+36,2100,3.35601219902512
+37,2100,2.02853658288739
+38,2100,1.0692593687607
+39,2100,0.811520508327249
+40,2100,1.50173337486922
+41,2100,1.90766812824895
+42,2100,1.12747679453582
+43,2100,0.0647257746695686
+44,2100,0.0583266040698618
+45,2100,0.111804107461239
+46,2100,0.144288611208399
+47,2100,0.0530587903387634
+48,2100,4.10370701947404
+49,2100,0.188448647138089
+50,2100,0.0582723738563289
+51,2100,1.22874230841314
+52,2100,2.93192604093929
+53,2100,0.695978334622902
+54,2100,0.0249364984223348
+55,2100,0.450945873217812
+56,2100,0.218866732235832
+57,2100,0.195051710119699
+58,2100,0.294330573666912
+59,2100,5.76871990434483
+60,2100,0.220711942517482
+61,2100,0.91591994232482
+62,2100,0.396192035030396
+63,2100,3.06509091547372
+64,2100,0.405101207798907
+65,2100,0.505266945437654
+66,2100,0.00992006713931914
+67,2100,0.208551598242593
+68,2100,0.215424445826102
+69,2100,1.9002733364841
+70,2100,0.372050918184414
+71,2100,0.665764873984699
+72,2100,1.0161849897122
+73,2100,5.71460464608435
+74,2100,2.79503683440271
+75,2100,1.09163540422014
+76,2100,0.0182346573276391
+77,2100,0.456661561411519
+78,2100,0.146857047941921
+79,2100,0.19222879500802
+80,2100,0.087919844489079
+81,2100,0.755920918250922
+82,2100,2.80171273822498
+83,2100,0.848005872593774
+84,2100,0.219223202006617
+85,2100,2.70269047454531
+86,2100,0.00401615417695211
+87,2100,7.69155150422694
+88,2100,4.07639167479766
+89,2100,0.200932409578577
+90,2100,1.00364885592371
+91,2100,1.95848374654209
+92,2100,8.74411912379401
+93,2100,5.14052913727528
+94,2100,4.26998119094719
+95,2100,0.869467002916736
+96,2100,1.93313208260406
+97,2100,12.1551707871727
+98,2100,0.22316646369643
+99,2100,0.788764127332627
+100,2100,3.31149561509301
+101,2100,0.760893872760446
+102,2100,0.00850839679594628
+103,2100,3.98330441678218
+104,2100,0.550945106934179
+105,2100,3.10615639804968
+106,2100,0.0696426752254089
+107,2100,0.0722311890914877
+108,2100,0.0682309198516009
+109,2100,4.36753030527325
+110,2100,0.556735196441874
+111,2100,0.196704295256495
+112,2100,0.100620698292914
+113,2100,0.148551942655786
+114,2100,0.621604885033577
+115,2100,0.0740267472624225
+116,2100,0.563702275394462
+117,2100,0.424618898312663
+118,2100,0.0089230343314739
+119,2100,0.422180694865574
+120,2100,0.377084798651481
+121,2100,1.11943255017786
+122,2100,0.224139095415239
+123,2100,1.13554549255673
+124,2100,0.357159893871914
+125,2100,0.116184128922297
+126,2100,1.86096746614714
+127,2100,4.2855853521794
+128,2100,3.02224515774287
+129,2100,0.0161053505180462
+130,2100,1.40701724931705
+131,2100,3.19310560005033
+132,2100,5.93672335216098
+133,2100,1.9934832528491
+134,2100,1.31253391709084
+135,2100,0.320918039053837
+136,2100,0.558007632293929
+137,2100,0.124657363136066
+138,2100,0.580127622048167
+139,2100,0.30075481475069
+140,2100,0.103963973702776
+141,2100,0.144656081845824
+142,2100,0.0394580503343605
+143,2100,2.03896248506521
+144,2100,2.98033020493487
+145,2100,0.125000322252163
+146,2100,12.5786998826776
+147,2100,0.317466083461795
+148,2100,2.82240541303679
+149,2100,5.84972310785034
+150,2100,1.12509265054223
+151,2100,1.11447347819643
+152,2100,1.02510241014658
+153,2100,0.16629325689183
+154,2100,0.28955199037952
+155,2100,0.245511349716112
+156,2100,0.0387102549053111
+157,2100,0.118058659936509
+158,2100,3.14872937379869
+159,2100,0.0936867571260809
+160,2100,0.98024845947532
+161,2100,0.0294072220344788
+162,2100,2.24127008432242
+163,2100,0.887617108222912
+164,2100,0.0131586534947701
+165,2100,0.606599566453838
+166,2100,1.20432724823378
+167,2100,0.202035974823389
+168,2100,1.36704228365352
+169,2100,0.0351727882034538
+170,2100,2.00470439078262
+171,2100,0.171218394389143
+172,2100,0.0211956352932248
+173,2100,0.887777138465992
+174,2100,0.309727491222247
+175,2100,1.44071878225119
+176,2100,0.229319051083579
+177,2100,2.64617223709405
+178,2100,4.68903883078875
+179,2100,0.446514705583743
+180,2100,1.48769058281403
+181,2100,3.5085026328575
+182,2100,0.597609611350083
+183,2100,0.129615886053671
+184,2100,0.291893209739555
+185,2100,2.67745695296253
+186,2100,0.244853730715931
+187,2100,0.882015727239832
+188,2100,0.835957145525526
+189,2100,0.584480748305729
+190,2100,0.374933550144377
+191,2100,0.81875996198869
+192,2100,0.390262696834782
+193,2100,0.42246322590654
+194,2100,5.7965001355891
+195,2100,0.317598370433575
+196,2100,0.307915814927822
+197,2100,0.0114179773489465
+198,2100,0.0426001814130501
+199,2100,0.0868389024001388
+200,2100,0.167974581339234
+201,2100,0.0235582382725852
+202,2100,0.124150008580187
+203,2100,1.70757005507496
+204,2100,15.78236607041
+205,2100,1.37191132909868
+206,2100,9.28004865018505
+207,2100,0.820646334246931
+208,2100,0.477716656074108
+209,2100,0.432720058490304
+210,2100,0.206383337424882
+211,2100,1.0866297537832
+212,2100,6.43831338405113
+213,2100,1.73053996916743
+214,2100,0.168224487046245
+215,2100,1.62177137951359
+216,2100,0.821070508778803
+217,2100,0.39639324865675
+218,2100,0.213552505244479
+219,2100,2.97219282844492
+220,2100,0.843503358561428
+221,2100,0.328211755214703
+222,2100,0.17605330332708
+223,2100,1.1069043794173
+224,2100,0.21612240455579
+225,2100,1.20577492524808
+226,2100,1.25291219222737
+227,2100,0.200468749273568
+228,2100,0.780454671720967
+229,2100,0.106299340147643
+230,2100,0.169379075578263
+231,2100,1.83722166799052
+232,2100,0.369450444717586
+233,2100,1.18527965247631
+234,2100,0.854136994448481
+235,2100,3.84873594390002
+236,2100,0.735046560642303
+237,2100,0.136281480070954
+238,2100,0.0413730341306859
+239,2100,0.255527432230359
+240,2100,0.147967382299043
+241,2100,0.0292073392551373
+242,2100,1.26825856954292
+243,2100,0.321247202948207
+244,2100,0.0485922709822262
+245,2100,3.31187047969279
+246,2100,0.978121764652315
+247,2100,2.31946069830155
+248,2100,1.63554747949217
+249,2100,1.62674657825119
+250,2100,0.148847691296396
+251,2100,0.191906322492287
+252,2100,0.163661165563099
+253,2100,0.111012678244151
+254,2100,0.180439168732846
+255,2100,0.401822217529116
+256,2100,0.59604340145205
+257,2100,0.367647576531454
+258,2100,0.46186141538945
+259,2100,2.81616635550927
+260,2100,2.80417958429488
+261,2100,0.571035745688278
+262,2100,0.192959470989173
+263,2100,0.143823357043626
+264,2100,1.29683103004572
+265,2100,0.219663890987213
+266,2100,1.11320642325646
+267,2100,0.28657518663158
+268,2100,0.654926170169006
+269,2100,2.30867047360834
+270,2100,0.0334534515545215
+271,2100,0.0056169209278778
+272,2100,0.172145810711299
+273,2100,4.41872451874951
+274,2100,0.409619658019437
+275,2100,0.0359870281607755
+276,2100,0.310719558172423
+277,2100,5.38563572439637
+278,2100,2.17224025123187
+279,2100,11.5301647254202
+280,2100,4.38766390518703
+281,2100,18.9189891972046
+282,2100,0.0341369833784171
+283,2100,0.514444477284599
+284,2100,0.279895664211153
+285,2100,4.05473946462735
+286,2100,13.5828679154583
+287,2100,10.7211283306124
+288,2100,12.2894399501215
+289,2100,3.09632456176877
+290,2100,5.63209184040729
+291,2100,1.70516409765219
+292,2100,14.7788975165167
+293,2100,7.56016000240061
+294,2100,2.05425777406847
+295,2100,0.03664298461063
+296,2100,4.01162510614813
+297,2100,3.09453219841089
+298,2100,8.98950905029051
+299,2100,0.811757224664589
+300,2100,0.762723579194691
+301,2100,0.88460226088979
+302,2100,4.80506116481229
+303,2100,10.1391146961203
+304,2100,0.381055037625629
+305,2100,1.33972262755319
+306,2100,1.91011800912111
+307,2100,0.161867397257906
+308,2100,0.398715070512395
+309,2100,0.197570261548918