I added plant area in the output

.gitlab-ci.yml

@@ -8,7 +8,7 @@ test_hydesign:
   - pip install .[test]
   - python -m pytest
   tags:
-  - debian
+  - linux
 
 # ===== TEST hydesign windows=====
 test_hydesign_windows:
@@ -46,7 +46,7 @@ pages:
   - /^test_docdeploy.*/ 
   - main
   tags: 
-  - debian
+  - linux
 
 # ===== DEPLOY publish hydesign on pypi=====
 pypi:
@@ -69,5 +69,5 @@ pypi:
     - twine upload dist/* -u $TWINE_USERNAME -p $TWINE_PASSWORD
     #- twine upload --repository-url https://test.pypi.org/legacy/ dist/* -u $TWINE_USERNAME -p $TWINE_PASSWORD # for testing purposes
   tags:
-  - debian
+  - linux
 

hydesign/hpp_assembly.py

@@ -466,6 +466,7 @@ class hpp_model:
             'Total curtailment [GWh]',
             'Awpp [km2]',
             'Apvp [km2]',
+            'Plant area [km2]',
             'Rotor diam [m]',
             'Hub height [m]',
             'Number of batteries used in lifetime',
@@ -590,6 +591,7 @@ class hpp_model:
             prob['total_curtailment']/1e3, #[GWh]
             Awpp,
             prob.get_val('shared_cost.Apvp'),
+            max( Awpp , prob.get_val('shared_cost.Apvp') ),
             d,
             hh,
             prob.get_val('battery_degradation.n_batteries') * (b_P>0),
@@ -650,6 +652,7 @@ class hpp_model:
                                             'Total curtailment [GWh]',
                                             'Awpp [km2]',
                                             'Apvp [km2]',
+                                            'Plant area [km2]',
                                             'Rotor diam [m]',
                                             'Hub height [m]',
                                             'Number of batteries used in lifetime',

hydesign/tests/test_files/France_good_wind_design.csv

@@ -16,7 +16,7 @@ b_E_h [h],3.0,3.0,3.0
 cost_of_battery_P_fluct_in_peak_price_ratio,5.0,5.0,5.0
 NPV_over_CAPEX,0.4056994118222148,-0.3096385714685465,0.1312709912092271
 NPV [MEuro],118.9228083111928,-46.93668671148821,30.48324709964725
-IRR,0.0921572011578872,0.0,0.0675936452454
+IRR,0.092157201157887,0.0,0.0675936452453993
 LCOE [Euro/MWh],23.082265092436995,31.11455770859952,26.17073137937983
 CAPEX [MEuro],293.1303444021433,151.5854,232.21617220107169
 OPEX [MEuro],5.357487360409396,2.025,3.698229286176772
@@ -39,6 +39,7 @@ Battery Power [MW],0.0,0.0,60.0
 Total curtailment [GWh],0.0,0.0,0.0
 Awpp [km2],42.85714285714285,0.0,21.428571428571427
 Apvp [km2],0.0,3.678,1.839
+Plant area [km2],42.85714285714285,3.678,21.428571428571427
 Rotor diam [m],134.86710626894708,134.86710626894708,134.86710626894708
 Hub height [m],77.43355313447354,77.43355313447354,77.43355313447354
 Number of batteries used in lifetime,0.0,0.0,1.0