Skip to content

Commit

Permalink
Merge pull request #36 from NREL/upgrade_pysam
Browse files Browse the repository at this point in the history
Updates for PySAM>3 &  model release
  • Loading branch information
michaelavs authored Dec 18, 2024
2 parents ebff69c + 5b55acf commit 4498d2a
Show file tree
Hide file tree
Showing 36 changed files with 41,951 additions and 298 deletions.
4 changes: 1 addition & 3 deletions build_envs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ dependencies:
- scipy
- spyder
- sqlalchemy
- nrel-pysam=4.2.0
- pip:
- nrel-pysam-stubs
- nrel-pysam>=5.1.0
Binary file added dgen_os/excel/2024_input_sheet.xlsm
Binary file not shown.
38 changes: 38 additions & 0 deletions dgen_os/input_data/batt_prices/batt_prices_FY23_high.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
year,batt_capex_per_kwh_res,batt_capex_per_kw_res,batt_capex_per_kwh_nonres,batt_capex_per_kw_nonres,linear_constant_res,linear_constant_nonres,batt_om_per_kw_res,batt_om_per_kwh_res,batt_om_per_kw_nonres,batt_om_per_kwh_nonres,batt_replace_frac_kw,batt_replace_frac_kwh
2014,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2015,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2016,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2017,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2018,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2019,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2020,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2021,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2022,597.3337942,646.4052909,264.3236332,957.8767111,7834.848561,215911.2606,92.66773721,0,59.37558362,0,0.174,1
2023,619.457268,670.3462276,274.1133974,993.3536263,8125.028137,223907.974,96.09987563,0,61.57467931,0,0.174,1
2024,623.8819628,675.1344149,276.0713502,1000.449009,8183.064052,225507.3166,96.78630331,0,62.01449845,0,0.174,1
2025,615.0325732,665.5580402,272.1554445,986.2582433,8066.992222,222308.6313,95.41344794,0,61.13486017,0,0.174,1
2026,592.0241604,640.6594661,261.9740898,949.3622514,7765.205462,213992.0494,91.84402399,0,58.84780066,0,0.174,1
2027,569.0157476,615.7608919,251.792735,912.4662596,7463.418703,205675.4675,88.27460004,0,56.56074114,0,0.174,1
2028,546.0073348,590.8623177,241.6113803,875.5702678,7161.631944,197358.8856,84.70517609,0,54.27368162,0,0.174,1
2029,522.998922,565.9637436,231.4300255,838.6742759,6859.845184,189042.3037,81.13575213,0,51.9866221,0,0.174,1
2030,499.9905092,541.0651694,221.2486707,801.7782841,6558.058425,180725.7218,77.56632818,0,49.69956259,0,0.174,1
2031,498.5627364,539.5201038,220.6168731,799.4887262,6539.331235,180209.6415,77.3448298,0,49.55764053,0,0.174,1
2032,497.1349637,537.9750383,219.9850754,797.1991684,6520.604045,179693.5612,77.12333141,0,49.41571847,0,0.174,1
2033,495.7071909,536.4299727,219.3532778,794.9096105,6501.876855,179177.4809,76.90183302,0,49.27379641,0,0.174,1
2034,494.2794181,534.8849072,218.7214802,792.6200527,6483.149665,178661.4005,76.68033464,0,49.13187436,0,0.174,1
2035,492.8516454,533.3398416,218.0896825,790.3304948,6464.422475,178145.3202,76.45883625,0,48.9899523,0,0.174,1
2036,491.4238726,531.7947761,217.4578849,788.040937,6445.695285,177629.2399,76.23733787,0,48.84803024,0,0.174,1
2037,489.9960998,530.2497105,216.8260872,785.7513791,6426.968096,177113.1596,76.01583948,0,48.70610818,0,0.174,1
2038,488.5683271,528.704645,216.1942896,783.4618213,6408.240906,176597.0792,75.79434109,0,48.56418612,0,0.174,1
2039,487.1405543,527.1595794,215.5624919,781.1722634,6389.513716,176080.9989,75.57284271,0,48.42226407,0,0.174,1
2040,485.7127815,525.6145139,214.9306943,778.8827055,6370.786526,175564.9186,75.35134432,0,48.28034201,0,0.174,1
2041,484.2850088,524.0694483,214.2988966,776.5931477,6352.059336,175048.8383,75.12984593,0,48.13841995,0,0.174,1
2042,482.857236,522.5243827,213.667099,774.3035898,6333.332146,174532.758,74.90834755,0,47.99649789,0,0.174,1
2043,481.4294632,520.9793172,213.0353013,772.014032,6314.604956,174016.6776,74.68684916,0,47.85457584,0,0.174,1
2044,480.0016905,519.4342516,212.4035037,769.7244741,6295.877766,173500.5973,74.46535078,0,47.71265378,0,0.174,1
2045,478.5739177,517.8891861,211.7717061,767.4349163,6277.150576,172984.517,74.24385239,0,47.57073172,0,0.174,1
2046,477.1461449,516.3441205,211.1399084,765.1453584,6258.423386,172468.4367,74.022354,0,47.42880966,0,0.174,1
2047,475.7183722,514.799055,210.5081108,762.8558006,6239.696197,171952.3563,73.80085562,0,47.2868876,0,0.174,1
2048,474.2905994,513.2539894,209.8763131,760.5662427,6220.969007,171436.276,73.57935723,0,47.14496555,0,0.174,1
2049,472.8628266,511.7089239,209.2445155,758.2766848,6202.241817,170920.1957,73.35785885,0,47.00304349,0,0.174,1
2050,471.4350539,510.1638583,208.6127178,755.987127,6183.514627,170404.1154,73.13636046,0,46.86112143,0,0.174,1
38 changes: 38 additions & 0 deletions dgen_os/input_data/batt_prices/batt_prices_FY23_low.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
year,batt_capex_per_kwh_res,batt_capex_per_kw_res,batt_capex_per_kwh_nonres,batt_capex_per_kw_nonres,linear_constant_res,linear_constant_nonres,batt_om_per_kw_res,batt_om_per_kwh_res,batt_om_per_kw_nonres,batt_om_per_kwh_nonres,batt_replace_frac_kw,batt_replace_frac_kwh
2014,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2015,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2016,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2017,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2018,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2019,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2020,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2021,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,48.22721409,0,0.174,1
2022,597.3337942,646.4052909,264.3236332,957.8767111,7834.848561,215911.2606,92.66773721,0,59.37558362,0,0.174,1
2023,429.7206377,465.0225661,190.1538492,689.0944311,5636.373084,155326.0932,66.66496943,0,42.71466625,0,0.174,1
2024,405.5983517,438.9186131,179.4795991,650.4122468,5319.976357,146606.8926,62.92274409,0,40.31688661,0,0.174,1
2025,384.9612536,416.5861592,170.3475647,617.3188644,5049.292628,139147.4421,59.72119547,0,38.26553817,0,0.174,1
2026,371.0910658,401.5765234,164.209927,595.0768115,4867.366172,134133.9476,57.56943556,0,36.88682747,0,0.174,1
2027,357.2208781,386.5668875,158.0722893,572.8347587,4685.439715,129120.453,55.41767564,0,35.50811678,0,0.174,1
2028,343.3506904,371.5572516,151.9346516,550.5927059,4503.513259,124106.9585,53.26591573,0,34.12940608,0,0.174,1
2029,329.4805026,356.5476158,145.7970139,528.350653,4321.586803,119093.4639,51.11415582,0,32.75069538,0,0.174,1
2030,315.6103149,341.5379799,139.6593762,506.1086002,4139.660346,114079.9694,48.96239591,0,31.37198469,0,0.174,1
2031,309.6752345,335.1153274,137.0330691,496.5911823,4061.81366,111934.6853,48.04165364,0,30.78203169,0,0.174,1
2032,303.740154,328.6926749,134.4067619,487.0737645,3983.966974,109789.4012,47.12091137,0,30.19207869,0,0.174,1
2033,297.8050736,322.2700224,131.7804548,477.5563466,3906.120289,107644.1171,46.2001691,0,29.60212569,0,0.174,1
2034,291.8699932,315.8473699,129.1541476,468.0389288,3828.273603,105498.8329,45.27942684,0,29.01217269,0,0.174,1
2035,285.9349128,309.4247174,126.5278404,458.5215109,3750.426917,103353.5488,44.35868457,0,28.42221969,0,0.174,1
2036,279.9998324,303.0020649,123.9015333,449.0040931,3672.580231,101208.2647,43.4379423,0,27.83226669,0,0.174,1
2037,274.0647519,296.5794124,121.2752261,439.4866753,3594.733545,99062.98062,42.51720003,0,27.24231369,0,0.174,1
2038,268.1296715,290.1567599,118.648919,429.9692574,3516.886859,96917.69652,41.59645776,0,26.65236069,0,0.174,1
2039,262.1945911,283.7341074,116.0226118,420.4518396,3439.040173,94772.41241,40.67571549,0,26.06240769,0,0.174,1
2040,256.2595107,277.3114549,113.3963047,410.9344217,3361.193487,92627.1283,39.75497322,0,25.47245469,0,0.174,1
2041,250.3244303,270.8888024,110.7699975,401.4170039,3283.346801,90481.8442,38.83423096,0,24.88250169,0,0.174,1
2042,244.3893498,264.4661499,108.1436903,391.899586,3205.500115,88336.56009,37.91348869,0,24.29254869,0,0.174,1
2043,238.4542694,258.0434974,105.5173832,382.3821682,3127.653429,86191.27598,36.99274642,0,23.70259569,0,0.174,1
2044,232.519189,251.6208449,102.891076,372.8647503,3049.806743,84045.99187,36.07200415,0,23.11264269,0,0.174,1
2045,226.5841086,245.1981924,100.2647689,363.3473325,2971.960057,81900.70777,35.15126188,0,22.52268969,0,0.174,1
2046,220.6490282,238.7755399,97.6384617,353.8299146,2894.113371,79755.42366,34.23051961,0,21.93273669,0,0.174,1
2047,214.7139477,232.3528874,95.01215454,344.3124968,2816.266685,77610.13955,33.30977735,0,21.34278369,0,0.174,1
2048,208.7788673,225.930235,92.38584738,334.795079,2738.419999,75464.85545,32.38903508,0,20.75283069,0,0.174,1
2049,202.8437869,219.5075825,89.75954022,325.2776611,2660.573313,73319.57134,31.46829281,0,20.16287769,0,0.174,1
2050,196.9087065,213.08493,87.13323306,315.7602433,2582.726627,71174.28723,30.54755054,0,19.57292469,0,0.174,1
38 changes: 38 additions & 0 deletions dgen_os/input_data/batt_prices/batt_prices_FY23_mid.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
year,batt_capex_per_kwh_res,batt_capex_per_kw_res,batt_capex_per_kwh_nonres,batt_capex_per_kw_nonres,linear_constant_res,linear_constant_nonres,batt_om_per_kw_res,batt_om_per_kwh_res,batt_om_per_kw_nonres,batt_om_per_kwh_nonres,batt_replace_frac_kw,batt_replace_frac_kwh
2014,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2015,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2016,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2017,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2018,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2019,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2020,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2021,717.9439627,554.8244171,234.6229377,327.5022644,6657.420662,397856.729,92.02921141,0,0,0,0.174,1
2022,597.3337942,646.4052909,264.3236332,957.8767111,7834.848561,215911.2606,92.66773721,0,0,0,0.174,1
2023,547.1023294,624.9827415,241.2616414,893.1255083,7575.193461,203028.735,87.69443143,0,0,0,0.174,1
2024,499.1649605,606.8969981,219.1634781,837.6016449,7355.982599,192207.1957,83.15014798,0,0,0,0.174,1
2025,453.0136393,591.454816,208.7174523,803.0994457,7168.813405,184658.529,78.94378988,0,0,0,0.174,1
2026,431.0272216,579.1630353,197.281737,779.3774908,7019.829103,180287.0818,76.51742275,0,0,0,0.174,1
2027,411.6096429,567.9703857,186.8497318,755.8767993,6884.16698,175839.5747,74.34569722,0,0,0,0.174,1
2028,395.1513059,557.7631993,177.2561349,733.8267751,6760.449305,171643.9905,72.44328313,0,0,0,0.174,1
2029,379.6304541,547.3616117,168.587596,713.8006259,6634.375362,167824.6981,70.58282048,0,0,0,0.174,1
2030,365.6123506,537.8433086,160.6218448,694.1035176,6519.007397,163995.3372,68.89189161,0,0,0,0.174,1
2031,361.0421962,531.1202673,158.6140717,685.4272236,6437.519804,161945.3955,68.03074296,0,0,0,0.174,1
2032,356.4720418,524.3972259,156.6062986,676.7509297,6356.032212,159895.4538,67.16959432,0,0,0,0.174,1
2033,351.9018874,517.6741845,154.5985256,668.0746357,6274.544619,157845.5121,66.30844567,0,0,0,0.174,1
2034,347.331733,510.9511432,152.5907525,659.3983417,6193.057027,155795.5703,65.44729703,0,0,0,0.174,1
2035,342.7615786,504.2281018,150.5829795,650.7220478,6111.569434,153745.6286,64.58614838,0,0,0,0.174,1
2036,338.1914243,497.5050605,148.5752064,642.0457538,6030.081842,151695.6869,63.72499974,0,0,0,0.174,1
2037,333.6212699,490.7820191,146.5674333,633.3694598,5948.594249,149645.7452,62.86385109,0,0,0,0.174,1
2038,329.0511155,484.0589778,144.5596603,624.6931659,5867.106657,147595.8035,62.00270245,0,0,0,0.174,1
2039,324.4809611,477.3359364,142.5518872,616.0168719,5785.619064,145545.8618,61.1415538,0,0,0,0.174,1
2040,319.9108067,470.612895,140.5441142,607.3405779,5704.131472,143495.9201,60.28040516,0,0,0,0.174,1
2041,315.3406524,463.8898537,138.5363411,598.6642839,5622.64388,141445.9783,59.41925651,0,0,0,0.174,1
2042,310.770498,457.1668123,136.528568,589.98799,5541.156287,139396.0366,58.55810787,0,0,0,0.174,1
2043,306.2003436,450.443771,134.520795,581.311696,5459.668695,137346.0949,57.69695922,0,0,0,0.174,1
2044,301.6301892,443.7207296,132.5130219,572.635402,5378.181102,135296.1532,56.83581058,0,0,0,0.174,1
2045,297.0600348,436.9976883,130.5052489,563.9591081,5296.69351,133246.2115,55.97466193,0,0,0,0.174,1
2046,292.4898804,430.2746469,128.4974758,555.2828141,5215.205917,131196.2698,55.11351329,0,0,0,0.174,1
2047,287.9197261,423.5516055,126.4897027,546.6065201,5133.718325,129146.3281,54.25236464,0,0,0,0.174,1
2048,283.3495717,416.8285642,124.4819297,537.9302261,5052.230732,127096.3863,53.391216,0,0,0,0.174,1
2049,278.7794173,410.1055228,122.4741566,529.2539322,4970.74314,125046.4446,52.53006735,0,0,0,0.174,1
2050,274.2092629,403.3824815,120.4663836,520.5776382,4889.255547,122996.5029,51.66891871,0,0,0,0.174,1
88 changes: 88 additions & 0 deletions dgen_os/input_data/depreciation_schedules/deprec_sch_FY24.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
year,sector_abbr,1,2,3,4,5,6
2022,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2023,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2024,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2025,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2026,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2027,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2028,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2029,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2030,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2031,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2032,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2033,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2034,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2035,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2036,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2037,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2038,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2039,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2040,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2041,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2042,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2043,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2044,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2045,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2046,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2047,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2048,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2049,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2050,com,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2022,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2023,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2024,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2025,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2026,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2027,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2028,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2029,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2030,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2031,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2032,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2033,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2034,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2035,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2036,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2037,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2038,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2039,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2040,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2041,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2042,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2043,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2044,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2045,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2046,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2047,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2048,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2049,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2050,ind,0.941301185,0.886047921,0.834037959,0.785080919,0.7389976,0.695619316
2022,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2023,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2024,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2025,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2026,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2027,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2028,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2029,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2030,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2031,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2032,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2033,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2034,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2035,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2036,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2037,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2038,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2039,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2040,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2041,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2042,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2043,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2044,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2045,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2046,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2047,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2048,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2049,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
2050,res,0.941303892,0.886053016,0.834045153,0.785089948,0.739008223,0.695631316
Loading

0 comments on commit 4498d2a

Please sign in to comment.