From 7d3f878b6f957a41e12e4247c050c08dd9a0d877 Mon Sep 17 00:00:00 2001 From: perrotcap Date: Tue, 25 Jun 2024 18:23:04 +0200 Subject: [PATCH] fixed data integrity -old rules- after changing some dataframe descriptors --- ..._FossilSimpleTechno_construction_delay_0.pkl | Bin 868 -> 858 bytes ...vestments_profile_builder_disc_all_years.pkl | Bin 527 -> 526 bytes ...n_investments_profile_builder_disc_poles.pkl | Bin 563 -> 570 bytes .../tests/l0_test_compute_energy_mix.py | 12 ++++++------ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl b/energy_models/tests/jacobian_pkls/jacobian_FossilSimpleTechno_FossilSimpleTechno_construction_delay_0.pkl index 3447681db6fe9eeb8f565217b0d22587f9e9bfb5..8fbdb40f47dc3f29d8a875cdf68b69b9384fb836 100644 GIT binary patch literal 858 zcmV-g1Eu^zT4*^jL0KkKS@48Hxd1QT|M&l|ALgg`G)0}?-$cLf-~LDBP5?+j0OA4Y za7+M5&;woo646G3B}}KOk&{e7!T=frLr+sCjQ|Y|8Z>0}0LU;yAP-O(Dw*X?18RCk zfB-ZMOdtX30Kx`<158FCk&pl!0000000000000000002UH~;_u000000000000001 zkRnnO5}Hk?p-regPijp8kki_spwmqn28_xBO&+H8Lr+a1D0Z$tb zggLQ?I4MdJ5)`Eg0iq~!F6-v5!U&5v;YC4kx3okGDzRIbC?RYGM%XGhX9|D<+Y|%< zIF5i6U_@f9b)X`Gcky%$yaKo|XNfDD;jk1GKvM)XR1Mt=ObENbz*TL1MFJxALkNu# zY_dXTGh&_zR7$EC(xOPX5p2MB6K`&bND?wgNhmep9DIv{vf_bPUte9D6;h}%Dv>2a zc-wSHTpxm)$c05=SY_?6b`;s6K-%!A7j^>s!Wm)cP6Y#S(Ik>dB=W?Rr({Yf*;tSi#JoaUH7o;LCa_y6Ux$#p#57ptK6XjYUOeL2-7lYpL+49g?+PlAB{X*>-kV zna2bj>1r`GNxYm~ve_g6_z>`c&PV|PZ*B+aA$p64M>$m$NtM*8QK;DilX?j_h@e=% zBtj6h1&a<^;RB`*h!uZ0TqWk=VQQEv-j~kyUYeI4z-2pU>TMmvo>^j)-BzS6N?O*r zgc5*)Xp>ri9Wp}zi#I0t9k6uksgBd8pl+#*c|+vt&S(yJLK3iVygb|{e;Wrke^rEp5FkK> z5fd2!U3!^x;4m2%WHQ;8EHEr88w+NdY2#TRr31R7O*F~EE7XFLDc;B^fTldE1~Fc> z#8^Ot0t67gDZ$U`uA~&R4Dn-IA?)8g$D|f#5TDwvVeoMI94frEUpzeS8&H%Wn+A6f zV4^g&4aaz8B`uGUWYHe|whN5ZcJWo9yD$DM=c!t&sA(t^phW43#d`K288T|*$*q7H k-#RJ>{Gf8w4ka`_B?A$N6jVRa;y>|sBvXY64+umnknE3R00000 literal 868 zcmV-q1DpIpT4*^jL0KkKS;UXvkN_{|fA{~dALgg`G)0}?-$cLf-~LDBP5?+j0OA4Y za7+M5&;xtHDrM0|kjYai>ODcD5HtYMgbfWnAT$60k%^Pa05sE04KxisKxC?Cl{5{h z=^6k4&@nK82dD!G8UPJ37=}hb05K$q>SzD}000dD000^Q00xZ%AOHh^0000000000 z00000000>RDM2wQ=^m$%Gz~H|01Z7xng&1`000>cGzLaZJtjs(Cip=hfC&^(zd*A} z&@g5U%n}I(W(fdU6gE`%uFW|DBE{fHs4aG;L_m>Mg=t_=LWl)Mh!q-a3V;I93IYHc z<|q;{5R59ri2#ZTrE3)V))lQ<$dNQ?hkzs$KvJ|9poV?A3dp(taF&U>poAjig>e}X zXPzL7rQ1=b62eO;QFD?=0R)0zK^;U!jKnelB9KWW#Jva_nTNo6^nhR;5+F>+ymdV4w+shEh^uP^702JL+|T4@okw zNl%!j|3ghPGEW>JcqJ;#)h6;uUQ=KYE&&e+4FEtwZGinGF-3u7VydF4GOC3S8Y`f3 zZ^0%KC>A#)h+-aqu4cxu_~Z`6CHz-wl^Mk43RagwDv!=yLX@1q%QFv&ntX;hQk16Z zwIOO!*0szalmrt*n$!U4k{AS8xi`b!9jwx@=DScsJxn3L9nKCGp$y|FY%sHDFa(r- zxOB>4iEdlg6Glwoz9!;d4WNLpQL`kQW?3zUfqyAs2q+s2fY}HjiGix1-&ZW`D{%C1 zSP=pQ2oNDeM8-f@UZ!0*3iuGVpAy3W0 zL;d|yTx7z zK&e(iC_y!??x22%;?P%)@Y-=LjgIBQJ*c>f7)NgvS_8Lnr)T1%%B}%?2uUD9bi~)G ueDDR!m^Ut5xk5TeL=gW18^A+dOWrUcY_K(M!9nYd}ds3Vrk<3YneTnuTfL0$aQ72)n8KDdi zz9briEjy4tqFo{NfOrw#oGLG2q4rfU>#}qQdfOAIB(XjqBZ1SKzUZBiKpgr;bZl;=WCz2e9k~tDIlUR4hvN4Xh$~+t+D9ASk=-eB_NOi{O Q-aq2*NT&)C80C(wASN)_6#xJL literal 527 zcmV+q0`UDpT4*^jL0KkKSv?SfUH}12|NsB&T1QM_dSu!=bjZJd|L$k(&H!u;7$|@c zfC?x%00h7Rt}7X#B_cxhpglkbsh|xWpf;eAl$t$2dNn;0Pf!gF z0gwTZ&;S4c0MU_<&;Z~78UO}>$N&Hu00T_`0000Q03@YHsp@)a0LaOR00003Kxyg# z0iZM*15Gq~ng-aQFVWDzj=;PVbRTfIp&99n%@pA@u!O}6AY6iQ8ck0W(Nu~cnhoSL zd{2sCpwC0WDUG3yNe|I&TMEV`q-s$lI)_llh0rG3MJJHHMO)_u9wC+~BA_R3ha)WD z#s)$Q@q7uwmN2RXI8^jt*>z<`axLI;xt9kf>ozmY%_$cWN19}R2PHjS661=01r$@`ig=(D0*H+` R1xkO5xgwk>NFInmF8~4&)tCSP diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl index 06e54c8dbbe39e3abf0b19b78a339919145d4fb9..d97bddd77196b080087656aa07aab12f9ba6161c 100644 GIT binary patch literal 570 zcmV-A0>%A8T4*^jL0KkKStePQr2qkn|NsBIYF5+bc~y%YRWQGI|KfA(P6!YH#E_8) z2m_EXgn_^T+yDcB2AXI9G5`P?000^Q0Av6ILqHAy8fl;a$N&In003wJ0gwO<4FEU* zX{LY!AOHcN00E!?20#EbGyp{;nhG|VGHIyAH>7$^5$U5S{Yi*4dKj8C(^Jz#^wZQb zHm0YP^wScAJmzvXow);>0OB)Im>&rl+Y_8D>V9m}2c*K7_zD~EZRBq>l%BfCgwJPi zGzr69dOZ`Fmw2K|M)CzCO+AsauzIPwRAJq89VgFy%jIvE4Q2|Z_@OZ|V{{*%1N^?1 zjn>U6_f*jb^aj8(`ng?Vp--y9I+`Km(*NJ1<8L@vMo@M=vF^=$d)sDfxw*QPZI;K~ zLQ9iRVJk=FUrxZ(h=}+Ed=~oeEiK8{B0-e$2Z@<=!WvaHG zXDAAp6xSt@O3uxxLi;+M1-czY!jW4uwzq5=tu&ggd`wG=I#~kMD(p zf;e6x!M0p291L&Jo{b7Kk~rL#Ima-$9aoLzd7NiK`#)Ea=WjgCmmue0InTJek}1N3 IfildsDAg1IuK)l5 literal 563 zcmV-30?hqFT4*^jL0KkKSz$%X1^@wrfB*liZdAc-e1D6b6coSb-{RN&oc z5E5!YB^4F-S!00EE&fB=d~G}LOI!e}8sLXQOl)b^rjwHSw#c~4D7XcNZ{si&rz zV^Or5RHY6A+B?t=lmjjHd4bj<-;$Y0NQFq=a5E|IX;evwTVAtK(q}%FfZJJ*ONxPq zhEwKro2~Yi(ti=Sux{+V>`h||ZbmP&&P^)khf(Bq9UJdu=zq1);e(x+n9AV>*Zkgm zdSyLDEQ8qx6d7`~6vgj;L9z0E?<;6DeDT5ay4QThi^0F>OC!H2FH)b0D#v2B#eu_! zh`14Pcoyo>=5GGIP^=XewI?*(?QX_Irk05Y+K?&e9QW|ouC-So%mR;wg|x`0XT^^w zUCg?Rni*?}BDROjx!9!%EK2q)Wi07r3~DTknKI_U5?V9wJ!CDzkFwasvrw;+$!|6~ zt$b#QNUG=e9G+(5?me$ept$t`whf2q{L0(PUe)ubS_XS<*RM952h~HHDDpXPJFw9D zUL<(}_GcE-H4)zRZ2NGOg)JMfK@kLVIUIFQxZ{lK*hY5^c88(Yc-t?r!+Kt4psI44 zWvle3o_=}CWR3R&@EGt#ccH-FekSAbly==W14yNTku6sP(l`(NUC9*TLP3QWEEszk B1t|ak diff --git a/energy_models/tests/l0_test_compute_energy_mix.py b/energy_models/tests/l0_test_compute_energy_mix.py index 8e56a19c..37d60e17 100644 --- a/energy_models/tests/l0_test_compute_energy_mix.py +++ b/energy_models/tests/l0_test_compute_energy_mix.py @@ -355,7 +355,7 @@ def test_02_energy_mix_discipline(self): f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyPricesValue}': self.prices_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyTypeCapitalDfValue}': self.energy_type_capital, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, f'{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}': 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -374,7 +374,7 @@ def test_02_energy_mix_discipline(self): f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyPricesValue}': self.cost_details, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyTypeCapitalDfValue}': self.energy_type_capital, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, GlossaryEnergy.methane: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -447,7 +447,7 @@ def test_03_energy_mix_discipline_exponential_limit(self): f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyPricesValue}': self.prices_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, f'{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}': 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -459,7 +459,7 @@ def test_03_energy_mix_discipline_exponential_limit(self): f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyPricesValue}': self.cost_details, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, GlossaryEnergy.methane: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -530,7 +530,7 @@ def test_04_energy_mix_resource(self): f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.EnergyPricesValue}': self.prices_hydro, f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, f'{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}': 0.0}), f'{name}.{model_name}.{GlossaryEnergy.hydrogen}.{GlossaryEnergy.gaseous_hydrogen}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock, @@ -542,7 +542,7 @@ def test_04_energy_mix_resource(self): f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyProcductionWithoutRatioValue}': self.production, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.EnergyPricesValue}': self.cost_details, f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2PerUse}': pd.DataFrame( - {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2Tax: 0.0, GlossaryEnergy.CO2PerUse: 0.0}), + {GlossaryEnergy.Years: self.years, GlossaryEnergy.CO2PerUse: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.CO2EmissionsValue}': pd.DataFrame( {GlossaryEnergy.Years: self.years, GlossaryEnergy.methane: 0.0}), f'{name}.{model_name}.{GlossaryEnergy.methane}.{GlossaryEnergy.LandUseRequiredValue}': self.land_use_required_mock,