From 62b590065f9541c4296338b3f1a0ee07cfcd28bc Mon Sep 17 00:00:00 2001 From: PJ Stanley Date: Wed, 30 Oct 2019 14:15:09 -0600 Subject: [PATCH] code changes for paper revision --- code/335MW_AFFiles/Cylinder1.dat | 17 + code/335MW_AFFiles/DU00-W2-350.dat | 159 + code/335MW_AFFiles/DU08-W-210.dat | 159 + code/335MW_AFFiles/DU91-W2-250.dat | 159 + code/335MW_AFFiles/DU97-W-300.dat | 159 + code/335MW_AFFiles/FX77-W-400.dat | 159 + code/335MW_AFFiles/FX77-W-500.dat | 159 + code/5MW_AFFiles/Cylinder.pfl | 203 + code/5MW_AFFiles/Cylinder1.dat | 17 + code/5MW_AFFiles/Cylinder2.dat | 18 + code/5MW_AFFiles/DU21_A17.dat | 154 + code/5MW_AFFiles/DU21_A17.pfl | 401 ++ code/5MW_AFFiles/DU25_A17.dat | 154 + code/5MW_AFFiles/DU25_A17.pfl | 401 ++ code/5MW_AFFiles/DU30_A17.dat | 158 + code/5MW_AFFiles/DU30_A17.pfl | 401 ++ code/5MW_AFFiles/DU35_A17.dat | 150 + code/5MW_AFFiles/DU35_A17.pfl | 401 ++ code/5MW_AFFiles/DU40_A17.dat | 151 + code/5MW_AFFiles/DU40_A17.pfl | 401 ++ code/5MW_AFFiles/NACA64_A17.dat | 142 + code/5MW_AFFiles/NACA64_A17.pfl | 207 + code/Submit_Scripts/submit_6.sh | 16 + code/Submit_Scripts/submit_8.sh | 16 + code/Submit_Scripts/submit_base.sh | 16 + code/Submit_Scripts/submit_circle.sh | 16 + code/Submit_Scripts/submit_grid_6.sh | 16 + code/Submit_Scripts/submit_grid_8.sh | 16 + code/Submit_Scripts/submit_grid_base.sh | 16 + code/Submit_Scripts/submit_grid_circle.sh | 16 + code/Submit_Scripts/submit_grid_square.sh | 16 + code/Submit_Scripts/submit_grid_ukiah.sh | 16 + .../Submit_Scripts/submit_grid_victorville.sh | 16 + code/Submit_Scripts/submit_param_6.sh | 16 + code/Submit_Scripts/submit_param_8.sh | 16 + code/Submit_Scripts/submit_param_base.sh | 16 + code/Submit_Scripts/submit_param_circle.sh | 16 + code/Submit_Scripts/submit_param_square.sh | 16 + code/Submit_Scripts/submit_param_ukiah.sh | 16 + .../submit_param_victorville.sh | 16 + code/Submit_Scripts/submit_square.sh | 16 + code/Submit_Scripts/submit_ukiah.sh | 15 + code/Submit_Scripts/submit_victorville.sh | 16 + code/aep_calc.py | 82 - code/aep_gaus.f90 | 642 --- code/aep_gaus_grid.f90 | 760 ---- code/full_aep.f90 | 3740 +++++++++++++++++ code/getBaseline.py | 469 +-- code/getCtCurve.py | 142 + code/multiModality.py | 439 -- code/multiModality_direct.py | 412 -- code/opt-files/opt.py | 351 -- code/opt-files/optDirect.py | 303 -- code/opt-files/optDirect_exact.py | 358 -- code/opt-files/optGrid.py | 482 --- code/opt-files/optParam.py | 536 --- code/opt-files/optPyopt.py | 320 -- .../amalia_4.0_northIslandRose/AEPopt.txt | 110 + .../amalia_4.0_northIslandRose/AEPtrue.txt | 110 + .../amalia_4.0_northIslandRose/funcCalls.txt | 110 + .../direct/amalia_4.0_ukiahRose/AEPopt.txt | 156 + .../direct/amalia_4.0_ukiahRose/AEPtrue.txt | 156 + .../direct/amalia_4.0_ukiahRose/funcCalls.txt | 156 + .../amalia_4.0_victorvilleRose/AEPopt.txt | 130 + .../amalia_4.0_victorvilleRose/AEPtrue.txt | 130 + .../amalia_4.0_victorvilleRose/funcCalls.txt | 130 + .../amalia_6.0_northIslandRose/AEPopt.txt | 235 ++ .../amalia_6.0_northIslandRose/AEPtrue.txt | 235 ++ .../amalia_6.0_northIslandRose/funcCalls.txt | 235 ++ .../amalia_8.0_northIslandRose/AEPopt.txt | 367 ++ .../amalia_8.0_northIslandRose/AEPtrue.txt | 367 ++ .../amalia_8.0_northIslandRose}/funcCalls.txt | 628 ++- .../circle2_4.0_northIslandRose/AEPopt.txt | 343 ++ .../circle2_4.0_northIslandRose/AEPtrue.txt | 343 ++ .../circle2_4.0_northIslandRose/funcCalls.txt | 343 ++ .../circle_4.0_northIslandRose/AEPopt.txt | 118 + .../circle_4.0_northIslandRose/AEPtrue.txt | 118 + .../circle_4.0_northIslandRose/funcCalls.txt | 118 + .../square_4.0_northIslandRose/AEPopt.txt | 123 + .../square_4.0_northIslandRose/AEPtrue.txt | 123 + .../square_4.0_northIslandRose/funcCalls.txt | 123 + .../amalia_4.0_northIslandRose/AEPopt.txt | 266 ++ .../amalia_4.0_northIslandRose/AEPtrue.txt | 266 ++ .../amalia_4.0_northIslandRose/funcCalls.txt | 266 ++ .../amalia_4.0_northIslandRose_my1/AEPopt.txt | 148 + .../AEPtrue.txt | 148 + .../funcCalls.txt | 148 + .../grid/amalia_4.0_ukiahRose/AEPopt.txt | 265 ++ .../grid/amalia_4.0_ukiahRose/AEPtrue.txt | 265 ++ .../grid/amalia_4.0_ukiahRose/funcCalls.txt | 265 ++ .../grid/amalia_4.0_ukiahRose_my1/AEPopt.txt | 197 + .../grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt | 197 + .../amalia_4.0_ukiahRose_my1/funcCalls.txt | 197 + .../amalia_4.0_victorvilleRose/AEPopt.txt | 299 ++ .../amalia_4.0_victorvilleRose/AEPtrue.txt | 299 ++ .../amalia_4.0_victorvilleRose/funcCalls.txt | 299 ++ .../amalia_4.0_victorvilleRose_my1/AEPopt.txt | 209 + .../AEPtrue.txt | 209 + .../funcCalls.txt | 209 + .../amalia_6.0_northIslandRose/AEPopt.txt | 349 ++ .../amalia_6.0_northIslandRose/AEPtrue.txt | 349 ++ .../amalia_6.0_northIslandRose}/funcCalls.txt | 578 ++- .../amalia_6.0_northIslandRose_my1/AEPopt.txt | 121 + .../AEPtrue.txt | 121 + .../funcCalls.txt | 121 + .../amalia_8.0_northIslandRose/AEPopt.txt | 256 ++ .../amalia_8.0_northIslandRose/AEPtrue.txt | 256 ++ .../amalia_8.0_northIslandRose/funcCalls.txt | 256 ++ .../amalia_8.0_northIslandRose_my1/AEPopt.txt | 108 + .../AEPtrue.txt | 108 + .../funcCalls.txt | 108 + .../circle_4.0_northIslandRose/AEPopt.txt | 194 + .../circle_4.0_northIslandRose/AEPtrue.txt | 194 + .../circle_4.0_northIslandRose/funcCalls.txt | 194 + .../circle_4.0_northIslandRose_my1/AEPopt.txt | 140 + .../AEPtrue.txt | 140 + .../funcCalls.txt | 140 + .../square_4.0_northIslandRose/AEPopt.txt | 334 ++ .../square_4.0_northIslandRose/AEPtrue.txt | 334 ++ .../square_4.0_northIslandRose}/funcCalls.txt | 599 ++- .../square_4.0_northIslandRose_my1/AEPopt.txt | 185 + .../AEPtrue.txt | 185 + .../funcCalls.txt | 185 + .../amalia_4.0_northIslandRose/AEPopt.txt | 145 + .../amalia_4.0_northIslandRose/AEPtrue.txt | 145 + .../amalia_4.0_northIslandRose/funcCalls.txt | 145 + .../param/amalia_4.0_ukiahRose/AEPopt.txt | 128 + .../param/amalia_4.0_ukiahRose/AEPtrue.txt | 128 + .../param/amalia_4.0_ukiahRose/funcCalls.txt | 128 + .../amalia_4.0_victorvilleRose/AEPopt.txt | 108 + .../amalia_4.0_victorvilleRose/AEPtrue.txt | 108 + .../amalia_4.0_victorvilleRose/funcCalls.txt | 108 + .../amalia_6.0_northIslandRose/AEPopt.txt | 216 + .../amalia_6.0_northIslandRose/AEPtrue.txt | 216 + .../amalia_6.0_northIslandRose/funcCalls.txt | 216 + .../amalia_8.0_northIslandRose/AEPopt.txt | 283 ++ .../amalia_8.0_northIslandRose/AEPtrue.txt | 283 ++ .../amalia_8.0_northIslandRose}/funcCalls.txt | 561 +-- .../circle_4.0_northIslandRose/AEPopt.txt | 178 + .../circle_4.0_northIslandRose/AEPtrue.txt | 178 + .../circle_4.0_northIslandRose/funcCalls.txt | 178 + .../square_4.0_northIslandRose/AEPopt.txt | 179 + .../square_4.0_northIslandRose/AEPtrue.txt | 179 + .../square_4.0_northIslandRose/funcCalls.txt | 179 + .../direct/amalia_4.0_northIslandRose/AEP.txt | 122 - .../amalia_4.0_northIslandRose/funcCalls.txt | 122 - .../direct/amalia_4.0_ukiahRose/AEP.txt | 119 - .../direct/amalia_4.0_ukiahRose/funcCalls.txt | 119 - .../direct/amalia_4.0_victorvilleRose/AEP.txt | 110 - .../amalia_4.0_victorvilleRose/funcCalls.txt | 110 - .../direct/amalia_6.0_northIslandRose/AEP.txt | 101 - .../amalia_6.0_northIslandRose/funcCalls.txt | 101 - .../direct/amalia_8.0_northIslandRose/AEP.txt | 112 - .../amalia_8.0_northIslandRose/funcCalls.txt | 112 - .../direct/circle_4.0_northIslandRose/AEP.txt | 138 - .../circle_4.0_northIslandRose/funcCalls.txt | 138 - .../direct/square_4.0_northIslandRose/AEP.txt | 110 - .../square_4.0_northIslandRose/funcCalls.txt | 110 - .../grid/amalia_4.0_northIslandRose/AEP.txt | 397 -- .../grid/amalia_4.0_ukiahRose/AEP.txt | 383 -- .../grid/amalia_4.0_victorvilleRose/AEP.txt | 399 -- .../grid/amalia_6.0_northIslandRose/AEP.txt | 398 -- .../grid/amalia_8.0_northIslandRose/AEP.txt | 389 -- .../amalia_8.0_northIslandRose/funcCalls.txt | 389 -- .../grid/circle_4.0_northIslandRose/AEP.txt | 393 -- .../grid/square_4.0_northIslandRose/AEP.txt | 399 -- .../param/amalia_4.0_northIslandRose/AEP.txt | 113 - .../amalia_4.0_northIslandRose/funcCalls.txt | 113 - .../param/amalia_4.0_ukiahRose/AEP.txt | 101 - .../param/amalia_4.0_ukiahRose/funcCalls.txt | 101 - .../param/amalia_4.0_victorvilleRose/AEP.txt | 100 - .../amalia_4.0_victorvilleRose/funcCalls.txt | 100 - .../param/amalia_6.0_northIslandRose/AEP.txt | 102 - .../amalia_6.0_northIslandRose/funcCalls.txt | 102 - .../param/amalia_8.0_northIslandRose/AEP.txt | 132 - .../amalia_8.0_northIslandRose/funcCalls.txt | 132 - .../param/circle_4.0_northIslandRose/AEP.txt | 140 - .../circle_4.0_northIslandRose/funcCalls.txt | 140 - .../param/square_4.0_northIslandRose/AEP.txt | 177 - .../square_4.0_northIslandRose/funcCalls.txt | 177 - code/optComponents.py | 494 +++ code/optDirectRevision.py | 473 +++ code/optGridRevision.py | 500 +++ code/optParamRevision.py | 534 +++ .../data/bins-convergence/10_1/AEP_opt.txt | 10 + .../data/bins-convergence/10_1/AEP_true.txt | 10 + .../data/bins-convergence/10_1/boundary.txt | 10 + .../data/bins-convergence/10_1/separation.txt | 10 + .../data/bins-convergence/10_1/turbineX.txt | 10 + .../data/bins-convergence/10_1/turbineY.txt | 10 + .../data/bins-convergence/10_10/AEP_opt.txt | 10 + .../data/bins-convergence/10_10/AEP_true.txt | 10 + .../data/bins-convergence/10_10/boundary.txt | 10 + .../bins-convergence/10_10/separation.txt | 10 + .../data/bins-convergence/10_10/turbineX.txt | 10 + .../data/bins-convergence/10_10/turbineY.txt | 10 + .../data/bins-convergence/10_2/AEP_opt.txt | 10 + .../data/bins-convergence/10_2/AEP_true.txt | 10 + .../data/bins-convergence/10_2/boundary.txt | 10 + .../data/bins-convergence/10_2/separation.txt | 10 + .../data/bins-convergence/10_2/turbineX.txt | 10 + .../data/bins-convergence/10_2/turbineY.txt | 10 + .../data/bins-convergence/10_3/AEP_opt.txt | 10 + .../data/bins-convergence/10_3/AEP_true.txt | 10 + .../data/bins-convergence/10_3/boundary.txt | 10 + .../data/bins-convergence/10_3/separation.txt | 10 + .../data/bins-convergence/10_3/turbineX.txt | 10 + .../data/bins-convergence/10_3/turbineY.txt | 10 + .../data/bins-convergence/10_4/AEP_opt.txt | 10 + .../data/bins-convergence/10_4/AEP_true.txt | 10 + .../data/bins-convergence/10_4/boundary.txt | 10 + .../data/bins-convergence/10_4/separation.txt | 10 + .../data/bins-convergence/10_4/turbineX.txt | 10 + .../data/bins-convergence/10_4/turbineY.txt | 10 + .../data/bins-convergence/10_5/AEP_opt.txt | 10 + .../data/bins-convergence/10_5/AEP_true.txt | 10 + .../data/bins-convergence/10_5/boundary.txt | 10 + .../data/bins-convergence/10_5/separation.txt | 10 + .../data/bins-convergence/10_5/turbineX.txt | 10 + .../data/bins-convergence/10_5/turbineY.txt | 10 + .../data/bins-convergence/10_6/AEP_opt.txt | 10 + .../data/bins-convergence/10_6/AEP_true.txt | 10 + .../data/bins-convergence/10_6/boundary.txt | 10 + .../data/bins-convergence/10_6/separation.txt | 10 + .../data/bins-convergence/10_6/turbineX.txt | 10 + .../data/bins-convergence/10_6/turbineY.txt | 10 + .../data/bins-convergence/15_1/AEP_opt.txt | 10 + .../data/bins-convergence/15_1/AEP_true.txt | 10 + .../data/bins-convergence/15_1/boundary.txt | 10 + .../data/bins-convergence/15_1/separation.txt | 10 + .../data/bins-convergence/15_1/turbineX.txt | 10 + .../data/bins-convergence/15_1/turbineY.txt | 10 + .../data/bins-convergence/15_10/AEP_opt.txt | 10 + .../data/bins-convergence/15_10/AEP_true.txt | 10 + .../data/bins-convergence/15_10/boundary.txt | 10 + .../bins-convergence/15_10/separation.txt | 10 + .../data/bins-convergence/15_10/turbineX.txt | 10 + .../data/bins-convergence/15_10/turbineY.txt | 10 + .../data/bins-convergence/15_2/AEP_opt.txt | 10 + .../data/bins-convergence/15_2/AEP_true.txt | 10 + .../data/bins-convergence/15_2/boundary.txt | 10 + .../data/bins-convergence/15_2/separation.txt | 10 + .../data/bins-convergence/15_2/turbineX.txt | 10 + .../data/bins-convergence/15_2/turbineY.txt | 10 + .../data/bins-convergence/15_3/AEP_opt.txt | 10 + .../data/bins-convergence/15_3/AEP_true.txt | 10 + .../data/bins-convergence/15_3/boundary.txt | 10 + .../data/bins-convergence/15_3/separation.txt | 10 + .../data/bins-convergence/15_3/turbineX.txt | 10 + .../data/bins-convergence/15_3/turbineY.txt | 10 + .../data/bins-convergence/15_4/AEP_opt.txt | 10 + .../data/bins-convergence/15_4/AEP_true.txt | 10 + .../data/bins-convergence/15_4/boundary.txt | 10 + .../data/bins-convergence/15_4/separation.txt | 10 + .../data/bins-convergence/15_4/turbineX.txt | 10 + .../data/bins-convergence/15_4/turbineY.txt | 10 + .../data/bins-convergence/15_5/AEP_opt.txt | 10 + .../data/bins-convergence/15_5/AEP_true.txt | 10 + .../data/bins-convergence/15_5/boundary.txt | 10 + .../data/bins-convergence/15_5/separation.txt | 10 + .../data/bins-convergence/15_5/turbineX.txt | 10 + .../data/bins-convergence/15_5/turbineY.txt | 10 + .../data/bins-convergence/15_6/AEP_opt.txt | 10 + .../data/bins-convergence/15_6/AEP_true.txt | 10 + .../data/bins-convergence/15_6/boundary.txt | 10 + .../data/bins-convergence/15_6/separation.txt | 10 + .../data/bins-convergence/15_6/turbineX.txt | 10 + .../data/bins-convergence/15_6/turbineY.txt | 10 + .../data/bins-convergence/20_1/AEP_opt.txt | 10 + .../data/bins-convergence/20_1/AEP_true.txt | 10 + .../data/bins-convergence/20_1/boundary.txt | 10 + .../data/bins-convergence/20_1/separation.txt | 10 + .../data/bins-convergence/20_1/turbineX.txt | 10 + .../data/bins-convergence/20_1/turbineY.txt | 10 + .../data/bins-convergence/20_10/AEP_opt.txt | 10 + .../data/bins-convergence/20_10/AEP_true.txt | 10 + .../data/bins-convergence/20_10/boundary.txt | 10 + .../bins-convergence/20_10/separation.txt | 10 + .../data/bins-convergence/20_10/turbineX.txt | 10 + .../data/bins-convergence/20_10/turbineY.txt | 10 + .../data/bins-convergence/20_2/AEP_opt.txt | 10 + .../data/bins-convergence/20_2/AEP_true.txt | 10 + .../data/bins-convergence/20_2/boundary.txt | 10 + .../data/bins-convergence/20_2/separation.txt | 10 + .../data/bins-convergence/20_2/turbineX.txt | 10 + .../data/bins-convergence/20_2/turbineY.txt | 10 + .../data/bins-convergence/20_3/AEP_opt.txt | 10 + .../data/bins-convergence/20_3/AEP_true.txt | 10 + .../data/bins-convergence/20_3/boundary.txt | 10 + .../data/bins-convergence/20_3/separation.txt | 10 + .../data/bins-convergence/20_3/turbineX.txt | 10 + .../data/bins-convergence/20_3/turbineY.txt | 10 + .../data/bins-convergence/20_4/AEP_opt.txt | 10 + .../data/bins-convergence/20_4/AEP_true.txt | 10 + .../data/bins-convergence/20_4/boundary.txt | 10 + .../data/bins-convergence/20_4/separation.txt | 10 + .../data/bins-convergence/20_4/turbineX.txt | 10 + .../data/bins-convergence/20_4/turbineY.txt | 10 + .../data/bins-convergence/20_5/AEP_opt.txt | 10 + .../data/bins-convergence/20_5/AEP_true.txt | 10 + .../data/bins-convergence/20_5/boundary.txt | 10 + .../data/bins-convergence/20_5/separation.txt | 10 + .../data/bins-convergence/20_5/turbineX.txt | 10 + .../data/bins-convergence/20_5/turbineY.txt | 10 + .../data/bins-convergence/20_6/AEP_opt.txt | 10 + .../data/bins-convergence/20_6/AEP_true.txt | 10 + .../data/bins-convergence/20_6/boundary.txt | 10 + .../data/bins-convergence/20_6/separation.txt | 10 + .../data/bins-convergence/20_6/turbineX.txt | 10 + .../data/bins-convergence/20_6/turbineY.txt | 10 + .../data/bins-convergence/25_1/AEP_opt.txt | 10 + .../data/bins-convergence/25_1/AEP_true.txt | 10 + .../data/bins-convergence/25_1/boundary.txt | 10 + .../data/bins-convergence/25_1/separation.txt | 10 + .../data/bins-convergence/25_1/turbineX.txt | 10 + .../data/bins-convergence/25_1/turbineY.txt | 10 + .../data/bins-convergence/25_10/AEP_opt.txt | 10 + .../data/bins-convergence/25_10/AEP_true.txt | 10 + .../data/bins-convergence/25_10/boundary.txt | 10 + .../bins-convergence/25_10/separation.txt | 10 + .../data/bins-convergence/25_10/turbineX.txt | 10 + .../data/bins-convergence/25_10/turbineY.txt | 10 + .../data/bins-convergence/25_2/AEP_opt.txt | 10 + .../data/bins-convergence/25_2/AEP_true.txt | 10 + .../data/bins-convergence/25_2/boundary.txt | 10 + .../data/bins-convergence/25_2/separation.txt | 10 + .../data/bins-convergence/25_2/turbineX.txt | 10 + .../data/bins-convergence/25_2/turbineY.txt | 10 + .../data/bins-convergence/25_3/AEP_opt.txt | 10 + .../data/bins-convergence/25_3/AEP_true.txt | 10 + .../data/bins-convergence/25_3/boundary.txt | 10 + .../data/bins-convergence/25_3/separation.txt | 10 + .../data/bins-convergence/25_3/turbineX.txt | 10 + .../data/bins-convergence/25_3/turbineY.txt | 10 + .../data/bins-convergence/25_4/AEP_opt.txt | 10 + .../data/bins-convergence/25_4/AEP_true.txt | 10 + .../data/bins-convergence/25_4/boundary.txt | 10 + .../data/bins-convergence/25_4/separation.txt | 10 + .../data/bins-convergence/25_4/turbineX.txt | 10 + .../data/bins-convergence/25_4/turbineY.txt | 10 + .../data/bins-convergence/25_5/AEP_opt.txt | 10 + .../data/bins-convergence/25_5/AEP_true.txt | 10 + .../data/bins-convergence/25_5/boundary.txt | 10 + .../data/bins-convergence/25_5/separation.txt | 10 + .../data/bins-convergence/25_5/turbineX.txt | 10 + .../data/bins-convergence/25_5/turbineY.txt | 10 + .../data/bins-convergence/25_6/AEP_opt.txt | 10 + .../data/bins-convergence/25_6/AEP_true.txt | 10 + .../data/bins-convergence/25_6/boundary.txt | 10 + .../data/bins-convergence/25_6/separation.txt | 10 + .../data/bins-convergence/25_6/turbineX.txt | 10 + .../data/bins-convergence/25_6/turbineY.txt | 10 + .../data/bins-convergence/30_1/AEP_opt.txt | 10 + .../data/bins-convergence/30_1/AEP_true.txt | 10 + .../data/bins-convergence/30_1/boundary.txt | 10 + .../data/bins-convergence/30_1/separation.txt | 10 + .../data/bins-convergence/30_1/turbineX.txt | 10 + .../data/bins-convergence/30_1/turbineY.txt | 10 + .../data/bins-convergence/30_10/AEP_opt.txt | 10 + .../data/bins-convergence/30_10/AEP_true.txt | 10 + .../data/bins-convergence/30_10/boundary.txt | 10 + .../bins-convergence/30_10/separation.txt | 10 + .../data/bins-convergence/30_10/turbineX.txt | 10 + .../data/bins-convergence/30_10/turbineY.txt | 10 + .../data/bins-convergence/30_2/AEP_opt.txt | 10 + .../data/bins-convergence/30_2/AEP_true.txt | 10 + .../data/bins-convergence/30_2/boundary.txt | 10 + .../data/bins-convergence/30_2/separation.txt | 10 + .../data/bins-convergence/30_2/turbineX.txt | 10 + .../data/bins-convergence/30_2/turbineY.txt | 10 + .../data/bins-convergence/30_3/AEP_opt.txt | 10 + .../data/bins-convergence/30_3/AEP_true.txt | 10 + .../data/bins-convergence/30_3/boundary.txt | 10 + .../data/bins-convergence/30_3/separation.txt | 10 + .../data/bins-convergence/30_3/turbineX.txt | 10 + .../data/bins-convergence/30_3/turbineY.txt | 10 + .../data/bins-convergence/30_4/AEP_opt.txt | 10 + .../data/bins-convergence/30_4/AEP_true.txt | 10 + .../data/bins-convergence/30_4/boundary.txt | 10 + .../data/bins-convergence/30_4/separation.txt | 10 + .../data/bins-convergence/30_4/turbineX.txt | 10 + .../data/bins-convergence/30_4/turbineY.txt | 10 + .../data/bins-convergence/30_5/AEP_opt.txt | 10 + .../data/bins-convergence/30_5/AEP_true.txt | 10 + .../data/bins-convergence/30_5/boundary.txt | 10 + .../data/bins-convergence/30_5/separation.txt | 10 + .../data/bins-convergence/30_5/turbineX.txt | 10 + .../data/bins-convergence/30_5/turbineY.txt | 10 + .../data/bins-convergence/30_6/AEP_opt.txt | 10 + .../data/bins-convergence/30_6/AEP_true.txt | 10 + .../data/bins-convergence/30_6/boundary.txt | 10 + .../data/bins-convergence/30_6/separation.txt | 10 + .../data/bins-convergence/30_6/turbineX.txt | 10 + .../data/bins-convergence/30_6/turbineY.txt | 10 + .../data/bins-convergence/50_1/AEP_opt.txt | 10 + .../data/bins-convergence/50_1/AEP_true.txt | 10 + .../data/bins-convergence/50_1/boundary.txt | 10 + .../data/bins-convergence/50_1/separation.txt | 10 + .../data/bins-convergence/50_1/turbineX.txt | 10 + .../data/bins-convergence/50_1/turbineY.txt | 10 + .../data/bins-convergence/50_10/AEP_opt.txt | 10 + .../data/bins-convergence/50_10/AEP_true.txt | 10 + .../data/bins-convergence/50_10/boundary.txt | 10 + .../bins-convergence/50_10/separation.txt | 10 + .../data/bins-convergence/50_10/turbineX.txt | 10 + .../data/bins-convergence/50_10/turbineY.txt | 10 + .../data/bins-convergence/50_2/AEP_opt.txt | 10 + .../data/bins-convergence/50_2/AEP_true.txt | 10 + .../data/bins-convergence/50_2/boundary.txt | 10 + .../data/bins-convergence/50_2/separation.txt | 10 + .../data/bins-convergence/50_2/turbineX.txt | 10 + .../data/bins-convergence/50_2/turbineY.txt | 10 + .../data/bins-convergence/50_3/AEP_opt.txt | 10 + .../data/bins-convergence/50_3/AEP_true.txt | 10 + .../data/bins-convergence/50_3/boundary.txt | 10 + .../data/bins-convergence/50_3/separation.txt | 10 + .../data/bins-convergence/50_3/turbineX.txt | 10 + .../data/bins-convergence/50_3/turbineY.txt | 10 + .../data/bins-convergence/50_4/AEP_opt.txt | 10 + .../data/bins-convergence/50_4/AEP_true.txt | 10 + .../data/bins-convergence/50_4/boundary.txt | 10 + .../data/bins-convergence/50_4/separation.txt | 10 + .../data/bins-convergence/50_4/turbineX.txt | 10 + .../data/bins-convergence/50_4/turbineY.txt | 10 + .../data/bins-convergence/50_5/AEP_opt.txt | 10 + .../data/bins-convergence/50_5/AEP_true.txt | 10 + .../data/bins-convergence/50_5/boundary.txt | 10 + .../data/bins-convergence/50_5/separation.txt | 10 + .../data/bins-convergence/50_5/turbineX.txt | 10 + .../data/bins-convergence/50_5/turbineY.txt | 10 + .../data/bins-convergence/50_6/AEP_opt.txt | 10 + .../data/bins-convergence/50_6/AEP_true.txt | 10 + .../data/bins-convergence/50_6/boundary.txt | 10 + .../data/bins-convergence/50_6/separation.txt | 10 + .../data/bins-convergence/50_6/turbineX.txt | 10 + .../data/bins-convergence/50_6/turbineY.txt | 10 + .../data/bins-convergence/5_1/AEP_opt.txt | 10 + .../data/bins-convergence/5_1/AEP_true.txt | 10 + .../data/bins-convergence/5_1/boundary.txt | 10 + .../data/bins-convergence/5_1/separation.txt | 10 + .../data/bins-convergence/5_1/turbineX.txt | 10 + .../data/bins-convergence/5_1/turbineY.txt | 10 + .../data/bins-convergence/5_10/AEP_opt.txt | 10 + .../data/bins-convergence/5_10/AEP_true.txt | 10 + .../data/bins-convergence/5_10/boundary.txt | 10 + .../data/bins-convergence/5_10/separation.txt | 10 + .../data/bins-convergence/5_10/turbineX.txt | 10 + .../data/bins-convergence/5_10/turbineY.txt | 10 + .../data/bins-convergence/5_2/AEP_opt.txt | 10 + .../data/bins-convergence/5_2/AEP_true.txt | 10 + .../data/bins-convergence/5_2/boundary.txt | 10 + .../data/bins-convergence/5_2/separation.txt | 10 + .../data/bins-convergence/5_2/turbineX.txt | 10 + .../data/bins-convergence/5_2/turbineY.txt | 10 + .../data/bins-convergence/5_3/AEP_opt.txt | 10 + .../data/bins-convergence/5_3/AEP_true.txt | 10 + .../data/bins-convergence/5_3/boundary.txt | 10 + .../data/bins-convergence/5_3/separation.txt | 10 + .../data/bins-convergence/5_3/turbineX.txt | 10 + .../data/bins-convergence/5_3/turbineY.txt | 10 + .../data/bins-convergence/5_4/AEP_opt.txt | 10 + .../data/bins-convergence/5_4/AEP_true.txt | 10 + .../data/bins-convergence/5_4/boundary.txt | 10 + .../data/bins-convergence/5_4/separation.txt | 10 + .../data/bins-convergence/5_4/turbineX.txt | 10 + .../data/bins-convergence/5_4/turbineY.txt | 10 + .../data/bins-convergence/5_5/AEP_opt.txt | 10 + .../data/bins-convergence/5_5/AEP_true.txt | 10 + .../data/bins-convergence/5_5/boundary.txt | 10 + .../data/bins-convergence/5_5/separation.txt | 10 + .../data/bins-convergence/5_5/turbineX.txt | 10 + .../data/bins-convergence/5_5/turbineY.txt | 10 + .../data/bins-convergence/5_6/AEP_opt.txt | 10 + .../data/bins-convergence/5_6/AEP_true.txt | 10 + .../data/bins-convergence/5_6/boundary.txt | 10 + .../data/bins-convergence/5_6/separation.txt | 10 + .../data/bins-convergence/5_6/turbineX.txt | 10 + .../data/bins-convergence/5_6/turbineY.txt | 10 + code/plots/multiModality.py | 6 +- code/plots/multiModality2D.py | 2 +- code/plots/multiModalityR1.py | 948 +++++ code/plots/plotBounds.py | 2 +- code/plots/plotConvergence.py | 176 + code/plots/plotCt.py | 45 + code/plots/plotLayout1.py | 6 +- code/plots/plotLayout2.py | 2 +- code/plots/plotLayouts.py | 9 +- code/plots/plotResults_bounds.py | 69 +- code/plots/plotResults_boundsR1.py | 417 ++ code/plots/plotResults_max.py | 2 +- code/plots/plotResults_maxR1.py | 327 ++ code/plots/plotResults_roses.py | 76 +- code/plots/plotResults_rosesR1.py | 434 ++ code/plots/plotResults_spacing.py | 2 +- code/plots/plotResults_spacingR1.py | 664 +++ code/plots/plotRoses.py | 14 +- code/plots/plotRotorSample.py | 143 + code/plots/plotScaling.py | 2 +- code/plots/plotSpacing.py | 2 +- code/plots/plotWeibull.py | 6 +- .../amalia_4.0_northIslandRose/AEPopt.txt | 110 + .../amalia_4.0_northIslandRose/AEPtrue.txt | 110 + .../amalia_4.0_northIslandRose/funcCalls.txt | 110 + .../direct/amalia_4.0_ukiahRose/AEPopt.txt | 156 + .../direct/amalia_4.0_ukiahRose/AEPtrue.txt | 156 + .../direct/amalia_4.0_ukiahRose/funcCalls.txt | 156 + .../amalia_4.0_victorvilleRose/AEPopt.txt | 130 + .../amalia_4.0_victorvilleRose/AEPtrue.txt | 130 + .../amalia_4.0_victorvilleRose/funcCalls.txt | 130 + .../amalia_6.0_northIslandRose/AEPopt.txt | 235 ++ .../amalia_6.0_northIslandRose/AEPtrue.txt | 235 ++ .../amalia_6.0_northIslandRose/funcCalls.txt | 235 ++ .../amalia_8.0_northIslandRose/AEPopt.txt | 367 ++ .../amalia_8.0_northIslandRose/AEPtrue.txt | 367 ++ .../amalia_8.0_northIslandRose/funcCalls.txt | 367 ++ .../circle2_4.0_northIslandRose/AEPopt.txt | 343 ++ .../circle2_4.0_northIslandRose/AEPtrue.txt | 343 ++ .../circle2_4.0_northIslandRose/funcCalls.txt | 343 ++ .../circle_4.0_northIslandRose/AEPopt.txt | 118 + .../circle_4.0_northIslandRose/AEPtrue.txt | 118 + .../circle_4.0_northIslandRose/funcCalls.txt | 118 + .../square_4.0_northIslandRose/AEPopt.txt | 123 + .../square_4.0_northIslandRose/AEPtrue.txt | 123 + .../square_4.0_northIslandRose/funcCalls.txt | 123 + .../amalia_4.0_northIslandRose/AEPopt.txt | 266 ++ .../amalia_4.0_northIslandRose/AEPtrue.txt | 266 ++ .../amalia_4.0_northIslandRose/funcCalls.txt | 266 ++ .../amalia_4.0_northIslandRose_my1/AEPopt.txt | 148 + .../AEPtrue.txt | 148 + .../funcCalls.txt | 148 + .../grid/amalia_4.0_ukiahRose/AEPopt.txt | 265 ++ .../grid/amalia_4.0_ukiahRose/AEPtrue.txt | 265 ++ .../grid/amalia_4.0_ukiahRose/funcCalls.txt | 265 ++ .../grid/amalia_4.0_ukiahRose_my1/AEPopt.txt | 197 + .../grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt | 197 + .../amalia_4.0_ukiahRose_my1/funcCalls.txt | 197 + .../amalia_4.0_victorvilleRose/AEPopt.txt | 299 ++ .../amalia_4.0_victorvilleRose/AEPtrue.txt | 299 ++ .../amalia_4.0_victorvilleRose/funcCalls.txt | 299 ++ .../amalia_4.0_victorvilleRose_my1/AEPopt.txt | 209 + .../AEPtrue.txt | 209 + .../funcCalls.txt | 209 + .../amalia_6.0_northIslandRose/AEPopt.txt | 349 ++ .../amalia_6.0_northIslandRose/AEPtrue.txt | 349 ++ .../amalia_6.0_northIslandRose}/funcCalls.txt | 590 ++- .../amalia_6.0_northIslandRose_my1/AEPopt.txt | 121 + .../AEPtrue.txt | 121 + .../funcCalls.txt | 121 + .../amalia_8.0_northIslandRose/AEPopt.txt | 256 ++ .../amalia_8.0_northIslandRose/AEPtrue.txt | 256 ++ .../amalia_8.0_northIslandRose/funcCalls.txt | 256 ++ .../amalia_8.0_northIslandRose_my1/AEPopt.txt | 108 + .../AEPtrue.txt | 108 + .../funcCalls.txt | 108 + .../circle_4.0_northIslandRose/AEPopt.txt | 194 + .../circle_4.0_northIslandRose/AEPtrue.txt | 194 + .../circle_4.0_northIslandRose/funcCalls.txt | 194 + .../circle_4.0_northIslandRose_my1/AEPopt.txt | 140 + .../AEPtrue.txt | 140 + .../funcCalls.txt | 140 + .../square_4.0_northIslandRose/AEPopt.txt | 334 ++ .../square_4.0_northIslandRose/AEPtrue.txt | 334 ++ .../square_4.0_northIslandRose/funcCalls.txt | 583 ++- .../square_4.0_northIslandRose_my1/AEPopt.txt | 185 + .../AEPtrue.txt | 185 + .../funcCalls.txt | 185 + .../amalia_4.0_northIslandRose/AEPopt.txt | 145 + .../amalia_4.0_northIslandRose/AEPtrue.txt | 145 + .../amalia_4.0_northIslandRose/funcCalls.txt | 145 + .../param/amalia_4.0_ukiahRose/AEPopt.txt | 128 + .../param/amalia_4.0_ukiahRose/AEPtrue.txt | 128 + .../param/amalia_4.0_ukiahRose/funcCalls.txt | 128 + .../amalia_4.0_victorvilleRose/AEPopt.txt | 108 + .../amalia_4.0_victorvilleRose/AEPtrue.txt | 108 + .../amalia_4.0_victorvilleRose/funcCalls.txt | 108 + .../amalia_6.0_northIslandRose/AEPopt.txt | 216 + .../amalia_6.0_northIslandRose/AEPtrue.txt | 216 + .../amalia_6.0_northIslandRose/funcCalls.txt | 216 + .../amalia_8.0_northIslandRose/AEPopt.txt | 283 ++ .../amalia_8.0_northIslandRose/AEPtrue.txt | 283 ++ .../amalia_8.0_northIslandRose/funcCalls.txt | 283 ++ .../circle_4.0_northIslandRose/AEPopt.txt | 178 + .../circle_4.0_northIslandRose/AEPtrue.txt | 178 + .../circle_4.0_northIslandRose/funcCalls.txt | 178 + .../square_4.0_northIslandRose/AEPopt.txt | 179 + .../square_4.0_northIslandRose/AEPtrue.txt | 179 + .../square_4.0_northIslandRose/funcCalls.txt | 179 + code/reduction_aep_calc.py | 247 ++ code/{setup.py => setupRevision.py} | 4 +- code/test/test_aep_gradients.py | 259 ++ code/test/test_constraint_gradients.py | 3 +- code/test/test_gradients.py | 2 +- code/test/test_grid_gradients.py | 5 +- code/test/test_param.py | 3 +- code/var_reduction_exact.py | 5 +- code/windRoses.py | 13 +- 596 files changed, 52315 insertions(+), 13586 deletions(-) create mode 100644 code/335MW_AFFiles/Cylinder1.dat create mode 100644 code/335MW_AFFiles/DU00-W2-350.dat create mode 100644 code/335MW_AFFiles/DU08-W-210.dat create mode 100644 code/335MW_AFFiles/DU91-W2-250.dat create mode 100644 code/335MW_AFFiles/DU97-W-300.dat create mode 100644 code/335MW_AFFiles/FX77-W-400.dat create mode 100644 code/335MW_AFFiles/FX77-W-500.dat create mode 100644 code/5MW_AFFiles/Cylinder.pfl create mode 100644 code/5MW_AFFiles/Cylinder1.dat create mode 100644 code/5MW_AFFiles/Cylinder2.dat create mode 100644 code/5MW_AFFiles/DU21_A17.dat create mode 100644 code/5MW_AFFiles/DU21_A17.pfl create mode 100644 code/5MW_AFFiles/DU25_A17.dat create mode 100644 code/5MW_AFFiles/DU25_A17.pfl create mode 100644 code/5MW_AFFiles/DU30_A17.dat create mode 100644 code/5MW_AFFiles/DU30_A17.pfl create mode 100644 code/5MW_AFFiles/DU35_A17.dat create mode 100644 code/5MW_AFFiles/DU35_A17.pfl create mode 100644 code/5MW_AFFiles/DU40_A17.dat create mode 100644 code/5MW_AFFiles/DU40_A17.pfl create mode 100644 code/5MW_AFFiles/NACA64_A17.dat create mode 100644 code/5MW_AFFiles/NACA64_A17.pfl create mode 100644 code/Submit_Scripts/submit_6.sh create mode 100644 code/Submit_Scripts/submit_8.sh create mode 100644 code/Submit_Scripts/submit_base.sh create mode 100644 code/Submit_Scripts/submit_circle.sh create mode 100644 code/Submit_Scripts/submit_grid_6.sh create mode 100644 code/Submit_Scripts/submit_grid_8.sh create mode 100644 code/Submit_Scripts/submit_grid_base.sh create mode 100644 code/Submit_Scripts/submit_grid_circle.sh create mode 100644 code/Submit_Scripts/submit_grid_square.sh create mode 100644 code/Submit_Scripts/submit_grid_ukiah.sh create mode 100644 code/Submit_Scripts/submit_grid_victorville.sh create mode 100644 code/Submit_Scripts/submit_param_6.sh create mode 100644 code/Submit_Scripts/submit_param_8.sh create mode 100644 code/Submit_Scripts/submit_param_base.sh create mode 100644 code/Submit_Scripts/submit_param_circle.sh create mode 100644 code/Submit_Scripts/submit_param_square.sh create mode 100644 code/Submit_Scripts/submit_param_ukiah.sh create mode 100644 code/Submit_Scripts/submit_param_victorville.sh create mode 100644 code/Submit_Scripts/submit_square.sh create mode 100644 code/Submit_Scripts/submit_ukiah.sh create mode 100644 code/Submit_Scripts/submit_victorville.sh delete mode 100644 code/aep_calc.py delete mode 100644 code/aep_gaus.f90 delete mode 100644 code/aep_gaus_grid.f90 create mode 100644 code/full_aep.f90 create mode 100644 code/getCtCurve.py delete mode 100644 code/multiModality.py delete mode 100644 code/multiModality_direct.py delete mode 100644 code/opt-files/opt.py delete mode 100644 code/opt-files/optDirect.py delete mode 100644 code/opt-files/optDirect_exact.py delete mode 100644 code/opt-files/optGrid.py delete mode 100644 code/opt-files/optParam.py delete mode 100644 code/opt-files/optPyopt.py create mode 100644 code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt create mode 100644 code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt rename code/{opt-results/grid/circle_4.0_northIslandRose => opt-results-revision/direct/amalia_8.0_northIslandRose}/funcCalls.txt (52%) create mode 100644 code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt rename code/{opt-results/grid/amalia_4.0_ukiahRose => opt-results-revision/grid/amalia_6.0_northIslandRose}/funcCalls.txt (67%) create mode 100644 code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt rename code/{opt-results/grid/amalia_4.0_northIslandRose => opt-results-revision/grid/square_4.0_northIslandRose}/funcCalls.txt (56%) create mode 100644 code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt create mode 100644 code/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt create mode 100644 code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt rename code/{opt-results/grid/amalia_6.0_northIslandRose => opt-results-revision/param/amalia_8.0_northIslandRose}/funcCalls.txt (50%) create mode 100644 code/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt create mode 100644 code/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt create mode 100644 code/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/direct/amalia_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/direct/amalia_4.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/direct/amalia_4.0_ukiahRose/AEP.txt delete mode 100644 code/opt-results/direct/amalia_4.0_ukiahRose/funcCalls.txt delete mode 100644 code/opt-results/direct/amalia_4.0_victorvilleRose/AEP.txt delete mode 100644 code/opt-results/direct/amalia_4.0_victorvilleRose/funcCalls.txt delete mode 100644 code/opt-results/direct/amalia_6.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/direct/amalia_6.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/direct/amalia_8.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/direct/amalia_8.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/direct/circle_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/direct/circle_4.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/direct/square_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/direct/square_4.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/grid/amalia_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/grid/amalia_4.0_ukiahRose/AEP.txt delete mode 100644 code/opt-results/grid/amalia_4.0_victorvilleRose/AEP.txt delete mode 100644 code/opt-results/grid/amalia_6.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/grid/amalia_8.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/grid/amalia_8.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/grid/circle_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/grid/square_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/param/amalia_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/param/amalia_4.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/param/amalia_4.0_ukiahRose/AEP.txt delete mode 100644 code/opt-results/param/amalia_4.0_ukiahRose/funcCalls.txt delete mode 100644 code/opt-results/param/amalia_4.0_victorvilleRose/AEP.txt delete mode 100644 code/opt-results/param/amalia_4.0_victorvilleRose/funcCalls.txt delete mode 100644 code/opt-results/param/amalia_6.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/param/amalia_6.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/param/amalia_8.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/param/amalia_8.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/param/circle_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/param/circle_4.0_northIslandRose/funcCalls.txt delete mode 100644 code/opt-results/param/square_4.0_northIslandRose/AEP.txt delete mode 100644 code/opt-results/param/square_4.0_northIslandRose/funcCalls.txt create mode 100644 code/optComponents.py create mode 100644 code/optDirectRevision.py create mode 100644 code/optGridRevision.py create mode 100644 code/optParamRevision.py create mode 100644 code/plots/data/bins-convergence/10_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_1/separation.txt create mode 100644 code/plots/data/bins-convergence/10_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/10_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_10/separation.txt create mode 100644 code/plots/data/bins-convergence/10_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/10_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_2/separation.txt create mode 100644 code/plots/data/bins-convergence/10_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/10_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_3/separation.txt create mode 100644 code/plots/data/bins-convergence/10_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/10_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_4/separation.txt create mode 100644 code/plots/data/bins-convergence/10_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/10_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_5/separation.txt create mode 100644 code/plots/data/bins-convergence/10_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/10_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/10_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/10_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/10_6/separation.txt create mode 100644 code/plots/data/bins-convergence/10_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/10_6/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_1/separation.txt create mode 100644 code/plots/data/bins-convergence/15_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_10/separation.txt create mode 100644 code/plots/data/bins-convergence/15_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_2/separation.txt create mode 100644 code/plots/data/bins-convergence/15_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_3/separation.txt create mode 100644 code/plots/data/bins-convergence/15_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_4/separation.txt create mode 100644 code/plots/data/bins-convergence/15_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_5/separation.txt create mode 100644 code/plots/data/bins-convergence/15_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/15_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/15_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/15_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/15_6/separation.txt create mode 100644 code/plots/data/bins-convergence/15_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/15_6/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_1/separation.txt create mode 100644 code/plots/data/bins-convergence/20_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_10/separation.txt create mode 100644 code/plots/data/bins-convergence/20_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_2/separation.txt create mode 100644 code/plots/data/bins-convergence/20_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_3/separation.txt create mode 100644 code/plots/data/bins-convergence/20_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_4/separation.txt create mode 100644 code/plots/data/bins-convergence/20_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_5/separation.txt create mode 100644 code/plots/data/bins-convergence/20_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/20_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/20_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/20_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/20_6/separation.txt create mode 100644 code/plots/data/bins-convergence/20_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/20_6/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_1/separation.txt create mode 100644 code/plots/data/bins-convergence/25_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_10/separation.txt create mode 100644 code/plots/data/bins-convergence/25_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_2/separation.txt create mode 100644 code/plots/data/bins-convergence/25_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_3/separation.txt create mode 100644 code/plots/data/bins-convergence/25_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_4/separation.txt create mode 100644 code/plots/data/bins-convergence/25_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_5/separation.txt create mode 100644 code/plots/data/bins-convergence/25_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/25_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/25_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/25_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/25_6/separation.txt create mode 100644 code/plots/data/bins-convergence/25_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/25_6/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_1/separation.txt create mode 100644 code/plots/data/bins-convergence/30_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_10/separation.txt create mode 100644 code/plots/data/bins-convergence/30_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_2/separation.txt create mode 100644 code/plots/data/bins-convergence/30_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_3/separation.txt create mode 100644 code/plots/data/bins-convergence/30_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_4/separation.txt create mode 100644 code/plots/data/bins-convergence/30_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_5/separation.txt create mode 100644 code/plots/data/bins-convergence/30_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/30_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/30_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/30_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/30_6/separation.txt create mode 100644 code/plots/data/bins-convergence/30_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/30_6/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_1/separation.txt create mode 100644 code/plots/data/bins-convergence/50_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_10/separation.txt create mode 100644 code/plots/data/bins-convergence/50_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_2/separation.txt create mode 100644 code/plots/data/bins-convergence/50_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_3/separation.txt create mode 100644 code/plots/data/bins-convergence/50_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_4/separation.txt create mode 100644 code/plots/data/bins-convergence/50_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_5/separation.txt create mode 100644 code/plots/data/bins-convergence/50_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/50_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/50_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/50_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/50_6/separation.txt create mode 100644 code/plots/data/bins-convergence/50_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/50_6/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_1/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_1/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_1/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_1/separation.txt create mode 100644 code/plots/data/bins-convergence/5_1/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_1/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_10/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_10/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_10/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_10/separation.txt create mode 100644 code/plots/data/bins-convergence/5_10/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_10/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_2/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_2/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_2/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_2/separation.txt create mode 100644 code/plots/data/bins-convergence/5_2/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_2/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_3/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_3/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_3/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_3/separation.txt create mode 100644 code/plots/data/bins-convergence/5_3/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_3/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_4/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_4/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_4/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_4/separation.txt create mode 100644 code/plots/data/bins-convergence/5_4/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_4/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_5/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_5/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_5/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_5/separation.txt create mode 100644 code/plots/data/bins-convergence/5_5/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_5/turbineY.txt create mode 100644 code/plots/data/bins-convergence/5_6/AEP_opt.txt create mode 100644 code/plots/data/bins-convergence/5_6/AEP_true.txt create mode 100644 code/plots/data/bins-convergence/5_6/boundary.txt create mode 100644 code/plots/data/bins-convergence/5_6/separation.txt create mode 100644 code/plots/data/bins-convergence/5_6/turbineX.txt create mode 100644 code/plots/data/bins-convergence/5_6/turbineY.txt create mode 100644 code/plots/multiModalityR1.py create mode 100644 code/plots/plotConvergence.py create mode 100644 code/plots/plotCt.py create mode 100644 code/plots/plotResults_boundsR1.py create mode 100644 code/plots/plotResults_maxR1.py create mode 100644 code/plots/plotResults_rosesR1.py create mode 100644 code/plots/plotResults_spacingR1.py create mode 100644 code/plots/plotRotorSample.py create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt rename code/{opt-results/grid/amalia_4.0_victorvilleRose => plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose}/funcCalls.txt (61%) create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt rename code/{opt-results => plots/revised_data/opt-results-revision}/grid/square_4.0_northIslandRose/funcCalls.txt (54%) create mode 100644 code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt create mode 100644 code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt create mode 100644 code/reduction_aep_calc.py rename code/{setup.py => setupRevision.py} (90%) create mode 100644 code/test/test_aep_gradients.py diff --git a/code/335MW_AFFiles/Cylinder1.dat b/code/335MW_AFFiles/Cylinder1.dat new file mode 100644 index 0000000..a430d10 --- /dev/null +++ b/code/335MW_AFFiles/Cylinder1.dat @@ -0,0 +1,17 @@ +Round root section with a Cd of 0.60 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +0.0 Stall angle (deg) +0.0 Zero lift angle of attack (deg) +0.0 Cn slope for zero lift (dimensionless) +0.0 Cn at stall value for positive angle of attack +0.0 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.60 Minimum CD value +-180.00 0.000 0.6000 0.000 + 0.00 0.000 0.6000 0.000 +180.00 0.000 0.6000 0.000 +EOT diff --git a/code/335MW_AFFiles/DU00-W2-350.dat b/code/335MW_AFFiles/DU00-W2-350.dat new file mode 100644 index 0000000..2285c60 --- /dev/null +++ b/code/335MW_AFFiles/DU00-W2-350.dat @@ -0,0 +1,159 @@ +DU00-W2-350 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +10.0 Stall angle (deg) +-8.0 Zero Cn angle of attack (deg) +7.0 Cn slope for zero lift (dimensionless) +1.4 Cn at stall value for positive angle of attack +-0.5 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.10 Minimum CD value +-180.0 0.000 0.000 0.000 +-175.0 0.217 0.054 0.200 +-170.0 0.433 0.107 0.400 +-165.0 0.620 0.163 0.212 +-160.0 0.806 0.219 0.024 +-155.0 0.763 0.314 0.048 +-150.0 0.719 0.409 0.072 +-145.0 0.695 0.525 0.094 +-140.0 0.670 0.640 0.116 +-135.0 0.636 0.763 0.140 +-130.0 0.601 0.886 0.163 +-125.0 0.548 1.001 0.187 +-120.0 0.494 1.116 0.211 +-115.0 0.422 1.208 0.234 +-110.0 0.350 1.301 0.256 +-105.0 0.265 1.360 0.273 +-100.0 0.180 1.418 0.291 +-95.0 0.090 1.436 0.301 +-90.0 0.000 1.453 0.312 +-85.0 -0.090 1.436 0.316 +-80.0 -0.180 1.418 0.320 +-75.0 -0.265 1.360 0.316 +-70.0 -0.350 1.301 0.312 +-65.0 -0.422 1.208 0.302 +-60.0 -0.494 1.116 0.292 +-55.0 -0.548 1.001 0.279 +-50.0 -0.601 0.886 0.267 +-45.0 -0.640 0.764 0.254 +-40.0 -0.670 0.640 0.244 +-38.0 -0.681 0.592 0.240 +-36.0 -0.691 0.544 0.238 +-34.0 -0.700 0.498 0.237 +-32.0 -0.709 0.452 0.237 +-30.0 -0.719 0.409 0.238 +-28.0 -0.730 0.366 0.242 +-26.0 -0.743 0.326 0.247 +-24.0 -0.759 0.288 0.257 +-22.0 -0.780 0.252 0.270 +-20.0 -0.806 0.219 0.289 +-19.0 -0.791 0.204 0.265 +-18.0 -0.776 0.188 0.241 +-17.0 -0.761 0.173 0.218 +-16.0 -0.746 0.157 0.194 +-15.0 -0.731 0.142 0.170 +-14.0 -0.716 0.126 0.146 +-13.5 -0.709 0.118 0.134 +-13.0 -0.701 0.111 0.122 +-12.5 -0.694 0.103 0.110 +-12.0 -0.686 0.095 0.098 +-11.5 -0.679 0.087 0.086 +-11.0 -0.671 0.080 0.075 +-10.5 -0.664 0.072 0.063 +-10.0 -0.656 0.064 0.051 +-9.5 -0.649 0.056 0.039 +-9.0 -0.641 0.049 0.027 +-8.5 -0.634 0.041 0.015 +-8.0 -0.626 0.033 0.003 +-7.5 -0.584 0.029 -0.001 +-7.0 -0.541 0.026 -0.005 +-6.5 -0.494 0.023 -0.010 +-6.0 -0.447 0.020 -0.014 +-5.5 -0.396 0.018 -0.019 +-5.0 -0.344 0.016 -0.023 +-4.5 -0.289 0.014 -0.028 +-4.0 -0.233 0.013 -0.033 +-3.5 -0.174 0.012 -0.038 +-3.0 -0.115 0.012 -0.043 +-2.5 -0.054 0.011 -0.048 +-2.0 0.007 0.011 -0.052 +-1.5 0.070 0.011 -0.056 +-1.0 0.133 0.010 -0.060 +-0.5 0.197 0.010 -0.064 +0.0 0.261 0.010 -0.068 +0.5 0.326 0.010 -0.072 +1.0 0.391 0.010 -0.075 +1.5 0.457 0.010 -0.079 +2.0 0.522 0.010 -0.082 +2.5 0.587 0.011 -0.085 +3.0 0.652 0.011 -0.087 +3.5 0.716 0.011 -0.089 +4.0 0.779 0.011 -0.091 +4.5 0.841 0.012 -0.093 +5.0 0.902 0.012 -0.095 +5.5 0.961 0.012 -0.097 +6.0 1.020 0.013 -0.098 +6.5 1.075 0.013 -0.099 +7.0 1.129 0.014 -0.100 +7.5 1.178 0.015 -0.101 +8.0 1.227 0.015 -0.102 +8.5 1.268 0.016 -0.103 +9.0 1.308 0.017 -0.104 +9.5 1.339 0.020 -0.105 +10.0 1.369 0.022 -0.106 +10.5 1.381 0.026 -0.107 +11.0 1.393 0.029 -0.107 +11.5 1.368 0.035 -0.108 +12.0 1.342 0.041 -0.108 +12.5 1.317 0.050 -0.109 +13.0 1.291 0.059 -0.109 +13.5 1.270 0.069 -0.109 +14.0 1.249 0.080 -0.109 +15.0 1.211 0.103 -0.110 +16.0 1.188 0.130 -0.119 +17.0 1.172 0.154 -0.132 +18.0 1.165 0.179 -0.143 +19.0 1.176 0.203 -0.148 +20.0 1.152 0.219 -0.157 +22.0 1.114 0.252 -0.172 +24.0 1.084 0.288 -0.184 +26.0 1.062 0.326 -0.196 +28.0 1.043 0.366 -0.206 +30.0 1.027 0.409 -0.215 +32.0 1.013 0.452 -0.224 +34.0 1.000 0.498 -0.233 +36.0 0.986 0.544 -0.242 +38.0 0.973 0.592 -0.250 +40.0 0.958 0.640 -0.259 +45.0 0.914 0.764 -0.279 +50.0 0.859 0.886 -0.299 +55.0 0.782 1.001 -0.318 +60.0 0.706 1.116 -0.337 +65.0 0.603 1.208 -0.354 +70.0 0.500 1.301 -0.371 +75.0 0.378 1.360 -0.384 +80.0 0.257 1.418 -0.397 +85.0 0.128 1.436 -0.406 +90.0 0.000 1.453 -0.415 +95.0 -0.090 1.436 -0.419 +100.0 -0.180 1.418 -0.423 +105.0 -0.265 1.360 -0.419 +110.0 -0.350 1.301 -0.415 +115.0 -0.422 1.208 -0.405 +120.0 -0.494 1.116 -0.395 +125.0 -0.548 1.001 -0.383 +130.0 -0.601 0.886 -0.370 +135.0 -0.636 0.763 -0.358 +140.0 -0.670 0.640 -0.347 +145.0 -0.695 0.525 -0.344 +150.0 -0.719 0.409 -0.341 +155.0 -0.763 0.314 -0.367 +160.0 -0.806 0.219 -0.392 +165.0 -0.605 0.164 -0.446 +170.0 -0.403 0.110 -0.500 +175.0 -0.202 0.055 -0.250 +180.0 0.000 0.000 0.000 +EOT diff --git a/code/335MW_AFFiles/DU08-W-210.dat b/code/335MW_AFFiles/DU08-W-210.dat new file mode 100644 index 0000000..67525b0 --- /dev/null +++ b/code/335MW_AFFiles/DU08-W-210.dat @@ -0,0 +1,159 @@ +DU08-W-210 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +10.0 Stall angle (deg) +-4.0 Zero lift angle of attack (deg) +7.0 Cn slope for zero lift (dimensionless) +1.4 Cn at stall value for positive angle of attack +-0.5 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.006 Minimum CD value +-180.0 0.000 0.000 0.000 +-175.0 0.250 0.038 0.200 +-170.0 0.501 0.075 0.400 +-165.0 0.655 0.124 0.150 +-160.0 0.809 0.172 -0.099 +-155.0 0.764 0.269 -0.066 +-150.0 0.720 0.365 -0.033 +-145.0 0.696 0.484 -0.008 +-140.0 0.671 0.602 0.018 +-135.0 0.636 0.728 0.043 +-130.0 0.601 0.854 0.069 +-125.0 0.548 0.973 0.095 +-120.0 0.494 1.091 0.122 +-115.0 0.422 1.188 0.147 +-110.0 0.350 1.284 0.172 +-105.0 0.265 1.347 0.193 +-100.0 0.180 1.410 0.215 +-95.0 0.090 1.431 0.229 +-90.0 0.000 1.453 0.244 +-85.0 -0.090 1.431 0.250 +-80.0 -0.180 1.410 0.256 +-75.0 -0.265 1.347 0.254 +-70.0 -0.350 1.284 0.251 +-65.0 -0.422 1.188 0.243 +-60.0 -0.494 1.091 0.235 +-55.0 -0.548 0.973 0.223 +-50.0 -0.601 0.854 0.212 +-45.0 -0.641 0.728 0.202 +-40.0 -0.671 0.602 0.194 +-38.0 -0.682 0.553 0.192 +-36.0 -0.691 0.504 0.191 +-34.0 -0.701 0.456 0.191 +-32.0 -0.710 0.410 0.193 +-30.0 -0.720 0.365 0.196 +-28.0 -0.731 0.322 0.203 +-26.0 -0.745 0.282 0.212 +-24.0 -0.761 0.243 0.225 +-22.0 -0.781 0.206 0.243 +-20.0 -0.809 0.172 0.269 +-19.0 -0.825 0.156 0.286 +-18.0 -0.820 0.141 0.280 +-17.0 -0.814 0.128 0.266 +-16.0 -0.782 0.115 0.227 +-15.0 -0.751 0.102 0.187 +-14.0 -0.720 0.088 0.147 +-13.5 -0.704 0.082 0.127 +-13.0 -0.688 0.075 0.108 +-12.5 -0.673 0.069 0.088 +-12.0 -0.657 0.062 0.068 +-11.5 -0.641 0.055 0.048 +-11.0 -0.626 0.049 0.028 +-10.5 -0.610 0.042 0.008 +-10.0 -0.594 0.036 -0.012 +-9.5 -0.579 0.029 -0.031 +-9.0 -0.563 0.022 -0.051 +-8.5 -0.536 0.017 -0.069 +-8.0 -0.508 0.012 -0.086 +-7.5 -0.437 0.010 -0.095 +-7.0 -0.366 0.009 -0.103 +-6.5 -0.304 0.008 -0.105 +-6.0 -0.242 0.007 -0.107 +-5.5 -0.180 0.007 -0.109 +-5.0 -0.119 0.007 -0.110 +-4.5 -0.058 0.007 -0.112 +-4.0 0.003 0.006 -0.113 +-3.5 0.064 0.006 -0.114 +-3.0 0.124 0.006 -0.116 +-2.5 0.185 0.006 -0.117 +-2.0 0.245 0.006 -0.118 +-1.5 0.305 0.006 -0.119 +-1.0 0.365 0.006 -0.120 +-0.5 0.425 0.006 -0.121 +0.0 0.485 0.006 -0.122 +0.5 0.545 0.006 -0.124 +1.0 0.604 0.006 -0.125 +1.5 0.664 0.007 -0.125 +2.0 0.723 0.007 -0.126 +2.5 0.782 0.007 -0.127 +3.0 0.841 0.007 -0.128 +3.5 0.900 0.007 -0.129 +4.0 0.959 0.007 -0.130 +4.5 1.017 0.007 -0.131 +5.0 1.075 0.007 -0.131 +5.5 1.132 0.007 -0.132 +6.0 1.188 0.008 -0.133 +6.5 1.242 0.008 -0.133 +7.0 1.291 0.009 -0.132 +7.5 1.333 0.011 -0.130 +8.0 1.373 0.012 -0.128 +8.5 1.412 0.013 -0.126 +9.0 1.451 0.015 -0.124 +9.5 1.489 0.016 -0.122 +10.0 1.516 0.017 -0.122 +10.5 1.542 0.018 -0.122 +11.0 1.563 0.020 -0.122 +11.5 1.580 0.022 -0.122 +12.0 1.587 0.035 -0.124 +12.5 1.549 0.049 -0.125 +13.0 1.510 0.062 -0.127 +13.5 1.460 0.076 -0.129 +14.0 1.410 0.089 -0.130 +15.0 1.340 0.103 -0.132 +16.0 1.300 0.116 -0.133 +17.0 1.260 0.130 -0.135 +18.0 1.200 0.143 -0.137 +19.0 1.179 0.156 -0.138 +20.0 1.155 0.172 -0.148 +22.0 1.116 0.206 -0.172 +24.0 1.087 0.243 -0.192 +26.0 1.064 0.282 -0.208 +28.0 1.045 0.322 -0.223 +30.0 1.029 0.365 -0.236 +32.0 1.015 0.410 -0.248 +34.0 1.001 0.456 -0.259 +36.0 0.988 0.504 -0.270 +38.0 0.974 0.553 -0.280 +40.0 0.959 0.602 -0.291 +45.0 0.915 0.728 -0.315 +50.0 0.859 0.854 -0.338 +55.0 0.783 0.973 -0.361 +60.0 0.706 1.091 -0.383 +65.0 0.603 1.188 -0.403 +70.0 0.500 1.284 -0.423 +75.0 0.378 1.347 -0.440 +80.0 0.257 1.410 -0.457 +85.0 0.128 1.431 -0.470 +90.0 0.000 1.453 -0.483 +95.0 -0.090 1.431 -0.489 +100.0 -0.180 1.410 -0.495 +105.0 -0.265 1.347 -0.493 +110.0 -0.350 1.284 -0.491 +115.0 -0.422 1.188 -0.483 +120.0 -0.494 1.091 -0.474 +125.0 -0.548 0.973 -0.463 +130.0 -0.601 0.854 -0.452 +135.0 -0.636 0.728 -0.442 +140.0 -0.671 0.602 -0.433 +145.0 -0.696 0.484 -0.435 +150.0 -0.720 0.365 -0.436 +155.0 -0.764 0.269 -0.472 +160.0 -0.809 0.172 -0.509 +165.0 -0.639 0.125 -0.504 +170.0 -0.469 0.078 -0.500 +175.0 -0.235 0.039 -0.250 +180.0 0.000 0.000 0.000 +EOT diff --git a/code/335MW_AFFiles/DU91-W2-250.dat b/code/335MW_AFFiles/DU91-W2-250.dat new file mode 100644 index 0000000..2b4bd1a --- /dev/null +++ b/code/335MW_AFFiles/DU91-W2-250.dat @@ -0,0 +1,159 @@ +DU91-W2-250 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +10.0 Stall angle (deg) +-0.25 Zero lift angle of attack (deg) +7.0 Cn slope for zero lift (dimensionless) +1.4 Cn at stall value for positive angle of attack +-0.5 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.008 Minimum CD value +-180.0 0.000 0.000 0.000 +-175.0 0.181 0.056 0.200 +-170.0 0.363 0.112 0.400 +-165.0 0.544 0.169 0.198 +-160.0 0.726 0.225 -0.003 +-155.0 0.731 0.314 -0.019 +-150.0 0.737 0.403 -0.035 +-145.0 0.709 0.519 -0.008 +-140.0 0.681 0.635 0.019 +-135.0 0.644 0.759 0.045 +-130.0 0.607 0.882 0.072 +-125.0 0.552 0.997 0.099 +-120.0 0.497 1.113 0.126 +-115.0 0.424 1.206 0.152 +-110.0 0.351 1.299 0.178 +-105.0 0.266 1.358 0.199 +-100.0 0.180 1.417 0.221 +-95.0 0.090 1.435 0.236 +-90.0 0.000 1.453 0.250 +-85.0 -0.090 1.435 0.258 +-80.0 -0.180 1.417 0.267 +-75.0 -0.266 1.358 0.267 +-70.0 -0.351 1.299 0.267 +-65.0 -0.424 1.206 0.260 +-60.0 -0.497 1.113 0.254 +-55.0 -0.552 0.997 0.244 +-50.0 -0.607 0.882 0.235 +-45.0 -0.648 0.759 0.226 +-40.0 -0.681 0.635 0.220 +-38.0 -0.693 0.587 0.219 +-36.0 -0.704 0.539 0.219 +-34.0 -0.714 0.492 0.221 +-32.0 -0.725 0.447 0.224 +-30.0 -0.737 0.403 0.229 +-28.0 -0.749 0.361 0.237 +-26.0 -0.765 0.320 0.248 +-24.0 -0.783 0.282 0.264 +-22.0 -0.812 0.246 0.245 +-20.0 -0.847 0.210 0.187 +-19.0 -0.865 0.192 0.158 +-18.0 -0.883 0.175 0.129 +-17.0 -0.901 0.157 0.100 +-16.0 -0.919 0.139 0.070 +-15.0 -0.936 0.121 0.041 +-14.0 -0.954 0.103 0.012 +-13.5 -0.963 0.094 -0.002 +-13.0 -0.972 0.085 -0.017 +-12.5 -0.961 0.075 -0.024 +-12.0 -0.949 0.064 -0.031 +-11.5 -0.926 0.055 -0.033 +-11.0 -0.903 0.045 -0.035 +-10.5 -0.871 0.038 -0.039 +-10.0 -0.839 0.032 -0.043 +-9.5 -0.806 0.026 -0.047 +-9.0 -0.773 0.021 -0.051 +-8.5 -0.717 0.017 -0.059 +-8.0 -0.662 0.013 -0.068 +-7.5 -0.595 0.012 -0.074 +-7.0 -0.528 0.010 -0.080 +-6.5 -0.457 0.010 -0.086 +-6.0 -0.387 0.009 -0.092 +-5.5 -0.317 0.009 -0.097 +-5.0 -0.247 0.008 -0.102 +-4.5 -0.179 0.008 -0.105 +-4.0 -0.110 0.008 -0.108 +-3.5 -0.044 0.008 -0.111 +-3.0 0.023 0.008 -0.114 +-2.5 0.089 0.008 -0.116 +-2.0 0.155 0.008 -0.119 +-1.5 0.219 0.008 -0.120 +-1.0 0.283 0.008 -0.122 +-0.5 0.346 0.008 -0.124 +0.0 0.408 0.008 -0.126 +0.5 0.470 0.008 -0.127 +1.0 0.533 0.008 -0.129 +1.5 0.595 0.008 -0.130 +2.0 0.658 0.008 -0.131 +2.5 0.721 0.008 -0.133 +3.0 0.782 0.008 -0.134 +3.5 0.843 0.008 -0.135 +4.0 0.904 0.008 -0.136 +4.5 0.964 0.008 -0.136 +5.0 1.024 0.009 -0.137 +5.5 1.083 0.009 -0.137 +6.0 1.141 0.009 -0.138 +6.5 1.195 0.009 -0.137 +7.0 1.248 0.010 -0.137 +7.5 1.289 0.011 -0.134 +8.0 1.330 0.011 -0.132 +8.5 1.347 0.013 -0.127 +9.0 1.365 0.015 -0.123 +9.5 1.336 0.025 -0.123 +10.0 1.306 0.036 -0.123 +10.5 1.231 0.046 -0.122 +11.0 1.156 0.055 -0.121 +11.5 1.133 0.059 -0.117 +12.0 1.109 0.063 -0.112 +12.5 1.103 0.070 -0.109 +13.0 1.097 0.077 -0.106 +13.5 1.104 0.085 -0.107 +14.0 1.112 0.093 -0.108 +15.0 1.126 0.111 -0.112 +16.0 1.129 0.125 -0.113 +17.0 1.122 0.137 -0.112 +18.0 1.127 0.155 -0.115 +19.0 1.134 0.176 -0.121 +20.0 1.139 0.196 -0.126 +22.0 1.147 0.245 -0.142 +24.0 1.119 0.282 -0.165 +26.0 1.092 0.320 -0.184 +28.0 1.071 0.361 -0.201 +30.0 1.052 0.403 -0.216 +32.0 1.036 0.447 -0.229 +34.0 1.020 0.492 -0.242 +36.0 1.005 0.539 -0.254 +38.0 0.989 0.587 -0.265 +40.0 0.973 0.635 -0.276 +45.0 0.926 0.759 -0.302 +50.0 0.868 0.882 -0.327 +55.0 0.789 0.997 -0.350 +60.0 0.711 1.113 -0.373 +65.0 0.606 1.206 -0.394 +70.0 0.502 1.299 -0.415 +75.0 0.380 1.358 -0.432 +80.0 0.257 1.417 -0.450 +85.0 0.129 1.435 -0.463 +90.0 0.000 1.453 -0.476 +95.0 -0.090 1.435 -0.484 +100.0 -0.180 1.417 -0.493 +105.0 -0.266 1.358 -0.493 +110.0 -0.351 1.299 -0.492 +115.0 -0.424 1.206 -0.486 +120.0 -0.497 1.113 -0.480 +125.0 -0.552 0.997 -0.470 +130.0 -0.607 0.882 -0.461 +135.0 -0.644 0.759 -0.454 +140.0 -0.681 0.635 -0.446 +145.0 -0.709 0.519 -0.451 +150.0 -0.737 0.403 -0.455 +155.0 -0.714 0.316 -0.478 +160.0 -0.690 0.230 -0.500 +165.0 -0.518 0.172 -0.500 +170.0 -0.345 0.115 -0.500 +175.0 -0.173 0.057 -0.250 +180.0 0.000 0.000 0.000 +EOT diff --git a/code/335MW_AFFiles/DU97-W-300.dat b/code/335MW_AFFiles/DU97-W-300.dat new file mode 100644 index 0000000..a913323 --- /dev/null +++ b/code/335MW_AFFiles/DU97-W-300.dat @@ -0,0 +1,159 @@ +DU97-W-300 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +10.0 Stall angle (deg) +-2.25 Zero lift angle of attack (deg) +7.0 Cn slope for zero lift (dimensionless) +1.4 Cn at stall value for positive angle of attack +-0.5 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.01 Minimum CD value +-180.0 0.000 0.000 0.000 +-175.0 0.183 0.047 0.200 +-170.0 0.366 0.093 0.400 +-165.0 0.549 0.140 0.194 +-160.0 0.732 0.187 -0.012 +-155.0 0.721 0.279 -0.008 +-150.0 0.710 0.371 -0.005 +-145.0 0.688 0.489 0.020 +-140.0 0.665 0.607 0.045 +-135.0 0.632 0.733 0.071 +-130.0 0.598 0.858 0.097 +-125.0 0.545 0.976 0.124 +-120.0 0.492 1.094 0.150 +-115.0 0.421 1.190 0.175 +-110.0 0.349 1.286 0.201 +-105.0 0.264 1.348 0.222 +-100.0 0.179 1.411 0.243 +-95.0 0.090 1.432 0.257 +-90.0 0.000 1.453 0.271 +-85.0 -0.090 1.432 0.277 +-80.0 -0.179 1.411 0.284 +-75.0 -0.264 1.348 0.282 +-70.0 -0.349 1.286 0.280 +-65.0 -0.421 1.190 0.271 +-60.0 -0.492 1.094 0.263 +-55.0 -0.545 0.976 0.251 +-50.0 -0.598 0.858 0.240 +-45.0 -0.636 0.733 0.229 +-40.0 -0.665 0.607 0.221 +-38.0 -0.675 0.558 0.218 +-36.0 -0.684 0.509 0.217 +-34.0 -0.693 0.462 0.217 +-32.0 -0.701 0.416 0.218 +-30.0 -0.710 0.371 0.222 +-28.0 -0.720 0.328 0.227 +-26.0 -0.732 0.287 0.235 +-24.0 -0.747 0.248 0.248 +-22.0 -0.766 0.212 0.265 +-20.0 -0.922 0.197 0.196 +-19.0 -0.999 0.189 0.162 +-18.0 -1.077 0.182 0.127 +-17.0 -1.154 0.174 0.093 +-16.0 -1.232 0.166 0.058 +-15.0 -1.259 0.155 0.032 +-14.0 -1.194 0.137 0.020 +-13.5 -1.152 0.127 0.012 +-13.0 -1.110 0.117 0.005 +-12.5 -1.065 0.108 -0.004 +-12.0 -1.020 0.098 -0.012 +-11.5 -0.975 0.090 -0.019 +-11.0 -0.931 0.083 -0.025 +-10.5 -0.884 0.076 -0.030 +-10.0 -0.838 0.070 -0.035 +-9.5 -0.801 0.060 -0.041 +-9.0 -0.765 0.050 -0.047 +-8.5 -0.751 0.037 -0.052 +-8.0 -0.737 0.024 -0.057 +-7.5 -0.693 0.021 -0.059 +-7.0 -0.649 0.017 -0.060 +-6.5 -0.578 0.016 -0.064 +-6.0 -0.507 0.015 -0.068 +-5.5 -0.438 0.014 -0.072 +-5.0 -0.369 0.013 -0.076 +-4.5 -0.301 0.012 -0.079 +-4.0 -0.233 0.012 -0.082 +-3.5 -0.167 0.011 -0.085 +-3.0 -0.101 0.011 -0.088 +-2.5 -0.036 0.011 -0.090 +-2.0 0.028 0.011 -0.093 +-1.5 0.092 0.010 -0.095 +-1.0 0.156 0.010 -0.098 +-0.5 0.221 0.010 -0.100 +0.0 0.287 0.010 -0.103 +0.5 0.351 0.011 -0.105 +1.0 0.416 0.011 -0.107 +1.5 0.480 0.011 -0.109 +2.0 0.544 0.011 -0.110 +2.5 0.606 0.011 -0.112 +3.0 0.668 0.011 -0.114 +3.5 0.729 0.011 -0.115 +4.0 0.791 0.011 -0.116 +4.5 0.852 0.011 -0.118 +5.0 0.913 0.011 -0.119 +5.5 0.972 0.012 -0.120 +6.0 1.031 0.012 -0.120 +6.5 1.088 0.012 -0.121 +7.0 1.145 0.012 -0.121 +7.5 1.200 0.013 -0.122 +8.0 1.256 0.013 -0.122 +8.5 1.308 0.013 -0.121 +9.0 1.359 0.014 -0.121 +9.5 1.406 0.014 -0.120 +10.0 1.452 0.015 -0.119 +10.5 1.489 0.016 -0.117 +11.0 1.526 0.017 -0.114 +11.5 1.542 0.018 -0.111 +12.0 1.559 0.020 -0.107 +12.5 1.377 0.040 -0.111 +13.0 1.196 0.059 -0.116 +13.5 1.148 0.067 -0.114 +14.0 1.100 0.075 -0.113 +15.0 1.050 0.089 -0.111 +16.0 1.022 0.103 -0.109 +17.0 1.007 0.117 -0.110 +18.0 1.010 0.133 -0.112 +19.0 1.040 0.153 -0.118 +20.0 1.065 0.173 -0.125 +22.0 1.095 0.212 -0.144 +24.0 1.067 0.248 -0.164 +26.0 1.046 0.287 -0.180 +28.0 1.029 0.328 -0.194 +30.0 1.015 0.371 -0.207 +32.0 1.002 0.416 -0.220 +34.0 0.990 0.462 -0.231 +36.0 0.977 0.509 -0.242 +38.0 0.964 0.558 -0.252 +40.0 0.950 0.607 -0.263 +45.0 0.908 0.733 -0.287 +50.0 0.854 0.858 -0.311 +55.0 0.779 0.976 -0.333 +60.0 0.703 1.094 -0.355 +65.0 0.601 1.190 -0.376 +70.0 0.499 1.286 -0.396 +75.0 0.378 1.348 -0.413 +80.0 0.256 1.411 -0.430 +85.0 0.128 1.432 -0.442 +90.0 0.000 1.453 -0.455 +95.0 -0.090 1.432 -0.461 +100.0 -0.179 1.411 -0.468 +105.0 -0.264 1.348 -0.465 +110.0 -0.349 1.286 -0.463 +115.0 -0.421 1.190 -0.455 +120.0 -0.492 1.094 -0.447 +125.0 -0.545 0.976 -0.435 +130.0 -0.598 0.858 -0.424 +135.0 -0.632 0.733 -0.414 +140.0 -0.665 0.607 -0.405 +145.0 -0.688 0.489 -0.405 +150.0 -0.710 0.371 -0.405 +155.0 -0.703 0.282 -0.432 +160.0 -0.697 0.193 -0.458 +165.0 -0.522 0.145 -0.479 +170.0 -0.348 0.096 -0.500 +175.0 -0.174 0.048 -0.250 +180.0 0.000 0.000 0.000 +EOT diff --git a/code/335MW_AFFiles/FX77-W-400.dat b/code/335MW_AFFiles/FX77-W-400.dat new file mode 100644 index 0000000..d6ad2a8 --- /dev/null +++ b/code/335MW_AFFiles/FX77-W-400.dat @@ -0,0 +1,159 @@ +FX77-W-400 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +10.0 Stall angle (deg) +-2.25 Zero lift angle of attack (deg) +7.0 Cn slope for zero lift (dimensionless) +1.4 Cn at stall value for positive angle of attack +-0.5 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.028 Minimum CD value +-180.0 0.000 0.010 0.000 +-175.0 0.246 0.010 0.200 +-170.0 0.493 0.010 0.400 +-165.0 0.603 0.052 0.353 +-160.0 0.713 0.094 0.306 +-155.0 0.675 0.182 0.282 +-150.0 0.637 0.270 0.259 +-145.0 0.616 0.379 0.261 +-140.0 0.594 0.487 0.264 +-135.0 0.564 0.603 0.275 +-130.0 0.533 0.718 0.285 +-125.0 0.486 0.828 0.298 +-120.0 0.438 0.937 0.311 +-115.0 0.374 1.028 0.322 +-110.0 0.311 1.119 0.333 +-105.0 0.235 1.180 0.339 +-100.0 0.159 1.241 0.344 +-95.0 0.080 1.265 0.343 +-90.0 0.000 1.290 0.342 +-85.0 -0.080 1.265 0.330 +-80.0 -0.159 1.241 0.319 +-75.0 -0.235 1.180 0.302 +-70.0 -0.311 1.119 0.285 +-65.0 -0.374 1.028 0.264 +-60.0 -0.438 0.937 0.243 +-55.0 -0.486 0.828 0.221 +-50.0 -0.533 0.718 0.200 +-45.0 -0.564 0.603 0.179 +-40.0 -0.594 0.487 0.159 +-38.0 -0.603 0.443 0.152 +-36.0 -0.611 0.400 0.144 +-34.0 -0.620 0.357 0.137 +-32.0 -0.628 0.314 0.130 +-30.0 -0.637 0.270 0.123 +-28.0 -0.652 0.235 0.115 +-26.0 -0.667 0.200 0.107 +-24.0 -0.683 0.165 0.100 +-22.0 -0.698 0.129 0.092 +-20.0 -0.713 0.094 0.084 +-19.0 -0.689 0.088 0.074 +-18.0 -0.665 0.082 0.064 +-17.0 -0.640 0.076 0.054 +-16.0 -0.616 0.070 0.044 +-15.0 -0.592 0.064 0.034 +-14.0 -0.568 0.058 0.024 +-13.5 -0.555 0.055 0.019 +-13.0 -0.543 0.052 0.014 +-12.5 -0.531 0.049 0.009 +-12.0 -0.519 0.046 0.004 +-11.5 -0.507 0.043 -0.001 +-11.0 -0.495 0.040 -0.006 +-10.5 -0.483 0.037 -0.011 +-10.0 -0.471 0.034 -0.016 +-9.5 -0.444 0.034 -0.016 +-9.0 -0.417 0.033 -0.016 +-8.5 -0.391 0.033 -0.016 +-8.0 -0.364 0.033 -0.016 +-7.5 -0.338 0.032 -0.016 +-7.0 -0.311 0.032 -0.016 +-6.5 -0.285 0.031 -0.016 +-6.0 -0.258 0.031 -0.016 +-5.5 -0.232 0.030 -0.016 +-5.0 -0.205 0.030 -0.016 +-4.5 -0.179 0.029 -0.016 +-4.0 -0.152 0.029 -0.016 +-3.5 -0.126 0.028 -0.016 +-3.0 -0.099 0.028 -0.016 +-2.5 -0.031 0.028 -0.019 +-2.0 0.037 0.028 -0.020 +-1.5 0.105 0.028 -0.022 +-1.0 0.173 0.028 -0.024 +-0.5 0.241 0.028 -0.025 +0.0 0.309 0.028 -0.027 +0.5 0.377 0.028 -0.029 +1.0 0.445 0.028 -0.031 +1.5 0.513 0.028 -0.032 +2.0 0.580 0.028 -0.034 +2.5 0.646 0.028 -0.036 +3.0 0.713 0.028 -0.039 +3.5 0.779 0.028 -0.041 +4.0 0.845 0.028 -0.043 +4.5 0.912 0.028 -0.045 +5.0 0.978 0.028 -0.047 +5.5 1.045 0.028 -0.049 +6.0 1.111 0.028 -0.052 +6.5 1.177 0.028 -0.054 +7.0 1.244 0.028 -0.056 +7.5 1.310 0.028 -0.058 +8.0 1.374 0.028 -0.061 +8.5 1.434 0.028 -0.064 +9.0 1.494 0.029 -0.068 +9.5 1.554 0.029 -0.071 +10.0 1.614 0.029 -0.074 +10.5 1.663 0.029 -0.078 +11.0 1.695 0.029 -0.081 +11.5 1.728 0.029 -0.084 +12.0 1.760 0.030 -0.088 +12.5 0.986 0.033 -0.059 +13.0 0.973 0.035 -0.060 +13.5 0.985 0.037 -0.062 +14.0 0.998 0.038 -0.064 +15.0 1.054 0.039 -0.069 +16.0 1.127 0.040 -0.074 +17.0 1.100 0.054 -0.083 +18.0 1.073 0.067 -0.093 +19.0 1.046 0.081 -0.102 +20.0 1.019 0.094 -0.111 +22.0 0.997 0.129 -0.120 +24.0 0.975 0.165 -0.130 +26.0 0.954 0.200 -0.139 +28.0 0.932 0.235 -0.149 +30.0 0.910 0.270 -0.158 +32.0 0.898 0.314 -0.166 +34.0 0.885 0.357 -0.173 +36.0 0.873 0.400 -0.180 +38.0 0.861 0.443 -0.187 +40.0 0.849 0.487 -0.194 +45.0 0.805 0.603 -0.212 +50.0 0.762 0.718 -0.229 +55.0 0.694 0.828 -0.246 +60.0 0.626 0.937 -0.263 +65.0 0.535 1.028 -0.279 +70.0 0.444 1.119 -0.295 +75.0 0.336 1.180 -0.308 +80.0 0.228 1.241 -0.322 +85.0 0.114 1.265 -0.332 +90.0 0.000 1.290 -0.342 +95.0 -0.080 1.265 -0.343 +100.0 -0.159 1.241 -0.344 +105.0 -0.235 1.180 -0.339 +110.0 -0.311 1.119 -0.333 +115.0 -0.374 1.028 -0.322 +120.0 -0.438 0.937 -0.311 +125.0 -0.486 0.828 -0.298 +130.0 -0.533 0.718 -0.285 +135.0 -0.564 0.603 -0.275 +140.0 -0.594 0.487 -0.264 +145.0 -0.616 0.379 -0.261 +150.0 -0.637 0.270 -0.259 +155.0 -0.675 0.182 -0.282 +160.0 -0.713 0.094 -0.306 +165.0 -0.603 0.052 -0.403 +170.0 -0.493 0.010 -0.500 +175.0 -0.246 0.010 -0.250 +180.0 0.000 0.010 0.000 +EOT diff --git a/code/335MW_AFFiles/FX77-W-500.dat b/code/335MW_AFFiles/FX77-W-500.dat new file mode 100644 index 0000000..ae3e472 --- /dev/null +++ b/code/335MW_AFFiles/FX77-W-500.dat @@ -0,0 +1,159 @@ +FX77-W-500 + + +1 Number of airfoil tables in this file +1.0 Reynolds numbers in millions +0.0 Control setting +10.0 Stall angle (deg) +-3.0 Zero lift angle of attack (deg) +7.0 Cn slope for zero lift (dimensionless) +1.4 Cn at stall value for positive angle of attack +-0.5 Cn at stall value for negative angle of attack +0.0 Angle of attack for minimum CD (deg) + 0.086 Minimum CD value +-180.0 0.000 0.155 0.000 +-175.0 0.220 0.173 0.200 +-170.0 0.440 0.191 0.400 +-165.0 0.547 0.244 0.358 +-160.0 0.653 0.296 0.317 +-155.0 0.627 0.376 0.300 +-150.0 0.602 0.456 0.284 +-145.0 0.587 0.554 0.289 +-140.0 0.573 0.651 0.294 +-135.0 0.547 0.754 0.305 +-130.0 0.521 0.856 0.315 +-125.0 0.476 0.951 0.326 +-120.0 0.432 1.045 0.337 +-115.0 0.370 1.118 0.343 +-110.0 0.308 1.192 0.350 +-105.0 0.233 1.235 0.351 +-100.0 0.159 1.278 0.352 +-95.0 0.079 1.284 0.345 +-90.0 0.000 1.290 0.339 +-85.0 -0.079 1.284 0.331 +-80.0 -0.159 1.278 0.324 +-75.0 -0.233 1.235 0.309 +-70.0 -0.308 1.192 0.295 +-65.0 -0.370 1.118 0.276 +-60.0 -0.432 1.045 0.256 +-55.0 -0.476 0.951 0.234 +-50.0 -0.521 0.856 0.212 +-45.0 -0.547 0.754 0.190 +-40.0 -0.573 0.651 0.167 +-38.0 -0.579 0.612 0.158 +-36.0 -0.585 0.573 0.150 +-34.0 -0.590 0.534 0.141 +-32.0 -0.596 0.495 0.132 +-30.0 -0.602 0.456 0.123 +-28.0 -0.612 0.424 0.113 +-26.0 -0.622 0.392 0.103 +-24.0 -0.633 0.360 0.093 +-22.0 -0.643 0.328 0.083 +-20.0 -0.653 0.296 0.073 +-19.0 -0.627 0.284 0.063 +-18.0 -0.600 0.271 0.054 +-17.0 -0.573 0.258 0.044 +-16.0 -0.547 0.246 0.034 +-15.0 -0.520 0.233 0.024 +-14.0 -0.494 0.220 0.014 +-13.5 -0.481 0.214 0.009 +-13.0 -0.467 0.208 0.004 +-12.5 -0.454 0.201 -0.001 +-12.0 -0.441 0.195 -0.006 +-11.5 -0.427 0.189 -0.011 +-11.0 -0.414 0.183 -0.016 +-10.5 -0.401 0.176 -0.021 +-10.0 -0.388 0.170 -0.026 +-9.5 -0.361 0.164 -0.025 +-9.0 -0.335 0.157 -0.024 +-8.5 -0.309 0.151 -0.023 +-8.0 -0.282 0.144 -0.022 +-7.5 -0.256 0.138 -0.022 +-7.0 -0.230 0.132 -0.021 +-6.5 -0.204 0.125 -0.020 +-6.0 -0.177 0.119 -0.019 +-5.5 -0.151 0.112 -0.019 +-5.0 -0.125 0.106 -0.018 +-4.5 -0.098 0.100 -0.017 +-4.0 -0.072 0.093 -0.016 +-3.5 -0.046 0.087 -0.016 +-3.0 -0.007 0.083 -0.016 +-2.5 0.050 0.084 -0.018 +-2.0 0.107 0.084 -0.020 +-1.5 0.164 0.085 -0.022 +-1.0 0.221 0.085 -0.024 +-0.5 0.279 0.086 -0.026 +0.0 0.336 0.086 -0.028 +0.5 0.393 0.087 -0.030 +1.0 0.450 0.087 -0.032 +1.5 0.507 0.088 -0.034 +2.0 0.570 0.088 -0.037 +2.5 0.637 0.088 -0.039 +3.0 0.703 0.087 -0.041 +3.5 0.770 0.087 -0.044 +4.0 0.837 0.087 -0.046 +4.5 0.903 0.087 -0.048 +5.0 0.970 0.087 -0.051 +5.5 1.037 0.087 -0.053 +6.0 1.098 0.086 -0.056 +6.5 1.157 0.086 -0.058 +7.0 1.217 0.086 -0.061 +7.5 1.277 0.086 -0.064 +8.0 1.336 0.086 -0.067 +8.5 1.396 0.086 -0.069 +9.0 1.444 0.086 -0.073 +9.5 1.485 0.088 -0.076 +10.0 1.526 0.089 -0.080 +10.5 1.240 0.105 -0.083 +11.0 1.073 0.126 -0.044 +11.5 1.045 0.141 -0.037 +12.0 1.028 0.155 -0.039 +12.5 1.017 0.169 -0.041 +13.0 1.010 0.183 -0.042 +13.5 1.008 0.195 -0.044 +14.0 1.007 0.206 -0.046 +15.0 1.008 0.227 -0.049 +16.0 1.012 0.246 -0.053 +17.0 0.994 0.259 -0.063 +18.0 0.974 0.271 -0.073 +19.0 0.953 0.284 -0.084 +20.0 0.933 0.296 -0.094 +22.0 0.918 0.328 -0.106 +24.0 0.904 0.360 -0.119 +26.0 0.889 0.392 -0.131 +28.0 0.874 0.424 -0.143 +30.0 0.860 0.456 -0.155 +32.0 0.852 0.495 -0.164 +34.0 0.843 0.534 -0.173 +36.0 0.835 0.573 -0.182 +38.0 0.827 0.612 -0.191 +40.0 0.819 0.651 -0.201 +45.0 0.781 0.754 -0.221 +50.0 0.744 0.856 -0.241 +55.0 0.680 0.951 -0.258 +60.0 0.617 1.045 -0.276 +65.0 0.528 1.118 -0.291 +70.0 0.440 1.192 -0.305 +75.0 0.333 1.235 -0.316 +80.0 0.227 1.278 -0.327 +85.0 0.113 1.284 -0.333 +90.0 0.000 1.290 -0.339 +95.0 -0.079 1.284 -0.345 +100.0 -0.159 1.278 -0.352 +105.0 -0.233 1.235 -0.351 +110.0 -0.308 1.192 -0.350 +115.0 -0.370 1.118 -0.343 +120.0 -0.432 1.045 -0.337 +125.0 -0.476 0.951 -0.326 +130.0 -0.521 0.856 -0.315 +135.0 -0.547 0.754 -0.305 +140.0 -0.573 0.651 -0.294 +145.0 -0.587 0.554 -0.289 +150.0 -0.602 0.456 -0.284 +155.0 -0.627 0.376 -0.300 +160.0 -0.653 0.296 -0.317 +165.0 -0.547 0.244 -0.408 +170.0 -0.440 0.191 -0.500 +175.0 -0.220 0.173 -0.250 +180.0 0.000 0.155 0.000 +EOT diff --git a/code/5MW_AFFiles/Cylinder.pfl b/code/5MW_AFFiles/Cylinder.pfl new file mode 100644 index 0000000..57a1027 --- /dev/null +++ b/code/5MW_AFFiles/Cylinder.pfl @@ -0,0 +1,203 @@ +Cyldiner +x/c y/c +1.0 0.0 +0.999750794563 0.0157842748824 +0.999003426666 0.0315528156563 +0.997758641301 0.0472899038974 +0.996017679297 0.0629798525339 +0.993782276083 0.0786070214836 +0.991054659957 0.0941558332449 +0.987837549868 0.109610788424 +0.984134152699 0.124956481185 +0.979948160078 0.140177614609 +0.975283744694 0.155259015937 +0.970145556136 0.170185651702 +0.964538716264 0.184942642708 +0.958468814096 0.199515278866 +0.951941900244 0.213889033855 +0.944964480878 0.228049579604 +0.937543511239 0.241982800571 +0.929686388713 0.255674807821 +0.921400945451 0.269111952862 +0.912695440561 0.282280841256 +0.903578551881 0.295168345968 +0.894059367324 0.307761620454 +0.884147375819 0.320048111464 +0.873852457856 0.332015571555 +0.863184875632 0.343652071305 +0.852155262826 0.354946011196 +0.840774613996 0.365886133184 +0.829054273619 0.376461531917 +0.817005924786 0.386661665608 +0.804641577553 0.396476366541 +0.791973556971 0.405895851211 +0.779014490797 0.414910730068 +0.76577729691 0.423512016886 +0.752275170435 0.431691137716 +0.738521570582 0.439439939431 +0.724530207241 0.446750697857 +0.710315027307 0.453616125473 +0.695890200779 0.460029378669 +0.681270106639 0.465984064576 +0.666469318515 0.471474247434 +0.651502590153 0.476494454508 +0.636384840715 0.481039681547 +0.621131139902 0.48510539777 +0.605756692934 0.488687550383 +0.590276825394 0.491782568618 +0.574706967952 0.494387367294 +0.559062640979 0.496499349889 +0.543359439082 0.498116411136 +0.527613015552 0.49923693911 +0.511839066768 0.499859816847 +0.496053316545 0.499984423447 +0.480271500462 0.499610634701 +0.464509350176 0.498738823208 +0.448782577742 0.49736985801 +0.433106859948 0.495505103721 +0.417497822691 0.493146419169 +0.401971025398 0.490296155541 +0.386541945519 0.486957154043 +0.371225963097 0.483132743063 +0.356038345434 0.478826734858 +0.34099423188 0.47404342175 +0.326108618734 0.46878757185 +0.311396344298 0.463064424304 +0.296872074088 0.456879684069 +0.282550286212 0.450239516228 +0.26844525694 0.443150539847 +0.254571046471 0.435619821369 +0.240941484921 0.42765486758 +0.227570158532 0.419263618119 +0.214470396135 0.410454437565 +0.201655255856 0.401236107101 +0.189137512106 0.391617815759 +0.176929642844 0.381609151263 +0.165043817141 0.371220090465 +0.153491883045 0.360460989407 +0.142285355776 0.349342572997 +0.131435406244 0.337875924312 +0.120952849914 0.326072473558 +0.110848136027 0.31394398667 +0.101131337181 0.30150255359 +0.0918121392928 0.288760576207 +0.082899831941 0.275730756002 +0.0744032991078 0.262426081382 +0.0663310103216 0.248859814738 +0.0586910122157 0.235045479218 +0.0514909205063 0.220996845253 +0.0447379124013 0.206727916826 +0.0384387194461 0.192252917516 +0.0325996208132 0.177586276317 +0.0272264370432 0.162742613255 +0.0223245242424 0.147736724817 +0.0178987687442 0.132583569199 +0.0139535822379 0.117298251396 +0.0104928973711 0.101896008145 +0.00752016382994 0.086392192737 +0.00503834489972 0.0708022597125 +0.00304991451156 0.0551417494556 +0.0015568547761 0.0394262727037 +0.000560654007778 0.0236714949858 +6.23052411713e-05 0.00789312100682 +0.0 0.0 +6.23052411713e-05 -0.00789312100682 +0.000560654007778 -0.0236714949858 +0.0015568547761 -0.0394262727037 +0.00304991451156 -0.0551417494556 +0.00503834489972 -0.0708022597125 +0.00752016382994 -0.086392192737 +0.0104928973711 -0.101896008145 +0.0139535822379 -0.117298251396 +0.0178987687442 -0.132583569199 +0.0223245242424 -0.147736724817 +0.0272264370432 -0.162742613255 +0.0325996208132 -0.177586276317 +0.0384387194461 -0.192252917516 +0.0447379124013 -0.206727916826 +0.0514909205063 -0.220996845253 +0.0586910122157 -0.235045479218 +0.0663310103216 -0.248859814738 +0.0744032991078 -0.262426081382 +0.082899831941 -0.275730756002 +0.0918121392928 -0.288760576207 +0.101131337181 -0.30150255359 +0.110848136027 -0.31394398667 +0.120952849914 -0.326072473558 +0.131435406244 -0.337875924312 +0.142285355776 -0.349342572997 +0.153491883045 -0.360460989407 +0.165043817141 -0.371220090465 +0.176929642844 -0.381609151263 +0.189137512106 -0.391617815759 +0.201655255856 -0.401236107101 +0.214470396135 -0.410454437565 +0.227570158532 -0.419263618119 +0.240941484921 -0.42765486758 +0.254571046471 -0.435619821369 +0.26844525694 -0.443150539847 +0.282550286212 -0.450239516228 +0.296872074088 -0.456879684069 +0.311396344298 -0.463064424304 +0.326108618734 -0.46878757185 +0.34099423188 -0.47404342175 +0.356038345434 -0.478826734858 +0.371225963097 -0.483132743063 +0.386541945519 -0.486957154043 +0.401971025398 -0.490296155541 +0.417497822691 -0.493146419169 +0.433106859948 -0.495505103721 +0.448782577742 -0.49736985801 +0.464509350176 -0.498738823208 +0.480271500462 -0.499610634701 +0.496053316545 -0.499984423447 +0.511839066768 -0.499859816847 +0.527613015552 -0.49923693911 +0.543359439082 -0.498116411136 +0.559062640979 -0.496499349889 +0.574706967952 -0.494387367294 +0.590276825394 -0.491782568618 +0.605756692934 -0.488687550383 +0.621131139902 -0.48510539777 +0.636384840715 -0.481039681547 +0.651502590153 -0.476494454508 +0.666469318515 -0.471474247434 +0.681270106639 -0.465984064576 +0.695890200779 -0.460029378669 +0.710315027307 -0.453616125473 +0.724530207241 -0.446750697857 +0.738521570582 -0.439439939431 +0.752275170435 -0.431691137716 +0.76577729691 -0.423512016886 +0.779014490797 -0.414910730068 +0.791973556971 -0.405895851211 +0.804641577553 -0.396476366541 +0.817005924786 -0.386661665608 +0.829054273619 -0.376461531917 +0.840774613996 -0.365886133184 +0.852155262826 -0.354946011196 +0.863184875632 -0.343652071305 +0.873852457856 -0.332015571555 +0.884147375819 -0.320048111464 +0.894059367324 -0.307761620454 +0.903578551881 -0.295168345968 +0.912695440561 -0.282280841256 +0.921400945451 -0.269111952862 +0.929686388713 -0.255674807821 +0.937543511239 -0.241982800571 +0.944964480878 -0.228049579604 +0.951941900244 -0.213889033855 +0.958468814096 -0.199515278866 +0.964538716264 -0.184942642708 +0.970145556136 -0.170185651702 +0.975283744694 -0.155259015937 +0.979948160078 -0.140177614609 +0.984134152699 -0.124956481185 +0.987837549868 -0.109610788424 +0.991054659957 -0.0941558332449 +0.993782276083 -0.0786070214836 +0.996017679297 -0.0629798525339 +0.997758641301 -0.0472899038974 +0.999003426666 -0.0315528156563 +0.999750794563 -0.0157842748824 +1.0 0.0 \ No newline at end of file diff --git a/code/5MW_AFFiles/Cylinder1.dat b/code/5MW_AFFiles/Cylinder1.dat new file mode 100644 index 0000000..7b0a66b --- /dev/null +++ b/code/5MW_AFFiles/Cylinder1.dat @@ -0,0 +1,17 @@ +Round root section with a Cd of 0.50 +Made by Jason Jonkman +one more line + 1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 0.0 Stall angle (deg) + 0.0 Zero lift angle of attack (deg) + 0.0 Cn slope for zero lift (dimensionless) + 0.0 Cn at stall value for positive angle of attack + 0.0 Cn at stall value for negative angle of attack + 0.0 Angle of attack for minimum CD (deg) + 0.50 Minimum CD value +-180.00 0.000 0.5000 0.000 + 0.00 0.000 0.5000 0.000 + 180.00 0.000 0.5000 0.000 +EOT diff --git a/code/5MW_AFFiles/Cylinder2.dat b/code/5MW_AFFiles/Cylinder2.dat new file mode 100644 index 0000000..5937180 --- /dev/null +++ b/code/5MW_AFFiles/Cylinder2.dat @@ -0,0 +1,18 @@ +Round root section with a Cd of 0.35 +Made by Jason Jonkman +line + 1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 0.0 Stall angle (deg) + 0.0 Zero lift angle of attack (deg) + 0.0 Cn slope for zero lift (dimensionless) + 0.0 Cn at stall value for positive angle of attack + 0.0 Cn at stall value for negative angle of attack + 0.0 Angle of attack for minimum CD (deg) + 0.35 Minimum CD value +-180.00 0.000 0.3500 0.000 + 0.00 0.000 0.3500 0.000 + 180.00 0.000 0.3500 0.000 +EOT + diff --git a/code/5MW_AFFiles/DU21_A17.dat b/code/5MW_AFFiles/DU21_A17.dat new file mode 100644 index 0000000..bf77268 --- /dev/null +++ b/code/5MW_AFFiles/DU21_A17.dat @@ -0,0 +1,154 @@ +DU21 airfoil with an aspect ratio of 17. Original -180 to 180deg Cl, Cd, and Cm versus AOA data taken from Appendix A of DOWEC document 10046_009.pdf (numerical values obtained from Koert Lindenburg of ECN). +Cl and Cd values corrected for rotational stall delay and Cd values corrected using the Viterna method for 0 to 90deg AOA by Jason Jonkman using AirfoilPrep_v2p0.xls. +one more line +1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 8.0 Stall angle (deg) + -5.0609 Zero lift angle of attack (deg) + 6.2047 Cn slope for zero lift (dimensionless) + 1.4144 Cn at stall value for positive angle of attack + -0.5324 Cn at stall value for negative angle of attack + -1.50 Angle of attack for minimum CD (deg) + 0.0057 Minimum CD value +-180.00 0.000 0.0185 0.0000 +-175.00 0.394 0.0332 0.1978 +-160.00 0.670 0.2809 0.2738 +-155.00 0.749 0.3932 0.3118 +-150.00 0.797 0.5112 0.3413 +-145.00 0.818 0.6309 0.3636 +-140.00 0.813 0.7485 0.3799 +-135.00 0.786 0.8612 0.3911 +-130.00 0.739 0.9665 0.3980 +-125.00 0.675 1.0625 0.4012 +-120.00 0.596 1.1476 0.4014 +-115.00 0.505 1.2206 0.3990 +-110.00 0.403 1.2805 0.3943 +-105.00 0.294 1.3265 0.3878 +-100.00 0.179 1.3582 0.3796 + -95.00 0.060 1.3752 0.3700 + -90.00 -0.060 1.3774 0.3591 + -85.00 -0.179 1.3648 0.3471 + -80.00 -0.295 1.3376 0.3340 + -75.00 -0.407 1.2962 0.3199 + -70.00 -0.512 1.2409 0.3049 + -65.00 -0.608 1.1725 0.2890 + -60.00 -0.693 1.0919 0.2722 + -55.00 -0.764 1.0002 0.2545 + -50.00 -0.820 0.8990 0.2359 + -45.00 -0.857 0.7900 0.2163 + -40.00 -0.875 0.6754 0.1958 + -35.00 -0.869 0.5579 0.1744 + -30.00 -0.838 0.4405 0.1520 + -25.00 -0.791 0.3256 0.1262 + -24.00 -0.794 0.3013 0.1170 + -23.00 -0.805 0.2762 0.1059 + -22.00 -0.821 0.2506 0.0931 + -21.00 -0.843 0.2246 0.0788 + -20.00 -0.869 0.1983 0.0631 + -19.00 -0.899 0.1720 0.0464 + -18.00 -0.931 0.1457 0.0286 + -17.00 -0.964 0.1197 0.0102 + -16.00 -0.999 0.0940 -0.0088 + -15.00 -1.033 0.0689 -0.0281 + -14.50 -1.050 0.0567 -0.0378 + -12.01 -0.953 0.0271 -0.0349 + -11.00 -0.900 0.0303 -0.0361 + -9.98 -0.827 0.0287 -0.0464 + -8.12 -0.536 0.0124 -0.0821 + -7.62 -0.467 0.0109 -0.0924 + -7.11 -0.393 0.0092 -0.1015 + -6.60 -0.323 0.0083 -0.1073 + -6.50 -0.311 0.0089 -0.1083 + -6.00 -0.245 0.0082 -0.1112 + -5.50 -0.178 0.0074 -0.1146 + -5.00 -0.113 0.0069 -0.1172 + -4.50 -0.048 0.0065 -0.1194 + -4.00 0.016 0.0063 -0.1213 + -3.50 0.080 0.0061 -0.1232 + -3.00 0.145 0.0058 -0.1252 + -2.50 0.208 0.0057 -0.1268 + -2.00 0.270 0.0057 -0.1282 + -1.50 0.333 0.0057 -0.1297 + -1.00 0.396 0.0057 -0.1310 + -0.50 0.458 0.0057 -0.1324 + 0.00 0.521 0.0057 -0.1337 + 0.50 0.583 0.0057 -0.1350 + 1.00 0.645 0.0058 -0.1363 + 1.50 0.706 0.0058 -0.1374 + 2.00 0.768 0.0059 -0.1385 + 2.50 0.828 0.0061 -0.1395 + 3.00 0.888 0.0063 -0.1403 + 3.50 0.948 0.0066 -0.1406 + 4.00 0.996 0.0071 -0.1398 + 4.50 1.046 0.0079 -0.1390 + 5.00 1.095 0.0090 -0.1378 + 5.50 1.145 0.0103 -0.1369 + 6.00 1.192 0.0113 -0.1353 + 6.50 1.239 0.0122 -0.1338 + 7.00 1.283 0.0131 -0.1317 + 7.50 1.324 0.0139 -0.1291 + 8.00 1.358 0.0147 -0.1249 + 8.50 1.385 0.0158 -0.1213 + 9.00 1.403 0.0181 -0.1177 + 9.50 1.401 0.0211 -0.1142 + 10.00 1.358 0.0255 -0.1103 + 10.50 1.313 0.0301 -0.1066 + 11.00 1.287 0.0347 -0.1032 + 11.50 1.274 0.0401 -0.1002 + 12.00 1.272 0.0468 -0.0971 + 12.50 1.273 0.0545 -0.0940 + 13.00 1.273 0.0633 -0.0909 + 13.50 1.273 0.0722 -0.0883 + 14.00 1.272 0.0806 -0.0865 + 14.50 1.273 0.0900 -0.0854 + 15.00 1.275 0.0987 -0.0849 + 15.50 1.281 0.1075 -0.0847 + 16.00 1.284 0.1170 -0.0850 + 16.50 1.296 0.1270 -0.0858 + 17.00 1.306 0.1368 -0.0869 + 17.50 1.308 0.1464 -0.0883 + 18.00 1.308 0.1562 -0.0901 + 18.50 1.308 0.1664 -0.0922 + 19.00 1.308 0.1770 -0.0949 + 19.50 1.307 0.1878 -0.0980 + 20.00 1.311 0.1987 -0.1017 + 20.50 1.325 0.2100 -0.1059 + 21.00 1.324 0.2214 -0.1105 + 22.00 1.277 0.2499 -0.1172 + 23.00 1.229 0.2786 -0.1239 + 24.00 1.182 0.3077 -0.1305 + 25.00 1.136 0.3371 -0.1370 + 26.00 1.093 0.3664 -0.1433 + 28.00 1.017 0.4246 -0.1556 + 30.00 0.962 0.4813 -0.1671 + 32.00 0.937 0.5356 -0.1778 + 35.00 0.947 0.6127 -0.1923 + 40.00 0.950 0.7396 -0.2154 + 45.00 0.928 0.8623 -0.2374 + 50.00 0.884 0.9781 -0.2583 + 55.00 0.821 1.0846 -0.2782 + 60.00 0.740 1.1796 -0.2971 + 65.00 0.646 1.2617 -0.3149 + 70.00 0.540 1.3297 -0.3318 + 75.00 0.425 1.3827 -0.3476 + 80.00 0.304 1.4202 -0.3625 + 85.00 0.179 1.4423 -0.3763 + 90.00 0.053 1.4512 -0.3890 + 95.00 -0.073 1.4480 -0.4004 + 100.00 -0.198 1.4294 -0.4105 + 105.00 -0.319 1.3954 -0.4191 + 110.00 -0.434 1.3464 -0.4260 + 115.00 -0.541 1.2829 -0.4308 + 120.00 -0.637 1.2057 -0.4333 + 125.00 -0.720 1.1157 -0.4330 + 130.00 -0.787 1.0144 -0.4294 + 135.00 -0.836 0.9033 -0.4219 + 140.00 -0.864 0.7845 -0.4098 + 145.00 -0.869 0.6605 -0.3922 + 150.00 -0.847 0.5346 -0.3682 + 155.00 -0.795 0.4103 -0.3364 + 160.00 -0.711 0.2922 -0.2954 + 175.00 -0.394 0.0334 -0.1978 + 180.00 0.000 0.0185 0.0000 +EOT diff --git a/code/5MW_AFFiles/DU21_A17.pfl b/code/5MW_AFFiles/DU21_A17.pfl new file mode 100644 index 0000000..53cbcb8 --- /dev/null +++ b/code/5MW_AFFiles/DU21_A17.pfl @@ -0,0 +1,401 @@ +DU 93-W-210.lm +x/c y/c +1 0.001939 +0.9966 0.003036 +0.99314 0.004112 +0.98961 0.005156 +0.98601 0.006177 +0.98235 0.007196 +0.97863 0.008227 +0.97484 0.009271 +0.97098 0.010325 +0.96706 0.011386 +0.96307 0.012458 +0.95902 0.013536 +0.9549 0.014626 +0.95072 0.015727 +0.94647 0.016844 +0.94216 0.01797 +0.93778 0.019107 +0.93333 0.020259 +0.92882 0.021423 +0.92425 0.022599 +0.91961 0.023788 +0.9149 0.024994 +0.91013 0.026213 +0.90529 0.027444 +0.90039 0.028688 +0.89542 0.029946 +0.89039 0.031215 +0.88529 0.032498 +0.88013 0.033793 +0.8749 0.035103 +0.86961 0.036426 +0.86425 0.037763 +0.85882 0.039117 +0.85333 0.040484 +0.84778 0.041863 +0.84216 0.043257 +0.83647 0.044664 +0.83072 0.046083 +0.8249 0.047516 +0.81902 0.048959 +0.81307 0.050414 +0.80706 0.051879 +0.80098 0.053355 +0.79484 0.05484 +0.78863 0.056336 +0.78235 0.057843 +0.77601 0.059358 +0.76961 0.060882 +0.76314 0.062415 +0.7566 0.063956 +0.75 0.065502 +0.74333 0.067056 +0.73667 0.068601 +0.73 0.070141 +0.72333 0.071674 +0.71667 0.0732 +0.71 0.074721 +0.70333 0.076235 +0.69667 0.077739 +0.69 0.079235 +0.68333 0.080721 +0.67667 0.082195 +0.67 0.083659 +0.66333 0.085113 +0.65667 0.086553 +0.65 0.087983 +0.64333 0.089402 +0.63667 0.090804 +0.63 0.092195 +0.62333 0.093569 +0.61667 0.094923 +0.61 0.096264 +0.60333 0.097585 +0.59667 0.098886 +0.59 0.100168 +0.58333 0.10143 +0.57667 0.10267 +0.57 0.103893 +0.56333 0.105091 +0.55667 0.106266 +0.55 0.107415 +0.54333 0.108541 +0.53667 0.109639 +0.529999 0.11071 +0.52333 0.111754 +0.51667 0.112767 +0.51 0.113751 +0.50333 0.114704 +0.49667 0.115618 +0.49 0.116497 +0.48333 0.117336 +0.47667 0.118133 +0.470001 0.118887 +0.46333 0.119599 +0.45667 0.120266 +0.45 0.120889 +0.44333 0.121467 +0.43667 0.121999 +0.43 0.122487 +0.42333 0.122924 +0.41667 0.123312 +0.41 0.12365 +0.40333 0.123938 +0.39667 0.124175 +0.39 0.12436 +0.38333 0.12449 +0.37667 0.124565 +0.37 0.124586 +0.36333 0.124551 +0.35667 0.124458 +0.35 0.12431 +0.34333 0.124106 +0.33667 0.123848 +0.33 0.123534 +0.32333 0.123168 +0.31667 0.122749 +0.31 0.122276 +0.30333 0.121748 +0.29667 0.121168 +0.29 0.120531 +0.28333 0.119839 +0.276671 0.119095 +0.27 0.118294 +0.26333 0.11744 +0.25667 0.116531 +0.25 0.115566 +0.24342 0.114559 +0.23693 0.113512 +0.23053 0.112428 +0.22421 0.111304 +0.21798 0.110147 +0.21184 0.108956 +0.20579 0.107734 +0.19982 0.10648 +0.19395 0.105199 +0.18816 0.103889 +0.18245 0.102549 +0.17684 0.101187 +0.17131 0.099799 +0.16587 0.098389 +0.16052 0.096958 +0.15526 0.095504 +0.15008 0.09403 +0.14499 0.092538 +0.13999 0.09103 +0.13508 0.089503 +0.13026 0.087963 +0.12552 0.086405 +0.12087 0.084833 +0.11631 0.083249 +0.11183 0.08165 +0.10745 0.080044 +0.10315 0.078425 +0.09893 0.076794 +0.09481 0.075159 +0.09077 0.073511 +0.08683 0.071863 +0.08297 0.070207 +0.079191 0.068541 +0.07551 0.066874 +0.07191 0.065202 +0.0684 0.063529 +0.06498 0.061853 +0.06164 0.060173 +0.0584 0.058501 +0.05524 0.056824 +0.05217 0.055151 +0.04918 0.053476 +0.04629 0.051811 +0.04348 0.050145 +0.04076 0.048487 +0.03812 0.046832 +0.03558 0.045193 +0.03312 0.043559 +0.03075 0.041938 +0.02847 0.040333 +0.02627 0.038736 +0.02417 0.037163 +0.02215 0.035596 +0.02022 0.034039 +0.01837 0.032485 +0.01662 0.030943 +0.01495 0.029395 +0.01337 0.02785 +0.01187 0.0263 +0.01047 0.024763 +0.00915 0.023224 +0.00792 0.021692 +0.00678 0.020167 +0.00572 0.018638 +0.00476 0.017133 +0.00388 0.01562 +0.00309 0.014102 +0.00238 0.012534 +0.00177 0.010942 +0.00124 0.009227 +0.0008 0.007396 +0.00044 0.005366 +0.00018 0.003327 +0 0 +0.00018 -0.002918 +0.00044 -0.004434 +0.0008 -0.005885 +0.00124 -0.007266 +0.00177 -0.008641 +0.00238 -0.009983 +0.00309 -0.011337 +0.00388 -0.012657 +0.00476 -0.01397 +0.00572 -0.015262 +0.00678 -0.016563 +0.00792 -0.017849 +0.00915 -0.019142 +0.01047 -0.02044 +0.01187 -0.021737 +0.01337 -0.023057 +0.01495 -0.024377 +0.01662 -0.02571 +0.01837 -0.027049 +0.02022 -0.028405 +0.02215 -0.029762 +0.02417 -0.031124 +0.02627 -0.03248 +0.02847 -0.033844 +0.03075 -0.035199 +0.03312 -0.036549 +0.03558 -0.037894 +0.03812 -0.039227 +0.04076 -0.040558 +0.04348 -0.041878 +0.04629 -0.043192 +0.04918 -0.044494 +0.05217 -0.045791 +0.05524 -0.047078 +0.0584 -0.048359 +0.06164 -0.049627 +0.06498 -0.050893 +0.0684 -0.052148 +0.07191 -0.053397 +0.07551 -0.054638 +0.07919 -0.055868 +0.08297 -0.057094 +0.08683 -0.058308 +0.09077 -0.05951 +0.09481 -0.060706 +0.09893 -0.061888 +0.10315 -0.063061 +0.10745 -0.064218 +0.11183 -0.065357 +0.11631 -0.066483 +0.12087 -0.067589 +0.12552 -0.068676 +0.13026 -0.069746 +0.13508 -0.070793 +0.13999 -0.071818 +0.14499 -0.072822 +0.15008 -0.073801 +0.15526 -0.074756 +0.16052 -0.075683 +0.16587 -0.076583 +0.17131 -0.077456 +0.17684 -0.078299 +0.18245 -0.07911 +0.18816 -0.079888 +0.19395 -0.08063 +0.19982 -0.081337 +0.20579 -0.082009 +0.21184 -0.082644 +0.21798 -0.083242 +0.22421 -0.0838 +0.23053 -0.084316 +0.23693 -0.084792 +0.24342 -0.085225 +0.25 -0.085613 +0.25667 -0.085953 +0.26333 -0.086241 +0.27 -0.08648 +0.27667 -0.086667 +0.28333 -0.086804 +0.29 -0.086893 +0.29667 -0.086932 +0.30333 -0.086922 +0.31 -0.086863 +0.31667 -0.086756 +0.32333 -0.086602 +0.33 -0.0864 +0.33667 -0.086153 +0.34333 -0.085862 +0.35 -0.085528 +0.35667 -0.08515 +0.36333 -0.08473 +0.37 -0.084267 +0.37667 -0.083762 +0.38333 -0.083216 +0.39 -0.08263 +0.39667 -0.082002 +0.40333 -0.081335 +0.41 -0.080623 +0.41667 -0.079871 +0.42333 -0.079079 +0.43 -0.078242 +0.43667 -0.077361 +0.44333 -0.076441 +0.45 -0.075478 +0.45667 -0.074475 +0.46333 -0.07343 +0.47 -0.072345 +0.47667 -0.071221 +0.48333 -0.070061 +0.49 -0.068863 +0.49667 -0.06763 +0.50333 -0.066364 +0.51 -0.065062 +0.51667 -0.063728 +0.52333 -0.062365 +0.53 -0.06097 +0.53667 -0.05955 +0.54333 -0.058103 +0.55 -0.05663 +0.55667 -0.055131 +0.56333 -0.053611 +0.57 -0.052067 +0.57667 -0.050504 +0.58333 -0.048924 +0.59 -0.047323 +0.596669 -0.045706 +0.60333 -0.044077 +0.61 -0.042432 +0.61667 -0.040776 +0.62333 -0.039113 +0.63 -0.037441 +0.63667 -0.035763 +0.64333 -0.034086 +0.65 -0.032405 +0.65667 -0.030727 +0.66333 -0.029057 +0.67 -0.027395 +0.67667 -0.025743 +0.68333 -0.024106 +0.69 -0.022483 +0.69667 -0.020878 +0.70333 -0.019296 +0.71 -0.017736 +0.71667 -0.016201 +0.72333 -0.014699 +0.73 -0.013225 +0.73667 -0.011788 +0.74333 -0.010388 +0.75 -0.009027 +0.7566 -0.007721 +0.76314 -0.006473 +0.76961 -0.005284 +0.77601 -0.004155 +0.78235 -0.003084 +0.78863 -0.002072 +0.79484 -0.001122 +0.80098 -0.000233 +0.80706 0.000596 +0.81307 0.001364 +0.81902 0.002074 +0.8249 0.002728 +0.83072 0.003326 +0.83647 0.003866 +0.84216 0.004352 +0.84778 0.004786 +0.85333 0.005168 +0.85882 0.005499 +0.86425 0.005781 +0.86961 0.006012 +0.8749 0.006195 +0.88013 0.006333 +0.88529 0.006426 +0.89039 0.006478 +0.89542 0.006488 +0.90039 0.006457 +0.90529 0.006385 +0.91013 0.006277 +0.9149 0.006132 +0.91961 0.005952 +0.92425 0.005742 +0.92882 0.005502 +0.93333 0.005233 +0.93778 0.004938 +0.94216 0.00462 +0.94647 0.004281 +0.95072 0.003923 +0.9549 0.003547 +0.95902 0.003154 +0.96307 0.002747 +0.96706 0.002326 +0.97098 0.001892 +0.97484 0.001446 +0.97863 0.00099 +0.98235 0.000525 +0.98601 0.000048 +0.98961 -0.00044 +0.99314 -0.000935 +0.9966 -0.001433 +1 -0.001939 \ No newline at end of file diff --git a/code/5MW_AFFiles/DU25_A17.dat b/code/5MW_AFFiles/DU25_A17.dat new file mode 100644 index 0000000..3be2e0c --- /dev/null +++ b/code/5MW_AFFiles/DU25_A17.dat @@ -0,0 +1,154 @@ +DU25 airfoil with an aspect ratio of 17. Original -180 to 180deg Cl, Cd, and Cm versus AOA data taken from Appendix A of DOWEC document 10046_009.pdf (numerical values obtained from Koert Lindenburg of ECN). +Cl and Cd values corrected for rotational stall delay and Cd values corrected using the Viterna method for 0 to 90deg AOA by Jason Jonkman using AirfoilPrep_v2p0.xls. +line +1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 8.50 Stall angle (deg) + -4.2422 Zero Cn angle of attack (deg) + 6.4462 Cn slope for zero lift (dimensionless) + 1.4336 Cn extrapolated to value at positive stall angle of attack + -0.6873 Cn at stall value for negative angle of attack + 0.00 Angle of attack for minimum CD (deg) + 0.0065 Minimum CD value +-180.00 0.000 0.0202 0.0000 +-175.00 0.368 0.0324 0.1845 +-170.00 0.735 0.0943 0.3701 +-160.00 0.695 0.2848 0.2679 +-155.00 0.777 0.4001 0.3046 +-150.00 0.828 0.5215 0.3329 +-145.00 0.850 0.6447 0.3540 +-140.00 0.846 0.7660 0.3693 +-135.00 0.818 0.8823 0.3794 +-130.00 0.771 0.9911 0.3854 +-125.00 0.705 1.0905 0.3878 +-120.00 0.624 1.1787 0.3872 +-115.00 0.530 1.2545 0.3841 +-110.00 0.426 1.3168 0.3788 +-105.00 0.314 1.3650 0.3716 +-100.00 0.195 1.3984 0.3629 + -95.00 0.073 1.4169 0.3529 + -90.00 -0.050 1.4201 0.3416 + -85.00 -0.173 1.4081 0.3292 + -80.00 -0.294 1.3811 0.3159 + -75.00 -0.409 1.3394 0.3017 + -70.00 -0.518 1.2833 0.2866 + -65.00 -0.617 1.2138 0.2707 + -60.00 -0.706 1.1315 0.2539 + -55.00 -0.780 1.0378 0.2364 + -50.00 -0.839 0.9341 0.2181 + -45.00 -0.879 0.8221 0.1991 + -40.00 -0.898 0.7042 0.1792 + -35.00 -0.893 0.5829 0.1587 + -30.00 -0.862 0.4616 0.1374 + -25.00 -0.803 0.3441 0.1154 + -24.00 -0.792 0.3209 0.1101 + -23.00 -0.789 0.2972 0.1031 + -22.00 -0.792 0.2730 0.0947 + -21.00 -0.801 0.2485 0.0849 + -20.00 -0.815 0.2237 0.0739 + -19.00 -0.833 0.1990 0.0618 + -18.00 -0.854 0.1743 0.0488 + -17.00 -0.879 0.1498 0.0351 + -16.00 -0.905 0.1256 0.0208 + -15.00 -0.932 0.1020 0.0060 + -14.00 -0.959 0.0789 -0.0091 + -13.00 -0.985 0.0567 -0.0243 + -12.01 -0.953 0.0271 -0.0349 + -11.00 -0.900 0.0303 -0.0361 + -9.98 -0.827 0.0287 -0.0464 + -8.98 -0.753 0.0271 -0.0534 + -8.47 -0.691 0.0264 -0.0650 + -7.45 -0.555 0.0114 -0.0782 + -6.42 -0.413 0.0094 -0.0904 + -5.40 -0.271 0.0086 -0.1006 + -5.00 -0.220 0.0073 -0.1107 + -4.50 -0.152 0.0071 -0.1135 + -4.00 -0.084 0.0070 -0.1162 + -3.50 -0.018 0.0069 -0.1186 + -3.00 0.049 0.0068 -0.1209 + -2.50 0.115 0.0068 -0.1231 + -2.00 0.181 0.0068 -0.1252 + -1.50 0.247 0.0067 -0.1272 + -1.00 0.312 0.0067 -0.1293 + -0.50 0.377 0.0067 -0.1311 + 0.00 0.444 0.0065 -0.1330 + 0.50 0.508 0.0065 -0.1347 + 1.00 0.573 0.0066 -0.1364 + 1.50 0.636 0.0067 -0.1380 + 2.00 0.701 0.0068 -0.1396 + 2.50 0.765 0.0069 -0.1411 + 3.00 0.827 0.0070 -0.1424 + 3.50 0.890 0.0071 -0.1437 + 4.00 0.952 0.0073 -0.1448 + 4.50 1.013 0.0076 -0.1456 + 5.00 1.062 0.0079 -0.1445 + 6.00 1.161 0.0099 -0.1419 + 6.50 1.208 0.0117 -0.1403 + 7.00 1.254 0.0132 -0.1382 + 7.50 1.301 0.0143 -0.1362 + 8.00 1.336 0.0153 -0.1320 + 8.50 1.369 0.0165 -0.1276 + 9.00 1.400 0.0181 -0.1234 + 9.50 1.428 0.0211 -0.1193 + 10.00 1.442 0.0262 -0.1152 + 10.50 1.427 0.0336 -0.1115 + 11.00 1.374 0.0420 -0.1081 + 11.50 1.316 0.0515 -0.1052 + 12.00 1.277 0.0601 -0.1026 + 12.50 1.250 0.0693 -0.1000 + 13.00 1.246 0.0785 -0.0980 + 13.50 1.247 0.0888 -0.0969 + 14.00 1.256 0.1000 -0.0968 + 14.50 1.260 0.1108 -0.0973 + 15.00 1.271 0.1219 -0.0981 + 15.50 1.281 0.1325 -0.0992 + 16.00 1.289 0.1433 -0.1006 + 16.50 1.294 0.1541 -0.1023 + 17.00 1.304 0.1649 -0.1042 + 17.50 1.309 0.1754 -0.1064 + 18.00 1.315 0.1845 -0.1082 + 18.50 1.320 0.1953 -0.1110 + 19.00 1.330 0.2061 -0.1143 + 19.50 1.343 0.2170 -0.1179 + 20.00 1.354 0.2280 -0.1219 + 20.50 1.359 0.2390 -0.1261 + 21.00 1.360 0.2536 -0.1303 + 22.00 1.325 0.2814 -0.1375 + 23.00 1.288 0.3098 -0.1446 + 24.00 1.251 0.3386 -0.1515 + 25.00 1.215 0.3678 -0.1584 + 26.00 1.181 0.3972 -0.1651 + 28.00 1.120 0.4563 -0.1781 + 30.00 1.076 0.5149 -0.1904 + 32.00 1.056 0.5720 -0.2017 + 35.00 1.066 0.6548 -0.2173 + 40.00 1.064 0.7901 -0.2418 + 45.00 1.035 0.9190 -0.2650 + 50.00 0.980 1.0378 -0.2867 + 55.00 0.904 1.1434 -0.3072 + 60.00 0.810 1.2333 -0.3265 + 65.00 0.702 1.3055 -0.3446 + 70.00 0.582 1.3587 -0.3616 + 75.00 0.456 1.3922 -0.3775 + 80.00 0.326 1.4063 -0.3921 + 85.00 0.197 1.4042 -0.4057 + 90.00 0.072 1.3985 -0.4180 + 95.00 -0.050 1.3973 -0.4289 + 100.00 -0.170 1.3810 -0.4385 + 105.00 -0.287 1.3498 -0.4464 + 110.00 -0.399 1.3041 -0.4524 + 115.00 -0.502 1.2442 -0.4563 + 120.00 -0.596 1.1709 -0.4577 + 125.00 -0.677 1.0852 -0.4563 + 130.00 -0.743 0.9883 -0.4514 + 135.00 -0.792 0.8818 -0.4425 + 140.00 -0.821 0.7676 -0.4288 + 145.00 -0.826 0.6481 -0.4095 + 150.00 -0.806 0.5264 -0.3836 + 155.00 -0.758 0.4060 -0.3497 + 160.00 -0.679 0.2912 -0.3065 + 170.00 -0.735 0.0995 -0.3706 + 175.00 -0.368 0.0356 -0.1846 + 180.00 0.000 0.0202 0.0000 +EOT diff --git a/code/5MW_AFFiles/DU25_A17.pfl b/code/5MW_AFFiles/DU25_A17.pfl new file mode 100644 index 0000000..92fe957 --- /dev/null +++ b/code/5MW_AFFiles/DU25_A17.pfl @@ -0,0 +1,401 @@ +DU 91-W2-250.lm +x/c y/c +1 0.002131 +0.9966 0.003137 +0.99314 0.004139 +0.98961 0.005151 +0.98601 0.006171 +0.98235 0.007196 +0.97863 0.008224 +0.97484 0.009259 +0.97098 0.010301 +0.96706 0.011348 +0.963069 0.012403 +0.95902 0.013465 +0.954901 0.014539 +0.95072 0.015622 +0.94647 0.016719 +0.94216 0.017829 +0.93778 0.018954 +0.93333 0.020093 +0.92882 0.021245 +0.92425 0.02241 +0.91961 0.02359 +0.9149 0.024787 +0.91013 0.025997 +0.90529 0.027224 +0.90039 0.028464 +0.89542 0.029719 +0.89039 0.030989 +0.88529 0.032274 +0.88013 0.033572 +0.8749 0.034887 +0.86961 0.036215 +0.86425 0.037558 +0.85882 0.038915 +0.85333 0.040285 +0.84778 0.041666 +0.84216 0.04306 +0.83647 0.044467 +0.83072 0.045886 +0.8249 0.047319 +0.81902 0.048765 +0.81307 0.050226 +0.80706 0.051699 +0.80098 0.053185 +0.79484 0.054682 +0.78863 0.056193 +0.78235 0.057714 +0.77601 0.059245 +0.76961 0.060782 +0.76314 0.062328 +0.7566 0.063883 +0.75 0.065444 +0.74333 0.067014 +0.73667 0.068573 +0.73 0.070128 +0.72333 0.071676 +0.71667 0.073216 +0.71 0.074751 +0.70333 0.076276 +0.69667 0.077791 +0.69 0.079299 +0.68333 0.080795 +0.67667 0.082279 +0.67 0.083754 +0.66333 0.085217 +0.65667 0.086666 +0.65 0.088103 +0.64333 0.089527 +0.63667 0.090934 +0.63 0.092328 +0.62333 0.093708 +0.61667 0.095071 +0.61 0.096418 +0.60333 0.097748 +0.59667 0.099058 +0.59 0.100353 +0.58333 0.101632 +0.57667 0.10289 +0.57 0.10413 +0.56333 0.105351 +0.55667 0.106549 +0.55 0.107728 +0.54333 0.108883 +0.53667 0.110014 +0.53 0.111124 +0.52333 0.112209 +0.51667 0.113266 +0.51 0.114297 +0.50333 0.115302 +0.49667 0.116279 +0.49 0.117228 +0.48333 0.118151 +0.47667 0.119044 +0.47 0.119909 +0.46333 0.120742 +0.45667 0.12154 +0.45 0.122304 +0.44333 0.12303 +0.43667 0.123717 +0.43 0.124364 +0.42333 0.124971 +0.41667 0.125536 +0.409999 0.126062 +0.40333 0.126545 +0.39667 0.126985 +0.39 0.127382 +0.38333 0.127732 +0.37667 0.128032 +0.37 0.128276 +0.36333 0.128462 +0.35667 0.128582 +0.35 0.128635 +0.34333 0.128618 +0.33667 0.128532 +0.33 0.128374 +0.32333 0.128147 +0.31667 0.12785 +0.31 0.127486 +0.30333 0.127054 +0.29667 0.12656 +0.29 0.126 +0.28333 0.125376 +0.27667 0.124688 +0.27 0.123936 +0.26333 0.12312 +0.25667 0.122242 +0.25 0.121298 +0.24342 0.120303 +0.23693 0.119261 +0.23053 0.118173 +0.22421 0.117039 +0.21798 0.115863 +0.21184 0.114648 +0.20579 0.113395 +0.19982 0.112103 +0.19395 0.110779 +0.18816 0.109419 +0.18245 0.108025 +0.17684 0.106604 +0.17131 0.105151 +0.16587 0.103672 +0.16052 0.102168 +0.15526 0.100639 +0.15008 0.099085 +0.14499 0.097509 +0.13999 0.095913 +0.13508 0.094297 +0.13026 0.092663 +0.12552 0.091008 +0.12087 0.089336 +0.11631 0.087651 +0.11183 0.085948 +0.10745 0.084235 +0.10315 0.082507 +0.09893 0.080764 +0.09481 0.079015 +0.09077 0.077252 +0.08683 0.075487 +0.08297 0.07371 +0.07919 0.071922 +0.07551 0.070134 +0.07191 0.068338 +0.0684 0.066539 +0.06498 0.064738 +0.06164 0.062932 +0.0584 0.061132 +0.05524 0.059329 +0.05217 0.057528 +0.04918 0.055726 +0.04629 0.053932 +0.04348 0.052137 +0.04076 0.050349 +0.03812 0.048561 +0.03558 0.046787 +0.03312 0.045017 +0.03075 0.043257 +0.02847 0.041508 +0.02627 0.039764 +0.02417 0.03804 +0.02215 0.036323 +0.02022 0.034622 +0.01837 0.032929 +0.01662 0.031264 +0.01495 0.029608 +0.01337 0.027973 +0.01187 0.026346 +0.01047 0.024753 +0.00915 0.023169 +0.00792 0.021609 +0.00678 0.020072 +0.00572 0.018547 +0.00476 0.017056 +0.00388 0.015569 +0.00309 0.014094 +0.00238 0.012606 +0.00177 0.011096 +0.00124 0.009445 +0.0008 0.007656 +0.00044 0.005684 +0.00018 0.003633 +0 0 +0.00018 -0.003603 +0.00044 -0.005719 +0.0008 -0.007777 +0.00124 -0.009743 +0.00177 -0.011687 +0.00238 -0.013586 +0.00309 -0.015492 +0.00388 -0.017358 +0.00476 -0.019211 +0.00572 -0.021038 +0.00678 -0.022879 +0.00792 -0.024696 +0.00915 -0.026518 +0.01047 -0.028351 +0.01187 -0.030188 +0.01337 -0.032053 +0.01495 -0.033921 +0.01662 -0.035805 +0.01837 -0.037695 +0.02022 -0.039609 +0.02215 -0.041525 +0.02417 -0.043449 +0.02627 -0.045367 +0.02847 -0.047295 +0.03075 -0.049209 +0.03312 -0.051119 +0.03558 -0.053021 +0.03812 -0.054906 +0.04076 -0.056788 +0.04348 -0.058651 +0.04629 -0.060506 +0.04918 -0.062343 +0.05217 -0.064177 +0.05524 -0.065996 +0.0584 -0.067804 +0.06164 -0.069599 +0.06498 -0.071387 +0.0684 -0.07316 +0.07191 -0.074924 +0.07551 -0.076677 +0.07919 -0.078415 +0.08297 -0.080148 +0.08683 -0.081864 +0.09077 -0.083564 +0.09481 -0.085254 +0.09893 -0.086924 +0.10315 -0.088581 +0.10745 -0.090215 +0.11183 -0.091823 +0.11631 -0.093415 +0.12087 -0.094979 +0.12552 -0.096517 +0.13026 -0.098028 +0.13508 -0.099506 +0.13999 -0.100954 +0.14499 -0.102371 +0.15008 -0.103755 +0.155259 -0.105105 +0.16052 -0.106416 +0.16587 -0.10769 +0.17131 -0.108923 +0.17684 -0.110114 +0.18245 -0.111258 +0.18816 -0.112358 +0.19395 -0.113408 +0.19982 -0.114407 +0.20579 -0.115358 +0.21184 -0.116255 +0.21798 -0.117099 +0.22421 -0.117887 +0.23053 -0.118618 +0.23693 -0.11929 +0.24342 -0.119902 +0.25 -0.120452 +0.25667 -0.120935 +0.26333 -0.121345 +0.27 -0.121683 +0.27667 -0.121948 +0.28333 -0.122142 +0.29 -0.122266 +0.29667 -0.12232 +0.30333 -0.122305 +0.31 -0.122222 +0.31667 -0.122073 +0.32333 -0.121856 +0.33 -0.121574 +0.33667 -0.121226 +0.34333 -0.120815 +0.35 -0.120342 +0.35667 -0.119809 +0.36333 -0.119217 +0.37 -0.118565 +0.37667 -0.117853 +0.38333 -0.117082 +0.39 -0.116253 +0.39667 -0.115366 +0.40333 -0.114423 +0.410001 -0.113421 +0.41667 -0.11236 +0.42333 -0.111238 +0.43 -0.110056 +0.43667 -0.108814 +0.44333 -0.107515 +0.45 -0.106154 +0.45667 -0.104736 +0.46333 -0.103264 +0.47 -0.101732 +0.47667 -0.100146 +0.48333 -0.098509 +0.49 -0.096818 +0.49667 -0.095075 +0.50333 -0.093286 +0.51 -0.091448 +0.51667 -0.089564 +0.523329 -0.087639 +0.53 -0.08567 +0.53667 -0.08366 +0.54333 -0.081615 +0.55 -0.079532 +0.55667 -0.077415 +0.56333 -0.075269 +0.57 -0.073089 +0.57667 -0.070879 +0.58333 -0.068647 +0.589999 -0.066385 +0.59667 -0.064101 +0.60333 -0.061798 +0.61 -0.059475 +0.61667 -0.057133 +0.62333 -0.054782 +0.63 -0.052417 +0.63667 -0.050045 +0.64333 -0.047673 +0.65 -0.0453 +0.65667 -0.04293 +0.66333 -0.040571 +0.67 -0.038219 +0.67667 -0.035883 +0.68333 -0.033569 +0.69 -0.031274 +0.69667 -0.029003 +0.70333 -0.026764 +0.71 -0.024555 +0.71667 -0.022384 +0.72333 -0.020258 +0.73 -0.018173 +0.73667 -0.016137 +0.74333 -0.014155 +0.75 -0.012226 +0.7566 -0.010378 +0.76314 -0.008608 +0.76961 -0.006923 +0.77601 -0.005324 +0.78235 -0.003807 +0.78863 -0.002375 +0.79484 -0.001027 +0.80098 0.000232 +0.80706 0.001409 +0.81307 0.002501 +0.819019 0.00351 +0.8249 0.004437 +0.83072 0.005286 +0.83647 0.006056 +0.84216 0.00675 +0.84778 0.007368 +0.85333 0.007912 +0.85882 0.008387 +0.86425 0.008792 +0.86961 0.009128 +0.8749 0.009399 +0.88013 0.009606 +0.88529 0.009749 +0.89039 0.009831 +0.89542 0.009853 +0.90039 0.009816 +0.90529 0.00972 +0.91013 0.00957 +0.9149 0.009364 +0.91961 0.009104 +0.92425 0.008796 +0.92882 0.00844 +0.93333 0.008039 +0.93778 0.007596 +0.94216 0.007115 +0.94647 0.006602 +0.95072 0.006059 +0.9549 0.005491 +0.95902 0.0049 +0.96307 0.004291 +0.96706 0.003666 +0.97098 0.00303 +0.97484 0.002384 +0.97863 0.001734 +0.98235 0.001083 +0.98601 0.000432 +0.98961 -0.000216 +0.99314 -0.000857 +0.9966 -0.001489 +1 -0.002131 \ No newline at end of file diff --git a/code/5MW_AFFiles/DU30_A17.dat b/code/5MW_AFFiles/DU30_A17.dat new file mode 100644 index 0000000..9ba3ff0 --- /dev/null +++ b/code/5MW_AFFiles/DU30_A17.dat @@ -0,0 +1,158 @@ +DU30 airfoil with an aspect ratio of 17. Original -180 to 180deg Cl, Cd, and Cm versus AOA data taken from Appendix A of DOWEC document 10046_009.pdf (numerical values obtained from Koert Lindenburg of ECN). +Cl and Cd values corrected for rotational stall delay and Cd values corrected using the Viterna method for 0 to 90deg AOA by Jason Jonkman using AirfoilPrep_v2p0.xls. +line +1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 9.00 Stall angle (deg) + -2.3220 Zero Cn angle of attack (deg) + 7.3326 Cn slope for zero lift (dimensionless) + 1.4490 Cn extrapolated to value at positive stall angle of attack + -0.6138 Cn at stall value for negative angle of attack + 0.00 Angle of attack for minimum CD (deg) + 0.0087 Minimum CD value +-180.00 0.000 0.0267 0.0000 +-175.00 0.274 0.0370 0.1379 +-170.00 0.547 0.0968 0.2778 +-160.00 0.685 0.2876 0.2740 +-155.00 0.766 0.4025 0.3118 +-150.00 0.816 0.5232 0.3411 +-145.00 0.836 0.6454 0.3631 +-140.00 0.832 0.7656 0.3791 +-135.00 0.804 0.8807 0.3899 +-130.00 0.756 0.9882 0.3965 +-125.00 0.690 1.0861 0.3994 +-120.00 0.609 1.1730 0.3992 +-115.00 0.515 1.2474 0.3964 +-110.00 0.411 1.3084 0.3915 +-105.00 0.300 1.3552 0.3846 +-100.00 0.182 1.3875 0.3761 + -95.00 0.061 1.4048 0.3663 + -90.00 -0.061 1.4070 0.3551 + -85.00 -0.183 1.3941 0.3428 + -80.00 -0.302 1.3664 0.3295 + -75.00 -0.416 1.3240 0.3153 + -70.00 -0.523 1.2676 0.3001 + -65.00 -0.622 1.1978 0.2841 + -60.00 -0.708 1.1156 0.2672 + -55.00 -0.781 1.0220 0.2494 + -50.00 -0.838 0.9187 0.2308 + -45.00 -0.877 0.8074 0.2113 + -40.00 -0.895 0.6904 0.1909 + -35.00 -0.889 0.5703 0.1696 + -30.00 -0.858 0.4503 0.1475 + -25.00 -0.832 0.3357 0.1224 + -24.00 -0.852 0.3147 0.1156 + -23.00 -0.882 0.2946 0.1081 + -22.00 -0.919 0.2752 0.1000 + -21.00 -0.963 0.2566 0.0914 + -20.00 -1.013 0.2388 0.0823 + -19.00 -1.067 0.2218 0.0728 + -18.00 -1.125 0.2056 0.0631 + -17.00 -1.185 0.1901 0.0531 + -16.00 -1.245 0.1754 0.0430 + -15.25 -1.290 0.1649 0.0353 + -14.24 -1.229 0.1461 0.0240 + -13.24 -1.148 0.1263 0.0100 + -12.22 -1.052 0.1051 -0.0090 + -11.22 -0.965 0.0886 -0.0230 + -10.19 -0.867 0.0740 -0.0336 + -9.70 -0.822 0.0684 -0.0375 + -9.18 -0.769 0.0605 -0.0440 + -8.18 -0.756 0.0270 -0.0578 + -7.19 -0.690 0.0180 -0.0590 + -6.65 -0.616 0.0166 -0.0633 + -6.13 -0.542 0.0152 -0.0674 + -6.00 -0.525 0.0117 -0.0732 + -5.50 -0.451 0.0105 -0.0766 + -5.00 -0.382 0.0097 -0.0797 + -4.50 -0.314 0.0092 -0.0825 + -4.00 -0.251 0.0091 -0.0853 + -3.50 -0.189 0.0089 -0.0884 + -3.00 -0.120 0.0089 -0.0914 + -2.50 -0.051 0.0088 -0.0942 + -2.00 0.017 0.0088 -0.0969 + -1.50 0.085 0.0088 -0.0994 + -1.00 0.152 0.0088 -0.1018 + -0.50 0.219 0.0088 -0.1041 + 0.00 0.288 0.0087 -0.1062 + 0.50 0.354 0.0087 -0.1086 + 1.00 0.421 0.0088 -0.1107 + 1.50 0.487 0.0089 -0.1129 + 2.00 0.554 0.0090 -0.1149 + 2.50 0.619 0.0091 -0.1168 + 3.00 0.685 0.0092 -0.1185 + 3.50 0.749 0.0093 -0.1201 + 4.00 0.815 0.0095 -0.1218 + 4.50 0.879 0.0096 -0.1233 + 5.00 0.944 0.0097 -0.1248 + 5.50 1.008 0.0099 -0.1260 + 6.00 1.072 0.0101 -0.1270 + 6.50 1.135 0.0103 -0.1280 + 7.00 1.197 0.0107 -0.1287 + 7.50 1.256 0.0112 -0.1289 + 8.00 1.305 0.0125 -0.1270 + 9.00 1.390 0.0155 -0.1207 + 9.50 1.424 0.0171 -0.1158 + 10.00 1.458 0.0192 -0.1116 + 10.50 1.488 0.0219 -0.1073 + 11.00 1.512 0.0255 -0.1029 + 11.50 1.533 0.0307 -0.0983 + 12.00 1.549 0.0370 -0.0949 + 12.50 1.558 0.0452 -0.0921 + 13.00 1.470 0.0630 -0.0899 + 13.50 1.398 0.0784 -0.0885 + 14.00 1.354 0.0931 -0.0885 + 14.50 1.336 0.1081 -0.0902 + 15.00 1.333 0.1239 -0.0928 + 15.50 1.326 0.1415 -0.0963 + 16.00 1.329 0.1592 -0.1006 + 16.50 1.326 0.1743 -0.1042 + 17.00 1.321 0.1903 -0.1084 + 17.50 1.331 0.2044 -0.1125 + 18.00 1.333 0.2186 -0.1169 + 18.50 1.340 0.2324 -0.1215 + 19.00 1.362 0.2455 -0.1263 + 19.50 1.382 0.2584 -0.1313 + 20.00 1.398 0.2689 -0.1352 + 20.50 1.426 0.2814 -0.1406 + 21.00 1.437 0.2943 -0.1462 + 22.00 1.418 0.3246 -0.1516 + 23.00 1.397 0.3557 -0.1570 + 24.00 1.376 0.3875 -0.1623 + 25.00 1.354 0.4198 -0.1676 + 26.00 1.332 0.4524 -0.1728 + 28.00 1.293 0.5183 -0.1832 + 30.00 1.265 0.5843 -0.1935 + 32.00 1.253 0.6492 -0.2039 + 35.00 1.264 0.7438 -0.2193 + 40.00 1.258 0.8970 -0.2440 + 45.00 1.217 1.0402 -0.2672 + 50.00 1.146 1.1686 -0.2891 + 55.00 1.049 1.2779 -0.3097 + 60.00 0.932 1.3647 -0.3290 + 65.00 0.799 1.4267 -0.3471 + 70.00 0.657 1.4621 -0.3641 + 75.00 0.509 1.4708 -0.3799 + 80.00 0.362 1.4544 -0.3946 + 85.00 0.221 1.4196 -0.4081 + 90.00 0.092 1.3938 -0.4204 + 95.00 -0.030 1.3943 -0.4313 + 100.00 -0.150 1.3798 -0.4408 + 105.00 -0.267 1.3504 -0.4486 + 110.00 -0.379 1.3063 -0.4546 + 115.00 -0.483 1.2481 -0.4584 + 120.00 -0.578 1.1763 -0.4597 + 125.00 -0.660 1.0919 -0.4582 + 130.00 -0.727 0.9962 -0.4532 + 135.00 -0.777 0.8906 -0.4441 + 140.00 -0.807 0.7771 -0.4303 + 145.00 -0.815 0.6581 -0.4109 + 150.00 -0.797 0.5364 -0.3848 + 155.00 -0.750 0.4157 -0.3508 + 160.00 -0.673 0.3000 -0.3074 + 170.00 -0.547 0.1051 -0.2786 + 175.00 -0.274 0.0388 -0.1380 + 180.00 0.000 0.0267 0.0000 +EOT + diff --git a/code/5MW_AFFiles/DU30_A17.pfl b/code/5MW_AFFiles/DU30_A17.pfl new file mode 100644 index 0000000..dfd67e7 --- /dev/null +++ b/code/5MW_AFFiles/DU30_A17.pfl @@ -0,0 +1,401 @@ +DU 97-W-300.lm +x/c y/c +1 0.00246 +0.9966 0.003402 +0.99314 0.004371 +0.98961 0.005364 +0.98601 0.006376 +0.98235 0.007398 +0.97863 0.008426 +0.97484 0.009465 +0.97098 0.010513 +0.96706 0.01157 +0.96307 0.012637 +0.95902 0.01371 +0.9549 0.014793 +0.95072 0.015883 +0.94647 0.016984 +0.94216 0.018095 +0.93778 0.01922 +0.93333 0.020358 +0.92882 0.02151 +0.92425 0.022675 +0.91961 0.023856 +0.9149 0.025053 +0.91013 0.026263 +0.90529 0.027489 +0.90039 0.028729 +0.89542 0.029987 +0.89039 0.031259 +0.88529 0.032546 +0.88013 0.033846 +0.8749 0.035163 +0.86961 0.036494 +0.86425 0.037841 +0.85882 0.039205 +0.85333 0.040581 +0.84778 0.041969 +0.84216 0.043373 +0.83647 0.044792 +0.83072 0.046224 +0.8249 0.047669 +0.81902 0.049125 +0.81307 0.050596 +0.80706 0.052078 +0.80098 0.053572 +0.79484 0.055075 +0.78863 0.05659 +0.78235 0.058118 +0.77601 0.059653 +0.76961 0.061198 +0.76314 0.062754 +0.7566 0.06432 +0.75 0.065892 +0.74333 0.067472 +0.73667 0.069044 +0.73 0.070609 +0.72333 0.072166 +0.71667 0.073711 +0.71 0.075251 +0.70333 0.076781 +0.69667 0.078301 +0.69 0.079812 +0.68333 0.081313 +0.67667 0.082801 +0.67 0.084279 +0.66333 0.085748 +0.65667 0.087201 +0.65 0.088644 +0.64333 0.090076 +0.63667 0.091493 +0.63 0.092898 +0.62333 0.094288 +0.61667 0.095662 +0.61 0.097025 +0.60333 0.098372 +0.59667 0.099703 +0.59 0.101019 +0.58333 0.102317 +0.57667 0.103597 +0.57 0.104864 +0.56333 0.106113 +0.55667 0.107342 +0.55 0.108553 +0.54333 0.109746 +0.53667 0.110918 +0.529999 0.112072 +0.52333 0.113205 +0.51667 0.114316 +0.51 0.115406 +0.50333 0.116476 +0.49667 0.11752 +0.49 0.118543 +0.48333 0.119541 +0.47667 0.120514 +0.47 0.121462 +0.46333 0.122386 +0.45667 0.123282 +0.45 0.124153 +0.44333 0.124996 +0.43667 0.125808 +0.43 0.126591 +0.42333 0.127342 +0.41667 0.12806 +0.41 0.128746 +0.40333 0.129398 +0.39667 0.130013 +0.389999 0.130592 +0.38333 0.131134 +0.37667 0.131635 +0.37 0.132098 +0.36333 0.132519 +0.35667 0.132897 +0.35 0.133232 +0.34333 0.133522 +0.33667 0.133766 +0.33 0.133961 +0.32333 0.134107 +0.31667 0.1342 +0.31 0.13424 +0.30333 0.134223 +0.29667 0.134147 +0.29 0.134011 +0.283329 0.133811 +0.27667 0.133545 +0.27 0.133207 +0.26333 0.132796 +0.25667 0.132308 +0.25 0.131737 +0.24342 0.131086 +0.23693 0.130356 +0.23053 0.129548 +0.22421 0.128664 +0.21798 0.127707 +0.21184 0.126684 +0.20579 0.125594 +0.19982 0.124443 +0.19395 0.123236 +0.18816 0.121974 +0.18245 0.12066 +0.17684 0.1193 +0.17131 0.117892 +0.16587 0.11644 +0.16052 0.114948 +0.15526 0.113417 +0.15008 0.111846 +0.14499 0.11024 +0.13999 0.108599 +0.13508 0.106925 +0.13026 0.105221 +0.12552 0.103484 +0.12087 0.101719 +0.11631 0.099929 +0.11183 0.09811 +0.10745 0.096271 +0.10315 0.094406 +0.09893 0.092517 +0.09481 0.090612 +0.09077 0.088685 +0.08683 0.086745 +0.08297 0.084783 +0.07919 0.082803 +0.07551 0.080817 +0.07191 0.078813 +0.0684 0.076798 +0.06498 0.074774 +0.06164 0.072737 +0.0584 0.0707 +0.05524 0.068651 +0.05217 0.066598 +0.04918 0.064535 +0.04629 0.062478 +0.04348 0.060415 +0.04076 0.058352 +0.03812 0.056286 +0.03558 0.05423 +0.03312 0.052173 +0.03075 0.050123 +0.02847 0.048081 +0.02627 0.046039 +0.02417 0.044018 +0.02215 0.041998 +0.02022 0.039992 +0.01837 0.037991 +0.01662 0.036018 +0.01495 0.034051 +0.01337 0.032107 +0.01187 0.03017 +0.01047 0.028266 +0.00915 0.026373 +0.00792 0.024503 +0.00678 0.022664 +0.00572 0.02083 +0.00476 0.019041 +0.00388 0.017251 +0.00309 0.01548 +0.00238 0.0137 +0.00177 0.011937 +0.00124 0.010102 +0.0008 0.008201 +0.00044 0.006121 +0.00018 0.003902 +0 0 +0.00018 -0.00382 +0.00044 -0.006006 +0.0008 -0.008145 +0.00124 -0.010167 +0.00177 -0.012159 +0.00238 -0.014116 +0.00309 -0.016113 +0.00388 -0.018111 +0.00476 -0.020139 +0.00572 -0.022168 +0.00678 -0.024234 +0.00792 -0.026304 +0.00915 -0.028401 +0.01047 -0.030528 +0.01187 -0.032666 +0.01337 -0.034849 +0.01495 -0.03705 +0.01662 -0.039286 +0.01837 -0.041544 +0.02022 -0.043847 +0.02215 -0.046167 +0.02417 -0.048515 +0.02627 -0.050877 +0.02847 -0.053276 +0.03075 -0.055692 +0.03312 -0.058132 +0.03558 -0.060599 +0.03812 -0.063078 +0.04076 -0.065587 +0.04348 -0.068106 +0.04629 -0.070641 +0.04918 -0.073182 +0.05217 -0.075744 +0.05524 -0.078307 +0.0584 -0.080878 +0.06164 -0.083449 +0.06498 -0.086037 +0.0684 -0.08862 +0.07191 -0.091205 +0.07551 -0.093792 +0.07919 -0.096369 +0.08297 -0.098953 +0.08683 -0.101524 +0.09077 -0.104084 +0.09481 -0.106645 +0.09893 -0.10919 +0.10315 -0.111732 +0.10745 -0.114252 +0.11183 -0.116749 +0.11631 -0.119233 +0.12087 -0.12169 +0.12552 -0.12412 +0.13026 -0.126519 +0.13508 -0.128881 +0.13999 -0.131211 +0.14499 -0.133504 +0.15008 -0.135759 +0.15526 -0.137971 +0.16052 -0.140136 +0.16587 -0.142253 +0.17131 -0.14432 +0.17684 -0.146332 +0.18245 -0.148282 +0.18816 -0.15017 +0.19395 -0.151981 +0.19982 -0.153713 +0.20579 -0.155369 +0.21184 -0.156932 +0.217981 -0.158398 +0.22421 -0.159761 +0.23053 -0.161011 +0.23693 -0.162138 +0.24342 -0.163135 +0.25 -0.163991 +0.25667 -0.164702 +0.26333 -0.16526 +0.27 -0.165665 +0.27667 -0.165916 +0.28333 -0.16602 +0.29 -0.165981 +0.29667 -0.165801 +0.30333 -0.165482 +0.31 -0.165029 +0.31667 -0.164445 +0.32333 -0.163736 +0.33 -0.162913 +0.33667 -0.161979 +0.34333 -0.16094 +0.35 -0.159796 +0.35667 -0.158553 +0.36333 -0.157218 +0.37 -0.155796 +0.37667 -0.154289 +0.38333 -0.152704 +0.39 -0.151041 +0.39667 -0.14931 +0.40333 -0.147515 +0.41 -0.145655 +0.41667 -0.143741 +0.42333 -0.141783 +0.43 -0.139774 +0.43667 -0.137718 +0.44333 -0.135619 +0.45 -0.133478 +0.45667 -0.131297 +0.46333 -0.129084 +0.47 -0.126834 +0.47667 -0.124555 +0.483331 -0.122251 +0.49 -0.11992 +0.49667 -0.117567 +0.50333 -0.115198 +0.51 -0.112808 +0.51667 -0.110402 +0.52333 -0.107985 +0.53 -0.105551 +0.53667 -0.103104 +0.54333 -0.100649 +0.55 -0.098179 +0.55667 -0.095698 +0.56333 -0.093211 +0.57 -0.090714 +0.57667 -0.088213 +0.58333 -0.085712 +0.59 -0.083204 +0.59667 -0.080696 +0.60333 -0.078192 +0.61 -0.075689 +0.61667 -0.073188 +0.62333 -0.070695 +0.63 -0.068204 +0.63667 -0.065721 +0.64333 -0.063252 +0.65 -0.060788 +0.65667 -0.058335 +0.66333 -0.055898 +0.67 -0.053471 +0.67667 -0.05106 +0.68333 -0.048669 +0.69 -0.046294 +0.69667 -0.04394 +0.70333 -0.041612 +0.71 -0.039306 +0.71667 -0.037026 +0.72333 -0.034778 +0.73 -0.032557 +0.73667 -0.030369 +0.74333 -0.028218 +0.75 -0.026101 +0.7566 -0.024047 +0.76314 -0.022054 +0.76961 -0.020127 +0.77601 -0.018266 +0.78235 -0.016471 +0.78863 -0.014743 +0.79484 -0.013086 +0.80098 -0.0115 +0.80706 -0.009984 +0.81307 -0.00854 +0.81902 -0.007166 +0.8249 -0.005861 +0.83072 -0.004624 +0.83647 -0.003457 +0.84216 -0.002357 +0.84778 -0.001327 +0.85333 -0.000368 +0.85882 0.000521 +0.86425 0.001342 +0.86961 0.002095 +0.8749 0.002779 +0.88013 0.0034 +0.88529 0.003954 +0.89039 0.004444 +0.89542 0.004872 +0.90039 0.005241 +0.90529 0.005552 +0.91013 0.005804 +0.9149 0.005999 +0.91961 0.006137 +0.92425 0.006221 +0.92882 0.00625 +0.93333 0.006226 +0.93778 0.006149 +0.94216 0.006016 +0.94647 0.005828 +0.95072 0.005582 +0.9549 0.005282 +0.95902 0.004928 +0.96307 0.004517 +0.96706 0.004046 +0.97098 0.003521 +0.97484 0.002942 +0.97863 0.002312 +0.98235 0.001634 +0.98601 0.000904 +0.98961 0.000121 +0.99314 -0.000709 +0.9966 -0.00158 +1 -0.00246 \ No newline at end of file diff --git a/code/5MW_AFFiles/DU35_A17.dat b/code/5MW_AFFiles/DU35_A17.dat new file mode 100644 index 0000000..5d6a1b8 --- /dev/null +++ b/code/5MW_AFFiles/DU35_A17.dat @@ -0,0 +1,150 @@ +DU35 airfoil with an aspect ratio of 17. Original -180 to 180deg Cl, Cd, and Cm versus AOA data taken from Appendix A of DOWEC document 10046_009.pdf (numerical values obtained from Koert Lindenburg of ECN). +Cl and Cd values corrected for rotational stall delay and Cd values corrected using the Viterna method for 0 to 90deg AOA by Jason Jonkman using AirfoilPrep_v2p0.xls. +line +1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 11.50 Stall angle (deg) + -1.8330 Zero Cn angle of attack (deg) + 7.1838 Cn slope for zero lift (dimensionless) + 1.6717 Cn extrapolated to value at positive stall angle of attack + -0.3075 Cn at stall value for negative angle of attack + 0.00 Angle of attack for minimum CD (deg) + 0.0094 Minimum CD value +-180.00 0.000 0.0407 0.0000 +-175.00 0.223 0.0507 0.0937 +-170.00 0.405 0.1055 0.1702 +-160.00 0.658 0.2982 0.2819 +-155.00 0.733 0.4121 0.3213 +-150.00 0.778 0.5308 0.3520 +-145.00 0.795 0.6503 0.3754 +-140.00 0.787 0.7672 0.3926 +-135.00 0.757 0.8785 0.4046 +-130.00 0.708 0.9819 0.4121 +-125.00 0.641 1.0756 0.4160 +-120.00 0.560 1.1580 0.4167 +-115.00 0.467 1.2280 0.4146 +-110.00 0.365 1.2847 0.4104 +-105.00 0.255 1.3274 0.4041 +-100.00 0.139 1.3557 0.3961 + -95.00 0.021 1.3692 0.3867 + -90.00 -0.098 1.3680 0.3759 + -85.00 -0.216 1.3521 0.3639 + -80.00 -0.331 1.3218 0.3508 + -75.00 -0.441 1.2773 0.3367 + -70.00 -0.544 1.2193 0.3216 + -65.00 -0.638 1.1486 0.3054 + -60.00 -0.720 1.0660 0.2884 + -55.00 -0.788 0.9728 0.2703 + -50.00 -0.840 0.8705 0.2512 + -45.00 -0.875 0.7611 0.2311 + -40.00 -0.889 0.6466 0.2099 + -35.00 -0.880 0.5299 0.1876 + -30.00 -0.846 0.4141 0.1641 + -25.00 -0.784 0.3030 0.1396 + -24.00 -0.768 0.2817 0.1345 + -23.00 -0.751 0.2608 0.1294 + -22.00 -0.733 0.2404 0.1243 + -21.00 -0.714 0.2205 0.1191 + -20.00 -0.693 0.2011 0.1139 + -19.00 -0.671 0.1822 0.1086 + -18.00 -0.648 0.1640 0.1032 + -17.00 -0.624 0.1465 0.0975 + -16.00 -0.601 0.1300 0.0898 + -15.00 -0.579 0.1145 0.0799 + -14.00 -0.559 0.1000 0.0682 + -13.00 -0.539 0.0867 0.0547 + -12.00 -0.519 0.0744 0.0397 + -11.00 -0.499 0.0633 0.0234 + -10.00 -0.480 0.0534 0.0060 + -5.54 -0.385 0.0245 -0.0800 + -5.04 -0.359 0.0225 -0.0800 + -4.54 -0.360 0.0196 -0.0800 + -4.04 -0.355 0.0174 -0.0800 + -3.54 -0.307 0.0162 -0.0800 + -3.04 -0.246 0.0144 -0.0800 + -3.00 -0.240 0.0240 -0.0623 + -2.50 -0.163 0.0188 -0.0674 + -2.00 -0.091 0.0160 -0.0712 + -1.50 -0.019 0.0137 -0.0746 + -1.00 0.052 0.0118 -0.0778 + -0.50 0.121 0.0104 -0.0806 + 0.00 0.196 0.0094 -0.0831 + 0.50 0.265 0.0096 -0.0863 + 1.00 0.335 0.0098 -0.0895 + 1.50 0.404 0.0099 -0.0924 + 2.00 0.472 0.0100 -0.0949 + 2.50 0.540 0.0102 -0.0973 + 3.00 0.608 0.0103 -0.0996 + 3.50 0.674 0.0104 -0.1016 + 4.00 0.742 0.0105 -0.1037 + 4.50 0.809 0.0107 -0.1057 + 5.00 0.875 0.0108 -0.1076 + 5.50 0.941 0.0109 -0.1094 + 6.00 1.007 0.0110 -0.1109 + 6.50 1.071 0.0113 -0.1118 + 7.00 1.134 0.0115 -0.1127 + 7.50 1.198 0.0117 -0.1138 + 8.00 1.260 0.0120 -0.1144 + 8.50 1.318 0.0126 -0.1137 + 9.00 1.368 0.0133 -0.1112 + 9.50 1.422 0.0143 -0.1100 + 10.00 1.475 0.0156 -0.1086 + 10.50 1.523 0.0174 -0.1064 + 11.00 1.570 0.0194 -0.1044 + 11.50 1.609 0.0227 -0.1013 + 12.00 1.642 0.0269 -0.0980 + 12.50 1.675 0.0319 -0.0953 + 13.00 1.700 0.0398 -0.0925 + 13.50 1.717 0.0488 -0.0896 + 14.00 1.712 0.0614 -0.0864 + 14.50 1.703 0.0786 -0.0840 + 15.50 1.671 0.1173 -0.0830 + 16.00 1.649 0.1377 -0.0848 + 16.50 1.621 0.1600 -0.0880 + 17.00 1.598 0.1814 -0.0926 + 17.50 1.571 0.2042 -0.0984 + 18.00 1.549 0.2316 -0.1052 + 19.00 1.544 0.2719 -0.1158 + 19.50 1.549 0.2906 -0.1213 + 20.00 1.565 0.3085 -0.1248 + 21.00 1.565 0.3447 -0.1317 + 22.00 1.563 0.3820 -0.1385 + 23.00 1.558 0.4203 -0.1452 + 24.00 1.552 0.4593 -0.1518 + 25.00 1.546 0.4988 -0.1583 + 26.00 1.539 0.5387 -0.1647 + 28.00 1.527 0.6187 -0.1770 + 30.00 1.522 0.6978 -0.1886 + 32.00 1.529 0.7747 -0.1994 + 35.00 1.544 0.8869 -0.2148 + 40.00 1.529 1.0671 -0.2392 + 45.00 1.471 1.2319 -0.2622 + 50.00 1.376 1.3747 -0.2839 + 55.00 1.249 1.4899 -0.3043 + 60.00 1.097 1.5728 -0.3236 + 65.00 0.928 1.6202 -0.3417 + 70.00 0.750 1.6302 -0.3586 + 75.00 0.570 1.6031 -0.3745 + 80.00 0.396 1.5423 -0.3892 + 85.00 0.237 1.4598 -0.4028 + 90.00 0.101 1.4041 -0.4151 + 95.00 -0.022 1.4053 -0.4261 + 100.00 -0.143 1.3914 -0.4357 + 105.00 -0.261 1.3625 -0.4437 + 110.00 -0.374 1.3188 -0.4498 + 115.00 -0.480 1.2608 -0.4538 + 120.00 -0.575 1.1891 -0.4553 + 125.00 -0.659 1.1046 -0.4540 + 130.00 -0.727 1.0086 -0.4492 + 135.00 -0.778 0.9025 -0.4405 + 140.00 -0.809 0.7883 -0.4270 + 145.00 -0.818 0.6684 -0.4078 + 150.00 -0.800 0.5457 -0.3821 + 155.00 -0.754 0.4236 -0.3484 + 160.00 -0.677 0.3066 -0.3054 + 170.00 -0.417 0.1085 -0.1842 + 175.00 -0.229 0.0510 -0.1013 + 180.00 0.000 0.0407 0.0000 +EOT + diff --git a/code/5MW_AFFiles/DU35_A17.pfl b/code/5MW_AFFiles/DU35_A17.pfl new file mode 100644 index 0000000..97d88d0 --- /dev/null +++ b/code/5MW_AFFiles/DU35_A17.pfl @@ -0,0 +1,401 @@ +Adjusted DU 35 +x/c y/c +1.00000 0.00283 +0.99660 0.00378 +0.99314 0.00477 +0.98961 0.00578 +0.98601 0.00683 +0.98235 0.00789 +0.97863 0.00897 +0.97484 0.01006 +0.97098 0.01116 +0.96706 0.01228 +0.96307 0.01342 +0.95902 0.01456 +0.95490 0.01571 +0.95072 0.01688 +0.94647 0.01806 +0.94216 0.01926 +0.93778 0.02046 +0.93333 0.02169 +0.92882 0.02292 +0.92425 0.02419 +0.91961 0.02547 +0.91490 0.02675 +0.91013 0.02807 +0.90529 0.02941 +0.90039 0.03077 +0.89542 0.03214 +0.89039 0.03353 +0.88529 0.03495 +0.88013 0.03638 +0.87490 0.03782 +0.86961 0.03929 +0.86425 0.04079 +0.85882 0.04230 +0.85333 0.04383 +0.84778 0.04538 +0.84216 0.04694 +0.83647 0.04853 +0.83072 0.05013 +0.82490 0.05176 +0.81902 0.05340 +0.81307 0.05506 +0.80706 0.05673 +0.80098 0.05842 +0.79484 0.06013 +0.78863 0.06184 +0.78235 0.06358 +0.77601 0.06531 +0.76961 0.06708 +0.76314 0.06885 +0.75660 0.07064 +0.75000 0.07244 +0.74333 0.07426 +0.73667 0.07606 +0.73000 0.07786 +0.72333 0.07966 +0.71667 0.08144 +0.71000 0.08322 +0.70333 0.08498 +0.69667 0.08674 +0.69000 0.08849 +0.68333 0.09022 +0.67667 0.09196 +0.67000 0.09368 +0.66333 0.09539 +0.65667 0.09708 +0.65000 0.09876 +0.64333 0.10044 +0.63667 0.10210 +0.63000 0.10375 +0.62333 0.10538 +0.61667 0.10699 +0.61000 0.10859 +0.60333 0.11017 +0.59667 0.11174 +0.59000 0.11330 +0.58333 0.11483 +0.57667 0.11634 +0.57000 0.11784 +0.56333 0.11931 +0.55667 0.12077 +0.55000 0.12220 +0.54333 0.12363 +0.53667 0.12502 +0.53000 0.12639 +0.52333 0.12775 +0.51667 0.12907 +0.51000 0.13037 +0.50333 0.13165 +0.49667 0.13289 +0.49000 0.13411 +0.48333 0.13531 +0.47667 0.13648 +0.47000 0.13761 +0.46333 0.13873 +0.45667 0.13980 +0.45000 0.14086 +0.44333 0.14189 +0.43667 0.14288 +0.43000 0.14384 +0.42333 0.14477 +0.41667 0.14566 +0.41000 0.14653 +0.40333 0.14736 +0.39667 0.14814 +0.39000 0.14889 +0.38333 0.14960 +0.37667 0.15028 +0.37000 0.15091 +0.36333 0.15151 +0.35667 0.15207 +0.35000 0.15258 +0.34333 0.15306 +0.33667 0.15351 +0.33000 0.15391 +0.32333 0.15426 +0.31667 0.15457 +0.31000 0.15482 +0.30333 0.15502 +0.29667 0.15516 +0.29000 0.15524 +0.28333 0.15525 +0.27667 0.15520 +0.27000 0.15507 +0.26333 0.15486 +0.25667 0.15457 +0.25000 0.15419 +0.24342 0.15372 +0.23693 0.15316 +0.23053 0.15250 +0.22421 0.15175 +0.21798 0.15094 +0.21184 0.15002 +0.20579 0.14904 +0.19982 0.14798 +0.19395 0.14686 +0.18816 0.14566 +0.18245 0.14439 +0.17684 0.14308 +0.17131 0.14169 +0.16587 0.14025 +0.16052 0.13875 +0.15526 0.13721 +0.15008 0.13561 +0.14499 0.13396 +0.13999 0.13226 +0.13508 0.13052 +0.13026 0.12873 +0.12552 0.12689 +0.12087 0.12502 +0.11631 0.12311 +0.11183 0.12115 +0.10745 0.11917 +0.10315 0.11715 +0.09893 0.11509 +0.09481 0.11299 +0.09077 0.11087 +0.08683 0.10871 +0.08297 0.10652 +0.07919 0.10430 +0.07551 0.10207 +0.07191 0.09979 +0.06840 0.09750 +0.06498 0.09517 +0.06164 0.09284 +0.05840 0.09048 +0.05524 0.08809 +0.05217 0.08569 +0.04918 0.08327 +0.04629 0.08084 +0.04348 0.07839 +0.04076 0.07592 +0.03812 0.07345 +0.03558 0.07096 +0.03312 0.06847 +0.03075 0.06597 +0.02847 0.06348 +0.02627 0.06097 +0.02417 0.05847 +0.02215 0.05596 +0.02022 0.05344 +0.01837 0.05091 +0.01662 0.04841 +0.01495 0.04589 +0.01337 0.04339 +0.01187 0.04088 +0.01047 0.03840 +0.00915 0.03591 +0.00792 0.03343 +0.00678 0.03096 +0.00572 0.02845 +0.00476 0.02592 +0.00388 0.02329 +0.00309 0.02056 +0.00238 0.01774 +0.00177 0.01503 +0.00124 0.01240 +0.00080 0.00990 +0.00044 0.00733 +0.00018 0.00465 +0.00000 0.00000 +0.00018 -0.00461 +0.00044 -0.00726 +0.00080 -0.00990 +0.00124 -0.01246 +0.00177 -0.01509 +0.00238 -0.01776 +0.00309 -0.02049 +0.00388 -0.02317 +0.00476 -0.02585 +0.00572 -0.02848 +0.00678 -0.03112 +0.00792 -0.03376 +0.00915 -0.03642 +0.01047 -0.03911 +0.01187 -0.04178 +0.01337 -0.04450 +0.01495 -0.04721 +0.01662 -0.04995 +0.01837 -0.05269 +0.02022 -0.05547 +0.02215 -0.05825 +0.02417 -0.06105 +0.02627 -0.06386 +0.02847 -0.06670 +0.03075 -0.06955 +0.03312 -0.07244 +0.03558 -0.07536 +0.03812 -0.07828 +0.04076 -0.08125 +0.04348 -0.08422 +0.04629 -0.08720 +0.04918 -0.09020 +0.05217 -0.09321 +0.05524 -0.09622 +0.05840 -0.09925 +0.06164 -0.10225 +0.06498 -0.10528 +0.06840 -0.10829 +0.07191 -0.11131 +0.07551 -0.11431 +0.07919 -0.11730 +0.08297 -0.12028 +0.08683 -0.12325 +0.09077 -0.12619 +0.09481 -0.12914 +0.09893 -0.13205 +0.10315 -0.13494 +0.10745 -0.13780 +0.11183 -0.14065 +0.11631 -0.14345 +0.12087 -0.14624 +0.12552 -0.14898 +0.13026 -0.15169 +0.13508 -0.15435 +0.13999 -0.15697 +0.14499 -0.15954 +0.15008 -0.16207 +0.15526 -0.16454 +0.16052 -0.16696 +0.16587 -0.16932 +0.17131 -0.17163 +0.17684 -0.17387 +0.18245 -0.17603 +0.18816 -0.17814 +0.19395 -0.18015 +0.19982 -0.18207 +0.20579 -0.18391 +0.21184 -0.18564 +0.21798 -0.18727 +0.22421 -0.18877 +0.23053 -0.19015 +0.23693 -0.19140 +0.24342 -0.19250 +0.25000 -0.19343 +0.25667 -0.19420 +0.26333 -0.19481 +0.27000 -0.19525 +0.27667 -0.19552 +0.28333 -0.19562 +0.29000 -0.19556 +0.29667 -0.19535 +0.30333 -0.19498 +0.31000 -0.19448 +0.31667 -0.19383 +0.32333 -0.19303 +0.33000 -0.19211 +0.33667 -0.19107 +0.34333 -0.18991 +0.35000 -0.18864 +0.35667 -0.18725 +0.36333 -0.18577 +0.37000 -0.18418 +0.37667 -0.18251 +0.38333 -0.18074 +0.39000 -0.17889 +0.39667 -0.17695 +0.40333 -0.17496 +0.41000 -0.17288 +0.41667 -0.17074 +0.42333 -0.16855 +0.43000 -0.16631 +0.43667 -0.16402 +0.44333 -0.16167 +0.45000 -0.15929 +0.45667 -0.15684 +0.46333 -0.15436 +0.47000 -0.15185 +0.47667 -0.14930 +0.48333 -0.14671 +0.49000 -0.14410 +0.49667 -0.14147 +0.50333 -0.13881 +0.51000 -0.13613 +0.51667 -0.13342 +0.52333 -0.13071 +0.53000 -0.12797 +0.53667 -0.12522 +0.54333 -0.12247 +0.55000 -0.11970 +0.55667 -0.11692 +0.56333 -0.11413 +0.57000 -0.11133 +0.57667 -0.10853 +0.58333 -0.10573 +0.59000 -0.10293 +0.59667 -0.10014 +0.60333 -0.09734 +0.61000 -0.09456 +0.61667 -0.09178 +0.62333 -0.08901 +0.63000 -0.08624 +0.63667 -0.08348 +0.64333 -0.08074 +0.65000 -0.07801 +0.65667 -0.07529 +0.66333 -0.07257 +0.67000 -0.06987 +0.67667 -0.06719 +0.68333 -0.06452 +0.69000 -0.06186 +0.69667 -0.05922 +0.70333 -0.05661 +0.71000 -0.05401 +0.71667 -0.05144 +0.72333 -0.04889 +0.73000 -0.04637 +0.73667 -0.04386 +0.74333 -0.04140 +0.75000 -0.03896 +0.75660 -0.03658 +0.76314 -0.03425 +0.76961 -0.03199 +0.77601 -0.02979 +0.78235 -0.02765 +0.78863 -0.02557 +0.79484 -0.02357 +0.80098 -0.02162 +0.80706 -0.01974 +0.81307 -0.01794 +0.81902 -0.01621 +0.82490 -0.01454 +0.83072 -0.01294 +0.83647 -0.01142 +0.84216 -0.00996 +0.84778 -0.00858 +0.85333 -0.00727 +0.85882 -0.00604 +0.86425 -0.00487 +0.86961 -0.00377 +0.87490 -0.00276 +0.88013 -0.00182 +0.88529 -0.00095 +0.89039 -0.00014 +0.89542 0.00061 +0.90039 0.00128 +0.90529 0.00189 +0.91013 0.00243 +0.91490 0.00293 +0.91961 0.00335 +0.92425 0.00370 +0.92882 0.00401 +0.93333 0.00425 +0.93778 0.00441 +0.94216 0.00452 +0.94647 0.00455 +0.95072 0.00451 +0.95490 0.00439 +0.95902 0.00420 +0.96307 0.00394 +0.96706 0.00358 +0.97098 0.00315 +0.97484 0.00264 +0.97863 0.00206 +0.98235 0.00141 +0.98601 0.00069 +0.98961 -0.00011 +0.99314 -0.00097 +0.99660 -0.00190 +1 -0.00283 \ No newline at end of file diff --git a/code/5MW_AFFiles/DU40_A17.dat b/code/5MW_AFFiles/DU40_A17.dat new file mode 100644 index 0000000..3e29f44 --- /dev/null +++ b/code/5MW_AFFiles/DU40_A17.dat @@ -0,0 +1,151 @@ +DU40 airfoil with an aspect ratio of 17. Original -180 to 180deg Cl, Cd, and Cm versus AOA data taken from Appendix A of DOWEC document 10046_009.pdf (numerical values obtained from Koert Lindenburg of ECN). +Cl and Cd values corrected for rotational stall delay and Cd values corrected using the Viterna method for 0 to 90deg AOA by Jason Jonkman using AirfoilPrep_v2p0.xls. +line +1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 9.00 Stall angle (deg) + -1.3430 Zero Cn angle of attack (deg) + 7.4888 Cn slope for zero lift (dimensionless) + 1.3519 Cn extrapolated to value at positive stall angle of attack + -0.3226 Cn at stall value for negative angle of attack + 0.00 Angle of attack for minimum CD (deg) + 0.0113 Minimum CD value +-180.00 0.000 0.0602 0.0000 +-175.00 0.218 0.0699 0.0934 +-170.00 0.397 0.1107 0.1697 +-160.00 0.642 0.3045 0.2813 +-155.00 0.715 0.4179 0.3208 +-150.00 0.757 0.5355 0.3516 +-145.00 0.772 0.6535 0.3752 +-140.00 0.762 0.7685 0.3926 +-135.00 0.731 0.8777 0.4048 +-130.00 0.680 0.9788 0.4126 +-125.00 0.613 1.0700 0.4166 +-120.00 0.532 1.1499 0.4176 +-115.00 0.439 1.2174 0.4158 +-110.00 0.337 1.2716 0.4117 +-105.00 0.228 1.3118 0.4057 +-100.00 0.114 1.3378 0.3979 + -95.00 -0.002 1.3492 0.3887 + -90.00 -0.120 1.3460 0.3781 + -85.00 -0.236 1.3283 0.3663 + -80.00 -0.349 1.2964 0.3534 + -75.00 -0.456 1.2507 0.3394 + -70.00 -0.557 1.1918 0.3244 + -65.00 -0.647 1.1204 0.3084 + -60.00 -0.727 1.0376 0.2914 + -55.00 -0.792 0.9446 0.2733 + -50.00 -0.842 0.8429 0.2543 + -45.00 -0.874 0.7345 0.2342 + -40.00 -0.886 0.6215 0.2129 + -35.00 -0.875 0.5067 0.1906 + -30.00 -0.839 0.3932 0.1670 + -25.00 -0.777 0.2849 0.1422 + -24.00 -0.761 0.2642 0.1371 + -23.00 -0.744 0.2440 0.1320 + -22.00 -0.725 0.2242 0.1268 + -21.00 -0.706 0.2049 0.1215 + -20.00 -0.685 0.1861 0.1162 + -19.00 -0.662 0.1687 0.1097 + -18.00 -0.635 0.1533 0.1012 + -17.00 -0.605 0.1398 0.0907 + -16.00 -0.571 0.1281 0.0784 + -15.00 -0.534 0.1183 0.0646 + -14.00 -0.494 0.1101 0.0494 + -13.00 -0.452 0.1036 0.0330 + -12.00 -0.407 0.0986 0.0156 + -11.00 -0.360 0.0951 -0.0026 + -10.00 -0.311 0.0931 -0.0213 + -8.00 -0.208 0.0930 -0.0600 + -6.00 -0.111 0.0689 -0.0500 + -5.50 -0.090 0.0614 -0.0516 + -5.00 -0.072 0.0547 -0.0532 + -4.50 -0.065 0.0480 -0.0538 + -4.00 -0.054 0.0411 -0.0544 + -3.50 -0.017 0.0349 -0.0554 + -3.00 0.003 0.0299 -0.0558 + -2.50 0.014 0.0255 -0.0555 + -2.00 0.009 0.0198 -0.0534 + -1.50 0.004 0.0164 -0.0442 + -1.00 0.036 0.0147 -0.0469 + -0.50 0.073 0.0137 -0.0522 + 0.00 0.137 0.0113 -0.0573 + 0.50 0.213 0.0114 -0.0644 + 1.00 0.292 0.0118 -0.0718 + 1.50 0.369 0.0122 -0.0783 + 2.00 0.444 0.0124 -0.0835 + 2.50 0.514 0.0124 -0.0866 + 3.00 0.580 0.0123 -0.0887 + 3.50 0.645 0.0120 -0.0900 + 4.00 0.710 0.0119 -0.0914 + 4.50 0.776 0.0122 -0.0933 + 5.00 0.841 0.0125 -0.0947 + 5.50 0.904 0.0129 -0.0957 + 6.00 0.967 0.0135 -0.0967 + 6.50 1.027 0.0144 -0.0973 + 7.00 1.084 0.0158 -0.0972 + 7.50 1.140 0.0174 -0.0972 + 8.00 1.193 0.0198 -0.0968 + 8.50 1.242 0.0231 -0.0958 + 9.00 1.287 0.0275 -0.0948 + 9.50 1.333 0.0323 -0.0942 + 10.00 1.368 0.0393 -0.0926 + 10.50 1.400 0.0475 -0.0908 + 11.00 1.425 0.0580 -0.0890 + 11.50 1.449 0.0691 -0.0877 + 12.00 1.473 0.0816 -0.0870 + 12.50 1.494 0.0973 -0.0870 + 13.00 1.513 0.1129 -0.0876 + 13.50 1.538 0.1288 -0.0886 + 14.50 1.587 0.1650 -0.0917 + 15.00 1.614 0.1845 -0.0939 + 15.50 1.631 0.2052 -0.0966 + 16.00 1.649 0.2250 -0.0996 + 16.50 1.666 0.2467 -0.1031 + 17.00 1.681 0.2684 -0.1069 + 17.50 1.699 0.2900 -0.1110 + 18.00 1.719 0.3121 -0.1157 + 19.00 1.751 0.3554 -0.1242 + 19.50 1.767 0.3783 -0.1291 + 20.50 1.798 0.4212 -0.1384 + 21.00 1.810 0.4415 -0.1416 + 22.00 1.830 0.4830 -0.1479 + 23.00 1.847 0.5257 -0.1542 + 24.00 1.861 0.5694 -0.1603 + 25.00 1.872 0.6141 -0.1664 + 26.00 1.881 0.6593 -0.1724 + 28.00 1.894 0.7513 -0.1841 + 30.00 1.904 0.8441 -0.1954 + 32.00 1.915 0.9364 -0.2063 + 35.00 1.929 1.0722 -0.2220 + 40.00 1.903 1.2873 -0.2468 + 45.00 1.820 1.4796 -0.2701 + 50.00 1.690 1.6401 -0.2921 + 55.00 1.522 1.7609 -0.3127 + 60.00 1.323 1.8360 -0.3321 + 65.00 1.106 1.8614 -0.3502 + 70.00 0.880 1.8347 -0.3672 + 75.00 0.658 1.7567 -0.3830 + 80.00 0.449 1.6334 -0.3977 + 85.00 0.267 1.4847 -0.4112 + 90.00 0.124 1.3879 -0.4234 + 95.00 0.002 1.3912 -0.4343 + 100.00 -0.118 1.3795 -0.4437 + 105.00 -0.235 1.3528 -0.4514 + 110.00 -0.348 1.3114 -0.4573 + 115.00 -0.453 1.2557 -0.4610 + 120.00 -0.549 1.1864 -0.4623 + 125.00 -0.633 1.1041 -0.4606 + 130.00 -0.702 1.0102 -0.4554 + 135.00 -0.754 0.9060 -0.4462 + 140.00 -0.787 0.7935 -0.4323 + 145.00 -0.797 0.6750 -0.4127 + 150.00 -0.782 0.5532 -0.3863 + 155.00 -0.739 0.4318 -0.3521 + 160.00 -0.664 0.3147 -0.3085 + 170.00 -0.410 0.1144 -0.1858 + 175.00 -0.226 0.0702 -0.1022 + 180.00 0.000 0.0602 0.0000 +EOT + diff --git a/code/5MW_AFFiles/DU40_A17.pfl b/code/5MW_AFFiles/DU40_A17.pfl new file mode 100644 index 0000000..954e7bd --- /dev/null +++ b/code/5MW_AFFiles/DU40_A17.pfl @@ -0,0 +1,401 @@ +Adjusted DU4050 +x/c y/c +1.00000 0.00347 +0.99660 0.00455 +0.99314 0.00565 +0.98961 0.00678 +0.98601 0.00795 +0.98235 0.00914 +0.97863 0.01035 +0.97484 0.01158 +0.97098 0.01283 +0.96706 0.01410 +0.96307 0.01539 +0.95902 0.01670 +0.95490 0.01803 +0.95072 0.01937 +0.94647 0.02074 +0.94216 0.02212 +0.93778 0.02352 +0.93333 0.02495 +0.92882 0.02639 +0.92425 0.02786 +0.91961 0.02936 +0.91490 0.03087 +0.91013 0.03242 +0.90529 0.03400 +0.90039 0.03560 +0.89542 0.03723 +0.89039 0.03887 +0.88529 0.04056 +0.88013 0.04226 +0.87490 0.04399 +0.86961 0.04575 +0.86425 0.04754 +0.85882 0.04935 +0.85333 0.05119 +0.84778 0.05305 +0.84216 0.05493 +0.83647 0.05685 +0.83072 0.05878 +0.82490 0.06076 +0.81902 0.06275 +0.81307 0.06476 +0.80706 0.06680 +0.80098 0.06886 +0.79484 0.07094 +0.78863 0.07304 +0.78235 0.07517 +0.77601 0.07730 +0.76961 0.07947 +0.76314 0.08165 +0.75660 0.08386 +0.75000 0.08608 +0.74333 0.08832 +0.73667 0.09056 +0.73000 0.09279 +0.72333 0.09502 +0.71667 0.09724 +0.71000 0.09946 +0.70333 0.10166 +0.69667 0.10386 +0.69000 0.10605 +0.68333 0.10822 +0.67667 0.11040 +0.67000 0.11256 +0.66333 0.11471 +0.65667 0.11685 +0.65000 0.11897 +0.64333 0.12109 +0.63667 0.12318 +0.63000 0.12527 +0.62333 0.12733 +0.61667 0.12938 +0.61000 0.13142 +0.60333 0.13343 +0.59667 0.13543 +0.59000 0.13742 +0.58333 0.13938 +0.57667 0.14131 +0.57000 0.14323 +0.56333 0.14512 +0.55667 0.14698 +0.55000 0.14882 +0.54333 0.15064 +0.53667 0.15242 +0.53000 0.15417 +0.52333 0.15591 +0.51667 0.15759 +0.51000 0.15925 +0.50333 0.16088 +0.49667 0.16246 +0.49000 0.16401 +0.48333 0.16553 +0.47667 0.16701 +0.47000 0.16844 +0.46333 0.16985 +0.45667 0.17120 +0.45000 0.17253 +0.44333 0.17381 +0.43667 0.17504 +0.43000 0.17624 +0.42333 0.17739 +0.41667 0.17849 +0.41000 0.17957 +0.40333 0.18058 +0.39667 0.18154 +0.39000 0.18246 +0.38333 0.18333 +0.37667 0.18415 +0.37000 0.18491 +0.36333 0.18563 +0.35667 0.18629 +0.35000 0.18690 +0.34333 0.18746 +0.33667 0.18797 +0.33000 0.18842 +0.32333 0.18881 +0.31667 0.18914 +0.31000 0.18940 +0.30333 0.18961 +0.29667 0.18973 +0.29000 0.18979 +0.28333 0.18977 +0.27667 0.18968 +0.27000 0.18950 +0.26333 0.18924 +0.25667 0.18890 +0.25000 0.18845 +0.24342 0.18791 +0.23693 0.18729 +0.23053 0.18657 +0.22421 0.18575 +0.21798 0.18487 +0.21184 0.18388 +0.20579 0.18282 +0.19982 0.18167 +0.19395 0.18046 +0.18816 0.17916 +0.18245 0.17778 +0.17684 0.17634 +0.17131 0.17482 +0.16587 0.17323 +0.16052 0.17158 +0.15526 0.16987 +0.15008 0.16809 +0.14499 0.16625 +0.13999 0.16436 +0.13508 0.16240 +0.13026 0.16038 +0.12552 0.15831 +0.12087 0.15619 +0.11631 0.15402 +0.11183 0.15179 +0.10745 0.14953 +0.10315 0.14722 +0.09893 0.14485 +0.09481 0.14243 +0.09077 0.13998 +0.08683 0.13748 +0.08297 0.13493 +0.07919 0.13234 +0.07551 0.12972 +0.07191 0.12705 +0.06840 0.12435 +0.06498 0.12161 +0.06164 0.11884 +0.05840 0.11603 +0.05524 0.11319 +0.05217 0.11031 +0.04918 0.10740 +0.04629 0.10447 +0.04348 0.10150 +0.04076 0.09851 +0.03812 0.09549 +0.03558 0.09246 +0.03312 0.08940 +0.03075 0.08632 +0.02847 0.08324 +0.02627 0.08013 +0.02417 0.07701 +0.02215 0.07387 +0.02022 0.07070 +0.01837 0.06751 +0.01662 0.06433 +0.01495 0.06111 +0.01337 0.05790 +0.01187 0.05468 +0.01047 0.05148 +0.00915 0.04826 +0.00792 0.04505 +0.00678 0.04181 +0.00572 0.03847 +0.00476 0.03502 +0.00388 0.03133 +0.00309 0.02736 +0.00238 0.02318 +0.00177 0.01920 +0.00124 0.01552 +0.00080 0.01217 +0.00044 0.00892 +0.00018 0.00563 +0.00000 0.00000 +0.00018 -0.00567 +0.00044 -0.00905 +0.00080 -0.01247 +0.00124 -0.01591 +0.00177 -0.01956 +0.00238 -0.02333 +0.00309 -0.02716 +0.00388 -0.03085 +0.00476 -0.03442 +0.00572 -0.03783 +0.00678 -0.04120 +0.00792 -0.04453 +0.00915 -0.04785 +0.01047 -0.05117 +0.01187 -0.05447 +0.01337 -0.05781 +0.01495 -0.06113 +0.01662 -0.06446 +0.01837 -0.06775 +0.02022 -0.07107 +0.02215 -0.07437 +0.02417 -0.07766 +0.02627 -0.08092 +0.02847 -0.08421 +0.03075 -0.08748 +0.03312 -0.09076 +0.03558 -0.09406 +0.03812 -0.09733 +0.04076 -0.10064 +0.04348 -0.10392 +0.04629 -0.10720 +0.04918 -0.11047 +0.05217 -0.11374 +0.05524 -0.11698 +0.05840 -0.12023 +0.06164 -0.12344 +0.06498 -0.12665 +0.06840 -0.12982 +0.07191 -0.13299 +0.07551 -0.13612 +0.07919 -0.13922 +0.08297 -0.14230 +0.08683 -0.14535 +0.09077 -0.14835 +0.09481 -0.15135 +0.09893 -0.15429 +0.10315 -0.15720 +0.10745 -0.16006 +0.11183 -0.16289 +0.11631 -0.16567 +0.12087 -0.16842 +0.12552 -0.17111 +0.13026 -0.17376 +0.13508 -0.17635 +0.13999 -0.17890 +0.14499 -0.18137 +0.15008 -0.18380 +0.15526 -0.18616 +0.16052 -0.18847 +0.16587 -0.19070 +0.17131 -0.19287 +0.17684 -0.19496 +0.18245 -0.19698 +0.18816 -0.19894 +0.19395 -0.20080 +0.19982 -0.20257 +0.20579 -0.20425 +0.21184 -0.20584 +0.21798 -0.20733 +0.22421 -0.20870 +0.23053 -0.20996 +0.23693 -0.21110 +0.24342 -0.21210 +0.25000 -0.21297 +0.25667 -0.21370 +0.26333 -0.21429 +0.27000 -0.21472 +0.27667 -0.21501 +0.28333 -0.21515 +0.29000 -0.21516 +0.29667 -0.21502 +0.30333 -0.21476 +0.31000 -0.21437 +0.31667 -0.21384 +0.32333 -0.21320 +0.33000 -0.21243 +0.33667 -0.21155 +0.34333 -0.21057 +0.35000 -0.20948 +0.35667 -0.20827 +0.36333 -0.20697 +0.37000 -0.20556 +0.37667 -0.20407 +0.38333 -0.20248 +0.39000 -0.20081 +0.39667 -0.19904 +0.40333 -0.19720 +0.41000 -0.19527 +0.41667 -0.19327 +0.42333 -0.19119 +0.43000 -0.18905 +0.43667 -0.18683 +0.44333 -0.18454 +0.45000 -0.18219 +0.45667 -0.17976 +0.46333 -0.17727 +0.47000 -0.17473 +0.47667 -0.17212 +0.48333 -0.16945 +0.49000 -0.16673 +0.49667 -0.16397 +0.50333 -0.16115 +0.51000 -0.15828 +0.51667 -0.15537 +0.52333 -0.15242 +0.53000 -0.14942 +0.53667 -0.14639 +0.54333 -0.14333 +0.55000 -0.14024 +0.55667 -0.13713 +0.56333 -0.13399 +0.57000 -0.13083 +0.57667 -0.12765 +0.58333 -0.12446 +0.59000 -0.12125 +0.59667 -0.11804 +0.60333 -0.11482 +0.61000 -0.11160 +0.61667 -0.10838 +0.62333 -0.10515 +0.63000 -0.10192 +0.63667 -0.09870 +0.64333 -0.09549 +0.65000 -0.09228 +0.65667 -0.08909 +0.66333 -0.08590 +0.67000 -0.08274 +0.67667 -0.07958 +0.68333 -0.07645 +0.69000 -0.07333 +0.69667 -0.07024 +0.70333 -0.06717 +0.71000 -0.06413 +0.71667 -0.06112 +0.72333 -0.05814 +0.73000 -0.05519 +0.73667 -0.05228 +0.74333 -0.04941 +0.75000 -0.04658 +0.75660 -0.04382 +0.76314 -0.04114 +0.76961 -0.03853 +0.77601 -0.03600 +0.78235 -0.03354 +0.78863 -0.03116 +0.79484 -0.02887 +0.80098 -0.02665 +0.80706 -0.02452 +0.81307 -0.02247 +0.81902 -0.02050 +0.82490 -0.01862 +0.83072 -0.01681 +0.83647 -0.01510 +0.84216 -0.01346 +0.84778 -0.01191 +0.85333 -0.01045 +0.85882 -0.00907 +0.86425 -0.00776 +0.86961 -0.00653 +0.87490 -0.00539 +0.88013 -0.00434 +0.88529 -0.00335 +0.89039 -0.00245 +0.89542 -0.00160 +0.90039 -0.00085 +0.90529 -0.00015 +0.91013 0.00046 +0.91490 0.00103 +0.91961 0.00151 +0.92425 0.00193 +0.92882 0.00229 +0.93333 0.00258 +0.93778 0.00279 +0.94216 0.00295 +0.94647 0.00303 +0.95072 0.00303 +0.95490 0.00296 +0.95902 0.00282 +0.96307 0.00261 +0.96706 0.00232 +0.97098 0.00194 +0.97484 0.00149 +0.97863 0.00098 +0.98235 0.00040 +0.98601 -0.00025 +0.98961 -0.00097 +0.99314 -0.00176 +0.99660 -0.00261 +1 -0.00347 \ No newline at end of file diff --git a/code/5MW_AFFiles/NACA64_A17.dat b/code/5MW_AFFiles/NACA64_A17.dat new file mode 100644 index 0000000..4a1874e --- /dev/null +++ b/code/5MW_AFFiles/NACA64_A17.dat @@ -0,0 +1,142 @@ +NACA64 airfoil with an aspect ratio of 17. Original -180 to 180deg Cl, Cd, and Cm versus AOA data taken from Appendix A of DOWEC document 10046_009.pdf (numerical values obtained from Koert Lindenburg of ECN). +Cl and Cd values corrected for rotational stall delay and Cd values corrected using the Viterna method for 0 to 90deg AOA by Jason Jonkman using AirfoilPrep_v2p0.xls. +line +1 Number of airfoil tables in this file + 1.0 Reynolds numbers in millions + 0.0 Control setting + 9.00 Stall angle (deg) + 4.4320 Zero Cn angle of attack (deg) + 6.0031 Cn slope for zero lift (dimensionless) + 1.4073 Cn extrapolated to value at positive stall angle of attack + -0.7945 Cn at stall value for negative angle of attack + -1.00 Angle of attack for minimum CD (deg) + 0.0052 Minimum CD value +-180.00 0.000 0.0198 0.0000 +-175.00 0.374 0.0341 0.1880 +-170.00 0.749 0.0955 0.3770 +-160.00 0.659 0.2807 0.2747 +-155.00 0.736 0.3919 0.3130 +-150.00 0.783 0.5086 0.3428 +-145.00 0.803 0.6267 0.3654 +-140.00 0.798 0.7427 0.3820 +-135.00 0.771 0.8537 0.3935 +-130.00 0.724 0.9574 0.4007 +-125.00 0.660 1.0519 0.4042 +-120.00 0.581 1.1355 0.4047 +-115.00 0.491 1.2070 0.4025 +-110.00 0.390 1.2656 0.3981 +-105.00 0.282 1.3104 0.3918 +-100.00 0.169 1.3410 0.3838 + -95.00 0.052 1.3572 0.3743 + -90.00 -0.067 1.3587 0.3636 + -85.00 -0.184 1.3456 0.3517 + -80.00 -0.299 1.3181 0.3388 + -75.00 -0.409 1.2765 0.3248 + -70.00 -0.512 1.2212 0.3099 + -65.00 -0.606 1.1532 0.2940 + -60.00 -0.689 1.0731 0.2772 + -55.00 -0.759 0.9822 0.2595 + -50.00 -0.814 0.8820 0.2409 + -45.00 -0.850 0.7742 0.2212 + -40.00 -0.866 0.6610 0.2006 + -35.00 -0.860 0.5451 0.1789 + -30.00 -0.829 0.4295 0.1563 + -25.00 -0.853 0.3071 0.1156 + -24.00 -0.870 0.2814 0.1040 + -23.00 -0.890 0.2556 0.0916 + -22.00 -0.911 0.2297 0.0785 + -21.00 -0.934 0.2040 0.0649 + -20.00 -0.958 0.1785 0.0508 + -19.00 -0.982 0.1534 0.0364 + -18.00 -1.005 0.1288 0.0218 + -17.00 -1.082 0.1037 0.0129 + -16.00 -1.113 0.0786 -0.0028 + -15.00 -1.105 0.0535 -0.0251 + -14.00 -1.078 0.0283 -0.0419 + -13.50 -1.053 0.0158 -0.0521 + -13.00 -1.015 0.0151 -0.0610 + -12.00 -0.904 0.0134 -0.0707 + -11.00 -0.807 0.0121 -0.0722 + -10.00 -0.711 0.0111 -0.0734 + -9.00 -0.595 0.0099 -0.0772 + -8.00 -0.478 0.0091 -0.0807 + -7.00 -0.375 0.0086 -0.0825 + -6.00 -0.264 0.0082 -0.0832 + -5.00 -0.151 0.0079 -0.0841 + -4.00 -0.017 0.0072 -0.0869 + -3.00 0.088 0.0064 -0.0912 + -2.00 0.213 0.0054 -0.0946 + -1.00 0.328 0.0052 -0.0971 + 0.00 0.442 0.0052 -0.1014 + 1.00 0.556 0.0052 -0.1076 + 2.00 0.670 0.0053 -0.1126 + 3.00 0.784 0.0053 -0.1157 + 4.00 0.898 0.0054 -0.1199 + 5.00 1.011 0.0058 -0.1240 + 6.00 1.103 0.0091 -0.1234 + 7.00 1.181 0.0113 -0.1184 + 8.00 1.257 0.0124 -0.1163 + 8.50 1.293 0.0130 -0.1163 + 9.00 1.326 0.0136 -0.1160 + 9.50 1.356 0.0143 -0.1154 + 10.00 1.382 0.0150 -0.1149 + 10.50 1.400 0.0267 -0.1145 + 11.00 1.415 0.0383 -0.1143 + 11.50 1.425 0.0498 -0.1147 + 12.00 1.434 0.0613 -0.1158 + 12.50 1.443 0.0727 -0.1165 + 13.00 1.451 0.0841 -0.1153 + 13.50 1.453 0.0954 -0.1131 + 14.00 1.448 0.1065 -0.1112 + 14.50 1.444 0.1176 -0.1101 + 15.00 1.445 0.1287 -0.1103 + 15.50 1.447 0.1398 -0.1109 + 16.00 1.448 0.1509 -0.1114 + 16.50 1.444 0.1619 -0.1111 + 17.00 1.438 0.1728 -0.1097 + 17.50 1.439 0.1837 -0.1079 + 18.00 1.448 0.1947 -0.1080 + 18.50 1.452 0.2057 -0.1090 + 19.00 1.448 0.2165 -0.1086 + 19.50 1.438 0.2272 -0.1077 + 20.00 1.428 0.2379 -0.1099 + 21.00 1.401 0.2590 -0.1169 + 22.00 1.359 0.2799 -0.1190 + 23.00 1.300 0.3004 -0.1235 + 24.00 1.220 0.3204 -0.1393 + 25.00 1.168 0.3377 -0.1440 + 26.00 1.116 0.3554 -0.1486 + 28.00 1.015 0.3916 -0.1577 + 30.00 0.926 0.4294 -0.1668 + 32.00 0.855 0.4690 -0.1759 + 35.00 0.800 0.5324 -0.1897 + 40.00 0.804 0.6452 -0.2126 + 45.00 0.793 0.7573 -0.2344 + 50.00 0.763 0.8664 -0.2553 + 55.00 0.717 0.9708 -0.2751 + 60.00 0.656 1.0693 -0.2939 + 65.00 0.582 1.1606 -0.3117 + 70.00 0.495 1.2438 -0.3285 + 75.00 0.398 1.3178 -0.3444 + 80.00 0.291 1.3809 -0.3593 + 85.00 0.176 1.4304 -0.3731 + 90.00 0.053 1.4565 -0.3858 + 95.00 -0.074 1.4533 -0.3973 + 100.00 -0.199 1.4345 -0.4075 + 105.00 -0.321 1.4004 -0.4162 + 110.00 -0.436 1.3512 -0.4231 + 115.00 -0.543 1.2874 -0.4280 + 120.00 -0.640 1.2099 -0.4306 + 125.00 -0.723 1.1196 -0.4304 + 130.00 -0.790 1.0179 -0.4270 + 135.00 -0.840 0.9064 -0.4196 + 140.00 -0.868 0.7871 -0.4077 + 145.00 -0.872 0.6627 -0.3903 + 150.00 -0.850 0.5363 -0.3665 + 155.00 -0.798 0.4116 -0.3349 + 160.00 -0.714 0.2931 -0.2942 + 170.00 -0.749 0.0971 -0.3771 + 175.00 -0.374 0.0334 -0.1879 + 180.00 0.000 0.0198 0.0000 +EOT + diff --git a/code/5MW_AFFiles/NACA64_A17.pfl b/code/5MW_AFFiles/NACA64_A17.pfl new file mode 100644 index 0000000..0854adf --- /dev/null +++ b/code/5MW_AFFiles/NACA64_A17.pfl @@ -0,0 +1,207 @@ +NACA 64-618 +x/c y/c +1 0 +0.99 0.003385 +0.98 0.006126 +0.97 0.008767 +0.96 0.011357 +0.95 0.013921 +0.94 0.016478 +0.93 0.019036 +0.92 0.021598 +0.91 0.024163 +0.9 0.026733 +0.875 0.033169 +0.85 0.039603 +0.825 0.046004 +0.8 0.052337 +0.775 0.058566 +0.75 0.064656 +0.725 0.070573 +0.7 0.076285 +0.675 0.081773 +0.65 0.087012 +0.625 0.091967 +0.6 0.096599 +0.575 0.100887 +0.55 0.104799 +0.525 0.108299 +0.5 0.11136 +0.475 0.113937 +0.45 0.11599 +0.44 0.11665 +0.43 0.117211 +0.42 0.117667 +0.41 0.118003 +0.4 0.118204 +0.39 0.118258 +0.38 0.118168 +0.37 0.117946 +0.36 0.117607 +0.35 0.117159 +0.34 0.116603 +0.33 0.115942 +0.32 0.115181 +0.31 0.114319 +0.3 0.113356 +0.29 0.112292 +0.28 0.111127 +0.27 0.109863 +0.26 0.108497 +0.25 0.107027 +0.24 0.105454 +0.23 0.103774 +0.22 0.101985 +0.21 0.100084 +0.2 0.098068 +0.19 0.095934 +0.18 0.093676 +0.17 0.091291 +0.16 0.088772 +0.15 0.08611 +0.14 0.083298 +0.13 0.080329 +0.12 0.077188 +0.11 0.073862 +0.1 0.070334 +0.095 0.068489 +0.09 0.066584 +0.085 0.064617 +0.08 0.062583 +0.075 0.060478 +0.07 0.058297 +0.065 0.056032 +0.06 0.053676 +0.055 0.051218 +0.05 0.048647 +0.045 0.04595 +0.04 0.04311 +0.035 0.040102 +0.03 0.036899 +0.025 0.033454 +0.02 0.029694 +0.0175 0.027666 +0.015 0.025511 +0.0125 0.023197 +0.01 0.020674 +0.009 0.019587 +0.008 0.018447 +0.007 0.017241 +0.006 0.015955 +0.005 0.014565 +0.004 0.013037 +0.003 0.011296 +0.002 0.009227 +0.00175 0.008633 +0.0015 0.007997 +0.00125 0.007312 +0.001 0.006555 +0.00075 0.005695 +0.0005 0.004672 +0.0004 0.00419 +0.0003 0.003636 +0.0002 0.00297 +0.0001 0.002104 +0 0 +0.0001 -0.002092 +0.0002 -0.002954 +0.0003 -0.003613 +0.0004 -0.004169 +0.0005 -0.004658 +0.00075 -0.005698 +0.001 -0.006572 +0.00125 -0.00734 +0.0015 -0.008027 +0.00175 -0.008654 +0.002 -0.009231 +0.003 -0.011176 +0.004 -0.012729 +0.005 -0.01403 +0.006 -0.01516 +0.007 -0.016174 +0.008 -0.017098 +0.009 -0.017953 +0.01 -0.01875 +0.0125 -0.020537 +0.015 -0.022107 +0.0175 -0.023517 +0.02 -0.024803 +0.025 -0.027092 +0.03 -0.029102 +0.035 -0.030904 +0.04 -0.032546 +0.045 -0.034061 +0.05 -0.035472 +0.055 -0.036792 +0.06 -0.038035 +0.065 -0.039209 +0.07 -0.040322 +0.075 -0.041381 +0.08 -0.042389 +0.085 -0.04335 +0.09 -0.044268 +0.095 -0.045145 +0.1 -0.045987 +0.11 -0.047576 +0.12 -0.04905 +0.13 -0.050417 +0.14 -0.051688 +0.15 -0.052868 +0.16 -0.053967 +0.17 -0.054988 +0.18 -0.055934 +0.19 -0.056811 +0.2 -0.057621 +0.21 -0.058365 +0.22 -0.059045 +0.23 -0.059664 +0.24 -0.060224 +0.25 -0.060723 +0.26 -0.061163 +0.27 -0.061545 +0.28 -0.061871 +0.29 -0.062137 +0.3 -0.062343 +0.31 -0.06249 +0.32 -0.062577 +0.33 -0.062602 +0.34 -0.062563 +0.35 -0.06246 +0.36 -0.062287 +0.37 -0.06204 +0.38 -0.061716 +0.39 -0.061301 +0.4 -0.060778 +0.41 -0.060138 +0.42 -0.059388 +0.43 -0.058544 +0.44 -0.057622 +0.45 -0.056632 +0.475 -0.053897 +0.5 -0.05085 +0.525 -0.047539 +0.55 -0.044014 +0.575 -0.040316 +0.6 -0.036486 +0.625 -0.032565 +0.65 -0.028585 +0.675 -0.024603 +0.7 -0.02066 +0.725 -0.016795 +0.75 -0.013048 +0.775 -0.009472 +0.8 -0.006122 +0.825 -0.003065 +0.85 -0.000376 +0.875 0.001859 +0.9 0.003536 +0.91 0.004023 +0.92 0.004387 +0.93 0.00462 +0.94 0.004702 +0.95 0.004614 +0.96 0.004338 +0.97 0.003829 +0.98 0.003042 +0.99 0.00191 +1 0 \ No newline at end of file diff --git a/code/Submit_Scripts/submit_6.sh b/code/Submit_Scripts/submit_6.sh new file mode 100644 index 0000000..551924e --- /dev/null +++ b/code/Submit_Scripts/submit_6.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=6.0 +boundary='amalia' +rose='northIslandRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_8.sh b/code/Submit_Scripts/submit_8.sh new file mode 100644 index 0000000..569bf81 --- /dev/null +++ b/code/Submit_Scripts/submit_8.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=8.0 +boundary='amalia' +rose='northIslandRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_base.sh b/code/Submit_Scripts/submit_base.sh new file mode 100644 index 0000000..ea34fb0 --- /dev/null +++ b/code/Submit_Scripts/submit_base.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='northIslandRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_circle.sh b/code/Submit_Scripts/submit_circle.sh new file mode 100644 index 0000000..e6e612c --- /dev/null +++ b/code/Submit_Scripts/submit_circle.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=24:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=4.0 +boundary='circle' +rose='northIslandRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_6.sh b/code/Submit_Scripts/submit_grid_6.sh new file mode 100644 index 0000000..0c397a0 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_6.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "6 farm" + +module load python/2.7 + +spacing=6.0 +boundary='amalia' +rose='northIslandRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_8.sh b/code/Submit_Scripts/submit_grid_8.sh new file mode 100644 index 0000000..93f4406 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_8.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "8 farm" + +module load python/2.7 + +spacing=8.0 +boundary='amalia' +rose='northIslandRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_base.sh b/code/Submit_Scripts/submit_grid_base.sh new file mode 100644 index 0000000..b90c186 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_base.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "base farm" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='northIslandRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_circle.sh b/code/Submit_Scripts/submit_grid_circle.sh new file mode 100644 index 0000000..400acf0 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_circle.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=4.0 +boundary='circle' +rose='northIslandRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_square.sh b/code/Submit_Scripts/submit_grid_square.sh new file mode 100644 index 0000000..53cbef6 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_square.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "square farm" + +module load python/2.7 + +spacing=4.0 +boundary='square' +rose='northIslandRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_ukiah.sh b/code/Submit_Scripts/submit_grid_ukiah.sh new file mode 100644 index 0000000..1a48bf4 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_ukiah.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "ukiah farm" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='ukiahRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_grid_victorville.sh b/code/Submit_Scripts/submit_grid_victorville.sh new file mode 100644 index 0000000..edca458 --- /dev/null +++ b/code/Submit_Scripts/submit_grid_victorville.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "victorville farm" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='victorvilleRose' + +python optGridRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_6.sh b/code/Submit_Scripts/submit_param_6.sh new file mode 100644 index 0000000..d672459 --- /dev/null +++ b/code/Submit_Scripts/submit_param_6.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P 6" + +module load python/2.7 + +spacing=6.0 +boundary='amalia' +rose='northIslandRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_8.sh b/code/Submit_Scripts/submit_param_8.sh new file mode 100644 index 0000000..f716c9f --- /dev/null +++ b/code/Submit_Scripts/submit_param_8.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P 8" + +module load python/2.7 + +spacing=8.0 +boundary='amalia' +rose='northIslandRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_base.sh b/code/Submit_Scripts/submit_param_base.sh new file mode 100644 index 0000000..0cf7ffa --- /dev/null +++ b/code/Submit_Scripts/submit_param_base.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P base" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='northIslandRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_circle.sh b/code/Submit_Scripts/submit_param_circle.sh new file mode 100644 index 0000000..d9b226b --- /dev/null +++ b/code/Submit_Scripts/submit_param_circle.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P circle" + +module load python/2.7 + +spacing=4.0 +boundary='circle' +rose='northIslandRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_square.sh b/code/Submit_Scripts/submit_param_square.sh new file mode 100644 index 0000000..091ebb2 --- /dev/null +++ b/code/Submit_Scripts/submit_param_square.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P square" + +module load python/2.7 + +spacing=4.0 +boundary='square' +rose='northIslandRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_ukiah.sh b/code/Submit_Scripts/submit_param_ukiah.sh new file mode 100644 index 0000000..06f99b6 --- /dev/null +++ b/code/Submit_Scripts/submit_param_ukiah.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P ukiah" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='ukiahRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_param_victorville.sh b/code/Submit_Scripts/submit_param_victorville.sh new file mode 100644 index 0000000..99457b5 --- /dev/null +++ b/code/Submit_Scripts/submit_param_victorville.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "P victorville" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='victorvilleRose' + +python optParamRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_square.sh b/code/Submit_Scripts/submit_square.sh new file mode 100644 index 0000000..3295dd2 --- /dev/null +++ b/code/Submit_Scripts/submit_square.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=24:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=4.0 +boundary='square' +rose='northIslandRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + + diff --git a/code/Submit_Scripts/submit_ukiah.sh b/code/Submit_Scripts/submit_ukiah.sh new file mode 100644 index 0000000..012f1f0 --- /dev/null +++ b/code/Submit_Scripts/submit_ukiah.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +#SBATCH --time=48:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='ukiahRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + diff --git a/code/Submit_Scripts/submit_victorville.sh b/code/Submit_Scripts/submit_victorville.sh new file mode 100644 index 0000000..1a39338 --- /dev/null +++ b/code/Submit_Scripts/submit_victorville.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +#SBATCH --time=24:00:00 +#SBATCH --ntasks=1 +#SBATCH --mem-per-cpu=1G +#SBATCH -J "circle farm" + +module load python/2.7 + +spacing=4.0 +boundary='amalia' +rose='victorvilleRose' + +python optDirectRevision.py $spacing $boundary $rose 1 + + diff --git a/code/aep_calc.py b/code/aep_calc.py deleted file mode 100644 index c3e7ee2..0000000 --- a/code/aep_calc.py +++ /dev/null @@ -1,82 +0,0 @@ -import numpy as np -import gaus_aep -import sys -sys.dont_write_bytecode = True - - -def fast_calc_AEP(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies, rated_ws=10., rated_power=3.35, - cut_in_speed=3., cut_out_speed=25., shearExp=0.15, relaxationFactor=1.0, zref=99999., z0=0.): - - if zref == 99999.: - zref = turbineZ[0] - - AEP = gaus_aep.calcaep(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies, shearExp, relaxationFactor, rated_ws, rated_power, - cut_in_speed, cut_out_speed, zref, z0) - - return AEP - - -def fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies, rated_ws=10., rated_power=3.35, - cut_in_speed=3., cut_out_speed=25., shearExp=0.15, relaxationFactor=1.0, zref=99999., z0=0.): - - if zref == 99999.: - zref = turbineZ[0] - - nTurbs = len(turbineX) - - dx = np.eye(nTurbs) - dy = np.zeros((nTurbs,nTurbs)) - aep, daep_dx = gaus_aep.calcaep_dv(turbineX, dx, turbineY, dy, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies, shearExp, relaxationFactor, rated_ws, rated_power, - cut_in_speed, cut_out_speed, zref, z0) - - dx = np.zeros((nTurbs,nTurbs)) - dy = np.eye(nTurbs) - aep, daep_dy = gaus_aep.calcaep_dv(turbineX, dx, turbineY, dy, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies, shearExp, relaxationFactor, rated_ws, rated_power, - cut_in_speed, cut_out_speed, zref, z0) - - return aep, daep_dx, daep_dy - - -# def fast_calc_grid_gradients(dx, dy, shear, rotate, turbs_per_row, x_start, y0, -# turbineZ, rotorDiameter, windDirections, -# windSpeeds, windFrequencies, rated_ws=10., rated_power=3.35, -# cut_in_speed=3., cut_out_speed=25., shearExp=0.15, relaxationFactor=1.0, zref=99999., z0=0.): -# -# dxd = 1. -# dyd = 0. -# sheard = 0. -# rotated = 0. -# aep, daep_ddx = gaus_aep_grid.calcaep_grid_dv(turbineZ,rotorDiameter,windDirections,dx,dxd,dy,dyd,shear,sheard,rotate, -# rotated,turbs_per_row,x_start,y0,windSpeeds,windFrequencies,shearExp,relaxationFactor, -# rated_ws,rated_power,cut_in_speed,cut_out_speed,zref,z0) -# -# dxd = 0. -# dyd = 1. -# sheard = 0. -# rotated = 0. -# aep, daep_ddy = gaus_aep_grid.calcaep_grid_dv(turbineZ,rotorDiameter,windDirections,dx,dxd,dy,dyd,shear,sheard,rotate, -# rotated,turbs_per_row,x_start,y0,windSpeeds,windFrequencies,shearExp,relaxationFactor, -# rated_ws,rated_power,cut_in_speed,cut_out_speed,zref,z0) -# -# dxd = 0. -# dyd = 0. -# sheard = 1. -# rotated = 0. -# aep, daep_ddshear = gaus_aep_grid.calcaep_grid_dv(turbineZ,rotorDiameter,windDirections,dx,dxd,dy,dyd,shear,sheard,rotate, -# rotated,turbs_per_row,x_start,y0,windSpeeds,windFrequencies,shearExp,relaxationFactor, -# rated_ws,rated_power,cut_in_speed,cut_out_speed,zref,z0) -# -# dxd = 0. -# dyd = 0. -# sheard = 0. -# rotated = 1. -# aep, daep_drotate = gaus_aep_grid.calcaep_grid_dv(turbineZ,rotorDiameter,windDirections,dx,dxd,dy,dyd,shear,sheard,rotate, -# rotated,turbs_per_row,x_start,y0,windSpeeds,windFrequencies,shearExp,relaxationFactor, -# rated_ws,rated_power,cut_in_speed,cut_out_speed,zref,z0) -# -# return aep, daep_ddx, daep_ddy, daep_ddshear, daep_drotate diff --git a/code/aep_gaus.f90 b/code/aep_gaus.f90 deleted file mode 100644 index 791109f..0000000 --- a/code/aep_gaus.f90 +++ /dev/null @@ -1,642 +0,0 @@ - -!global functions -subroutine WindFrame(nTurbines, wind_direction, turbineX, turbineY, turbineXw, turbineYw) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: wind_direction - real(dp), dimension(nTurbines), intent(in) :: turbineX, turbineY - - ! out - real(dp), dimension(nTurbines), intent(out) :: turbineXw, turbineYw - - ! local - real(dp) :: windDirectionDeg, windDirectionRad - real(dp), parameter :: pi = 3.141592653589793_dp, tol = 0.000001_dp - - windDirectionDeg = 270. - wind_direction - if (windDirectionDeg < 0.) then - windDirectionDeg = windDirectionDeg + 360. - end if - windDirectionRad = pi*windDirectionDeg/180.0 - - turbineXw = turbineX*cos(-windDirectionRad)-turbineY*sin(-windDirectionRad) - turbineYw = turbineX*sin(-windDirectionRad)+turbineY*cos(-windDirectionRad) - -end subroutine WindFrame - - -subroutine Hermite_Spline(x, x0, x1, y0, dy0, y1, dy1, y) - ! This function produces the y and dy values for a hermite cubic spline - ! interpolating between two end points with known slopes - ! - ! :param x: x position of output y - ! :param x0: x position of upwind endpoint of spline - ! :param x1: x position of downwind endpoint of spline - ! :param y0: y position of upwind endpoint of spline - ! :param dy0: slope at upwind endpoint of spline - ! :param y1: y position of downwind endpoint of spline - ! :param dy1: slope at downwind endpoint of spline - ! - ! :return: y: y value of spline at location x - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - real(dp), intent(in) :: x, x0, x1, y0, dy0, y1, dy1 - - ! out - real(dp), intent(out) :: y !, dy_dx - - ! local - real(dp) :: c3, c2, c1, c0 - - ! initialize coefficients for parametric cubic spline - c3 = (2.0_dp*(y1))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - & - (2.0_dp*(y0))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + & - (dy0)/(x0**2 - 2.0_dp*x0*x1 + x1**2) + & - (dy1)/(x0**2 - 2.0_dp*x0*x1 + x1**2) - - c2 = (3.0_dp*(y0)*(x0 + x1))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - & - ((dy1)*(2.0_dp*x0 + x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - ((dy0)*(x0 + & - 2.0_dp*x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - (3.0_dp*(y1)*(x0 + x1))/(x0**3 - & - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - - c1 = ((dy0)*(x1**2 + 2.0_dp*x0*x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) + ((dy1)*(x0**2 + & - 2.0_dp*x1*x0))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - (6.0_dp*x0*x1*(y0))/(x0**3 - & - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + (6.0_dp*x0*x1*(y1))/(x0**3 - & - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - - c0 = ((y0)*(- x1**3 + 3.0_dp*x0*x1**2))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - & - x1**3) - ((y1)*(- x0**3 + 3.0_dp*x1*x0**2))/(x0**3 - 3.0_dp*x0**2*x1 + & - 3.0_dp*x0*x1**2 - x1**3) - (x0*x1**2*(dy0))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - & - (x0**2*x1*(dy1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - - ! Solve for y and dy values at the given point - y = c3*x**3 + c2*x**2 + c1*x + c0 - !dy_dx = c3*3*x**2 + c2*2*x + c1 - -end subroutine Hermite_Spline - -! -! !power calculations" -subroutine PowWind(nTurbines, Uref, turbineZ, shearExp, zref, z0, & - &turbineSpeeds) - - implicit none - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: Uref, shearExp, zref, z0 - real(dp), dimension(nTurbines), intent(in) :: turbineZ - ! out - real(dp), dimension(nTurbines), intent(out) :: turbineSpeeds - ! local - integer :: n - - do n = 1, nTurbines - turbineSpeeds(n)= Uref*((turbineZ(n)-z0)/(zref-z0))**shearExp - end do - -end subroutine PowWind - - -subroutine DirPower(nTurbines, wtVelocity, rated_ws, rated_power, cut_in_speed, cut_out_speed,& - &dir_power) - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: rated_ws, rated_power, cut_in_speed, cut_out_speed - real(dp), dimension(nTurbines), intent(in) :: wtVelocity - - ! out - real(dp), intent(out) :: dir_power - - ! local - real(dp), dimension(nTurbines) :: wtPower - real(dp) :: buffer, x0, x1, y0, y1, dy0, dy1 - integer :: n - - buffer = 0.1 - - do n = 1, nTurbines - ! If we're below cut-in - if (wtVelocity(n) < (cut_in_speed-buffer)) then - wtPower(n) = 0. - ! If we're at the spline of cut-in - else if (wtVelocity(n) > (cut_in_speed-buffer) .and. (wtVelocity(n) < (cut_in_speed+buffer))) then - x0 = cut_in_speed-buffer - x1 = cut_in_speed+buffer - y0 = 0. - y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 - dy0 = 0. - dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/(rated_ws**3) - call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) - ! If we're between cut-in and rated - else if ((wtVelocity(n) > (cut_in_speed+buffer)) .and. (wtVelocity(n) < (rated_ws-buffer))) then - wtPower(n) = rated_power*(wtVelocity(n)/rated_ws)**3 - ! If we're at the spline of rated - else if ((wtVelocity(n) > (rated_ws-buffer)) .and. (wtVelocity(n) < (rated_ws+buffer))) then - x0 = rated_ws-buffer - x1 = rated_ws+buffer - y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 - y1 = rated_power - dy0 = 3.*rated_power*(rated_ws-buffer)**2/(rated_ws**3) - dy1 = 0. - call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) - ! If we're between rated and cut-out - else if ((wtVelocity(n) > (rated_ws+buffer)) .and. (wtVelocity(n) < (cut_out_speed-buffer))) then - wtPower(n) = rated_power - ! If we're at the spline of cut-out - else if ((wtVelocity(n) > (cut_out_speed-buffer)) .and. (wtVelocity(n) < (cut_out_speed+buffer))) then - x0 = cut_out_speed-buffer - x1 = cut_out_speed+buffer - y0 = rated_power - y1 = 0. - dy0 = 0. - dy1 = 0. - call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) - ! If we're above cut-out - else if (wtVelocity(n) > (cut_out_speed+buffer)) then - wtPower(n) = 0. - end if - - end do - - dir_power = sum(wtPower) - -end subroutine DirPower - - -subroutine calcAEP(nTurbines, nDirections, turbineX, turbineY, turbineZ, rotorDiameter, windDirections,& - &windSpeeds, windFrequencies, shearExp, relaxationFactor, rated_ws, rated_power,& - &cut_in_speed, cut_out_speed, zref, z0, AEP) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines, nDirections - real(dp), intent(in) :: shearExp, relaxationFactor, rated_ws, rated_power, cut_in_speed, cut_out_speed, zref, z0 - real(dp), dimension(nTurbines), intent(in) :: turbineX, turbineY, turbineZ, rotorDiameter - real(dp), dimension(nDirections), intent(in) :: windDirections, windSpeeds, windFrequencies - - ! out - real(dp), intent(out) :: AEP - - ! local - real(dp), dimension(nDirections) :: dir_powers - real(dp), dimension(nTurbines) :: turbineXw, turbineYw, Vinf_floris, wtVelocity, loss - real(dp) :: hrs_per_year, pwrDir, Vinf - integer :: n, i - - do n = 1, nDirections - call WindFrame(nTurbines, windDirections(n), turbineX, turbineY, turbineXw, turbineYw) - call PowWind(nTurbines, windSpeeds(n), turbineZ, shearExp, zref, z0, Vinf_floris) - Vinf = Vinf_floris(1) - call GaussianWake(nTurbines, turbineXw, turbineYw, rotorDiameter(1), relaxationFactor, loss) - wtVelocity = Vinf*(1.0_dp-loss) - call DirPower(nTurbines, wtVelocity, rated_ws, rated_power, cut_in_speed, cut_out_speed, pwrDir) - dir_powers(n) = pwrDir - end do - - hrs_per_year = 365.*24. - AEP = hrs_per_year * (sum(windFrequencies * dir_powers)) - -end subroutine calcAEP - - -subroutine GaussianWake(nTurbines, turbineXw, turbineYw, turb_diam, relaxationFactor, loss) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: turb_diam, relaxationFactor - real(dp), dimension(nTurbines), intent(in) :: turbineXw, turbineYw - - ! out - real(dp), dimension(nTurbines), intent(out) :: loss - - ! local - real(dp) :: CT, k, x, y, sigma, exponent, radical - real(dp), dimension(nTurbines) :: loss_array - real(dp), parameter :: pi = 3.141592653589793_dp, e = 2.718281828459045_dp, tol = 0.000001_dp - integer :: i, j - - CT = 4.0*1./3.*(1.0-1./3.) - k = 0.0324555 - - do i = 1, nTurbines - do j = 1, nTurbines - x = turbineXw(i) - turbineXw(j) - y = turbineYw(i) - turbineYw(j) - if (x > 0.0) then - sigma = k*x + turb_diam/sqrt(8.0) - exponent = -0.5 * (y/(relaxationFactor*sigma))**2 - radical = 1. - CT/(8.*sigma**2 / turb_diam**2) - loss_array(j) = (1.-sqrt(radical)) * e**exponent - else - loss_array(j) = 0.0 - end if - end do - loss(i) = sqrt(sum(loss_array**2)) - end do - -end subroutine GaussianWake - - - - - -! Generated by TAPENADE (INRIA, Ecuador team) -! Tapenade 3.14 (r7259) - 18 Jan 2019 09:31 -! -! Differentiation of windframe in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: turbinexw turbineyw -! with respect to varying inputs: turbinex turbiney -!global functions -SUBROUTINE WINDFRAME_DV(nturbines, wind_direction, turbinex, turbinexd, & -& turbiney, turbineyd, turbinexw, turbinexwd, turbineyw, turbineywd, & -& nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines - REAL(dp), INTENT(IN) :: wind_direction - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinex, turbiney - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexd, & -& turbineyd -! out - REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: turbinexw, turbineyw - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: turbinexwd, & -& turbineywd -! local - REAL(dp) :: winddirectiondeg, winddirectionrad - REAL(dp), PARAMETER :: pi=3.141592653589793_dp, tol=0.000001_dp - INTRINSIC COS - INTRINSIC SIN - INTEGER :: nd - INTEGER :: nbdirs - winddirectiondeg = 270. - wind_direction - IF (winddirectiondeg .LT. 0.) winddirectiondeg = winddirectiondeg + & -& 360. - winddirectionrad = pi*winddirectiondeg/180.0 - DO nd=1,nbdirs - turbinexwd(nd, :) = COS(-winddirectionrad)*turbinexd(nd, :) - SIN(-& -& winddirectionrad)*turbineyd(nd, :) - turbineywd(nd, :) = SIN(-winddirectionrad)*turbinexd(nd, :) + COS(-& -& winddirectionrad)*turbineyd(nd, :) - END DO - turbinexw = turbinex*COS(-winddirectionrad) - turbiney*SIN(-& -& winddirectionrad) - turbineyw = turbinex*SIN(-winddirectionrad) + turbiney*COS(-& -& winddirectionrad) -END SUBROUTINE WINDFRAME_DV - -! Differentiation of hermite_spline in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: y -! with respect to varying inputs: x -SUBROUTINE HERMITE_SPLINE_DV(x, xd, x0, x1, y0, dy0, y1, dy1, y, yd, & -& nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE -!dy_dx = c3*3*x**2 + c2*2*x + c1 - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - REAL(dp), INTENT(IN) :: x, x0, x1, y0, dy0, y1, dy1 - REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: xd -! out -!, dy_dx - REAL(dp), INTENT(OUT) :: y - REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: yd -! local - REAL(dp) :: c3, c2, c1, c0 - INTEGER :: nd - INTEGER :: nbdirs -! initialize coefficients for parametric cubic spline - c3 = 2.0_dp*y1/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) - 2.0_dp*& -& y0/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + dy0/(x0**2-2.0_dp& -& *x0*x1+x1**2) + dy1/(x0**2-2.0_dp*x0*x1+x1**2) - c2 = 3.0_dp*y0*(x0+x1)/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) -& -& dy1*(2.0_dp*x0+x1)/(x0**2-2.0_dp*x0*x1+x1**2) - dy0*(x0+2.0_dp*x1)/(& -& x0**2-2.0_dp*x0*x1+x1**2) - 3.0_dp*y1*(x0+x1)/(x0**3-3.0_dp*x0**2*x1& -& +3.0_dp*x0*x1**2-x1**3) - c1 = dy0*(x1**2+2.0_dp*x0*x1)/(x0**2-2.0_dp*x0*x1+x1**2) + dy1*(x0**2+& -& 2.0_dp*x1*x0)/(x0**2-2.0_dp*x0*x1+x1**2) - 6.0_dp*x0*x1*y0/(x0**3-& -& 3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + 6.0_dp*x0*x1*y1/(x0**3-& -& 3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) - c0 = y0*(-(x1**3)+3.0_dp*x0*x1**2)/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1& -& **2-x1**3) - y1*(-(x0**3)+3.0_dp*x1*x0**2)/(x0**3-3.0_dp*x0**2*x1+& -& 3.0_dp*x0*x1**2-x1**3) - x0*x1**2*dy0/(x0**2-2.0_dp*x0*x1+x1**2) - & -& x0**2*x1*dy1/(x0**2-2.0_dp*x0*x1+x1**2) - DO nd=1,nbdirs -! Solve for y and dy values at the given point - yd(nd) = c3*3*x**2*xd(nd) + c2*2*x*xd(nd) + c1*xd(nd) - END DO - y = c3*x**3 + c2*x**2 + c1*x + c0 -END SUBROUTINE HERMITE_SPLINE_DV - -! Differentiation of dirpower in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: dir_power -! with respect to varying inputs: wtvelocity -SUBROUTINE DIRPOWER_DV(nturbines, wtvelocity, wtvelocityd, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, dir_power, dir_powerd, & -& nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines - REAL(dp), INTENT(IN) :: rated_ws, rated_power, cut_in_speed, & -& cut_out_speed - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: wtvelocity - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: wtvelocityd -! out - REAL(dp), INTENT(OUT) :: dir_power - REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: dir_powerd -! local - REAL(dp), DIMENSION(nturbines) :: wtpower - REAL(dp), DIMENSION(nbdirs, nturbines) :: wtpowerd - REAL(dp) :: buffer, x0, x1, y0, y1, dy0, dy1 - INTEGER :: n - INTRINSIC SUM - INTEGER :: nd - INTEGER :: nbdirs - buffer = 0.1 - wtpowerd(:, :) = 0.0_8 - DO n=1,nturbines -! If we're below cut-in - IF (wtvelocity(n) .LT. cut_in_speed - buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = 0.0_8 - END DO - wtpower(n) = 0. -! If we're at the spline of cut-in - ELSE IF (wtvelocity(n) .GT. cut_in_speed - buffer .AND. wtvelocity(n& -& ) .LT. cut_in_speed + buffer) THEN - x0 = cut_in_speed - buffer - x1 = cut_in_speed + buffer - y0 = 0. - y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 - dy0 = 0. - dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/rated_ws**3 - CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & -& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & -& nbdirs) -! If we're between cut-in and rated - ELSE IF (wtvelocity(n) .GT. cut_in_speed + buffer .AND. wtvelocity(n& -& ) .LT. rated_ws - buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = rated_power*3*wtvelocity(n)**2*wtvelocityd(nd& -& , n)/rated_ws**3 - END DO - wtpower(n) = rated_power*(wtvelocity(n)/rated_ws)**3 -! If we're at the spline of rated - ELSE IF (wtvelocity(n) .GT. rated_ws - buffer .AND. wtvelocity(n) & -& .LT. rated_ws + buffer) THEN - x0 = rated_ws - buffer - x1 = rated_ws + buffer - y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 - y1 = rated_power - dy0 = 3.*rated_power*(rated_ws-buffer)**2/rated_ws**3 - dy1 = 0. - CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & -& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & -& nbdirs) -! If we're between rated and cut-out - ELSE IF (wtvelocity(n) .GT. rated_ws + buffer .AND. wtvelocity(n) & -& .LT. cut_out_speed - buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = 0.0_8 - END DO - wtpower(n) = rated_power -! If we're at the spline of cut-out - ELSE IF (wtvelocity(n) .GT. cut_out_speed - buffer .AND. wtvelocity(& -& n) .LT. cut_out_speed + buffer) THEN - x0 = cut_out_speed - buffer - x1 = cut_out_speed + buffer - y0 = rated_power - y1 = 0. - dy0 = 0. - dy1 = 0. - CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & -& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & -& nbdirs) -! If we're above cut-out - ELSE IF (wtvelocity(n) .GT. cut_out_speed + buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = 0.0_8 - END DO - wtpower(n) = 0. - END IF - END DO - DO nd=1,nbdirs - dir_powerd(nd) = SUM(wtpowerd(nd, :)) - END DO - dir_power = SUM(wtpower) -END SUBROUTINE DIRPOWER_DV - -! Differentiation of gaussianwake in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: loss -! with respect to varying inputs: turbinexw turbineyw loss -SUBROUTINE GAUSSIANWAKE_DV(nturbines, turbinexw, turbinexwd, turbineyw, & -& turbineywd, turb_diam, relaxationfactor, loss, lossd, nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines - REAL(dp), INTENT(IN) :: turb_diam, relaxationfactor - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinexw, turbineyw - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexwd, & -& turbineywd -! out - REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: loss - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: lossd -! local - REAL(dp) :: ct, k, x, y, sigma, exponent, radical - REAL(dp), DIMENSION(nbdirs) :: xd, yd, sigmad, exponentd, radicald - REAL(dp), DIMENSION(nturbines) :: loss_array - REAL(dp), DIMENSION(nbdirs, nturbines) :: loss_arrayd - REAL(dp), PARAMETER :: pi=3.141592653589793_dp, e=2.718281828459045_dp& -& , tol=0.000001_dp - INTEGER :: i, j - INTRINSIC SQRT - INTRINSIC SUM - REAL :: result1 - REAL(dp) :: result10 - REAL(dp), DIMENSION(nbdirs) :: result10d - REAL(dp) :: pwr1 - REAL(dp), DIMENSION(nbdirs) :: pwr1d - REAL(dp), DIMENSION(nturbines) :: arg1 - REAL(dp), DIMENSION(nbdirs, nturbines) :: arg1d - REAL(dp) :: arg2 - REAL(dp), DIMENSION(nbdirs) :: arg2d - INTEGER :: nd - INTEGER :: nbdirs - ct = 4.0*1./3.*(1.0-1./3.) - k = 0.0324555 - loss_arrayd(:, :) = 0.0_8 - DO i=1,nturbines - DO j=1,nturbines - DO nd=1,nbdirs - xd(nd) = turbinexwd(nd, i) - turbinexwd(nd, j) - yd(nd) = turbineywd(nd, i) - turbineywd(nd, j) - END DO - x = turbinexw(i) - turbinexw(j) - y = turbineyw(i) - turbineyw(j) - IF (x .GT. 0.0) THEN - result1 = SQRT(8.0) - sigma = k*x + turb_diam/result1 - exponent = -(0.5*(y/(relaxationfactor*sigma))**2) - radical = 1. - ct/(8.*sigma**2/turb_diam**2) - result10 = SQRT(radical) - pwr1 = e**exponent - DO nd=1,nbdirs - sigmad(nd) = k*xd(nd) - exponentd(nd) = -(0.5*2*y*(yd(nd)*relaxationfactor*sigma-y*& -& relaxationfactor*sigmad(nd))/(relaxationfactor**3*sigma**3)) - radicald(nd) = ct*8.*2*sigma*sigmad(nd)/turb_diam**2/(8.*sigma& -& **2/turb_diam**2)**2 - IF (radical .EQ. 0.0) THEN - result10d(nd) = 0.0_8 - ELSE - result10d(nd) = radicald(nd)/(2.0*SQRT(radical)) - END IF - IF (e .GT. 0.0) THEN - pwr1d(nd) = LOG(e)*e**exponent*exponentd(nd) - ELSE - pwr1d(nd) = 0.0 - END IF - loss_arrayd(nd, j) = (1.-result10)*pwr1d(nd) - result10d(nd)*& -& pwr1 - END DO - loss_array(j) = (1.-result10)*pwr1 - ELSE - DO nd=1,nbdirs - loss_arrayd(nd, j) = 0.0_8 - END DO - loss_array(j) = 0.0 - END IF - END DO - arg1(:) = loss_array**2 - arg2 = SUM(arg1(:)) - DO nd=1,nbdirs - arg1d(nd, :) = 2*loss_array*loss_arrayd(nd, :) - arg2d(nd) = SUM(arg1d(nd, :)) - IF (arg2 .EQ. 0.0) THEN - lossd(nd, i) = 0.0_8 - ELSE - lossd(nd, i) = arg2d(nd)/(2.0*SQRT(arg2)) - END IF - END DO - loss(i) = SQRT(arg2) - END DO -END SUBROUTINE GAUSSIANWAKE_DV - -! Differentiation of calcaep in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: aep -! with respect to varying inputs: turbinex turbiney -! RW status of diff variables: turbinex:in turbiney:in aep:out -SUBROUTINE CALCAEP_DV(nturbines, ndirections, turbinex, turbinexd, & -& turbiney, turbineyd, turbinez, rotordiameter, winddirections, & -& windspeeds, windfrequencies, shearexp, relaxationfactor, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, zref, z0, aep, aepd, nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines, ndirections - REAL(dp), INTENT(IN) :: shearexp, relaxationfactor, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, zref, z0 - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinex, turbiney, & -& turbinez, rotordiameter - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexd, & -& turbineyd - REAL(dp), DIMENSION(ndirections), INTENT(IN) :: winddirections, & -& windspeeds, windfrequencies -! out - REAL(dp), INTENT(OUT) :: aep - REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: aepd -! local - REAL(dp), DIMENSION(ndirections) :: dir_powers - REAL(dp), DIMENSION(nbdirs, ndirections) :: dir_powersd - REAL(dp), DIMENSION(nturbines) :: turbinexw, turbineyw, vinf_floris, & -& wtvelocity, loss - REAL(dp), DIMENSION(nbdirs, nturbines) :: turbinexwd, turbineywd, & -& wtvelocityd, lossd - REAL(dp) :: hrs_per_year, pwrdir, vinf - REAL(dp), DIMENSION(nbdirs) :: pwrdird - INTEGER :: n, i - INTRINSIC SUM - REAL(dp), DIMENSION(ndirections) :: arg1 - REAL(dp), DIMENSION(nbdirs, ndirections) :: arg1d - INTEGER :: nd - INTEGER :: nbdirs - dir_powersd(:, :) = 0.0_8 - lossd(:, :) = 0.0_8 - DO n=1,ndirections - CALL WINDFRAME_DV(nturbines, winddirections(n), turbinex, turbinexd& -& , turbiney, turbineyd, turbinexw, turbinexwd, turbineyw& -& , turbineywd, nbdirs) - CALL POWWIND(nturbines, windspeeds(n), turbinez, shearexp, zref, z0& -& , vinf_floris) - vinf = vinf_floris(1) - CALL GAUSSIANWAKE_DV(nturbines, turbinexw, turbinexwd, turbineyw, & -& turbineywd, rotordiameter(1), relaxationfactor, loss& -& , lossd, nbdirs) - DO nd=1,nbdirs - wtvelocityd(nd, :) = -(vinf*lossd(nd, :)) - END DO - wtvelocity = vinf*(1.0_dp-loss) - CALL DIRPOWER_DV(nturbines, wtvelocity, wtvelocityd, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, pwrdir, pwrdird& -& , nbdirs) - DO nd=1,nbdirs - dir_powersd(nd, n) = pwrdird(nd) - END DO - dir_powers(n) = pwrdir - END DO - hrs_per_year = 365.*24. - DO nd=1,nbdirs - arg1d(nd, :) = windfrequencies*dir_powersd(nd, :) - aepd(nd) = hrs_per_year*SUM(arg1d(nd, :)) - END DO - arg1(:) = windfrequencies*dir_powers - aep = hrs_per_year*SUM(arg1(:)) -END SUBROUTINE CALCAEP_DV diff --git a/code/aep_gaus_grid.f90 b/code/aep_gaus_grid.f90 deleted file mode 100644 index 8035441..0000000 --- a/code/aep_gaus_grid.f90 +++ /dev/null @@ -1,760 +0,0 @@ - -!global functions -subroutine WindFrame(nTurbines, wind_direction, turbineX, turbineY, turbineXw, turbineYw) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: wind_direction - real(dp), dimension(nTurbines), intent(in) :: turbineX, turbineY - - ! out - real(dp), dimension(nTurbines), intent(out) :: turbineXw, turbineYw - - ! local - real(dp) :: windDirectionDeg, windDirectionRad - real(dp), parameter :: pi = 3.141592653589793_dp, tol = 0.000001_dp - - windDirectionDeg = 270. - wind_direction - if (windDirectionDeg < 0.) then - windDirectionDeg = windDirectionDeg + 360. - end if - windDirectionRad = pi*windDirectionDeg/180.0 - - turbineXw = turbineX*cos(-windDirectionRad)-turbineY*sin(-windDirectionRad) - turbineYw = turbineX*sin(-windDirectionRad)+turbineY*cos(-windDirectionRad) - -end subroutine WindFrame - - -subroutine Hermite_Spline(x, x0, x1, y0, dy0, y1, dy1, y) - ! This function produces the y and dy values for a hermite cubic spline - ! interpolating between two end points with known slopes - ! - ! :param x: x position of output y - ! :param x0: x position of upwind endpoint of spline - ! :param x1: x position of downwind endpoint of spline - ! :param y0: y position of upwind endpoint of spline - ! :param dy0: slope at upwind endpoint of spline - ! :param y1: y position of downwind endpoint of spline - ! :param dy1: slope at downwind endpoint of spline - ! - ! :return: y: y value of spline at location x - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - real(dp), intent(in) :: x, x0, x1, y0, dy0, y1, dy1 - - ! out - real(dp), intent(out) :: y !, dy_dx - - ! local - real(dp) :: c3, c2, c1, c0 - - ! initialize coefficients for parametric cubic spline - c3 = (2.0_dp*(y1))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - & - (2.0_dp*(y0))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + & - (dy0)/(x0**2 - 2.0_dp*x0*x1 + x1**2) + & - (dy1)/(x0**2 - 2.0_dp*x0*x1 + x1**2) - - c2 = (3.0_dp*(y0)*(x0 + x1))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - & - ((dy1)*(2.0_dp*x0 + x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - ((dy0)*(x0 + & - 2.0_dp*x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - (3.0_dp*(y1)*(x0 + x1))/(x0**3 - & - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - - c1 = ((dy0)*(x1**2 + 2.0_dp*x0*x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) + ((dy1)*(x0**2 + & - 2.0_dp*x1*x0))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - (6.0_dp*x0*x1*(y0))/(x0**3 - & - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + (6.0_dp*x0*x1*(y1))/(x0**3 - & - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - - c0 = ((y0)*(- x1**3 + 3.0_dp*x0*x1**2))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - & - x1**3) - ((y1)*(- x0**3 + 3.0_dp*x1*x0**2))/(x0**3 - 3.0_dp*x0**2*x1 + & - 3.0_dp*x0*x1**2 - x1**3) - (x0*x1**2*(dy0))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - & - (x0**2*x1*(dy1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - - ! Solve for y and dy values at the given point - y = c3*x**3 + c2*x**2 + c1*x + c0 - !dy_dx = c3*3*x**2 + c2*2*x + c1 - -end subroutine Hermite_Spline - -! -! !power calculations" -subroutine PowWind(nTurbines, Uref, turbineZ, shearExp, zref, z0, & - &turbineSpeeds) - - implicit none - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: Uref, shearExp, zref, z0 - real(dp), dimension(nTurbines), intent(in) :: turbineZ - ! out - real(dp), dimension(nTurbines), intent(out) :: turbineSpeeds - ! local - integer :: n - - do n = 1, nTurbines - turbineSpeeds(n)= Uref*((turbineZ(n)-z0)/(zref-z0))**shearExp - end do - -end subroutine PowWind - - -subroutine DirPower(nTurbines, wtVelocity, rated_ws, rated_power, cut_in_speed, cut_out_speed,& - &dir_power) - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: rated_ws, rated_power, cut_in_speed, cut_out_speed - real(dp), dimension(nTurbines), intent(in) :: wtVelocity - - ! out - real(dp), intent(out) :: dir_power - - ! local - real(dp), dimension(nTurbines) :: wtPower - real(dp) :: buffer, x0, x1, y0, y1, dy0, dy1 - integer :: n - - buffer = 0.1 - - do n = 1, nTurbines - ! If we're below cut-in - if (wtVelocity(n) < (cut_in_speed-buffer)) then - wtPower(n) = 0. - ! If we're at the spline of cut-in - else if (wtVelocity(n) > (cut_in_speed-buffer) .and. (wtVelocity(n) < (cut_in_speed+buffer))) then - x0 = cut_in_speed-buffer - x1 = cut_in_speed+buffer - y0 = 0. - y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 - dy0 = 0. - dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/(rated_ws**3) - call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) - ! If we're between cut-in and rated - else if ((wtVelocity(n) > (cut_in_speed+buffer)) .and. (wtVelocity(n) < (rated_ws-buffer))) then - wtPower(n) = rated_power*(wtVelocity(n)/rated_ws)**3 - ! If we're at the spline of rated - else if ((wtVelocity(n) > (rated_ws-buffer)) .and. (wtVelocity(n) < (rated_ws+buffer))) then - x0 = rated_ws-buffer - x1 = rated_ws+buffer - y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 - y1 = rated_power - dy0 = 3.*rated_power*(rated_ws-buffer)**2/(rated_ws**3) - dy1 = 0. - call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) - ! If we're between rated and cut-out - else if ((wtVelocity(n) > (rated_ws+buffer)) .and. (wtVelocity(n) < (cut_out_speed-buffer))) then - wtPower(n) = rated_power - ! If we're at the spline of cut-out - else if ((wtVelocity(n) > (cut_out_speed-buffer)) .and. (wtVelocity(n) < (cut_out_speed+buffer))) then - x0 = cut_out_speed-buffer - x1 = cut_out_speed+buffer - y0 = rated_power - y1 = 0. - dy0 = 0. - dy1 = 0. - call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) - ! If we're above cut-out - else if (wtVelocity(n) > (cut_out_speed+buffer)) then - wtPower(n) = 0. - end if - - end do - - dir_power = sum(wtPower) - -end subroutine DirPower - - -subroutine makeGrid_fortran(nRows, nTurbines, dx, dy, shear, rotate, turbs_per_row, x_start, & - & y0, turbineX, turbineY) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nRows, nTurbines - real(dp), intent(in) :: dx, dy, shear, rotate, y0 - integer, dimension(nRows), intent(in) :: turbs_per_row - real(dp), dimension(nRows), intent(in) :: x_start - - ! out - real(dp), dimension(nTurbines), intent(out) :: turbineX, turbineY - - ! local - integer :: i, j, index - real(dp) :: rotate_rad - real(dp), dimension(nTurbines) :: x, y - - index = 1 - - do i = 1, nRows - do j = 1, turbs_per_row(i) - x(index) = x_start(i) + dx*j + i*shear - y(index) = y0 + dy*i - index = index + 1 - end do - end do - - rotate_rad = (rotate*3.1415926535)/180.0 - turbineX = cos(rotate_rad)*x - sin(rotate_rad)*y - turbineY = sin(rotate_rad)*x + cos(rotate_rad)*y - - -end subroutine makeGrid_fortran - - -subroutine calcAEP_grid(nTurbines, nDirections, nRows, turbineZ, rotorDiameter, windDirections,& - &dx, dy, shear, rotate, turbs_per_row, x_start, y0,& - &windSpeeds, windFrequencies, shearExp, relaxationFactor, rated_ws, rated_power,& - &cut_in_speed, cut_out_speed, zref, z0, AEP) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines, nDirections, nRows - real(dp), intent(in) :: shearExp, relaxationFactor, rated_ws, rated_power, cut_in_speed,& - &cut_out_speed, zref, z0, dx, dy, shear, rotate, y0 - real(dp), dimension(nTurbines), intent(in) :: turbineZ, rotorDiameter - real(dp), dimension(nDirections), intent(in) :: windDirections, windSpeeds, windFrequencies - integer, dimension(nRows), intent(in) :: turbs_per_row - real(dp), dimension(nRows), intent(in) :: x_start - - ! out - real(dp), intent(out) :: AEP - - ! local - real(dp), dimension(nTurbines) :: turbineX, turbineY - real(dp), dimension(nDirections) :: dir_powers - real(dp), dimension(nTurbines) :: turbineXw, turbineYw, Vinf_floris, wtVelocity, loss - real(dp) :: hrs_per_year, pwrDir, Vinf - integer :: n, i - - call makeGrid_fortran(nRows, nTurbines, dx, dy, shear, rotate, turbs_per_row, x_start, & - & y0, turbineX, turbineY) - - do n = 1, nDirections - call WindFrame(nTurbines, windDirections(n), turbineX, turbineY, turbineXw, turbineYw) - call PowWind(nTurbines, windSpeeds(n), turbineZ, shearExp, zref, z0, Vinf_floris) - Vinf = Vinf_floris(1) - call GaussianWake(nTurbines, turbineXw, turbineYw, rotorDiameter(1), relaxationFactor, loss) - wtVelocity = Vinf*(1.0_dp-loss) - call DirPower(nTurbines, wtVelocity, rated_ws, rated_power, cut_in_speed, cut_out_speed, pwrDir) - dir_powers(n) = pwrDir - end do - - hrs_per_year = 365.*24. - AEP = hrs_per_year * (sum(windFrequencies * dir_powers)) - -end subroutine calcAEP_grid - - -subroutine GaussianWake(nTurbines, turbineXw, turbineYw, turb_diam, relaxationFactor, loss) - - implicit none - - ! define precision to be the standard for a double precision ! on local system - integer, parameter :: dp = kind(0.d0) - - ! in - integer, intent(in) :: nTurbines - real(dp), intent(in) :: turb_diam, relaxationFactor - real(dp), dimension(nTurbines), intent(in) :: turbineXw, turbineYw - - ! out - real(dp), dimension(nTurbines), intent(out) :: loss - - ! local - real(dp) :: CT, k, x, y, sigma, exponent, radical - real(dp), dimension(nTurbines) :: loss_array - real(dp), parameter :: pi = 3.141592653589793_dp, e = 2.718281828459045_dp, tol = 0.000001_dp - integer :: i, j - - CT = 4.0*1./3.*(1.0-1./3.) - k = 0.0324555 - - do i = 1, nTurbines - do j = 1, nTurbines - x = turbineXw(i) - turbineXw(j) - y = turbineYw(i) - turbineYw(j) - if (x > 0.0) then - sigma = k*x + turb_diam/sqrt(8.0) - exponent = -0.5 * (y/(relaxationFactor*sigma))**2 - radical = 1. - CT/(8.*sigma**2 / turb_diam**2) - loss_array(j) = (1.-sqrt(radical)) * e**exponent - else - loss_array(j) = 0.0 - end if - end do - loss(i) = sqrt(sum(loss_array**2)) - end do - -end subroutine GaussianWake - - - - - -! Generated by TAPENADE (INRIA, Ecuador team) -! Tapenade 3.14 (r7259) - 18 Jan 2019 09:31 -! -! Differentiation of windframe in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: turbinexw turbineyw -! with respect to varying inputs: turbinex turbiney -!global functions -SUBROUTINE WINDFRAME_DV(nturbines, wind_direction, turbinex, turbinexd, & -& turbiney, turbineyd, turbinexw, turbinexwd, turbineyw, turbineywd, & -& nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines - REAL(dp), INTENT(IN) :: wind_direction - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinex, turbiney - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexd, & -& turbineyd -! out - REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: turbinexw, turbineyw - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: turbinexwd, & -& turbineywd -! local - REAL(dp) :: winddirectiondeg, winddirectionrad - REAL(dp), PARAMETER :: pi=3.141592653589793_dp, tol=0.000001_dp - INTRINSIC COS - INTRINSIC SIN - INTEGER :: nd - INTEGER :: nbdirs - winddirectiondeg = 270. - wind_direction - IF (winddirectiondeg .LT. 0.) winddirectiondeg = winddirectiondeg + & -& 360. - winddirectionrad = pi*winddirectiondeg/180.0 - DO nd=1,nbdirs - turbinexwd(nd, :) = COS(-winddirectionrad)*turbinexd(nd, :) - SIN(-& -& winddirectionrad)*turbineyd(nd, :) - turbineywd(nd, :) = SIN(-winddirectionrad)*turbinexd(nd, :) + COS(-& -& winddirectionrad)*turbineyd(nd, :) - END DO - turbinexw = turbinex*COS(-winddirectionrad) - turbiney*SIN(-& -& winddirectionrad) - turbineyw = turbinex*SIN(-winddirectionrad) + turbiney*COS(-& -& winddirectionrad) -END SUBROUTINE WINDFRAME_DV - -! Differentiation of hermite_spline in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: y -! with respect to varying inputs: x -SUBROUTINE HERMITE_SPLINE_DV(x, xd, x0, x1, y0, dy0, y1, dy1, y, yd, & -& nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE -!dy_dx = c3*3*x**2 + c2*2*x + c1 - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - REAL(dp), INTENT(IN) :: x, x0, x1, y0, dy0, y1, dy1 - REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: xd -! out -!, dy_dx - REAL(dp), INTENT(OUT) :: y - REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: yd -! local - REAL(dp) :: c3, c2, c1, c0 - INTEGER :: nd - INTEGER :: nbdirs -! initialize coefficients for parametric cubic spline - c3 = 2.0_dp*y1/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) - 2.0_dp*& -& y0/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + dy0/(x0**2-2.0_dp& -& *x0*x1+x1**2) + dy1/(x0**2-2.0_dp*x0*x1+x1**2) - c2 = 3.0_dp*y0*(x0+x1)/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) -& -& dy1*(2.0_dp*x0+x1)/(x0**2-2.0_dp*x0*x1+x1**2) - dy0*(x0+2.0_dp*x1)/(& -& x0**2-2.0_dp*x0*x1+x1**2) - 3.0_dp*y1*(x0+x1)/(x0**3-3.0_dp*x0**2*x1& -& +3.0_dp*x0*x1**2-x1**3) - c1 = dy0*(x1**2+2.0_dp*x0*x1)/(x0**2-2.0_dp*x0*x1+x1**2) + dy1*(x0**2+& -& 2.0_dp*x1*x0)/(x0**2-2.0_dp*x0*x1+x1**2) - 6.0_dp*x0*x1*y0/(x0**3-& -& 3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + 6.0_dp*x0*x1*y1/(x0**3-& -& 3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) - c0 = y0*(-(x1**3)+3.0_dp*x0*x1**2)/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1& -& **2-x1**3) - y1*(-(x0**3)+3.0_dp*x1*x0**2)/(x0**3-3.0_dp*x0**2*x1+& -& 3.0_dp*x0*x1**2-x1**3) - x0*x1**2*dy0/(x0**2-2.0_dp*x0*x1+x1**2) - & -& x0**2*x1*dy1/(x0**2-2.0_dp*x0*x1+x1**2) - DO nd=1,nbdirs -! Solve for y and dy values at the given point - yd(nd) = c3*3*x**2*xd(nd) + c2*2*x*xd(nd) + c1*xd(nd) - END DO - y = c3*x**3 + c2*x**2 + c1*x + c0 -END SUBROUTINE HERMITE_SPLINE_DV - -! Differentiation of dirpower in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: dir_power -! with respect to varying inputs: wtvelocity -SUBROUTINE DIRPOWER_DV(nturbines, wtvelocity, wtvelocityd, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, dir_power, dir_powerd, & -& nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines - REAL(dp), INTENT(IN) :: rated_ws, rated_power, cut_in_speed, & -& cut_out_speed - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: wtvelocity - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: wtvelocityd -! out - REAL(dp), INTENT(OUT) :: dir_power - REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: dir_powerd -! local - REAL(dp), DIMENSION(nturbines) :: wtpower - REAL(dp), DIMENSION(nbdirs, nturbines) :: wtpowerd - REAL(dp) :: buffer, x0, x1, y0, y1, dy0, dy1 - INTEGER :: n - INTRINSIC SUM - INTEGER :: nd - INTEGER :: nbdirs - buffer = 0.1 - wtpowerd(:, :) = 0.0_8 - DO n=1,nturbines -! If we're below cut-in - IF (wtvelocity(n) .LT. cut_in_speed - buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = 0.0_8 - END DO - wtpower(n) = 0. -! If we're at the spline of cut-in - ELSE IF (wtvelocity(n) .GT. cut_in_speed - buffer .AND. wtvelocity(n& -& ) .LT. cut_in_speed + buffer) THEN - x0 = cut_in_speed - buffer - x1 = cut_in_speed + buffer - y0 = 0. - y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 - dy0 = 0. - dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/rated_ws**3 - CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & -& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & -& nbdirs) -! If we're between cut-in and rated - ELSE IF (wtvelocity(n) .GT. cut_in_speed + buffer .AND. wtvelocity(n& -& ) .LT. rated_ws - buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = rated_power*3*wtvelocity(n)**2*wtvelocityd(nd& -& , n)/rated_ws**3 - END DO - wtpower(n) = rated_power*(wtvelocity(n)/rated_ws)**3 -! If we're at the spline of rated - ELSE IF (wtvelocity(n) .GT. rated_ws - buffer .AND. wtvelocity(n) & -& .LT. rated_ws + buffer) THEN - x0 = rated_ws - buffer - x1 = rated_ws + buffer - y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 - y1 = rated_power - dy0 = 3.*rated_power*(rated_ws-buffer)**2/rated_ws**3 - dy1 = 0. - CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & -& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & -& nbdirs) -! If we're between rated and cut-out - ELSE IF (wtvelocity(n) .GT. rated_ws + buffer .AND. wtvelocity(n) & -& .LT. cut_out_speed - buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = 0.0_8 - END DO - wtpower(n) = rated_power -! If we're at the spline of cut-out - ELSE IF (wtvelocity(n) .GT. cut_out_speed - buffer .AND. wtvelocity(& -& n) .LT. cut_out_speed + buffer) THEN - x0 = cut_out_speed - buffer - x1 = cut_out_speed + buffer - y0 = rated_power - y1 = 0. - dy0 = 0. - dy1 = 0. - CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & -& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & -& nbdirs) -! If we're above cut-out - ELSE IF (wtvelocity(n) .GT. cut_out_speed + buffer) THEN - DO nd=1,nbdirs - wtpowerd(nd, n) = 0.0_8 - END DO - wtpower(n) = 0. - END IF - END DO - DO nd=1,nbdirs - dir_powerd(nd) = SUM(wtpowerd(nd, :)) - END DO - dir_power = SUM(wtpower) -END SUBROUTINE DIRPOWER_DV - -! Differentiation of makegrid_fortran in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: turbinex turbiney -! with respect to varying inputs: rotate dx dy shear -SUBROUTINE MAKEGRID_FORTRAN_DV(nrows, nturbines, dx, dxd, dy, dyd, shear& -& , sheard, rotate, rotated, turbs_per_row, x_start, y0, turbinex, & -& turbinexd, turbiney, turbineyd, nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nrows, nturbines - REAL(dp), INTENT(IN) :: dx, dy, shear, rotate, y0 - REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: dxd, dyd, sheard, & -& rotated - INTEGER, DIMENSION(nrows), INTENT(IN) :: turbs_per_row - REAL(dp), DIMENSION(nrows), INTENT(IN) :: x_start -! out - REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: turbinex, turbiney - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: turbinexd, & -& turbineyd -! local - INTEGER :: i, j, index - REAL(dp) :: rotate_rad - REAL(dp), DIMENSION(nbdirs) :: rotate_radd - REAL(dp), DIMENSION(nturbines) :: x, y - REAL(dp), DIMENSION(nbdirs, nturbines) :: xd, yd - INTRINSIC COS - INTRINSIC SIN - INTEGER :: nd - INTEGER :: nbdirs - index = 1 - xd(:, :) = 0.0_8 - yd(:, :) = 0.0_8 - DO i=1,nrows - DO j=1,turbs_per_row(i) - DO nd=1,nbdirs - xd(nd, index) = j*dxd(nd) + i*sheard(nd) - yd(nd, index) = i*dyd(nd) - END DO - x(index) = x_start(i) + dx*j + i*shear - y(index) = y0 + dy*i - index = index + 1 - END DO - END DO - rotate_rad = rotate*3.1415926535/180.0 - DO nd=1,nbdirs - rotate_radd(nd) = 3.1415926535*rotated(nd)/180.0 - turbinexd(nd, :) = COS(rotate_rad)*xd(nd, :) - rotate_radd(nd)*SIN(& -& rotate_rad)*x - rotate_radd(nd)*COS(rotate_rad)*y - SIN(rotate_rad& -& )*yd(nd, :) - turbineyd(nd, :) = rotate_radd(nd)*COS(rotate_rad)*x + SIN(& -& rotate_rad)*xd(nd, :) + COS(rotate_rad)*yd(nd, :) - rotate_radd(nd& -& )*SIN(rotate_rad)*y - END DO - turbinex = COS(rotate_rad)*x - SIN(rotate_rad)*y - turbiney = SIN(rotate_rad)*x + COS(rotate_rad)*y -END SUBROUTINE MAKEGRID_FORTRAN_DV - -! Differentiation of gaussianwake in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: loss -! with respect to varying inputs: turbinexw turbineyw loss -SUBROUTINE GAUSSIANWAKE_DV(nturbines, turbinexw, turbinexwd, turbineyw, & -& turbineywd, turb_diam, relaxationfactor, loss, lossd, nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines - REAL(dp), INTENT(IN) :: turb_diam, relaxationfactor - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinexw, turbineyw - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexwd, & -& turbineywd -! out - REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: loss - REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: lossd -! local - REAL(dp) :: ct, k, x, y, sigma, exponent, radical - REAL(dp), DIMENSION(nbdirs) :: xd, yd, sigmad, exponentd, radicald - REAL(dp), DIMENSION(nturbines) :: loss_array - REAL(dp), DIMENSION(nbdirs, nturbines) :: loss_arrayd - REAL(dp), PARAMETER :: pi=3.141592653589793_dp, e=2.718281828459045_dp& -& , tol=0.000001_dp - INTEGER :: i, j - INTRINSIC SQRT - INTRINSIC SUM - REAL :: result1 - REAL(dp) :: result10 - REAL(dp), DIMENSION(nbdirs) :: result10d - REAL(dp) :: pwr1 - REAL(dp), DIMENSION(nbdirs) :: pwr1d - REAL(dp), DIMENSION(nturbines) :: arg1 - REAL(dp), DIMENSION(nbdirs, nturbines) :: arg1d - REAL(dp) :: arg2 - REAL(dp), DIMENSION(nbdirs) :: arg2d - INTEGER :: nd - INTEGER :: nbdirs - ct = 4.0*1./3.*(1.0-1./3.) - k = 0.0324555 - loss_arrayd(:, :) = 0.0_8 - DO i=1,nturbines - DO j=1,nturbines - DO nd=1,nbdirs - xd(nd) = turbinexwd(nd, i) - turbinexwd(nd, j) - yd(nd) = turbineywd(nd, i) - turbineywd(nd, j) - END DO - x = turbinexw(i) - turbinexw(j) - y = turbineyw(i) - turbineyw(j) - IF (x .GT. 0.0) THEN - result1 = SQRT(8.0) - sigma = k*x + turb_diam/result1 - exponent = -(0.5*(y/(relaxationfactor*sigma))**2) - radical = 1. - ct/(8.*sigma**2/turb_diam**2) - result10 = SQRT(radical) - pwr1 = e**exponent - DO nd=1,nbdirs - sigmad(nd) = k*xd(nd) - exponentd(nd) = -(0.5*2*y*(yd(nd)*relaxationfactor*sigma-y*& -& relaxationfactor*sigmad(nd))/(relaxationfactor**3*sigma**3)) - radicald(nd) = ct*8.*2*sigma*sigmad(nd)/turb_diam**2/(8.*sigma& -& **2/turb_diam**2)**2 - IF (radical .EQ. 0.0) THEN - result10d(nd) = 0.0_8 - ELSE - result10d(nd) = radicald(nd)/(2.0*SQRT(radical)) - END IF - IF (e .GT. 0.0) THEN - pwr1d(nd) = LOG(e)*e**exponent*exponentd(nd) - ELSE - pwr1d(nd) = 0.0 - END IF - loss_arrayd(nd, j) = (1.-result10)*pwr1d(nd) - result10d(nd)*& -& pwr1 - END DO - loss_array(j) = (1.-result10)*pwr1 - ELSE - DO nd=1,nbdirs - loss_arrayd(nd, j) = 0.0_8 - END DO - loss_array(j) = 0.0 - END IF - END DO - arg1(:) = loss_array**2 - arg2 = SUM(arg1(:)) - DO nd=1,nbdirs - arg1d(nd, :) = 2*loss_array*loss_arrayd(nd, :) - arg2d(nd) = SUM(arg1d(nd, :)) - IF (arg2 .EQ. 0.0) THEN - lossd(nd, i) = 0.0_8 - ELSE - lossd(nd, i) = arg2d(nd)/(2.0*SQRT(arg2)) - END IF - END DO - loss(i) = SQRT(arg2) - END DO -END SUBROUTINE GAUSSIANWAKE_DV - -! Differentiation of calcaep_grid in forward (tangent) mode (with options multiDirectional i4 dr8 r4): -! variations of useful results: aep -! with respect to varying inputs: rotate dx dy shear -! RW status of diff variables: rotate:in dx:in dy:in aep:out -! shear:in -SUBROUTINE CALCAEP_GRID_DV(nturbines, ndirections, nrows, turbinez, & -& rotordiameter, winddirections, dx, dxd, dy, dyd, shear, sheard, rotate& -& , rotated, turbs_per_row, x_start, y0, windspeeds, windfrequencies, & -& shearexp, relaxationfactor, rated_ws, rated_power, cut_in_speed, & -& cut_out_speed, zref, z0, aep, aepd, nbdirs) - -! Hint: nbdirs should be the maximum number of differentiation directions - IMPLICIT NONE - INTRINSIC KIND -! define precision to be the standard for a double precision ! on local system - INTEGER, PARAMETER :: dp=KIND(0.d0) -! in - INTEGER, INTENT(IN) :: nturbines, ndirections, nrows - REAL(dp), INTENT(IN) :: shearexp, relaxationfactor, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, zref, z0, dx, dy, shear, & -& rotate, y0 - REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: dxd, dyd, sheard, & -& rotated - REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinez, rotordiameter - REAL(dp), DIMENSION(ndirections), INTENT(IN) :: winddirections, & -& windspeeds, windfrequencies - INTEGER, DIMENSION(nrows), INTENT(IN) :: turbs_per_row - REAL(dp), DIMENSION(nrows), INTENT(IN) :: x_start -! out - REAL(dp), INTENT(OUT) :: aep - REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: aepd -! local - REAL(dp), DIMENSION(nturbines) :: turbinex, turbiney - REAL(dp), DIMENSION(nbdirs, nturbines) :: turbinexd, turbineyd - REAL(dp), DIMENSION(ndirections) :: dir_powers - REAL(dp), DIMENSION(nbdirs, ndirections) :: dir_powersd - REAL(dp), DIMENSION(nturbines) :: turbinexw, turbineyw, vinf_floris, & -& wtvelocity, loss - REAL(dp), DIMENSION(nbdirs, nturbines) :: turbinexwd, turbineywd, & -& wtvelocityd, lossd - REAL(dp) :: hrs_per_year, pwrdir, vinf - REAL(dp), DIMENSION(nbdirs) :: pwrdird - INTEGER :: n, i - INTRINSIC SUM - REAL(dp), DIMENSION(ndirections) :: arg1 - REAL(dp), DIMENSION(nbdirs, ndirections) :: arg1d - INTEGER :: nd - INTEGER :: nbdirs - CALL MAKEGRID_FORTRAN_DV(nrows, nturbines, dx, dxd, dy, dyd, shear, & -& sheard, rotate, rotated, turbs_per_row, x_start, y0& -& , turbinex, turbinexd, turbiney, turbineyd, nbdirs) - dir_powersd(:, :) = 0.0_8 - lossd(:, :) = 0.0_8 - DO n=1,ndirections - CALL WINDFRAME_DV(nturbines, winddirections(n), turbinex, turbinexd& -& , turbiney, turbineyd, turbinexw, turbinexwd, turbineyw& -& , turbineywd, nbdirs) - CALL POWWIND(nturbines, windspeeds(n), turbinez, shearexp, zref, z0& -& , vinf_floris) - vinf = vinf_floris(1) - CALL GAUSSIANWAKE_DV(nturbines, turbinexw, turbinexwd, turbineyw, & -& turbineywd, rotordiameter(1), relaxationfactor, loss& -& , lossd, nbdirs) - DO nd=1,nbdirs - wtvelocityd(nd, :) = -(vinf*lossd(nd, :)) - END DO - wtvelocity = vinf*(1.0_dp-loss) - CALL DIRPOWER_DV(nturbines, wtvelocity, wtvelocityd, rated_ws, & -& rated_power, cut_in_speed, cut_out_speed, pwrdir, pwrdird& -& , nbdirs) - DO nd=1,nbdirs - dir_powersd(nd, n) = pwrdird(nd) - END DO - dir_powers(n) = pwrdir - END DO - hrs_per_year = 365.*24. - DO nd=1,nbdirs - arg1d(nd, :) = windfrequencies*dir_powersd(nd, :) - aepd(nd) = hrs_per_year*SUM(arg1d(nd, :)) - END DO - arg1(:) = windfrequencies*dir_powers - aep = hrs_per_year*SUM(arg1(:)) -END SUBROUTINE CALCAEP_GRID_DV diff --git a/code/full_aep.f90 b/code/full_aep.f90 new file mode 100644 index 0000000..40c63e1 --- /dev/null +++ b/code/full_aep.f90 @@ -0,0 +1,3740 @@ + +!global functions +subroutine WindFrame(nTurbines, wind_direction, turbineX, turbineY, turbineXw, turbineYw) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + integer, intent(in) :: nTurbines + real(dp), intent(in) :: wind_direction + real(dp), dimension(nTurbines), intent(in) :: turbineX, turbineY + + ! out + real(dp), dimension(nTurbines), intent(out) :: turbineXw, turbineYw + + ! local + real(dp) :: windDirectionDeg, windDirectionRad + real(dp), parameter :: pi = 3.141592653589793_dp, tol = 0.000001_dp + + windDirectionDeg = 270. - wind_direction + if (windDirectionDeg < 0.) then + windDirectionDeg = windDirectionDeg + 360. + end if + windDirectionRad = pi*windDirectionDeg/180.0 + + turbineXw = turbineX*cos(-windDirectionRad)-turbineY*sin(-windDirectionRad) + turbineYw = turbineX*sin(-windDirectionRad)+turbineY*cos(-windDirectionRad) + +end subroutine WindFrame + + +subroutine Hermite_Spline(x, x0, x1, y0, dy0, y1, dy1, y) + ! This function produces the y and dy values for a hermite cubic spline + ! interpolating between two end points with known slopes + ! + ! :param x: x position of output y + ! :param x0: x position of upwind endpoint of spline + ! :param x1: x position of downwind endpoint of spline + ! :param y0: y position of upwind endpoint of spline + ! :param dy0: slope at upwind endpoint of spline + ! :param y1: y position of downwind endpoint of spline + ! :param dy1: slope at downwind endpoint of spline + ! + ! :return: y: y value of spline at location x + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: x, x0, x1, y0, dy0, y1, dy1 + + ! out + real(dp), intent(out) :: y !, dy_dx + + ! local + real(dp) :: c3, c2, c1, c0 + + ! initialize coefficients for parametric cubic spline + c3 = (2.0_dp*(y1))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - & + (2.0_dp*(y0))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + & + (dy0)/(x0**2 - 2.0_dp*x0*x1 + x1**2) + & + (dy1)/(x0**2 - 2.0_dp*x0*x1 + x1**2) + + c2 = (3.0_dp*(y0)*(x0 + x1))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) - & + ((dy1)*(2.0_dp*x0 + x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - ((dy0)*(x0 + & + 2.0_dp*x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - (3.0_dp*(y1)*(x0 + x1))/(x0**3 - & + 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + + c1 = ((dy0)*(x1**2 + 2.0_dp*x0*x1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) + ((dy1)*(x0**2 + & + 2.0_dp*x1*x0))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - (6.0_dp*x0*x1*(y0))/(x0**3 - & + 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + (6.0_dp*x0*x1*(y1))/(x0**3 - & + 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - x1**3) + + c0 = ((y0)*(- x1**3 + 3.0_dp*x0*x1**2))/(x0**3 - 3.0_dp*x0**2*x1 + 3.0_dp*x0*x1**2 - & + x1**3) - ((y1)*(- x0**3 + 3.0_dp*x1*x0**2))/(x0**3 - 3.0_dp*x0**2*x1 + & + 3.0_dp*x0*x1**2 - x1**3) - (x0*x1**2*(dy0))/(x0**2 - 2.0_dp*x0*x1 + x1**2) - & + (x0**2*x1*(dy1))/(x0**2 - 2.0_dp*x0*x1 + x1**2) + + ! Solve for y and dy values at the given point + y = c3*x**3 + c2*x**2 + c1*x + c0 + !dy_dx = c3*3*x**2 + c2*2*x + c1 + +end subroutine Hermite_Spline + + + +! +! !power calculations" +subroutine PowWind(nTurbines, Uref, turbineZ, shearExp, zref, z0, & + &turbineSpeeds) + + implicit none + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + ! in + integer, intent(in) :: nTurbines + real(dp), intent(in) :: Uref, shearExp, zref, z0 + real(dp), dimension(nTurbines), intent(in) :: turbineZ + ! out + real(dp), dimension(nTurbines), intent(out) :: turbineSpeeds + ! local + integer :: n + + do n = 1, nTurbines + turbineSpeeds(n)= Uref*((turbineZ(n)-z0)/(zref-z0))**shearExp + end do + +end subroutine PowWind + + +subroutine DirPower(nTurbines, wtVelocity, rated_ws, rated_power, cut_in_speed, cut_out_speed,& + &dir_power) + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + integer, intent(in) :: nTurbines + real(dp), intent(in) :: rated_ws, rated_power, cut_in_speed, cut_out_speed + real(dp), dimension(nTurbines), intent(in) :: wtVelocity + + ! out + real(dp), intent(out) :: dir_power + + ! local + real(dp), dimension(nTurbines) :: wtPower + real(dp) :: buffer, x0, x1, y0, y1, dy0, dy1 + integer :: n + + buffer = 0.1 + + do n = 1, nTurbines + ! If we're below cut-in + if (wtVelocity(n) < (cut_in_speed-buffer)) then + wtPower(n) = 0. + ! If we're at the spline of cut-in + else if (wtVelocity(n) > (cut_in_speed-buffer) .and. (wtVelocity(n) < (cut_in_speed+buffer))) then + x0 = cut_in_speed-buffer + x1 = cut_in_speed+buffer + y0 = 0. + y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 + dy0 = 0. + dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/(rated_ws**3) + call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) + ! If we're between cut-in and rated + else if ((wtVelocity(n) > (cut_in_speed+buffer)) .and. (wtVelocity(n) < (rated_ws-buffer))) then + wtPower(n) = rated_power*(wtVelocity(n)/rated_ws)**3 + ! If we're at the spline of rated + else if ((wtVelocity(n) > (rated_ws-buffer)) .and. (wtVelocity(n) < (rated_ws+buffer))) then + x0 = rated_ws-buffer + x1 = rated_ws+buffer + y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 + y1 = rated_power + dy0 = 3.*rated_power*(rated_ws-buffer)**2/(rated_ws**3) + dy1 = 0. + call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) + ! If we're between rated and cut-out + else if ((wtVelocity(n) > (rated_ws+buffer)) .and. (wtVelocity(n) < (cut_out_speed-buffer))) then + wtPower(n) = rated_power + ! If we're at the spline of cut-out + else if ((wtVelocity(n) > (cut_out_speed-buffer)) .and. (wtVelocity(n) < (cut_out_speed+buffer))) then + x0 = cut_out_speed-buffer + x1 = cut_out_speed+buffer + y0 = rated_power + y1 = 0. + dy0 = 0. + dy1 = 0. + call Hermite_Spline(wtVelocity(n), x0, x1, y0, dy0, y1, dy1, wtPower(n)) + ! If we're above cut-out + else if (wtVelocity(n) > (cut_out_speed+buffer)) then + wtPower(n) = 0. + end if + + end do + + dir_power = sum(wtPower) + +end subroutine DirPower + + +subroutine calcAEP(nTurbines, nDirections, nRotorPoints, nCtPoints,& + &turbineX, turbineY, turbineZ, rotorDiameter, Ct, yawDeg, windDirections,& + &windSpeeds, windFrequencies, shearExp, rated_ws, rated_power,& + &cut_in_speed, cut_out_speed, zref, z0,& + &ky, kz, alpha, beta, TI, wec_factor, RotorPointsY, RotorPointsZ,& + &ct_curve_wind_speed, ct_curve_ct, sm_smoothing, wake_combination_method, TI_calculation_method,& + &wake_model_version, interp_type, calc_k_star, print_ti, use_ct_curve,AEP) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + integer, intent(in) :: nTurbines, nDirections, nRotorPoints, nCtPoints + real(dp), dimension(nTurbines), intent(in) :: turbineX, turbineY, turbineZ, rotorDiameter, Ct, yawDeg + real(dp), dimension(nDirections), intent(in) :: windDirections, windSpeeds, windFrequencies + real(dp), intent(in) :: shearExp, rated_ws, rated_power, cut_in_speed, cut_out_speed, zref, z0 + real(dp), intent(in) :: ky, kz, alpha, beta, TI, wec_factor + real(dp), dimension(nRotorPoints), intent(in) :: RotorPointsY, RotorPointsZ + real(dp), dimension(nCtPoints), intent(in) :: ct_curve_wind_speed, ct_curve_ct + real(dp), intent(in) :: sm_smoothing + integer, intent(in) :: wake_combination_method, TI_calculation_method, & + & wake_model_version, interp_type + logical, intent(in) :: calc_k_star, print_ti, use_ct_curve + + ! out + real(dp), intent(out) :: AEP + + ! local + real(dp), dimension(nDirections) :: dir_powers + real(dp), dimension(nTurbines) :: turbineXw, turbineYw, Vinf_floris, wtVelocity, loss + real(dp) :: hrs_per_year, pwrDir, Vinf + integer :: n, i + integer, dimension(nTurbines) :: sorted_x_idx + + do n = 1, nDirections + call WindFrame(nTurbines, windDirections(n), turbineX, turbineY, turbineXw, turbineYw) + call PowWind(nTurbines, windSpeeds(n), turbineZ, shearExp, zref, z0, Vinf_floris) + Vinf = Vinf_floris(1) + call sort_turbs(nTurbines,turbineXw,sorted_x_idx) + ! call GaussianWake(nTurbines, turbineXw, turbineYw, rotorDiameter(1), relaxationFactor, loss) + ! wtVelocity = Vinf*(1.0_dp-loss) + + if (Vinf > cut_in_speed) then + call porteagel_analyze(nTurbines, nRotorPoints, nCtPoints, turbineXw, & + sorted_x_idx, turbineYw, turbineZ, & + rotorDiameter, Ct, Vinf, & + yawDeg, ky, kz, alpha, beta, TI, RotorPointsY, RotorPointsZ, & + zref, z0, shearExp, wake_combination_method, & + TI_calculation_method, calc_k_star, wec_factor, print_ti, & + wake_model_version, interp_type, & + use_ct_curve, ct_curve_wind_speed, ct_curve_ct, sm_smoothing, & + wtVelocity) + else + do i = 1, nTurbines + wtVelocity(i) = 0.0 + end do + end if + ! print *, wtVelocity + call DirPower(nTurbines, wtVelocity, rated_ws, rated_power, cut_in_speed, cut_out_speed, pwrDir) + dir_powers(n) = pwrDir + end do + + hrs_per_year = 365.*24. + AEP = hrs_per_year * (sum(windFrequencies * dir_powers)) + +end subroutine calcAEP + + +subroutine sort_turbs(nTurbines,turbineX,sorted_x_idx) + + implicit none + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + integer, intent(in) :: nTurbines + real(dp), dimension(nTurbines), intent(in) :: turbineX + + ! out + integer, dimension(nTurbines), intent(out) :: sorted_x_idx + + ! local + integer :: i, j, index + real(dp) :: min + real(dp), dimension(nTurbines) :: sorting_turbines + + + do i = 1, nTurbines + sorting_turbines(i) = turbineX(i) + end do + + do i = 1, nTurbines + index = 1 + min = 9999999.0 + do j = 1, nTurbines + if (sorting_turbines(j) < min) then + min = sorting_turbines(j) + index = j + end if + end do + sorted_x_idx(i) = index-1 + sorting_turbines(index) = 99999999.0 + end do + +end subroutine sort_turbs + + + +! implementation of the Bastankhah and Porte Agel (BPA) wake model for analysis +subroutine porteagel_analyze(nTurbines, nRotorPoints, nCtPoints, turbineXw, & + sorted_x_idx, turbineYw, turbineZ, & + rotorDiameter, Ct, wind_speed, & + yawDeg, ky, kz, alpha, beta, TI, RotorPointsY, RotorPointsZ, & + z_ref, z_0, shear_exp, wake_combination_method, & + TI_calculation_method, calc_k_star, wec_factor, print_ti, & + wake_model_version, interp_type, & + use_ct_curve, ct_curve_wind_speed, ct_curve_ct, sm_smoothing, & + wtVelocity) + + ! independent variables: turbineXw turbineYw turbineZ rotorDiameter Ct yawDeg + + ! dependent variables: wtVelocity + + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + integer, intent(in) :: nTurbines, nRotorPoints, nCtPoints + integer, intent(in) :: wake_combination_method, TI_calculation_method, & + & wake_model_version, interp_type + logical, intent(in) :: calc_k_star, print_ti, use_ct_curve + real(dp), dimension(nTurbines), intent(in) :: turbineXw, turbineYw, turbineZ + integer, dimension(nTurbines), intent(in) :: sorted_x_idx + real(dp), dimension(nTurbines), intent(in) :: rotorDiameter, yawDeg + real(dp), dimension(nTurbines) :: Ct + real(dp), intent(in) :: ky, kz, alpha, beta, TI, wind_speed, z_ref, z_0, shear_exp, wec_factor + real(dp), dimension(nRotorPoints), intent(in) :: RotorPointsY, RotorPointsZ + real(dp), dimension(nCtPoints), intent(in) :: ct_curve_wind_speed, ct_curve_ct + real(dp), intent(in) :: sm_smoothing + + ! local (General) + real(dp), dimension(nTurbines) :: yaw, TIturbs, Ct_local, ky_local, kz_local + real(dp) :: x0, deltax0, deltay, theta_c_0, sigmay, sigmaz, wake_offset, k_star + real(dp) :: x, deltav, deltaz, sigmay_dp, sigmaz_dp, deltax0_dp, deficit_sum + real(dp) :: tol, discontinuity_point, TI_area_ratio + real(dp) :: TI_area_ratio_tmp, TI_dst_tmp, TI_ust_tmp, rpts + real(dp) :: LocalRotorPointY, LocalRotorPointZ, point_velocity, point_z, point_velocity_with_shear + Integer :: u, d, turb, turbI, p + real(dp), parameter :: pi = 3.141592653589793_dp + + ! model out + real(dp), dimension(nTurbines), intent(out) :: wtVelocity + + intrinsic sin, cos, atan, max, sqrt, log + + ! bastankhah and porte agel 2016 define yaw to be positive clockwise, this is reversed + yaw = - yawDeg*pi/180.0_dp + + ! set tolerance for location checks + tol = 0.1_dp + + ! initialize wind turbine velocities to 0.0 + wtVelocity = 0.0_dp + + ! initialize TI of all turbines to free-stream value + !print *, "start TIturbs: ", TIturbs + TIturbs = TI + + + ! initialize the local wake factors + ky_local(:) = ky + kz_local(:) = kz + Ct_local(:) = Ct + + + !print *, 'wake model version: ', wake_model_version + + !print *, "ky_local: ", ky_local + !print *, "kz_local: ", kz_local + !print *, "TIturbs init: ", TIturbs + + do, d=1, nTurbines + + ! get index of downstream turbine + turbI = sorted_x_idx(d) + 1 + + do, p=1, nRotorPoints + + ! initialize the TI_area_ratio to 0.0 for each turbine + TI_area_ratio = 0.0_dp + + ! initialize deficit summation term to zero + deficit_sum = 0.0_dp + + ! scale rotor sample point coordinate by rotor diameter (in rotor hub ref. frame) + LocalRotorPointY = RotorPointsY(p)*0.5_dp*rotorDiameter(turbI) + LocalRotorPointZ = RotorPointsZ(p)*0.5_dp*rotorDiameter(turbI) +! !print *, "rotorDiameter after local rotor points", rotorDiameter +! !print *, "local rotor points Y,Z: ", LocalRotorPointY, LocalRotorPointZ + + do, u=1, nTurbines ! at turbineX-locations + + ! get index of upstream turbine + turb = sorted_x_idx(u) + 1 + + ! skip this loop if turb = turbI (turbines impact on itself) + if (turb .eq. turbI) cycle + + ! downstream distance between upstream turbine and point + x = turbineXw(turbI) - turbineXw(turb) + LocalRotorPointY*sin(yaw(turbI)) + + ! set this iterations velocity deficit to 0 + deltav = 0.0_dp + + ! check turbine relative locations + if (x > (0.0_dp + tol)) then + + !print *, "rotorDiameter before x0 ", rotorDiameter + + ! determine the onset location of far wake + call x0_func(rotorDiameter(turb), yaw(turb), Ct_local(turb), alpha, & + & TIturbs(turb), beta, x0) +! call x0_func(rotorDiameter(turb), yaw(turb), Ct(turb), alpha, & +! & TI, beta, x0) + + ! downstream distance from far wake onset to downstream turbine + deltax0 = x - x0 + + ! calculate wake spreading parameter at each turbine if desired + if (calc_k_star .eqv. .true.) then + call k_star_func(TIturbs(turb), k_star) + ky_local(turb) = k_star + kz_local(turb) = k_star + end if + + !print *, "ky_local ", ky_local + !print *, "deltax0 ", deltax0 + !print *, "turbineZ ", turbineZ + !print *, "rotorDiameter after x0 ", rotorDiameter + !print *, "Ct ", Ct + !print *, "yaw ", yaw + + ! determine the initial wake angle at the onset of far wake + call theta_c_0_func(yaw(turb), Ct_local(turb), theta_c_0) + !print *, "theta_c_0 ", theta_c_0 + ! horizontal spread + call sigmay_func(ky_local(turb), deltax0, rotorDiameter(turb), yaw(turb), sigmay) + !print *, "sigmay ", sigmay + !print *, "rotorDiameter after sigmay", rotorDiameter + ! vertical spread + call sigmaz_func(kz_local(turb), deltax0, rotorDiameter(turb), sigmaz) + !print *, "sigmaz ", sigmaz + !print *, "rotorDiameter after sigmaz ", rotorDiameter + ! horizontal cross-wind wake displacement from hub + call wake_offset_func(rotorDiameter(turb), theta_c_0, x0, yaw(turb), & + & ky_local(turb), kz_local(turb), Ct_local(turb), sigmay, sigmaz, wake_offset) + + + !print *, "wake_offset ", wake_offset + ! cross wind distance from downstream point location to wake center + deltay = LocalRotorPointY*cos(yaw(turbI)) + turbineYw(turbI) - (turbineYw(turb) + wake_offset) + + ! cross wind distance from hub height to height of point of interest + deltaz = LocalRotorPointZ + turbineZ(turbI) - turbineZ(turb) + + !print *, "dx, dy, dz: ", x, deltay, deltaz + !print *, "local y,z : ", LocalRotorPointY, LocalRotorPointZ, turb, turbI, p + !print *, deltaz, deltay + ! far wake region + + ! find the final point where the original model is undefined + call discontinuity_point_func(x0, rotorDiameter(turb), ky_local(turb), & + & kz_local(turb), yaw(turb), Ct_local(turb), & + & discontinuity_point) + !print *, "discontinuity point is: ", discontinuity_point + if (x > discontinuity_point) then + + !print *, x + + ! velocity difference in the wake + call deltav_func(deltay, deltaz, Ct_local(turb), yaw(turb), & + & sigmay, sigmaz, rotorDiameter(turb), & + & wake_model_version, kz_local(turb), x, & + & wec_factor, deltav) + !print *, "rotorDiameter after far deltav ", rotorDiameter + ! near wake region (linearized) + else + + ! determine distance from discontinuity point to far wake onset + deltax0_dp = discontinuity_point - x0 + + ! horizontal spread at far wake onset + call sigmay_func(ky_local(turb), deltax0_dp, rotorDiameter(turb), yaw(turb), sigmay_dp) + + ! vertical spread at far wake onset + call sigmaz_func(kz_local(turb), deltax0_dp, rotorDiameter(turb), sigmaz_dp) + + ! print *, "inputs in parent: ", deltay, deltaz, Ct(turb), yaw(turb), sigmay_dp, sigmaz_dp, & +! & rotorDiameter(turb), x, discontinuity_point, sigmay_dp, sigmaz_dp, & +! & wake_model_version, kz_local, x0, & +! & wec_factor + + ! velocity deficit in the nearwake (linear model) + call deltav_near_wake_lin_func(deltay, deltaz, & + & Ct_local(turb), yaw(turb), sigmay_dp, sigmaz_dp, & + & rotorDiameter(turb), x, discontinuity_point, sigmay_dp, sigmaz_dp, & + & wake_model_version, kz_local(turb), x0, & + & wec_factor, deltav) + + !print *, "rotorDiameter after deltav near ", rotorDiameter + end if + + ! combine deficits according to selected method wake combination method + call wake_combination_func(wind_speed, wtVelocity(turb), deltav, & + wake_combination_method, deficit_sum) + + if ((x > 0.0_dp) .and. (TI_calculation_method > 0)) then + !print *, "turbI, turb: ", turbI, turb + ! calculate TI value at each turbine +! print *, "turb, turbI: ", turb, turbI + + ! save ti_area_ratio and ti_dst to new memory locations to avoid + ! aliasing during differentiation + TI_area_ratio_tmp = TI_area_ratio + TI_dst_tmp = TIturbs(turbI) + TI_ust_tmp = TIturbs(turb) + + call added_ti_func(TI, Ct_local(turb), x, ky_local(turb), rotorDiameter(turb), & + & rotorDiameter(turbI), deltay, turbineZ(turb), & + & turbineZ(turbI), sm_smoothing, TI_ust_tmp, & + & TI_calculation_method, TI_area_ratio_tmp, & + & TI_dst_tmp, TI_area_ratio, TIturbs(turbI)) + + !print *, "rotorDiameter after TI calcs", rotorDiameter + end if + +! !print *, "deficit_sum, turbI, p, turb: ", deficit_sum, turbI, p, turb + + end if + + end do + + ! print *, deficit_sum + + ! find velocity at point p due to the wake of turbine turb + point_velocity = wind_speed - deficit_sum + + !print *, "point velocity, deficit_sum, turbI, p: ", point_velocity, deficit_sum, turbI, p + + ! put sample point height in global reference frame + point_z = LocalRotorPointZ + turbineZ(turbI) + + !print *, "point_z, turbI, p: ", point_z, turbI, p + ! adjust sample point velocity for shear + call wind_shear_func(point_z, point_velocity, z_ref, z_0, shear_exp, point_velocity_with_shear) + !print *, "v, vs, x, turb, turbI, p: ", point_velocity, point_velocity_with_shear, x, turb, turbI, p + ! add sample point velocity to turbine velocity to be averaged later + wtVelocity(turbI) = wtVelocity(turbI) + point_velocity_with_shear + + end do + + ! final velocity calculation for turbine turbI (average equally across all points) + rpts = REAL(nRotorPoints, dp) +! print *, rpts, nRotorPoints, wtVelocity(turbI), wtVelocity(turbI)/rpts, wtVelocity(turbI)/nRotorPoints +! STOP 1 + wtVelocity(turbI) = wtVelocity(turbI)/rpts +! print *, wtVelocity(turbI) + if (use_ct_curve) then + ! print *, "wtVelocity(turbI): ", wtVelocity(turbI) + call interpolation(nCtPoints, interp_type, ct_curve_wind_speed, ct_curve_ct, & + & wtVelocity(turbI), Ct_local(turbI), 0.0_dp, 0.0_dp, .false.) + ! print *, "Ct_local(turbI): ", Ct_local(turbI) + end if + ! print *, Ct_local(turbI) + end do + + !! print TIturbs values to a file +! if (print_ti) then +! open(unit=2, file="TIturbs_tmp.txt") +! do, turb=1, nTurbines +! write(2,*) TIturbs(turb) +! end do +! close(2) +! end if + + !print *, "TIturbs: ", TIturbs + !print *, wtVelocity + + !! make sure turbine inflow velocity is non-negative +! if (wtVelocity(turbI) .lt. 0.0_dp) then +! wtVelocity(turbI) = 0.0_dp +! end if + !print *, "fortran" + +end subroutine porteagel_analyze + + +! calculates the onset of far-wake conditions +subroutine x0_func(rotor_diameter, yaw, Ct, alpha, TI, beta, x0) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: rotor_diameter, yaw, Ct, alpha, TI, beta + + ! out + real(dp), intent(out) :: x0 + + intrinsic cos, sqrt + + + ! determine the onset location of far wake + x0 = rotor_diameter * (cos(yaw) * (1.0_dp + sqrt(1.0_dp - Ct)) / & + (sqrt(2.0_dp) * (alpha * TI + beta * & + & (1.0_dp - sqrt(1.0_dp - Ct))))) + +end subroutine x0_func + + +! calculates the wake angle at the onset of far wake conditions +subroutine theta_c_0_func(yaw, Ct, theta_c_0) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: yaw, Ct + + ! out + real(dp), intent(out) :: theta_c_0 + + intrinsic cos, sqrt + + ! determine the initial wake angle at the onset of far wake + theta_c_0 = 0.3_dp * yaw * (1.0_dp - sqrt(1.0_dp - Ct * cos(yaw))) / cos(yaw) + +end subroutine theta_c_0_func + + +! calculates the horizontal spread of the wake at a given distance from the onset of far +! wake condition +subroutine sigmay_func(ky, deltax0, rotor_diameter, yaw, sigmay) + + implicit none + + ! define precision to be the standard for a double precision on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: ky, deltax0, rotor_diameter, yaw + + ! out + real(dp), intent(out) :: sigmay + + intrinsic cos, sqrt + + ! horizontal spread + sigmay = rotor_diameter * (ky * deltax0 / rotor_diameter + cos(yaw) / sqrt(8.0_dp)) + +end subroutine sigmay_func + + +! calculates the vertical spread of the wake at a given distance from the onset of far +! wake condition +subroutine sigmaz_func(kz, deltax0, rotor_diameter, sigmaz) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: kz, deltax0, rotor_diameter + + ! out + real(dp), intent(out) :: sigmaz + + ! load necessary intrinsic functions + intrinsic sqrt + + ! vertical spread + sigmaz = rotor_diameter * (kz * deltax0 / rotor_diameter + 1.0_dp / sqrt(8.0_dp)) + +end subroutine sigmaz_func + + +! calculates the horizontal distance from the wake center to the hub of the turbine making +! the wake +subroutine wake_offset_func(rotor_diameter, theta_c_0, x0, yaw, ky, kz, Ct, sigmay, & + & sigmaz, wake_offset) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: rotor_diameter, theta_c_0, x0, yaw, ky, kz, Ct, sigmay + real(dp), intent(in) :: sigmaz + + ! out + real(dp), intent(out) :: wake_offset + + intrinsic cos, sqrt, log + + ! horizontal cross-wind wake displacement from hub + wake_offset = rotor_diameter * ( & + theta_c_0 * x0 / rotor_diameter + & + (theta_c_0 / 14.7_dp) * sqrt(cos(yaw) / (ky * kz * Ct)) * & + (2.9_dp + 1.3_dp * sqrt(1.0_dp - Ct) - Ct) * & + log( & + ((1.6_dp + sqrt(Ct)) * & + (1.6_dp * sqrt(8.0_dp * sigmay * sigmaz / & + (cos(yaw) * rotor_diameter ** 2)) & + - sqrt(Ct))) / & + ((1.6_dp - sqrt(Ct)) * & + (1.6_dp * sqrt(8.0_dp * sigmay * sigmaz / & + (cos(yaw) * rotor_diameter ** 2)) & + + sqrt(Ct))) & + ) & + ) +end subroutine wake_offset_func + + +! calculates the velocity difference between hub velocity and free stream for a given wake +! for use in the far wake region +subroutine deltav_func(deltay, deltaz, Ct, yaw, sigmay, sigmaz, & + & rotor_diameter_ust, version, k, deltax, wec_factor, deltav) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: deltay, deltaz, Ct, yaw, sigmay + real(dp), intent(in) :: sigmaz, rotor_diameter_ust, wec_factor + real(dp), intent(in) :: k, deltax ! only for 2014 version + integer, intent(in) :: version + + ! local + real(dp) :: beta_2014, epsilon_2014 ! only for 2014 version + + ! out + real(dp), intent(out) :: deltav + + ! load intrinsic functions + intrinsic cos, sqrt, exp + + !print *, "rotor_diameter in deltav entry", rotor_diameter_ust +! print *, 'wake model version in deltav: ', version + + if (version == 2014) then + !print *, "in 2014 version" + beta_2014 = 0.5_dp*(1.0_dp + sqrt(1.0_dp - Ct))/sqrt(1.0_dp - Ct) + epsilon_2014 = 0.2_dp*sqrt(beta_2014) + + ! print *, "beta = ", beta_2014, "epsilon = ", epsilon_2014 + ! print *, "k, deltax: ", k, deltax + ! print *, "term: ", Ct & +! / (8.0_dp * (k*deltax/rotor_diameter_ust+epsilon_2014)**2) + deltav = ( & + (1.0_dp - sqrt(1.0_dp - Ct & + / (8.0_dp * ((k*deltax/rotor_diameter_ust)+epsilon_2014)**2)))* & + exp((-1.0_dp/(2.0_dp*((k*deltax/rotor_diameter_ust) + epsilon_2014)**2))* & + ((deltaz/(wec_factor*rotor_diameter_ust))**2 + (deltay/(wec_factor*rotor_diameter_ust))**2)) & + ) + ! print *, "deltav 2014 = ", deltav + else if (version == 2016) then + ! velocity difference in the wake at each sample point + deltav = ( & + (1.0_dp - sqrt(1.0_dp - Ct * & + cos(yaw) / (8.0_dp * sigmay * sigmaz / (rotor_diameter_ust ** 2)))) * & + exp(-0.5_dp * (deltay / (wec_factor*sigmay)) ** 2) * exp(-0.5_dp * (deltaz / (wec_factor*sigmaz)) ** 2)& + ) + else + print *, "Invalid Bastankhah and Porte Agel model version. Must be 2014 or 2016. ", version, " was given." + stop 1 + end if + + !print *, "rotor_diameter in deltav exit", rotor_diameter_ust + +end subroutine deltav_func + + +! calculates the velocity difference between hub velocity and free stream for a given wake +! for use in the near wake region only +subroutine deltav_near_wake_lin_func(deltay, deltaz, Ct, yaw, & + & sigmay, sigmaz, rotor_diameter_ust, x, & + & discontinuity_point, sigmay0, sigmaz0, version, k, & + & deltax0_dp, wec_factor, deltav) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: deltay, deltaz, Ct, yaw, sigmay + real(dp), intent(in) :: sigmaz, rotor_diameter_ust, wec_factor + real(dp), intent(in) :: x, discontinuity_point, sigmay0, sigmaz0 + real(dp), intent(in) :: k, deltax0_dp ! only for 2014 version + integer, intent(in) :: version + + ! local + real(dp) :: deltav0m, deltavr + real(dp) :: beta_2014, epsilon_2014 ! only for 2014 version + + ! out + real(dp), intent(out) :: deltav + + ! load intrinsic functions + intrinsic cos, sqrt, exp + + ! print *, 'wake model version in deltav near wake: ', version +! print *, "inputs: ", deltay, deltaz, Ct, yaw, & +! & sigmay, sigmaz, rotor_diameter_ust, x, & +! & discontinuity_point, sigmay0, sigmaz0, version, k, & +! & deltax0_dp, wec_factor + if (version == 2014) then + if (yaw > 0.0_dp) then + print *, "model version 2014 may only be used when yaw=0" + stop 1 + end if + beta_2014 = 0.5_dp*(1.0_dp + sqrt(1.0_dp - Ct))/sqrt(1.0_dp - Ct) + epsilon_2014 = 0.2_dp*sqrt(beta_2014) + + ! magnitude term of gaussian at x0 + deltav0m = (1.0_dp - sqrt(1.0_dp - Ct & + / (8.0_dp * (k*deltax0_dp/rotor_diameter_ust+epsilon_2014)**2))) + + ! initialize the gaussian magnitude term at the rotor for the linear interpolation + deltavr = deltav0m + + ! linearized gaussian magnitude term for near wake + deltav = ( & + (((deltav0m - deltavr)/discontinuity_point) * x + deltavr) * & + exp((-1.0_dp/(2.0_dp*(k*deltax0_dp/rotor_diameter_ust + epsilon_2014)**2))* & + ((deltaz/(wec_factor*rotor_diameter_ust))**2 + (deltay/(wec_factor*rotor_diameter_ust))**2)) & + ) + else if (version == 2016) then + + ! magnitude term of gaussian at x0 + deltav0m = ( & + (1.0_dp - sqrt(1.0_dp - Ct * & + cos(yaw) / (8.0_dp * sigmay0 * sigmaz0 / & + (rotor_diameter_ust ** 2))))) + ! initialize the gaussian magnitude term at the rotor for the linear interpolation + deltavr = deltav0m + + ! linearized gaussian magnitude term for near wake + deltav = (((deltav0m - deltavr)/discontinuity_point) * x + deltavr) * & + exp(-0.5_dp * (deltay / (wec_factor*sigmay)) ** 2) * & + exp(-0.5_dp * (deltaz / (wec_factor*sigmaz)) ** 2) + else + print *, "Invalid Bastankhah and Porte Agel model version. Must be 2014 or 2016. ", version, " was given." + stop 1 + end if + +end subroutine deltav_near_wake_lin_func + +! calculates the overlap area between a given wake and a rotor area +subroutine overlap_area_func(turbine_y, turbine_z, rotor_diameter, & + wake_center_y, wake_center_z, wake_diameter, & + wake_overlap) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: turbine_y, turbine_z, rotor_diameter + real(dp), intent(in) :: wake_center_y, wake_center_z, wake_diameter + + ! out + real(dp), intent(out) :: wake_overlap + + ! local + real(dp), parameter :: pi = 3.141592653589793_dp, tol = 0.000001_dp + real(dp) :: OVdYd, OVr, OVRR, OVL, OVz, OVz2 + + ! load intrinsic functions + intrinsic acos, sqrt + +! print *, turbine_y, turbine_z, rotor_diameter, & +! wake_center_y, wake_center_z, wake_diameter, & +! wake_overlap + + ! distance between wake center and rotor center + if ((wake_center_z > (turbine_z + tol)) .or. (wake_center_z < (turbine_z - tol))) then + OVdYd = sqrt((wake_center_y-turbine_y)**2_dp + (wake_center_z - turbine_z)**2_dp) + else if (wake_center_y > (turbine_y + tol)) then! potential source of gradient issues, abs() did not cause a problem in FLORIS + OVdYd = wake_center_y - turbine_y + else if (turbine_y > (wake_center_y + tol)) then + OVdYd = turbine_y - wake_center_y + else + OVdYd = 0.0_dp + end if + + !print *, "OVdYd: ", OVdYd + ! find rotor radius + OVr = rotor_diameter/2.0_dp + !print *, "OVr: ", OVr + + ! find wake radius + OVRR = wake_diameter/2.0_dp + !print *, "OVRR: ", OVRR + + ! determine if there is overlap + if (OVdYd < (OVr+OVRR)) then ! if the rotor overlaps the wake zone + + ! check that turbine and wake centers are not perfectly aligned + if (OVdYd > (0.0_dp + tol)) then + + ! check if the rotor is wholly contained in the wake + if ((OVdYd + OVr) < OVRR + tol) then + wake_overlap = pi*OVr*OVr +! print *, "1" + ! check if the wake is wholly contained in the rotor swept area + else if ((OVdYd + OVRR) < OVr + tol) then + wake_overlap = pi*OVRR*OVRR +! print *, "2" + else + + ! calculate the distance from the wake center to the chord connecting the lens + ! cusps + OVL = (-OVr*OVr+OVRR*OVRR+OVdYd*OVdYd)/(2.0_dp*OVdYd) + + OVz = sqrt(OVRR*OVRR-OVL*OVL) + OVz2 = sqrt(OVr*OVr-(OVdYd-OVL)*(OVdYd-OVL)) + + wake_overlap = OVRR*OVRR*acos(OVL/OVRR) + OVr*OVr*acos((OVdYd-OVL)/OVr) - & + & OVL*OVz - (OVdYd-OVL)*OVz2 +! print *, OVRR, OVr, OVdYd, OVL, OVz, OVz2 +! print *, "3" + end if + + ! perfect overlap case where the wake is larger than the rotor + else if (OVRR > OVr) then + wake_overlap = pi*OVr*OVr +! print *, "4" + + ! perfect overlap case where the rotor is larger than the wake + else + wake_overlap = pi*OVRR*OVRR +! print *, "5" + end if + + ! case with no overlap + else + wake_overlap = 0.0_dp + end if + +! print *, "wake overlap in func: ", wake_overlap/(pi*OVr**2) +! print *, "wake overlap in func: ", wake_overlap/(pi*OVRR**2) + + if ((wake_overlap/(pi*OVr*OVr) > (1.0_dp + tol)) .or. (wake_overlap/(pi*OVRR*OVRR) > (1.0_dp + tol))) then + print *, "wake overlap in func: ", wake_overlap/(pi*OVr*OVr) + print *, "wake overlap in func: ", wake_overlap/(pi*OVRR*OVRR) + STOP 1 + end if + +end subroutine overlap_area_func + +! combines wakes using various methods +subroutine wake_combination_func(wind_speed, turb_inflow, deltav, & + wake_combination_method, deficit_sum) + + ! combines wakes to calculate velocity at a given turbine + ! wind_speed = Free stream velocity + ! turb_inflow = Effective velocity as seen by the upstream rotor + ! deltav = Velocity deficit percentage for current turbine pair + ! wake_combination_method = Use for selecting which method to use for wake combo + ! deficit_sum (in) = Combined deficits prior to including the current deltav + ! deficit_sum (out) = Combined deficits after to including the current deltav + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: wind_speed, turb_inflow, deltav + integer, intent(in) :: wake_combination_method + + ! out + real(dp), intent(inout) :: deficit_sum + + ! intrinsic functions + intrinsic sqrt + + ! freestream linear superposition (Lissaman 1979) + if (wake_combination_method == 0) then + deficit_sum = deficit_sum + wind_speed*deltav + + ! local velocity linear superposition (Niayifar and Porte Agel 2015, 2016) + else if (wake_combination_method == 1) then + deficit_sum = deficit_sum + turb_inflow*deltav + !print *, "here" + + ! sum of squares freestream superposition (Katic et al. 1986) + else if (wake_combination_method == 2) then + deficit_sum = sqrt(deficit_sum**2 + (wind_speed*deltav)**2) + + ! sum of squares local velocity superposition (Voutsinas 1990) + else if (wake_combination_method == 3) then + deficit_sum = sqrt(deficit_sum**2 + (turb_inflow*deltav)**2) + + ! wake combination method error + else + print *, "Invalid wake combination method. Must be one of [0,1,2,3]." + stop 1 + end if + +end subroutine wake_combination_func + +! combines wakes using various methods +subroutine added_ti_func(TI, Ct_ust, x, k_star_ust, rotor_diameter_ust, rotor_diameter_dst, & + & deltay, wake_height, turbine_height, sm_smoothing, TI_ust, & + & TI_calculation_method, TI_area_ratio_in, TI_dst_in, TI_area_ratio, TI_dst) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: Ct_ust, x, k_star_ust, rotor_diameter_ust, rotor_diameter_dst + real(dp), intent(in) :: deltay, wake_height, turbine_height, sm_smoothing + real(dp), intent(in) :: TI_ust, TI, TI_area_ratio_in, TI_dst_in + integer, intent(in) :: TI_calculation_method + + ! local + real(dp) :: axial_induction_ust, beta, epsilon, sigma, wake_diameter, wake_overlap + real(dp) :: TI_added, TI_tmp, rotor_area_dst, TI_area_ratio_tmp + real(dp), parameter :: pi = 3.141592653589793_dp + + ! out + real(dp), intent(out) :: TI_dst, TI_area_ratio + + ! intrinsic functions + intrinsic sqrt + + ! initialize output variables + TI_area_ratio = TI_area_ratio_in + TI_dst = TI_dst_in + + ! initialize wake overlap to zero + wake_overlap = 0.0_dp + + !print *, "TI_dst in: ", TI_dst + ! Niayifar and Porte Agel 2015, 2016 (adjusted by Annoni and Thomas for SOWFA match + ! and optimization) + if (TI_calculation_method == 1) then + + ! calculate axial induction based on the Ct value + call ct_to_axial_ind_func(Ct_ust, axial_induction_ust) + + ! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + beta = 0.5_dp*((1.0_dp + sqrt(1.0_dp - Ct_ust))/sqrt(1.0_dp - Ct_ust)) + epsilon = 0.2_dp*sqrt(beta) + !print *, "epsilon = ", epsilon + ! calculate wake spread for TI calcs + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma + !print *, "sigma = ", sigma + ! calculate wake overlap ratio + call overlap_area_func(deltay, turbine_height, rotor_diameter_dst, & + 0.0_dp, wake_height, wake_diameter, & + wake_overlap) + !print *, "wake_overlap = ", wake_overlap + ! Calculate the turbulence added to the inflow of the downstream turbine by the + ! wake of the upstream turbine + TI_added = 0.73_dp*(axial_induction_ust**0.8325_dp)*(TI_ust**0.0325_dp)* & + ((x/rotor_diameter_ust)**(-0.32_dp)) + !print *, "TI_added = ", TI_added + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + ! Calculate the total turbulence intensity at the downstream turbine + !sum_of_squares = TI_dst**2 + (TI_added*wake_overlap)**2 + ! print *, "sum of squares = ", sum_of_squares +! TI_dst = sqrt(sum_of_squares) +! !print *, "TI_dst = ", TI_dst + TI_dst = sqrt(TI_dst_in**2.0_dp + (TI_added*wake_overlap/rotor_area_dst)**2.0_dp) + + + ! Niayifar and Porte Agel 2015, 2016 + else if (TI_calculation_method == 2) then + + ! calculate axial induction based on the Ct value + call ct_to_axial_ind_func(Ct_ust, axial_induction_ust) + + ! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + beta = 0.5_dp*((1.0_dp + sqrt(1.0_dp - Ct_ust))/sqrt(1.0_dp - Ct_ust)) + epsilon = 0.2_dp*sqrt(beta) + + ! calculate wake spread for TI calcs + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma + + ! calculate wake overlap ratio + call overlap_area_func(deltay, turbine_height, rotor_diameter_dst, & + 0.0_dp, wake_height, wake_diameter, & + wake_overlap) + + ! Calculate the turbulence added to the inflow of the downstream turbine by the + ! wake of the upstream turbine + TI_added = 0.73_dp*(axial_induction_ust**0.8325_dp)*(TI_ust**0.0325_dp)* & + ((x/rotor_diameter_ust)**(-0.32_dp)) + + ! Calculate the total turbulence intensity at the downstream turbine based on + ! current upstream turbine + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + TI_tmp = sqrt(TI**2.0_dp + (TI_added*(wake_overlap/rotor_area_dst))**2.0_dp) + + ! Check if this is the max and use it if it is + if (TI_tmp > TI_dst_in) then +! print *, "TI_tmp > TI_dst" + TI_dst = TI_tmp + end if + + ! Niayifar and Porte Agel 2015, 2016 with smooth max + else if (TI_calculation_method == 3) then + + ! calculate axial induction based on the Ct value + call ct_to_axial_ind_func(Ct_ust, axial_induction_ust) + + ! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + beta = 0.5_dp*((1.0_dp + sqrt(1.0_dp - Ct_ust))/sqrt(1.0_dp - Ct_ust)) + epsilon = 0.2_dp*sqrt(beta) + + ! calculate wake spread for TI calcs + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma + +! print *, "sigma, k_star_ust, x, rotor_diameter_ust, epsilon ", sigma, k_star_ust, x, rotor_diameter_ust, epsilon + + ! print *, "deltay, turbine_height, rotor_diameter_dst, wake_height, wake_diameter", & +! & deltay, turbine_height, rotor_diameter_dst, & +! wake_height, wake_diameter + + ! calculate wake overlap ratio + call overlap_area_func(deltay, turbine_height, rotor_diameter_dst, & + 0.0_dp, wake_height, wake_diameter, & + wake_overlap) + + ! Calculate the turbulence added to the inflow of the downstream turbine by the + ! wake of the upstream turbine + TI_added = 0.73_dp*(axial_induction_ust**0.8325_dp)*(TI_ust**0.0325_dp)* & + ((x/rotor_diameter_ust)**(-0.32_dp)) + + ! Calculate the total turbulence intensity at the downstream turbine based on + ! current upstream turbine + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + TI_tmp = sqrt(TI**2.0_dp + (TI_added*(wake_overlap/rotor_area_dst))**2.0_dp) + + !print *, "TI, TI_added, wake_overlap, rotor_area_dst: ", TI, TI_added, wake_overlap, rotor_area_dst + + ! Check if this is the max and use it if it is + !if (TI_tmp > TI_dst) then + ! TI_dst = TI_tmp + !end if +! print *, "before: ", TI_dst, TI_tmp +! TI_dst_in = TI_dst + call smooth_max(sm_smoothing, TI_dst_in, TI_tmp, TI_dst) +! print *, "after:: ", TI_dst, TI_tmp + + ! Niayifar and Porte Agel 2015, 2016 using max on area TI ratio + else if (TI_calculation_method == 4) then + + ! calculate axial induction based on the Ct value + call ct_to_axial_ind_func(Ct_ust, axial_induction_ust) + + ! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + beta = 0.5_dp*((1.0_dp + sqrt(1.0_dp - Ct_ust))/sqrt(1.0_dp - Ct_ust)) + epsilon = 0.2_dp*sqrt(beta) + + ! calculate wake spread for TI calcs + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma + + ! calculate wake overlap ratio + call overlap_area_func(deltay, turbine_height, rotor_diameter_dst, & + 0.0_dp, wake_height, wake_diameter, & + wake_overlap) + + ! Calculate the turbulence added to the inflow of the downstream turbine by the + ! wake of the upstream turbine + TI_added = 0.73_dp*(axial_induction_ust**0.8325_dp)*(TI_ust**0.0325_dp)* & + ((x/rotor_diameter_ust)**(-0.32_dp)) + + ! Calculate the total turbulence intensity at the downstream turbine based on + ! current upstream turbine + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + TI_area_ratio_tmp = TI_added*(wake_overlap/rotor_area_dst) + + ! Check if this is the max and use it if it is + if (TI_area_ratio_tmp > TI_area_ratio_in) then +! print *, "ti_area_ratio_tmp > ti_area_ratio" + !TI_dst = TI_tmp + TI_area_ratio = TI_area_ratio_tmp + TI_dst = sqrt(TI**2.0_dp + (TI_area_ratio)**2.0_dp) + + end if + + ! Niayifar and Porte Agel 2015, 2016 using smooth max on area TI ratio + else if (TI_calculation_method == 5) then + + ! calculate axial induction based on the Ct value + call ct_to_axial_ind_func(Ct_ust, axial_induction_ust) + + ! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + beta = 0.5_dp*((1.0_dp + sqrt(1.0_dp - Ct_ust))/sqrt(1.0_dp - Ct_ust)) + epsilon = 0.2_dp*sqrt(beta) + + ! calculate wake spread for TI calcs + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma + + ! calculate wake overlap ratio + call overlap_area_func(deltay, turbine_height, rotor_diameter_dst, & + 0.0_dp, wake_height, wake_diameter, & + wake_overlap) + ! only include turbines with area overlap in the softmax + if (wake_overlap > 0.0_dp) then + + ! Calculate the turbulence added to the inflow of the downstream turbine by the + ! wake of the upstream turbine + TI_added = 0.73_dp*(axial_induction_ust**0.8325_dp)*(TI_ust**0.0325_dp)* & + ((x/rotor_diameter_ust)**(-0.32_dp)) + + + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + TI_area_ratio_tmp = TI_added*(wake_overlap/rotor_area_dst) + !TI_tmp = sqrt(TI**2.0_dp + (TI_added*(wake_overlap/rotor_area_dst))**2.0_dp) + + ! Run through the smooth max to get an approximation of the true max TI area ratio + call smooth_max(sm_smoothing, TI_area_ratio_in, TI_area_ratio_tmp, TI_area_ratio) + + ! Calculate the total turbulence intensity at the downstream turbine based on + ! the result of the smooth max function + TI_dst = sqrt(TI**2.0_dp + TI_area_ratio**2.0_dp) + + end if + + ! wake combination method error + else + print *, "Invalid added TI calculation method. Must be one of [0,1,2,3,4,5]." + stop 1 + end if + + !print *, "ratio: ", wake_overlap/rotor_area_dst + !print *, "Dr, Dw: ", rotor_diameter_dst, wake_diameter + !print *, "Ar, Aol: ", rotor_area_dst, wake_overlap + +end subroutine added_ti_func + +! compute wake spread parameter based on local turbulence intensity +subroutine k_star_func(TI_ust, k_star_ust) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: TI_ust + + ! out + real(dp), intent(out) :: k_star_ust + + ! calculate wake spread parameter from Niayifar and Porte Agel (2015, 2016) + k_star_ust = 0.3837*TI_ust+0.003678 + +end subroutine k_star_func + +! calculate axial induction from Ct +subroutine ct_to_axial_ind_func(CT, axial_induction) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: CT + + ! out + real(dp), intent(out) :: axial_induction + + ! initialize axial induction to zero + axial_induction = 0.0_dp + + ! calculate axial induction + if (CT > 0.96) then ! Glauert condition + axial_induction = 0.143_dp + sqrt(0.0203_dp-0.6427_dp*(0.889_dp - CT)) + else + axial_induction = 0.5_dp*(1.0_dp-sqrt(1.0_dp-CT)) + end if + +end subroutine ct_to_axial_ind_func + +! adjust wind speed for wind shear +subroutine wind_shear_func(point_z, u_ref, z_ref, z_0, shear_exp, adjusted_wind_speed) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: point_z, u_ref, z_ref, z_0, shear_exp + + ! out + real(dp), intent(out) :: adjusted_wind_speed + + ! initialize adjusted wind speed to zero + adjusted_wind_speed = 0.0_dp + + ! check that the point of interest is above ground level + if (point_z >= z_0) then + ! adjusted wind speed for wind shear if point is above ground + adjusted_wind_speed = u_ref*((point_z-z_0)/(z_ref-z_0))**shear_exp + else + ! if the point of interest is below ground, set the wind speed to 0.0 + adjusted_wind_speed = 0.0_dp + end if + +end subroutine wind_shear_func + + +! calculate the point where the Bastankhah and Porte Agel wake model becomes undefined +subroutine discontinuity_point_func(x0, rotor_diameter, ky, kz, yaw, Ct, discontinuity_point) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: x0, rotor_diameter, ky, kz, yaw, Ct + + ! local + real(dp) :: a, b, c + + ! out + real(dp), intent(out) :: discontinuity_point + + intrinsic cos, sqrt + + ! for clarity, break out the terms in the equation + a = ky + kz*cos(yaw) + b = 4.0_dp * ky * kz * cos(yaw)*(Ct - 1.0_dp) + c = 2.0_dp * sqrt(8.0_dp) * ky * kz + + ! distance from rotor to the last point where the wake model is undefined + discontinuity_point = x0 + rotor_diameter * (a - sqrt(a**2 - b))/c + +end subroutine discontinuity_point_func + +subroutine smooth_max(s, x, y, g) + + ! based on John D. Cook's writings at + ! (1) https://www.johndcook.com/blog/2010/01/13/soft-maximum/ + ! and + ! (2) https://www.johndcook.com/blog/2010/01/20/how-to-compute-the-soft-maximum/ + + ! s controls the level of smoothing used in the smooth max + ! x and y are the values to be compared + + ! g is the result + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + real(dp), intent(in) :: s, x, y + + ! local + real(dp) :: max_val, min_val + + ! out + real(dp), intent(out) :: g + + intrinsic log, exp, max, min + + ! LogSumExponential Method - used this in the past + ! g = (x*exp(s*x)+y*exp(s*y))/(exp(s*x)+exp(s*y)) + + ! non-overflowing version of Smooth Max function (see ref 2 above) + max_val = max(x, y) + min_val = min(x, y) + g = (log(1.0_dp + exp(s*(min_val - max_val)))+s*max_val)/s + +end subroutine smooth_max + +subroutine interpolation(nPoints, interp_type, x, y, xval, yval, dy0in, dy1in, usedyin) + + implicit none + + ! define precision to be the standard for a double precision ! on local system + integer, parameter :: dp = kind(0.d0) + + ! in + integer, intent(in) :: nPoints, interp_type + real(dp), dimension(nPoints), intent(in) :: x, y + real(dp), intent(in) :: xval + real(dp), intent(in):: dy0in, dy1in + logical :: usedyin + + ! local + integer :: idx + real(dp) :: x0, x1, y0, dy0, y1, dy1 + + ! out + real(dp), intent(out) :: yval + +! print *, "in interpolation" + + ! if ((xval < x(1)) .or. (xval > x(nPoints))) then +! print *, "interpolation point is out of bounds" +! ! STOP 1 +! end if + + if (usedyin .and. (interp_type == 1)) then + print *, "end point derivatives may not be specified for linear interpolation" + STOP 1 + end if + + if (xval < x(1)) then + yval = y(1) + else if (xval > x(nPoints)) then + yval = y(nPoints) + + else + idx = 1 + + do while ((xval > x(idx)) .and. (idx <= nPoints)) + idx = idx + 1 + end do + + idx = idx - 1 + + x0 = x(idx) + x1 = x((idx + 1)) + y0 = y(idx) + y1 = y((idx + 1)) + + ! Hermite cubic piecewise spline interpolation + if (interp_type == 0) then + + ! approximate derivative at left end of interval + if (idx == 1) then + + if (usedyin) then + dy0 = dy0in + else + dy0 = 0.0_dp + endif + + else + dy0 = (y(idx+1) - y(idx-1))/(x(idx+1) - x(idx-1)) + end if + + ! approximate derivative at the right end of interval + if (idx >= nPoints-1) then + + if(usedyin)then + dy1 = dy1in + else + dy1 = 0.0_dp + endif + else + dy1 = (y(idx+2) - y(idx))/(x(idx+2) - x(idx)) + end if + + ! call Hermite spline routine + call Hermite_Spline(xval, x0, x1, y0, dy0, y1, dy1, yval) + + ! linear interpolation + else if (interp_type == 1) then + yval = (xval-x0)*(y1-y0)/(x1-x0) + y0 + + end if + end if + +! print *, "yval = ", yval + +end subroutine interpolation + + + + + + + + + + + + + + + + + + + + + + + +! Generated by TAPENADE (INRIA, Ecuador team) +! Tapenade 3.14 (master-db54337a6) - 29 Jul 2019 10:54 +! +! Differentiation of calcaep in forward (tangent) mode: +! variations of useful results: aep +! with respect to varying inputs: turbinex turbiney +! RW status of diff variables: turbinex:in turbiney:in aep:out +SUBROUTINE CALCAEP_DV(nturbines, ndirections, nrotorpoints, nctpoints, & +& turbinex, turbinexd, turbiney, turbineyd, turbinez, rotordiameter, ct& +& , yawdeg, winddirections, windspeeds, windfrequencies, shearexp, & +& rated_ws, rated_power, cut_in_speed, cut_out_speed, zref, z0, ky, kz, & +& alpha, beta, ti, wec_factor, rotorpointsy, rotorpointsz, & +& ct_curve_wind_speed, ct_curve_ct, sm_smoothing, & +& wake_combination_method, ti_calculation_method, wake_model_version, & +& interp_type, calc_k_star, print_ti, use_ct_curve, aep, aepd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + INTEGER, INTENT(IN) :: nturbines, ndirections, nrotorpoints, nctpoints + REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinex, turbiney, & +& turbinez, rotordiameter, ct, yawdeg + REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexd, & +& turbineyd + REAL(dp), DIMENSION(ndirections), INTENT(IN) :: winddirections, & +& windspeeds, windfrequencies + REAL(dp), INTENT(IN) :: shearexp, rated_ws, rated_power, cut_in_speed& +& , cut_out_speed, zref, z0 + REAL(dp), INTENT(IN) :: ky, kz, alpha, beta, ti, wec_factor + REAL(dp), DIMENSION(nrotorpoints), INTENT(IN) :: rotorpointsy, & +& rotorpointsz + REAL(dp), DIMENSION(nctpoints), INTENT(IN) :: ct_curve_wind_speed, & +& ct_curve_ct + REAL(dp), INTENT(IN) :: sm_smoothing + INTEGER, INTENT(IN) :: wake_combination_method, ti_calculation_method& +& , wake_model_version, interp_type + LOGICAL, INTENT(IN) :: calc_k_star, print_ti, use_ct_curve +! out + REAL(dp), INTENT(OUT) :: aep + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: aepd +! local + REAL(dp), DIMENSION(ndirections) :: dir_powers + REAL(dp), DIMENSION(nbdirs, ndirections) :: dir_powersd + REAL(dp), DIMENSION(nturbines) :: turbinexw, turbineyw, vinf_floris, & +& wtvelocity, loss + REAL(dp), DIMENSION(nbdirs, nturbines) :: turbinexwd, turbineywd, & +& wtvelocityd + REAL(dp) :: hrs_per_year, pwrdir, vinf + REAL(dp), DIMENSION(nbdirs) :: pwrdird + INTEGER :: n, i + INTEGER, DIMENSION(nturbines) :: sorted_x_idx + INTRINSIC SUM + REAL(dp), DIMENSION(ndirections) :: arg1 + REAL(dp), DIMENSION(nbdirs, ndirections) :: arg1d + INTEGER :: nd + INTEGER :: nbdirs + dir_powersd(:, :) = 0.0_8 + wtvelocityd(:, :) = 0.0_8 + DO n=1,ndirections + CALL WINDFRAME_DV(nturbines, winddirections(n), turbinex, turbinexd& +& , turbiney, turbineyd, turbinexw, turbinexwd, turbineyw& +& , turbineywd, nbdirs) + CALL POWWIND(nturbines, windspeeds(n), turbinez, shearexp, zref, z0& +& , vinf_floris) + vinf = vinf_floris(1) + CALL SORT_TURBS(nturbines, turbinexw, sorted_x_idx) +! call GaussianWake(nTurbines, turbineXw, turbineYw, rotorDiameter(1), relaxationFactor, loss) +! wtVelocity = Vinf*(1.0_dp-loss) + IF (vinf .GT. cut_in_speed) THEN + CALL PORTEAGEL_ANALYZE_DV(nturbines, nrotorpoints, nctpoints, & +& turbinexw, turbinexwd, sorted_x_idx, turbineyw& +& , turbineywd, turbinez, rotordiameter, ct, & +& vinf, yawdeg, ky, kz, alpha, beta, ti, & +& rotorpointsy, rotorpointsz, zref, z0, shearexp& +& , wake_combination_method, & +& ti_calculation_method, calc_k_star, wec_factor& +& , print_ti, wake_model_version, interp_type, & +& use_ct_curve, ct_curve_wind_speed, ct_curve_ct& +& , sm_smoothing, wtvelocity, wtvelocityd, & +& nbdirs) + ELSE + DO i=1,nturbines + DO nd=1,nbdirs + wtvelocityd(nd, i) = 0.0_8 + END DO + wtvelocity(i) = 0.0 + END DO + END IF +! print *, wtVelocity + CALL DIRPOWER_DV(nturbines, wtvelocity, wtvelocityd, rated_ws, & +& rated_power, cut_in_speed, cut_out_speed, pwrdir, pwrdird& +& , nbdirs) + DO nd=1,nbdirs + dir_powersd(nd, n) = pwrdird(nd) + END DO + dir_powers(n) = pwrdir + END DO + hrs_per_year = 365.*24. + DO nd=1,nbdirs + arg1d(nd, :) = windfrequencies*dir_powersd(nd, :) + aepd(nd) = hrs_per_year*SUM(arg1d(nd, :)) + END DO + arg1(:) = windfrequencies*dir_powers + aep = hrs_per_year*SUM(arg1(:)) +END SUBROUTINE CALCAEP_DV + +! Differentiation of windframe in forward (tangent) mode: +! variations of useful results: turbinexw turbineyw +! with respect to varying inputs: turbinex turbiney +!global functions +SUBROUTINE WINDFRAME_DV(nturbines, wind_direction, turbinex, turbinexd, & +& turbiney, turbineyd, turbinexw, turbinexwd, turbineyw, turbineywd, & +& nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + INTEGER, INTENT(IN) :: nturbines + REAL(dp), INTENT(IN) :: wind_direction + REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinex, turbiney + REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexd, & +& turbineyd +! out + REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: turbinexw, turbineyw + REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: turbinexwd, & +& turbineywd +! local + REAL(dp) :: winddirectiondeg, winddirectionrad + REAL(dp), PARAMETER :: pi=3.141592653589793_dp, tol=0.000001_dp + INTRINSIC COS + INTRINSIC SIN + INTEGER :: nd + INTEGER :: nbdirs + winddirectiondeg = 270. - wind_direction + IF (winddirectiondeg .LT. 0.) winddirectiondeg = winddirectiondeg + & +& 360. + winddirectionrad = pi*winddirectiondeg/180.0 + DO nd=1,nbdirs + turbinexwd(nd, :) = COS(-winddirectionrad)*turbinexd(nd, :) - SIN(-& +& winddirectionrad)*turbineyd(nd, :) + turbineywd(nd, :) = SIN(-winddirectionrad)*turbinexd(nd, :) + COS(-& +& winddirectionrad)*turbineyd(nd, :) + END DO + turbinexw = turbinex*COS(-winddirectionrad) - turbiney*SIN(-& +& winddirectionrad) + turbineyw = turbinex*SIN(-winddirectionrad) + turbiney*COS(-& +& winddirectionrad) +END SUBROUTINE WINDFRAME_DV + +! Differentiation of dirpower in forward (tangent) mode: +! variations of useful results: dir_power +! with respect to varying inputs: wtvelocity +SUBROUTINE DIRPOWER_DV(nturbines, wtvelocity, wtvelocityd, rated_ws, & +& rated_power, cut_in_speed, cut_out_speed, dir_power, dir_powerd, & +& nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + INTEGER, INTENT(IN) :: nturbines + REAL(dp), INTENT(IN) :: rated_ws, rated_power, cut_in_speed, & +& cut_out_speed + REAL(dp), DIMENSION(nturbines), INTENT(IN) :: wtvelocity + REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: wtvelocityd +! out + REAL(dp), INTENT(OUT) :: dir_power + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: dir_powerd +! local + REAL(dp), DIMENSION(nturbines) :: wtpower + REAL(dp), DIMENSION(nbdirs, nturbines) :: wtpowerd + REAL(dp) :: buffer, x0, x1, y0, y1, dy0, dy1 + INTEGER :: n + INTRINSIC SUM + INTEGER :: nd + INTEGER :: nbdirs + buffer = 0.1 + wtpowerd(:, :) = 0.0_8 + DO n=1,nturbines +! If we're below cut-in + IF (wtvelocity(n) .LT. cut_in_speed - buffer) THEN + DO nd=1,nbdirs + wtpowerd(nd, n) = 0.0_8 + END DO + wtpower(n) = 0. +! If we're at the spline of cut-in + ELSE IF (wtvelocity(n) .GT. cut_in_speed - buffer .AND. wtvelocity(n& +& ) .LT. cut_in_speed + buffer) THEN + x0 = cut_in_speed - buffer + x1 = cut_in_speed + buffer + y0 = 0. + y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 + dy0 = 0. + dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/rated_ws**3 + CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & +& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & +& nbdirs) +! If we're between cut-in and rated + ELSE IF (wtvelocity(n) .GT. cut_in_speed + buffer .AND. wtvelocity(n& +& ) .LT. rated_ws - buffer) THEN + DO nd=1,nbdirs + wtpowerd(nd, n) = rated_power*3*wtvelocity(n)**2*wtvelocityd(nd& +& , n)/rated_ws**3 + END DO + wtpower(n) = rated_power*(wtvelocity(n)/rated_ws)**3 +! If we're at the spline of rated + ELSE IF (wtvelocity(n) .GT. rated_ws - buffer .AND. wtvelocity(n) & +& .LT. rated_ws + buffer) THEN + x0 = rated_ws - buffer + x1 = rated_ws + buffer + y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 + y1 = rated_power + dy0 = 3.*rated_power*(rated_ws-buffer)**2/rated_ws**3 + dy1 = 0. + CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & +& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & +& nbdirs) +! If we're between rated and cut-out + ELSE IF (wtvelocity(n) .GT. rated_ws + buffer .AND. wtvelocity(n) & +& .LT. cut_out_speed - buffer) THEN + DO nd=1,nbdirs + wtpowerd(nd, n) = 0.0_8 + END DO + wtpower(n) = rated_power +! If we're at the spline of cut-out + ELSE IF (wtvelocity(n) .GT. cut_out_speed - buffer .AND. wtvelocity(& +& n) .LT. cut_out_speed + buffer) THEN + x0 = cut_out_speed - buffer + x1 = cut_out_speed + buffer + y0 = rated_power + y1 = 0. + dy0 = 0. + dy1 = 0. + CALL HERMITE_SPLINE_DV(wtvelocity(n), wtvelocityd(:, n), x0, x1, & +& y0, dy0, y1, dy1, wtpower(n), wtpowerd(:, n), & +& nbdirs) +! If we're above cut-out + ELSE IF (wtvelocity(n) .GT. cut_out_speed + buffer) THEN + DO nd=1,nbdirs + wtpowerd(nd, n) = 0.0_8 + END DO + wtpower(n) = 0. + END IF + END DO + DO nd=1,nbdirs + dir_powerd(nd) = SUM(wtpowerd(nd, :)) + END DO + dir_power = SUM(wtpower) +END SUBROUTINE DIRPOWER_DV + +! Differentiation of porteagel_analyze in forward (tangent) mode: +! variations of useful results: wtvelocity +! with respect to varying inputs: turbinexw turbineyw +! implementation of the Bastankhah and Porte Agel (BPA) wake model for analysis +SUBROUTINE PORTEAGEL_ANALYZE_DV(nturbines, nrotorpoints, nctpoints, & +& turbinexw, turbinexwd, sorted_x_idx, turbineyw, turbineywd, turbinez, & +& rotordiameter, ct, wind_speed, yawdeg, ky, kz, alpha, beta, ti, & +& rotorpointsy, rotorpointsz, z_ref, z_0, shear_exp, & +& wake_combination_method, ti_calculation_method, calc_k_star, & +& wec_factor, print_ti, wake_model_version, interp_type, use_ct_curve, & +& ct_curve_wind_speed, ct_curve_ct, sm_smoothing, wtvelocity, & +& wtvelocityd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE +! print *, Ct_local(turbI) +!! print TIturbs values to a file +! if (print_ti) then +! open(unit=2, file="TIturbs_tmp.txt") +! do, turb=1, nTurbines +! write(2,*) TIturbs(turb) +! end do +! close(2) +! end if +!print *, "TIturbs: ", TIturbs +!print *, wtVelocity +!! make sure turbine inflow velocity is non-negative +! if (wtVelocity(turbI) .lt. 0.0_dp) then +! wtVelocity(turbI) = 0.0_dp +! end if +!print *, "fortran" + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + INTEGER, INTENT(IN) :: nturbines, nrotorpoints, nctpoints + INTEGER, INTENT(IN) :: wake_combination_method, ti_calculation_method& +& , wake_model_version, interp_type + LOGICAL, INTENT(IN) :: calc_k_star, print_ti, use_ct_curve + REAL(dp), DIMENSION(nturbines), INTENT(IN) :: turbinexw, turbineyw, & +& turbinez + REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(IN) :: turbinexwd, & +& turbineywd + INTEGER, DIMENSION(nturbines), INTENT(IN) :: sorted_x_idx + REAL(dp), DIMENSION(nturbines), INTENT(IN) :: rotordiameter, yawdeg + REAL(dp), DIMENSION(nturbines) :: ct + REAL(dp), INTENT(IN) :: ky, kz, alpha, beta, ti, wind_speed, z_ref, & +& z_0, shear_exp, wec_factor + REAL(dp), DIMENSION(nrotorpoints), INTENT(IN) :: rotorpointsy, & +& rotorpointsz + REAL(dp), DIMENSION(nctpoints), INTENT(IN) :: ct_curve_wind_speed, & +& ct_curve_ct + REAL(dp), INTENT(IN) :: sm_smoothing +! local (General) + REAL(dp), DIMENSION(nturbines) :: yaw, titurbs, ct_local, ky_local, & +& kz_local + REAL(dp), DIMENSION(nbdirs, nturbines) :: titurbsd, ct_locald, & +& ky_locald, kz_locald + REAL(dp) :: x0, deltax0, deltay, theta_c_0, sigmay, sigmaz, & +& wake_offset, k_star + REAL(dp), DIMENSION(nbdirs) :: x0d, deltax0d, deltayd, theta_c_0d, & +& sigmayd, sigmazd, wake_offsetd, k_stard + REAL(dp) :: x, deltav, deltaz, sigmay_dp, sigmaz_dp, deltax0_dp, & +& deficit_sum + REAL(dp), DIMENSION(nbdirs) :: xd, deltavd, sigmay_dpd, sigmaz_dpd& +& , deltax0_dpd, deficit_sumd + REAL(dp) :: tol, discontinuity_point, ti_area_ratio + REAL(dp), DIMENSION(nbdirs) :: discontinuity_pointd, ti_area_ratiod + REAL(dp) :: ti_area_ratio_tmp, ti_dst_tmp, ti_ust_tmp, rpts + REAL(dp), DIMENSION(nbdirs) :: ti_area_ratio_tmpd, ti_dst_tmpd, & +& ti_ust_tmpd + REAL(dp) :: localrotorpointy, localrotorpointz, point_velocity, & +& point_z, point_velocity_with_shear + REAL(dp), DIMENSION(nbdirs) :: point_velocityd, & +& point_velocity_with_sheard + INTEGER :: u, d, turb, turbi, p + REAL(dp), PARAMETER :: pi=3.141592653589793_dp +! model out + REAL(dp), DIMENSION(nturbines), INTENT(OUT) :: wtvelocity + REAL(dp), DIMENSION(nbdirs, nturbines), INTENT(OUT) :: wtvelocityd + INTRINSIC SIN, COS, ATAN, MAX, SQRT, LOG + INTRINSIC REAL + INTEGER :: nd + INTEGER :: nbdirs +! bastankhah and porte agel 2016 define yaw to be positive clockwise, this is reversed + yaw = -(yawdeg*pi/180.0_dp) +! set tolerance for location checks + tol = 0.1_dp +! initialize wind turbine velocities to 0.0 + wtvelocity = 0.0_dp +! initialize TI of all turbines to free-stream value +!print *, "start TIturbs: ", TIturbs + titurbs = ti +! initialize the local wake factors + ky_local(:) = ky + kz_local(:) = kz + ct_local(:) = ct + wtvelocityd(:, :) = 0.0_8 + titurbsd(:, :) = 0.0_8 + kz_locald(:, :) = 0.0_8 + ct_locald(:, :) = 0.0_8 + ky_locald(:, :) = 0.0_8 +!print *, 'wake model version: ', wake_model_version +!print *, "ky_local: ", ky_local +!print *, "kz_local: ", kz_local +!print *, "TIturbs init: ", TIturbs + DO d=1,nturbines +! get index of downstream turbine + turbi = sorted_x_idx(d) + 1 + DO p=1,nrotorpoints +! initialize the TI_area_ratio to 0.0 for each turbine + ti_area_ratio = 0.0_dp +! initialize deficit summation term to zero + deficit_sum = 0.0_dp +! scale rotor sample point coordinate by rotor diameter (in rotor hub ref. frame) + localrotorpointy = rotorpointsy(p)*0.5_dp*rotordiameter(turbi) + localrotorpointz = rotorpointsz(p)*0.5_dp*rotordiameter(turbi) + deficit_sumd(:) = 0.0_8 + ti_area_ratiod(:) = 0.0_8 +! !print *, "rotorDiameter after local rotor points", rotorDiameter +! !print *, "local rotor points Y,Z: ", LocalRotorPointY, LocalRotorPointZ +! at turbineX-locations + DO u=1,nturbines +! get index of upstream turbine + turb = sorted_x_idx(u) + 1 +! skip this loop if turb = turbI (turbines impact on itself) + IF (turb .NE. turbi) THEN + DO nd=1,nbdirs +! downstream distance between upstream turbine and point + xd(nd) = turbinexwd(nd, turbi) - turbinexwd(nd, turb) + END DO + x = turbinexw(turbi) - turbinexw(turb) + localrotorpointy*SIN(& +& yaw(turbi)) +! set this iterations velocity deficit to 0 + deltav = 0.0_dp +! check turbine relative locations + IF (x .GT. 0.0_dp + tol) THEN +!print *, "rotorDiameter before x0 ", rotorDiameter +! determine the onset location of far wake + CALL X0_FUNC_DV(rotordiameter(turb), yaw(turb), ct_local(& +& turb), ct_locald(:, turb), alpha, titurbs(turb), & +& titurbsd(:, turb), beta, x0, x0d, nbdirs) + DO nd=1,nbdirs +! call x0_func(rotorDiameter(turb), yaw(turb), Ct(turb), alpha, & +! & TI, beta, x0) +! downstream distance from far wake onset to downstream turbine + deltax0d(nd) = xd(nd) - x0d(nd) + END DO + deltax0 = x - x0 +! calculate wake spreading parameter at each turbine if desired + IF (calc_k_star .EQV. .true.) THEN + CALL K_STAR_FUNC_DV(titurbs(turb), titurbsd(:, turb), & +& k_star, k_stard, nbdirs) + DO nd=1,nbdirs + ky_locald(nd, turb) = k_stard(nd) + kz_locald(nd, turb) = k_stard(nd) + END DO + ky_local(turb) = k_star + kz_local(turb) = k_star + END IF +!print *, "ky_local ", ky_local +!print *, "deltax0 ", deltax0 +!print *, "turbineZ ", turbineZ +!print *, "rotorDiameter after x0 ", rotorDiameter +!print *, "Ct ", Ct +!print *, "yaw ", yaw +! determine the initial wake angle at the onset of far wake + CALL THETA_C_0_FUNC_DV(yaw(turb), ct_local(turb), ct_locald(& +& :, turb), theta_c_0, theta_c_0d, nbdirs) +!print *, "theta_c_0 ", theta_c_0 +! horizontal spread + CALL SIGMAY_FUNC_DV(ky_local(turb), ky_locald(:, turb), & +& deltax0, deltax0d, rotordiameter(turb), yaw(& +& turb), sigmay, sigmayd, nbdirs) +!print *, "sigmay ", sigmay +!print *, "rotorDiameter after sigmay", rotorDiameter +! vertical spread + CALL SIGMAZ_FUNC_DV(kz_local(turb), kz_locald(:, turb), & +& deltax0, deltax0d, rotordiameter(turb), sigmaz& +& , sigmazd, nbdirs) +!print *, "sigmaz ", sigmaz +!print *, "rotorDiameter after sigmaz ", rotorDiameter +! horizontal cross-wind wake displacement from hub + CALL WAKE_OFFSET_FUNC_DV(rotordiameter(turb), theta_c_0, & +& theta_c_0d, x0, x0d, yaw(turb), ky_local(& +& turb), ky_locald(:, turb), kz_local(turb)& +& , kz_locald(:, turb), ct_local(turb), & +& ct_locald(:, turb), sigmay, sigmayd, & +& sigmaz, sigmazd, wake_offset, & +& wake_offsetd, nbdirs) + DO nd=1,nbdirs +!print *, "wake_offset ", wake_offset +! cross wind distance from downstream point location to wake center + deltayd(nd) = turbineywd(nd, turbi) - turbineywd(nd, turb)& +& - wake_offsetd(nd) + END DO + deltay = localrotorpointy*COS(yaw(turbi)) + turbineyw(turbi)& +& - (turbineyw(turb)+wake_offset) +! cross wind distance from hub height to height of point of interest + deltaz = localrotorpointz + turbinez(turbi) - turbinez(turb) +!print *, "dx, dy, dz: ", x, deltay, deltaz +!print *, "local y,z : ", LocalRotorPointY, LocalRotorPointZ, turb, turbI, p +!print *, deltaz, deltay +! far wake region +! find the final point where the original model is undefined + CALL DISCONTINUITY_POINT_FUNC_DV(x0, x0d, rotordiameter(turb& +& ), ky_local(turb), ky_locald(:, & +& turb), kz_local(turb), kz_locald(& +& :, turb), yaw(turb), ct_local(& +& turb), ct_locald(:, turb), & +& discontinuity_point, & +& discontinuity_pointd, nbdirs) +!print *, "discontinuity point is: ", discontinuity_point + IF (x .GT. discontinuity_point) THEN +!print *, x +! velocity difference in the wake + CALL DELTAV_FUNC_DV(deltay, deltayd, deltaz, ct_local(turb& +& ), ct_locald(:, turb), yaw(turb), sigmay, & +& sigmayd, sigmaz, sigmazd, rotordiameter(turb& +& ), wake_model_version, kz_local(turb), & +& kz_locald(:, turb), x, xd, wec_factor, & +& deltav, deltavd, nbdirs) +!print *, "rotorDiameter after far deltav ", rotorDiameter +! near wake region (linearized) + ELSE + DO nd=1,nbdirs +! determine distance from discontinuity point to far wake onset + deltax0_dpd(nd) = discontinuity_pointd(nd) - x0d(nd) + END DO + deltax0_dp = discontinuity_point - x0 +! horizontal spread at far wake onset + CALL SIGMAY_FUNC_DV(ky_local(turb), ky_locald(:, turb), & +& deltax0_dp, deltax0_dpd, rotordiameter(turb)& +& , yaw(turb), sigmay_dp, sigmay_dpd, nbdirs) +! vertical spread at far wake onset + CALL SIGMAZ_FUNC_DV(kz_local(turb), kz_locald(:, turb), & +& deltax0_dp, deltax0_dpd, rotordiameter(turb)& +& , sigmaz_dp, sigmaz_dpd, nbdirs) +! print *, "inputs in parent: ", deltay, deltaz, Ct(turb), yaw(turb), sigmay_dp, sigmaz_dp, & +! & rotorDiameter(turb), x, discontinuity_point, sigmay_dp, sigmaz_dp, & +! & wake_model_version, kz_local, x0, & +! & wec_factor +! velocity deficit in the nearwake (linear model) + CALL DELTAV_NEAR_WAKE_LIN_FUNC_DV(deltay, deltayd, deltaz& +& , ct_local(turb), ct_locald(:& +& , turb), yaw(turb), sigmay_dp& +& , sigmay_dpd, sigmaz_dp, & +& sigmaz_dpd, rotordiameter(turb& +& ), x, xd, discontinuity_point& +& , discontinuity_pointd, & +& sigmay_dp, sigmay_dpd, & +& sigmaz_dp, sigmaz_dpd, & +& wake_model_version, kz_local(& +& turb), kz_locald(:, turb), x0& +& , x0d, wec_factor, deltav, & +& deltavd, nbdirs) +!print *, "rotorDiameter after deltav near ", rotorDiameter + END IF +! combine deficits according to selected method wake combination method + CALL WAKE_COMBINATION_FUNC_DV(wind_speed, wtvelocity(turb), & +& wtvelocityd(:, turb), deltav, & +& deltavd, wake_combination_method, & +& deficit_sum, deficit_sumd, nbdirs) + IF (x .GT. 0.0_dp .AND. ti_calculation_method .GT. 0) THEN + DO nd=1,nbdirs +!print *, "turbI, turb: ", turbI, turb +! calculate TI value at each turbine +! print *, "turb, turbI: ", turb, turbI +! save ti_area_ratio and ti_dst to new memory locations to avoid +! aliasing during differentiation + ti_area_ratio_tmpd(nd) = ti_area_ratiod(nd) + ti_dst_tmpd(nd) = titurbsd(nd, turbi) + ti_ust_tmpd(nd) = titurbsd(nd, turb) + END DO + ti_area_ratio_tmp = ti_area_ratio + ti_dst_tmp = titurbs(turbi) + ti_ust_tmp = titurbs(turb) + CALL ADDED_TI_FUNC_DV(ti, ct_local(turb), ct_locald(:, & +& turb), x, xd, ky_local(turb), ky_locald(:& +& , turb), rotordiameter(turb), & +& rotordiameter(turbi), deltay, deltayd, & +& turbinez(turb), turbinez(turbi), & +& sm_smoothing, ti_ust_tmp, ti_ust_tmpd, & +& ti_calculation_method, ti_area_ratio_tmp, & +& ti_area_ratio_tmpd, ti_dst_tmp, & +& ti_dst_tmpd, ti_area_ratio, ti_area_ratiod& +& , titurbs(turbi), titurbsd(:, turbi), & +& nbdirs) +!print *, "rotorDiameter after TI calcs", rotorDiameter + END IF + END IF + END IF + END DO + DO nd=1,nbdirs +! !print *, "deficit_sum, turbI, p, turb: ", deficit_sum, turbI, p, turb +! print *, deficit_sum +! find velocity at point p due to the wake of turbine turb + point_velocityd(nd) = -deficit_sumd(nd) + END DO + point_velocity = wind_speed - deficit_sum +!print *, "point velocity, deficit_sum, turbI, p: ", point_velocity, deficit_sum, turbI, p +! put sample point height in global reference frame + point_z = localrotorpointz + turbinez(turbi) +!print *, "point_z, turbI, p: ", point_z, turbI, p +! adjust sample point velocity for shear + CALL WIND_SHEAR_FUNC_DV(point_z, point_velocity, point_velocityd, & +& z_ref, z_0, shear_exp, point_velocity_with_shear& +& , point_velocity_with_sheard, nbdirs) + DO nd=1,nbdirs +!print *, "v, vs, x, turb, turbI, p: ", point_velocity, point_velocity_with_shear, x, turb, turbI, p +! add sample point velocity to turbine velocity to be averaged later + wtvelocityd(nd, turbi) = wtvelocityd(nd, turbi) + & +& point_velocity_with_sheard(nd) + END DO + wtvelocity(turbi) = wtvelocity(turbi) + point_velocity_with_shear + END DO +! final velocity calculation for turbine turbI (average equally across all points) + rpts = REAL(nrotorpoints, dp) + DO nd=1,nbdirs +! print *, rpts, nRotorPoints, wtVelocity(turbI), wtVelocity(turbI)/rpts, wtVelocity(turbI)/nRotorPoints +! STOP 1 + wtvelocityd(nd, turbi) = wtvelocityd(nd, turbi)/rpts + END DO + wtvelocity(turbi) = wtvelocity(turbi)/rpts +! print *, wtVelocity(turbI) + IF (use_ct_curve) THEN +! print *, "wtVelocity(turbI): ", wtVelocity(turbI) + CALL INTERPOLATION_DV(nctpoints, interp_type, ct_curve_wind_speed& +& , ct_curve_ct, wtvelocity(turbi), wtvelocityd(:, & +& turbi), ct_local(turbi), ct_locald(:, turbi), & +& 0.0_dp, 0.0_dp, .false., nbdirs) +! print *, "Ct_local(turbI): ", Ct_local(turbI) + END IF + END DO +END SUBROUTINE PORTEAGEL_ANALYZE_DV + +! Differentiation of x0_func in forward (tangent) mode: +! variations of useful results: x0 +! with respect to varying inputs: ti ct +! calculates the onset of far-wake conditions +SUBROUTINE X0_FUNC_DV(rotor_diameter, yaw, ct, ctd, alpha, ti, tid, beta& +& , x0, x0d, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: rotor_diameter, yaw, ct, alpha, ti, beta + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: ctd, tid +! out + REAL(dp), INTENT(OUT) :: x0 + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: x0d + INTRINSIC COS, SQRT + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: result2 + REAL(dp) :: result3 + REAL(dp), DIMENSION(nbdirs) :: result3d + INTEGER :: nd + INTEGER :: nbdirs + result1 = SQRT(1.0_dp - ct) + result2 = SQRT(2.0_dp) + result3 = SQRT(1.0_dp - ct) + DO nd=1,nbdirs +! determine the onset location of far wake + result1d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + result3d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + x0d(nd) = rotor_diameter*(COS(yaw)*result1d(nd)*result2*(alpha*ti+& +& beta*(1.0_dp-result3))-COS(yaw)*(1.0_dp+result1)*result2*(alpha*& +& tid(nd)-beta*result3d(nd)))/(result2**2*(alpha*ti+beta*(1.0_dp-& +& result3))**2) + END DO + x0 = rotor_diameter*(COS(yaw)*(1.0_dp+result1)/(result2*(alpha*ti+beta& +& *(1.0_dp-result3)))) +END SUBROUTINE X0_FUNC_DV + +! Differentiation of theta_c_0_func in forward (tangent) mode: +! variations of useful results: theta_c_0 +! with respect to varying inputs: ct +! calculates the wake angle at the onset of far wake conditions +SUBROUTINE THETA_C_0_FUNC_DV(yaw, ct, ctd, theta_c_0, theta_c_0d, nbdirs& +&) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: yaw, ct + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: ctd +! out + REAL(dp), INTENT(OUT) :: theta_c_0 + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: theta_c_0d + INTRINSIC COS, SQRT + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + INTEGER :: nd + INTEGER :: nbdirs + arg1 = 1.0_dp - ct*COS(yaw) + DO nd=1,nbdirs +! determine the initial wake angle at the onset of far wake + arg1d(nd) = -(COS(yaw)*ctd(nd)) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + theta_c_0d(nd) = (-(0.3_dp*yaw*result1d(nd)))/COS(yaw) + END DO + result1 = SQRT(arg1) + theta_c_0 = 0.3_dp*yaw*(1.0_dp-result1)/COS(yaw) +END SUBROUTINE THETA_C_0_FUNC_DV + +! Differentiation of sigmay_func in forward (tangent) mode: +! variations of useful results: sigmay +! with respect to varying inputs: ky deltax0 +! calculates the horizontal spread of the wake at a given distance from the onset of far +! wake condition +SUBROUTINE SIGMAY_FUNC_DV(ky, kyd, deltax0, deltax0d, rotor_diameter, & +& yaw, sigmay, sigmayd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: ky, deltax0, rotor_diameter, yaw + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: kyd, deltax0d +! out + REAL(dp), INTENT(OUT) :: sigmay + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: sigmayd + INTRINSIC COS, SQRT + REAL(dp) :: result1 + INTEGER :: nd + INTEGER :: nbdirs +! horizontal spread + result1 = SQRT(8.0_dp) + DO nd=1,nbdirs + sigmayd(nd) = kyd(nd)*deltax0 + ky*deltax0d(nd) + END DO + sigmay = rotor_diameter*(ky*deltax0/rotor_diameter+COS(yaw)/result1) +END SUBROUTINE SIGMAY_FUNC_DV + +! Differentiation of sigmaz_func in forward (tangent) mode: +! variations of useful results: sigmaz +! with respect to varying inputs: kz deltax0 +! calculates the vertical spread of the wake at a given distance from the onset of far +! wake condition +SUBROUTINE SIGMAZ_FUNC_DV(kz, kzd, deltax0, deltax0d, rotor_diameter, & +& sigmaz, sigmazd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: kz, deltax0, rotor_diameter + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: kzd, deltax0d +! out + REAL(dp), INTENT(OUT) :: sigmaz + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: sigmazd +! load necessary intrinsic functions + INTRINSIC SQRT + REAL(dp) :: result1 + INTEGER :: nd + INTEGER :: nbdirs +! vertical spread + result1 = SQRT(8.0_dp) + DO nd=1,nbdirs + sigmazd(nd) = kzd(nd)*deltax0 + kz*deltax0d(nd) + END DO + sigmaz = rotor_diameter*(kz*deltax0/rotor_diameter+1.0_dp/result1) +END SUBROUTINE SIGMAZ_FUNC_DV + +! Differentiation of wake_offset_func in forward (tangent) mode: +! variations of useful results: wake_offset +! with respect to varying inputs: theta_c_0 sigmay sigmaz ky +! kz x0 ct +! calculates the horizontal distance from the wake center to the hub of the turbine making +! the wake +SUBROUTINE WAKE_OFFSET_FUNC_DV(rotor_diameter, theta_c_0, theta_c_0d, x0& +& , x0d, yaw, ky, kyd, kz, kzd, ct, ctd, sigmay, sigmayd, sigmaz, & +& sigmazd, wake_offset, wake_offsetd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: rotor_diameter, theta_c_0, x0, yaw, ky, kz, ct& +& , sigmay + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: theta_c_0d, x0d, kyd, & +& kzd, ctd, sigmayd + REAL(dp), INTENT(IN) :: sigmaz + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: sigmazd +! out + REAL(dp), INTENT(OUT) :: wake_offset + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: wake_offsetd + INTRINSIC COS, SQRT, LOG + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: result2 + REAL(dp), DIMENSION(nbdirs) :: result2d + REAL(dp) :: result3 + REAL(dp), DIMENSION(nbdirs) :: result3d + REAL(dp) :: arg2 + REAL(dp), DIMENSION(nbdirs) :: arg2d + REAL(dp) :: result4 + REAL(dp), DIMENSION(nbdirs) :: result4d + REAL(dp) :: result5 + REAL(dp), DIMENSION(nbdirs) :: result5d + REAL(dp) :: result6 + REAL(dp), DIMENSION(nbdirs) :: result6d + REAL(dp) :: arg3 + REAL(dp), DIMENSION(nbdirs) :: arg3d + REAL(dp) :: result7 + REAL(dp), DIMENSION(nbdirs) :: result7d + REAL(dp) :: result8 + REAL(dp), DIMENSION(nbdirs) :: result8d + REAL(dp) :: arg4 + REAL(dp), DIMENSION(nbdirs) :: arg4d + INTEGER :: nd + INTEGER :: nbdirs + arg1 = COS(yaw)/(ky*kz*ct) + result1 = SQRT(arg1) + result2 = SQRT(1.0_dp - ct) + result3 = SQRT(ct) + arg2 = 8.0_dp*sigmay*sigmaz/(COS(yaw)*rotor_diameter**2) + result4 = SQRT(arg2) + result5 = SQRT(ct) + result6 = SQRT(ct) + arg3 = 8.0_dp*sigmay*sigmaz/(COS(yaw)*rotor_diameter**2) + result7 = SQRT(arg3) + result8 = SQRT(ct) + arg4 = (1.6_dp+result3)*(1.6_dp*result4-result5)/((1.6_dp-result6)*(& +& 1.6_dp*result7+result8)) + DO nd=1,nbdirs +! horizontal cross-wind wake displacement from hub + arg1d(nd) = -(COS(yaw)*((kyd(nd)*kz+ky*kzd(nd))*ct+ky*kz*ctd(nd))/(& +& ky*kz*ct)**2) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + result2d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + IF (ct .EQ. 0.0) THEN + result3d(nd) = 0.0_8 + ELSE + result3d(nd) = ctd(nd)/(2.0*SQRT(ct)) + END IF + arg2d(nd) = 8.0_dp*(sigmayd(nd)*sigmaz+sigmay*sigmazd(nd))/(COS(yaw)& +& *rotor_diameter**2) + IF (arg2 .EQ. 0.0) THEN + result4d(nd) = 0.0_8 + ELSE + result4d(nd) = arg2d(nd)/(2.0*SQRT(arg2)) + END IF + IF (ct .EQ. 0.0) THEN + result5d(nd) = 0.0_8 + ELSE + result5d(nd) = ctd(nd)/(2.0*SQRT(ct)) + END IF + IF (ct .EQ. 0.0) THEN + result6d(nd) = 0.0_8 + ELSE + result6d(nd) = ctd(nd)/(2.0*SQRT(ct)) + END IF + arg3d(nd) = 8.0_dp*(sigmayd(nd)*sigmaz+sigmay*sigmazd(nd))/(COS(yaw)& +& *rotor_diameter**2) + IF (arg3 .EQ. 0.0) THEN + result7d(nd) = 0.0_8 + ELSE + result7d(nd) = arg3d(nd)/(2.0*SQRT(arg3)) + END IF + IF (ct .EQ. 0.0) THEN + result8d(nd) = 0.0_8 + ELSE + result8d(nd) = ctd(nd)/(2.0*SQRT(ct)) + END IF + arg4d(nd) = ((result3d(nd)*(1.6_dp*result4-result5)+(1.6_dp+result3)& +& *(1.6_dp*result4d(nd)-result5d(nd)))*(1.6_dp-result6)*(1.6_dp*& +& result7+result8)-(1.6_dp+result3)*(1.6_dp*result4-result5)*((& +& 1.6_dp-result6)*(1.6_dp*result7d(nd)+result8d(nd))-result6d(nd)*(& +& 1.6_dp*result7+result8)))/((1.6_dp-result6)*(1.6_dp*result7+& +& result8))**2 + wake_offsetd(nd) = rotor_diameter*((theta_c_0d(nd)*x0+theta_c_0*x0d(& +& nd))/rotor_diameter+((theta_c_0d(nd)*result1/14.7_dp+theta_c_0*& +& result1d(nd)/14.7_dp)*(2.9_dp+1.3_dp*result2-ct)+theta_c_0*result1& +& *(1.3_dp*result2d(nd)-ctd(nd))/14.7_dp)*LOG(arg4)+theta_c_0*& +& result1*(2.9_dp+1.3_dp*result2-ct)*arg4d(nd)/(14.7_dp*arg4)) + END DO + wake_offset = rotor_diameter*(theta_c_0*x0/rotor_diameter+theta_c_0/& +& 14.7_dp*result1*(2.9_dp+1.3_dp*result2-ct)*LOG(arg4)) +END SUBROUTINE WAKE_OFFSET_FUNC_DV + +! Differentiation of deltav_func in forward (tangent) mode: +! variations of useful results: deltav +! with respect to varying inputs: k sigmay sigmaz deltax deltay +! ct +! calculates the velocity difference between hub velocity and free stream for a given wake +! for use in the far wake region +SUBROUTINE DELTAV_FUNC_DV(deltay, deltayd, deltaz, ct, ctd, yaw, sigmay& +& , sigmayd, sigmaz, sigmazd, rotor_diameter_ust, version, k, kd, deltax& +& , deltaxd, wec_factor, deltav, deltavd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE +!print *, "rotor_diameter in deltav exit", rotor_diameter_ust + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: deltay, deltaz, ct, yaw, sigmay + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: deltayd, ctd, sigmayd + REAL(dp), INTENT(IN) :: sigmaz, rotor_diameter_ust, wec_factor + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: sigmazd +! only for 2014 version + REAL(dp), INTENT(IN) :: k, deltax + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: kd, deltaxd + INTEGER, INTENT(IN) :: version +! local +! only for 2014 version + REAL(dp) :: beta_2014, epsilon_2014 + REAL(dp), DIMENSION(nbdirs) :: beta_2014d, epsilon_2014d +! out + REAL(dp), INTENT(OUT) :: deltav + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: deltavd +! load intrinsic functions + INTRINSIC COS, SQRT, EXP + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: result2 + REAL(dp), DIMENSION(nbdirs) :: result2d + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: arg2 + REAL(dp), DIMENSION(nbdirs) :: arg2d + REAL(dp) :: arg3 + REAL(dp), DIMENSION(nbdirs) :: arg3d + INTEGER :: nd + INTEGER :: nbdirs +!print *, "rotor_diameter in deltav entry", rotor_diameter_ust +! print *, 'wake model version in deltav: ', version + IF (version .EQ. 2014) THEN + result1 = SQRT(1.0_dp - ct) + result2 = SQRT(1.0_dp - ct) + beta_2014 = 0.5_dp*(1.0_dp+result1)/result2 + DO nd=1,nbdirs +!print *, "in 2014 version" + result1d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + result2d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + beta_2014d(nd) = (0.5_dp*result1d(nd)*result2-0.5_dp*(1.0_dp+& +& result1)*result2d(nd))/result2**2 + IF (beta_2014 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = beta_2014d(nd)/(2.0*SQRT(beta_2014)) + END IF + epsilon_2014d(nd) = 0.2_dp*result1d(nd) + END DO + result1 = SQRT(beta_2014) + epsilon_2014 = 0.2_dp*result1 + arg1 = 1.0_dp - ct/(8.0_dp*(k*deltax/rotor_diameter_ust+epsilon_2014& +& )**2) + result1 = SQRT(arg1) + arg2 = (-(1.0_dp/(2.0_dp*(k*deltax/rotor_diameter_ust+epsilon_2014)& +& **2)))*((deltaz/(wec_factor*rotor_diameter_ust))**2+(deltay/(& +& wec_factor*rotor_diameter_ust))**2) + DO nd=1,nbdirs +! print *, "beta = ", beta_2014, "epsilon = ", epsilon_2014 +! print *, "k, deltax: ", k, deltax +! print *, "term: ", Ct & +! / (8.0_dp * (k*deltax/rotor_diameter_ust+epsilon_2014)**2) + arg1d(nd) = -((ctd(nd)*8.0_dp*(k*deltax/rotor_diameter_ust+& +& epsilon_2014)**2-ct*8.0_dp*2*(k*deltax/rotor_diameter_ust+& +& epsilon_2014)*((kd(nd)*deltax+k*deltaxd(nd))/rotor_diameter_ust+& +& epsilon_2014d(nd)))/(8.0_dp*(k*deltax/rotor_diameter_ust+& +& epsilon_2014)**2)**2) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + arg2d(nd) = 2*((kd(nd)*deltax+k*deltaxd(nd))/rotor_diameter_ust+& +& epsilon_2014d(nd))*((deltaz/(wec_factor*rotor_diameter_ust))**2+& +& (deltay/(wec_factor*rotor_diameter_ust))**2)/(2.0_dp*(k*deltax/& +& rotor_diameter_ust+epsilon_2014)**3) - 2*deltay*deltayd(nd)/(& +& 2.0_dp*(k*deltax/rotor_diameter_ust+epsilon_2014)**2*wec_factor& +& **2*rotor_diameter_ust**2) + deltavd(nd) = (1.0_dp-result1)*arg2d(nd)*EXP(arg2) - result1d(nd)*& +& EXP(arg2) + END DO + deltav = (1.0_dp-result1)*EXP(arg2) +! print *, "deltav 2014 = ", deltav + ELSE IF (version .EQ. 2016) THEN + arg1 = 1.0_dp - ct*COS(yaw)/(8.0_dp*sigmay*sigmaz/rotor_diameter_ust& +& **2) + result1 = SQRT(arg1) + arg2 = -(0.5_dp*(deltay/(wec_factor*sigmay))**2) + arg3 = -(0.5_dp*(deltaz/(wec_factor*sigmaz))**2) + DO nd=1,nbdirs +! velocity difference in the wake at each sample point + arg1d(nd) = -((COS(yaw)*ctd(nd)*8.0_dp*sigmay*sigmaz/& +& rotor_diameter_ust**2-ct*COS(yaw)*8.0_dp*(sigmayd(nd)*sigmaz+& +& sigmay*sigmazd(nd))/rotor_diameter_ust**2)/(8.0_dp*sigmay*sigmaz& +& /rotor_diameter_ust**2)**2) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + arg2d(nd) = -(0.5_dp*2*deltay*(deltayd(nd)*wec_factor*sigmay-& +& deltay*wec_factor*sigmayd(nd))/(wec_factor**3*sigmay**3)) + arg3d(nd) = 0.5_dp*2*deltaz**2*sigmazd(nd)/(wec_factor**2*sigmaz**& +& 3) + deltavd(nd) = ((1.0_dp-result1)*arg2d(nd)*EXP(arg2)-result1d(nd)*& +& EXP(arg2))*EXP(arg3) + (1.0_dp-result1)*EXP(arg2)*arg3d(nd)*EXP(& +& arg3) + END DO + deltav = (1.0_dp-result1)*EXP(arg2)*EXP(arg3) + ELSE + PRINT*, 'Invalid Bastankhah and Porte Agel model version. Must be 20& +&14 or 2016. ', version, ' was given.' + STOP + END IF +END SUBROUTINE DELTAV_FUNC_DV + +! Differentiation of deltav_near_wake_lin_func in forward (tangent) mode: +! variations of useful results: deltav +! with respect to varying inputs: k discontinuity_point x sigmay +! sigmaz deltax0_dp deltay sigmay0 ct sigmaz0 +! calculates the velocity difference between hub velocity and free stream for a given wake +! for use in the near wake region only +SUBROUTINE DELTAV_NEAR_WAKE_LIN_FUNC_DV(deltay, deltayd, deltaz, ct, ctd& +& , yaw, sigmay, sigmayd, sigmaz, sigmazd, rotor_diameter_ust, x, xd, & +& discontinuity_point, discontinuity_pointd, sigmay0, sigmay0d, sigmaz0& +& , sigmaz0d, version, k, kd, deltax0_dp, deltax0_dpd, wec_factor, & +& deltav, deltavd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: deltay, deltaz, ct, yaw, sigmay + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: deltayd, ctd, sigmayd + REAL(dp), INTENT(IN) :: sigmaz, rotor_diameter_ust, wec_factor + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: sigmazd + REAL(dp), INTENT(IN) :: x, discontinuity_point, sigmay0, sigmaz0 + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: xd, discontinuity_pointd& +& , sigmay0d, sigmaz0d +! only for 2014 version + REAL(dp), INTENT(IN) :: k, deltax0_dp + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: kd, deltax0_dpd + INTEGER, INTENT(IN) :: version +! local + REAL(dp) :: deltav0m, deltavr + REAL(dp), DIMENSION(nbdirs) :: deltav0md, deltavrd +! only for 2014 version + REAL(dp) :: beta_2014, epsilon_2014 + REAL(dp), DIMENSION(nbdirs) :: beta_2014d, epsilon_2014d +! out + REAL(dp), INTENT(OUT) :: deltav + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: deltavd +! load intrinsic functions + INTRINSIC COS, SQRT, EXP + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: result2 + REAL(dp), DIMENSION(nbdirs) :: result2d + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: arg2 + REAL(dp), DIMENSION(nbdirs) :: arg2d + INTEGER :: nd + INTEGER :: nbdirs +! print *, 'wake model version in deltav near wake: ', version +! print *, "inputs: ", deltay, deltaz, Ct, yaw, & +! & sigmay, sigmaz, rotor_diameter_ust, x, & +! & discontinuity_point, sigmay0, sigmaz0, version, k, & +! & deltax0_dp, wec_factor + IF (version .EQ. 2014) THEN + IF (yaw .GT. 0.0_dp) THEN + PRINT*, 'model version 2014 may only be used when yaw=0' + STOP + ELSE + result1 = SQRT(1.0_dp - ct) + result2 = SQRT(1.0_dp - ct) + beta_2014 = 0.5_dp*(1.0_dp+result1)/result2 + DO nd=1,nbdirs + result1d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + result2d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + beta_2014d(nd) = (0.5_dp*result1d(nd)*result2-0.5_dp*(1.0_dp+& +& result1)*result2d(nd))/result2**2 + IF (beta_2014 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = beta_2014d(nd)/(2.0*SQRT(beta_2014)) + END IF + epsilon_2014d(nd) = 0.2_dp*result1d(nd) + END DO + result1 = SQRT(beta_2014) + epsilon_2014 = 0.2_dp*result1 + arg1 = 1.0_dp - ct/(8.0_dp*(k*deltax0_dp/rotor_diameter_ust+& +& epsilon_2014)**2) + DO nd=1,nbdirs +! magnitude term of gaussian at x0 + arg1d(nd) = -((ctd(nd)*8.0_dp*(k*deltax0_dp/rotor_diameter_ust+& +& epsilon_2014)**2-ct*8.0_dp*2*(k*deltax0_dp/rotor_diameter_ust+& +& epsilon_2014)*((kd(nd)*deltax0_dp+k*deltax0_dpd(nd))/& +& rotor_diameter_ust+epsilon_2014d(nd)))/(8.0_dp*(k*deltax0_dp/& +& rotor_diameter_ust+epsilon_2014)**2)**2) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + deltav0md(nd) = -result1d(nd) +! initialize the gaussian magnitude term at the rotor for the linear interpolation + deltavrd(nd) = deltav0md(nd) +! linearized gaussian magnitude term for near wake + arg1d(nd) = 2*((kd(nd)*deltax0_dp+k*deltax0_dpd(nd))/& +& rotor_diameter_ust+epsilon_2014d(nd))*((deltaz/(wec_factor*& +& rotor_diameter_ust))**2+(deltay/(wec_factor*rotor_diameter_ust& +& ))**2)/(2.0_dp*(k*deltax0_dp/rotor_diameter_ust+epsilon_2014)& +& **3) - 2*deltay*deltayd(nd)/(2.0_dp*(k*deltax0_dp/& +& rotor_diameter_ust+epsilon_2014)**2*wec_factor**2*& +& rotor_diameter_ust**2) + END DO + result1 = SQRT(arg1) + deltav0m = 1.0_dp - result1 + deltavr = deltav0m + arg1 = (-(1.0_dp/(2.0_dp*(k*deltax0_dp/rotor_diameter_ust+& +& epsilon_2014)**2)))*((deltaz/(wec_factor*rotor_diameter_ust))**2& +& +(deltay/(wec_factor*rotor_diameter_ust))**2) + DO nd=1,nbdirs + deltavd(nd) = (((deltav0md(nd)-deltavrd(nd))*discontinuity_point& +& -(deltav0m-deltavr)*discontinuity_pointd(nd))*x/& +& discontinuity_point**2+(deltav0m-deltavr)*xd(nd)/& +& discontinuity_point+deltavrd(nd))*EXP(arg1) + ((deltav0m-& +& deltavr)/discontinuity_point*x+deltavr)*arg1d(nd)*EXP(arg1) + END DO + deltav = ((deltav0m-deltavr)/discontinuity_point*x+deltavr)*EXP(& +& arg1) + END IF + ELSE IF (version .EQ. 2016) THEN + arg1 = 1.0_dp - ct*COS(yaw)/(8.0_dp*sigmay0*sigmaz0/& +& rotor_diameter_ust**2) + DO nd=1,nbdirs +! magnitude term of gaussian at x0 + arg1d(nd) = -((COS(yaw)*ctd(nd)*8.0_dp*sigmay0*sigmaz0/& +& rotor_diameter_ust**2-ct*COS(yaw)*8.0_dp*(sigmay0d(nd)*sigmaz0+& +& sigmay0*sigmaz0d(nd))/rotor_diameter_ust**2)/(8.0_dp*sigmay0*& +& sigmaz0/rotor_diameter_ust**2)**2) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + deltav0md(nd) = -result1d(nd) +! initialize the gaussian magnitude term at the rotor for the linear interpolation + deltavrd(nd) = deltav0md(nd) +! linearized gaussian magnitude term for near wake + arg1d(nd) = -(0.5_dp*2*deltay*(deltayd(nd)*wec_factor*sigmay-& +& deltay*wec_factor*sigmayd(nd))/(wec_factor**3*sigmay**3)) + arg2d(nd) = 0.5_dp*2*deltaz**2*sigmazd(nd)/(wec_factor**2*sigmaz**& +& 3) + END DO + result1 = SQRT(arg1) + deltav0m = 1.0_dp - result1 + deltavr = deltav0m + arg1 = -(0.5_dp*(deltay/(wec_factor*sigmay))**2) + arg2 = -(0.5_dp*(deltaz/(wec_factor*sigmaz))**2) + DO nd=1,nbdirs + deltavd(nd) = ((((deltav0md(nd)-deltavrd(nd))*discontinuity_point-& +& (deltav0m-deltavr)*discontinuity_pointd(nd))*x/& +& discontinuity_point**2+(deltav0m-deltavr)*xd(nd)/& +& discontinuity_point+deltavrd(nd))*EXP(arg1)+((deltav0m-deltavr)/& +& discontinuity_point*x+deltavr)*arg1d(nd)*EXP(arg1))*EXP(arg2) + & +& ((deltav0m-deltavr)/discontinuity_point*x+deltavr)*EXP(arg1)*& +& arg2d(nd)*EXP(arg2) + END DO + deltav = ((deltav0m-deltavr)/discontinuity_point*x+deltavr)*EXP(arg1& +& )*EXP(arg2) + ELSE + PRINT*, 'Invalid Bastankhah and Porte Agel model version. Must be 20& +&14 or 2016. ', version, ' was given.' + STOP + END IF +END SUBROUTINE DELTAV_NEAR_WAKE_LIN_FUNC_DV + +! Differentiation of wake_combination_func in forward (tangent) mode: +! variations of useful results: deficit_sum +! with respect to varying inputs: turb_inflow deficit_sum deltav +! combines wakes using various methods +SUBROUTINE WAKE_COMBINATION_FUNC_DV(wind_speed, turb_inflow, & +& turb_inflowd, deltav, deltavd, wake_combination_method, deficit_sum, & +& deficit_sumd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: wind_speed, turb_inflow, deltav + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: turb_inflowd, deltavd + INTEGER, INTENT(IN) :: wake_combination_method +! out + REAL(dp), INTENT(INOUT) :: deficit_sum + REAL(dp), DIMENSION(nbdirs), INTENT(INOUT) :: deficit_sumd +! intrinsic functions + INTRINSIC SQRT + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + INTEGER :: nd + INTEGER :: nbdirs +! freestream linear superposition (Lissaman 1979) + IF (wake_combination_method .EQ. 0) THEN + DO nd=1,nbdirs + deficit_sumd(nd) = deficit_sumd(nd) + wind_speed*deltavd(nd) + END DO + deficit_sum = deficit_sum + wind_speed*deltav +! local velocity linear superposition (Niayifar and Porte Agel 2015, 2016) + ELSE IF (wake_combination_method .EQ. 1) THEN + DO nd=1,nbdirs + deficit_sumd(nd) = deficit_sumd(nd) + turb_inflowd(nd)*deltav + & +& turb_inflow*deltavd(nd) + END DO + deficit_sum = deficit_sum + turb_inflow*deltav +!print *, "here" +! sum of squares freestream superposition (Katic et al. 1986) + ELSE IF (wake_combination_method .EQ. 2) THEN + arg1 = deficit_sum**2 + (wind_speed*deltav)**2 + DO nd=1,nbdirs + arg1d(nd) = 2*deficit_sum*deficit_sumd(nd) + 2*wind_speed**2*& +& deltav*deltavd(nd) + IF (arg1 .EQ. 0.0) THEN + deficit_sumd(nd) = 0.0_8 + ELSE + deficit_sumd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + deficit_sum = SQRT(arg1) +! sum of squares local velocity superposition (Voutsinas 1990) + ELSE IF (wake_combination_method .EQ. 3) THEN + arg1 = deficit_sum**2 + (turb_inflow*deltav)**2 + DO nd=1,nbdirs + arg1d(nd) = 2*deficit_sum*deficit_sumd(nd) + 2*turb_inflow*deltav*& +& (turb_inflowd(nd)*deltav+turb_inflow*deltavd(nd)) + IF (arg1 .EQ. 0.0) THEN + deficit_sumd(nd) = 0.0_8 + ELSE + deficit_sumd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + deficit_sum = SQRT(arg1) +! wake combination method error + ELSE + PRINT*, 'Invalid wake combination method. Must be one of [0,1,2,3].' + STOP + END IF +END SUBROUTINE WAKE_COMBINATION_FUNC_DV + +! Differentiation of added_ti_func in forward (tangent) mode: +! variations of useful results: ti_dst ti_area_ratio +! with respect to varying inputs: k_star_ust x ti_dst_in ct_ust +! deltay ti_area_ratio_in ti_ust +! combines wakes using various methods +SUBROUTINE ADDED_TI_FUNC_DV(ti, ct_ust, ct_ustd, x, xd, k_star_ust, & +& k_star_ustd, rotor_diameter_ust, rotor_diameter_dst, deltay, deltayd, & +& wake_height, turbine_height, sm_smoothing, ti_ust, ti_ustd, & +& ti_calculation_method, ti_area_ratio_in, ti_area_ratio_ind, ti_dst_in& +& , ti_dst_ind, ti_area_ratio, ti_area_ratiod, ti_dst, ti_dstd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE +!print *, "ratio: ", wake_overlap/rotor_area_dst +!print *, "Dr, Dw: ", rotor_diameter_dst, wake_diameter +!print *, "Ar, Aol: ", rotor_area_dst, wake_overlap + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: ct_ust, x, k_star_ust, rotor_diameter_ust, & +& rotor_diameter_dst + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: ct_ustd, xd, k_star_ustd + REAL(dp), INTENT(IN) :: deltay, wake_height, turbine_height, & +& sm_smoothing + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: deltayd + REAL(dp), INTENT(IN) :: ti_ust, ti, ti_area_ratio_in, ti_dst_in + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: ti_ustd, & +& ti_area_ratio_ind, ti_dst_ind + INTEGER, INTENT(IN) :: ti_calculation_method +! local + REAL(dp) :: axial_induction_ust, beta, epsilon, sigma, wake_diameter, & +& wake_overlap + REAL(dp), DIMENSION(nbdirs) :: axial_induction_ustd, betad, & +& epsilond, sigmad, wake_diameterd, wake_overlapd + REAL(dp) :: ti_added, ti_tmp, rotor_area_dst, ti_area_ratio_tmp + REAL(dp), DIMENSION(nbdirs) :: ti_addedd, ti_tmpd, & +& ti_area_ratio_tmpd + REAL(dp), PARAMETER :: pi=3.141592653589793_dp +! out + REAL(dp), INTENT(OUT) :: ti_dst, ti_area_ratio + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: ti_dstd, ti_area_ratiod +! intrinsic functions + INTRINSIC SQRT + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: result2 + REAL(dp), DIMENSION(nbdirs) :: result2d + REAL(dp) :: pwx1 + REAL(dp), DIMENSION(nbdirs) :: pwx1d + REAL(dp) :: pwr1 + REAL(dp), DIMENSION(nbdirs) :: pwr1d + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + INTEGER :: nd + INTEGER :: nbdirs + DO nd=1,nbdirs +! initialize output variables + ti_area_ratiod(nd) = ti_area_ratio_ind(nd) + ti_dstd(nd) = ti_dst_ind(nd) + END DO + ti_area_ratio = ti_area_ratio_in + ti_dst = ti_dst_in +! initialize wake overlap to zero + wake_overlap = 0.0_dp +!print *, "TI_dst in: ", TI_dst +! Niayifar and Porte Agel 2015, 2016 (adjusted by Annoni and Thomas for SOWFA match +! and optimization) + IF (ti_calculation_method .EQ. 1) THEN +! calculate axial induction based on the Ct value + CALL CT_TO_AXIAL_IND_FUNC_DV(ct_ust, ct_ustd, axial_induction_ust, & +& axial_induction_ustd, nbdirs) + result1 = SQRT(1.0_dp - ct_ust) + result2 = SQRT(1.0_dp - ct_ust) + beta = 0.5_dp*((1.0_dp+result1)/result2) + pwx1 = x/rotor_diameter_ust + pwr1 = pwx1**(-0.32_dp) + DO nd=1,nbdirs +! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + result1d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + result2d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + betad(nd) = 0.5_dp*(result1d(nd)*result2-(1.0_dp+result1)*result2d& +& (nd))/result2**2 + IF (beta .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = betad(nd)/(2.0*SQRT(beta)) + END IF + epsilond(nd) = 0.2_dp*result1d(nd) +!print *, "epsilon = ", epsilon +! calculate wake spread for TI calcs + sigmad(nd) = k_star_ustd(nd)*x + k_star_ust*xd(nd) + & +& rotor_diameter_ust*epsilond(nd) + wake_diameterd(nd) = 4.0_dp*sigmad(nd) +!print *, "wake_overlap = ", wake_overlap +! Calculate the turbulence added to the inflow of the downstream turbine by the +! wake of the upstream turbine + pwx1d(nd) = xd(nd)/rotor_diameter_ust + IF (pwx1 .GT. 0.0) THEN + pwr1d(nd) = -(0.32_dp*pwx1**(-1.32)*pwx1d(nd)) + ELSE + pwr1d(nd) = 0.0 + END IF + ti_addedd(nd) = 0.73_dp*((0.8325_dp*axial_induction_ust**(-0.1675)& +& *axial_induction_ustd(nd)*pwr1+axial_induction_ust**0.8325_dp*& +& pwr1d(nd))*ti_ust**0.0325_dp+axial_induction_ust**0.8325_dp*pwr1& +& *0.0325_dp*ti_ust**(-0.9675)*ti_ustd(nd)) + END DO + result1 = SQRT(beta) + epsilon = 0.2_dp*result1 + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma +!print *, "sigma = ", sigma +! calculate wake overlap ratio + CALL OVERLAP_AREA_FUNC_DV(deltay, deltayd, turbine_height, & +& rotor_diameter_dst, 0.0_dp, wake_height, & +& wake_diameter, wake_diameterd, wake_overlap, & +& wake_overlapd, nbdirs) + ti_added = 0.73_dp*axial_induction_ust**0.8325_dp*ti_ust**0.0325_dp*& +& pwr1 +!print *, "TI_added = ", TI_added + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + arg1 = ti_dst_in**2.0_dp + (ti_added*wake_overlap/rotor_area_dst)**& +& 2.0_dp + DO nd=1,nbdirs +! Calculate the total turbulence intensity at the downstream turbine +!sum_of_squares = TI_dst**2 + (TI_added*wake_overlap)**2 +! print *, "sum of squares = ", sum_of_squares +! TI_dst = sqrt(sum_of_squares) +! !print *, "TI_dst = ", TI_dst + arg1d(nd) = 2.0_dp*ti_dst_in*ti_dst_ind(nd) + 2.0_dp*ti_added*& +& wake_overlap*(ti_addedd(nd)*wake_overlap+ti_added*wake_overlapd(& +& nd))/rotor_area_dst**2 + IF (arg1 .EQ. 0.0) THEN + ti_dstd(nd) = 0.0_8 + ELSE + ti_dstd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + ti_dst = SQRT(arg1) +! Niayifar and Porte Agel 2015, 2016 + ELSE IF (ti_calculation_method .EQ. 2) THEN +! calculate axial induction based on the Ct value + CALL CT_TO_AXIAL_IND_FUNC_DV(ct_ust, ct_ustd, axial_induction_ust, & +& axial_induction_ustd, nbdirs) + result1 = SQRT(1.0_dp - ct_ust) + result2 = SQRT(1.0_dp - ct_ust) + beta = 0.5_dp*((1.0_dp+result1)/result2) + pwx1 = x/rotor_diameter_ust + pwr1 = pwx1**(-0.32_dp) + DO nd=1,nbdirs +! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + result1d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + result2d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + betad(nd) = 0.5_dp*(result1d(nd)*result2-(1.0_dp+result1)*result2d& +& (nd))/result2**2 + IF (beta .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = betad(nd)/(2.0*SQRT(beta)) + END IF + epsilond(nd) = 0.2_dp*result1d(nd) +! calculate wake spread for TI calcs + sigmad(nd) = k_star_ustd(nd)*x + k_star_ust*xd(nd) + & +& rotor_diameter_ust*epsilond(nd) + wake_diameterd(nd) = 4.0_dp*sigmad(nd) +! Calculate the turbulence added to the inflow of the downstream turbine by the +! wake of the upstream turbine + pwx1d(nd) = xd(nd)/rotor_diameter_ust + IF (pwx1 .GT. 0.0) THEN + pwr1d(nd) = -(0.32_dp*pwx1**(-1.32)*pwx1d(nd)) + ELSE + pwr1d(nd) = 0.0 + END IF + ti_addedd(nd) = 0.73_dp*((0.8325_dp*axial_induction_ust**(-0.1675)& +& *axial_induction_ustd(nd)*pwr1+axial_induction_ust**0.8325_dp*& +& pwr1d(nd))*ti_ust**0.0325_dp+axial_induction_ust**0.8325_dp*pwr1& +& *0.0325_dp*ti_ust**(-0.9675)*ti_ustd(nd)) + END DO + result1 = SQRT(beta) + epsilon = 0.2_dp*result1 + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma +! calculate wake overlap ratio + CALL OVERLAP_AREA_FUNC_DV(deltay, deltayd, turbine_height, & +& rotor_diameter_dst, 0.0_dp, wake_height, & +& wake_diameter, wake_diameterd, wake_overlap, & +& wake_overlapd, nbdirs) + ti_added = 0.73_dp*axial_induction_ust**0.8325_dp*ti_ust**0.0325_dp*& +& pwr1 +! Calculate the total turbulence intensity at the downstream turbine based on +! current upstream turbine + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + arg1 = ti**2.0_dp + (ti_added*(wake_overlap/rotor_area_dst))**2.0_dp + DO nd=1,nbdirs + arg1d(nd) = 2.0_dp*ti_added*wake_overlap*(ti_addedd(nd)*& +& wake_overlap/rotor_area_dst+ti_added*wake_overlapd(nd)/& +& rotor_area_dst)/rotor_area_dst + IF (arg1 .EQ. 0.0) THEN + ti_tmpd(nd) = 0.0_8 + ELSE + ti_tmpd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + ti_tmp = SQRT(arg1) +! Check if this is the max and use it if it is + IF (ti_tmp .GT. ti_dst_in) THEN + DO nd=1,nbdirs +! print *, "TI_tmp > TI_dst" + ti_dstd(nd) = ti_tmpd(nd) + END DO + ti_dst = ti_tmp + END IF + ELSE IF (ti_calculation_method .EQ. 3) THEN +! Niayifar and Porte Agel 2015, 2016 with smooth max +! calculate axial induction based on the Ct value + CALL CT_TO_AXIAL_IND_FUNC_DV(ct_ust, ct_ustd, axial_induction_ust, & +& axial_induction_ustd, nbdirs) + result1 = SQRT(1.0_dp - ct_ust) + result2 = SQRT(1.0_dp - ct_ust) + beta = 0.5_dp*((1.0_dp+result1)/result2) + pwx1 = x/rotor_diameter_ust + pwr1 = pwx1**(-0.32_dp) + DO nd=1,nbdirs +! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + result1d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + result2d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + betad(nd) = 0.5_dp*(result1d(nd)*result2-(1.0_dp+result1)*result2d& +& (nd))/result2**2 + IF (beta .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = betad(nd)/(2.0*SQRT(beta)) + END IF + epsilond(nd) = 0.2_dp*result1d(nd) +! calculate wake spread for TI calcs + sigmad(nd) = k_star_ustd(nd)*x + k_star_ust*xd(nd) + & +& rotor_diameter_ust*epsilond(nd) + wake_diameterd(nd) = 4.0_dp*sigmad(nd) +! Calculate the turbulence added to the inflow of the downstream turbine by the +! wake of the upstream turbine + pwx1d(nd) = xd(nd)/rotor_diameter_ust + IF (pwx1 .GT. 0.0) THEN + pwr1d(nd) = -(0.32_dp*pwx1**(-1.32)*pwx1d(nd)) + ELSE + pwr1d(nd) = 0.0 + END IF + ti_addedd(nd) = 0.73_dp*((0.8325_dp*axial_induction_ust**(-0.1675)& +& *axial_induction_ustd(nd)*pwr1+axial_induction_ust**0.8325_dp*& +& pwr1d(nd))*ti_ust**0.0325_dp+axial_induction_ust**0.8325_dp*pwr1& +& *0.0325_dp*ti_ust**(-0.9675)*ti_ustd(nd)) + END DO + result1 = SQRT(beta) + epsilon = 0.2_dp*result1 + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma +! print *, "sigma, k_star_ust, x, rotor_diameter_ust, epsilon ", sigma, k_star_ust, x, rotor_diameter_ust, epsilon +! print *, "deltay, turbine_height, rotor_diameter_dst, wake_height, wake_diameter", & +! & deltay, turbine_height, rotor_diameter_dst, & +! wake_height, wake_diameter +! calculate wake overlap ratio + CALL OVERLAP_AREA_FUNC_DV(deltay, deltayd, turbine_height, & +& rotor_diameter_dst, 0.0_dp, wake_height, & +& wake_diameter, wake_diameterd, wake_overlap, & +& wake_overlapd, nbdirs) + ti_added = 0.73_dp*axial_induction_ust**0.8325_dp*ti_ust**0.0325_dp*& +& pwr1 +! Calculate the total turbulence intensity at the downstream turbine based on +! current upstream turbine + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + arg1 = ti**2.0_dp + (ti_added*(wake_overlap/rotor_area_dst))**2.0_dp + DO nd=1,nbdirs + arg1d(nd) = 2.0_dp*ti_added*wake_overlap*(ti_addedd(nd)*& +& wake_overlap/rotor_area_dst+ti_added*wake_overlapd(nd)/& +& rotor_area_dst)/rotor_area_dst + IF (arg1 .EQ. 0.0) THEN + ti_tmpd(nd) = 0.0_8 + ELSE + ti_tmpd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + ti_tmp = SQRT(arg1) +!print *, "TI, TI_added, wake_overlap, rotor_area_dst: ", TI, TI_added, wake_overlap, rotor_area_dst +! Check if this is the max and use it if it is +!if (TI_tmp > TI_dst) then +! TI_dst = TI_tmp +!end if +! print *, "before: ", TI_dst, TI_tmp +! TI_dst_in = TI_dst + CALL SMOOTH_MAX_DV(sm_smoothing, ti_dst_in, ti_dst_ind, ti_tmp, & +& ti_tmpd, ti_dst, ti_dstd, nbdirs) +! print *, "after:: ", TI_dst, TI_tmp +! Niayifar and Porte Agel 2015, 2016 using max on area TI ratio + ELSE IF (ti_calculation_method .EQ. 4) THEN +! calculate axial induction based on the Ct value + CALL CT_TO_AXIAL_IND_FUNC_DV(ct_ust, ct_ustd, axial_induction_ust, & +& axial_induction_ustd, nbdirs) + result1 = SQRT(1.0_dp - ct_ust) + result2 = SQRT(1.0_dp - ct_ust) + beta = 0.5_dp*((1.0_dp+result1)/result2) + pwx1 = x/rotor_diameter_ust + pwr1 = pwx1**(-0.32_dp) + DO nd=1,nbdirs +! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + result1d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + result2d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + betad(nd) = 0.5_dp*(result1d(nd)*result2-(1.0_dp+result1)*result2d& +& (nd))/result2**2 + IF (beta .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = betad(nd)/(2.0*SQRT(beta)) + END IF + epsilond(nd) = 0.2_dp*result1d(nd) +! calculate wake spread for TI calcs + sigmad(nd) = k_star_ustd(nd)*x + k_star_ust*xd(nd) + & +& rotor_diameter_ust*epsilond(nd) + wake_diameterd(nd) = 4.0_dp*sigmad(nd) +! Calculate the turbulence added to the inflow of the downstream turbine by the +! wake of the upstream turbine + pwx1d(nd) = xd(nd)/rotor_diameter_ust + IF (pwx1 .GT. 0.0) THEN + pwr1d(nd) = -(0.32_dp*pwx1**(-1.32)*pwx1d(nd)) + ELSE + pwr1d(nd) = 0.0 + END IF + ti_addedd(nd) = 0.73_dp*((0.8325_dp*axial_induction_ust**(-0.1675)& +& *axial_induction_ustd(nd)*pwr1+axial_induction_ust**0.8325_dp*& +& pwr1d(nd))*ti_ust**0.0325_dp+axial_induction_ust**0.8325_dp*pwr1& +& *0.0325_dp*ti_ust**(-0.9675)*ti_ustd(nd)) + END DO + result1 = SQRT(beta) + epsilon = 0.2_dp*result1 + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma +! calculate wake overlap ratio + CALL OVERLAP_AREA_FUNC_DV(deltay, deltayd, turbine_height, & +& rotor_diameter_dst, 0.0_dp, wake_height, & +& wake_diameter, wake_diameterd, wake_overlap, & +& wake_overlapd, nbdirs) + ti_added = 0.73_dp*axial_induction_ust**0.8325_dp*ti_ust**0.0325_dp*& +& pwr1 +! Calculate the total turbulence intensity at the downstream turbine based on +! current upstream turbine + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + DO nd=1,nbdirs + ti_area_ratio_tmpd(nd) = ti_addedd(nd)*wake_overlap/rotor_area_dst& +& + ti_added*wake_overlapd(nd)/rotor_area_dst + END DO + ti_area_ratio_tmp = ti_added*(wake_overlap/rotor_area_dst) +! Check if this is the max and use it if it is + IF (ti_area_ratio_tmp .GT. ti_area_ratio_in) THEN + ti_area_ratio = ti_area_ratio_tmp + arg1 = ti**2.0_dp + ti_area_ratio**2.0_dp + DO nd=1,nbdirs +! print *, "ti_area_ratio_tmp > ti_area_ratio" +!TI_dst = TI_tmp + ti_area_ratiod(nd) = ti_area_ratio_tmpd(nd) + arg1d(nd) = 2.0_dp*ti_area_ratio*ti_area_ratiod(nd) + IF (arg1 .EQ. 0.0) THEN + ti_dstd(nd) = 0.0_8 + ELSE + ti_dstd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + ti_dst = SQRT(arg1) + END IF + ELSE IF (ti_calculation_method .EQ. 5) THEN +! Niayifar and Porte Agel 2015, 2016 using smooth max on area TI ratio +! calculate axial induction based on the Ct value + CALL CT_TO_AXIAL_IND_FUNC_DV(ct_ust, ct_ustd, axial_induction_ust, & +& axial_induction_ustd, nbdirs) + result1 = SQRT(1.0_dp - ct_ust) + result2 = SQRT(1.0_dp - ct_ust) + beta = 0.5_dp*((1.0_dp+result1)/result2) + DO nd=1,nbdirs +! calculate BPA spread parameters Bastankhah and Porte Agel 2014 + result1d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + result2d(nd) = -(ct_ustd(nd)/(2.0*SQRT(1.0_dp-ct_ust))) + betad(nd) = 0.5_dp*(result1d(nd)*result2-(1.0_dp+result1)*result2d& +& (nd))/result2**2 + IF (beta .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = betad(nd)/(2.0*SQRT(beta)) + END IF + epsilond(nd) = 0.2_dp*result1d(nd) +! calculate wake spread for TI calcs + sigmad(nd) = k_star_ustd(nd)*x + k_star_ust*xd(nd) + & +& rotor_diameter_ust*epsilond(nd) + wake_diameterd(nd) = 4.0_dp*sigmad(nd) + END DO + result1 = SQRT(beta) + epsilon = 0.2_dp*result1 + sigma = k_star_ust*x + rotor_diameter_ust*epsilon + wake_diameter = 4.0_dp*sigma +! calculate wake overlap ratio + CALL OVERLAP_AREA_FUNC_DV(deltay, deltayd, turbine_height, & +& rotor_diameter_dst, 0.0_dp, wake_height, & +& wake_diameter, wake_diameterd, wake_overlap, & +& wake_overlapd, nbdirs) +! only include turbines with area overlap in the softmax + IF (wake_overlap .GT. 0.0_dp) THEN + pwx1 = x/rotor_diameter_ust + pwr1 = pwx1**(-0.32_dp) + ti_added = 0.73_dp*axial_induction_ust**0.8325_dp*ti_ust**& +& 0.0325_dp*pwr1 + rotor_area_dst = 0.25_dp*pi*rotor_diameter_dst**2_dp + DO nd=1,nbdirs +! Calculate the turbulence added to the inflow of the downstream turbine by the +! wake of the upstream turbine + pwx1d(nd) = xd(nd)/rotor_diameter_ust + IF (pwx1 .GT. 0.0) THEN + pwr1d(nd) = -(0.32_dp*pwx1**(-1.32)*pwx1d(nd)) + ELSE + pwr1d(nd) = 0.0 + END IF + ti_addedd(nd) = 0.73_dp*((0.8325_dp*axial_induction_ust**(& +& -0.1675)*axial_induction_ustd(nd)*pwr1+axial_induction_ust**& +& 0.8325_dp*pwr1d(nd))*ti_ust**0.0325_dp+axial_induction_ust**& +& 0.8325_dp*pwr1*0.0325_dp*ti_ust**(-0.9675)*ti_ustd(nd)) + ti_area_ratio_tmpd(nd) = ti_addedd(nd)*wake_overlap/& +& rotor_area_dst + ti_added*wake_overlapd(nd)/rotor_area_dst + END DO + ti_area_ratio_tmp = ti_added*(wake_overlap/rotor_area_dst) +!TI_tmp = sqrt(TI**2.0_dp + (TI_added*(wake_overlap/rotor_area_dst))**2.0_dp) +! Run through the smooth max to get an approximation of the true max TI area ratio + CALL SMOOTH_MAX_DV(sm_smoothing, ti_area_ratio_in, & +& ti_area_ratio_ind, ti_area_ratio_tmp, & +& ti_area_ratio_tmpd, ti_area_ratio, ti_area_ratiod, & +& nbdirs) + arg1 = ti**2.0_dp + ti_area_ratio**2.0_dp + DO nd=1,nbdirs +! Calculate the total turbulence intensity at the downstream turbine based on +! the result of the smooth max function + arg1d(nd) = 2.0_dp*ti_area_ratio*ti_area_ratiod(nd) + IF (arg1 .EQ. 0.0) THEN + ti_dstd(nd) = 0.0_8 + ELSE + ti_dstd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + ti_dst = SQRT(arg1) + END IF + ELSE +! wake combination method error + PRINT*, & +& 'Invalid added TI calculation method. Must be one of [0,1,2,3,4,5].' + STOP + END IF +END SUBROUTINE ADDED_TI_FUNC_DV + +! Differentiation of overlap_area_func in forward (tangent) mode: +! variations of useful results: wake_overlap +! with respect to varying inputs: wake_diameter turbine_y +! calculates the overlap area between a given wake and a rotor area +SUBROUTINE OVERLAP_AREA_FUNC_DV(turbine_y, turbine_yd, turbine_z, & +& rotor_diameter, wake_center_y, wake_center_z, wake_diameter, & +& wake_diameterd, wake_overlap, wake_overlapd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: turbine_y, turbine_z, rotor_diameter + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: turbine_yd + REAL(dp), INTENT(IN) :: wake_center_y, wake_center_z, wake_diameter + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: wake_diameterd +! out + REAL(dp), INTENT(OUT) :: wake_overlap + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: wake_overlapd +! local + REAL(dp), PARAMETER :: pi=3.141592653589793_dp, tol=0.000001_dp + REAL(dp) :: ovdyd, ovr, ovrr, ovl, ovz, ovz2 + REAL(dp), DIMENSION(nbdirs) :: ovdydd, ovrrd, ovld, ovzd, ovz2d +! load intrinsic functions + INTRINSIC ACOS, SQRT + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: arg2 + REAL(dp), DIMENSION(nbdirs) :: arg2d + REAL(dp) :: result2 + REAL(dp), DIMENSION(nbdirs) :: result2d + INTEGER :: nd + INTEGER :: nbdirs +! print *, turbine_y, turbine_z, rotor_diameter, & +! wake_center_y, wake_center_z, wake_diameter, & +! wake_overlap +! distance between wake center and rotor center + IF (wake_center_z .GT. turbine_z + tol .OR. wake_center_z .LT. & +& turbine_z - tol) THEN + arg1 = (wake_center_y-turbine_y)**2_dp + (wake_center_z-turbine_z)**& +& 2_dp + DO nd=1,nbdirs + arg1d(nd) = -(2_dp*(wake_center_y-turbine_y)*turbine_yd(nd)) + IF (arg1 .EQ. 0.0) THEN + ovdydd(nd) = 0.0_8 + ELSE + ovdydd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + ovdyd = SQRT(arg1) + ELSE IF (wake_center_y .GT. turbine_y + tol) THEN + DO nd=1,nbdirs +! potential source of gradient issues, abs() did not cause a problem in FLORIS + ovdydd(nd) = -turbine_yd(nd) + END DO + ovdyd = wake_center_y - turbine_y + ELSE IF (turbine_y .GT. wake_center_y + tol) THEN + DO nd=1,nbdirs + ovdydd(nd) = turbine_yd(nd) + END DO + ovdyd = turbine_y - wake_center_y + ELSE + ovdyd = 0.0_dp + ovdydd(:) = 0.0_8 + END IF +!print *, "OVdYd: ", OVdYd +! find rotor radius + ovr = rotor_diameter/2.0_dp + DO nd=1,nbdirs +!print *, "OVr: ", OVr +! find wake radius + ovrrd(nd) = wake_diameterd(nd)/2.0_dp + END DO + ovrr = wake_diameter/2.0_dp +!print *, "OVRR: ", OVRR +! determine if there is overlap + IF (ovdyd .LT. ovr + ovrr) THEN +! if the rotor overlaps the wake zone +! check that turbine and wake centers are not perfectly aligned + IF (ovdyd .GT. 0.0_dp + tol) THEN +! check if the rotor is wholly contained in the wake + IF (ovdyd + ovr .LT. ovrr + tol) THEN + wake_overlap = pi*ovr*ovr +! print *, "1" +! check if the wake is wholly contained in the rotor swept area + wake_overlapd(:) = 0.0_8 + ELSE IF (ovdyd + ovrr .LT. ovr + tol) THEN + DO nd=1,nbdirs + wake_overlapd(nd) = pi*(ovrrd(nd)*ovrr+ovrr*ovrrd(nd)) + END DO + wake_overlap = pi*ovrr*ovrr +! print *, "2" + ELSE + ovl = (-(ovr*ovr)+ovrr*ovrr+ovdyd*ovdyd)/(2.0_dp*ovdyd) + arg1 = ovrr*ovrr - ovl*ovl + arg2 = (ovdyd-ovl)/ovr + DO nd=1,nbdirs +! calculate the distance from the wake center to the chord connecting the lens +! cusps + ovld(nd) = ((ovrrd(nd)*ovrr+ovrr*ovrrd(nd)+ovdydd(nd)*ovdyd+& +& ovdyd*ovdydd(nd))*2.0_dp*ovdyd-(-(ovr*ovr)+ovrr*ovrr+ovdyd*& +& ovdyd)*2.0_dp*ovdydd(nd))/(2.0_dp*ovdyd)**2 + arg1d(nd) = ovrrd(nd)*ovrr + ovrr*ovrrd(nd) - ovld(nd)*ovl - & +& ovl*ovld(nd) + IF (arg1 .EQ. 0.0) THEN + ovzd(nd) = 0.0_8 + ELSE + ovzd(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + arg1d(nd) = -((ovdydd(nd)-ovld(nd))*(ovdyd-ovl)) - (ovdyd-ovl)& +& *(ovdydd(nd)-ovld(nd)) + arg2d(nd) = (ovdydd(nd)-ovld(nd))/ovr + IF (arg2 .EQ. 1.0 .OR. arg2 .EQ. (-1.0)) THEN + result2d(nd) = 0.0_8 + ELSE + result2d(nd) = -(arg2d(nd)/SQRT(1.0-arg2**2)) + END IF + END DO + ovz = SQRT(arg1) + arg1 = ovr*ovr - (ovdyd-ovl)*(ovdyd-ovl) + DO nd=1,nbdirs + IF (arg1 .EQ. 0.0) THEN + ovz2d(nd) = 0.0_8 + ELSE + ovz2d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + arg1d(nd) = (ovld(nd)*ovrr-ovl*ovrrd(nd))/ovrr**2 + END DO + ovz2 = SQRT(arg1) + arg1 = ovl/ovrr + result1 = ACOS(arg1) + DO nd=1,nbdirs + IF (arg1 .EQ. 1.0 .OR. arg1 .EQ. (-1.0)) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = -(arg1d(nd)/SQRT(1.0-arg1**2)) + END IF + wake_overlapd(nd) = (ovrrd(nd)*ovrr+ovrr*ovrrd(nd))*result1 + & +& ovrr**2*result1d(nd) + ovr**2*result2d(nd) - ovld(nd)*ovz - & +& ovl*ovzd(nd) - (ovdydd(nd)-ovld(nd))*ovz2 - (ovdyd-ovl)*& +& ovz2d(nd) + END DO + result2 = ACOS(arg2) + wake_overlap = ovrr*ovrr*result1 + ovr*ovr*result2 - ovl*ovz - (& +& ovdyd-ovl)*ovz2 +! print *, OVRR, OVr, OVdYd, OVL, OVz, OVz2 +! print *, "3" + END IF + ELSE IF (ovrr .GT. ovr) THEN +! perfect overlap case where the wake is larger than the rotor + wake_overlap = pi*ovr*ovr +! print *, "4" +! perfect overlap case where the rotor is larger than the wake + wake_overlapd(:) = 0.0_8 + ELSE + DO nd=1,nbdirs + wake_overlapd(nd) = pi*(ovrrd(nd)*ovrr+ovrr*ovrrd(nd)) + END DO + wake_overlap = pi*ovrr*ovrr +! print *, "5" + END IF + ELSE +! case with no overlap + wake_overlap = 0.0_dp + wake_overlapd(:) = 0.0_8 + END IF +! print *, "wake overlap in func: ", wake_overlap/(pi*OVr**2) +! print *, "wake overlap in func: ", wake_overlap/(pi*OVRR**2) + IF (wake_overlap/(pi*ovr*ovr) .GT. 1.0_dp + tol .OR. wake_overlap/(pi*& +& ovrr*ovrr) .GT. 1.0_dp + tol) THEN + PRINT*, 'wake overlap in func: ', wake_overlap/(pi*ovr*ovr) + PRINT*, 'wake overlap in func: ', wake_overlap/(pi*ovrr*ovrr) + STOP + END IF +END SUBROUTINE OVERLAP_AREA_FUNC_DV + +! Differentiation of k_star_func in forward (tangent) mode: +! variations of useful results: k_star_ust +! with respect to varying inputs: ti_ust +! compute wake spread parameter based on local turbulence intensity +SUBROUTINE K_STAR_FUNC_DV(ti_ust, ti_ustd, k_star_ust, k_star_ustd, & +& nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: ti_ust + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: ti_ustd +! out + REAL(dp), INTENT(OUT) :: k_star_ust + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: k_star_ustd + INTEGER :: nd + INTEGER :: nbdirs + DO nd=1,nbdirs +! calculate wake spread parameter from Niayifar and Porte Agel (2015, 2016) + k_star_ustd(nd) = 0.3837*ti_ustd(nd) + END DO + k_star_ust = 0.3837*ti_ust + 0.003678 +END SUBROUTINE K_STAR_FUNC_DV + +! Differentiation of ct_to_axial_ind_func in forward (tangent) mode: +! variations of useful results: axial_induction +! with respect to varying inputs: ct +! calculate axial induction from Ct +SUBROUTINE CT_TO_AXIAL_IND_FUNC_DV(ct, ctd, axial_induction, & +& axial_inductiond, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: ct + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: ctd +! out + REAL(dp), INTENT(OUT) :: axial_induction + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: axial_inductiond + INTRINSIC SQRT + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + INTEGER :: nd + INTEGER :: nbdirs +! initialize axial induction to zero + axial_induction = 0.0_dp +! calculate axial induction + IF (ct .GT. 0.96) THEN + arg1 = 0.0203_dp - 0.6427_dp*(0.889_dp-ct) + DO nd=1,nbdirs +! Glauert condition + arg1d(nd) = 0.6427_dp*ctd(nd) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + axial_inductiond(nd) = result1d(nd) + END DO + result1 = SQRT(arg1) + axial_induction = 0.143_dp + result1 + ELSE + DO nd=1,nbdirs + result1d(nd) = -(ctd(nd)/(2.0*SQRT(1.0_dp-ct))) + axial_inductiond(nd) = -(0.5_dp*result1d(nd)) + END DO + result1 = SQRT(1.0_dp - ct) + axial_induction = 0.5_dp*(1.0_dp-result1) + END IF +END SUBROUTINE CT_TO_AXIAL_IND_FUNC_DV + +! Differentiation of wind_shear_func in forward (tangent) mode: +! variations of useful results: adjusted_wind_speed +! with respect to varying inputs: u_ref +! adjust wind speed for wind shear +SUBROUTINE WIND_SHEAR_FUNC_DV(point_z, u_ref, u_refd, z_ref, z_0, & +& shear_exp, adjusted_wind_speed, adjusted_wind_speedd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: point_z, u_ref, z_ref, z_0, shear_exp + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: u_refd +! out + REAL(dp), INTENT(OUT) :: adjusted_wind_speed + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: adjusted_wind_speedd + REAL(dp) :: pwx1 + REAL(dp) :: pwr1 + INTEGER :: nd + INTEGER :: nbdirs +! initialize adjusted wind speed to zero + adjusted_wind_speed = 0.0_dp +! check that the point of interest is above ground level + IF (point_z .GE. z_0) THEN +! adjusted wind speed for wind shear if point is above ground + pwx1 = (point_z-z_0)/(z_ref-z_0) + pwr1 = pwx1**shear_exp + DO nd=1,nbdirs + adjusted_wind_speedd(nd) = pwr1*u_refd(nd) + END DO + adjusted_wind_speed = u_ref*pwr1 + ELSE +! if the point of interest is below ground, set the wind speed to 0.0 + adjusted_wind_speed = 0.0_dp + adjusted_wind_speedd(:) = 0.0_8 + END IF +END SUBROUTINE WIND_SHEAR_FUNC_DV + +! Differentiation of discontinuity_point_func in forward (tangent) mode: +! variations of useful results: discontinuity_point +! with respect to varying inputs: ky kz x0 ct +! calculate the point where the Bastankhah and Porte Agel wake model becomes undefined +SUBROUTINE DISCONTINUITY_POINT_FUNC_DV(x0, x0d, rotor_diameter, ky, kyd& +& , kz, kzd, yaw, ct, ctd, discontinuity_point, discontinuity_pointd, & +& nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: x0, rotor_diameter, ky, kz, yaw, ct + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: x0d, kyd, kzd, ctd +! local + REAL(dp) :: a, b, c + REAL(dp), DIMENSION(nbdirs) :: ad, bd, cd +! out + REAL(dp), INTENT(OUT) :: discontinuity_point + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: discontinuity_pointd + INTRINSIC COS, SQRT + REAL(dp) :: result1 + REAL(dp), DIMENSION(nbdirs) :: result1d + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + INTEGER :: nd + INTEGER :: nbdirs + a = ky + kz*COS(yaw) + b = 4.0_dp*ky*kz*COS(yaw)*(ct-1.0_dp) + result1 = SQRT(8.0_dp) + arg1 = a**2 - b + DO nd=1,nbdirs +! for clarity, break out the terms in the equation + ad(nd) = kyd(nd) + COS(yaw)*kzd(nd) + bd(nd) = 4.0_dp*COS(yaw)*((kyd(nd)*kz+ky*kzd(nd))*(ct-1.0_dp)+ky*kz*& +& ctd(nd)) + cd(nd) = 2.0_dp*result1*(kyd(nd)*kz+ky*kzd(nd)) +! distance from rotor to the last point where the wake model is undefined + arg1d(nd) = 2*a*ad(nd) - bd(nd) + IF (arg1 .EQ. 0.0) THEN + result1d(nd) = 0.0_8 + ELSE + result1d(nd) = arg1d(nd)/(2.0*SQRT(arg1)) + END IF + END DO + c = 2.0_dp*result1*ky*kz + result1 = SQRT(arg1) + DO nd=1,nbdirs + discontinuity_pointd(nd) = x0d(nd) + (rotor_diameter*(ad(nd)-& +& result1d(nd))*c-rotor_diameter*(a-result1)*cd(nd))/c**2 + END DO + discontinuity_point = x0 + rotor_diameter*(a-result1)/c +END SUBROUTINE DISCONTINUITY_POINT_FUNC_DV + +! Differentiation of smooth_max in forward (tangent) mode: +! variations of useful results: g +! with respect to varying inputs: x y +SUBROUTINE SMOOTH_MAX_DV(s, x, xd, y, yd, g, gd, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: s, x, y + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: xd, yd +! local + REAL(dp) :: max_val, min_val + REAL(dp), DIMENSION(nbdirs) :: max_vald, min_vald +! out + REAL(dp), INTENT(OUT) :: g + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: gd + INTRINSIC LOG, EXP, MAX, MIN + REAL(dp) :: arg1 + REAL(dp), DIMENSION(nbdirs) :: arg1d + REAL(dp) :: arg2 + REAL(dp), DIMENSION(nbdirs) :: arg2d + INTEGER :: nd + INTEGER :: nbdirs + IF (x .LT. y) THEN + DO nd=1,nbdirs + max_vald(nd) = yd(nd) + END DO + max_val = y + ELSE + DO nd=1,nbdirs + max_vald(nd) = xd(nd) + END DO + max_val = x + END IF + IF (x .GT. y) THEN + DO nd=1,nbdirs + min_vald(nd) = yd(nd) + END DO + min_val = y + ELSE + DO nd=1,nbdirs + min_vald(nd) = xd(nd) + END DO + min_val = x + END IF + arg1 = s*(min_val-max_val) + arg2 = 1.0_dp + EXP(arg1) + DO nd=1,nbdirs + arg1d(nd) = s*(min_vald(nd)-max_vald(nd)) + arg2d(nd) = arg1d(nd)*EXP(arg1) + gd(nd) = (arg2d(nd)/arg2+s*max_vald(nd))/s + END DO + g = (LOG(arg2)+s*max_val)/s +END SUBROUTINE SMOOTH_MAX_DV + +! Differentiation of interpolation in forward (tangent) mode: +! variations of useful results: yval +! with respect to varying inputs: yval xval +SUBROUTINE INTERPOLATION_DV(npoints, interp_type, x, y, xval, xvald, & +& yval, yvald, dy0in, dy1in, usedyin, nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE +! print *, "yval = ", yval + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + INTEGER, INTENT(IN) :: npoints, interp_type + REAL(dp), DIMENSION(npoints), INTENT(IN) :: x, y + REAL(dp), INTENT(IN) :: xval + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: xvald + REAL(dp), INTENT(IN) :: dy0in, dy1in + LOGICAL :: usedyin +! local + INTEGER :: idx + REAL(dp) :: x0, x1, y0, dy0, y1, dy1 +! out + REAL(dp), INTENT(OUT) :: yval + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: yvald + INTEGER :: nd + INTEGER :: nbdirs +! print *, "in interpolation" +! if ((xval < x(1)) .or. (xval > x(nPoints))) then +! print *, "interpolation point is out of bounds" +! ! STOP 1 +! end if + IF (usedyin .AND. interp_type .EQ. 1) THEN + PRINT*, & +& 'end point derivatives may not be specified for linear interpolation' + STOP + ELSE IF (xval .LT. x(1)) THEN + yval = y(1) + yvald(:) = 0.0_8 + ELSE IF (xval .GT. x(npoints)) THEN + yval = y(npoints) + yvald(:) = 0.0_8 + ELSE + idx = 1 + DO WHILE (xval .GT. x(idx) .AND. idx .LE. npoints) + idx = idx + 1 + END DO + idx = idx - 1 + x0 = x(idx) + x1 = x(idx+1) + y0 = y(idx) + y1 = y(idx+1) +! Hermite cubic piecewise spline interpolation + IF (interp_type .EQ. 0) THEN +! approximate derivative at left end of interval + IF (idx .EQ. 1) THEN + IF (usedyin) THEN + dy0 = dy0in + ELSE + dy0 = 0.0_dp + END IF + ELSE + dy0 = (y(idx+1)-y(idx-1))/(x(idx+1)-x(idx-1)) + END IF +! approximate derivative at the right end of interval + IF (idx .GE. npoints - 1) THEN + IF (usedyin) THEN + dy1 = dy1in + ELSE + dy1 = 0.0_dp + END IF + ELSE + dy1 = (y(idx+2)-y(idx))/(x(idx+2)-x(idx)) + END IF +! call Hermite spline routine + CALL HERMITE_SPLINE_DV(xval, xvald, x0, x1, y0, dy0, y1, dy1, yval& +& , yvald, nbdirs) +! linear interpolation + ELSE IF (interp_type .EQ. 1) THEN + DO nd=1,nbdirs + yvald(nd) = (y1-y0)*xvald(nd)/(x1-x0) + END DO + yval = (xval-x0)*(y1-y0)/(x1-x0) + y0 + END IF + END IF +END SUBROUTINE INTERPOLATION_DV + +! Differentiation of hermite_spline in forward (tangent) mode: +! variations of useful results: y +! with respect to varying inputs: x +SUBROUTINE HERMITE_SPLINE_DV(x, xd, x0, x1, y0, dy0, y1, dy1, y, yd, & +& nbdirs) + +! Hint: nbdirs should be the maximum number of differentiation directions + IMPLICIT NONE +!dy_dx = c3*3*x**2 + c2*2*x + c1 + INTRINSIC KIND +! define precision to be the standard for a double precision ! on local system + INTEGER, PARAMETER :: dp=KIND(0.d0) +! in + REAL(dp), INTENT(IN) :: x, x0, x1, y0, dy0, y1, dy1 + REAL(dp), DIMENSION(nbdirs), INTENT(IN) :: xd +! out +!, dy_dx + REAL(dp), INTENT(OUT) :: y + REAL(dp), DIMENSION(nbdirs), INTENT(OUT) :: yd +! local + REAL(dp) :: c3, c2, c1, c0 + INTEGER :: nd + INTEGER :: nbdirs +! initialize coefficients for parametric cubic spline + c3 = 2.0_dp*y1/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) - 2.0_dp*& +& y0/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + dy0/(x0**2-2.0_dp& +& *x0*x1+x1**2) + dy1/(x0**2-2.0_dp*x0*x1+x1**2) + c2 = 3.0_dp*y0*(x0+x1)/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) -& +& dy1*(2.0_dp*x0+x1)/(x0**2-2.0_dp*x0*x1+x1**2) - dy0*(x0+2.0_dp*x1)/(& +& x0**2-2.0_dp*x0*x1+x1**2) - 3.0_dp*y1*(x0+x1)/(x0**3-3.0_dp*x0**2*x1& +& +3.0_dp*x0*x1**2-x1**3) + c1 = dy0*(x1**2+2.0_dp*x0*x1)/(x0**2-2.0_dp*x0*x1+x1**2) + dy1*(x0**2+& +& 2.0_dp*x1*x0)/(x0**2-2.0_dp*x0*x1+x1**2) - 6.0_dp*x0*x1*y0/(x0**3-& +& 3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + 6.0_dp*x0*x1*y1/(x0**3-& +& 3.0_dp*x0**2*x1+3.0_dp*x0*x1**2-x1**3) + c0 = y0*(-(x1**3)+3.0_dp*x0*x1**2)/(x0**3-3.0_dp*x0**2*x1+3.0_dp*x0*x1& +& **2-x1**3) - y1*(-(x0**3)+3.0_dp*x1*x0**2)/(x0**3-3.0_dp*x0**2*x1+& +& 3.0_dp*x0*x1**2-x1**3) - x0*x1**2*dy0/(x0**2-2.0_dp*x0*x1+x1**2) - & +& x0**2*x1*dy1/(x0**2-2.0_dp*x0*x1+x1**2) + DO nd=1,nbdirs +! Solve for y and dy values at the given point + yd(nd) = c3*3*x**2*xd(nd) + c2*2*x*xd(nd) + c1*xd(nd) + END DO + y = c3*x**3 + c2*x**2 + c1*x + c0 +END SUBROUTINE HERMITE_SPLINE_DV diff --git a/code/getBaseline.py b/code/getBaseline.py index e02d01c..4424e6a 100644 --- a/code/getBaseline.py +++ b/code/getBaseline.py @@ -3,293 +3,94 @@ import numpy as np import scipy as sp import os -from aep_calc import * -from var_reduction_exact import * import grid_param_fortran -import constraints +import full_aep +from var_reduction_exact import * import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') from windRoses import * from position_constraints import calculate_boundary sys.dont_write_bytecode = True -class AEP_calc(Component): - """ Calculates aep with simple gaussian wake model """ - - def __init__(self, nTurbines, nDirections): - - # print 'entering windframe __init__ - analytic' - - super(AEP_calc, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('turbineZ', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('windDirections', val=np.zeros(nDirections)) - self.add_param('windSpeeds', val=np.zeros(nDirections)) - self.add_param('windFrequencies', val=np.zeros(nDirections)) - - - self.add_output('negAEP', val=0.0, pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_obj - nCalls_obj += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - turbineZ = params['turbineZ'] - rotorDiameter = params['rotorDiameter'] - - windDirections = params['windDirections'] - windSpeeds = params['windSpeeds'] - windFrequencies = params['windFrequencies'] - - AEP, daep_dx, daep_dy = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - self.daep_dx = daep_dx - self.daep_dy = daep_dy - unknowns['negAEP'] = -AEP - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - d_dx = np.zeros((1,self.nTurbines)) - d_dy = np.zeros((1,self.nTurbines)) - for i in range(self.nTurbines): - d_dx[0][i] = -self.daep_dx[i] - d_dy[0][i] = -self.daep_dy[i] - # populate Jacobian dict - J[('negAEP', 'turbineX')] = d_dx - J[('negAEP', 'turbineY')] = d_dy - - return J - - -class constraint_calc(Component): - """ Calculates spacing and boundary constraints""" - - def __init__(self, nTurbines, nBoundaries): - - super(constraint_calc, self).__init__() - - self.nTurbines = nTurbines - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) - self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) - - self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) - self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_con - nCalls_con += 1 - - turbineX = params['turbineX'] - # turbineX = turbineX-(max(turbineX)+min(turbineX))/2. - turbineY = params['turbineY'] - # turbienY = turbineY-(max(turbineY)+min(turbineY))/2. - rotorDiameter = params['rotorDiameter'] - - boundaryVertices = params['boundaryVertices'] - # bx = params['boundaryVertices'][:,0] - # by = params['boundaryVertices'][:,1] - # bx = bx + (max(turbineX)+min(turbineX))/2. - # by = by + (max(turbineY)+min(turbineY))/2. - # boundaryVertices[:,0] = bx[:] - # boundaryVertices[:,1] = by[:] - boundaryNormals = params['boundaryNormals'] - - - dx = np.eye(self.nTurbines) - dy = np.zeros((self.nTurbines,self.nTurbines)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((self.nTurbines,self.nTurbines)) - dy = np.eye(self.nTurbines) - ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - bounds = np.zeros(nTurbines) - index = np.zeros(nTurbines) - for i in range(nTurbines): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - - self.index = index - self.ss_dx = ss_dx - self.ss_dy = ss_dy - self.bd_dx = bd_dx - self.bd_dy = bd_dy - - unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 - unknowns['boundary_constraint'] = bounds - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('spacing_constraint', 'turbineX')] = self.ss_dx.T - J[('spacing_constraint', 'turbineY')] = self.ss_dy.T - - db_dx = np.zeros((self.nTurbines,self.nTurbines)) - db_dy = np.zeros((self.nTurbines,self.nTurbines)) - for i in range(nTurbines): - db_dx[i][i] = self.bd_dx[i][i][self.index[i]] - db_dy[i][i] = self.bd_dy[i][i][self.index[i]] - J[('boundary_constraint','turbineX')] = db_dx - J[('boundary_constraint','turbineY')] = db_dy - - return J - - -class form_grid(Component): - """get turbine locations from grid variables""" - - def __init__(self, nTurbines, nRows): - - super(form_grid, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('dx', val=0.) - self.add_param('dy', val=0.) - self.add_param('shear', val=0.) - self.add_param('rotate', val=0.) - self.add_param('y0', val=0.) - - self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) - self.add_param('x_start', val=np.zeros(nRows)) - - self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) - self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - dx = params['dx'] - dy = params['dy'] - shear = params['shear'] - rotate = params['rotate'] - y0 = params['y0'] - turbs_per_row = params['turbs_per_row'] - x_start = params['x_start'] - - dxd = 1. - dyd = 0. - sheard = 0. - rotated = 0. - turbineX,dx_ddx,turbineY,dy_ddx = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 1. - sheard = 0. - rotated = 0. - turbineX,dx_ddy,turbineY,dy_ddy = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 1. - rotated = 0. - turbineX,dx_dshear,turbineY,dy_dshear = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 0. - rotated = 1. - turbineX,dx_drotate,turbineY,dy_drotate = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - self.dx_ddx = dx_ddx - self.dy_ddx = dy_ddx - self.dx_ddy = dx_ddy - self.dy_ddy = dy_ddy - self.dx_dshear = dx_dshear - self.dy_dshear = dy_dshear - self.dx_drotate = dx_drotate - self.dy_drotate = dy_drotate - - unknowns['turbineX'] = turbineX - unknowns['turbineY'] = turbineY - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('turbineX', 'dx')] = self.dx_ddx.T - J[('turbineY', 'dx')] = self.dy_ddx.T - - J[('turbineX', 'dy')] = self.dx_ddy.T - J[('turbineY', 'dy')] = self.dy_ddy.T - - J[('turbineX', 'shear')] = self.dx_dshear.T - J[('turbineY', 'shear')] = self.dy_dshear.T - - J[('turbineX', 'rotate')] = self.dx_drotate.T - J[('turbineY', 'rotate')] = self.dy_drotate.T - - - return J +def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed p attern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-po ints-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y if __name__ == "__main__": - global nCalls_obj - global nCalls_con - - run = 4 nTurbines = 100 - rose = 'northIslandRose' + # rose = 'northIslandRose' # rose = 'ukiahRose' # rose = 'victorvilleRose' - spacing = 8. - boundary = 'amalia' + # spacing = 4. + # spacing = 6. + # spacing = 8. + # boundary = 'amalia' # boundary = 'circle' # boundary = 'square' - nDirections = 23 + spacing = float(sys.argv[1]) + boundary = '%s'%sys.argv[2] + rose = '%s'%sys.argv[3] + + print 'spacing: ', spacing + print 'boundary: ', boundary + print 'rose: ', rose + + nDirections = 24 nSpeeds = 5 if rose == 'northIslandRose': windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = northIslandRose(360,nSpeeds=50) + windDirections_eval -= wind_angle elif rose == 'ukiahRose': windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = ukiahRose(360,nSpeeds=50) + windDirections_eval -= wind_angle elif rose == 'victorvilleRose': windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) windDirections -= wind_angle + windDirections_eval, windFrequencies_eval, windSpeeds_eval = victorvilleRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + rotorDiameter = np.ones(nTurbines)*130. turbineZ = np.ones(nTurbines)*110. @@ -324,8 +125,8 @@ def linearize(self, params, unknowns, resids): locations[:, 1] = yBounds boundaryVertices, boundaryNormals = calculate_boundary(locations) elif boundary == 'amalia': - locations = np.loadtxt('/Users/ningrsrch/Dropbox/Projects/reduction/layout_amalia.txt') - xBounds = locations[:, 0] + locations = np.loadtxt('/fslhome/pjstanle/compute/reduction/layout_amalia.txt') + xBounds = locations[:, 0] yBounds = locations[:, 1] xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. @@ -367,73 +168,91 @@ def linearize(self, params, unknowns, resids): ymax = max(yBounds) ymin = min(yBounds) - num = 1 - for i in range(num): - rotate = 0. - dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nTurbines, + ct_speeds = np.array([ 0.000001, 0.1 , 0.60816327, 1.11632653, 1.6244898 , 2.13265306, + 2.64081633, 3.14897959, 3.65714286, 4.16530612, 4.67346939, + 5.18163265, 5.68979592, 6.19795918, 6.70612245, 7.21428571, + 7.72244898, 8.23061224, 8.73877551, 9.24693878, 9.75510204, + 10.26326531, 10.77142857, 11.27959184, 11.7877551 , 12.29591837, + 12.80408163, 13.3122449 , 13.82040816, 14.32857143, 14.83673469, + 15.34489796, 15.85306122, 16.36122449, 16.86938776, 17.37755102, + 17.88571429, 18.39387755, 18.90204082, 19.41020408, 19.91836735, + 20.42653061, 20.93469388, 21.44285714, 21.95102041, 22.45918367, + 22.96734694, 23.4755102 , 23.98367347, 24.49183673, 25. ]) + ct_ct = np.array([0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, + 0.74988552, 0.74945275, 0.74736838, 0.74578062, 0.74452166, + 0.7432327 , 0.74240891, 0.74171844, 0.74113119, 0.74062551, + 0.7401854 , 0.7397988 , 0.73945643, 0.73915104, 0.71535516, + 0.50902345, 0.42264255, 0.36002829, 0.31616439, 0.27728908, + 0.2449473 , 0.2179915 , 0.19464155, 0.17388996, 0.15676952, + 0.14116089, 0.12769325, 0.11564223, 0.104593 , 0.09546578, + 0.08765315, 0.08043937, 0.07409357, 0.06822311, 0.06322334, + 0.05887784, 0.05481244, 0.05114998, 0.0474271 , 0.04415572, + 0.04104199, 0.0383636 , 0.03582949, 0.03401271, 0.03235028]) + + nCtPoints = len(ct_ct) + RotorPointsYopt = np.array([0, 0, -0.69, 0.69]) + RotorPointsZopt = np.array([0.69, -0.69, 0, 0]) + nRotorPoints_opt = 4 + + nRotorPoints_eval = 100 + RotorPointsYeval, RotorPointsZeval = sunflower_points(nRotorPoints_eval) + + + rotate = 0. + dx,dy,shear,rotate,turbs_per_row,x_start,y0 = startGrid(nTurbines, boundaryVertices,boundaryNormals,rotate=rotate,my=1.0) - - nRows = len(turbs_per_row) - prob = Problem() - root = prob.root = Group() - root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) - root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) - root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) - root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) - - root.add('makeGrid', form_grid(nTurbines=nTurbines,nRows=nRows),promotes=['*']) - root.add('AEP_obj', AEP_calc(nTurbines=nTurbines, nDirections=nDirections*nSpeeds), promotes=['*']) - root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) - - prob.setup(check=True) - - prob['turbineZ'] = turbineZ - prob['rotorDiameter'] = rotorDiameter - - prob['windDirections'] = windDirections - prob['windSpeeds'] = windSpeeds - prob['windFrequencies'] = windFrequencies - - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - prob['turbs_per_row'] = turbs_per_row - prob['x_start'] = x_start - prob['y0'] = y0 - - print 'iteration: ', i - nCalls_obj = 0 - nCalls_con = 0 - - prob['dx'] = dx_start - prob['dy'] = dy_start - prob['shear'] = shear_start - prob['rotate'] = rotate_start - - prob.run() - - separation = np.min(prob['spacing_constraint']) - boundary = np.min(prob['boundary_constraint']) - AEP = -prob['negAEP'] - - print 'AEP opt: ', AEP - print 'function calls obj: ', nCalls_obj - print 'function calls con: ', nCalls_con - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - print 'turbineX: ', repr(prob['turbineX']) - print 'turbineY: ', repr(prob['turbineY']) - - plt.figure(1) - plt.clf() - for i in range(nTurbines): - circ = plt.Circle((prob['turbineX'][i],prob['turbineY'][i]),prob['rotorDiameter'][i]/2.) - plt.gca().add_patch(circ) - bx = prob['boundaryVertices'][:,0] - by = prob['boundaryVertices'][:,1] - bx = np.append(bx,bx[0]) - by = np.append(by,by[0]) - plt.plot(bx,by,'--k') - plt.axis('equal') - plt.show() + turbineX,_,turbineY,_ = grid_param_fortran.makegrid_fortran_dv(nTurbines, + dx,0.,dy,0.,shear,0.,rotate,0.,turbs_per_row,x_start,y0) + nRows = len(turbs_per_row) + + print 'dx: ', dx + print 'dy: ', dy + print 'shear: ', shear + print 'rotate: ', rotate + print 'turbs_per_row: ', turbs_per_row + print 'x_start: ', x_start + print 'y0: ', y0 + print 'turbineX: ', turbineX + print 'turbineY: ', turbineY + + """evaluate""" + + Ct = np.ones(nTurbines)*8./9. + yaw = np.zeros(nTurbines) + shear_exp = 0.1 + rated_ws = 9.8 + rated_power = 3.6 + cut_in_speed = 4.0 + cut_out_speed = 25. + zref = 50. + z0 = 0. + ky = 0.022 + kz = 0.022 + alpha = 2.32 + beta = 0.154 + TI = 0.11 + relaxationFactor = 1.0 + sm_smoothing = 700. + generator_efficiency = 0.936 + wake_combination_method = 1 + ti_calculation_method = 2 + wake_model_version = 2016 + interp_type = 1 + calc_k_star = True + print_ti = False + use_ct_curve = True + + print 'windDirections: ', windDirections + print 'windSpeeds: ', windSpeeds + print 'windFrequencies: ', np.sum(windFrequencies) + print 'RotorPointsYopt: ', RotorPointsYopt + print 'RotorPointsZopt: ', RotorPointsZopt + AEPopt = full_aep.calcaep(turbineX,turbineY,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsYopt, RotorPointsZopt,ct_speeds,ct_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + AEPopt = AEPopt*0.936 + print 'AEPopt: ', AEPopt diff --git a/code/getCtCurve.py b/code/getCtCurve.py new file mode 100644 index 0000000..6676d43 --- /dev/null +++ b/code/getCtCurve.py @@ -0,0 +1,142 @@ +from ccblade import * +import numpy as np +import scipy.interpolate as sp + + +r = np.array([0.000,0.010,0.020,0.030,0.040,0.050,0.060,0.070,0.080,0.100,0.120,0.140,0.160,0.180,0.200,0.220, + 0.240,0.260,0.280,0.300,0.320,0.340,0.360,0.380,0.400,0.420,0.440,0.460,0.480,0.500,0.520,0.540, + 0.560,0.580,0.600,0.620,0.640,0.660,0.680,0.700,0.720,0.740,0.760,0.780,0.800,0.820,0.840,0.860, + 0.880,0.900,0.920,0.940,0.960,0.980,1.000])*62.4+2.6 + +chord = np.array([2600.0,2600.0,2600.0,2620.6,2680.1,2776.7,2910.6,3032.4,3155.4,3400.0,3618.0,3803.9,3958.7,4083.2,4178.5,4245.5, + 4285.1,4298.4,4286.7,4252.0,4196.1,4121.1,4028.7,3921.1,3800.0,3667.7,3527.8,3384.0,3240.1,3100.0,2966.8,2841.2, + 2723.1,2612.7,2509.8,2414.5,2326.9,2246.8,2174.3,2109.5,2052.3,2002.8,1960.9,1926.6,1900.0,1879.2,1854.9,1816.1, + 1751.5,1650.0,1500.5,1291.9,1013.1,652.8 ,200.0 ])/1000. + +theta = np.array([20.00,19.87,19.73,19.56,19.39,19.20,18.99,18.76,18.51,17.94,17.07,15.81,14.37,12.95,11.75,10.73, + 9.71 ,8.71 ,7.74 ,6.81 ,5.93 ,5.12 ,4.39 ,3.75 ,3.21 ,2.76 ,2.38 ,2.05 ,1.77 ,1.53 ,1.32 ,1.13 , + 0.95 ,0.78 ,0.60 ,0.42 ,0.27 ,0.13 ,0.01 ,-0.11,-0.22,-0.34,-0.47,-0.60,-0.75,-0.91,-1.07,-1.24, + -1.45,-1.70,-2.05,-2.54,-3.14,-3.84 ,-4.62 ]) + + +# r = np.array([0.0, 0.02, 0.1371, 0.2118, 0.3188, 0.5236, 0.6781, 0.8967, 1.0]) +# +# chord = np.zeros_like(r) +# theta = np.zeros_like(r) +# +# for i in range(len(r)): +# index = 0 +# on = True +# while on: +# if r[i] >= r1[index] and r[i] <= r1[index+1]: +# on = False +# else: +# index += 1 +# chord[i] = (r[i]-r1[index])/(r1[index+1]-r1[index])*(chord1[index+1]-chord1[index])+chord1[index] +# theta[i] = (r[i]-r1[index])/(r1[index+1]-r1[index])*(theta1[index+1]-theta1[index])+theta1[index] + +# r = np.array([2.8667, 5.6000, 8.3333, 11.7500, 15.8500, 19.9500, 24.0500, +# 28.1500, 32.2500, 36.3500, 40.4500, 44.5500, 48.6500, 52.7500, +# 56.1667, 58.9000, 61.6333]) +# chord = np.array([3.542, 3.854, 4.167, 4.557, 4.652, 4.458, 4.249, 4.007, 3.748, +# 3.502, 3.256, 3.010, 2.764, 2.518, 2.313, 2.086, 1.419]) +# theta = np.array([13.308, 13.308, 13.308, 13.308, 11.480, 10.162, 9.011, 7.795, +# 6.544, 5.361, 4.188, 3.125, 2.319, 1.526, 0.863, 0.370, 0.106]) + +import os +afinit = CCAirfoil.initFromAerodynFile # just for shorthand +basepath = '335MW_AFFiles' + os.path.sep + +# load all airfoils +airfoil_types = [0]*7 +airfoil_types[0] = afinit(basepath + 'Cylinder1.dat') +airfoil_types[1] = afinit(basepath + 'FX77-W-500.dat') +airfoil_types[2] = afinit(basepath + 'FX77-W-400.dat') +airfoil_types[3] = afinit(basepath + 'DU00-W2-350.dat') +airfoil_types[4] = afinit(basepath + 'DU97-W-300.dat') +airfoil_types[5] = afinit(basepath + 'DU91-W2-250.dat') +airfoil_types[6] = afinit(basepath + 'DU08-W-210.dat') + +# basepath = '5MW_AFFiles' + os.path.sep + +# airfoil_types = [0]*8 +# airfoil_types[0] = afinit(basepath + 'Cylinder1.dat') +# airfoil_types[1] = afinit(basepath + 'Cylinder2.dat') +# airfoil_types[2] = afinit(basepath + 'DU40_A17.dat') +# airfoil_types[3] = afinit(basepath + 'DU35_A17.dat') +# airfoil_types[4] = afinit(basepath + 'DU30_A17.dat') +# airfoil_types[5] = afinit(basepath + 'DU25_A17.dat') +# airfoil_types[6] = afinit(basepath + 'DU21_A17.dat') +# airfoil_types[7] = afinit(basepath + 'NACA64_A17.dat') + + +# r = np.array([0.0, 0.02, 0.1371, 0.2118, 0.3188, 0.5236, 0.6781, 0.8967, 1.0]) +# af_idx = [0, 0, 1, 2, 3, 4, 5, 6, 6] +af_idx = [0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, + 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 6, 6, 6, 6, 6, 6] + +# af_idx = [0, 0, 1, 2, 3, 3, 4, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6] + +# af_idx = [0, 0, 0, 2, 3, 4, 5, 6, 6] + +af = [0]*len(r) +for i in range(len(r)): + af[i] = airfoil_types[af_idx[i]] + +tilt = 5.0 +precone = 2.5 +hubHt = 110. +Rhub = 2.6 +Rtip = 65. + +rotor = CCBlade(r, chord, theta, af, Rhub, Rtip, precone, tilt, hubHt) + +omega_rpm = np.array([0.,3.9114391143911433,11.75,11.75]) +omega_ws = np.array([0.,3.060344827586208,9.331896551724139, 25.1,]) +f_omega = sp.interp1d(omega_ws,omega_rpm) + + + +pitch_angle = np.array([1.09,1.09,1.09,1.09,0.8645195667798404, + 3.102803043445931,4.465909935810053,5.732360157624726,6.706981585665069, + 7.486740687501545,8.461981709583881,9.339636670053778,10.510049815360972, + 11.583186696076726,12.949081761629778,14.705630870653547,16.95042008476046, + 18.707898584847207,20.17261890009665,21.83313093261295,23.493642965129244, + 25.447532776524817,26.424322783712107]) +pitch_ws = np.array([0.,3.1528662420382156,7.67515923566879, 9.26751592356688, 9.777070063694268, + 9.968152866242038, 10.222929936305732,10.605095541401274,10.987261146496815, + 11.305732484076435,11.815286624203821,12.261146496815286,12.898089171974522, + 13.535031847133759,14.363057324840764,15.509554140127388,17.038216560509554, + 18.37579617834395, 19.522292993630575,20.923566878980893,22.32484076433121, + 24.044585987261147,25.]) +f_pitch = sp.interp1d(pitch_ws,pitch_angle) + + + +Uinf = np.linspace(0.1,25.,50) + +import matplotlib.pyplot as plt +plt.plot(Uinf,f_omega(Uinf),'o') +plt.show() + +print 'Uinf: ', repr(Uinf) +# print 'f_omega(Uinf): ', f_omega(Uinf) +# print 'f_pitch(Uinf): ', f_pitch(Uinf) + +P, T, Q, M, CP, CT, CQ, CM = rotor.evaluate(Uinf, f_omega(Uinf), f_pitch(Uinf), coefficients=True) +# print 'P: ', P +# print 'T: ', T +# print 'Q: ', Q +# print 'M: ', M +# print 'CP: ', CP +# print 'CQ: ', CQ + +print 'Uinf: ', repr(Uinf) +print 'CT: ', repr(CT) +# print 'CM: ', CM + +import matplotlib.pyplot as plt +plt.plot(Uinf,CT,'o') +plt.show() diff --git a/code/multiModality.py b/code/multiModality.py deleted file mode 100644 index ca2970f..0000000 --- a/code/multiModality.py +++ /dev/null @@ -1,439 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver -import numpy as np -import scipy as sp -import os -from aep_calc import * -from var_reduction_exact import * -import grid_param_fortran -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - - -class AEP_calc(Component): - """ Calculates aep with simple gaussian wake model """ - - def __init__(self, nTurbines, nDirections): - - # print 'entering windframe __init__ - analytic' - - super(AEP_calc, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('turbineZ', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('windDirections', val=np.zeros(nDirections)) - self.add_param('windSpeeds', val=np.zeros(nDirections)) - self.add_param('windFrequencies', val=np.zeros(nDirections)) - - - self.add_output('negAEP', val=0.0, pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_obj - nCalls_obj += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - turbineZ = params['turbineZ'] - rotorDiameter = params['rotorDiameter'] - - windDirections = params['windDirections'] - windSpeeds = params['windSpeeds'] - windFrequencies = params['windFrequencies'] - - AEP, daep_dx, daep_dy = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - self.daep_dx = daep_dx - self.daep_dy = daep_dy - unknowns['negAEP'] = -AEP - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - d_dx = np.zeros((1,self.nTurbines)) - d_dy = np.zeros((1,self.nTurbines)) - for i in range(self.nTurbines): - d_dx[0][i] = -self.daep_dx[i] - d_dy[0][i] = -self.daep_dy[i] - # populate Jacobian dict - J[('negAEP', 'turbineX')] = d_dx - J[('negAEP', 'turbineY')] = d_dy - - return J - - -class constraint_calc(Component): - """ Calculates spacing and boundary constraints""" - - def __init__(self, nTurbines, nBoundaries): - - super(constraint_calc, self).__init__() - - self.nTurbines = nTurbines - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) - self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) - - self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) - self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_con - nCalls_con += 1 - - turbineX = params['turbineX'] - # turbineX = turbineX-(max(turbineX)+min(turbineX))/2. - turbineY = params['turbineY'] - # turbienY = turbineY-(max(turbineY)+min(turbineY))/2. - rotorDiameter = params['rotorDiameter'] - - boundaryVertices = params['boundaryVertices'] - # bx = params['boundaryVertices'][:,0] - # by = params['boundaryVertices'][:,1] - # bx = bx + (max(turbineX)+min(turbineX))/2. - # by = by + (max(turbineY)+min(turbineY))/2. - # boundaryVertices[:,0] = bx[:] - # boundaryVertices[:,1] = by[:] - boundaryNormals = params['boundaryNormals'] - - - dx = np.eye(self.nTurbines) - dy = np.zeros((self.nTurbines,self.nTurbines)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((self.nTurbines,self.nTurbines)) - dy = np.eye(self.nTurbines) - ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - bounds = np.zeros(nTurbines) - index = np.zeros(nTurbines) - for i in range(nTurbines): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - - self.index = index - self.ss_dx = ss_dx - self.ss_dy = ss_dy - self.bd_dx = bd_dx - self.bd_dy = bd_dy - - unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 - unknowns['boundary_constraint'] = bounds - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('spacing_constraint', 'turbineX')] = self.ss_dx.T - J[('spacing_constraint', 'turbineY')] = self.ss_dy.T - - db_dx = np.zeros((self.nTurbines,self.nTurbines)) - db_dy = np.zeros((self.nTurbines,self.nTurbines)) - for i in range(nTurbines): - db_dx[i][i] = self.bd_dx[i][i][self.index[i]] - db_dy[i][i] = self.bd_dy[i][i][self.index[i]] - J[('boundary_constraint','turbineX')] = db_dx - J[('boundary_constraint','turbineY')] = db_dy - - return J - - -class form_grid(Component): - """get turbine locations from grid variables""" - - def __init__(self, nTurbines, nRows): - - super(form_grid, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('dx', val=0.) - self.add_param('dy', val=0.) - self.add_param('shear', val=0.) - self.add_param('rotate', val=0.) - self.add_param('y0', val=0.) - - self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) - self.add_param('x_start', val=np.zeros(nRows)) - - self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) - self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - dx = params['dx'] - dy = params['dy'] - shear = params['shear'] - rotate = params['rotate'] - y0 = params['y0'] - turbs_per_row = params['turbs_per_row'] - x_start = params['x_start'] - - dxd = 1. - dyd = 0. - sheard = 0. - rotated = 0. - turbineX,dx_ddx,turbineY,dy_ddx = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 1. - sheard = 0. - rotated = 0. - turbineX,dx_ddy,turbineY,dy_ddy = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 1. - rotated = 0. - turbineX,dx_dshear,turbineY,dy_dshear = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 0. - rotated = 1. - turbineX,dx_drotate,turbineY,dy_drotate = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - self.dx_ddx = dx_ddx - self.dy_ddx = dy_ddx - self.dx_ddy = dx_ddy - self.dy_ddy = dy_ddy - self.dx_dshear = dx_dshear - self.dy_dshear = dy_dshear - self.dx_drotate = dx_drotate - self.dy_drotate = dy_drotate - - unknowns['turbineX'] = turbineX - unknowns['turbineY'] = turbineY - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('turbineX', 'dx')] = self.dx_ddx.T - J[('turbineY', 'dx')] = self.dy_ddx.T - - J[('turbineX', 'dy')] = self.dx_ddy.T - J[('turbineY', 'dy')] = self.dy_ddy.T - - J[('turbineX', 'shear')] = self.dx_dshear.T - J[('turbineY', 'shear')] = self.dy_dshear.T - - J[('turbineX', 'rotate')] = self.dx_drotate.T - J[('turbineY', 'rotate')] = self.dy_drotate.T - - - return J - - -if __name__ == "__main__": - global nCalls_obj - global nCalls_con - - run = 4 - nTurbines = 100 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 4. - boundary = 'amalia' - # boundary = 'circle' - # boundary = 'square' - - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbines)*130. - turbineZ = np.ones(nTurbines)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - nBounds = 100 - # circle_radius = 5280. - xBounds = np.zeros(nBounds) - yBounds = np.zeros(nBounds) - theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) - for i in range(nBounds): - xBounds[i] = circle_radius*np.cos(theta[i]) - yBounds[i] = circle_radius*np.sin(theta[i]) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/Users/ningrsrch/Dropbox/Projects/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - nBoundaries = np.shape(boundaryVertices)[0] - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - num = 1 - for i in range(num): - rotate = 0. - dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nTurbines, - boundaryVertices,boundaryNormals,rotate=rotate,my=1.0) - - nRows = len(turbs_per_row) - prob = Problem() - root = prob.root = Group() - root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) - root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) - root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) - root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) - - root.add('makeGrid', form_grid(nTurbines=nTurbines,nRows=nRows),promotes=['*']) - root.add('AEP_obj', AEP_calc(nTurbines=nTurbines, nDirections=nDirections*nSpeeds), promotes=['*']) - root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) - - prob.setup(check=True) - - prob['turbineZ'] = turbineZ - prob['rotorDiameter'] = rotorDiameter - - prob['windDirections'] = windDirections - prob['windSpeeds'] = windSpeeds - prob['windFrequencies'] = windFrequencies - - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - prob['turbs_per_row'] = turbs_per_row - prob['x_start'] = x_start - prob['y0'] = y0 - - print 'iteration: ', i - nCalls_obj = 0 - nCalls_con = 0 - - prob['dx'] = dx_start - prob['dy'] = dy_start - prob['shear'] = shear_start - prob['rotate'] = rotate_start - - prob.run() - - separation = np.min(prob['spacing_constraint']) - boundary = np.min(prob['boundary_constraint']) - AEP = -prob['negAEP'] - - print 'AEP opt: ', AEP - print 'function calls obj: ', nCalls_obj - print 'function calls con: ', nCalls_con - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - print 'turbineX: ', repr(prob['turbineX']) - print 'turbineY: ', repr(prob['turbineY']) - - plt.figure(1) - plt.clf() - for i in range(nTurbines): - circ = plt.Circle((prob['turbineX'][i],prob['turbineY'][i]),prob['rotorDiameter'][i]/2.) - plt.gca().add_patch(circ) - bx = prob['boundaryVertices'][:,0] - by = prob['boundaryVertices'][:,1] - bx = np.append(bx,bx[0]) - by = np.append(by,by[0]) - plt.plot(bx,by,'--k') - plt.axis('equal') - plt.show() diff --git a/code/multiModality_direct.py b/code/multiModality_direct.py deleted file mode 100644 index 164026d..0000000 --- a/code/multiModality_direct.py +++ /dev/null @@ -1,412 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver -import numpy as np -import scipy as sp -import os -from aep_calc import * -from var_reduction_exact import * -import grid_param_fortran -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - - -class AEP_calc(Component): - """ Calculates aep with simple gaussian wake model """ - - def __init__(self, nTurbines, nDirections): - - # print 'entering windframe __init__ - analytic' - - super(AEP_calc, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('turbineZ', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('windDirections', val=np.zeros(nDirections)) - self.add_param('windSpeeds', val=np.zeros(nDirections)) - self.add_param('windFrequencies', val=np.zeros(nDirections)) - - - self.add_output('negAEP', val=0.0, pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_obj - nCalls_obj += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - turbineZ = params['turbineZ'] - rotorDiameter = params['rotorDiameter'] - - windDirections = params['windDirections'] - windSpeeds = params['windSpeeds'] - windFrequencies = params['windFrequencies'] - - AEP, daep_dx, daep_dy = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - self.daep_dx = daep_dx - self.daep_dy = daep_dy - unknowns['negAEP'] = -AEP - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - d_dx = np.zeros((1,self.nTurbines)) - d_dy = np.zeros((1,self.nTurbines)) - for i in range(self.nTurbines): - d_dx[0][i] = -self.daep_dx[i] - d_dy[0][i] = -self.daep_dy[i] - # populate Jacobian dict - J[('negAEP', 'turbineX')] = d_dx - J[('negAEP', 'turbineY')] = d_dy - - return J - - -class constraint_calc(Component): - """ Calculates spacing and boundary constraints""" - - def __init__(self, nTurbines, nBoundaries): - - super(constraint_calc, self).__init__() - - self.nTurbines = nTurbines - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) - self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) - - self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) - self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_con - nCalls_con += 1 - - turbineX = params['turbineX'] - # turbineX = turbineX-(max(turbineX)+min(turbineX))/2. - turbineY = params['turbineY'] - # turbienY = turbineY-(max(turbineY)+min(turbineY))/2. - rotorDiameter = params['rotorDiameter'] - - boundaryVertices = params['boundaryVertices'] - # bx = params['boundaryVertices'][:,0] - # by = params['boundaryVertices'][:,1] - # bx = bx + (max(turbineX)+min(turbineX))/2. - # by = by + (max(turbineY)+min(turbineY))/2. - # boundaryVertices[:,0] = bx[:] - # boundaryVertices[:,1] = by[:] - boundaryNormals = params['boundaryNormals'] - - - dx = np.eye(self.nTurbines) - dy = np.zeros((self.nTurbines,self.nTurbines)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((self.nTurbines,self.nTurbines)) - dy = np.eye(self.nTurbines) - ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - bounds = np.zeros(nTurbines) - index = np.zeros(nTurbines) - for i in range(nTurbines): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - - self.index = index - self.ss_dx = ss_dx - self.ss_dy = ss_dy - self.bd_dx = bd_dx - self.bd_dy = bd_dy - - unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 - unknowns['boundary_constraint'] = bounds - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('spacing_constraint', 'turbineX')] = self.ss_dx.T - J[('spacing_constraint', 'turbineY')] = self.ss_dy.T - - db_dx = np.zeros((self.nTurbines,self.nTurbines)) - db_dy = np.zeros((self.nTurbines,self.nTurbines)) - for i in range(nTurbines): - db_dx[i][i] = self.bd_dx[i][i][self.index[i]] - db_dy[i][i] = self.bd_dy[i][i][self.index[i]] - J[('boundary_constraint','turbineX')] = db_dx - J[('boundary_constraint','turbineY')] = db_dy - - return J - - -class form_grid(Component): - """get turbine locations from grid variables""" - - def __init__(self, nTurbines, nRows): - - super(form_grid, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('dx', val=0.) - self.add_param('dy', val=0.) - self.add_param('shear', val=0.) - self.add_param('rotate', val=0.) - self.add_param('y0', val=0.) - - self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) - self.add_param('x_start', val=np.zeros(nRows)) - - self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) - self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - dx = params['dx'] - dy = params['dy'] - shear = params['shear'] - rotate = params['rotate'] - y0 = params['y0'] - turbs_per_row = params['turbs_per_row'] - x_start = params['x_start'] - - dxd = 1. - dyd = 0. - sheard = 0. - rotated = 0. - turbineX,dx_ddx,turbineY,dy_ddx = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 1. - sheard = 0. - rotated = 0. - turbineX,dx_ddy,turbineY,dy_ddy = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 1. - rotated = 0. - turbineX,dx_dshear,turbineY,dy_dshear = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 0. - rotated = 1. - turbineX,dx_drotate,turbineY,dy_drotate = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - self.dx_ddx = dx_ddx - self.dy_ddx = dy_ddx - self.dx_ddy = dx_ddy - self.dy_ddy = dy_ddy - self.dx_dshear = dx_dshear - self.dy_dshear = dy_dshear - self.dx_drotate = dx_drotate - self.dy_drotate = dy_drotate - - unknowns['turbineX'] = turbineX - unknowns['turbineY'] = turbineY - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('turbineX', 'dx')] = self.dx_ddx.T - J[('turbineY', 'dx')] = self.dy_ddx.T - - J[('turbineX', 'dy')] = self.dx_ddy.T - J[('turbineY', 'dy')] = self.dy_ddy.T - - J[('turbineX', 'shear')] = self.dx_dshear.T - J[('turbineY', 'shear')] = self.dy_dshear.T - - J[('turbineX', 'rotate')] = self.dx_drotate.T - J[('turbineY', 'rotate')] = self.dy_drotate.T - - - return J - - -if __name__ == "__main__": - global nCalls_obj - global nCalls_con - - run = 4 - nTurbines = 100 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 4. - boundary = 'amalia' - # boundary = 'circle' - # boundary = 'square' - - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbines)*130. - turbineZ = np.ones(nTurbines)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - nBounds = 100 - # circle_radius = 5280. - xBounds = np.zeros(nBounds) - yBounds = np.zeros(nBounds) - theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) - for i in range(nBounds): - xBounds[i] = circle_radius*np.cos(theta[i]) - yBounds[i] = circle_radius*np.sin(theta[i]) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/Users/ningrsrch/Dropbox/Projects/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - nBoundaries = np.shape(boundaryVertices)[0] - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - num = 1 - for i in range(num): - rotate = 0. - dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nTurbines, - boundaryVertices,boundaryNormals,rotate=rotate,my=1.0) - - nRows = len(turbs_per_row) - prob = Problem() - root = prob.root = Group() - root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) - root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) - root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) - root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) - - root.add('makeGrid', form_grid(nTurbines=nTurbines,nRows=nRows),promotes=['*']) - root.add('AEP_obj', AEP_calc(nTurbines=nTurbines, nDirections=nDirections*nSpeeds), promotes=['*']) - - prob.setup(check=True) - - prob['turbineZ'] = turbineZ - prob['rotorDiameter'] = rotorDiameter - - prob['windDirections'] = windDirections - prob['windSpeeds'] = windSpeeds - prob['windFrequencies'] = windFrequencies - - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - prob['turbs_per_row'] = turbs_per_row - prob['x_start'] = x_start - prob['y0'] = y0 - - print 'iteration: ', i - nCalls_obj = 0 - nCalls_con = 0 - - prob['dx'] = dx_start - prob['dy'] = dy_start - prob['shear'] = shear_start - prob['rotate'] = rotate_start - - prob.run() diff --git a/code/opt-files/opt.py b/code/opt-files/opt.py deleted file mode 100644 index f008772..0000000 --- a/code/opt-files/opt.py +++ /dev/null @@ -1,351 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver -import numpy as np -import scipy as sp -import os -from aep_calc import * -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - -def random_start(N,D,xmin,xmax,ymin,ymax): - x = np.zeros(N) - y = np.zeros(N) - i = 0 - while i < N: - good = True - xtemp = float(np.random.rand(1))*(xmax-xmin)+xmin - ytemp = float(np.random.rand(1))*(ymax-ymin)+ymin - for j in range(i): - dist = np.sqrt((x[j]-xtemp)**2+(y[j]-ytemp)**2) - if dist < D: - good = False - if good == True: - x[i] = xtemp - y[i] = ytemp - i += 1 - return x,y - - -class AEP_calc(Component): - """ Calculates aep with simple gaussian wake model """ - - def __init__(self, nTurbines, nDirections): - - # print 'entering windframe __init__ - analytic' - - super(AEP_calc, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('turbineZ', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('windDirections', val=np.zeros(nDirections)) - self.add_param('windSpeeds', val=np.zeros(nDirections)) - self.add_param('windFrequencies', val=np.zeros(nDirections)) - - - self.add_output('negAEP', val=0.0, pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_obj - nCalls_obj += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - turbineZ = params['turbineZ'] - rotorDiameter = params['rotorDiameter'] - - windDirections = params['windDirections'] - windSpeeds = params['windSpeeds'] - windFrequencies = params['windFrequencies'] - - AEP, daep_dx, daep_dy = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - self.daep_dx = daep_dx - self.daep_dy = daep_dy - unknowns['negAEP'] = -AEP - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - d_dx = np.zeros((1,self.nTurbines)) - d_dy = np.zeros((1,self.nTurbines)) - for i in range(self.nTurbines): - d_dx[0][i] = -self.daep_dx[i] - d_dy[0][i] = -self.daep_dy[i] - # populate Jacobian dict - J[('negAEP', 'turbineX')] = d_dx - J[('negAEP', 'turbineY')] = d_dy - - return J - - -class constraint_calc(Component): - """ Calculates spacing and boundary constraints""" - - def __init__(self, nTurbines, nBoundaries): - - super(constraint_calc, self).__init__() - - self.nTurbines = nTurbines - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) - self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) - - self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) - self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_con - nCalls_con += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - rotorDiameter = params['rotorDiameter'] - - boundaryVertices = params['boundaryVertices'] - boundaryNormals = params['boundaryNormals'] - - dx = np.eye(self.nTurbines) - dy = np.zeros((self.nTurbines,self.nTurbines)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((self.nTurbines,self.nTurbines)) - dy = np.eye(self.nTurbines) - ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - bounds = np.zeros(nTurbines) - index = np.zeros(nTurbines) - for i in range(nTurbines): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - - self.index = index - self.ss_dx = ss_dx - self.ss_dy = ss_dy - self.bd_dx = bd_dx - self.bd_dy = bd_dy - - unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 - unknowns['boundary_constraint'] = bounds - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('spacing_constraint', 'turbineX')] = self.ss_dx.T - J[('spacing_constraint', 'turbineY')] = self.ss_dy.T - - db_dx = np.zeros((self.nTurbines,self.nTurbines)) - db_dy = np.zeros((self.nTurbines,self.nTurbines)) - for i in range(nTurbines): - db_dx[i][i] = self.bd_dx[i][i][self.index[i]] - db_dy[i][i] = self.bd_dy[i][i][self.index[i]] - J[('boundary_constraint','turbineX')] = db_dx - J[('boundary_constraint','turbineY')] = db_dy - - return J - - -if __name__ == "__main__": - global nCalls_obj - global nCalls_con - - run = 20 - nTurbines = 100 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 4. - boundary = 'amalia' - # boundary = 'circle' - # boundary = 'square' - - folder = 'opt-results/direct/%s_%s_%s'%(boundary,spacing,rose) - if not os.path.exists(folder): - os.makedirs(folder) - - # nDirections = 30 - # nSpeeds = 8 - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbines)*130. - turbineZ = np.ones(nTurbines)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - boundaryVertices = np.zeros((1,2)) - boundaryVertices[0] = np.array([circle_radius,0.]) - boundaryNormals = np.zeros((1,2)) - boundaryNormals[0] = np.array([0.,0.]) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/home/flowlab/PJ/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - nBoundaries = np.shape(boundaryVertices)[0] - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - prob = Problem() - root = prob.root = Group() - root.add('turbineX', IndepVarComp('turbineX', np.zeros(nTurbines)), promotes=['*']) - root.add('turbineY', IndepVarComp('turbineY', np.zeros(nTurbines)), promotes=['*']) - - root.add('AEP_obj', AEP_calc(nTurbines=nTurbines, nDirections=nDirections*nSpeeds), promotes=['*']) - root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) - - prob.driver = pyOptSparseDriver() - prob.driver.options['optimizer'] = 'SNOPT' - # prob.driver.opt_settings['Major iterations limit'] = 1000 - prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 - # prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 - prob.driver.opt_settings['Verify level'] = 3 - prob.driver.opt_settings['Scale option'] = 2 - prob.driver.opt_settings['Scale tolerance'] = .95 - - prob.driver.opt_settings['Summary file'] = '%s/%s_summary.out'%(folder,run) - prob.driver.opt_settings['Print file'] = '%s/%s_print.out'%(folder,run) - - prob.driver.add_objective('negAEP') - - prob.driver.add_desvar('turbineX') - prob.driver.add_desvar('turbineY') - - prob.driver.add_constraint('spacing_constraint',lower=0.) - prob.driver.add_constraint('boundary_constraint',lower=0.) - - prob.setup(check=True) - - prob['turbineZ'] = turbineZ - prob['rotorDiameter'] = rotorDiameter - - prob['windDirections'] = windDirections - prob['windSpeeds'] = windSpeeds - prob['windFrequencies'] = windFrequencies - - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - - num = 500 - for i in range(num): - print 'iteration: ', i - x,y = random_start(nTurbines,rotorDiameter[0],xmin,xmax,ymin,ymax) - nCalls_obj = 0 - nCalls_con = 0 - - prob['turbineX'] = x - prob['turbineY'] = y - - prob.run() - - separation = np.min(prob['spacing_constraint']) - boundary = np.min(prob['boundary_constraint']) - AEP = -prob['negAEP'] - - print 'AEP opt: ', AEP - print 'function calls obj: ', nCalls_obj - print 'function calls con: ', nCalls_con - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - # if separation > -1.E-4 and boundary > -1.E-4: - # print 'feasible AEP opt: ', AEP - # - # file = open('%s/AEP.txt'%folder, 'a') - # file.write('%s'%(AEP) + '\n') - # file.close() - # - # file = open('%s/funcCalls.txt'%folder, 'a') - # file.write('%s'%nCalls_obj + '\n') - # file.close() diff --git a/code/opt-files/optDirect.py b/code/opt-files/optDirect.py deleted file mode 100644 index 56cc759..0000000 --- a/code/opt-files/optDirect.py +++ /dev/null @@ -1,303 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -import numpy as np -import scipy as sp -import matplotlib.pyplot as plt -import os -from aep_calc import * -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - - -def random_start(N,D,xmin,xmax,ymin,ymax): - x = np.zeros(N) - y = np.zeros(N) - i = 0 - while i < N: - print i - good = True - xtemp = float(np.random.rand(1))*(xmax-xmin)+xmin - ytemp = float(np.random.rand(1))*(ymax-ymin)+ymin - for j in range(i): - dist = np.sqrt((x[j]-xtemp)**2+(y[j]-ytemp)**2) - if dist < D: - good = False - if good == True: - x[i] = xtemp - y[i] = ytemp - i += 1 - return x,y - - -def obj_func(xdict): - global rotorDiameter - global turbineZ - global windDirections - global windSpeeds - global windFrequencies - global boundaryVertices - global boundaryNormals - global nCalls - - nCalls += 1 - - turbineX = xdict['x'] - turbineY = xdict['y'] - nTurbs = len(turbineX) - - show = True - if show == True: - boundx = boundaryVertices[:,0] - boundy = boundaryVertices[:,1] - boundx = np.append(boundx,boundx[0]) - boundy = np.append(boundy,boundy[0]) - - plt.figure(1) - plt.clf() - for i in range(nTurbs): - circ = plt.Circle((turbineX[i],turbineY[i]), rotorDiameter[i]/2.,facecolor="blue",edgecolor="blue",alpha=0.2) - plt.gca().add_patch(circ) - plt.plot(boundx,boundy,'--k') - plt.axis('equal') - plt.draw() - plt.pause(0.001) - - funcs = {} - AEP = fast_calc_AEP(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - funcs['obj'] = -AEP/1.E5 - - ss, bd = constraints.constraints_position(turbineX, turbineY, boundaryVertices, boundaryNormals) - - # dx = np.zeros((nTurbs,nTurbs)) - # dy = np.eye(nTurbs) - # ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - # boundaryVertices,boundaryNormals) - # - # dx = np.eye(nTurbs) - # dy = np.zeros((nTurbs,nTurbs)) - # ss,ss_dx,bd,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - # boundaryVertices,boundaryNormals) - - funcs['sep'] = ss - funcs['bound'] = np.ndarray.flatten(bd) - - fail = False - - return funcs, fail - - -def grad_func(xdict): - global rotorDiameter - global turbineZ - global windDirections - global windSpeeds - global windFrequencies - global boundaryVertices - global boundaryNormals - global nCalls - - nCalls += 1 - - turbineX = xdict['x'] - turbineY = xdict['y'] - nTurbs = len(turbineX) - - g_obj = np.zeros((nTurbs,2)) - - _,g_obj[:,0],g_obj[:,1] = fast_calc_AEP(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - dx = np.zeros((nTurbs,nTurbs)) - dy = np.eye(nTurbs) - _,ss_dy,_,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.eye(nTurbs) - dy = np.zeros((nTurbs,nTurbs)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - - g_con = 0. - fail = False - - return g_obj, g_con, fail - - -if __name__ == "__main__": - global rotorDiameter - global turbineZ - global windDirections - global windSpeeds - global windFrequencies - global boundaryVertices - global boundaryNormals - global nCalls - - run = 1 - nTurbs = 5 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 4. - boundary = 'amalia' - # boundary = 'circle' - # boundary = 'square' - - folder = 'opt-results/exact/direct/%s_%s_%s'%(boundary,spacing,rose) - if not os.path.exists(folder): - os.makedirs(folder) - - # nDirections = 30 - # nSpeeds = 8 - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbs)*130. - turbineZ = np.ones(nTurbs)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - boundaryVertices = np.zeros((1,2)) - boundaryVertices[0] = np.array([circle_radius,0.]) - boundaryNormals = np.zeros((1,2)) - boundaryNormals[0] = np.array([0.,0.]) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/home/flowlab/PJ/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - x,y = random_start(nTurbs,rotorDiameter[0],xmin,xmax,ymin,ymax) - - num = 1 - for i in range(num): - nCalls = 0 - print 'iteration: ', i - if boundary == 'circle': - x = np.random.rand(nTurbs)*(2.*circle_radius)-circle_radius - y = np.random.rand(nTurbs)*(2.*circle_radius)-circle_radius - elif boundary == 'square': - x = np.random.rand(nTurbs)*(side_length)-side_length/2. - y = np.random.rand(nTurbs)*(side_length)-side_length/2. - elif boundary == 'amalia': - x = np.random.rand(nTurbs)*(max(xBounds)-min(xBounds))+min(xBounds) - y = np.random.rand(nTurbs)*(max(yBounds)-min(yBounds))+min(yBounds) - - """Optimization""" - optProb = Optimization('Wind_Farm_AEP', obj_func) - optProb.addObj('obj') - - optProb.addVarGroup('x', nTurbs, type='c', lower=xmin, upper=xmax, value=x) - optProb.addVarGroup('y', nTurbs, type='c', lower=ymin, upper=ymax, value=y) - - num_cons_sep = (nTurbs-1)*nTurbs/2 - optProb.addConGroup('sep', num_cons_sep, lower=(2.*rotorDiameter[0])**2, upper=None) - optProb.addConGroup('bound', nTurbs*len(boundaryVertices), lower=0., upper=None) - - opt = SNOPT() - opt.setOption('Scale option',0) - opt.setOption('Derivative level',3) - opt.setOption('Iterations limit',1000000) - - # opt.setOption('Summary file','current_summary_square_gaus.out') - opt.setOption('Major optimality tolerance',1.e-5) - opt.setOption('Major feasibility tolerance',1.e-6) - - # res = opt(optProb) - opt(optProb,sens_type=grad_func) - - x = res.xStar['x'] - y = res.xStar['y'] - - input = {'x':x,'y':y} - funcs,_ = obj_func(input) - - separation = min(funcs['sep']) - boundary = min(funcs['bound']) - - print 'AEP opt: ', -funcs['obj'] - print 'function calls: ', nCalls - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - # if separation > -1.E-4 and boundary > -1.E-4: - # print 'AEP opt: ', -funcs['obj'] - # - # file = open('%s/AEP.txt'%folder, 'a') - # file.write('%s'%(-funcs['obj']) + '\n') - # file.close() - # - # file = open('%s/funcCalls.txt'%folder, 'a') - # file.write('%s'%nCalls + '\n') - # file.close() diff --git a/code/opt-files/optDirect_exact.py b/code/opt-files/optDirect_exact.py deleted file mode 100644 index de62d3c..0000000 --- a/code/opt-files/optDirect_exact.py +++ /dev/null @@ -1,358 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -import numpy as np -import scipy as sp -import matplotlib.pyplot as plt -# from position_constraints import * -from windRoses import * -# from grid_param import * -# from aep_calc import * -import os -from openmdao.api import pyOptSparseDriver, Problem, ScipyOptimizer, Group, IndepVarComp -from plantenergy.OptimizationGroups import * -from plantenergy.GeneralWindFarmComponents import calculate_boundary, calculate_distance -from plantenergy.gauss import gauss_wrapper, add_gauss_params_IndepVarComps -from plantenergy.floris import floris_wrapper, add_floris_params_IndepVarComps -from plantenergy import config -import sys -sys.dont_write_bytecode = True - -import cPickle as pickle - -def random_start(N,D,xmin,xmax,ymin,ymax): - x = np.zeros(N) - y = np.zeros(N) - i = 0 - while i < N: - print i - good = True - xtemp = float(np.random.rand(1))*(xmax-xmin)+xmin - ytemp = float(np.random.rand(1))*(ymax-ymin)+ymin - for j in range(i): - dist = np.sqrt((x[j]-xtemp)**2+(y[j]-ytemp)**2) - if dist < D: - good = False - if good == True: - x[i] = xtemp - y[i] = ytemp - i += 1 - return x,y - - -if __name__ == "__main__": - test = False - - run = 5 - - nTurbs = 100 - rose = 'victorvilleRose' - spacing = 4. - boundary = 'amalia' - - folder = 'opt-results/exact/direct/%s_%s_%s'%(boundary,spacing,rose) - if not os.path.exists(folder): - os.makedirs(folder) - - # nDirections = 30 - # nSpeeds = 8 - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - if test == True: - nTurbs = 50 - windDirections = np.array([0.]) - windFrequencies = np.array([1.]) - windSpeeds = np.array([8.5]) - spacing = 4. - boundary = 'circle' - nDirections = 1 - nSpeeds = 1 - - hubHeight = np.ones(nTurbs)*110. - rotorDiameter = np.ones(nTurbs)*130. - - shearExp = 0.15 - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - - if boundary == 'circle': - nVertices = 1 - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - nVertices = len(boundaryVertices) - elif boundary == 'amalia': - locations = np.loadtxt('layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - nVertices = len(boundaryVertices) - - - axialInduction = np.zeros(nTurbs) - generatorEfficiency = np.zeros(nTurbs) - Ct = np.zeros(nTurbs) - Cp = np.zeros(nTurbs) - - for turbI in range(0, nTurbs): - axialInduction[turbI] = 1.0/3.0 - generatorEfficiency[turbI] = 1.0 - Ct[turbI] = 4.0 * axialInduction[turbI] * (1.0 - axialInduction[turbI]) - Cp[turbI] = 4.0 * 1.0 / 3.0 * np.power((1 - 1.0 / 3.0), 2) - - # Define flow properties - air_density = 1.18 # kg/m^3 - - wake_model_version = 2016 - wake_combination_method = 1 - ti_calculation_method = 5 #0 with WEC (original paper uses 4) - sm_smoothing = 700. - calc_k_star = True #false for 0 ti, true for 4 and 5 - sort = True - z_ref = hubHeight[0] - z_0 = 0. - TI = 0.1 - k_calc = 0.3837 * TI + 0.003678 - shear_exp = 0.15 - - config.obj_func_calls_array[:] = 0. - config.sens_func_calls_array[:] = 0. - - """OpenMDAO""" - # prob = Problem() - # root = prob.root = Group() - - # set up problem - wake_model_options = {'nSamples': 0, - 'nRotorPoints': 1, - 'use_ct_curve': False, - 'interp_type': 1, - 'differentiable': True} - - prob = Problem(root=OptAEP(nTurbines=nTurbs, nDirections=nDirections*nSpeeds, wake_model=gauss_wrapper, minSpacing=minSpacing, - wake_model_options=wake_model_options, nVertices=nVertices, datasize=0, use_rotor_components=False, - params_IdepVar_func=add_gauss_params_IndepVarComps, differentiable=True, - params_IndepVar_args={'nRotorPoints': 1},rec_func_calls=True)) - - prob.driver = pyOptSparseDriver() - prob.driver.options['optimizer'] = 'SNOPT' - # prob.driver.opt_settings['Major iterations limit'] = 1000 - prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 - prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 - prob.driver.opt_settings['Verify level'] = -1 - # prob.driver.opt_settings['Scale option'] = 2 - # prob.driver.opt_settings['Scale tolerance'] = .95 - - prob.driver.opt_settings['Summary file'] = 'exact_summary__scaled_%s_%s_%s_%s.out'%(boundary,spacing,rose,run) - prob.driver.opt_settings['Print file'] = 'exact_print_scaled_%s_%s_%s_%s.out'%(boundary,spacing,rose,run) - - prob.driver.add_objective('obj', scaler=1E-3) - - if boundary == 'circle': - prob.driver.add_desvar('turbineX', scaler=1E1,lower=np.ones(nTurbs)*(-circle_radius),upper=np.ones(nTurbs)*(circle_radius)) - prob.driver.add_desvar('turbineY', scaler=1E1,lower=np.ones(nTurbs)*(-circle_radius),upper=np.ones(nTurbs)*(circle_radius)) - else: - prob.driver.add_desvar('turbineX', scaler=1E1,lower=np.ones(nTurbs)*np.min(xBounds),upper=np.ones(nTurbs)*np.max(xBounds)) - prob.driver.add_desvar('turbineY', scaler=1E1,lower=np.ones(nTurbs)*np.min(yBounds),upper=np.ones(nTurbs)*np.max(yBounds)) - - prob.driver.add_constraint('sc', lower=np.zeros(int(((nTurbs-1.)*nTurbs/2.))),scaler=1E-2, - active_tol=(2.*rotorDiameter[0])**2) - # prob.driver.add_constraint('boundaryDistances', lower=np.zeros((nTurbs,nVertices)),scaler=1E2, - # active_tol=2.*rotorDiameter) - prob.driver.add_constraint('boundaryDistances', lower=np.zeros(nTurbs*nVertices),scaler=1E-2, - active_tol=2.*rotorDiameter[0]) - - - prob.root.ln_solver.options['mode'] = 'rev' - prob.root.ln_solver.options['single_voi_relevance_reduction'] = True - - print 'setup' - prob.setup(check=False) - print 'setup finished' - - # voi reduction, active set, first test with verify 2 or 3 - # assign values to constant inputs (not design variables) - prob['hubHeight'] = hubHeight - for direction_id in range(nDirections*nSpeeds): - prob['yaw%i' % direction_id] = np.zeros(nTurbs) - prob['rotorDiameter'] = rotorDiameter - prob['axialInduction'] = axialInduction - prob['generatorEfficiency'] = generatorEfficiency - prob['windSpeeds'] = windSpeeds - prob['windDirections'] = windDirections - prob['windFrequencies'] = windFrequencies - prob['air_density'] = air_density - prob['Ct_in'] = Ct - prob['Cp_in'] = Cp - - prob['use_power_curve_definition'] = True - prob['rated_wind_speed'] = np.ones(nTurbs)*10. - prob['rated_power'] = np.ones(nTurbs)*3350. - prob['cut_in_speed'] = np.ones(nTurbs)*3.0 - prob['cut_out_speed'] = np.ones(nTurbs)*25. - - prob['model_params:wake_combination_method'] = wake_combination_method - prob['model_params:ti_calculation_method'] = ti_calculation_method - prob['model_params:wake_model_version'] = wake_model_version - prob['model_params:wec_factor'] = 1.0 - prob['model_params:calc_k_star'] = calc_k_star - prob['model_params:sort'] = sort - prob['model_params:z_ref'] = z_ref - prob['model_params:z_0'] = z_0 - prob['model_params:ky'] = k_calc - prob['model_params:kz'] = k_calc - prob['model_params:print_ti'] = False - prob['model_params:shear_exp'] = shear_exp - prob['model_params:I'] = TI - prob['model_params:sm_smoothing'] = sm_smoothing - - if boundary == 'circle': - prob['boundary_center'] = np.array([0.,0.]) - prob['boundary_radius'] = circle_radius - else: - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - - if test == True: - num = 1 - else: - num = 500 - - for i in range(num): - - config.obj_func_calls_array[:] = 0. - config.sens_func_calls_array[:] = 0. - print 'iteration: ', i - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - x,y = random_start(nTurbs,rotorDiameter[0],xmin,xmax,ymin,ymax) - # plt.figure(1) - # plt.clf() - # for i in range(nTurbs): - # circ = plt.Circle((x[i],y[i]), rotorDiameter[i]/2.,facecolor="blue",edgecolor="blue",alpha=0.2) - # plt.gca().add_patch(circ) - # circ = plt.Circle((0.,0.), circle_radius,facecolor="None",edgecolor="black",alpha=0.8) - # plt.gca().add_patch(circ) - # plt.axis('equal') - # plt.show() - - prob['turbineX'] = x - prob['turbineY'] = y - - """Optimization""" - print 'run' - prob.run() - print 'run finished' - - opt_AEP = prob['AEP'] - nCalls = config.obj_func_calls_array[0] - separation = np.min(prob['sc']) - boundary = np.min(prob['boundaryDistances']) - - if test == True: - print 'separation: ', separation - print 'wtSeparationSquared: ', prob['wtSeparationSquared'] - print 'boundary: ', boundary - print 'AEP: ', opt_AEP - print 'nCalls: ', nCalls - print 'turbineX: ', prob['turbineX'] - print 'turbineY: ', prob['turbineY'] - print 'AEP: ', prob['AEP'] - print 'function calls: ', config.obj_func_calls_array[0] + config.sens_func_calls_array[0] - - plt.figure(1) - plt.clf() - for i in range(nTurbs): - circ = plt.Circle((prob['turbineX'][i],prob['turbineY'][i]), rotorDiameter[i]/2.,facecolor="blue",edgecolor="blue",alpha=0.2) - plt.gca().add_patch(circ) - circ = plt.Circle((0.,0.), circle_radius,facecolor="None",edgecolor="black",alpha=0.8) - plt.gca().add_patch(circ) - plt.axis('equal') - plt.show() - - else: - - print 'AEP opt: ', opt_AEP - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - # plt.figure(1) - # plt.clf() - # for i in range(nTurbs): - # circ = plt.Circle((prob['turbineX'][i],prob['turbineY'][i]), rotorDiameter[i]/2.,facecolor="blue",edgecolor="blue",alpha=0.2) - # plt.gca().add_patch(circ) - # circ = plt.Circle((0.,0.), circle_radius,facecolor="None",edgecolor="black",alpha=0.8) - # plt.gca().add_patch(circ) - # plt.axis('equal') - # plt.show() - - if separation > -1.E-4 and boundary > -1.E-4: - print 'AEP opt: ', opt_AEP - - file = open('%s/AEP.txt'%folder, 'a') - file.write('%s'%(opt_AEP) + '\n') - file.close() - - file = open('%s/funcCalls.txt'%folder, 'a') - file.write('%s'%nCalls + '\n') - file.close() diff --git a/code/opt-files/optGrid.py b/code/opt-files/optGrid.py deleted file mode 100644 index 2e2cac9..0000000 --- a/code/opt-files/optGrid.py +++ /dev/null @@ -1,482 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver -import numpy as np -import scipy as sp -import os -from aep_calc import * -from var_reduction_exact import * -import grid_param_fortran -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - - -class AEP_calc(Component): - """ Calculates aep with simple gaussian wake model """ - - def __init__(self, nTurbines, nDirections): - - # print 'entering windframe __init__ - analytic' - - super(AEP_calc, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('turbineZ', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('windDirections', val=np.zeros(nDirections)) - self.add_param('windSpeeds', val=np.zeros(nDirections)) - self.add_param('windFrequencies', val=np.zeros(nDirections)) - - - self.add_output('negAEP', val=0.0, pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_obj - nCalls_obj += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - turbineZ = params['turbineZ'] - rotorDiameter = params['rotorDiameter'] - - windDirections = params['windDirections'] - windSpeeds = params['windSpeeds'] - windFrequencies = params['windFrequencies'] - - AEP, daep_dx, daep_dy = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - self.daep_dx = daep_dx - self.daep_dy = daep_dy - unknowns['negAEP'] = -AEP - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - d_dx = np.zeros((1,self.nTurbines)) - d_dy = np.zeros((1,self.nTurbines)) - for i in range(self.nTurbines): - d_dx[0][i] = -self.daep_dx[i] - d_dy[0][i] = -self.daep_dy[i] - # populate Jacobian dict - J[('negAEP', 'turbineX')] = d_dx - J[('negAEP', 'turbineY')] = d_dy - - return J - - -class constraint_calc(Component): - """ Calculates spacing and boundary constraints""" - - def __init__(self, nTurbines, nBoundaries): - - super(constraint_calc, self).__init__() - - self.nTurbines = nTurbines - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) - self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) - - self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) - self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_con - nCalls_con += 1 - - turbineX = params['turbineX'] - # turbineX = turbineX-(max(turbineX)+min(turbineX))/2. - turbineY = params['turbineY'] - # turbienY = turbineY-(max(turbineY)+min(turbineY))/2. - rotorDiameter = params['rotorDiameter'] - - boundaryVertices = params['boundaryVertices'] - # bx = params['boundaryVertices'][:,0] - # by = params['boundaryVertices'][:,1] - # bx = bx + (max(turbineX)+min(turbineX))/2. - # by = by + (max(turbineY)+min(turbineY))/2. - # boundaryVertices[:,0] = bx[:] - # boundaryVertices[:,1] = by[:] - boundaryNormals = params['boundaryNormals'] - - - dx = np.eye(self.nTurbines) - dy = np.zeros((self.nTurbines,self.nTurbines)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((self.nTurbines,self.nTurbines)) - dy = np.eye(self.nTurbines) - ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - bounds = np.zeros(nTurbines) - index = np.zeros(nTurbines) - for i in range(nTurbines): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - - self.index = index - self.ss_dx = ss_dx - self.ss_dy = ss_dy - self.bd_dx = bd_dx - self.bd_dy = bd_dy - - unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 - unknowns['boundary_constraint'] = bounds - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('spacing_constraint', 'turbineX')] = self.ss_dx.T - J[('spacing_constraint', 'turbineY')] = self.ss_dy.T - - db_dx = np.zeros((self.nTurbines,self.nTurbines)) - db_dy = np.zeros((self.nTurbines,self.nTurbines)) - for i in range(nTurbines): - db_dx[i][i] = self.bd_dx[i][i][self.index[i]] - db_dy[i][i] = self.bd_dy[i][i][self.index[i]] - J[('boundary_constraint','turbineX')] = db_dx - J[('boundary_constraint','turbineY')] = db_dy - - return J - - -class form_grid(Component): - """get turbine locations from grid variables""" - - def __init__(self, nTurbines, nRows): - - super(form_grid, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('dx', val=0.) - self.add_param('dy', val=0.) - self.add_param('shear', val=0.) - self.add_param('rotate', val=0.) - self.add_param('y0', val=0.) - - self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) - self.add_param('x_start', val=np.zeros(nRows)) - - self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) - self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - dx = params['dx'] - dy = params['dy'] - shear = params['shear'] - rotate = params['rotate'] - y0 = params['y0'] - turbs_per_row = params['turbs_per_row'] - x_start = params['x_start'] - - dxd = 1. - dyd = 0. - sheard = 0. - rotated = 0. - turbineX,dx_ddx,turbineY,dy_ddx = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 1. - sheard = 0. - rotated = 0. - turbineX,dx_ddy,turbineY,dy_ddy = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 1. - rotated = 0. - turbineX,dx_dshear,turbineY,dy_dshear = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - dxd = 0. - dyd = 0. - sheard = 0. - rotated = 1. - turbineX,dx_drotate,turbineY,dy_drotate = grid_param_fortran.makegrid_fortran_dv(nTurbines, - dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) - - self.dx_ddx = dx_ddx - self.dy_ddx = dy_ddx - self.dx_ddy = dx_ddy - self.dy_ddy = dy_ddy - self.dx_dshear = dx_dshear - self.dy_dshear = dy_dshear - self.dx_drotate = dx_drotate - self.dy_drotate = dy_drotate - - unknowns['turbineX'] = turbineX - unknowns['turbineY'] = turbineY - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('turbineX', 'dx')] = self.dx_ddx.T - J[('turbineY', 'dx')] = self.dy_ddx.T - - J[('turbineX', 'dy')] = self.dx_ddy.T - J[('turbineY', 'dy')] = self.dy_ddy.T - - J[('turbineX', 'shear')] = self.dx_dshear.T - J[('turbineY', 'shear')] = self.dy_dshear.T - - J[('turbineX', 'rotate')] = self.dx_drotate.T - J[('turbineY', 'rotate')] = self.dy_drotate.T - - - return J - - -if __name__ == "__main__": - global nCalls_obj - global nCalls_con - - run = 4 - nTurbines = 100 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 4. - # boundary = 'amalia' - boundary = 'circle' - # boundary = 'square' - - folder = 'opt-results/grid/%s_%s_%s'%(boundary,spacing,rose) - if not os.path.exists(folder): - os.makedirs(folder) - - # nDirections = 30 - # nSpeeds = 8 - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbines)*130. - turbineZ = np.ones(nTurbines)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - nBounds = 100 - # circle_radius = 5280. - xBounds = np.zeros(nBounds) - yBounds = np.zeros(nBounds) - theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) - for i in range(nBounds): - xBounds[i] = circle_radius*np.cos(theta[i]) - yBounds[i] = circle_radius*np.sin(theta[i]) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/home/flowlab/PJ/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - nBoundaries = np.shape(boundaryVertices)[0] - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - num = 100 - for i in range(num): - rotate = float(np.random.rand(1))*360. - print 'rotate: ', rotate - dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nTurbines, - boundaryVertices*0.95,boundaryNormals,rotate=rotate,my=1.0) - - nRows = len(turbs_per_row) - print turbs_per_row - print x_start - prob = Problem() - root = prob.root = Group() - root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) - root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) - root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) - root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) - - root.add('makeGrid', form_grid(nTurbines=nTurbines,nRows=nRows),promotes=['*']) - root.add('AEP_obj', AEP_calc(nTurbines=nTurbines, nDirections=nDirections*nSpeeds), promotes=['*']) - root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) - - prob.driver = pyOptSparseDriver() - prob.driver.options['optimizer'] = 'SNOPT' - # prob.driver.opt_settings['Major iterations limit'] = 1000 - prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 - # prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 - prob.driver.opt_settings['Verify level'] = -1 - prob.driver.opt_settings['Scale option'] = 2 - prob.driver.opt_settings['Scale tolerance'] = .95 - - prob.driver.opt_settings['Summary file'] = '%s/%s_summary.out'%(folder,run) - prob.driver.opt_settings['Print file'] = '%s/%s_print.out'%(folder,run) - - prob.driver.add_objective('negAEP') - - prob.driver.add_desvar('dx') - prob.driver.add_desvar('dy') - prob.driver.add_desvar('shear') - prob.driver.add_desvar('rotate') - - prob.driver.add_constraint('spacing_constraint',lower=0.) - prob.driver.add_constraint('boundary_constraint',lower=0.) - - prob.setup(check=True) - - prob['turbineZ'] = turbineZ - prob['rotorDiameter'] = rotorDiameter - - prob['windDirections'] = windDirections - prob['windSpeeds'] = windSpeeds - prob['windFrequencies'] = windFrequencies - - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - prob['turbs_per_row'] = turbs_per_row - prob['x_start'] = x_start - prob['y0'] = y0 - - print 'iteration: ', i - nCalls_obj = 0 - nCalls_con = 0 - - prob['dx'] = dx_start + float(np.random.rand(1))*dx_start/5.-dx_start/10. - prob['dy'] = dy_start + float(np.random.rand(1))*dy_start/5.-dy_start/10. - prob['shear'] = shear_start + float(np.random.rand(1))*shear_start/5.-shear_start/10. - # prob['rotate'] = float(np.random.rand(1))*20.-10. - # prob['dx'] = dx_start - # prob['dy'] = dy_start - # prob['shear'] = shear_start - prob['rotate'] = rotate_start - - prob.run() - - separation = np.min(prob['spacing_constraint']) - boundary = np.min(prob['boundary_constraint']) - AEP = -prob['negAEP'] - - print 'AEP opt: ', AEP - print 'function calls obj: ', nCalls_obj - print 'function calls con: ', nCalls_con - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - plt.figure(1) - plt.clf() - for i in range(nTurbines): - circ = plt.Circle((prob['turbineX'][i],prob['turbineY'][i]),prob['rotorDiameter'][i]/2.) - plt.gca().add_patch(circ) - bx = prob['boundaryVertices'][:,0] - by = prob['boundaryVertices'][:,1] - bx = np.append(bx,bx[0]) - by = np.append(by,by[0]) - plt.plot(bx,by,'--k') - plt.axis('equal') - plt.pause(0.001) - - if separation > -1.E-4 and boundary > -1.E-4: - print 'feasible AEP opt: ', AEP - - file = open('%s/AEP.txt'%folder, 'a') - file.write('%s'%(AEP) + '\n') - file.close() - - file = open('%s/funcCalls.txt'%folder, 'a') - file.write('%s'%nCalls_obj + '\n') - file.close() diff --git a/code/opt-files/optParam.py b/code/opt-files/optParam.py deleted file mode 100644 index 2826dd8..0000000 --- a/code/opt-files/optParam.py +++ /dev/null @@ -1,536 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 -from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver -import numpy as np -import scipy as sp -import os -from aep_calc import * -from var_reduction_exact import * -import param_fortran -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - - -class AEP_calc(Component): - """ Calculates aep with simple gaussian wake model """ - - def __init__(self, nTurbines, nDirections): - - # print 'entering windframe __init__ - analytic' - - super(AEP_calc, self).__init__() - - self.nTurbines = nTurbines - - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('turbineZ', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('windDirections', val=np.zeros(nDirections)) - self.add_param('windSpeeds', val=np.zeros(nDirections)) - self.add_param('windFrequencies', val=np.zeros(nDirections)) - - self.add_output('negAEP', val=0.0, pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_obj - nCalls_obj += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - turbineZ = params['turbineZ'] - rotorDiameter = params['rotorDiameter'] - - windDirections = params['windDirections'] - windSpeeds = params['windSpeeds'] - windFrequencies = params['windFrequencies'] - - AEP, daep_dx, daep_dy = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - - self.daep_dx = daep_dx - self.daep_dy = daep_dy - unknowns['negAEP'] = -AEP - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - d_dx = np.zeros((1,self.nTurbines)) - d_dy = np.zeros((1,self.nTurbines)) - for i in range(self.nTurbines): - d_dx[0][i] = -self.daep_dx[i] - d_dy[0][i] = -self.daep_dy[i] - # populate Jacobian dict - J[('negAEP', 'turbineX')] = d_dx - J[('negAEP', 'turbineY')] = d_dy - - return J - - -class constraint_calc(Component): - """ Calculates spacing and boundary constraints""" - - def __init__(self, nTurbines, nBoundaries): - - super(constraint_calc, self).__init__() - - self.nTurbines = nTurbines - # Explicitly size input arrays - self.add_param('turbineX', val=np.zeros(nTurbines)) - self.add_param('turbineY', val=np.zeros(nTurbines)) - self.add_param('rotorDiameter', val=np.zeros(nTurbines)) - - self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) - self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) - - self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) - self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - global nCalls_con - nCalls_con += 1 - - turbineX = params['turbineX'] - turbineY = params['turbineY'] - rotorDiameter = params['rotorDiameter'] - - boundaryVertices = params['boundaryVertices'] - boundaryNormals = params['boundaryNormals'] - - - dx = np.eye(self.nTurbines) - dy = np.zeros((self.nTurbines,self.nTurbines)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((self.nTurbines,self.nTurbines)) - dy = np.eye(self.nTurbines) - ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - bounds = np.zeros(nTurbines) - index = np.zeros(nTurbines) - for i in range(nTurbines): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - - self.index = index - self.ss_dx = ss_dx - self.ss_dy = ss_dy - self.bd_dx = bd_dx - self.bd_dy = bd_dy - - unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 - unknowns['boundary_constraint'] = bounds - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('spacing_constraint', 'turbineX')] = self.ss_dx.T - J[('spacing_constraint', 'turbineY')] = self.ss_dy.T - - db_dx = np.zeros((self.nTurbines,self.nTurbines)) - db_dy = np.zeros((self.nTurbines,self.nTurbines)) - for i in range(nTurbines): - db_dx[i][i] = self.bd_dx[i][i][self.index[i]] - db_dy[i][i] = self.bd_dy[i][i][self.index[i]] - J[('boundary_constraint','turbineX')] = db_dx - J[('boundary_constraint','turbineY')] = db_dy - - return J - - -class get_turbine_locs(Component): - """get turbine locations from grid variables""" - - def __init__(self, nTurbines, nRows, nOuter, nGrid, nBoundaries): - - super(get_turbine_locs, self).__init__() - - self.nTurbines = nTurbines - self.nOuter = nOuter - self.nGrid = nGrid - self.nRows = nRows - self.nBoundaries = nBoundaries - - # Explicitly size input arrays - self.add_param('dx', val=0.) - self.add_param('dy', val=0.) - self.add_param('shear', val=0.) - self.add_param('rotate', val=0.) - self.add_param('start', val=0.) - self.add_param('y0', val=0.) - - self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) - self.add_param('x_start', val=np.zeros(nRows)) - - self.add_param('bx', val=np.zeros(nBoundaries)) - self.add_param('by', val=np.zeros(nBoundaries)) - - self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) - self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) - - - def solve_nonlinear(self, params, unknowns, resids): - - dx = params['dx'] - dy = params['dy'] - shear = params['shear'] - rotate = params['rotate'] - start = params['start'] - y0 = params['y0'] - - turbs_per_row = params['turbs_per_row'] - x_start = params['x_start'] - - bx = params['bx'] - by = params['by'] - - dxd = 1. - dyd = 0. - sheard = 0. - rotated = 0. - startd = 0. - turbineX,dx_ddx,turbineY,dy_ddx = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, - dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, - start,startd,bx,by) - dxd = 0. - dyd = 1. - sheard = 0. - rotated = 0. - startd = 0. - turbineX,dx_ddy,turbineY,dy_ddy = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, - dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, - start,startd,bx,by) - - dxd = 0. - dyd = 0. - sheard = 1. - rotated = 0. - startd = 0. - turbineX,dx_dshear,turbineY,dy_dshear = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, - dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, - start,startd,bx,by) - - dxd = 0. - dyd = 0. - sheard = 0. - rotated = 1. - startd = 0. - turbineX,dx_drotate,turbineY,dy_drotate = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, - dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, - start,startd,bx,by) - - dxd = 0. - dyd = 0. - sheard = 0. - rotated = 0. - startd = 1. - turbineX,dx_dstart,turbineY,dy_dstart = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, - dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, - start,startd,bx,by) - - self.dx_ddx = dx_ddx - self.dy_ddx = dy_ddx - self.dx_ddy = dx_ddy - self.dy_ddy = dy_ddy - self.dx_dshear = dx_dshear - self.dy_dshear = dy_dshear - self.dx_drotate = dx_drotate - self.dy_drotate = dy_drotate - self.dx_dstart = dx_dstart - self.dy_dstart = dy_dstart - - unknowns['turbineX'] = turbineX - unknowns['turbineY'] = turbineY - - def linearize(self, params, unknowns, resids): - - # initialize Jacobian dict - J = {} - - # populate Jacobian dict - J[('turbineX', 'dx')] = self.dx_ddx.T - J[('turbineY', 'dx')] = self.dy_ddx.T - - J[('turbineX', 'dy')] = self.dx_ddy.T - J[('turbineY', 'dy')] = self.dy_ddy.T - - J[('turbineX', 'shear')] = self.dx_dshear.T - J[('turbineY', 'shear')] = self.dy_dshear.T - - J[('turbineX', 'rotate')] = self.dx_drotate.T - J[('turbineY', 'rotate')] = self.dy_drotate.T - - J[('turbineX', 'start')] = self.dx_dstart.T - J[('turbineY', 'start')] = self.dy_dstart.T - - return J - - -if __name__ == "__main__": - global nCalls_obj - global nCalls_con - - run = 13 - nTurbines = 100 - frac = 0.45 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 6. - boundary = 'amalia' - # boundary = 'circle' - # boundary = 'square' - - folder = 'opt-results/param/%s_%s_%s'%(boundary,spacing,rose) - if not os.path.exists(folder): - os.makedirs(folder) - - # nDirections = 30 - # nSpeeds = 8 - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbines)*130. - turbineZ = np.ones(nTurbines)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - nBounds = 100 - # circle_radius = 5280. - xBounds = np.zeros(nBounds) - yBounds = np.zeros(nBounds) - theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) - for i in range(nBounds): - xBounds[i] = circle_radius*np.cos(theta[i]) - yBounds[i] = circle_radius*np.sin(theta[i]) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/home/flowlab/PJ/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - bx = boundaryVertices[:,0] - by = boundaryVertices[:,1] - bx = bx-(min(bx)+max(bx))/2. - by = by-(min(by)+max(by))/2. - bx = np.append(bx,bx[0]) - by = np.append(by,by[0]) - nBounds_con = np.shape(boundaryVertices)[0] - nBounds_outer = len(bx) - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - - """determine how many turbines will be in the grid here""" - lenBound = np.zeros(nBounds_outer-1) - for i in range(nBounds_outer-1): - lenBound[i] = np.sqrt((bx[i+1]-bx[i])**2+(by[i+1]-by[i])**2) - - - circumference = sum(lenBound) - nOuter = int(frac*nTurbines) - spacing_outer = circumference/(nOuter*rotorDiameter[0]) - if float(spacing_outer) < 2.*np.sqrt(2.): - nOuter = int(circumference/(2.*np.sqrt(2.)*rotorDiameter[0])) - nGrid = int(nTurbines-nOuter) - - print 'nTurbines: ', nTurbines - print 'nOuter: ', nOuter - print 'nGrid: ', nGrid - - num = 100 - for i in range(num): - rotate = float(np.random.rand(1))*360. - print 'rotate: ', rotate - - dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nGrid, - boundaryVertices*0.85,boundaryNormals,rotate=rotate,my=4.0) - - nRows = len(turbs_per_row) - print turbs_per_row - print x_start - prob = Problem() - root = prob.root = Group() - root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) - root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) - root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) - root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) - root.add('start', IndepVarComp('start', 0.), promotes=['*']) - - root.add('get_turbine_locs', get_turbine_locs(nTurbines=nTurbines,nRows=nRows, nOuter=nOuter, - nGrid=nGrid, nBoundaries=nBounds_outer),promotes=['*']) - root.add('AEP_obj', AEP_calc(nTurbines=nTurbines, nDirections=nDirections*nSpeeds), promotes=['*']) - root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBounds_con),promotes=['*']) - - prob.driver = pyOptSparseDriver() - prob.driver.options['optimizer'] = 'SNOPT' - # prob.driver.opt_settings['Major iterations limit'] = 1000 - prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 - # prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 - prob.driver.opt_settings['Verify level'] = 0 - prob.driver.opt_settings['Scale option'] = 2 - prob.driver.opt_settings['Scale tolerance'] = .95 - - prob.driver.opt_settings['Summary file'] = '%s/%s_summary.out'%(folder,run) - prob.driver.opt_settings['Print file'] = '%s/%s_print.out'%(folder,run) - - prob.driver.add_objective('negAEP') - - prob.driver.add_desvar('dx') - prob.driver.add_desvar('dy') - prob.driver.add_desvar('shear') - prob.driver.add_desvar('rotate') - prob.driver.add_desvar('start') - - prob.driver.add_constraint('spacing_constraint',lower=0.) - prob.driver.add_constraint('boundary_constraint',lower=0.) - - prob.setup(check=True) - - prob['turbineZ'] = turbineZ - prob['rotorDiameter'] = rotorDiameter - - prob['windDirections'] = windDirections - prob['windSpeeds'] = windSpeeds - prob['windFrequencies'] = windFrequencies - - prob['boundaryVertices'] = boundaryVertices - prob['boundaryNormals'] = boundaryNormals - - prob['turbs_per_row'] = turbs_per_row - prob['x_start'] = x_start - prob['y0'] = y0 - - prob['bx'] = bx - prob['by'] = by - - print 'iteration: ', i - nCalls_obj = 0 - nCalls_con = 0 - - prob['dx'] = dx_start + float(np.random.rand(1))*dx_start/5.-dx_start/10. - prob['dy'] = dy_start + float(np.random.rand(1))*dy_start/5.-dy_start/10. - prob['shear'] = shear_start + float(np.random.rand(1))*shear_start/5.-shear_start/10. - prob['rotate'] = rotate_start - prob['start'] = float(np.random.rand(1))*rotorDiameter[0]*3. - - prob.run() - - separation = np.min(prob['spacing_constraint']) - boundary = np.min(prob['boundary_constraint']) - AEP = -prob['negAEP'] - - print 'AEP opt: ', AEP - print 'function calls obj: ', nCalls_obj - print 'function calls con: ', nCalls_con - print 'boundary constraint: ', boundary - print 'separation constraint: ', separation - - # plt.figure(1) - # plt.clf() - # for i in range(nTurbines): - # circ = plt.Circle((prob['turbineX'][i],prob['turbineY'][i]),prob['rotorDiameter'][i]/2.) - # plt.gca().add_patch(circ) - # bx = prob['boundaryVertices'][:,0] - # by = prob['boundaryVertices'][:,1] - # bx = np.append(bx,bx[0]) - # by = np.append(by,by[0]) - # plt.plot(bx,by,'--k') - # plt.axis('equal') - # plt.pause(0.001) - - if separation > -1.E-4 and boundary > -1.E-4: - print 'feasible AEP opt: ', AEP - - file = open('%s/AEP.txt'%folder, 'a') - file.write('%s'%(AEP) + '\n') - file.close() - - file = open('%s/funcCalls.txt'%folder, 'a') - file.write('%s'%nCalls_obj + '\n') - file.close() diff --git a/code/opt-files/optPyopt.py b/code/opt-files/optPyopt.py deleted file mode 100644 index 7acd9f7..0000000 --- a/code/opt-files/optPyopt.py +++ /dev/null @@ -1,320 +0,0 @@ -from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2, CONMIN -import numpy as np -import scipy as sp -import matplotlib.pyplot as plt -import os -from aep_calc import * -import constraints -import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction/') -from windRoses import * -from position_constraints import calculate_boundary -sys.dont_write_bytecode = True - - -def random_start(N,D,xmin,xmax,ymin,ymax): - x = np.zeros(N) - y = np.zeros(N) - i = 0 - while i < N: - good = True - xtemp = float(np.random.rand(1))*(xmax-xmin)+xmin - ytemp = float(np.random.rand(1))*(ymax-ymin)+ymin - for j in range(i): - dist = np.sqrt((x[j]-xtemp)**2+(y[j]-ytemp)**2) - if dist < D: - good = False - if good == True: - x[i] = xtemp - y[i] = ytemp - i += 1 - return x,y - - -def objfunc(x): - global rotorDiameter - global turbineZ - global windDirections - global windSpeeds - global windFrequencies - global boundaryVertices - global boundaryNormals - global nCalls - global index - - nCalls += 1 - - nTurbs = len(x['x'])/2 - turbineX = x['x'][0:nTurbs] - turbineY = x['x'][nTurbs:2*nTurbs] - - # show = True - # if show == True: - # boundx = boundaryVertices[:,0] - # boundy = boundaryVertices[:,1] - # boundx = np.append(boundx,boundx[0]) - # boundy = np.append(boundy,boundy[0]) - # - # plt.figure(1) - # plt.clf() - # for i in range(nTurbs): - # circ = plt.Circle((turbineX[i],turbineY[i]), rotorDiameter[i]/2.,facecolor="blue",edgecolor="blue",alpha=0.2) - # plt.gca().add_patch(circ) - # plt.plot(boundx,boundy,'--k') - # plt.axis('equal') - # plt.draw() - # plt.pause(0.001) - - AEP = fast_calc_AEP(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - obj = -AEP - print obj - ss, bd = constraints.constraints_position(turbineX, turbineY, boundaryVertices, boundaryNormals) - print '1' - bounds = np.zeros(nTurbs) - index = np.zeros(nTurbs) - for i in range(nTurbs): - bounds[i] = np.min(bd[i]) - index[i] = np.argmin(bd[i]) - print '2' - con = np.append((ss-(2.*rotorDiameter[0])**2)/1.E5,bounds/1.E3) - fail = 0 - print '3' - return obj, con - - -def gradfunc(x,obj,con): - global rotorDiameter - global turbineZ - global windDirections - global windSpeeds - global windFrequencies - global boundaryVertices - global boundaryNormals - global nCalls - global index - - nCalls += 1 - print '4' - nTurbs = len(x['x'])/2 - turbineX = x['x'][0:nTurbs] - turbineY = x['x'][nTurbs:2*nTurbs] - print '5' - """objective""" - g_obj = np.zeros(2*nTurbs) - - g_obj[0:nTurbs],g_obj[nTurbs:2*nTurbs] = fast_calc_gradients(turbineX, turbineY, turbineZ, rotorDiameter, windDirections, - windSpeeds, windFrequencies) - g_obj = -g_obj - print '6' - """constraints""" - dx = np.eye(nTurbs) - dy = np.zeros((nTurbs,nTurbs)) - _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - - dx = np.zeros((nTurbs,nTurbs)) - dy = np.eye(nTurbs) - _,ss_dy,_,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, - boundaryVertices,boundaryNormals) - print '7' - - g_con = np.zeros(((nTurbs-1)*nTurbs/2 + nTurbs,2*nTurbs)) - for i in range((nTurbs-1)*nTurbs/2): - g_con[i][0:nTurbs] = ss_dx[:,i] - g_con[i][nTurbs:2*nTurbs] = ss_dy[:,i] - print '8' - for i in range(nTurbs): - for j in range(nTurbs): - g_con[i+(nTurbs-1)*nTurbs/2][j] = bd_dx[i][i][index[i]] - g_con[i+(nTurbs-1)*nTurbs/2][j+nTurbs] = bd_dy[i][i][index[i]] - print '9' - fail = False - - return g_obj, g_con, fail - - -if __name__ == "__main__": - global rotorDiameter - global turbineZ - global windDirections - global windSpeeds - global windFrequencies - global boundaryVertices - global boundaryNormals - global nCalls - - run = 1 - nTurbs = 3 - rose = 'northIslandRose' - # rose = 'ukiahRose' - # rose = 'victorvilleRose' - spacing = 4. - boundary = 'amalia' - # boundary = 'circle' - # boundary = 'square' - - folder = 'opt-results/exact/direct/%s_%s_%s'%(boundary,spacing,rose) - if not os.path.exists(folder): - os.makedirs(folder) - - # nDirections = 30 - # nSpeeds = 8 - nDirections = 23 - nSpeeds = 5 - if rose == 'northIslandRose': - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'ukiahRose': - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - elif rose == 'victorvilleRose': - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) - wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] - windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) - windDirections -= wind_angle - - rotorDiameter = np.ones(nTurbs)*130. - turbineZ = np.ones(nTurbs)*110. - - minSpacing = 2.0 - - side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing - a = side_length**2 - circle_radius = np.sqrt(a/np.pi) - if boundary == 'circle': - boundaryVertices = np.zeros((1,2)) - boundaryVertices[0] = np.array([circle_radius,0.]) - boundaryNormals = np.zeros((1,2)) - boundaryNormals[0] = np.array([0.,0.]) - elif boundary == 'square': - nBounds = 4 - x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) - y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) - xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) - yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) - - locations = np.zeros((nBounds,2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - elif boundary == 'amalia': - locations = np.loadtxt('/home/flowlab/PJ/reduction/layout_amalia.txt') - xBounds = locations[:, 0] - yBounds = locations[:, 1] - xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. - yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - xBounds = boundaryVertices[:, 0] - yBounds = boundaryVertices[:, 1] - nBounds = len(xBounds) - points = np.zeros((nBounds,2)) - points[:, 0] = xBounds - points[:, 1] = yBounds - hull = sp.spatial.ConvexHull(points) - area = hull.volume - area_ratio = area/a - xBounds = xBounds/np.sqrt(area_ratio) - yBounds = yBounds/np.sqrt(area_ratio) - - locations = np.zeros((len(xBounds),2)) - locations[:, 0] = xBounds - locations[:, 1] = yBounds - boundaryVertices, boundaryNormals = calculate_boundary(locations) - - if boundary == 'circle': - xmin = -circle_radius - xmax = circle_radius - ymin = -circle_radius - ymax = circle_radius - elif boundary == 'square': - xmax = side_length/2. - xmin = -side_length/2. - ymax = side_length/2. - ymin = -side_length/2. - elif boundary =='amalia': - xmax = max(xBounds) - xmin = min(xBounds) - ymax = max(yBounds) - ymin = min(yBounds) - - x,y = random_start(nTurbs,rotorDiameter[0],xmin,xmax,ymin,ymax) - nCalls = 0 - turbs = np.append(x,y) - # obj,con = objfunc(turbs) - # gradfunc(turbs,obj,con) - - opt_prob = Optimization('AEP max',objfunc) - opt_prob.addVarGroup('x',nTurbs*2,'c',value=turbs) - opt_prob.addObj('obj') - opt_prob.addConGroup('con',(nTurbs-1)*nTurbs/2 + nTurbs,lower=0.) - opt = SNOPT(sens_type=gradfunc) - opt(opt_prob) - - # num = 1 - # for i in range(num): - # nCalls = 0 - # print 'iteration: ', i - # if boundary == 'circle': - # x = np.random.rand(nTurbs)*(2.*circle_radius)-circle_radius - # y = np.random.rand(nTurbs)*(2.*circle_radius)-circle_radius - # elif boundary == 'square': - # x = np.random.rand(nTurbs)*(side_length)-side_length/2. - # y = np.random.rand(nTurbs)*(side_length)-side_length/2. - # elif boundary == 'amalia': - # x = np.random.rand(nTurbs)*(max(xBounds)-min(xBounds))+min(xBounds) - # y = np.random.rand(nTurbs)*(max(yBounds)-min(yBounds))+min(yBounds) - # - # """Optimization""" - # optProb = Optimization('Wind_Farm_AEP', obj_func) - # optProb.addObj('obj') - # - # optProb.addVarGroup('x', nTurbs, type='c', lower=xmin, upper=xmax, value=x) - # optProb.addVarGroup('y', nTurbs, type='c', lower=ymin, upper=ymax, value=y) - # - # num_cons_sep = (nTurbs-1)*nTurbs/2 - # optProb.addConGroup('sep', num_cons_sep, lower=(2.*rotorDiameter[0])**2, upper=None) - # optProb.addConGroup('bound', nTurbs*len(boundaryVertices), lower=0., upper=None) - # - # opt = SNOPT() - # opt.setOption('Scale option',0) - # opt.setOption('Derivative level',3) - # opt.setOption('Iterations limit',1000000) - # - # # opt.setOption('Summary file','current_summary_square_gaus.out') - # opt.setOption('Major optimality tolerance',1.e-5) - # opt.setOption('Major feasibility tolerance',1.e-6) - # - # # res = opt(optProb) - # opt(optProb,sens_type=grad_func) - # - # x = res.xStar['x'] - # y = res.xStar['y'] - # - # input = {'x':x,'y':y} - # funcs,_ = obj_func(input) - # - # separation = min(funcs['sep']) - # boundary = min(funcs['bound']) - # - # print 'AEP opt: ', -funcs['obj'] - # print 'function calls: ', nCalls - # print 'boundary constraint: ', boundary - # print 'separation constraint: ', separation - # - # # if separation > -1.E-4 and boundary > -1.E-4: - # # print 'AEP opt: ', -funcs['obj'] - # # - # # file = open('%s/AEP.txt'%folder, 'a') - # # file.write('%s'%(-funcs['obj']) + '\n') - # # file.close() - # # - # # file = open('%s/funcCalls.txt'%folder, 'a') - # # file.write('%s'%nCalls + '\n') - # # file.close() diff --git a/code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..8796945 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,110 @@ +1313785.7232220338 +1312707.8228890297 +1312084.0266410836 +1309524.6806510726 +1304666.3838834492 +1313547.4573798724 +1313075.7145099738 +1310239.437510675 +1316382.47640889 +1314108.1343081729 +1310862.3527520897 +1311317.8597231824 +1309474.543875305 +1313742.818105664 +1311314.4929883818 +1306486.1287014391 +1309808.3350636964 +1311384.1514368362 +1309402.6602744006 +1314260.3495491443 +1316483.0920148613 +1316630.0448792456 +1312561.9622953427 +1312661.5423834438 +1312748.3974237521 +1313418.7727010474 +1311098.6687407354 +1309616.2884409304 +1310750.6341443502 +1312254.502754586 +1313560.1236033132 +1313095.750780667 +1314640.2149240675 +1308520.2608764914 +1311532.662814404 +1313378.8657014326 +1315635.5237398741 +1313269.502682176 +1313433.1768462893 +1305883.60022247 +1310866.88981497 +1313290.576359514 +1309781.5343702731 +1315100.715444093 +1314876.0035664442 +1312448.3927146462 +1313402.9539281959 +1313452.8152068655 +1315343.6600264378 +1312344.3857020624 +1313946.7487380246 +1312819.260622137 +1312567.7216035074 +1310789.3586708175 +1313180.0233815454 +1303970.9839587822 +1314132.4743445534 +1308207.0755746558 +1313417.765944488 +1314492.7022938442 +1315094.1443318091 +1314542.2215186385 +1313310.8919847726 +1311782.3039646163 +1312363.0243678165 +1308122.8483703348 +1309216.6775936487 +1310683.0876798108 +1315015.3570065538 +1313130.4192062959 +1311272.9225533449 +1314389.2808961207 +1312477.9666457116 +1314968.1311532522 +1312177.520342375 +1316367.0598704887 +1316838.1609812512 +1314646.2160500803 +1313791.1118515572 +1313582.8082758766 +1316329.509244247 +1308798.1952450085 +1310693.294979965 +1315211.3760253314 +1314452.0084967215 +1313796.0546512231 +1315612.3885482189 +1315679.6517595665 +1310780.4622574276 +1312266.8134641808 +1315400.961250972 +1314782.7723521553 +1319337.4624830007 +1313750.0054644982 +1315487.039505473 +1311274.40100207 +1315724.7207074761 +1314013.0737182891 +1315159.993079227 +1311387.9887169893 +1313127.4201285634 +1313231.0164616138 +1309960.329573751 +1313109.4746758412 +1311603.6093303119 +1313397.7655431845 +1313247.7541793992 +1311520.758652729 +1316606.9051098553 +1312729.151887893 diff --git a/code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..5e6eaad --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,110 @@ +1353970.16279 +1352411.95334 +1351919.48926 +1348969.78328 +1348304.52883 +1353699.56499 +1352636.73386 +1349940.30062 +1354539.29341 +1353564.18779 +1349855.56713 +1350853.45113 +1348360.22417 +1353571.37182 +1351043.94545 +1345644.55723 +1348097.92873 +1350382.60747 +1348601.02601 +1354073.77303 +1355724.30603 +1355654.06353 +1352170.52482 +1353111.71673 +1352050.37342 +1352465.02226 +1351237.28233 +1349630.62503 +1348908.85436 +1352457.17762 +1352930.75264 +1353373.75702 +1353403.04118 +1347663.31162 +1349847.45504 +1352907.32832 +1355073.13613 +1352967.88717 +1352961.19564 +1346560.95899 +1349467.67781 +1352681.73272 +1349759.46444 +1353903.57647 +1353891.32838 +1350775.07908 +1352524.56696 +1352561.79456 +1353656.40497 +1351173.17794 +1353558.25888 +1352775.32825 +1352365.82387 +1349704.59044 +1352688.21163 +1344726.45424 +1353395.93766 +1346750.56217 +1353514.83144 +1354493.17775 +1353556.08939 +1353755.0479 +1352883.83819 +1351556.4959 +1351227.90732 +1347757.37394 +1348614.95916 +1350324.21165 +1353985.4218 +1353202.57943 +1350917.94945 +1354436.53569 +1352007.86136 +1354009.32413 +1351746.58197 +1355177.60662 +1355893.85828 +1353735.21179 +1352693.16091 +1352478.21355 +1354120.74199 +1348819.79461 +1349383.20749 +1354301.04974 +1352634.35112 +1352519.41773 +1355622.04262 +1354038.58858 +1349053.06257 +1351811.84373 +1354764.98363 +1353236.26921 +1357709.4021 +1352589.45096 +1353617.84007 +1351498.52651 +1354556.35132 +1353756.95948 +1354702.11997 +1350435.68032 +1352831.74353 +1352511.72053 +1348877.55398 +1352171.35518 +1352082.84152 +1353083.94968 +1351770.49508 +1351388.22341 +1354687.83951 +1351591.51398 diff --git a/code/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..6697a21 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,110 @@ +59 +69 +71 +76 +105 +135 +128 +133 +145 +151 +179 +180 +184 +205 +233 +73 +255 +278 +277 +279 +321 +208 +167 +347 +354 +379 +379 +258 +106 +441 +483 +355 +201 +460 +481 +471 +523 +393 +507 +201 +143 +557 +586 +578 +598 +601 +617 +77 +129 +648 +679 +356 +190 +684 +732 +50 +634 +324 +812 +475 +818 +166 +490 +843 +701 +410 +271 +219 +588 +630 +750 +480 +64 +435 +179 +281 +464 +774 +402 +404 +614 +94 +451 +164 +789 +537 +564 +889 +563 +662 +754 +406 +732 +691 +273 +290 +858 +63 +104 +120 +277 +378 +84 +463 +253 +509 +71 +577 +137 +277 diff --git a/code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt b/code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt new file mode 100644 index 0000000..468c673 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt @@ -0,0 +1,156 @@ +1411996.9034870549 +1403715.6981467437 +1410210.516179464 +1407627.133059403 +1408126.414261777 +1408328.8335708785 +1408824.1393230075 +1409741.1419183572 +1407752.5038472754 +1412630.8462089207 +1406820.6784454128 +1408462.447361146 +1414234.5678769841 +1413452.781717294 +1411112.8801578502 +1409353.7630264997 +1415278.9473485365 +1404951.4438136567 +1407799.3841003077 +1403743.63540862 +1411285.6970215484 +1413149.9323265906 +1407637.545634421 +1409424.4270612535 +1406523.8755689082 +1414711.3297750063 +1412876.3130195716 +1413110.1187974405 +1404142.6274553507 +1410833.181145509 +1414953.9134485137 +1411538.5124324635 +1407383.5230148095 +1405989.3335931827 +1412997.3233280675 +1407168.7910839743 +1409408.0420859805 +1411509.738630365 +1409617.1026261472 +1411010.8143508025 +1404915.9406765841 +1410054.8620817985 +1413040.9789841317 +1404001.548885659 +1411385.2832279175 +1409235.6114087522 +1410066.0227358288 +1411321.0725683665 +1411109.502783798 +1408239.3620920593 +1406185.7940893562 +1412392.6506272852 +1414207.6195796188 +1409812.0291329073 +1411785.223902788 +1412848.7668238494 +1409792.8496665792 +1407506.6627504784 +1407508.127481944 +1413954.157815523 +1410393.2779975932 +1407804.6837874176 +1413353.2207334866 +1408517.029250573 +1410482.9733353432 +1408736.0263632424 +1410702.5583538616 +1410741.3285853427 +1409000.3518448777 +1409989.051186236 +1408574.4567735288 +1415097.6938157836 +1405682.3632994206 +1413389.0003776688 +1408022.4130396722 +1405680.5800030995 +1406978.7080854538 +1412932.670515469 +1413681.7331994246 +1412254.1280558698 +1409806.4151271502 +1410245.107797527 +1407903.137011983 +1408001.1212000602 +1409533.6090015124 +1408047.44811021 +1408476.3604504128 +1407336.0313301643 +1410945.4369215113 +1408913.0613873603 +1405007.642909542 +1411926.5260353303 +1408442.759184441 +1411368.4551719858 +1412605.0790600397 +1414058.6739333074 +1409408.464732758 +1407008.8293920122 +1409274.6773680788 +1410127.493209244 +1409168.4726748366 +1403652.6092859101 +1410623.37599742 +1405002.836992987 +1412869.1292122018 +1411788.7321746193 +1408214.4337020237 +1413519.243735371 +1413940.1057594344 +1410812.8002697774 +1410472.2868187476 +1407888.5000786674 +1409064.5039671483 +1410021.632117929 +1403436.1749872311 +1411674.0969147803 +1408134.341851609 +1408553.0856601186 +1411580.0287407986 +1411354.9913644746 +1405193.703898355 +1410577.5057830494 +1413953.3631300747 +1410528.2867670404 +1406705.2745540326 +1408671.1979578228 +1407662.868435384 +1405584.5426857546 +1407338.7831949107 +1411399.0030070294 +1409909.5327641037 +1410719.4810471395 +1410404.3884742472 +1408151.0191766575 +1407466.0467242706 +1409514.3757711044 +1412467.2932708063 +1408686.9544250965 +1411742.7759579762 +1401225.7883405413 +1402476.6837464236 +1410146.2236202548 +1407961.495758741 +1411074.9011724629 +1410057.119977408 +1412591.919044447 +1407616.3075680276 +1412813.966088532 +1408778.7688881673 +1409680.2699878854 +1411437.8239869426 +1406291.9895695075 +1403618.09464186 +1404063.06283047 +1410166.6074534734 +1412064.570841421 diff --git a/code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt b/code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt new file mode 100644 index 0000000..7f1ef66 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt @@ -0,0 +1,156 @@ +1467696.76862 +1460163.10806 +1466058.31408 +1463892.4043 +1463875.78581 +1463734.05266 +1464128.12239 +1466465.65672 +1462987.0566 +1467995.51132 +1462378.22458 +1464411.0103 +1469732.70084 +1468732.28903 +1467145.15018 +1465334.50744 +1470799.97181 +1461335.39342 +1464511.56072 +1460149.88809 +1466528.08328 +1469266.72923 +1464416.77888 +1465655.1377 +1462515.46365 +1470807.90913 +1469839.87219 +1469027.99678 +1460112.38306 +1467180.0053 +1469944.05654 +1467446.14064 +1463747.5421 +1460671.42122 +1468868.29966 +1463060.27565 +1465450.37532 +1467582.22543 +1464200.96506 +1466756.21649 +1459725.53926 +1464697.49994 +1469423.66306 +1460452.84098 +1466853.73287 +1465019.78756 +1466600.79991 +1467212.67538 +1466310.71433 +1463175.98716 +1462419.71868 +1466202.9346 +1469783.78361 +1465021.04563 +1468034.93821 +1468560.2473 +1465132.13514 +1463229.37903 +1464293.67024 +1470590.95524 +1465756.87283 +1462589.66632 +1467889.00578 +1465590.29104 +1467576.84922 +1465732.07843 +1466722.65338 +1466471.35878 +1464872.55733 +1465853.22628 +1464353.47625 +1469840.97261 +1462930.7485 +1469257.95723 +1463375.83738 +1461610.77101 +1463414.57957 +1468577.76969 +1468416.54317 +1468378.42342 +1465865.04888 +1465446.56966 +1463439.22695 +1461990.01789 +1465445.82313 +1464627.57237 +1464694.95522 +1464038.5665 +1465604.67342 +1464005.56018 +1460331.12152 +1466858.40102 +1463840.74091 +1467962.96924 +1468696.11916 +1469181.72183 +1464811.19389 +1461646.8534 +1464141.75692 +1466528.55954 +1464892.7507 +1460168.7699 +1466319.07374 +1461428.89043 +1468920.31685 +1466950.29997 +1464558.99178 +1468737.72574 +1469229.97466 +1466817.51602 +1466269.04104 +1463720.65974 +1463761.20977 +1466333.28346 +1458413.75375 +1466270.08166 +1464607.30467 +1465237.60307 +1467649.02848 +1467580.98642 +1460706.26865 +1465832.454 +1469980.79768 +1466583.3795 +1461476.93351 +1463382.4804 +1463192.47719 +1460940.67284 +1462930.91321 +1468532.57275 +1466841.21482 +1466680.05382 +1466331.20665 +1464891.73613 +1463596.17762 +1464851.38663 +1468497.1728 +1464177.30304 +1467153.99704 +1457873.01537 +1458089.50079 +1464929.08387 +1464123.87776 +1466839.02092 +1465627.13954 +1468081.11889 +1462535.52532 +1468948.74052 +1463843.17138 +1464174.43439 +1466734.36923 +1462855.89487 +1459723.85186 +1459936.45193 +1466688.99466 +1466903.64938 diff --git a/code/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt b/code/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt new file mode 100644 index 0000000..f302a83 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt @@ -0,0 +1,156 @@ +100 +84 +118 +125 +126 +87 +94 +89 +176 +195 +201 +176 +178 +256 +149 +217 +130 +299 +91 +70 +346 +363 +283 +284 +289 +304 +318 +430 +76 +321 +347 +229 +374 +371 +381 +499 +128 +380 +335 +161 +266 +480 +498 +119 +341 +379 +749 +152 +738 +530 +673 +779 +268 +326 +812 +412 +311 +106 +664 +644 +120 +886 +187 +167 +130 +330 +709 +115 +256 +319 +688 +775 +784 +722 +152 +168 +154 +336 +655 +130 +624 +577 +215 +361 +103 +271 +912 +169 +572 +654 +543 +638 +593 +477 +1119 +485 +60 +284 +477 +1422 +592 +95 +746 +112 +165 +361 +1198 +220 +128 +178 +335 +475 +567 +233 +730 +753 +673 +94 +791 +671 +427 +491 +501 +139 +651 +125 +1569 +628 +269 +79 +175 +735 +124 +750 +555 +281 +263 +214 +290 +59 +980 +212 +99 +752 +157 +588 +541 +724 +517 +468 +166 +170 +1023 +202 +97 +292 diff --git a/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt b/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt new file mode 100644 index 0000000..da2cf9c --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt @@ -0,0 +1,130 @@ +1488933.7258878048 +1491221.089274421 +1479244.930681548 +1493359.0957919187 +1489270.5742208487 +1493353.6402684043 +1494147.088328799 +1490928.2521700622 +1492019.9315746955 +1493846.7461516052 +1493481.042883461 +1494891.810209481 +1493443.504940763 +1495860.8435680363 +1494149.8782637387 +1492368.6274055704 +1495185.3605866823 +1495720.8335777293 +1493838.3585354069 +1495487.4379096697 +1497094.510607192 +1492780.740262337 +1494459.9880622418 +1496548.575199087 +1488878.0002610008 +1495946.4616738628 +1494394.9768779736 +1492480.5701696812 +1496053.1572329297 +1494266.7407867569 +1494730.684100154 +1495104.6754760037 +1491667.2608650592 +1495627.226559621 +1494022.9581801551 +1493923.509587771 +1496163.9697089724 +1491224.8413895306 +1491461.9586551567 +1496095.5878441967 +1494857.5899315374 +1492995.0575639645 +1494769.3821076162 +1496111.2538133264 +1491004.2356047595 +1494438.3887567013 +1493372.5725494134 +1495283.696241095 +1493309.9140528284 +1496191.1133414577 +1494500.310606278 +1494584.2442339663 +1495125.1012377692 +1490952.7616803423 +1495090.363815226 +1492583.9873391502 +1493138.510235926 +1497126.4117099189 +1495097.616476345 +1491461.9812601847 +1493450.6427089944 +1495751.0542677862 +1490784.0033672214 +1491381.7880200858 +1493506.5476360973 +1494746.186710019 +1490703.914754184 +1496007.9049377309 +1492153.3706945821 +1491653.0528101826 +1491239.930819626 +1492731.3976352825 +1494118.6273205404 +1495795.6864530824 +1491170.0897867675 +1495724.4217311 +1491872.6318939386 +1492450.195756997 +1493958.015827481 +1488282.4769789528 +1488026.3736647947 +1497711.1393903312 +1494076.804350872 +1496512.5146954278 +1492035.1913296937 +1494195.2430236756 +1490686.523428751 +1492440.7466289708 +1490995.0588619125 +1495646.21135002 +1493532.3015202996 +1489996.5510849329 +1493160.036310364 +1491488.6177347978 +1493612.8859138095 +1491876.4760548975 +1492612.5806717263 +1493959.2955539823 +1492833.7509379447 +1496502.8467583074 +1495921.761231866 +1496009.1198391165 +1495901.6328392283 +1491155.6023529086 +1491473.4388711734 +1493249.4233703616 +1496685.1572933171 +1492027.9502488389 +1496836.239864639 +1493909.5451323672 +1493322.2586576953 +1492951.5959815348 +1495738.338589485 +1493972.4477023894 +1494169.0643140608 +1493859.698613025 +1492767.9417632788 +1488685.452803941 +1494853.4817393485 +1494398.3801906607 +1488710.2459497163 +1493433.881362875 +1495521.2812260038 +1491768.4751505808 +1495936.4108263857 +1496539.531536559 +1491872.1962548287 +1493624.4064302372 +1492205.830753303 +1497776.3276994652 diff --git a/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt b/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt new file mode 100644 index 0000000..0f19510 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt @@ -0,0 +1,130 @@ +1555647.80715 +1556425.02461 +1548237.83466 +1558690.64716 +1554386.90192 +1557963.62653 +1558220.55066 +1555520.98595 +1556776.05508 +1558643.05135 +1559019.5189 +1560074.88684 +1559449.38228 +1560767.78168 +1558842.62883 +1557991.1075 +1559664.14802 +1559945.74947 +1559438.24437 +1560166.76271 +1561992.89748 +1557604.80051 +1560883.7654 +1561331.77389 +1554431.22103 +1560390.28648 +1559290.56189 +1558239.50568 +1560587.11612 +1559473.62057 +1559139.98925 +1560514.53905 +1556571.16214 +1560845.41421 +1558641.50059 +1559364.88018 +1560128.78399 +1556707.76056 +1557495.70199 +1560734.48325 +1558844.47402 +1558051.82 +1560323.51313 +1560700.77945 +1556982.18008 +1560492.33913 +1559098.33434 +1559516.8476 +1558630.13118 +1560927.97868 +1559715.80231 +1560093.17362 +1560484.84302 +1556694.30073 +1557645.10062 +1558097.26858 +1558771.59874 +1561984.97286 +1559345.43569 +1557210.60524 +1559178.43036 +1560478.47331 +1555788.93765 +1557255.95303 +1559083.84205 +1560687.86446 +1556295.8406 +1561263.47227 +1557461.9406 +1557249.85916 +1556722.11559 +1560276.64453 +1558239.62186 +1559757.70255 +1557082.27487 +1561160.92938 +1556993.36526 +1557483.32221 +1558628.26043 +1554800.69438 +1553408.40088 +1560817.28902 +1558712.33196 +1561945.54948 +1557582.55065 +1559077.61374 +1554786.27339 +1557659.19286 +1555647.80853 +1560622.88101 +1559249.42346 +1555046.19514 +1559115.33498 +1556223.92993 +1558987.05106 +1557716.21329 +1558761.32889 +1558759.80673 +1558317.51001 +1561080.33629 +1561339.47351 +1560888.04499 +1561495.02669 +1556810.29015 +1557408.77959 +1558882.3101 +1561619.25374 +1557799.6916 +1561799.27678 +1560310.52812 +1559522.9057 +1557339.98687 +1560291.70202 +1558974.50733 +1559126.85292 +1559538.53719 +1557252.79928 +1554151.84598 +1559781.24371 +1559596.5796 +1554792.31252 +1558408.27218 +1560574.11682 +1558462.47059 +1560540.45752 +1561941.3234 +1558055.84202 +1559080.59223 +1557612.07652 +1563048.66176 diff --git a/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt b/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt new file mode 100644 index 0000000..1b8754c --- /dev/null +++ b/code/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt @@ -0,0 +1,130 @@ +100 +160 +177 +202 +71 +227 +283 +288 +334 +352 +355 +431 +454 +475 +523 +529 +527 +532 +532 +540 +548 +581 +578 +618 +627 +634 +621 +648 +662 +658 +676 +671 +195 +694 +668 +733 +503 +437 +520 +779 +809 +607 +556 +473 +874 +843 +909 +914 +535 +956 +982 +664 +989 +172 +1026 +463 +338 +1060 +319 +82 +94 +421 +653 +408 +482 +585 +1294 +621 +593 +164 +483 +219 +637 +625 +390 +389 +602 +442 +802 +784 +1476 +426 +995 +138 +1005 +1033 +1626 +563 +166 +98 +139 +148 +152 +97 +238 +246 +309 +327 +121 +428 +424 +430 +434 +441 +444 +454 +483 +498 +515 +515 +521 +522 +534 +561 +572 +592 +575 +126 +630 +638 +657 +661 +666 +681 +680 +661 +714 +136 +98 +748 diff --git a/code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..03b477f --- /dev/null +++ b/code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt @@ -0,0 +1,235 @@ +1440157.870663181 +1429702.5540713759 +1430948.4851418296 +1435417.7714399626 +1437266.2559252183 +1439237.1140176153 +1439489.3071603947 +1441078.0836817103 +1438226.3946967789 +1437584.0300634282 +1434268.5806930962 +1432733.6457333982 +1429155.9718416156 +1430999.4355988007 +1438771.502168714 +1442475.1278986107 +1437756.8231208911 +1432047.7843489249 +1441558.7986120668 +1435484.17037302 +1442185.738854518 +1429261.0756757644 +1441178.4258734586 +1438720.1940719383 +1444130.5355461645 +1438905.2940595443 +1435505.4389084924 +1436414.248144639 +1439525.900655756 +1439356.5050145537 +1428852.8076421425 +1439379.827102706 +1434948.8073158765 +1432939.5407457321 +1434060.4150135417 +1440961.8302710045 +1430629.4885985998 +1437588.6442637828 +1431492.3240412918 +1439319.2369418999 +1439576.415105147 +1437607.8491564665 +1438858.5485990136 +1429648.4150139291 +1427384.9546712635 +1440472.857205781 +1440595.6499443532 +1436940.4006305567 +1433631.7371790328 +1432462.3570543525 +1439162.753418782 +1439477.946046283 +1442385.1200030982 +1439741.2141357488 +1441585.385313092 +1437317.8516524278 +1434692.4166186769 +1432680.083648855 +1436634.8162264493 +1434625.3437726498 +1436995.7447367168 +1429997.8647256235 +1440331.245358098 +1431187.2149606906 +1442662.7667033554 +1434502.4722520006 +1434212.7304235331 +1434418.1868705673 +1437847.1742884659 +1432523.5482053529 +1434267.4657846228 +1440886.1362430537 +1440374.8860048258 +1442858.6485561472 +1435625.8846851334 +1441161.1761198812 +1434029.3951086747 +1432755.9670600023 +1437917.8630897726 +1442403.6788113387 +1442952.8922752608 +1437544.163607192 +1437365.5485163708 +1430259.3312998577 +1433913.068318451 +1439219.1602293593 +1434199.8177567252 +1440535.316565938 +1436181.0081247394 +1438715.6775039071 +1443612.7204088918 +1436734.1794503147 +1438854.293745159 +1432047.5869064936 +1437197.2507800348 +1435099.2658956065 +1438167.2613023631 +1434089.2119617152 +1435071.2068754553 +1443510.4714130356 +1438827.8454960107 +1435375.7175627716 +1435786.2451111923 +1437182.6333537747 +1433479.7251259761 +1436195.980592367 +1433021.9102170274 +1438789.4453215974 +1441872.7993958003 +1438882.6979378785 +1430290.025202305 +1437204.7645026809 +1439675.599671984 +1439370.1414315666 +1430665.8984700795 +1437224.5032885405 +1438052.0052308887 +1439877.335059501 +1441438.224263589 +1443405.237934947 +1438389.5911940965 +1434517.3042534075 +1437383.0319598787 +1437661.3752823207 +1437124.2298083066 +1438744.5455424893 +1434959.15977214 +1433342.0696128327 +1436387.2391572415 +1434564.248808007 +1434753.2355991823 +1441703.8578578413 +1435701.4132924427 +1437106.7918441263 +1435941.0988913965 +1438808.2075982145 +1434167.7314068377 +1437624.876078484 +1432716.7959877907 +1434382.6153734857 +1442099.3722179732 +1438986.850483405 +1441031.7968643454 +1440351.4361043219 +1436547.609827668 +1440374.7860509395 +1440544.8812502113 +1442170.362510684 +1435630.2998109073 +1440274.6224676843 +1442763.6781759174 +1436644.0066901052 +1440899.2616559295 +1440361.8139597045 +1433843.1193735374 +1442414.381533287 +1441244.5405964558 +1440731.6865902191 +1435813.9223489887 +1432992.302875279 +1436317.576133951 +1438086.1435294948 +1442156.4762711504 +1439659.3887349546 +1431757.8740808193 +1433026.566732041 +1440051.222530952 +1439959.098243314 +1439425.0632800828 +1438642.3327165325 +1435933.1368917448 +1437803.4186131605 +1438256.0664129118 +1438321.6946769576 +1439071.1380491965 +1431197.2513602865 +1433983.5064752526 +1432350.8692498652 +1432963.4460723877 +1438285.3267195176 +1439460.7551046067 +1436353.5135963168 +1440019.4221997112 +1437304.7515922817 +1442852.619090428 +1440478.4850038236 +1435871.3368299683 +1436538.5020487153 +1438051.0673969595 +1442046.0757471772 +1434522.937736183 +1430875.6287547906 +1439259.9924187064 +1436762.7283326075 +1437772.227301226 +1438367.0607338077 +1438246.591128736 +1435643.0121245452 +1439855.7643868253 +1431425.4992622896 +1442440.0146443907 +1432267.1391905902 +1438125.1161194702 +1441229.4471825396 +1436571.1142475002 +1442392.090460457 +1441135.0603018529 +1439280.0544992057 +1439966.1920337377 +1435214.1507800943 +1438614.6861932636 +1429422.0425719735 +1431325.5604418744 +1438674.544942831 +1433174.9787407434 +1437305.2135162468 +1441121.64841236 +1434528.724627201 +1443722.454409371 +1440190.3564344125 +1439784.1548289547 +1434252.6944375238 +1436483.3547153047 +1438472.1132943216 +1437302.3364550006 +1432845.1330253899 +1437512.6541265233 +1439652.7809271505 +1440398.087151073 +1435085.820400351 +1435948.4209105086 +1434976.192110999 +1436438.3874475062 +1440054.7305167005 +1434240.7420963494 diff --git a/code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..5fa38b4 --- /dev/null +++ b/code/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,235 @@ +1468578.88069 +1459000.91999 +1460516.50574 +1464084.8905 +1465752.58217 +1467390.70395 +1467825.88922 +1468160.62684 +1466210.17132 +1465559.26429 +1462550.75031 +1461166.71946 +1457985.98334 +1460545.15775 +1466246.29764 +1468999.79365 +1465404.33554 +1460349.76036 +1469390.79789 +1463089.87325 +1469074.28631 +1457890.30205 +1468100.1788 +1466132.91347 +1470505.76598 +1465445.41906 +1464186.19537 +1464035.9885 +1467089.84504 +1466979.69696 +1456919.60652 +1466394.22167 +1463090.32149 +1461245.98297 +1462261.4673 +1467851.62093 +1459391.37276 +1465091.39836 +1460634.26657 +1467568.93343 +1467334.12337 +1466019.64499 +1466273.72882 +1458959.87285 +1457451.20283 +1466954.06667 +1467712.17138 +1464605.97091 +1462038.01207 +1462414.93712 +1465385.33115 +1467044.91612 +1469537.97354 +1467708.86857 +1468369.70667 +1465077.07002 +1463345.74037 +1461151.85552 +1464346.76856 +1463170.73639 +1464237.62166 +1458946.71752 +1467335.85509 +1460724.33676 +1469510.82766 +1463784.604 +1462722.14996 +1462398.18999 +1465508.06546 +1460665.49212 +1463617.16044 +1468642.98219 +1467766.85604 +1469362.40628 +1463767.82817 +1468630.9711 +1462140.27889 +1461106.26568 +1465152.62484 +1469061.99624 +1468857.68431 +1464726.93902 +1465909.98633 +1459071.0011 +1462470.67214 +1467370.41806 +1462995.93869 +1468037.42951 +1463369.25243 +1465431.2492 +1469817.4112 +1464250.96368 +1466889.39397 +1460724.72041 +1465228.43165 +1462615.87479 +1465044.70404 +1462810.80533 +1462767.59777 +1469860.84082 +1467549.12188 +1463381.72294 +1464094.51845 +1464816.90241 +1461889.84499 +1463650.60286 +1462304.49372 +1466184.64969 +1469128.3101 +1466000.60734 +1459780.523 +1464752.1523 +1468290.87137 +1466546.06993 +1458749.25911 +1464529.94447 +1466720.91726 +1467274.92409 +1468031.16937 +1470625.14051 +1465194.05118 +1461974.63194 +1464253.24041 +1465210.92117 +1464939.33414 +1465394.57506 +1461867.04042 +1461345.60785 +1464397.24093 +1463518.15898 +1463124.60142 +1468762.55111 +1464165.12762 +1465991.17764 +1464159.98299 +1467541.26934 +1461978.51852 +1466069.08931 +1461604.08277 +1462511.92425 +1469272.00657 +1465712.1584 +1469005.55665 +1466783.02671 +1463948.88083 +1467667.39303 +1467922.68975 +1469674.74035 +1463076.58758 +1468162.40264 +1469602.02355 +1463659.9264 +1467502.56004 +1466426.4207 +1461748.74626 +1469384.40042 +1468884.03838 +1468431.42589 +1463669.40379 +1461428.84405 +1464209.17899 +1466513.13044 +1469149.2952 +1467167.69772 +1460178.66385 +1462251.30568 +1468188.75364 +1467116.38528 +1467547.77373 +1466398.23427 +1465805.84337 +1464937.50425 +1466835.90377 +1465902.58297 +1466576.78533 +1459934.77429 +1462256.13547 +1461036.09552 +1460989.2261 +1465636.75484 +1466759.27103 +1464934.8007 +1467634.99885 +1464529.40429 +1469872.89974 +1468185.51659 +1465015.6942 +1464409.16768 +1464387.10931 +1468488.46445 +1463664.32014 +1459548.79504 +1467233.02309 +1465544.1154 +1465153.02286 +1466378.46911 +1465641.47739 +1463581.35538 +1466956.06729 +1459626.47566 +1469014.14531 +1461424.29651 +1464995.70587 +1468937.02479 +1465057.90587 +1469674.177 +1467760.36884 +1466149.48995 +1467821.87791 +1463262.93097 +1465751.69997 +1458194.52294 +1459281.77575 +1466743.4244 +1462069.56423 +1464762.90043 +1468437.42919 +1462269.36256 +1470381.01397 +1467996.92995 +1466658.24331 +1462295.82291 +1463655.43095 +1467172.46986 +1464787.18949 +1461190.04033 +1464694.0745 +1468081.88792 +1468199.23536 +1463232.46573 +1463160.70804 +1462919.35351 +1465173.44421 +1466922.13371 +1463350.23363 diff --git a/code/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..4a91f0a --- /dev/null +++ b/code/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt @@ -0,0 +1,235 @@ +47 +49 +55 +52 +55 +55 +62 +62 +62 +65 +66 +66 +68 +69 +72 +77 +85 +84 +84 +85 +87 +109 +112 +120 +124 +135 +53 +158 +160 +159 +66 +176 +59 +87 +91 +195 +79 +191 +86 +128 +120 +124 +149 +235 +51 +235 +59 +157 +129 +98 +275 +148 +64 +101 +309 +191 +62 +318 +315 +322 +208 +101 +233 +139 +118 +112 +74 +87 +170 +109 +56 +76 +128 +103 +309 +53 +217 +74 +441 +137 +459 +466 +59 +315 +121 +58 +56 +81 +203 +294 +336 +259 +104 +509 +95 +227 +175 +68 +108 +308 +51 +548 +180 +461 +48 +86 +104 +306 +60 +59 +246 +73 +61 +245 +593 +63 +95 +102 +66 +79 +657 +660 +665 +215 +78 +124 +277 +131 +74 +104 +73 +85 +82 +87 +235 +81 +614 +70 +160 +120 +95 +206 +58 +104 +157 +72 +78 +79 +71 +188 +87 +177 +493 +537 +87 +264 +95 +61 +63 +81 +111 +97 +64 +68 +124 +55 +81 +140 +155 +99 +53 +188 +150 +137 +56 +278 +106 +86 +593 +66 +72 +74 +80 +347 +154 +79 +139 +333 +1021 +211 +98 +75 +86 +57 +92 +78 +422 +288 +153 +112 +111 +63 +511 +61 +70 +328 +115 +248 +216 +102 +157 +820 +63 +69 +61 +309 +174 +297 +105 +84 +387 +67 +346 +75 +177 +59 +123 +85 +60 +949 +216 +53 +64 +383 +63 diff --git a/code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..4ea9b7a --- /dev/null +++ b/code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt @@ -0,0 +1,367 @@ +1493880.121174869 +1487960.1416906498 +1497661.0296321583 +1498148.7542887414 +1500603.4296049026 +1502356.1625785253 +1494169.0612788845 +1497433.4998794494 +1489761.676643932 +1496756.7762398415 +1494028.4623714692 +1496454.3019105655 +1490155.188418153 +1490960.9384154128 +1490691.9442489515 +1495133.2586836703 +1504432.7607374135 +1497366.9190700676 +1501431.8852872602 +1500961.3174628941 +1497113.5369624435 +1495273.5583966933 +1498796.3542653357 +1490230.2254526096 +1498529.4773176312 +1500095.2904643512 +1491992.734102917 +1498665.5131859297 +1502838.5150105676 +1499456.8428899962 +1500936.4005270367 +1493689.690968588 +1488955.8328210483 +1493494.836921472 +1490049.6864076322 +1498932.90692084 +1492113.0776583084 +1491329.916284738 +1494902.606815565 +1487578.8963264308 +1490564.5816402198 +1491027.969982039 +1492841.2733127477 +1490469.1420149517 +1503109.4534266181 +1491272.3106273015 +1502873.8456832124 +1501397.3845884702 +1501467.846423019 +1494573.8509242681 +1493656.4453814623 +1499872.839414666 +1498260.3967311233 +1493863.2299864853 +1495672.8042592756 +1493982.2257454398 +1500238.8882466075 +1492241.177749993 +1497077.389825467 +1494106.5670791264 +1498237.4128172835 +1489724.6350818954 +1496322.5330891241 +1498255.16250634 +1495634.248449939 +1487677.8127392165 +1496527.4509872901 +1494376.3238459567 +1497873.512936728 +1496610.2179517169 +1501574.6637291864 +1495335.0314850567 +1503674.067279681 +1500867.60643823 +1494385.9580955543 +1495874.9491018786 +1493936.6026857204 +1495149.7709477777 +1497000.9355195335 +1503169.4879035112 +1502288.6624113403 +1488822.5424545796 +1504627.0471007032 +1493836.4159708275 +1492695.4165560084 +1493901.9141782813 +1494145.0420850574 +1492145.1385612527 +1491400.1935252121 +1493268.1117058995 +1499845.5660452528 +1499497.3739340573 +1494254.9563048924 +1495549.3297299931 +1503049.5320570716 +1494722.1023792552 +1495342.5644676746 +1493494.7597613276 +1494025.675597543 +1502965.7425717998 +1495761.5784953872 +1499497.9983792412 +1491042.1378346614 +1496351.8559197376 +1487918.1533927997 +1502579.422517911 +1495483.3688933507 +1495286.8051316007 +1500865.594537831 +1493110.6577574085 +1498156.6583047106 +1496253.7857050179 +1494540.4506828892 +1495817.7434747664 +1496911.2423702911 +1495896.436561625 +1499018.36659293 +1496529.133259245 +1496268.8362060129 +1497733.2111781286 +1502626.8252305095 +1495632.475523482 +1498522.0873887737 +1494682.1978821699 +1497329.0974100437 +1499307.5914575553 +1501679.2580298267 +1494894.6264651446 +1499662.326458726 +1497643.5287897922 +1501215.0324685748 +1494522.1817355363 +1493791.7955600673 +1490427.966122537 +1495059.0088997514 +1495591.1922692894 +1495225.1293975662 +1503342.6204910758 +1500390.4886607134 +1490625.3428027541 +1500368.599391217 +1498961.2913538702 +1500804.4804347309 +1500986.0619421494 +1501297.7422463999 +1490113.9686681232 +1489389.44793983 +1495840.6051252396 +1496426.525573683 +1492131.13133601 +1490768.6386636053 +1499554.2682036995 +1502883.6446718676 +1493501.2185624947 +1500899.1774241545 +1500256.8338520993 +1486948.8100861888 +1500534.3896461693 +1493101.9241711374 +1497651.617162032 +1500531.6883338555 +1492643.0191422203 +1493430.950144686 +1492520.6255623852 +1496094.1821413492 +1497024.7920145073 +1498228.049316239 +1501686.7409251546 +1499118.3718477685 +1495140.2864917954 +1499633.339046124 +1498872.7836847175 +1494205.5551854589 +1493412.7236989883 +1501943.7076793828 +1489543.1355900741 +1499162.5972134415 +1487599.6887091529 +1497947.9669794904 +1488548.7955172611 +1504112.946111831 +1486663.2521995055 +1493095.3743380026 +1495112.7779928255 +1488799.565643752 +1497584.684929503 +1492662.6520558405 +1493380.2290038352 +1502105.6510003333 +1497557.4320374774 +1496558.5223923705 +1491540.3724179529 +1493563.4234221873 +1497492.9330392012 +1500538.498566261 +1490836.6197054388 +1497729.448308813 +1496881.9224732574 +1497863.3371177 +1494999.4621766985 +1495383.3537784773 +1488177.074564759 +1498968.9480659144 +1499654.1123744494 +1489401.2439840084 +1500361.06563868 +1503533.462730565 +1494419.930785523 +1497055.623165287 +1492807.839005576 +1494375.6560448348 +1494838.4416806686 +1496087.643163856 +1500074.874799644 +1501864.7245153976 +1499175.5676176446 +1500645.8517929018 +1495121.7086519664 +1495034.370990544 +1494751.5261347333 +1494503.966765976 +1496165.5080705197 +1495349.9361740926 +1489754.2684738107 +1494468.955860293 +1501909.311386409 +1500070.9406813055 +1490754.5594387783 +1494518.2892556116 +1492683.6404417714 +1501077.0253920641 +1500952.9879576121 +1495698.4978133182 +1495923.7980711225 +1491046.5790314998 +1492199.3315455613 +1496266.868504126 +1491541.7419661288 +1491919.326525437 +1502082.0147258015 +1496213.2503997404 +1499313.225731911 +1489236.676792685 +1489372.8283144706 +1493330.6883899055 +1497449.012568769 +1493860.5713752268 +1501976.197407702 +1496587.59854668 +1494068.2148615322 +1501425.2508881672 +1497269.0830380379 +1491492.1281536745 +1495486.5952844182 +1489163.4960326839 +1499676.274789633 +1501957.9804538314 +1496468.6820265464 +1502163.902229096 +1499078.717022409 +1499910.5894152424 +1497060.4674438732 +1501721.6792498531 +1499069.1538050475 +1490559.8365926698 +1494373.5246156703 +1491282.3397063317 +1498230.1183048612 +1496534.4412027274 +1488095.6971718932 +1491196.4320145773 +1503806.7806738822 +1500594.7827066395 +1503064.418591588 +1501433.5381891294 +1500924.6426077678 +1496939.2922404562 +1493084.102976359 +1498692.938579658 +1496833.039958472 +1493518.1952568197 +1499649.5878023873 +1495027.66476857 +1496085.926119487 +1488559.2087155846 +1497402.1363952772 +1496725.479291477 +1500284.556541405 +1501182.6187489955 +1499650.9171478304 +1497132.249713456 +1494965.167282187 +1492669.3287889394 +1504371.3799829986 +1489812.2621138433 +1496359.0627382728 +1497841.4936019944 +1491156.6972330615 +1493758.9168202325 +1496184.6196109354 +1488556.470632966 +1504360.6094703674 +1500571.0278496365 +1498272.6438177756 +1500688.8059819823 +1496428.9002814821 +1498271.404769909 +1498778.294525877 +1501655.44069659 +1495028.1709608557 +1492999.1121136555 +1500630.7497328117 +1496530.3336692962 +1503236.0104117945 +1497378.6399723 +1498658.3547593893 +1502105.2174421938 +1494601.5774483483 +1499446.844635553 +1496901.2010771849 +1502527.4846155408 +1497765.4016120522 +1502128.0613627608 +1502410.81308596 +1496966.5341241327 +1500196.6050703693 +1502158.1883173932 +1496020.0824411337 +1503150.7239505306 +1503062.7679340567 +1492764.192910698 +1500107.143159278 +1502136.7729844379 +1497844.2598724333 +1500199.2256016422 +1492035.7476322164 +1494098.7713819074 +1497720.9079019693 +1499785.1509776234 +1501198.9446853783 +1493197.7083921228 +1494863.9885424646 +1494286.4724107157 +1504327.2025917782 +1497301.0140483016 +1502671.5418510365 +1496094.7953910509 +1491614.0898083993 +1494025.7561070158 +1502156.9981487873 +1500358.928106802 +1499132.4432726847 +1492746.6579540311 +1487243.6373590997 +1496261.2073088451 +1496983.2706644135 +1500820.5413876916 +1500168.0600164318 +1491387.0975499093 +1499768.1045432922 +1497945.7018626882 +1490795.864450576 +1495306.0306883485 +1496535.0663432823 +1489804.928744842 +1494791.7425791253 +1493022.6878604048 diff --git a/code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..4be928a --- /dev/null +++ b/code/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,367 @@ +1511253.02143 +1507691.08885 +1514857.76963 +1515512.55921 +1517425.41177 +1518055.24164 +1511029.84956 +1514796.43133 +1509234.27566 +1514054.75768 +1512004.14646 +1513794.00675 +1508369.81563 +1509595.73568 +1508849.53132 +1512258.84404 +1519111.13289 +1513895.12264 +1517870.42765 +1517541.95123 +1514280.816 +1512412.29023 +1514996.09042 +1508538.12398 +1514291.23636 +1516418.60519 +1510282.12522 +1515098.73344 +1517763.7695 +1515035.96954 +1516252.05466 +1510854.40188 +1507570.27437 +1511615.61097 +1508524.1589 +1515964.99501 +1511025.91931 +1509673.52932 +1512708.27903 +1506625.07916 +1509241.33648 +1509392.38248 +1511511.9635 +1507812.48437 +1517773.20902 +1509232.84358 +1518248.59087 +1516009.30184 +1517238.41891 +1512521.67561 +1511865.66294 +1515663.33332 +1514193.0437 +1511178.48846 +1512555.20039 +1511626.11756 +1515959.04401 +1510830.81589 +1514392.85863 +1511548.6678 +1515450.70243 +1507838.06002 +1513835.94469 +1515323.48815 +1512942.44327 +1507575.5595 +1512477.70887 +1510814.04325 +1513430.0265 +1513171.64287 +1517560.24389 +1511859.17964 +1518158.81998 +1517501.46108 +1510617.05481 +1512551.74527 +1511905.00419 +1511663.66318 +1512576.6111 +1517766.71037 +1517522.08561 +1508272.78251 +1519337.74429 +1512558.32226 +1511501.82827 +1510831.4403 +1511456.89496 +1510001.16461 +1510019.52642 +1510991.20183 +1516254.47193 +1514935.21288 +1511622.93353 +1512591.02959 +1518120.7372 +1512182.4797 +1513357.25086 +1511727.85875 +1511472.0622 +1517817.41069 +1512545.58706 +1515505.69625 +1509493.35965 +1512903.8326 +1507738.5464 +1517618.73791 +1511963.93159 +1511912.01253 +1517127.58539 +1510743.76626 +1514516.97341 +1513630.28158 +1510991.7713 +1513657.69891 +1512357.627 +1512620.70381 +1516060.89204 +1513945.72203 +1512400.87459 +1514630.91937 +1517406.87295 +1512403.37156 +1515928.01916 +1511237.17297 +1512955.21497 +1515637.46785 +1517555.83727 +1512012.92066 +1515761.091 +1513501.44476 +1517035.0538 +1512052.25247 +1511509.13873 +1508470.47877 +1511877.51518 +1512679.24758 +1512034.98085 +1518783.6109 +1516235.65566 +1508270.52609 +1516202.73424 +1515741.33502 +1516227.44981 +1517321.04054 +1516094.50989 +1508502.24984 +1508259.00873 +1512735.94871 +1513099.5973 +1509751.78333 +1509029.46069 +1515317.62764 +1517089.56632 +1511411.93338 +1517467.68925 +1516904.83171 +1506313.86566 +1515253.37294 +1511094.26279 +1514524.75117 +1516056.04853 +1510604.65887 +1510403.75615 +1510502.32759 +1513300.95938 +1512980.09966 +1514077.11168 +1517378.06258 +1516779.61536 +1512414.78896 +1515450.79554 +1514392.5376 +1512643.97572 +1511620.11134 +1518283.6031 +1508062.67019 +1514905.09254 +1506752.75462 +1513568.09771 +1507039.27486 +1518683.41901 +1506747.84111 +1510529.34932 +1512318.34727 +1507333.22667 +1514676.97046 +1510434.46292 +1510501.47725 +1517869.44484 +1515031.43647 +1513179.56348 +1509218.26223 +1511188.74934 +1513771.14075 +1516737.5496 +1509295.55869 +1514200.24279 +1513902.73826 +1514504.57775 +1512244.23251 +1511938.69798 +1506737.85447 +1516223.66009 +1515594.31068 +1507972.1382 +1516057.03543 +1518467.5899 +1512120.79253 +1514544.70731 +1510511.23269 +1511691.98132 +1511708.47393 +1513059.8247 +1516943.54045 +1517309.27133 +1515703.35167 +1517856.64405 +1512276.68804 +1512519.01625 +1512065.56352 +1512427.40793 +1513831.58696 +1512586.50392 +1508406.20966 +1511985.07234 +1516624.12357 +1515856.12467 +1509177.75297 +1512241.97464 +1510876.36786 +1517404.49301 +1517305.26794 +1514321.1525 +1511689.21532 +1510160.11823 +1510935.0339 +1512205.20191 +1510425.10773 +1509519.93568 +1517732.3507 +1512931.59134 +1515502.99665 +1508278.62971 +1508304.13755 +1510802.24739 +1514851.29543 +1510823.27009 +1517833.42191 +1513656.86742 +1511117.41421 +1516834.16109 +1513089.83243 +1509644.11774 +1513513.17713 +1506698.03667 +1516563.43937 +1516813.44791 +1514025.77199 +1518357.25413 +1515761.71124 +1515293.59703 +1514401.37921 +1517449.80454 +1516744.16714 +1508350.80241 +1511006.11869 +1509692.82076 +1513945.22296 +1513566.94272 +1506921.99241 +1509765.81032 +1519370.14863 +1517852.5348 +1518249.29324 +1516521.1276 +1517118.49973 +1513875.02681 +1510413.51986 +1515868.08106 +1513098.25199 +1510985.1716 +1516692.35572 +1512249.67522 +1512749.86673 +1507176.29565 +1513643.53069 +1513649.64593 +1516627.12062 +1516005.93232 +1515790.12736 +1513944.38214 +1511607.48203 +1510494.52809 +1518777.39062 +1508518.12174 +1513411.60629 +1514244.64216 +1509206.47937 +1510622.22356 +1513067.50706 +1506963.87207 +1518913.69777 +1516073.52153 +1514279.80267 +1517477.81977 +1513066.39795 +1515261.52917 +1515759.66566 +1517080.75299 +1512652.23538 +1510841.20046 +1515839.16534 +1513454.73419 +1518609.44545 +1513790.226 +1516159.55261 +1516232.13931 +1512130.86048 +1515489.25779 +1513089.08942 +1519198.95701 +1514524.8196 +1517890.50165 +1517017.33687 +1514139.55359 +1516344.80685 +1518639.2974 +1512805.04361 +1518657.01949 +1518536.26318 +1510660.88761 +1516082.22665 +1518338.07143 +1514466.66655 +1516243.57817 +1510150.3695 +1511599.2447 +1514923.70528 +1516331.9842 +1517043.58012 +1511313.68773 +1512733.06281 +1511386.41649 +1518682.61217 +1513648.90524 +1517732.51339 +1512860.50525 +1510016.8416 +1511677.87979 +1518607.6491 +1516715.16921 +1514951.80973 +1510709.20747 +1505721.54187 +1513982.31075 +1513733.10141 +1516247.16785 +1515086.90642 +1509555.93015 +1516255.41416 +1514672.17197 +1509046.53026 +1511305.82731 +1513318.20889 +1509075.66693 +1512000.30051 +1510717.04099 diff --git a/code/opt-results/grid/circle_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt similarity index 52% rename from code/opt-results/grid/circle_4.0_northIslandRose/funcCalls.txt rename to code/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt index e56982f..338810f 100644 --- a/code/opt-results/grid/circle_4.0_northIslandRose/funcCalls.txt +++ b/code/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt @@ -1,393 +1,367 @@ -60 -68 -61 -89 -60 -83 -35 +37 +41 +48 53 -61 -144 -28 -70 -81 -66 -69 -56 -77 -62 -61 -49 -144 -70 -65 -56 -51 -54 -59 -81 54 -73 -59 -62 -61 -61 -83 55 -76 -39 -60 -83 -61 -84 -59 -69 -48 -56 -76 -58 -56 -181 -65 -151 +57 +46 61 +49 65 -71 50 -28 -95 -69 -109 -55 -33 50 -69 -69 +51 +53 +72 +76 +79 62 -75 -40 +57 +59 +60 +83 60 -64 -68 -65 -64 -79 69 -52 -46 -117 +66 +72 +72 +99 +81 +86 +90 +92 87 -41 -122 -50 -77 -30 -164 -94 -62 -69 -184 -76 +96 +104 +38 +112 +47 +114 +56 +108 50 -160 -61 +55 +78 +53 59 -45 -51 -57 -63 -66 -83 -73 +78 +89 +47 79 -147 -164 -68 -83 -68 -56 -59 -115 -141 +159 56 +199 +62 +113 +65 +60 +49 +61 +54 +71 +54 51 -51 -124 -63 +60 26 -63 -47 +124 57 -51 -60 -50 +290 +220 +63 +133 +120 64 +107 +101 +125 +256 +139 +92 80 -145 -37 -62 -53 -69 -41 -77 +91 +158 +95 +235 +284 73 -103 -30 -60 -54 -56 -53 -63 -63 -60 +267 +52 62 -67 -78 -61 -77 -45 -73 -39 -56 -38 -67 -60 -64 +50 +203 +195 +309 +139 +102 54 -62 -59 -74 -58 -58 -65 -28 -65 +85 +135 +105 65 -66 +200 +67 +109 +59 +69 +92 +83 79 -51 -51 -76 -62 -43 -62 -50 -108 -88 -49 -44 -90 -65 -90 -33 -60 -91 +254 55 -68 -35 -62 -62 +41 +91 +65 +111 +390 63 +42 +63 +52 +141 +42 +84 +401 +308 54 +81 +61 62 -55 -68 -58 -67 -106 -75 -58 -59 -59 -122 -69 -64 -62 -35 -38 -48 -32 -72 -73 -132 -82 +81 +49 59 -130 -60 -58 +33 +258 +359 66 -61 +271 56 -65 -69 -55 -27 -61 +85 +224 +50 +74 +103 +59 +362 72 -63 -54 +73 +131 +87 +173 +76 +108 +154 +51 +46 55 -71 -45 -62 +336 +393 +87 +47 +96 +149 +236 +59 +279 +535 +702 62 -72 -61 -66 -31 -30 -61 -39 -923 -57 -71 -159 +85 +77 90 -88 -76 79 -65 -61 -53 44 -89 -62 -59 +53 +67 +447 +140 +303 +317 +375 +146 39 -41 -47 -62 +98 +130 +574 +61 +233 +175 +89 +51 +139 +692 +48 +133 +79 +157 +133 +50 +65 +44 +130 +102 +131 +46 +48 +54 57 -60 -63 -47 -34 +169 +44 +103 +305 +99 +93 +78 +86 +54 45 -34 -144 -29 +385 +183 +358 76 -180 -105 -87 -49 -153 -63 -52 -160 -138 -144 -135 -51 -165 +68 +96 59 -106 +39 +117 74 +90 +99 +105 84 -54 -68 -65 -57 +79 68 -51 -27 -64 -170 -75 -72 -55 +245 +60 +84 +592 +54 +107 +45 +372 +54 +99 77 -46 +62 +70 +111 +98 +70 +659 +50 +123 +382 +71 +540 +78 +66 +177 +59 +111 69 -72 +71 +166 +190 +788 +252 +83 +549 +55 66 -57 -87 -80 +62 +92 +55 +62 +113 60 +47 +214 +47 +114 75 -66 +70 +623 +64 +85 +151 +84 +46 +237 +49 +239 +726 +43 +160 +74 +80 +56 +80 +275 50 +344 +170 +630 +221 +91 88 -58 -59 -72 -51 -65 -53 -50 -150 -64 -55 75 -71 -55 -56 +47 +53 +58 +99 142 -62 -49 -46 -62 -106 -64 -44 -29 -69 -42 +74 79 -45 -172 -35 -68 -51 +56 +102 +709 +57 55 -123 -80 +801 48 -64 -62 +147 +73 +124 +50 +56 +69 +667 74 -170 +75 +86 +104 +66 +52 +93 +56 121 -108 -65 -61 -67 +51 +96 +114 +111 +57 +329 74 -162 -148 -34 -150 -59 -70 -183 -61 -83 -177 -26 -62 -71 -63 -60 -63 -60 +178 +99 47 -64 +176 +78 +57 54 +216 +43 +38 +51 50 -55 -72 -63 59 +299 +256 +61 106 -54 -50 -59 -64 -50 -77 -115 -67 -28 -60 -62 +206 +175 +76 +40 +71 +436 diff --git a/code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..fe8fc9b --- /dev/null +++ b/code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,343 @@ +1306462.7604490498 +1308639.5215851518 +1314357.6740331308 +1311342.2652301914 +1310477.7090845506 +1312767.680965439 +1313512.7822856072 +1309152.0555853548 +1306839.43798134 +1311015.5263496346 +1313183.6476027952 +1310780.8154184406 +1309467.2203011024 +1307669.1477634413 +1312286.9357615644 +1308466.0500766775 +1310786.4939798051 +1312090.8782453616 +1306846.8840864748 +1311733.224165289 +1307579.7590876943 +1308411.3661821003 +1310961.5936231434 +1312759.6457378294 +1311541.685143805 +1311496.3803562159 +1308519.5734721895 +1308386.0401697687 +1306888.7032620164 +1310290.0749622907 +1311214.545909675 +1309312.0149203122 +1313326.4033123676 +1310848.886747154 +1310594.7098906513 +1313992.2042539162 +1315760.8580728457 +1311994.4488202021 +1304821.2715047845 +1313527.5848900902 +1311375.5809360556 +1310730.3268704668 +1309105.4188083594 +1311236.5858802903 +1308114.2513458675 +1310131.7879891752 +1310907.134848875 +1308546.3319790356 +1315321.3252042287 +1311450.5239052828 +1308047.1575360366 +1309887.6847110277 +1308189.7965670754 +1304797.2173501845 +1310644.2667516007 +1308392.0296526994 +1310031.9582679437 +1310365.1350357006 +1308001.9711920987 +1311764.0661605306 +1309348.3173031372 +1308571.3562850936 +1306307.745797318 +1311569.0967505474 +1311456.3299982443 +1310457.223204364 +1310362.073665202 +1313338.7276357212 +1313547.7382258072 +1308858.9361987163 +1315143.5681194828 +1304584.6278717648 +1310035.1729414808 +1309862.109580519 +1311559.5379116242 +1311272.622903031 +1307587.0767082404 +1313354.7578003425 +1314877.8838792238 +1308224.045382443 +1311263.9798730214 +1308119.04452495 +1314939.6219975625 +1309357.4809847192 +1312109.9924670206 +1310106.011782041 +1310940.3482022483 +1305456.3311277963 +1309600.3771408224 +1309193.2107461933 +1304541.3845379523 +1310196.3788617556 +1311209.2738116186 +1311045.3603522724 +1311062.8777646401 +1305251.1248347326 +1310515.6951419122 +1305874.7758794457 +1308256.762613731 +1307524.6519854297 +1305046.7397025335 +1310514.8119223453 +1307444.106950746 +1305756.1029050588 +1311665.7594487113 +1313721.9017834018 +1307783.4581667332 +1307393.48556757 +1306037.2281461137 +1305756.293238215 +1310763.6299220563 +1306187.6197278483 +1309657.5726145208 +1308144.8559632762 +1310095.946624736 +1307096.6749530267 +1308770.0205778491 +1309810.906893728 +1309644.2336418873 +1306325.6353345325 +1311477.480749265 +1311751.076078273 +1306937.7018426491 +1314196.8155992378 +1310173.1463531535 +1310167.2694221616 +1308390.8430605063 +1311991.3492701366 +1311515.31711441 +1308439.0783631809 +1309649.9547070926 +1311752.3229144951 +1311263.9454264464 +1309331.42119749 +1307415.0449840142 +1307901.1638226951 +1312947.4174305685 +1311502.894532733 +1311141.2316533101 +1309808.791171581 +1310980.213356609 +1309165.265459976 +1310253.2623155466 +1309353.917576423 +1310146.1790760686 +1310843.1265004466 +1311003.124633059 +1312655.6269111682 +1307006.5289704292 +1310336.6252705087 +1312425.3041855893 +1310995.0419865127 +1306488.5371089329 +1314277.0711365058 +1310490.1903226725 +1311284.8002697832 +1309882.6269019712 +1309949.7298615954 +1308612.183458652 +1310902.3460673539 +1312943.567284815 +1308507.9916607887 +1312210.0213048644 +1310556.812018571 +1313762.0461591005 +1312170.9801012315 +1310711.619814418 +1311163.9060505242 +1312450.9267538954 +1310190.150252585 +1309959.225607119 +1312359.928739059 +1314113.832472376 +1313662.0671005782 +1312171.2935958025 +1308584.3845110778 +1310317.1571378966 +1308306.1187137216 +1309247.418243402 +1310249.3218595225 +1305813.612017626 +1306988.212563197 +1307148.1319822178 +1308506.5735494925 +1310470.9937380813 +1307430.9092591796 +1310803.1578410228 +1311348.86822976 +1304909.8873811634 +1313234.4235544985 +1308668.1923143496 +1313845.2698071508 +1309624.4214748186 +1310941.1054732334 +1309036.1638075393 +1307962.4071286113 +1307939.4394014322 +1313046.6635639349 +1310535.8645315806 +1308002.7231745403 +1309048.8197840746 +1310392.6500103376 +1308793.64930106 +1307804.9507734037 +1309833.607816027 +1306992.143575706 +1309095.0904247873 +1310117.6116319573 +1307195.7091516128 +1311554.1913584475 +1310219.5313749006 +1310690.2099265147 +1309710.6556891073 +1311913.2906823403 +1307700.2503578532 +1310570.4073914108 +1307407.3821741373 +1308837.9392623056 +1308936.2592358044 +1307868.1662374383 +1309661.6236840372 +1312627.172637676 +1309169.8957976825 +1304918.7900120795 +1313424.8520505084 +1310646.3903611363 +1309466.715427912 +1308811.3144734073 +1307234.4292891738 +1308303.0635483547 +1311274.0627612327 +1305886.0752605358 +1309674.83711576 +1309412.781609927 +1310272.9722675302 +1308549.5745740167 +1311373.4010066069 +1311615.3193776642 +1308499.2295482473 +1311062.7722257422 +1311930.7861324607 +1310400.5240810325 +1304132.073603237 +1311198.1737920437 +1310949.385126382 +1310682.833209343 +1312984.0036911552 +1308920.4473448442 +1312173.368565354 +1306470.6740329228 +1310666.2725951623 +1309970.595332857 +1313787.0009773439 +1312603.587116455 +1309749.0482785297 +1309946.5373021124 +1309640.0786886401 +1311071.3148009945 +1313201.7567571225 +1310950.0635814976 +1307097.7791476813 +1301578.5832859275 +1309890.8463422644 +1311866.1149025867 +1310048.609650759 +1310431.3215978618 +1313058.873327878 +1305324.3643303663 +1306540.6368259299 +1311679.0868526006 +1312390.4834748204 +1309015.3230483248 +1308258.720073048 +1309308.6242094783 +1304925.285023831 +1305002.3996953533 +1310829.1757024815 +1310163.9423475156 +1310243.478811712 +1306955.39513223 +1312641.9130968163 +1312798.813971843 +1311160.1890276347 +1309849.6791768216 +1307613.3792560648 +1308884.4070147562 +1311262.4324477692 +1308772.292915078 +1310006.4100487274 +1311777.8036778732 +1306547.9639412935 +1311455.5102324698 +1313790.1781515365 +1311396.3381141946 +1310970.8058274211 +1306242.6124720662 +1310386.2349958227 +1307568.0481473943 +1310263.737513201 +1312519.9152157472 +1307755.0536924247 +1307574.4723723065 +1315481.2053272843 +1306125.4297467968 +1310875.5518746537 +1306900.366976498 +1310089.0641808892 +1307626.2216073223 +1306315.528244381 +1305901.854797599 +1312772.3967629243 +1308538.5548290862 +1309421.7591761008 +1308472.0331236687 +1308773.0425672142 +1310718.12018964 +1312042.2839258406 +1307291.1740647652 +1308823.1970812185 +1311624.1677675436 +1311077.2297525886 +1305873.4518140545 +1309298.7191141322 +1309775.6964941586 +1313101.56574817 +1306086.752277088 +1312404.5011532274 +1312474.8809775368 +1305953.5203665048 +1313371.9029553344 +1307700.0939457503 +1310033.4061947032 +1311339.5786589074 +1308632.9777235833 +1313840.8154743966 +1311093.9898768915 +1310710.2935427171 +1307655.4514087406 +1310499.5318137787 +1311611.6427731628 +1308613.685511496 +1313461.0548664364 +1313406.3529195823 diff --git a/code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..aa393b5 --- /dev/null +++ b/code/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,343 @@ +1346480.70467 +1349976.27334 +1354872.9171 +1351590.10408 +1352286.22199 +1352978.92279 +1354161.7423 +1348925.30441 +1347393.62852 +1352445.22217 +1354120.24982 +1350786.11272 +1349566.45783 +1348435.92162 +1352353.46213 +1349663.11076 +1350099.62766 +1352354.39972 +1346364.11041 +1351516.60592 +1347077.29946 +1349063.64252 +1352169.13293 +1353383.1487 +1350947.58403 +1352080.24802 +1349121.87938 +1348937.58415 +1348017.93117 +1349908.60787 +1352337.85633 +1349678.0316 +1353955.12944 +1350977.65373 +1351664.05664 +1353584.52348 +1355432.7627 +1352077.32916 +1345622.63307 +1352340.47239 +1351259.23136 +1351219.08056 +1349374.35094 +1351286.19167 +1348564.96829 +1350276.751 +1350591.63998 +1348730.70906 +1355844.71075 +1351558.22127 +1349068.60787 +1349495.72399 +1347763.02624 +1344675.80582 +1351800.47287 +1348409.24842 +1349924.02263 +1350800.7399 +1348656.35168 +1353448.90656 +1350100.63801 +1348872.73997 +1347457.2888 +1351816.11905 +1351074.45418 +1350210.63566 +1350907.50369 +1353759.24438 +1353776.80666 +1349215.1922 +1355208.19267 +1344275.64583 +1349769.22566 +1350408.00889 +1351700.34261 +1352042.18361 +1347901.49593 +1352824.94996 +1354285.38301 +1349108.64728 +1352419.94294 +1348597.32372 +1355220.91404 +1348285.94239 +1352047.92006 +1350330.78475 +1351125.32312 +1346076.28206 +1350580.86142 +1349639.79046 +1344583.07723 +1350085.56487 +1350783.93491 +1351405.10988 +1350412.84864 +1345777.00149 +1350383.30597 +1346048.71004 +1348704.17484 +1347689.06273 +1343952.99961 +1351045.5157 +1346913.54292 +1345524.57692 +1351501.24649 +1353859.47749 +1347516.27829 +1347544.11843 +1346158.03809 +1345969.15364 +1350488.39029 +1346902.28155 +1349966.49922 +1347500.71112 +1349503.09028 +1346762.90998 +1348174.2947 +1349898.58412 +1350983.63391 +1346859.20218 +1351740.11489 +1352439.71699 +1347194.36379 +1354443.57603 +1349447.42831 +1350572.51266 +1348490.34743 +1351548.69019 +1349279.48036 +1348435.22048 +1349528.76746 +1351857.54255 +1351349.44779 +1348846.16468 +1347872.573 +1348048.97095 +1352544.38022 +1351461.50889 +1351314.78113 +1348650.03219 +1349872.9922 +1348329.1392 +1350960.52404 +1350109.70295 +1351148.03307 +1351007.01483 +1350675.39584 +1353795.04514 +1347436.80188 +1351134.58803 +1351667.52439 +1349997.50298 +1346016.81653 +1354389.80776 +1349764.06111 +1349955.61353 +1350542.74761 +1349327.94134 +1348827.70882 +1351966.61121 +1353941.35333 +1348697.88511 +1352409.32558 +1349347.21709 +1353676.60631 +1351681.56125 +1350981.47498 +1352173.18696 +1352695.09511 +1349842.24378 +1349605.21538 +1351373.78723 +1354554.25039 +1353284.06628 +1352119.87692 +1348645.57491 +1350353.73643 +1348794.3736 +1349147.43372 +1350922.03491 +1346074.38056 +1346794.025 +1347630.64803 +1348538.12966 +1349244.80565 +1348403.27055 +1351203.02197 +1351671.0411 +1345237.02451 +1353724.90696 +1348123.16989 +1354551.46196 +1349125.00723 +1351713.50344 +1349206.81631 +1348667.44932 +1348795.65289 +1353166.82317 +1350988.0894 +1350306.65346 +1349219.83451 +1350499.34378 +1348872.79399 +1347524.20548 +1349809.00164 +1346699.80803 +1348599.03142 +1350151.1764 +1347009.41837 +1350871.40568 +1351316.715 +1350894.92001 +1349750.49737 +1353361.24457 +1348569.16168 +1349704.34336 +1347203.15004 +1349303.13391 +1348801.18582 +1347698.94431 +1350102.59918 +1351599.06954 +1349276.73866 +1344681.11492 +1352836.38305 +1351110.11498 +1348959.24025 +1349774.22184 +1347102.73623 +1348303.20766 +1352042.0779 +1346024.52737 +1349974.11813 +1348543.84743 +1351198.68017 +1349449.68832 +1351161.62608 +1351865.73758 +1349243.90319 +1351198.59326 +1351568.14073 +1350382.20433 +1344039.55252 +1351791.50135 +1350957.11431 +1350355.96068 +1353501.05425 +1349185.58156 +1353458.37763 +1346707.37143 +1351380.05459 +1350426.29651 +1352630.75828 +1353406.05915 +1350804.72181 +1349882.04705 +1350784.25092 +1350728.57385 +1353845.7522 +1350548.75278 +1346754.17302 +1340766.12163 +1350566.02508 +1352518.75706 +1350729.26038 +1350969.39514 +1353791.05123 +1346040.00555 +1347041.64175 +1352188.62276 +1352853.50625 +1349571.58296 +1349122.64037 +1349712.50873 +1343732.09139 +1345125.77772 +1351545.27458 +1349888.27715 +1350108.25108 +1347346.45215 +1352525.37601 +1352462.96952 +1350851.72472 +1348477.71619 +1347635.48456 +1348588.2206 +1351251.64129 +1349024.3536 +1349772.75221 +1351906.75052 +1345646.74855 +1350788.04733 +1354654.60882 +1351796.72618 +1349960.53747 +1347566.40286 +1350796.08358 +1349968.41263 +1350011.77289 +1351805.48786 +1348734.11233 +1348066.21094 +1354512.96975 +1345793.31762 +1350948.57414 +1347383.63662 +1349526.76699 +1348531.02374 +1346761.57115 +1346359.93046 +1352938.34459 +1347796.25102 +1350442.32636 +1348297.68897 +1348740.58444 +1351069.77458 +1352433.94091 +1347039.04895 +1349363.22889 +1351998.79283 +1351143.00552 +1347179.9289 +1348659.14989 +1350765.36201 +1353215.49734 +1346767.93596 +1352879.74619 +1351652.55603 +1345338.49253 +1353746.90671 +1347101.31964 +1349364.68717 +1351034.12326 +1347400.87502 +1353134.16499 +1351410.40384 +1351741.7883 +1348334.13595 +1350914.46085 +1352850.00271 +1348783.38339 +1354262.92429 +1354348.47317 diff --git a/code/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..6653ea5 --- /dev/null +++ b/code/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,343 @@ +55 +60 +58 +63 +60 +63 +66 +69 +69 +72 +74 +77 +82 +82 +85 +89 +97 +103 +103 +105 +111 +127 +138 +153 +152 +69 +180 +131 +183 +87 +70 +80 +97 +205 +212 +216 +218 +94 +94 +224 +231 +230 +133 +240 +93 +72 +109 +131 +129 +278 +49 +169 +297 +75 +194 +78 +161 +311 +215 +69 +69 +250 +84 +62 +115 +228 +71 +90 +84 +76 +93 +402 +150 +157 +81 +71 +114 +158 +171 +79 +92 +91 +63 +441 +107 +91 +259 +332 +173 +75 +47 +171 +164 +74 +124 +55 +349 +201 +61 +231 +91 +62 +137 +537 +88 +81 +77 +104 +98 +52 +102 +370 +583 +149 +133 +214 +215 +82 +73 +144 +110 +63 +333 +655 +475 +291 +96 +75 +193 +239 +291 +91 +435 +136 +298 +123 +408 +635 +164 +433 +134 +96 +93 +153 +98 +131 +286 +103 +641 +74 +134 +135 +62 +96 +170 +180 +307 +92 +102 +73 +74 +353 +132 +116 +80 +145 +184 +84 +126 +256 +196 +168 +138 +91 +142 +261 +117 +80 +106 +63 +122 +159 +205 +87 +160 +78 +47 +131 +83 +137 +426 +167 +224 +98 +104 +149 +77 +105 +542 +48 +243 +100 +184 +83 +364 +353 +157 +73 +154 +225 +70 +93 +233 +54 +65 +643 +353 +221 +335 +447 +49 +90 +325 +472 +117 +90 +138 +59 +97 +118 +49 +557 +655 +248 +69 +158 +307 +277 +57 +134 +68 +107 +112 +91 +152 +76 +59 +190 +50 +91 +71 +46 +243 +56 +498 +300 +61 +494 +75 +98 +81 +68 +76 +75 +137 +316 +81 +69 +61 +161 +82 +73 +73 +79 +207 +231 +83 +120 +106 +618 +162 +396 +148 +166 +227 +348 +224 +129 +186 +210 +72 +974 +61 +86 +283 +63 +53 +83 +80 +145 +230 +154 +213 +85 +207 +180 +289 +56 +77 +309 +93 +896 +81 +87 +128 +69 +71 +175 +190 +76 +261 +321 +278 +128 +93 +101 +66 +145 +237 +104 +118 +121 +86 +182 +233 +74 +64 +91 +91 +51 +306 +70 +147 diff --git a/code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..41ec70b --- /dev/null +++ b/code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,118 @@ +1309507.4877375762 +1308005.007857323 +1307972.732913321 +1310615.6337065932 +1309681.6391762225 +1306280.479039519 +1309808.0184081302 +1305253.736614993 +1310598.9775629963 +1310530.3772524176 +1309809.5908287796 +1309203.487057261 +1311925.6333587107 +1313015.2309511346 +1314835.994987042 +1308878.783435479 +1306327.0536932545 +1306393.8909124886 +1309653.9292358626 +1309396.9722835652 +1311472.7292028845 +1310840.7146225078 +1311684.9651294958 +1306076.1670307901 +1307369.0377265906 +1309381.4675685822 +1310675.3725750863 +1311728.4952795343 +1306842.7940430923 +1307705.5593952783 +1308475.7738566992 +1310842.963054482 +1309267.8109563189 +1306834.3920203964 +1311223.2501462197 +1313413.247502285 +1307339.338994644 +1307753.9673535456 +1307227.0811057575 +1314656.2127078886 +1311647.3945134843 +1313227.2699531603 +1308031.0614720497 +1308817.4482796087 +1307091.1150188064 +1310711.973836471 +1302156.8105029939 +1304194.4076901507 +1310640.1841016274 +1311917.5871662549 +1310248.733314595 +1311688.9833408438 +1307065.6664436813 +1304870.515708649 +1307647.7975154063 +1310337.5559784237 +1311381.3535068904 +1315815.5893947128 +1314833.8909384166 +1313371.4159679906 +1309637.237404857 +1311732.831228742 +1312165.526732558 +1313109.5221594195 +1306508.9268485792 +1309147.0089234593 +1308319.8492431368 +1309348.2940977898 +1311889.8213186369 +1310416.1162334194 +1307504.7677788595 +1308747.082841133 +1311013.9210783155 +1312816.9141244413 +1302022.9553772372 +1307098.065586345 +1310372.1051815932 +1304390.7033874998 +1308938.128820697 +1309555.6023834958 +1306982.0517987646 +1309212.7359773477 +1314138.3827651073 +1309675.1682433838 +1306533.845474772 +1310238.136538341 +1311483.2982989198 +1307677.183961316 +1310875.0213969902 +1310287.6936191297 +1306201.7596806209 +1310448.832390415 +1309482.9050267944 +1311465.8964551855 +1308596.5114728766 +1312233.5484868628 +1306767.0711773813 +1307095.4543842827 +1307608.7756555155 +1310605.370881256 +1307676.5741989885 +1310976.9933003609 +1310217.351737957 +1310625.3609382033 +1310443.871183625 +1309037.010380459 +1305586.4251758035 +1313217.025434803 +1307923.8103874307 +1310697.0240615201 +1305826.3643339272 +1307872.7708077547 +1310610.1448390053 +1310647.0465586765 +1303004.2415653272 +1308105.4166655808 +1308513.6286665958 +1311315.733922838 diff --git a/code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..06badc9 --- /dev/null +++ b/code/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,118 @@ +1350485.61987 +1349428.18615 +1348739.50519 +1351040.07391 +1350226.0236 +1347025.7616 +1351125.6402 +1345667.60759 +1351684.85584 +1351833.54483 +1350744.88163 +1350577.33037 +1352059.06376 +1353295.1472 +1355168.91139 +1350773.61841 +1346500.16948 +1345520.07933 +1350242.42644 +1349986.04372 +1352063.26801 +1351468.47082 +1352656.64461 +1346331.00498 +1348558.37245 +1350121.51865 +1351825.05329 +1351950.25308 +1348568.05806 +1347645.12463 +1348961.98343 +1350620.52705 +1351520.0685 +1346707.79496 +1352200.93097 +1354763.00397 +1347703.14908 +1348894.59626 +1348141.50908 +1354986.14453 +1350820.75417 +1353166.84358 +1348184.05657 +1348876.82784 +1347622.18945 +1350970.06025 +1342840.35111 +1344328.63354 +1351989.63698 +1351722.42319 +1351225.93464 +1351476.1679 +1347936.48631 +1344359.41885 +1348040.27141 +1351571.34394 +1351853.55659 +1355977.26239 +1354903.17248 +1353570.40236 +1350527.3676 +1353211.84166 +1352931.15566 +1354194.6668 +1347321.24274 +1350061.72339 +1348343.08341 +1350142.76783 +1351475.55149 +1351267.5158 +1347489.03663 +1349949.87908 +1351994.55614 +1352829.85754 +1341381.90364 +1347903.776 +1350999.30196 +1344469.00449 +1348681.1777 +1350161.29385 +1346956.10899 +1349655.75483 +1354114.50716 +1349227.41202 +1347261.86381 +1349835.71847 +1351850.09602 +1347203.62604 +1352100.67623 +1350071.42185 +1345713.51506 +1350509.2461 +1349266.80038 +1352689.34124 +1349852.0533 +1353109.13143 +1347633.82421 +1347534.5369 +1347585.05864 +1352339.1942 +1347606.57259 +1351362.89793 +1351337.98632 +1351808.75792 +1351707.01865 +1348489.80083 +1346462.44027 +1353303.07706 +1347034.53741 +1350933.52173 +1345216.33356 +1348984.62812 +1350743.06577 +1351359.66699 +1343091.21628 +1349086.82195 +1349706.06987 +1352035.17627 diff --git a/code/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..74469f9 --- /dev/null +++ b/code/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,118 @@ +50 +53 +59 +61 +61 +63 +65 +65 +66 +68 +66 +44 +69 +72 +73 +74 +75 +75 +48 +75 +75 +49 +76 +52 +52 +81 +81 +53 +54 +54 +54 +83 +55 +84 +55 +56 +86 +56 +86 +88 +58 +59 +59 +88 +59 +59 +60 +60 +61 +90 +60 +90 +61 +91 +91 +62 +62 +93 +93 +63 +63 +61 +64 +94 +64 +66 +95 +98 +95 +68 +66 +68 +68 +69 +101 +101 +69 +69 +47 +69 +70 +70 +103 +103 +70 +102 +71 +71 +72 +105 +70 +73 +73 +110 +76 +53 +77 +77 +77 +78 +112 +78 +113 +71 +54 +116 +55 +56 +82 +82 +82 +83 +83 +120 +82 +83 +85 +59 diff --git a/code/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..afac274 --- /dev/null +++ b/code/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,123 @@ +1324827.6490652722 +1329520.0050574266 +1325915.310114447 +1327321.9341762557 +1325116.7845307612 +1324878.9372413876 +1329059.0979978933 +1324929.858928048 +1323620.035475362 +1328933.2092091802 +1327867.0041381142 +1324399.892420372 +1325642.678550773 +1326735.7059190355 +1324901.4232753597 +1324989.9257310326 +1324096.920352715 +1324635.366760104 +1324174.678796896 +1322084.1617345486 +1327379.179517718 +1329733.8046032637 +1324048.0093454965 +1326514.9589911562 +1324963.2012596237 +1325392.6283836225 +1329519.2146559253 +1324270.321250827 +1328356.5673284426 +1325564.4418125062 +1327487.6383320042 +1325300.2956898334 +1325433.593991441 +1326554.1219708698 +1325706.9019806383 +1327050.5587132892 +1326691.178660743 +1326581.8647739948 +1326618.5360854475 +1325897.4398893313 +1324077.0756171679 +1322962.331360683 +1325535.5400186086 +1323934.5274761994 +1323990.7049503033 +1327660.6467157805 +1324593.6318793292 +1326157.4842317535 +1323226.7747049895 +1325001.7158758338 +1325475.512615837 +1324728.0664639077 +1324866.966136997 +1326069.4675991551 +1325242.5835439663 +1326984.0342673496 +1324943.3027117236 +1323939.9117717603 +1326991.9229892604 +1322689.8362849574 +1327150.2065323042 +1325330.5735375579 +1329618.1729134303 +1327024.285663643 +1326913.6389790133 +1326394.8992737415 +1325003.419224133 +1323106.2102372546 +1326342.7354670882 +1327643.1705659 +1326769.420977662 +1327326.9668464288 +1324397.6932607978 +1324555.2484687462 +1325499.502273771 +1322957.029375136 +1326908.9916138914 +1325936.49206725 +1323226.6412505093 +1326840.00216262 +1319662.2025920441 +1323062.6132991316 +1326325.073417917 +1320091.179652719 +1325548.164035155 +1323363.4994068888 +1325123.7464487548 +1324272.358582392 +1324395.4565021156 +1322755.3463291172 +1327298.8359781778 +1323481.3865619402 +1325417.1040714711 +1326171.400766772 +1326870.0610328133 +1325741.9939797358 +1327493.546929354 +1323448.3687703602 +1325945.8066832079 +1325929.5956669848 +1321494.122041456 +1325658.7764962246 +1328059.252820554 +1325426.6140100101 +1323826.4018947482 +1325171.8952828308 +1326429.1477051503 +1326404.862768156 +1321125.0268045655 +1323898.3396038362 +1326255.9398549679 +1326738.7157695834 +1324870.1744847465 +1324033.399368701 +1327028.2239356951 +1323308.220385652 +1326589.0458181463 +1325338.5877378592 +1324645.145057551 +1327439.427417851 +1323293.2360180987 +1324720.124996219 +1325616.6343688802 diff --git a/code/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..857b7df --- /dev/null +++ b/code/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,123 @@ +1361114.04224 +1365314.03894 +1361698.67435 +1363235.53735 +1361912.76104 +1362111.52097 +1365512.62027 +1361810.08505 +1360612.05159 +1365256.88503 +1364382.77447 +1360882.25543 +1362790.67767 +1363898.25447 +1361727.25521 +1362007.24585 +1359984.31729 +1362074.186 +1362005.05196 +1359569.98227 +1363990.26762 +1366805.77434 +1361102.11352 +1362897.30132 +1361580.66229 +1361674.25437 +1366214.31295 +1360452.3602 +1365664.47967 +1361777.56282 +1363608.22538 +1361735.38545 +1362410.38784 +1363140.06467 +1362107.9521 +1363919.42891 +1362951.45502 +1363280.91886 +1362500.3174 +1361586.86354 +1360778.67616 +1359736.3258 +1362555.94897 +1360857.71179 +1360123.67784 +1364134.18831 +1360638.21799 +1362651.68991 +1360775.65145 +1362545.03496 +1362516.91007 +1361236.8782 +1361797.06263 +1362952.32643 +1362949.05959 +1362995.69299 +1361938.02064 +1361491.66446 +1363438.35977 +1359551.27465 +1363187.12431 +1361323.7864 +1366558.61412 +1364023.93075 +1363694.58881 +1363854.61082 +1361938.11721 +1360668.47376 +1362650.77665 +1363814.38118 +1363249.30056 +1364671.61002 +1361694.19262 +1360759.00692 +1363175.96439 +1360059.44072 +1363869.73461 +1362235.68652 +1360004.76063 +1363297.21718 +1357853.46996 +1360662.85446 +1363469.46862 +1357486.55154 +1361943.24391 +1360799.54407 +1362265.04805 +1361604.46696 +1359495.14565 +1359399.57657 +1363811.0533 +1360087.20686 +1362243.17501 +1363318.64341 +1363494.07173 +1362898.22854 +1364395.99079 +1359906.09764 +1362900.06006 +1362181.68691 +1358950.37382 +1363170.34698 +1364849.22402 +1362203.32268 +1360671.56524 +1362010.66413 +1362698.25652 +1362979.78354 +1357918.43171 +1362494.90426 +1362411.30328 +1363551.72473 +1362482.47979 +1361450.78997 +1363595.45753 +1360566.88902 +1363543.02017 +1362556.19868 +1361291.04253 +1363458.57139 +1361183.07725 +1361977.55606 +1362432.57707 diff --git a/code/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..2fab82a --- /dev/null +++ b/code/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,123 @@ +365 +394 +426 +439 +446 +474 +471 +484 +473 +490 +492 +500 +508 +523 +533 +571 +592 +682 +696 +689 +708 +761 +792 +808 +402 +864 +867 +870 +879 +913 +960 +957 +493 +1011 +1025 +450 +1087 +571 +678 +1112 +640 +590 +1160 +611 +1183 +464 +716 +630 +424 +664 +750 +1352 +669 +887 +625 +737 +930 +689 +1491 +1516 +564 +579 +526 +396 +398 +407 +423 +426 +433 +449 +472 +483 +471 +495 +495 +482 +505 +504 +512 +509 +514 +513 +517 +519 +526 +546 +551 +552 +559 +566 +571 +560 +576 +576 +577 +565 +593 +599 +608 +608 +614 +626 +626 +636 +626 +649 +658 +667 +672 +683 +690 +693 +698 +710 +713 +720 +718 +730 +737 +747 +756 +760 +776 diff --git a/code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..886f929 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,266 @@ +1264889.2859179524 +1216997.4219943 +1238671.500831875 +1214724.8639870004 +1262334.6546249858 +1226172.5211017702 +1223006.9252113786 +1251640.0929945912 +1252941.6751603482 +1265279.1449187614 +1251640.092334775 +1264147.8254360897 +1279294.6566356306 +1258904.4780830047 +1275660.7349738795 +1247096.6518941466 +1244238.8992892955 +1229214.541341591 +1240476.244608972 +1268601.3822413587 +1260025.5425431235 +1239868.5583432748 +1226233.364786597 +1269341.9013386557 +1252941.509870696 +1258030.4233507682 +1272070.1431252342 +1274169.5388160166 +1275659.895073622 +1269341.901458343 +1255714.0594863237 +1252941.6415622628 +1242306.1779156218 +1264889.1999783271 +1258030.4223280584 +1255752.3148334385 +1253201.2570224872 +1279552.7550651932 +1244238.897514643 +1258030.4213119326 +1263823.606599196 +1272010.8369756837 +1256944.4586178237 +1278214.9088241467 +1272004.5111075207 +1258030.4233445295 +1226434.7179509925 +1246842.6001228022 +1214726.0457320963 +1278215.2257219187 +1263242.1003976255 +1257668.3241184582 +1257668.3242623387 +1285013.9936945664 +1250245.063573713 +1276132.098237845 +1256932.674018352 +1226672.9601544316 +1219224.132445003 +1269516.5065010437 +1264270.8665160048 +1267298.769419361 +1273572.596689025 +1246955.295399803 +1264889.2490788836 +1264921.5447142874 +1257555.0342497258 +1258778.0784247005 +1275676.7897855847 +1241425.7675636222 +1263242.0551274354 +1269341.9161840794 +1276128.6564127044 +1238671.500511707 +1226083.6334939543 +1215238.4659857152 +1275899.512073096 +1264147.825420746 +1261529.4761791683 +1265997.1978939888 +1246743.9513255572 +1249442.1830217037 +1258030.4230801477 +1238671.5019386825 +1259645.3052210154 +1256944.4593678543 +1229214.5418050853 +1285013.9930285094 +1261199.1499791618 +1275716.6593647448 +1261555.1572360091 +1235162.0668315287 +1213352.6824044986 +1260717.9715406136 +1244238.8959784645 +1226434.7171151286 +1236430.0486223998 +1276132.8925199155 +1223462.2519792079 +1262346.3242546371 +1275898.689548471 +1264921.516296661 +1260717.9715405423 +1277544.6385947415 +1255714.1354464886 +1213352.6825631734 +1202427.474672818 +1213352.6825043329 +1258030.4233523097 +1270815.7721604567 +1241384.595787527 +1259632.1349846656 +1263241.1810286301 +1226434.717617366 +1263823.6063704768 +1269341.9014583384 +1232291.6155984858 +1258034.7840342629 +1252183.8648303833 +1256925.7630775492 +1243139.596888504 +1261555.157190814 +1232101.3849457407 +1264889.2551104382 +1263823.6065281958 +1275898.343968294 +1276061.9925057618 +1232818.4593611108 +1278212.3847972043 +1257555.0327615677 +1219224.1324453745 +1249442.181904509 +1266246.5028459525 +1270740.8883702694 +1214724.0921030308 +1269516.5065014341 +1249441.630410448 +1270814.8932823772 +1266176.2226037548 +1258030.4217672243 +1276052.4139785732 +1247619.2713168173 +1271056.9619049986 +1231162.102401702 +1255714.1354543986 +1271632.8380730075 +1273490.9746054544 +1208693.2620561423 +1273489.8158379614 +1258419.1152958502 +1277544.6384062942 +1228743.9864847958 +1258148.9317531632 +1270815.772160457 +1256996.2682413303 +1240476.260225706 +1226687.424220072 +1264147.8254119228 +1256953.577634582 +1226233.364790625 +1218213.2475174316 +1264889.2816858282 +1274069.077924905 +1249667.8623632756 +1229253.9182424012 +1274169.5366368855 +1275899.5134265714 +1273490.979292002 +1214726.1466419387 +1236210.3041658797 +1249442.1829884483 +1242668.891283277 +1273984.2411421966 +1250225.941897201 +1228728.1456367744 +1223462.2534529555 +1236430.047950756 +1213352.6816219187 +1251640.1040081398 +1257664.991908302 +1252941.5551454376 +1261555.1572151557 +1220465.0394313557 +1242306.192052096 +1263008.2740883713 +1266893.498747943 +1260030.127578359 +1277536.4190444548 +1235847.4408229538 +1232101.3225977856 +1273984.2411415714 +1277527.873545228 +1256888.7349223918 +1265997.1967865988 +1242526.328955805 +1264008.7850552292 +1270769.3722689648 +1236526.777500846 +1226083.633812999 +1275899.512771989 +1235235.47146792 +1272070.1410385442 +1266899.5377478166 +1249432.2186364508 +1226693.633473791 +1274087.879852858 +1275660.856203334 +1267298.777853432 +1260717.9715405754 +1240476.260222123 +1263823.6065993323 +1272007.0530963133 +1264869.674724794 +1275703.4543440747 +1272007.0076050092 +1229214.5401664309 +1263823.5972304733 +1270814.8932823737 +1260708.342694415 +1272430.225350014 +1258649.2569291613 +1242306.1967644098 +1226434.717945105 +1272007.058280558 +1256944.45905867 +1258163.4460547874 +1263823.6065984236 +1267298.7555596854 +1281712.1601674694 +1265279.1450637782 +1269341.9014584634 +1267401.9705833888 +1229498.7609126999 +1272010.8393023259 +1264147.8253315783 +1265279.1450832011 +1221634.7669448212 +1263823.6065993232 +1285006.6744641473 +1256905.2726643493 +1249441.547063823 +1276131.3419837744 +1285013.9936827337 +1244238.8973767478 +1257555.0327730605 +1273490.9815635127 +1249432.2192710624 +1267298.7782264003 +1258030.4164561592 +1236695.9627062012 +1228814.5176264541 +1213352.6820568396 +1251640.1362994611 +1240476.260112381 +1285013.9936804632 +1264889.2867734735 +1235847.439712263 +1273955.6540622804 +1266246.50296995 +1226693.3291600074 +1258904.4508558097 +1259870.973217311 +1274090.8033095053 +1270749.1980212852 +1277544.1894433976 +1269341.901176269 diff --git a/code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..18e0410 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,266 @@ +1308603.9393 +1257660.27891 +1271349.19909 +1245863.77621 +1304848.65228 +1253900.2197 +1248080.73312 +1296088.16627 +1298904.99353 +1301891.08725 +1296088.16588 +1305235.51871 +1318229.02886 +1300117.59201 +1315353.17478 +1291834.58833 +1285556.13984 +1257803.91947 +1279351.9739 +1313012.32908 +1303069.50453 +1275793.93427 +1253883.57612 +1314517.61533 +1298904.81562 +1289444.78128 +1310521.42462 +1317341.69785 +1315352.27401 +1314517.61545 +1300803.72598 +1298904.95796 +1274077.17016 +1308603.82398 +1289444.77939 +1294326.38071 +1292773.1016 +1320987.01204 +1285555.14777 +1289444.77841 +1296818.30728 +1307761.1734 +1301107.7198 +1317736.9711 +1308164.99133 +1289444.78127 +1253884.99215 +1285347.82896 +1245865.6269 +1317737.30205 +1308897.38223 +1291838.58612 +1291838.5972 +1326187.41074 +1286010.1516 +1315790.82344 +1290862.83341 +1253797.74056 +1247863.52675 +1310170.11198 +1306498.29349 +1308776.1169 +1317123.68415 +1279801.15655 +1308603.89024 +1300010.63864 +1285255.75698 +1300355.73071 +1317366.02898 +1279054.94155 +1308897.33633 +1314517.62482 +1315589.98361 +1271351.08318 +1253409.79049 +1239039.34971 +1317686.33063 +1305235.48098 +1290134.23134 +1301649.33702 +1291253.24677 +1288446.43246 +1289444.78075 +1271352.08881 +1304996.81979 +1301107.74288 +1257803.9146 +1326187.41196 +1305777.55194 +1318680.91914 +1289612.00392 +1273854.26241 +1236463.53528 +1296267.26854 +1285554.89583 +1253885.08048 +1265920.75702 +1315672.09104 +1248806.13725 +1297562.33784 +1317684.86974 +1300010.60741 +1296267.26854 +1319633.50493 +1300803.80813 +1236463.46677 +1231148.44071 +1236463.38092 +1289444.78128 +1304901.34069 +1284900.26195 +1302107.06391 +1308896.43122 +1253884.97936 +1296818.30281 +1314517.61545 +1264591.8137 +1292092.63496 +1286582.01606 +1297159.1706 +1274965.88443 +1289612.00388 +1266949.49482 +1308603.90111 +1296818.303 +1317684.36053 +1316072.29645 +1269240.75917 +1317734.70201 +1285255.75519 +1247863.52674 +1288447.40815 +1300653.0602 +1303935.78382 +1245862.75122 +1310170.11197 +1288184.62325 +1304859.55374 +1301001.29311 +1289444.77942 +1318968.30575 +1293148.75329 +1311865.2638 +1262803.99951 +1300803.80814 +1310549.40095 +1312903.43367 +1248235.25041 +1312972.79044 +1299931.18821 +1319633.50255 +1250424.91265 +1303397.71301 +1304901.34069 +1301055.81577 +1279365.73095 +1254322.05191 +1305235.54125 +1290640.78306 +1253883.57956 +1245892.37265 +1308603.93425 +1317255.25239 +1279907.11543 +1270859.57258 +1317341.84331 +1317686.33261 +1312902.92001 +1245866.592 +1272546.89704 +1288446.2306 +1287024.49982 +1314865.06555 +1285830.63391 +1250404.40428 +1248806.13836 +1265919.80207 +1236463.29887 +1296088.17101 +1297953.61797 +1298904.86244 +1289612.0039 +1253776.31059 +1274071.37884 +1298132.58161 +1304501.74399 +1303156.64753 +1319473.82379 +1271073.36996 +1266988.03003 +1314865.06447 +1319291.39498 +1299061.44698 +1301649.01976 +1278306.66835 +1296278.76124 +1304356.04551 +1272762.60091 +1253410.00983 +1317686.33152 +1267844.48336 +1310521.64043 +1305150.03913 +1287545.56101 +1254238.58697 +1315663.09209 +1315353.30385 +1308776.12453 +1296267.26854 +1279365.56829 +1296818.3073 +1308143.54281 +1308583.83359 +1317223.453 +1307863.78721 +1257803.89709 +1296818.29877 +1304859.55361 +1296257.16785 +1316197.32535 +1306889.49101 +1274073.51664 +1253884.9694 +1308143.54681 +1301107.73671 +1302627.70376 +1296818.30686 +1308776.08671 +1315630.30559 +1301891.12443 +1314517.61545 +1312114.95817 +1259194.76539 +1307764.74449 +1305235.51122 +1301891.11857 +1251182.39393 +1296818.30731 +1326170.07595 +1301218.17076 +1288385.52456 +1315696.01894 +1326187.41205 +1285555.18721 +1285255.75535 +1312903.2894 +1287545.25286 +1308776.12501 +1289444.77189 +1265949.18856 +1267045.06684 +1236463.64999 +1296088.20353 +1279366.54456 +1326187.41269 +1308603.94105 +1271071.51063 +1317795.23568 +1300653.06035 +1254238.3522 +1300106.20332 +1298128.70257 +1315666.48568 +1304105.68601 +1319632.9743 +1314517.61516 diff --git a/code/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..0aac39a --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,266 @@ +9 +12 +12 +13 +15 +15 +16 +16 +16 +17 +16 +18 +17 +20 +22 +22 +23 +23 +24 +24 +50 +25 +27 +27 +28 +30 +32 +34 +34 +35 +33 +35 +37 +38 +39 +39 +40 +41 +42 +43 +43 +45 +46 +47 +47 +49 +50 +50 +52 +56 +56 +57 +57 +57 +60 +63 +65 +66 +66 +67 +68 +11 +73 +80 +18 +81 +83 +10 +19 +87 +90 +20 +90 +23 +30 +31 +97 +23 +98 +32 +12 +32 +19 +13 +31 +110 +44 +25 +31 +112 +115 +51 +27 +116 +38 +33 +117 +32 +122 +120 +123 +124 +128 +24 +12 +28 +131 +26 +60 +132 +41 +61 +70 +18 +64 +30 +138 +143 +144 +30 +30 +51 +151 +36 +30 +154 +59 +63 +53 +76 +67 +23 +165 +35 +18 +168 +169 +69 +171 +77 +79 +172 +176 +109 +37 +28 +174 +19 +178 +44 +23 +50 +10 +99 +19 +56 +21 +43 +122 +54 +23 +15 +56 +19 +203 +55 +110 +127 +33 +36 +46 +57 +45 +70 +25 +95 +128 +19 +28 +18 +29 +84 +88 +34 +217 +133 +45 +62 +55 +111 +43 +157 +155 +31 +158 +26 +28 +13 +19 +132 +15 +39 +79 +16 +12 +15 +29 +45 +87 +61 +43 +126 +11 +15 +44 +25 +56 +43 +110 +23 +15 +76 +30 +91 +171 +112 +168 +10 +21 +30 +56 +29 +16 +37 +21 +21 +11 +285 +12 +108 +24 +37 +33 +35 +74 +181 +22 +47 +25 +135 +74 +36 +10 +26 +44 +11 +47 +70 +160 +30 +41 +142 +20 +131 +23 +47 diff --git a/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt b/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..d611d02 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,148 @@ +1248926.929577071 +1255534.6766534871 +1236850.4555467963 +1255534.7429491978 +1239979.0129068976 +1237146.441802111 +1268136.5429547937 +1271709.8054945224 +1271710.0475120624 +1256212.1162036792 +1256212.5303529855 +1264331.6605080925 +1252794.6324661048 +1254601.4268296137 +1237146.441712074 +1240608.6381489758 +1237146.4418462259 +1256204.526668263 +1268131.6360276937 +1255534.677059904 +1245343.3846569217 +1236831.642338555 +1240608.6392005053 +1271235.9896632622 +1275816.0805267864 +1245592.9829431232 +1270236.7211017513 +1268032.1024445985 +1274466.227246584 +1248871.5633032415 +1273224.0438034134 +1256212.0635868262 +1271710.0319519155 +1275977.0424938914 +1271710.0275879623 +1268032.1026233349 +1256211.0466319586 +1254909.2570725407 +1274217.6099657957 +1269538.1569817762 +1254476.394681451 +1247065.9085690987 +1263629.0518710942 +1272989.876331486 +1269538.156861632 +1268137.88816399 +1254476.394918855 +1274466.2272268974 +1264331.6605488295 +1276227.4434788385 +1276006.4811423274 +1255534.1680667563 +1275816.0800530242 +1274418.4155797274 +1275976.903799802 +1262821.9084615011 +1265878.229061744 +1239563.5121155102 +1240173.2346242636 +1240173.2125617983 +1272435.1939803232 +1262564.5246060134 +1270227.9485745425 +1248934.6507381448 +1240608.639977 +1257963.08218149 +1239979.0129138683 +1256198.2242046804 +1273419.3354122161 +1263629.0628460853 +1274217.6100464195 +1275977.040118494 +1272517.7123633127 +1280183.7095750356 +1251698.031568781 +1236831.6632936727 +1272517.7095315068 +1275977.038697715 +1275977.0407000103 +1269591.71281249 +1272989.7546043186 +1254909.2561661578 +1258555.1567868798 +1248871.5619689147 +1272989.878015113 +1254476.394867741 +1263695.3958523534 +1250364.160396808 +1259296.8834733455 +1248934.650701843 +1235943.950585999 +1256212.174071508 +1275743.5063048296 +1254476.394542669 +1276387.9860204903 +1268137.887309764 +1240173.3782669515 +1261923.6464804907 +1269538.1559029075 +1271709.9860227392 +1265878.2273941142 +1271710.0419027861 +1271710.0440868794 +1250364.156540317 +1261528.2555382852 +1251809.4378154844 +1265862.013448761 +1265862.0134358166 +1258967.9520431347 +1254601.4270633545 +1262294.5676937732 +1267834.003613519 +1263629.0628078864 +1262600.3436988532 +1256308.0105156535 +1237146.441887114 +1256212.5316753045 +1268032.1026281319 +1269538.1544810876 +1246770.4148466785 +1276006.44918719 +1254476.3949139717 +1250364.1584905665 +1260107.660355009 +1245343.3846516688 +1248295.4468555038 +1258842.897029272 +1267848.1508760205 +1253769.5701646497 +1265131.2441904065 +1240173.2404629537 +1240173.212212858 +1256212.478511413 +1254601.425086056 +1273984.2593595837 +1248934.651082068 +1247065.9085889843 +1259296.889345098 +1236604.819294936 +1265862.013401484 +1235943.9463266144 +1245592.9557537518 +1261455.879084841 +1254476.3948512282 +1258555.156231137 +1275369.089894706 +1254907.3088812954 +1258015.273000669 diff --git a/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..20563fe --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,148 @@ +1289171.63628 +1295044.36142 +1273315.47384 +1295044.4342 +1279462.42936 +1273726.58386 +1308647.60866 +1306288.90994 +1306287.04103 +1296362.05553 +1296362.48826 +1308262.77587 +1289794.15803 +1288540.75033 +1273726.58375 +1283243.35202 +1273726.58392 +1296353.85719 +1312483.24826 +1295044.36186 +1281936.78513 +1273204.14735 +1283243.35299 +1312243.8062 +1315318.96769 +1283678.86967 +1310933.55915 +1309345.10438 +1316105.87565 +1285674.9428 +1313959.97395 +1296362.00015 +1306288.25677 +1315830.88083 +1306288.04785 +1309345.10452 +1296360.93669 +1294040.50845 +1320347.22757 +1308407.42008 +1292303.48266 +1283941.74112 +1302715.35608 +1314144.72644 +1308407.42031 +1308649.06254 +1292303.41319 +1316105.87858 +1308262.77595 +1313658.04483 +1313527.35242 +1295043.81858 +1315318.96987 +1311942.00726 +1315830.99755 +1296913.61092 +1305355.07176 +1282040.59735 +1283235.55655 +1283235.54048 +1308922.96067 +1309953.35646 +1310923.44944 +1289180.71422 +1283243.35371 +1298759.90217 +1279461.72028 +1296347.05743 +1312898.92593 +1302712.99 +1320347.22779 +1315830.91214 +1313123.75564 +1319281.29349 +1291079.88489 +1273204.17029 +1313123.75295 +1315831.37536 +1315830.95511 +1305591.87092 +1314142.80398 +1294040.50755 +1296722.33745 +1285674.93498 +1314144.19078 +1292303.64305 +1301132.52644 +1281618.32919 +1299888.54935 +1289180.71434 +1272728.02953 +1296362.11396 +1315248.85946 +1292302.79541 +1312180.80884 +1308649.0616 +1283235.67409 +1299692.66824 +1308407.37715 +1306285.43498 +1305355.07045 +1306286.38559 +1306287.58522 +1281618.30954 +1298525.82272 +1285646.99143 +1313867.3423 +1313867.34228 +1296945.71428 +1288540.76362 +1301725.4587 +1308103.60903 +1302713.21217 +1302020.71408 +1294091.53804 +1273726.58396 +1296362.48952 +1309345.10452 +1308407.40827 +1282899.88311 +1313527.33195 +1292303.46957 +1281618.29102 +1299423.10843 +1281936.78513 +1294983.53023 +1296015.27832 +1308704.09957 +1296332.93092 +1300969.0206 +1283235.56557 +1283235.54019 +1296362.43405 +1288540.78233 +1314853.6965 +1289180.71465 +1283941.73771 +1299888.55763 +1271518.93225 +1313867.34224 +1272728.02105 +1283670.05634 +1297238.34546 +1292303.69068 +1296722.30843 +1314964.14494 +1294038.68311 +1292800.60412 diff --git a/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt b/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..86e48f5 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,148 @@ +8 +9 +9 +10 +10 +10 +10 +11 +11 +11 +11 +12 +12 +12 +12 +12 +12 +13 +14 +14 +14 +14 +14 +14 +15 +15 +15 +15 +16 +16 +16 +16 +17 +17 +17 +17 +17 +17 +17 +17 +17 +17 +18 +18 +19 +19 +19 +19 +20 +21 +21 +11 +22 +22 +22 +22 +23 +23 +12 +12 +23 +24 +13 +13 +24 +14 +14 +14 +26 +26 +15 +15 +15 +15 +15 +15 +27 +28 +16 +28 +17 +17 +29 +17 +17 +31 +31 +31 +32 +32 +32 +20 +20 +20 +33 +21 +21 +21 +34 +21 +21 +22 +22 +22 +22 +23 +23 +23 +23 +37 +37 +24 +24 +38 +38 +25 +25 +25 +25 +25 +26 +40 +27 +27 +27 +28 +29 +29 +30 +31 +31 +32 +32 +32 +33 +48 +33 +35 +36 +36 +37 +37 +38 +38 +38 +38 +39 +39 diff --git a/code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt b/code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt new file mode 100644 index 0000000..a33d316 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt @@ -0,0 +1,265 @@ +1362583.9910693057 +1368831.604408819 +1379652.1078271447 +1344759.5722229565 +1340276.8586731872 +1379652.107881971 +1322837.554110796 +1352551.7392756396 +1339701.0338543507 +1362584.0916979294 +1339701.0395300123 +1374828.5861792357 +1347955.4897957896 +1363733.592998341 +1335717.4124800153 +1346601.695817219 +1360788.681755162 +1344691.7769586032 +1335717.4131651788 +1335512.7327418835 +1348402.9106360828 +1366344.737317081 +1296647.9804176851 +1374300.4637238383 +1357938.7317105941 +1277536.002656741 +1373812.8312587182 +1351704.9964012322 +1356646.2955254635 +1349981.8836545323 +1307708.4125983706 +1335717.4125872368 +1360253.2005560175 +1373558.6239179506 +1374243.0582977002 +1317092.217285832 +1350800.5436175542 +1367932.4524176777 +1379706.7282884163 +1345135.8084737228 +1376132.1524179578 +1362583.9907669092 +1339365.2987816618 +1348402.9115550483 +1362583.9979833392 +1345135.7360001898 +1372783.7855483014 +1349027.565936277 +1335717.412586369 +1356646.2986316376 +1340315.6228744588 +1376132.161557729 +1331327.5991103835 +1308275.5582810729 +1331327.5997245882 +1340276.8677203786 +1359439.864687074 +1369592.345253822 +1378432.5127051675 +1381163.1441029788 +1348402.9106581276 +1373068.3872681772 +1378432.5407046506 +1331327.5997311636 +1379703.7484740661 +1346601.7000833652 +1366984.0800125848 +1357311.2014750226 +1369548.906349429 +1361188.397906064 +1339465.0094809497 +1369592.3452874967 +1306940.7149774828 +1376702.6793940691 +1358069.4709751997 +1305664.8911264914 +1335722.8348261083 +1296055.4470313068 +1356986.1940510562 +1309313.1636238473 +1356951.4182329602 +1331327.5997224585 +1352551.7432855687 +1356986.1941483535 +1374483.3298512204 +1346601.7155253189 +1308673.9724689934 +1352649.1432702234 +1308275.5466505575 +1304918.759799173 +1312792.940714565 +1331327.5997342817 +1353630.888719814 +1340276.8650596603 +1339701.031342079 +1307944.92636299 +1371008.7548959267 +1340276.8679533976 +1322386.4199733993 +1335717.4125254313 +1332170.8399845264 +1353396.4324994646 +1356646.2979928444 +1310387.6990000664 +1376132.1606089184 +1342831.8988834198 +1373341.0802167777 +1381163.144101196 +1296645.300043584 +1376702.6793944226 +1379652.1078795753 +1308673.9707189358 +1344967.9835493388 +1356951.669076981 +1356646.298634027 +1356986.1909746362 +1357938.7303039823 +1348402.9069987284 +1330717.9358043147 +1308675.3270712243 +1354154.9149744601 +1356020.0116402505 +1328299.3790136604 +1308161.8545117676 +1342831.899031713 +1348402.9144979925 +1296055.4434313094 +1349027.5663866657 +1277536.0026025884 +1300605.2889247017 +1344759.5722075899 +1296055.4342117188 +1309962.4903085239 +1308161.8573815126 +1372827.7099393455 +1304918.759776275 +1374483.90218048 +1378428.926426545 +1381163.144099184 +1349080.1409372138 +1335610.7264061426 +1376132.1560968368 +1358007.2525931143 +1359490.6329020995 +1362584.0939065316 +1362583.9908608864 +1361188.3979109474 +1308127.3251806211 +1365672.0022731377 +1345549.4818548635 +1335512.732439096 +1356019.5663199683 +1374483.902180765 +1374483.9021807646 +1330930.6936562115 +1278062.169533693 +1373812.8412758282 +1335717.4123979004 +1345135.8517085079 +1345135.8509333425 +1361188.3980533269 +1355884.4808290086 +1370351.2776945743 +1307628.0815152926 +1359490.6328548614 +1296055.435527049 +1313238.5357204177 +1356646.2985906976 +1374723.9920187092 +1357223.09011171 +1353545.9930095894 +1349509.6669345535 +1369592.3452342348 +1330717.859591748 +1308519.1314675626 +1361186.526507754 +1360253.2005685042 +1363749.9224316769 +1345135.8517453098 +1358142.5586250138 +1335512.7328259032 +1352800.965444652 +1335665.9871575043 +1313234.4864617488 +1381163.144103303 +1359723.9760544787 +1363751.1733374237 +1340276.8677716414 +1362583.2373784995 +1362584.093943659 +1335434.364098705 +1348860.8907157574 +1372783.7855482902 +1308517.8822077762 +1347832.774692147 +1354152.884414794 +1328344.5896396334 +1340276.8642076855 +1369548.9063399495 +1359109.0833665219 +1376132.1616149908 +1365358.7611404862 +1379705.2268915488 +1348402.9079764723 +1370222.9181631145 +1369875.4691425462 +1346601.6966592413 +1302164.0433535448 +1319810.7159645427 +1335722.834074925 +1336257.4308167556 +1300668.9242296303 +1352551.7432855596 +1370351.2777888845 +1370351.2777925837 +1370905.9338693565 +1349027.566339158 +1344691.7769504313 +1354542.522207212 +1357938.7314193316 +1308675.3268688752 +1335512.7327980245 +1347439.3479093704 +1371218.1149587927 +1335665.9864231956 +1373812.8291282977 +1359101.2981277509 +1349509.6666609088 +1312801.0151221245 +1331327.599735453 +1309095.4352934554 +1296055.4315687553 +1371008.7548962769 +1359490.6327673958 +1357311.2013660637 +1373341.0803183152 +1332170.864688453 +1356019.566609583 +1312637.7332089352 +1344967.9835657103 +1332767.7624052288 +1356986.205009396 +1362583.921824933 +1317092.2174918712 +1307835.6377147462 +1371979.5373838528 +1369592.3452873116 +1359490.6330212913 +1360790.9283041768 +1356950.6519834676 +1261907.4534630217 +1369548.6616079696 +1302169.1008603508 +1352649.1858169632 +1319810.715889278 +1356646.2986586653 +1308275.5583254395 +1349027.566412133 +1354154.9128363493 +1296055.4470313822 +1307708.4136962541 +1331327.599702641 +1332767.625618448 +1308275.5580975376 +1360772.5826474125 diff --git a/code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt b/code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt new file mode 100644 index 0000000..538f9ee --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt @@ -0,0 +1,265 @@ +1418285.18998 +1429565.00592 +1438728.14729 +1408482.79976 +1389776.80898 +1438728.28364 +1381531.11554 +1413259.80994 +1396503.40913 +1418287.81558 +1396504.02558 +1430668.3203 +1409860.19286 +1417829.88468 +1380462.22821 +1406686.57846 +1417827.53945 +1401104.25152 +1380462.18716 +1386654.54185 +1399773.06331 +1424094.37554 +1330473.21557 +1430581.90466 +1423371.93937 +1307648.60149 +1432839.49113 +1401001.96711 +1404338.37688 +1398177.34782 +1349319.40144 +1380462.24473 +1406309.26112 +1438832.30852 +1433787.53749 +1360589.06191 +1406412.55098 +1432882.87362 +1440519.82583 +1401912.42663 +1434423.39065 +1418283.9392 +1395850.08936 +1399773.0642 +1418281.21573 +1401912.37935 +1432150.01959 +1395024.4308 +1380462.24405 +1404338.38842 +1387264.30465 +1434423.45514 +1386807.41054 +1362896.0818 +1386807.52405 +1389776.85411 +1415650.0235 +1430398.52498 +1442684.52717 +1441867.3101 +1399773.06337 +1437919.77277 +1442684.54864 +1386807.56985 +1440618.34443 +1406686.58124 +1423411.4641 +1411804.60086 +1422702.24285 +1413572.97023 +1383923.37309 +1430398.54683 +1361728.00102 +1434435.93582 +1418363.07077 +1345336.23833 +1386842.60653 +1330338.75445 +1415825.91413 +1352938.6813 +1408421.16055 +1386807.59635 +1413259.55165 +1415825.91419 +1431639.66668 +1406686.5873 +1351008.59119 +1400666.14392 +1362896.076 +1342263.3765 +1353195.64202 +1386807.56956 +1401977.91959 +1389776.90641 +1396505.03967 +1349786.46518 +1423181.56376 +1389776.98455 +1381083.80448 +1380462.22196 +1383037.68994 +1396267.81408 +1404338.38791 +1355200.71238 +1434423.44874 +1389903.43151 +1428997.09098 +1441867.31127 +1330570.97214 +1434435.93582 +1438728.23049 +1351008.14378 +1399513.51107 +1408421.6689 +1404338.39908 +1415825.9106 +1423371.92727 +1399773.05361 +1376544.12937 +1350832.65217 +1403059.52695 +1413679.68136 +1384207.24792 +1362756.00692 +1389903.43153 +1399773.06401 +1330338.7498 +1395024.3983 +1307648.57517 +1337556.03694 +1408482.79973 +1330338.73784 +1354325.80808 +1362756.00412 +1432182.25413 +1342263.37867 +1431640.22789 +1442680.60393 +1441867.31174 +1396685.74912 +1386486.42214 +1434423.42928 +1414135.68655 +1414410.69232 +1418284.10873 +1418283.95762 +1413572.96838 +1362642.70597 +1429774.47868 +1398330.72771 +1386654.53155 +1413696.94638 +1431640.22788 +1431640.22788 +1376934.16638 +1308453.04307 +1432839.50301 +1380462.22047 +1401912.45368 +1401912.45323 +1413572.96671 +1409730.61189 +1424730.99366 +1351668.26861 +1414410.69227 +1330338.7395 +1357915.87355 +1404338.39361 +1430333.50547 +1422667.04683 +1414023.4999 +1407937.64344 +1430398.67241 +1376543.98845 +1350342.41731 +1413559.63496 +1406309.28317 +1416968.138 +1401912.45386 +1423766.58727 +1386654.54357 +1413030.67081 +1392301.73893 +1357911.7424 +1441867.30994 +1414619.4289 +1417729.80297 +1389776.97204 +1418354.11209 +1418283.59935 +1392120.90128 +1403045.9237 +1432150.01959 +1350075.78141 +1407294.59359 +1403056.96205 +1380121.03049 +1389777.01768 +1422702.24284 +1415289.81126 +1434423.45243 +1435949.32473 +1440548.94447 +1399773.05624 +1426890.36049 +1425439.3995 +1406686.57923 +1344064.89012 +1362819.24895 +1386842.55299 +1392940.41845 +1335691.22185 +1413259.55185 +1424731.01502 +1424731.01664 +1425162.00259 +1395024.36609 +1401104.28201 +1412039.86208 +1423371.92901 +1350832.16802 +1386654.46718 +1405478.63718 +1429777.81938 +1392301.82631 +1432839.48804 +1414568.17819 +1407937.89312 +1342804.29678 +1386807.56854 +1352291.74623 +1330338.73439 +1423181.56461 +1414410.69218 +1411804.54522 +1428997.07951 +1383037.98673 +1413696.9467 +1347406.51175 +1399513.51115 +1382683.25119 +1415825.92532 +1418264.56965 +1360589.05768 +1349108.74455 +1426223.44359 +1430398.55108 +1414410.69242 +1417839.13924 +1408420.24187 +1284883.11244 +1422701.93062 +1343929.80815 +1400666.18835 +1362819.23588 +1404338.38624 +1362896.08188 +1395024.40483 +1403059.52425 +1330338.75446 +1349319.24417 +1386807.63987 +1382683.09876 +1362896.0821 +1418582.49584 diff --git a/code/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt b/code/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt new file mode 100644 index 0000000..2d92d5a --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt @@ -0,0 +1,265 @@ +13 +13 +14 +15 +15 +18 +18 +20 +20 +21 +21 +21 +22 +23 +25 +25 +26 +26 +27 +27 +28 +28 +28 +30 +29 +30 +30 +32 +32 +33 +33 +35 +35 +35 +35 +36 +36 +36 +36 +36 +37 +37 +38 +38 +41 +42 +43 +44 +44 +44 +45 +48 +49 +50 +51 +52 +56 +56 +61 +62 +67 +68 +70 +69 +73 +11 +75 +75 +76 +76 +77 +81 +10 +82 +84 +88 +13 +89 +11 +95 +19 +31 +33 +22 +98 +26 +21 +102 +20 +32 +34 +19 +106 +38 +17 +27 +47 +40 +22 +39 +29 +22 +35 +117 +38 +117 +19 +31 +33 +120 +26 +36 +31 +28 +41 +27 +36 +48 +127 +18 +131 +9 +135 +34 +139 +8 +77 +64 +38 +20 +20 +143 +15 +15 +147 +52 +46 +43 +66 +36 +12 +36 +157 +159 +28 +43 +89 +12 +11 +165 +40 +16 +95 +85 +15 +23 +21 +12 +108 +31 +43 +45 +40 +87 +109 +88 +12 +35 +30 +23 +24 +31 +23 +107 +50 +198 +54 +112 +32 +87 +40 +82 +44 +20 +63 +124 +122 +17 +43 +29 +36 +51 +78 +143 +16 +118 +15 +51 +221 +12 +34 +13 +72 +34 +35 +24 +25 +39 +80 +82 +35 +113 +36 +59 +48 +171 +31 +24 +20 +21 +23 +17 +25 +20 +52 +58 +97 +52 +44 +26 +112 +66 +35 +195 +83 +35 +19 +20 +44 +14 +128 +31 +28 +17 +17 +171 +42 +103 +34 +18 +28 +298 +93 +150 +130 +35 +49 +45 +106 +124 +36 +39 +113 +27 +108 diff --git a/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt b/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt new file mode 100644 index 0000000..7a65824 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt @@ -0,0 +1,197 @@ +1360697.4979221392 +1325392.557750303 +1337403.6072306037 +1357102.8434680034 +1357106.340548594 +1328461.1935975922 +1345485.4413696635 +1355984.2632063513 +1332167.876289066 +1337395.0799089517 +1349691.2999244453 +1331857.0754190236 +1356393.1549001073 +1356740.9011343003 +1361439.715285999 +1347860.1498785317 +1322423.7101522563 +1332167.862831315 +1360253.38002722 +1342355.077959357 +1339978.5632822847 +1327667.5809877336 +1322336.4106764647 +1355059.421300835 +1358223.9708585523 +1339588.6109347166 +1327994.326785932 +1360253.2131000676 +1381832.8806432036 +1377614.5837691582 +1360300.4849148798 +1366103.3933729238 +1366756.0245751003 +1377614.5837729468 +1331857.0607105752 +1327388.2947114953 +1358223.9696340435 +1339824.3300178025 +1360300.4875199706 +1339205.4912752665 +1346661.1191274025 +1326370.2817048766 +1377614.583635169 +1342355.0867001594 +1340776.422497636 +1361315.5310747542 +1325508.5422886105 +1361439.714769357 +1353390.3561408287 +1350694.2089037534 +1369511.543080296 +1340352.749541031 +1330505.948366011 +1350906.1895893505 +1352571.9405260887 +1352675.6644251791 +1360697.5116733112 +1360697.5108792318 +1347860.137394245 +1366756.0245377207 +1332161.401370964 +1357945.2338560233 +1332167.8818906026 +1328463.162609435 +1325533.7626994364 +1333745.4940620484 +1369511.542556281 +1337007.3112172033 +1346661.1064250048 +1337403.605239195 +1361439.7142021377 +1377614.5834668458 +1335765.0290944136 +1339588.769164261 +1332167.8100494538 +1371907.6407594886 +1346661.1197194331 +1360253.3794790865 +1352631.753670711 +1359011.6093781034 +1366103.3874679462 +1352675.6645057246 +1346661.0849727439 +1347860.1475825803 +1366234.129135986 +1367133.6598388054 +1346661.1184983023 +1333130.2709579985 +1366103.390877776 +1358125.4316808262 +1360245.146418646 +1356968.1798209306 +1351584.0135397783 +1357543.5814776549 +1339978.5631586278 +1352675.6645083309 +1328463.162586376 +1347860.149877009 +1353758.8986999386 +1357106.340548594 +1337007.284453487 +1328463.1057254917 +1377614.583636452 +1352571.8875349013 +1339978.5638397334 +1366103.393023547 +1360697.509107223 +1358223.9689809068 +1325533.7626993486 +1345472.8437236687 +1337006.0182735536 +1365661.9416566046 +1366102.5669849978 +1381832.8806513154 +1344199.2997295682 +1347860.1367176955 +1361103.930100265 +1356967.8722799043 +1352631.7536718035 +1360697.5064177804 +1339978.5633866119 +1371235.2284070011 +1353390.3560654577 +1352571.9382560921 +1346375.2271541858 +1358223.959513392 +1353998.9533920106 +1358223.9703349154 +1337526.0100503007 +1355059.4216977453 +1361255.7069932707 +1339205.489028424 +1370082.9035133854 +1359011.6110829865 +1353390.3559213704 +1361002.8503475313 +1349867.7053281697 +1330719.4148892558 +1360300.4848281546 +1325533.7634745494 +1339205.491283229 +1366234.1420883038 +1369254.2418874847 +1371907.6430394524 +1347860.1461717782 +1339978.5631592532 +1325508.5423884743 +1352675.6645093726 +1327667.5809889804 +1360675.7734532943 +1381832.6052697597 +1336697.419645219 +1365661.940470283 +1353390.3561406343 +1361507.159400287 +1333130.2605114903 +1353390.356140639 +1340352.74955698 +1339978.5631504077 +1371235.2284262958 +1358223.970961036 +1361002.823604691 +1338950.1693053835 +1322423.708968049 +1352112.9270151746 +1360689.3454230293 +1327667.5809877338 +1360689.345377819 +1337382.7407526267 +1360697.5091101786 +1356393.172581125 +1327203.4951603347 +1366103.366130307 +1340649.0772821628 +1331902.3757528195 +1355285.1374562953 +1347350.7823471923 +1346660.8582590823 +1358666.98023624 +1360692.5587543284 +1342231.0292472222 +1337042.2537679416 +1355990.392110185 +1325508.5422886226 +1358223.966699479 +1366103.21163724 +1348085.697066046 +1348085.5750287687 +1325508.5423030185 +1325877.3156747909 +1346660.7373850252 +1352339.9478521761 +1358223.970709385 +1345485.463048213 +1360683.4445943425 +1352675.6644589994 +1359011.6110838596 diff --git a/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt new file mode 100644 index 0000000..a2988a4 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt @@ -0,0 +1,197 @@ +1420213.25702 +1379111.98496 +1393685.76082 +1415461.77405 +1415465.00266 +1385786.23708 +1403785.7908 +1414315.07235 +1385112.97335 +1393677.7918 +1395764.84179 +1384740.66734 +1412295.55292 +1416685.414 +1415667.06384 +1400057.67366 +1374730.78294 +1385112.35178 +1419864.10081 +1400344.5553 +1390967.8569 +1382053.77361 +1371470.07337 +1410705.42406 +1405844.83464 +1395616.23704 +1379288.77195 +1419863.90969 +1434115.2303 +1431235.04337 +1416652.96311 +1419757.43255 +1420831.68358 +1431235.04249 +1384739.2277 +1383304.13857 +1405845.27773 +1396126.20993 +1416652.96436 +1392477.81758 +1402783.8955 +1377811.10065 +1431235.04072 +1400344.56377 +1398216.06118 +1415201.57276 +1379325.37852 +1415667.09869 +1415353.85368 +1402233.20397 +1422602.38884 +1392216.07423 +1385372.87732 +1407427.91259 +1408573.03866 +1401430.25557 +1420213.26304 +1420213.26168 +1400056.46679 +1420831.59818 +1385217.08999 +1414290.04229 +1385116.00403 +1385788.13337 +1379230.6254 +1384384.05682 +1422603.20019 +1392289.62792 +1402783.90859 +1393685.75938 +1415667.13633 +1431235.03386 +1389068.77135 +1395616.39161 +1385115.47083 +1430410.5053 +1402783.8216 +1419864.10107 +1401528.27678 +1412629.55911 +1419758.02746 +1401430.26813 +1402784.61694 +1400057.35834 +1420904.42264 +1419936.9348 +1402783.87909 +1383623.45786 +1419757.50695 +1416666.27269 +1419855.03577 +1416800.50824 +1409972.64679 +1414791.49474 +1390967.9918 +1401430.28477 +1385788.13338 +1400057.7075 +1409893.5084 +1415465.00266 +1392288.96888 +1385788.04948 +1431235.03578 +1408573.04358 +1390967.66028 +1419757.4682 +1420213.25898 +1405844.85674 +1379230.6254 +1397337.13334 +1392286.87612 +1422461.9947 +1419755.85016 +1434115.22767 +1395287.55086 +1400056.55048 +1413987.79697 +1416800.16502 +1401528.41087 +1420213.25692 +1390967.74297 +1429562.8992 +1415353.85352 +1408573.02054 +1411976.53719 +1405846.88707 +1407890.7347 +1405844.51331 +1381827.66667 +1410705.42449 +1418378.32876 +1392477.81735 +1422691.036 +1412629.4605 +1415353.85656 +1415235.32256 +1395902.16738 +1378218.94934 +1416652.96299 +1379230.62764 +1392477.81741 +1420903.91127 +1422327.90948 +1430410.59363 +1400057.46448 +1390968.00586 +1379325.37867 +1401430.28066 +1382053.77361 +1420190.10143 +1434114.93951 +1387909.65568 +1422462.0429 +1415353.85368 +1415697.75404 +1383624.19086 +1415353.85368 +1392216.13331 +1390968.00134 +1429562.89964 +1405844.98265 +1415235.25138 +1390192.22783 +1374730.78171 +1403303.28666 +1415272.48106 +1382053.77361 +1415272.3587 +1393665.16688 +1420213.25898 +1412297.85402 +1381847.97467 +1419757.27778 +1389672.35486 +1384823.76503 +1410574.19523 +1405814.51075 +1402783.96416 +1416907.32954 +1420207.93878 +1394110.33808 +1387691.61454 +1414321.51268 +1379325.37852 +1405845.65749 +1419756.352 +1400470.30944 +1400467.95358 +1379325.3786 +1379837.06722 +1402784.69426 +1403702.40243 +1405844.73776 +1403785.98836 +1420198.22112 +1401430.27425 +1412629.5347 diff --git a/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt b/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt new file mode 100644 index 0000000..f5948f5 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt @@ -0,0 +1,197 @@ +8 +9 +10 +10 +10 +11 +10 +11 +11 +12 +12 +13 +13 +14 +14 +13 +14 +13 +14 +14 +15 +15 +14 +15 +15 +16 +16 +17 +17 +17 +18 +18 +18 +19 +20 +20 +20 +20 +21 +21 +21 +22 +22 +22 +21 +23 +23 +22 +23 +23 +24 +23 +8 +25 +25 +27 +9 +9 +27 +28 +10 +10 +10 +10 +29 +28 +11 +11 +11 +11 +30 +12 +12 +12 +12 +31 +12 +12 +32 +32 +13 +32 +13 +32 +33 +14 +14 +14 +14 +14 +14 +14 +34 +14 +34 +34 +34 +15 +15 +15 +15 +15 +15 +15 +16 +16 +16 +16 +16 +16 +16 +37 +17 +36 +37 +17 +17 +18 +18 +18 +39 +39 +39 +18 +40 +19 +40 +20 +21 +21 +21 +43 +21 +22 +22 +23 +23 +23 +48 +25 +50 +26 +47 +51 +28 +29 +30 +31 +33 +33 +34 +34 +34 +35 +35 +62 +63 +38 +38 +40 +40 +42 +42 +42 +43 +71 +44 +44 +13 +10 +75 +12 +15 +48 +14 +16 +49 +13 +17 +12 +50 +16 +9 +24 +17 +16 +16 +23 +23 +19 +13 +10 +16 +16 +17 +56 +56 diff --git a/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt new file mode 100644 index 0000000..cd9bdac --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt @@ -0,0 +1,299 @@ +1433152.0133785699 +1457312.3387948677 +1420710.453256691 +1420652.6224728946 +1458847.1001493514 +1451301.6766495958 +1423244.2219077495 +1435135.265671975 +1443455.053022247 +1454866.3763408097 +1436677.4550781138 +1434367.6752352915 +1428321.5338673473 +1433997.20217151 +1448650.8603823823 +1438906.1191533213 +1458847.1001384396 +1436459.975852071 +1453088.3003403433 +1457613.8197126265 +1458847.0997826387 +1451360.9120957872 +1422766.3273967826 +1449654.6788483553 +1410791.5305732607 +1433987.1723795978 +1417619.9093756594 +1441473.2282588645 +1437281.314978217 +1430303.9890785557 +1453087.8831493605 +1422250.1417720625 +1431548.1547783932 +1451361.9287617807 +1451284.478590409 +1448651.2733189885 +1448654.0996016753 +1419258.3813533962 +1424689.3843999617 +1454865.426389201 +1434771.6145925964 +1451301.6587427964 +1434904.1535264677 +1418835.0992579209 +1455727.1930479303 +1434771.6011432768 +1421259.6442983004 +1419258.3812450655 +1443454.8250544919 +1437492.628432205 +1462698.4688608998 +1422766.3272096578 +1419258.3812962046 +1429145.654965399 +1451351.741471383 +1443454.2649740963 +1422057.0137308235 +1429158.170573557 +1449422.1903894613 +1425566.41820298 +1425566.4181938476 +1428082.9403140743 +1433987.1723904447 +1417006.9630234346 +1426722.364176514 +1410028.1570853156 +1429145.6549608593 +1408357.1222873528 +1424709.7888727468 +1461430.8726237197 +1449657.1085374453 +1418835.0990289256 +1449422.1812851236 +1455709.9257015004 +1422145.539456382 +1449734.3756069397 +1449422.1891681845 +1448267.929617417 +1423427.097060722 +1448579.4992985493 +1449422.1899475816 +1438061.7355454045 +1462698.332849307 +1462697.4373005682 +1429454.7575536894 +1425164.351447112 +1422089.6875249033 +1429158.170573652 +1461430.872776013 +1435135.4002090932 +1459114.3257579878 +1422766.3271931687 +1448654.0583171363 +1434904.8057656398 +1453088.3005441483 +1418265.5239697949 +1435207.0133007956 +1421259.5937078674 +1425477.2933163878 +1433987.1723904833 +1426722.364179158 +1449899.1534448154 +1417892.5627486696 +1429454.7575510486 +1422145.5379796668 +1422145.54190598 +1434904.676319488 +1439528.0496727023 +1461430.8728240773 +1453088.298807655 +1434904.8044415726 +1456502.157565291 +1418768.422910273 +1410028.1570866453 +1422145.1241761663 +1457601.053075235 +1434771.5325569047 +1443455.10509133 +1434435.4634723368 +1429541.278038617 +1422315.8127110922 +1426068.0650564972 +1435135.264935284 +1434771.6144504782 +1429541.2780385679 +1430303.9891077157 +1409592.3760456224 +1462698.4692689825 +1451199.6283587655 +1418837.3040995284 +1450713.7807526784 +1458847.0991194074 +1422315.8155888368 +1434916.3341846077 +1443454.9177177649 +1425386.9553245367 +1435743.5515394001 +1462698.0096594545 +1434916.3406701495 +1443455.1019274779 +1436677.4550781788 +1430591.7160009325 +1451301.6766562716 +1459114.3258502458 +1418835.050710014 +1457965.8054942712 +1461430.8728402653 +1430303.9882321025 +1425566.4182029408 +1455727.193043531 +1428321.533871122 +1429495.402519531 +1419258.3813096546 +1448294.3040235427 +1430591.716000915 +1435739.0466814204 +1462698.4111870783 +1435467.356092859 +1433660.8607424265 +1435739.045141302 +1430303.9839807646 +1443455.1050915408 +1448651.263345405 +1458847.0992357912 +1430591.7160007025 +1429407.4117292229 +1433663.2247285065 +1434901.1852716603 +1417499.9351051045 +1462697.9547662477 +1435207.0132874702 +1427784.234911465 +1441514.9786201366 +1422089.6941322645 +1450058.2295442997 +1447568.100914752 +1443454.9180638404 +1430250.0070137873 +1418835.0990685069 +1451360.8952830986 +1439155.7436854718 +1433987.1723857762 +1434670.3688824242 +1462698.4588334055 +1450235.8611762307 +1421555.673217181 +1403564.819559103 +1406782.866701983 +1436677.4550852182 +1437281.314977237 +1427831.257162726 +1451361.904158903 +1462698.469289606 +1457613.819759776 +1448021.9864111473 +1430591.7160008575 +1422761.193476551 +1437717.5684922072 +1447568.1038948528 +1403564.8249876332 +1426264.8790290859 +1454951.3163803231 +1428082.9403217302 +1450244.4391036446 +1454866.3800629806 +1449895.264704692 +1458847.0998686464 +1422315.8148186274 +1458847.0995120027 +1422145.537267708 +1462696.472397849 +1430242.9153716539 +1451351.741472903 +1462698.1927958878 +1434904.8057502403 +1421094.5112158093 +1454866.3928662648 +1434962.9840036365 +1427831.258893084 +1424689.3856181926 +1431755.1452480333 +1436677.4550854142 +1449422.1886899828 +1427831.2588930726 +1418252.6444606897 +1448361.5397675394 +1426739.971162971 +1424808.5390913046 +1423919.661051554 +1437260.0083063482 +1433405.88734072 +1437714.8577118677 +1439529.220477684 +1425374.8204025102 +1417007.4477336917 +1422766.3272112038 +1436724.8910496407 +1417471.5376307084 +1457613.8196408849 +1429454.7575530426 +1403564.7810324538 +1428333.103936409 +1424531.6747436835 +1451361.9294410134 +1418580.28834387 +1453088.1361195536 +1462698.4009724904 +1405213.7276787548 +1457862.2395777998 +1443118.708253018 +1430250.0070139016 +1430591.7160010436 +1438906.1169642066 +1453044.2406730994 +1433404.7842221512 +1448654.0928651618 +1444062.4747272667 +1434152.2575964374 +1417744.0570846337 +1438061.7361327726 +1430248.240750664 +1439155.744697904 +1455727.1930480748 +1430248.2407522905 +1446456.0387868593 +1456577.789241736 +1441532.1349214949 +1453044.2155987287 +1428421.242884572 +1439155.734225838 +1421259.6491841036 +1451301.6766438251 +1427784.3476369116 +1426634.6465159028 +1441405.8289761702 +1449899.148102365 +1449422.1901644187 +1425444.831810791 +1422761.1935051063 +1430303.9886255774 +1433439.0962713594 +1422416.3509426839 +1451301.686521399 +1433987.1723903792 +1449937.130298824 +1422766.327210159 +1441117.795632378 +1442769.4707000295 +1448467.8887237217 +1422145.541725592 +1427850.6457632834 +1439529.2200585846 +1435466.5491825223 +1449422.1860983665 +1443455.1050146504 +1421662.8779355285 +1461430.8727980321 +1417687.1237438165 +1431324.8553532446 diff --git a/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt new file mode 100644 index 0000000..b323d01 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt @@ -0,0 +1,299 @@ +1499631.94987 +1520340.88412 +1491271.54299 +1491058.39721 +1522937.89254 +1525014.29534 +1490418.86583 +1502617.99185 +1510822.85874 +1517409.2787 +1497018.26217 +1509005.91822 +1485585.24632 +1501501.60212 +1519885.07503 +1505727.64678 +1522937.86564 +1502810.84779 +1524216.17661 +1523314.35979 +1522937.89971 +1514853.95417 +1478417.12678 +1519400.70184 +1473627.34312 +1490861.76124 +1474841.48798 +1513159.17564 +1508894.55222 +1488974.62534 +1524215.79993 +1477508.82627 +1492913.94177 +1514770.7234 +1524996.3923 +1519885.34461 +1519889.6208 +1472141.11985 +1492467.70748 +1517406.49123 +1502101.98685 +1525014.2736 +1502323.65544 +1483653.45573 +1519340.28644 +1502102.00082 +1476056.50414 +1472141.11477 +1510823.83501 +1505653.07394 +1525220.61699 +1478417.20894 +1489305.35575 +1472141.12385 +1514929.89913 +1510822.06851 +1478463.01383 +1485560.21971 +1512786.98545 +1486028.55204 +1486028.55198 +1487115.18352 +1490861.76365 +1476086.79065 +1484660.46811 +1464699.7977 +1489305.3558 +1460831.2526 +1492261.15634 +1522153.04343 +1519426.68631 +1483653.4675 +1512787.87696 +1519604.60399 +1487531.60088 +1519696.0676 +1512787.05917 +1513192.53639 +1476520.25825 +1520236.32201 +1512786.74967 +1507091.19762 +1525220.40394 +1525219.57366 +1486445.36269 +1485540.04343 +1486615.88477 +1485560.21977 +1522153.04257 +1502617.86598 +1527258.98838 +1478417.06221 +1519889.61799 +1502324.27898 +1524216.17679 +1475411.95578 +1501642.92582 +1476057.01384 +1487755.47885 +1490861.76392 +1484660.46885 +1521342.07403 +1481821.59862 +1486445.36852 +1487531.59919 +1487531.60369 +1502324.21023 +1498339.50412 +1522153.05361 +1524216.17462 +1502324.44254 +1519172.76068 +1483638.58026 +1464699.78593 +1487531.12513 +1523302.05482 +1502102.11781 +1510822.91654 +1501023.05147 +1485906.82754 +1479179.45044 +1494876.38447 +1502617.71446 +1502101.86498 +1485906.82716 +1488974.62559 +1461440.572 +1525220.61731 +1521293.7545 +1474619.84431 +1511414.03505 +1522937.92675 +1479179.45003 +1491896.28554 +1510822.72595 +1493655.75318 +1495717.24701 +1525220.17644 +1491896.29899 +1510822.91275 +1497018.27499 +1501805.67291 +1525014.29535 +1527258.77454 +1483653.45401 +1517635.5557 +1522153.08868 +1488974.62183 +1486028.55204 +1519340.30953 +1485585.24536 +1487980.96238 +1472141.12062 +1519891.81266 +1501805.67291 +1503907.83305 +1525220.56117 +1503852.43339 +1501177.36411 +1503907.8314 +1488974.66519 +1510822.91654 +1519885.28104 +1522937.746 +1501805.67291 +1485692.3551 +1501079.94809 +1502320.05473 +1477085.54792 +1525219.95637 +1501642.92112 +1485861.30943 +1512165.66103 +1486615.89242 +1513706.2249 +1514756.77774 +1510822.70848 +1494037.43885 +1483653.45573 +1514853.93642 +1496008.07309 +1490861.76118 +1491140.50388 +1525220.60731 +1519578.44708 +1476859.21102 +1457956.00055 +1480441.12498 +1497018.26357 +1508894.55221 +1485504.7782 +1514770.68809 +1525220.61731 +1523314.35988 +1519508.41975 +1501805.67291 +1480767.62352 +1490398.19036 +1514756.88102 +1457959.83534 +1484215.52938 +1518494.94361 +1487115.20357 +1519574.60264 +1517406.49584 +1521356.51514 +1522937.79699 +1479179.43091 +1522937.76672 +1487531.59838 +1525218.08795 +1493951.58572 +1514929.90168 +1525220.35214 +1502324.18001 +1489167.57116 +1517407.94577 +1491868.18754 +1485504.7795 +1492467.76606 +1488002.25351 +1497018.26431 +1512787.0857 +1485504.7795 +1486147.0918 +1519947.70872 +1494099.65087 +1495509.94253 +1480026.57817 +1504347.64178 +1494846.55274 +1508189.06387 +1498419.80433 +1493671.75465 +1476174.52556 +1478417.14079 +1504195.74572 +1479194.99363 +1523314.35967 +1486445.36211 +1457972.20742 +1486337.63217 +1486146.103 +1514770.71791 +1475538.6044 +1524216.01779 +1525220.55222 +1454597.53551 +1528848.32765 +1513691.6867 +1494037.43882 +1501805.67291 +1505727.62418 +1524451.81361 +1494841.75016 +1519889.71218 +1513484.87773 +1492004.82709 +1482722.22527 +1507091.19822 +1493885.81585 +1496002.98766 +1519340.28538 +1493885.8341 +1517215.42747 +1517370.45709 +1513329.04457 +1524451.67701 +1485394.0843 +1496019.71163 +1476058.04597 +1525014.29536 +1485861.43282 +1484766.33801 +1511533.78307 +1521342.08349 +1512787.00354 +1494618.52233 +1480767.6254 +1488974.62856 +1492891.07858 +1486974.7778 +1525014.30345 +1490861.76655 +1520964.56298 +1478417.12549 +1499832.26451 +1511263.49496 +1510762.37145 +1487531.60348 +1485519.74454 +1498421.88551 +1503851.59191 +1512787.25857 +1510822.91674 +1472597.79058 +1522153.05398 +1481481.14867 +1490889.65804 diff --git a/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt new file mode 100644 index 0000000..e996ca7 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt @@ -0,0 +1,299 @@ +11 +12 +12 +12 +13 +13 +14 +14 +14 +16 +16 +16 +17 +18 +18 +18 +30 +19 +19 +21 +21 +21 +21 +22 +22 +22 +23 +24 +25 +25 +26 +26 +26 +27 +26 +28 +29 +29 +29 +29 +30 +30 +30 +31 +32 +32 +32 +33 +33 +35 +35 +36 +36 +36 +37 +38 +40 +41 +42 +42 +42 +43 +45 +45 +50 +50 +52 +53 +55 +55 +55 +58 +75 +59 +59 +66 +67 +69 +69 +71 +76 +78 +12 +11 +26 +16 +12 +86 +19 +25 +19 +31 +15 +21 +17 +115 +20 +20 +36 +31 +25 +104 +33 +17 +105 +107 +20 +30 +14 +28 +27 +108 +30 +39 +113 +12 +50 +26 +37 +52 +37 +21 +34 +37 +54 +51 +120 +50 +121 +58 +36 +31 +30 +37 +27 +126 +128 +27 +37 +26 +41 +60 +10 +19 +30 +31 +37 +54 +62 +56 +43 +35 +29 +29 +83 +89 +18 +75 +71 +82 +41 +41 +29 +68 +61 +36 +22 +13 +169 +11 +33 +174 +13 +29 +19 +11 +22 +46 +17 +104 +122 +24 +28 +28 +22 +10 +188 +42 +33 +28 +192 +57 +23 +10 +23 +54 +73 +12 +12 +127 +50 +136 +26 +137 +13 +29 +37 +13 +40 +87 +12 +43 +26 +27 +19 +27 +38 +79 +154 +51 +66 +36 +63 +156 +231 +82 +25 +82 +20 +24 +62 +83 +78 +83 +38 +63 +45 +22 +12 +24 +84 +249 +89 +86 +17 +38 +40 +256 +27 +31 +158 +93 +26 +22 +97 +25 +49 +184 +41 +75 +17 +136 +63 +42 +35 +115 +19 +104 +81 +114 +26 +28 +134 +52 +16 +109 +76 +12 +33 +34 +23 +27 +21 +49 +127 +29 +72 +105 +49 +141 +42 +41 +66 +43 +19 +25 +21 +157 +55 diff --git a/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt new file mode 100644 index 0000000..637c5a1 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt @@ -0,0 +1,209 @@ +1432810.6463987029 +1446586.5700866906 +1438501.7355034314 +1423001.9811574516 +1422712.0996911605 +1435054.3732873828 +1423001.9829549578 +1449671.4200486818 +1437412.8089826226 +1448436.574748877 +1422753.7633419982 +1449671.4209734714 +1455791.7484520993 +1434725.4158746742 +1432815.7704125836 +1452444.9750017903 +1423001.9811697672 +1455791.7484170839 +1448436.5811933067 +1454560.7353765876 +1455791.3831372352 +1429720.613660974 +1450590.014965654 +1422696.3399759345 +1441041.401177596 +1456394.065104321 +1422712.1033064378 +1429235.3815648889 +1461158.1867724431 +1446452.5166008298 +1446452.5166113467 +1441041.4013269248 +1447530.9361530584 +1449571.9109831825 +1421645.5760253132 +1439403.6564822856 +1451904.388984944 +1422714.7134456048 +1427759.0898227037 +1455791.7485288328 +1454560.7336408796 +1432433.1196671792 +1435460.1895501972 +1450808.6880858003 +1437213.6628909868 +1451106.2657308064 +1451508.4388039617 +1450808.7075090478 +1438801.0380984796 +1447560.2478808453 +1432244.8118775396 +1447162.397233155 +1449177.9560559702 +1432569.6407030022 +1439187.2586591304 +1446600.6724328324 +1455791.7484185607 +1435053.9042850574 +1448201.971105361 +1441028.6697681977 +1444672.421172412 +1438501.6427073227 +1421645.5769635665 +1436806.0962893604 +1414499.530811268 +1453265.9726028794 +1439187.2586596492 +1450773.210038622 +1423001.9811572814 +1455791.7484470184 +1454788.4992371828 +1435053.311587839 +1455791.6342283492 +1456394.0653751902 +1447560.2488657143 +1432815.770383117 +1454560.36852632 +1443253.7348212765 +1426285.894163199 +1440939.7181564136 +1453265.972301912 +1432153.864211825 +1425349.847826164 +1432433.1214227313 +1454560.7402896013 +1437136.2837376916 +1423001.9811574994 +1450663.6941321362 +1436806.0953251452 +1449671.4172674094 +1448436.5605065646 +1442359.6270795513 +1430438.9791754382 +1432244.8143277685 +1433350.5046842813 +1432433.1193260301 +1449229.9822397004 +1449229.99087454 +1440464.4865391061 +1437449.9396499272 +1451106.2657308166 +1451106.265730811 +1432433.1204404288 +1426665.4123185354 +1441041.4011789472 +1441041.3996384272 +1425127.5565631827 +1432433.1215365878 +1440464.4865699902 +1436806.1028342152 +1441041.3964965995 +1444672.4211700344 +1427099.5161811027 +1431589.6058372855 +1425349.847797353 +1422714.7134455342 +1425827.4270055098 +1430252.4096274443 +1440939.7164314946 +1450803.7389406925 +1448219.1481937438 +1448202.1429067557 +1419131.8616096685 +1432432.8199600957 +1446452.5166084035 +1461158.1732222002 +1446452.5166110266 +1448218.8216812522 +1455791.7483870594 +1449177.974137062 +1445273.8135442985 +1439799.0868071094 +1431589.6222717103 +1421817.3974088042 +1441104.7940900684 +1435885.98889007 +1430591.871505459 +1449177.9862213165 +1443835.6234381555 +1447560.2488416883 +1439403.6651753145 +1448436.5626162158 +1435949.6366833071 +1437102.3125766732 +1430438.9785476157 +1431589.63086301 +1453265.9726145533 +1427759.089862797 +1449571.858571655 +1447547.772565217 +1419131.8591149095 +1440562.054236765 +1440939.7178159843 +1448318.6566141874 +1458236.7617019794 +1448219.166288159 +1450773.8103690858 +1444538.354855357 +1446170.7592609818 +1454788.4991001175 +1440939.7176776687 +1451081.392919506 +1433350.5105044835 +1450590.014966477 +1420030.851073455 +1454788.4961819588 +1432569.6405964722 +1442179.324106583 +1448219.148221792 +1423001.9811574114 +1454365.3542027748 +1438501.6535225199 +1423001.2632008207 +1423001.981157406 +1447545.295128756 +1448318.5285678646 +1429363.7470961208 +1427099.2610849203 +1430621.0962146993 +1455791.7483313556 +1439403.5186891877 +1440281.9927002478 +1422712.0996873733 +1444672.4211559894 +1455791.7483959706 +1422971.0023761457 +1437213.6629697315 +1420030.8510704816 +1432815.7697499713 +1441041.3957393244 +1449177.9703394903 +1449126.0025580467 +1430541.5533626147 +1442359.6271368752 +1430243.8765612144 +1435885.9888405972 +1448202.1433214087 +1447261.9573135132 +1454560.7341370436 +1443671.7282737605 +1444155.1773885335 +1432815.770411984 +1448436.565820031 +1449126.002558847 +1445631.8698775957 +1443835.6232349132 +1430243.160030275 +1447162.1898491743 +1449571.914292711 diff --git a/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt new file mode 100644 index 0000000..1d24003 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt @@ -0,0 +1,209 @@ +1501497.11453 +1511561.76802 +1510329.47752 +1490953.43203 +1490452.66552 +1499507.5135 +1490953.43392 +1516156.37194 +1504092.37762 +1513232.05094 +1490620.80846 +1516156.27352 +1524497.66983 +1499417.04075 +1501502.62219 +1515226.09905 +1490953.43204 +1524497.66979 +1513232.03888 +1518180.51303 +1524497.28355 +1493604.46942 +1516405.61541 +1490520.998 +1506277.26515 +1521709.13258 +1490452.66941 +1492324.50377 +1529512.45956 +1512772.59001 +1512772.5907 +1506277.25566 +1509584.30436 +1518370.2834 +1485020.94535 +1506292.28843 +1519892.99638 +1486146.26125 +1491429.59833 +1524497.66992 +1518179.99864 +1497567.90365 +1499972.42082 +1518542.3654 +1502192.7199 +1516774.18071 +1517799.92523 +1518543.34678 +1504730.13045 +1515049.00148 +1495014.72693 +1512787.55405 +1512817.10823 +1495410.4932 +1504147.60437 +1513077.50661 +1524497.66979 +1499507.06888 +1516674.40185 +1506263.78474 +1509554.83416 +1510329.39234 +1485020.94614 +1497693.20727 +1475588.40352 +1515962.5127 +1504147.6052 +1516193.69642 +1490953.43203 +1524497.66982 +1523775.66766 +1499506.39452 +1524497.54151 +1521709.13825 +1515048.99185 +1501502.62218 +1518180.40623 +1505160.56538 +1489166.92539 +1507777.33172 +1515962.51238 +1494478.43782 +1489159.9567 +1497567.95421 +1518180.53991 +1504782.31716 +1490953.43203 +1513660.07049 +1497693.20321 +1516156.70466 +1513232.03968 +1510232.39455 +1494188.69957 +1495014.50515 +1494339.10056 +1497567.89187 +1517956.70927 +1517957.40193 +1507327.11665 +1498011.76151 +1516774.1803 +1516774.18089 +1497567.84885 +1489632.74345 +1506277.26518 +1506277.40099 +1501947.56499 +1497567.86974 +1507327.12182 +1497693.2271 +1506277.55405 +1509554.83081 +1491736.89486 +1495611.36581 +1489161.39096 +1486146.26125 +1488911.44638 +1493735.8787 +1507777.67417 +1518258.38246 +1507997.10642 +1516674.54705 +1481853.39388 +1497567.0368 +1512772.59153 +1529512.52545 +1512772.59064 +1507996.71905 +1524497.66976 +1512817.17096 +1510055.36208 +1504690.67326 +1495610.92554 +1481516.75481 +1508266.04653 +1504443.46179 +1497850.38052 +1512817.1449 +1512368.30434 +1515048.95779 +1506291.53642 +1513232.04194 +1507696.58637 +1500355.99809 +1494188.67447 +1495610.79342 +1515962.51273 +1491429.4469 +1518371.02294 +1510505.89045 +1481853.44275 +1504920.1877 +1507777.94971 +1515866.87791 +1527437.17222 +1507997.13344 +1516194.44858 +1506680.57219 +1513234.19109 +1523775.28056 +1507777.91374 +1516470.04604 +1494339.10706 +1516405.62917 +1482357.32116 +1523775.28172 +1495410.52672 +1506859.18452 +1507997.10645 +1490953.43203 +1521529.81841 +1510329.42942 +1490952.50998 +1490953.43203 +1510673.91988 +1515865.90441 +1498246.41365 +1490149.02886 +1497466.10685 +1524497.66971 +1506290.16749 +1505526.55125 +1490452.66552 +1509554.83101 +1524497.66977 +1490917.09777 +1502192.71999 +1482357.32436 +1501502.62245 +1506277.16868 +1512817.12422 +1512018.42706 +1498210.51667 +1510232.57392 +1497218.24475 +1504443.46198 +1516674.54747 +1512580.46268 +1518180.59855 +1507967.53211 +1506401.19445 +1501502.62223 +1513232.04554 +1512018.42711 +1509018.7781 +1512368.30304 +1497217.46338 +1512787.33697 +1518370.24858 diff --git a/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt new file mode 100644 index 0000000..d7b9725 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt @@ -0,0 +1,209 @@ +8 +9 +9 +9 +9 +9 +10 +11 +11 +11 +11 +12 +12 +12 +12 +13 +13 +13 +13 +13 +14 +14 +14 +14 +14 +15 +14 +15 +16 +16 +16 +16 +17 +17 +16 +17 +18 +18 +18 +19 +19 +19 +19 +20 +21 +21 +21 +22 +22 +22 +22 +22 +24 +24 +24 +24 +24 +8 +8 +8 +26 +8 +26 +26 +26 +26 +27 +9 +9 +9 +28 +10 +10 +29 +29 +11 +11 +30 +11 +11 +30 +31 +12 +12 +12 +12 +12 +13 +13 +13 +13 +13 +32 +13 +13 +13 +14 +14 +34 +14 +14 +34 +14 +34 +14 +14 +15 +15 +35 +15 +15 +15 +36 +16 +16 +16 +16 +17 +17 +17 +17 +17 +17 +17 +18 +18 +18 +18 +18 +18 +19 +19 +19 +41 +20 +20 +20 +21 +21 +21 +21 +22 +22 +44 +22 +23 +46 +46 +24 +24 +24 +48 +26 +26 +26 +27 +28 +28 +29 +30 +30 +30 +30 +32 +32 +33 +33 +35 +66 +9 +11 +14 +9 +9 +10 +17 +13 +78 +14 +16 +14 +17 +10 +15 +14 +12 +9 +51 +23 +10 +24 +24 +24 +19 +19 +16 +17 +22 +18 +20 +54 +13 +13 +89 +89 +12 +26 +23 +17 diff --git a/code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..bc76990 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt @@ -0,0 +1,349 @@ +1379536.5592981752 +1379765.2608072644 +1397938.8797979017 +1411117.855756931 +1379536.430631768 +1409165.0854669297 +1406335.5184109863 +1370002.7984748653 +1415100.1565371181 +1412658.3964548437 +1405487.1268447833 +1397938.8798638494 +1397938.8798065246 +1413542.8630304653 +1407376.6429945072 +1371131.8604726996 +1368204.0893103306 +1395267.7997790559 +1414107.8615015307 +1370002.2291119169 +1413542.275000528 +1412122.3805908093 +1413345.4626729062 +1409853.438007857 +1405885.1770738084 +1372971.1437431856 +1409448.4004172506 +1412122.3819118675 +1403687.1069396967 +1411752.7277575014 +1414107.8617809305 +1412122.3814945593 +1379759.550380254 +1397080.0835375644 +1389061.992052381 +1414107.8614597786 +1413345.4632131208 +1411932.1831163394 +1400362.0355403982 +1412658.3947425948 +1412122.3818398179 +1374987.0671946758 +1420356.245794297 +1403324.2854259792 +1412122.3815009776 +1394695.946689145 +1376394.7947754466 +1412122.381803338 +1424118.8420980994 +1402439.4618287322 +1379983.7882861674 +1405486.812327744 +1425930.1078157115 +1385999.9176042387 +1403252.9094012694 +1415100.1567194841 +1395055.2021068935 +1412011.7169438705 +1403687.1127655646 +1402586.7453691524 +1399819.567288239 +1397061.4793650277 +1415467.9616191573 +1400603.3305803263 +1412755.1468074943 +1402888.068896089 +1396925.020068688 +1415467.9954887095 +1409853.4526273739 +1415467.0394078586 +1428351.7311277087 +1428351.7311276933 +1420522.2640727593 +1414107.8613941094 +1415100.1566390283 +1397080.084616096 +1402449.6918931194 +1420586.429976591 +1412755.146999238 +1409165.087081326 +1370001.2683715879 +1400568.9176562915 +1402439.4617441075 +1402449.69212871 +1412011.716115445 +1412755.1469043905 +1394224.1378454366 +1415467.9915382082 +1406833.2614175149 +1403252.9415373967 +1403324.2852115105 +1402730.6440541686 +1428351.7310748054 +1374277.4460741335 +1395267.7864695012 +1400603.330591935 +1413345.4643854676 +1414107.8618401426 +1390708.3658198677 +1403571.9162646849 +1397938.879821814 +1379863.2960989543 +1414107.8618003034 +1412122.3814971172 +1378800.7300379758 +1408961.7761863524 +1413345.4645835662 +1412233.376393429 +1403548.033804423 +1404595.0800229942 +1417335.0034783175 +1405878.9516814891 +1417251.4610529745 +1420352.8555426025 +1402439.4578824968 +1371131.7968505432 +1399824.916127376 +1374328.552156467 +1404979.1696340102 +1380036.8658726255 +1396925.0194923987 +1397080.0846164022 +1395704.667321259 +1390708.3658931481 +1379983.7882871365 +1417251.4624475169 +1394224.1374854122 +1412658.4100249324 +1395826.4613085906 +1404375.7248960752 +1411422.6588646064 +1371201.8635115982 +1415100.1567748783 +1397938.879531125 +1402439.462816348 +1371590.9117915656 +1399228.2088537146 +1409719.68510719 +1412122.372574882 +1397938.8798183748 +1392644.9665479476 +1378800.728649049 +1387592.4588245843 +1387080.9830517732 +1399824.8888702265 +1403214.1196924585 +1397252.6388101534 +1409853.4460125084 +1412122.3804426307 +1398886.137489468 +1379759.5521106503 +1374986.9494938948 +1402586.7453816223 +1402233.97893408 +1417251.4624527523 +1404794.2743578695 +1400362.035590315 +1389826.2490415561 +1415100.1567975548 +1397080.0846102682 +1379536.3664142361 +1409719.681684854 +1400568.9179373076 +1400774.4195947007 +1404597.1734540598 +1376731.0403681577 +1380036.8653286335 +1420356.2457782514 +1397938.8797596553 +1402449.6920932 +1428351.7311280384 +1386869.063857726 +1380036.8383222697 +1403245.57431198 +1412237.976935622 +1411753.0482238214 +1412658.4096577603 +1412755.1468639649 +1397938.8798632761 +1369992.508498565 +1411422.6588613002 +1410099.1837654528 +1409165.0877855108 +1397812.0465389087 +1407040.6372287336 +1411303.2208971682 +1403548.0683050267 +1405690.306903698 +1415467.919982783 +1402888.1039733482 +1408053.4477945785 +1382193.1392953717 +1380444.685159038 +1397938.879813167 +1412122.3819822255 +1421615.0560105764 +1404732.5476746582 +1409165.0878329477 +1408006.4726389747 +1415467.9959646906 +1387144.687329619 +1403304.7997555265 +1370000.0744301376 +1428351.7310972393 +1420525.288101638 +1392273.0555517464 +1376394.7945755292 +1385999.9052028463 +1402449.692060624 +1425431.0201947617 +1405487.1147749184 +1379863.1971262845 +1399824.8677706262 +1411422.6588629987 +1407499.3033803445 +1420525.2881016398 +1378278.6814843833 +1413167.6591799308 +1414107.8618630264 +1412649.156358627 +1428351.731099502 +1407376.643684816 +1415466.9040491562 +1411422.6588630397 +1397080.0846148639 +1395704.6521901197 +1395055.2031621267 +1414107.861840647 +1409448.4016463696 +1402586.7453792475 +1376708.2205168132 +1413675.1218819697 +1380036.867577283 +1413345.464577719 +1397080.0846166566 +1407376.1480175485 +1397080.084616223 +1408053.4445153412 +1407100.0598370912 +1428351.729797632 +1420525.2881016396 +1395826.4603740508 +1392273.0557271843 +1411006.0096632387 +1392273.0489807758 +1402439.463248704 +1370002.2498729841 +1378800.7291844038 +1374987.0734856434 +1403324.2853992078 +1406889.377016663 +1425431.0227360723 +1389826.2884709244 +1425899.5839174895 +1404058.0576584016 +1395704.6702548072 +1405878.9516743848 +1411422.6588639359 +1398860.4035918054 +1411969.1962095662 +1410525.3639623073 +1406441.962990301 +1396631.708839115 +1415402.086986456 +1415402.123339023 +1411117.8558814423 +1403136.385242147 +1412122.381800466 +1400774.4176230305 +1412122.3819466557 +1400774.4195177334 +1412122.3819089425 +1397812.0470057772 +1400774.4141855666 +1400568.917927713 +1403742.9260823226 +1385609.6338546453 +1374987.0746556523 +1388707.9250085119 +1380255.7574629884 +1397061.4815713288 +1417077.161559115 +1397252.6513523199 +1410458.8624920957 +1402449.5815012446 +1428351.7311261054 +1428351.7311263056 +1417186.5207884496 +1417252.0089895069 +1415685.9536890476 +1410458.8622635466 +1396631.7091205344 +1388707.9249897234 +1402439.4619165543 +1397987.0701419057 +1397080.0844076078 +1420356.2458029564 +1406427.7771399019 +1389826.0301422558 +1412755.14679135 +1395704.6703037787 +1414107.861859682 +1411422.658774184 +1412122.3816775875 +1417186.520792222 +1412818.7013296229 +1412818.7013138414 +1403252.9300622856 +1399839.3678391557 +1417186.4129974712 +1412122.3803905246 +1380036.861988203 +1403687.10667975 +1415679.0426567134 +1415365.774396597 +1392273.0558894172 +1410525.3797000006 +1408962.1531174057 +1396925.0193223078 +1403687.1135768543 +1406570.0847695572 +1414107.8618640858 +1404333.3144985351 +1413167.663292087 +1397812.0465662458 +1428351.7311046391 +1396631.7078704396 +1395704.6698189215 +1415467.962190032 +1413167.6634099176 +1412122.3818216862 +1412237.9769679517 +1420356.2458020006 +1380255.0306762701 +1392273.0277462264 +1421188.9858021091 +1412755.1468176302 +1392866.8928226407 +1424118.8420283308 +1413167.6617893456 +1412658.4095892794 +1400774.4151970271 +1408962.1026751283 +1400588.3092178714 +1396631.708856932 +1395826.4613008609 +1428351.7311254279 +1374725.2077580597 +1412751.8792599174 diff --git a/code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..5f983fb --- /dev/null +++ b/code/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,349 @@ +1414332.12624 +1414576.82669 +1433025.0606 +1448422.61181 +1414332.16718 +1437231.83518 +1443470.87654 +1403271.55353 +1443211.20429 +1440491.83377 +1441350.87048 +1433025.06123 +1433025.06078 +1439471.32351 +1435365.1066 +1400493.18355 +1397302.49609 +1432800.27282 +1443386.63269 +1403268.91178 +1451224.63068 +1443807.69104 +1442099.51979 +1443440.84447 +1441499.67537 +1407555.47759 +1436168.81823 +1443807.58416 +1435714.2004 +1440494.97337 +1443386.64108 +1443807.58408 +1414654.41754 +1424791.48116 +1419225.87 +1443386.64931 +1442099.34165 +1439674.48681 +1432686.78129 +1440491.83211 +1443807.58812 +1408634.00222 +1446771.46081 +1438263.38479 +1443807.58087 +1432384.16648 +1406201.12797 +1443807.60715 +1453904.49068 +1431230.86985 +1413020.97458 +1441348.16285 +1452155.9742 +1420249.71011 +1434439.46355 +1443211.28387 +1422234.08058 +1439807.27361 +1435714.20532 +1431348.35452 +1432843.59594 +1427248.46407 +1444770.63801 +1433153.97963 +1449807.46411 +1433182.0239 +1424687.26626 +1444770.67397 +1443440.35309 +1444769.92159 +1456771.53149 +1456771.52639 +1446787.23643 +1443386.62434 +1443211.22332 +1424791.45472 +1431157.98403 +1446920.43954 +1449807.46422 +1437231.17884 +1403269.63009 +1425838.15293 +1431230.96996 +1431157.99343 +1439807.53371 +1449807.46418 +1425768.91853 +1444770.70378 +1444749.64949 +1434317.18798 +1438263.46885 +1437643.75072 +1456771.55278 +1409780.40858 +1432800.27104 +1433153.96487 +1442098.65519 +1443386.69274 +1420854.84613 +1431679.19918 +1433025.0611 +1414607.11047 +1443386.65872 +1443807.58098 +1410095.94995 +1445265.68893 +1442098.53251 +1439919.23915 +1437573.04543 +1432177.46382 +1446711.45807 +1432945.9314 +1449229.3511 +1446669.16378 +1431231.3655 +1400491.85783 +1432785.9862 +1409801.16841 +1436712.66873 +1414802.9158 +1424687.29854 +1424791.45454 +1426287.34515 +1420854.87257 +1413020.96955 +1449230.18496 +1425768.9136 +1440491.84382 +1421637.13782 +1435071.91414 +1440873.38522 +1406041.15153 +1443211.22834 +1433025.05496 +1431230.82298 +1403117.47193 +1438650.60561 +1444532.78782 +1443807.69533 +1433025.06103 +1428414.94885 +1410096.01505 +1419722.01564 +1420051.30633 +1432785.48269 +1429812.66308 +1431507.48155 +1443438.86899 +1443807.69644 +1434857.65682 +1414654.41774 +1408633.70036 +1431348.37437 +1432596.18628 +1449230.15162 +1436063.11149 +1432686.91458 +1423647.86428 +1443211.22585 +1424791.46017 +1414332.11183 +1444533.66572 +1425838.1214 +1433256.60038 +1432144.87006 +1410206.24727 +1414802.91074 +1446771.29698 +1433025.05979 +1431157.98536 +1456771.5279 +1416985.12773 +1414802.88589 +1434899.66515 +1436743.01103 +1440495.64924 +1440491.84813 +1449807.46415 +1433025.06123 +1403260.22611 +1440873.38487 +1441712.96291 +1437231.28852 +1433135.98487 +1441306.2939 +1444926.94082 +1437570.67841 +1444164.06575 +1444770.73027 +1433183.10186 +1436119.68882 +1413757.74265 +1414516.15548 +1433025.06092 +1443807.58872 +1446715.25141 +1438894.39467 +1437231.33756 +1445364.64651 +1444770.71274 +1424118.20986 +1436151.45537 +1403268.53246 +1456771.51189 +1446873.87435 +1423757.01329 +1406197.54291 +1420249.76803 +1431157.68467 +1451776.85757 +1441345.99893 +1414607.03949 +1432786.68135 +1440873.38517 +1441096.33297 +1446873.87448 +1416801.35402 +1439204.34546 +1443386.65096 +1440483.10516 +1456771.50081 +1435365.21857 +1444769.81655 +1440873.38549 +1424791.45477 +1426287.54954 +1422233.46093 +1443386.65475 +1436168.95389 +1431348.37789 +1410013.65773 +1439572.12324 +1414802.91596 +1442098.53602 +1424791.45392 +1435373.90227 +1424791.45469 +1436119.65787 +1441711.77577 +1456771.51544 +1446873.87383 +1421637.319 +1423756.91476 +1448563.23072 +1423756.66011 +1431231.3501 +1403269.01737 +1410096.03647 +1408633.85014 +1438263.39245 +1441151.65162 +1451776.85965 +1423644.77232 +1452197.15841 +1437921.00775 +1426287.73319 +1432945.93243 +1440873.38596 +1425648.24245 +1438671.51981 +1439318.95848 +1431207.27467 +1423797.11155 +1438057.96442 +1438058.04141 +1448422.61185 +1431330.19135 +1443807.63255 +1433255.56709 +1443807.58482 +1433256.5363 +1443807.55734 +1433135.98351 +1433256.65037 +1425838.15216 +1433927.5621 +1419881.83237 +1408633.83341 +1425059.12517 +1413121.03233 +1427248.46339 +1449069.68383 +1431507.11776 +1437798.9866 +1431192.95539 +1456771.53886 +1456771.53304 +1447157.76791 +1449230.01449 +1439601.06198 +1437798.9826 +1423797.107 +1425059.22949 +1431230.96289 +1426010.98936 +1424791.43779 +1446771.73367 +1433628.95968 +1423640.03714 +1449807.4641 +1426287.56554 +1443386.65034 +1440873.39012 +1443807.57971 +1447157.76792 +1440594.1546 +1440594.14956 +1434395.43204 +1435375.50253 +1447157.70266 +1443807.71931 +1414802.91439 +1435714.20007 +1446118.75785 +1444128.40906 +1423756.90603 +1439319.08426 +1445266.20693 +1424687.31195 +1435714.206 +1437964.00154 +1443386.65127 +1434837.2542 +1439235.16075 +1433135.98495 +1456771.49607 +1423797.02517 +1426287.59524 +1444770.81179 +1439235.19467 +1443807.60401 +1436742.96916 +1446771.71775 +1413159.87022 +1423756.87099 +1448549.15034 +1449807.46412 +1420528.48228 +1453904.49065 +1439235.05915 +1440491.84807 +1433256.42934 +1445266.14048 +1427472.40083 +1423797.11608 +1421637.50165 +1456771.5194 +1408530.13938 +1449804.3421 diff --git a/code/opt-results/grid/amalia_4.0_ukiahRose/funcCalls.txt b/code/opt-results-revision/grid/amalia_6.0_northIslandRose/funcCalls.txt similarity index 67% rename from code/opt-results/grid/amalia_4.0_ukiahRose/funcCalls.txt rename to code/opt-results-revision/grid/amalia_6.0_northIslandRose/funcCalls.txt index 06f3245..cb3786b 100644 --- a/code/opt-results/grid/amalia_4.0_ukiahRose/funcCalls.txt +++ b/code/opt-results-revision/grid/amalia_6.0_northIslandRose/funcCalls.txt @@ -1,383 +1,349 @@ +9 +10 +12 +13 14 -19 -24 -19 -45 -35 +14 +15 +15 +15 +15 +15 +15 +15 +16 +16 +17 +17 +17 +17 +18 +18 18 -67 19 -26 +19 +21 +21 +21 +22 +22 +22 +22 +23 +24 +24 +24 +25 +25 25 +26 +26 +26 +27 +28 +28 +28 +28 +28 +29 +29 +32 +32 33 -24 +34 +34 +35 +36 +36 +36 +36 37 -41 -18 37 -27 -31 -21 -27 -21 -146 -16 -47 38 -42 -27 -28 -44 +39 +40 41 -27 -113 +43 +43 44 -19 -25 -14 -38 -21 -13 -38 +45 +46 +46 +47 47 -44 -23 -13 -19 -17 -55 -15 -54 -29 -38 48 -83 -123 -16 -38 -39 52 -128 -55 -35 +57 +61 +62 +63 +63 +64 +67 +70 +70 +71 +73 +73 +12 +76 +12 +20 20 -47 -26 26 -42 -17 -24 -24 -21 -31 +13 +90 21 -14 +25 +10 +29 28 -35 -56 -74 -32 -33 -79 -15 +22 +16 +27 18 -48 -37 +28 31 -47 -37 -36 25 -41 -12 -47 -18 -32 -27 -20 -33 +97 33 -49 +32 28 -17 -48 +16 +101 +23 +30 +102 +27 +16 25 -17 -33 -41 -40 -21 22 -33 -37 -19 -21 -19 +38 +23 +32 19 -47 -29 -126 +34 +109 44 -33 -143 -37 -37 -15 -52 -29 +13 25 -14 -28 +44 26 -29 -60 -17 -32 -125 -33 +113 35 -33 -28 -25 -11 -56 -43 -132 -22 -21 -50 -38 -21 -53 -58 -19 -16 -177 -46 -22 -31 47 -419 -87 -42 +36 27 -49 -23 -53 -24 -71 -20 +117 +30 23 -26 -21 -24 +47 +25 29 -63 -79 +60 +60 +29 +52 34 -33 -114 -30 -31 -67 -19 -19 -254 -37 -31 -131 +53 +18 44 -27 +30 +15 +59 19 +134 +26 +39 +135 38 -45 -18 -17 -27 -23 -15 -43 -31 -40 -23 +57 +8 +25 +48 +73 33 -11 -32 -42 -47 +150 21 -29 -59 -14 +28 +77 +72 +32 13 -27 -39 -24 -42 -39 -25 -26 +9 +13 +22 +19 +16 +49 +72 +14 +78 +37 +23 +88 +166 46 -31 -43 -31 -36 -52 -44 -20 -17 +24 +27 25 -23 -52 -34 +19 29 -15 +55 +11 +57 +21 +44 +32 +16 +21 28 34 +30 12 -28 -11 -62 -23 -22 -48 +41 +189 29 +44 +10 +105 +35 +20 14 +35 +54 +57 +77 +27 +35 +49 +50 30 -64 -47 31 -37 -43 -37 -162 -23 +24 19 -48 -197 -16 -17 -71 -67 -70 -22 -30 +10 26 +37 40 -45 -17 23 -27 -36 -30 -36 -29 -31 -54 -35 -39 -31 -94 43 -35 -45 -56 +147 +24 +38 +25 +55 +23 +62 +20 +18 47 -60 -17 -22 -21 -57 +99 +73 +45 +16 13 -43 -31 -27 -35 +32 +20 +24 28 20 +54 23 -25 -25 -20 +165 +19 35 -22 -26 -53 +29 +58 +64 +33 +36 +18 +44 +10 24 -22 -28 -22 +27 +31 +69 +25 +27 24 -16 +92 25 -52 +98 +54 16 -32 +17 +79 44 +36 28 -31 -16 -26 -21 -31 -29 -38 26 +118 +40 +22 +25 +25 +28 +189 +133 +51 +23 +123 53 -14 -37 -56 +41 +23 43 -57 -35 -32 +95 28 +140 22 -15 -41 -34 -39 -15 -43 -42 -16 -47 -16 -42 -30 -52 -25 -23 -15 -49 -59 -186 -16 -68 -25 +76 +31 +57 +21 +137 +21 27 -42 -56 -97 -24 -114 +40 +232 +113 +12 +10 +85 +26 +38 +27 +19 +44 +88 +62 +54 +27 +65 +107 +94 +27 +38 +106 +35 35 19 -33 -18 -43 -45 -18 -51 -28 27 -51 -36 -631 -26 +31 +31 +13 35 -54 -121 -14 -23 -59 +72 +29 +26 +50 +27 +21 +39 +50 +13 +18 +67 +22 +47 diff --git a/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt b/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..b55b196 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,121 @@ +1410466.4844866453 +1411419.4651934018 +1398211.6715929336 +1412287.963184741 +1403257.636468706 +1406067.9364327083 +1406894.9818180616 +1407362.184001878 +1384402.4909153248 +1396077.2796565145 +1418414.1696130573 +1408151.828352505 +1405623.31896174 +1399058.7122929604 +1396394.146163684 +1395322.3004814845 +1414178.8885493155 +1396077.2796369377 +1415826.7396486613 +1415874.4647236192 +1412284.4616086492 +1410466.4870833997 +1396077.2799924319 +1400219.9563963967 +1386635.093936091 +1395432.0228950118 +1418414.1696142533 +1408461.2182389365 +1408467.7658123255 +1413070.3977400395 +1406727.3971843044 +1398211.5704264785 +1408745.4539830897 +1407352.4319090513 +1399053.9492004614 +1406381.764957655 +1406381.764957655 +1409699.610937212 +1406426.686015559 +1414764.2614305061 +1409047.8569483205 +1401930.723514046 +1405821.649983295 +1406326.9437102766 +1409952.7630354743 +1405569.554074004 +1403257.636469229 +1420340.5234643698 +1408467.7642032509 +1384104.124765202 +1408336.1460532993 +1404748.2285610407 +1413624.9963533445 +1392091.032197338 +1399058.7847248497 +1403257.6364691842 +1416142.19275178 +1399501.5968930756 +1413070.4022360859 +1395322.3033861194 +1415110.1012928411 +1399056.475679544 +1416142.1493799924 +1404374.6035493766 +1394281.1136593511 +1408477.2796587748 +1405621.571799472 +1416154.2874013977 +1409711.8791934154 +1396077.280480233 +1413067.3898962792 +1411451.6470352102 +1406797.7730277495 +1402675.720026465 +1408656.7885189706 +1414169.0828429998 +1397619.09415552 +1396077.2804523672 +1412378.8635055665 +1411784.043141954 +1383938.4143256098 +1412284.176243449 +1405170.0989566813 +1409385.5660735997 +1405170.0990118093 +1393782.848973405 +1396077.2788904489 +1389703.536829159 +1404956.5634091608 +1411151.3263902524 +1415107.0474907276 +1419307.2998261123 +1396077.2490931142 +1408467.766268247 +1407364.05096419 +1410823.3009956647 +1399014.925516485 +1413629.8886687174 +1401902.0849726745 +1419307.3274361403 +1406607.4492305352 +1412378.8637014322 +1393782.8492957156 +1395693.3184191103 +1409434.608541591 +1395693.3183954072 +1410823.3013817463 +1395432.0238883474 +1415957.762979059 +1388167.9352967043 +1386635.093136165 +1389703.5368000958 +1400868.9062377175 +1388161.2841607544 +1405841.4179693153 +1404238.5002737727 +1406568.1568509655 +1413107.1909544712 +1414915.312242788 +1396077.2796347756 +1389634.5283958912 diff --git a/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..e004b17 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,121 @@ +1446838.2333 +1445111.57449 +1437665.75449 +1442361.51365 +1435613.57957 +1437582.36385 +1444512.13459 +1442843.57118 +1419192.4342 +1431658.59281 +1447803.12425 +1444528.39367 +1439531.13976 +1438147.63953 +1435152.97019 +1429161.99954 +1450322.17289 +1431658.53505 +1443565.67761 +1448802.92644 +1448932.9294 +1446838.23245 +1431658.58853 +1434636.32879 +1427580.91555 +1429205.85575 +1447803.12424 +1448098.07163 +1440868.40745 +1438880.53904 +1436150.79386 +1437598.03209 +1434787.98514 +1438740.13786 +1438143.70568 +1442899.52608 +1442899.52608 +1439297.27055 +1442917.77742 +1445962.43409 +1433642.84649 +1431800.51318 +1438730.74444 +1441857.72396 +1438505.94246 +1440925.81783 +1435613.57909 +1444053.49066 +1440870.28815 +1418307.9866 +1435611.77777 +1438333.66248 +1437870.50388 +1425283.61529 +1438147.69901 +1435613.5792 +1449942.29156 +1433879.77514 +1438872.23389 +1429162.15242 +1445765.1605 +1438145.79203 +1449942.27228 +1434968.12065 +1434313.45489 +1447203.42901 +1439530.57948 +1449960.7637 +1439051.02543 +1431658.59893 +1439157.8181 +1435478.88904 +1434453.92218 +1434839.07829 +1441796.95379 +1449160.68551 +1432673.92563 +1431658.60208 +1446229.51846 +1439887.64376 +1414563.21045 +1448915.04999 +1429095.94449 +1438514.58002 +1429095.94434 +1426269.09112 +1431658.62382 +1423391.53491 +1442055.87669 +1439590.18065 +1445616.07788 +1443058.69791 +1431658.52564 +1440871.77705 +1442844.75193 +1435712.10762 +1438076.17438 +1446634.82857 +1433240.57888 +1443049.54025 +1444489.57981 +1446229.43239 +1426269.49843 +1429171.38422 +1439084.44925 +1429171.38422 +1435712.11969 +1429204.75023 +1450801.45763 +1421983.09067 +1427580.23697 +1423391.53849 +1429316.49011 +1424821.42649 +1437192.82673 +1429255.12805 +1437804.12601 +1439296.904 +1446252.43359 +1431658.53818 +1419669.62068 diff --git a/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt b/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..42b5575 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,121 @@ +10 +11 +12 +21 +24 +27 +28 +30 +29 +12 +30 +13 +13 +14 +14 +15 +35 +16 +17 +17 +17 +18 +18 +19 +20 +20 +20 +20 +20 +20 +20 +10 +20 +21 +11 +22 +22 +22 +22 +22 +45 +23 +46 +24 +24 +25 +14 +25 +26 +27 +27 +27 +27 +27 +28 +28 +28 +28 +28 +18 +30 +18 +46 +19 +32 +32 +20 +22 +35 +22 +23 +23 +37 +37 +37 +38 +38 +19 +38 +38 +38 +25 +39 +40 +40 +27 +27 +27 +28 +44 +30 +30 +30 +45 +31 +31 +32 +32 +78 +32 +33 +48 +33 +33 +49 +21 +34 +20 +36 +36 +20 +23 +37 +53 +54 +38 +55 +39 +56 +16 +40 diff --git a/code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..f6004cf --- /dev/null +++ b/code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt @@ -0,0 +1,256 @@ +1481427.7802538015 +1475320.3029836537 +1481012.618518378 +1456654.5217461803 +1483999.7766595397 +1470344.8484964906 +1478147.764347288 +1472305.0036711718 +1483054.7058374502 +1479153.332235048 +1479647.156878044 +1483054.7066659445 +1478547.4582592344 +1472606.8474374088 +1484533.8392742234 +1479645.4358878206 +1475693.8504097029 +1450199.2845197318 +1455601.517953936 +1452631.7393225455 +1474831.200683655 +1479158.367633233 +1486297.5076152475 +1475320.315983774 +1455824.6185276872 +1495577.3541018453 +1478147.7702962353 +1450199.2491912358 +1481427.7705925864 +1479092.4867033653 +1481739.1112955352 +1478548.0603308694 +1478455.0052114432 +1458166.3214571262 +1479876.2790880324 +1479153.3316340703 +1456654.5294700656 +1463450.0783509864 +1494774.3326009556 +1494774.3325921327 +1475110.2494568976 +1474947.794568428 +1491343.2443851305 +1456654.5296639535 +1476709.059701748 +1456654.526986673 +1477255.5357900965 +1475110.2494516287 +1484794.3959583687 +1450199.281751075 +1486941.4767277678 +1479876.2868846622 +1484794.5457817232 +1477280.9543876962 +1495577.354103449 +1455646.0754597776 +1483054.4170790757 +1475280.768685645 +1476709.060252776 +1491500.2419934191 +1486458.1729271794 +1486941.4765890294 +1486941.4765932504 +1475280.773319025 +1494774.3326003738 +1495577.3540905574 +1479876.2885074392 +1475280.7736245943 +1475280.773400522 +1485753.0991621702 +1485588.9994724053 +1475601.078715672 +1465621.6079533417 +1469682.2720623498 +1442369.1705186577 +1494774.3325990005 +1465274.406099048 +1465208.4409726784 +1462211.6542694897 +1453123.813446832 +1475110.2494178228 +1451765.3380295099 +1472287.0320990025 +1484533.8144170127 +1495577.3540978946 +1456831.3093990167 +1472581.134882621 +1471410.1974199878 +1478883.833296539 +1478087.6680820896 +1467829.1015394733 +1479647.1584576285 +1452375.1733580828 +1467441.5285977744 +1476011.3282147434 +1479646.730239961 +1478883.8568361362 +1469069.4369058595 +1481427.6738054312 +1471411.533018346 +1474710.596386687 +1481012.6175929666 +1471295.4897472397 +1495577.353994423 +1477938.3299888852 +1450199.2567955416 +1475811.5966141485 +1477281.012342525 +1472281.4560636994 +1479659.500509 +1491500.2419286014 +1481012.6185239565 +1456668.634049541 +1484381.0994917855 +1475693.8506897015 +1491919.3952251065 +1465208.4409624585 +1481427.7910822073 +1482008.916073443 +1484381.099489615 +1479876.2868921189 +1475259.5643661022 +1475280.773646447 +1475351.3254954515 +1452509.938369752 +1471411.5412869332 +1479623.6550401363 +1487549.8338439409 +1478135.7686661321 +1479876.286873454 +1469986.7059195284 +1494774.3325336732 +1474042.4963528141 +1482008.9164898638 +1481059.3647858168 +1478893.9665375988 +1465262.7463592424 +1463507.9157012654 +1484381.0994731372 +1475280.7736373094 +1476011.3289445117 +1486941.472558943 +1465394.296631303 +1475693.801091653 +1465394.2966945104 +1484533.8397223556 +1482008.9074071567 +1472293.0770532812 +1477642.7955954412 +1475351.328148801 +1455600.6986666187 +1475601.0782699932 +1448434.4234157468 +1486941.4767294982 +1471450.4207483984 +1446818.9732637522 +1479179.487340622 +1483597.798860809 +1476205.004695134 +1482008.9155422314 +1450199.2690278739 +1452631.7381132706 +1481811.910663999 +1469290.078571182 +1478176.955357663 +1495577.3540672231 +1451765.3215053508 +1466549.2202428905 +1466392.33586661 +1477824.314227714 +1450199.2332041678 +1475534.4315860216 +1477698.1403491457 +1486302.6937256185 +1465394.295094731 +1470157.9130218383 +1486148.3277759268 +1476442.3500038802 +1481679.8899279458 +1478883.856814297 +1458312.992545121 +1463413.429783159 +1455790.35132427 +1482475.8214565364 +1475023.0695223259 +1474710.596402271 +1474990.6113330931 +1483054.7066658004 +1475280.775858316 +1477992.332020821 +1479600.2990331517 +1484642.8355231085 +1475368.5216579721 +1455790.3129567618 +1475280.7741829765 +1479153.3262785608 +1481837.7692398275 +1474669.2235785844 +1494441.2766417945 +1467961.4011742023 +1483537.788373777 +1472306.4211043122 +1485521.314380131 +1474831.213993747 +1455824.8214579236 +1479179.398572739 +1476390.1492407497 +1462697.328539566 +1481427.7391701767 +1475110.2494487937 +1479647.1519369287 +1477056.5777220256 +1475601.0771055517 +1465394.2989775857 +1471295.489727189 +1479153.3325063093 +1484532.8433395852 +1477635.2455663695 +1486505.4762278786 +1482336.2611589425 +1467441.4874824279 +1456654.4498848922 +1484533.8398427179 +1481684.2662895322 +1481008.9243360315 +1484381.0994919324 +1462551.5646189498 +1465208.4409779934 +1475693.8199001122 +1477280.961536129 +1456006.5714982315 +1479153.330658929 +1481045.8306048454 +1486297.50454789 +1491452.5766092502 +1478341.173023702 +1477056.579679963 +1479647.153375245 +1466392.2389358457 +1455788.9868727513 +1483108.4477021906 +1481012.6183469016 +1476205.0442037769 +1456025.3856853603 +1495577.3540945686 +1483545.0742727425 +1473319.7411446779 +1483537.7883651948 +1475690.443760375 +1485694.5667620574 +1483509.4448553575 +1491343.2394278937 +1469069.3904130452 +1451525.1689227447 +1452311.1846087351 +1475259.5650284225 diff --git a/code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..24e0793 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,256 @@ +1502678.55096 +1497203.66789 +1502838.70106 +1482155.88472 +1504450.99195 +1491899.55582 +1500828.71139 +1493216.73852 +1504441.10364 +1502911.7424 +1504692.11507 +1504441.10419 +1502267.61413 +1498527.33012 +1502817.15523 +1504691.83246 +1501494.53753 +1474672.36557 +1484832.95719 +1476629.91851 +1503360.42648 +1497797.50262 +1500388.78783 +1497203.65755 +1485003.82987 +1513847.76672 +1500828.70056 +1474677.23206 +1502678.54265 +1499158.23276 +1504725.50668 +1502267.61885 +1502649.57552 +1483413.65813 +1505501.06035 +1502911.83307 +1482153.97296 +1491466.61716 +1510747.49746 +1510747.49733 +1492324.46874 +1504954.85039 +1506611.98773 +1482154.23689 +1501184.50027 +1482153.62362 +1493466.55541 +1492324.46866 +1501320.54219 +1474672.02742 +1502562.20659 +1505501.06429 +1501320.9088 +1493472.4011 +1513847.77186 +1484900.6081 +1504440.96974 +1496253.38387 +1501184.91716 +1506703.00642 +1501507.97958 +1502562.4312 +1502563.15778 +1496251.27496 +1510747.49756 +1513847.75756 +1505501.06381 +1496251.37439 +1496251.45472 +1498618.29349 +1498565.30964 +1497907.7521 +1486004.00767 +1491627.9044 +1468614.82544 +1510747.49745 +1490930.6623 +1485681.70754 +1481889.84136 +1481886.19878 +1492324.46731 +1474239.75894 +1498142.73175 +1502840.51048 +1513847.76667 +1481190.41765 +1500662.04805 +1497358.02378 +1500450.61264 +1502156.02353 +1497216.18431 +1504692.09794 +1475285.77852 +1496971.588 +1503292.00246 +1504689.50086 +1500450.92548 +1490590.06084 +1502678.46084 +1497360.63609 +1497717.13173 +1502838.66798 +1490669.77862 +1513847.70486 +1499173.53634 +1474669.66989 +1496768.97774 +1493466.2819 +1498937.01349 +1498222.00462 +1506703.03262 +1502838.70149 +1485086.72008 +1506645.55269 +1501494.53772 +1505255.35759 +1485681.70411 +1502678.55979 +1506613.87037 +1506645.39271 +1505501.06428 +1496216.51779 +1496254.72335 +1496325.95019 +1472598.37544 +1497360.61443 +1505193.71705 +1500664.12367 +1497811.31239 +1505501.06428 +1493756.75084 +1510747.49683 +1497194.521 +1506612.91593 +1502787.24398 +1504326.3661 +1484483.46412 +1481903.69531 +1506645.47323 +1496251.29237 +1503292.00314 +1502571.10997 +1484449.01098 +1501494.51292 +1484448.92454 +1502819.93239 +1506613.31856 +1498330.61077 +1501541.44226 +1496325.79839 +1484834.21376 +1497907.79198 +1479943.64041 +1502562.28097 +1497426.7415 +1475337.60475 +1499190.01243 +1499153.05763 +1489530.48011 +1506614.08345 +1474669.91707 +1476628.78453 +1506782.68273 +1490790.206 +1497817.87404 +1513847.81755 +1474237.61745 +1485785.31815 +1488792.10264 +1499278.21905 +1474670.83063 +1497355.33966 +1502172.10421 +1499034.10093 +1484448.73501 +1489614.01619 +1498935.42903 +1496842.3218 +1501113.70668 +1500450.92765 +1483460.43184 +1495817.38766 +1485026.72725 +1498439.4824 +1492265.36338 +1497717.29886 +1491624.98837 +1504441.10419 +1496250.38438 +1500453.47427 +1498725.06059 +1502773.96972 +1498093.05177 +1485028.49431 +1496252.94196 +1502911.79345 +1507621.16424 +1496279.6307 +1510529.53574 +1489142.76163 +1495189.15364 +1489255.85629 +1498780.13211 +1503360.44611 +1485012.37105 +1499208.82245 +1500688.54697 +1491933.35031 +1502678.5109 +1492324.46866 +1504692.10255 +1504361.15145 +1497907.65234 +1484448.70706 +1490669.78247 +1502911.84493 +1502945.85904 +1502406.15685 +1500128.29275 +1503103.99652 +1496971.59628 +1482152.3929 +1502819.35678 +1501556.10266 +1508750.66198 +1506645.5523 +1484808.64536 +1485681.78911 +1501494.51587 +1493464.68676 +1485148.82645 +1502911.95665 +1509213.96243 +1500388.89058 +1506667.3391 +1493009.28316 +1504361.15666 +1504692.08588 +1488786.34722 +1485016.75924 +1500902.71798 +1502838.69309 +1489523.93218 +1485322.58924 +1513847.75929 +1499080.30157 +1498849.17259 +1495189.16008 +1501492.25847 +1502105.94616 +1502659.41193 +1506611.89757 +1490595.22369 +1475908.61494 +1481058.14857 +1496216.45858 diff --git a/code/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..f7ba1b7 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt @@ -0,0 +1,256 @@ +10 +13 +19 +20 +20 +20 +21 +21 +21 +22 +23 +21 +24 +24 +25 +26 +27 +27 +27 +25 +28 +28 +28 +29 +29 +27 +29 +30 +30 +30 +31 +29 +31 +31 +32 +32 +33 +34 +35 +35 +36 +37 +37 +37 +37 +38 +39 +39 +40 +40 +40 +42 +42 +43 +44 +44 +46 +48 +48 +49 +50 +45 +51 +52 +53 +55 +51 +52 +57 +58 +59 +64 +66 +69 +74 +75 +76 +76 +80 +13 +91 +36 +21 +23 +17 +29 +28 +21 +30 +33 +102 +32 +22 +105 +44 +30 +34 +38 +33 +37 +36 +34 +39 +17 +34 +33 +25 +31 +12 +37 +50 +18 +31 +126 +34 +46 +48 +28 +41 +132 +47 +24 +43 +133 +132 +41 +60 +26 +136 +45 +50 +41 +51 +51 +19 +22 +30 +67 +157 +55 +16 +48 +74 +25 +45 +67 +20 +24 +64 +101 +27 +80 +32 +95 +105 +31 +28 +116 +23 +23 +104 +28 +25 +41 +83 +15 +115 +127 +35 +35 +45 +37 +23 +49 +43 +22 +208 +21 +41 +45 +49 +39 +42 +220 +133 +48 +41 +15 +42 +38 +57 +22 +20 +12 +46 +50 +88 +43 +145 +236 +112 +153 +38 +16 +26 +32 +22 +105 +28 +78 +27 +19 +80 +53 +68 +34 +24 +118 +90 +16 +142 +43 +66 +116 +26 +101 +29 +88 +30 +19 +24 +30 +46 +28 +20 +290 +30 +23 +58 +19 +54 +63 +31 +36 +35 +221 +73 +55 +33 +67 +59 +315 +33 +138 +26 +67 diff --git a/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt b/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..2fa4851 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,108 @@ +1470700.959359604 +1467219.1411359266 +1470030.0040485966 +1489949.3701909904 +1489949.3761034214 +1470752.4144714102 +1478850.912563043 +1485864.3413576104 +1477151.5048238318 +1485867.374787878 +1486103.050782534 +1479830.3414964022 +1489949.376733132 +1480317.3970693375 +1470916.2831203458 +1480274.8328850118 +1486103.0504809862 +1472407.419345845 +1470931.2188711953 +1470303.2328567659 +1480777.4426527175 +1470559.2133156753 +1470801.768107651 +1488892.3396530524 +1486040.9550290813 +1484775.9885098846 +1481227.8968446094 +1489203.102731004 +1472407.4388173048 +1461878.061614229 +1483315.9173979745 +1481227.8968467184 +1480769.6124011641 +1483059.2625224094 +1478281.3913592647 +1464387.7647329122 +1479830.3414448907 +1462431.9109579506 +1470559.1684955817 +1486919.9984636419 +1483349.5722502272 +1480703.8973706285 +1478801.2265860662 +1486103.0500595768 +1487924.2096538953 +1479474.830573483 +1470928.8617718795 +1478346.2416125636 +1489128.8965337977 +1483293.604203189 +1462158.6903721564 +1470752.411726969 +1477689.6887256925 +1478484.2318903024 +1484317.1039881664 +1489010.0417013764 +1485064.3228616868 +1489010.0416886855 +1478866.7972104468 +1471949.5276996172 +1487924.2099815458 +1463702.533632114 +1490370.285207951 +1486725.5576021606 +1470029.99865384 +1488892.3396930892 +1483349.601142006 +1494711.0751554663 +1475462.3857437836 +1478124.6643972357 +1485859.4384140142 +1488920.7542294953 +1478281.3914014625 +1479723.0356326117 +1486355.2729869976 +1486672.1073365428 +1485867.3652722647 +1472288.7086392674 +1483183.104323898 +1483349.6073342594 +1481199.7741117745 +1487725.8988959135 +1474927.6266189243 +1472407.438724784 +1478879.2071028687 +1470752.4144622753 +1486919.8346516774 +1480777.4428978164 +1486919.8328637152 +1473566.5079783017 +1459283.7978642026 +1484489.4694916604 +1470752.4131367365 +1474093.5615423613 +1480956.5593668132 +1494711.0810718315 +1494711.0719164922 +1482070.6924534189 +1472698.2176619752 +1482363.6274920907 +1470916.2831128447 +1470752.4144840143 +1471293.6786629823 +1464258.7142505979 +1472235.2141683225 +1478732.3416860967 +1488892.339451641 +1488640.2319217627 diff --git a/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..80d427b --- /dev/null +++ b/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,108 @@ +1495784.78294 +1490224.51266 +1492640.50693 +1504975.70946 +1504976.20855 +1488866.56937 +1500336.2464 +1501665.01695 +1491471.79112 +1503103.6302 +1498949.48376 +1497882.30701 +1504976.18934 +1492591.26928 +1489191.16461 +1492583.8762 +1498949.29212 +1498582.61298 +1487774.35719 +1499873.01503 +1505872.98274 +1487515.49766 +1492160.98312 +1501525.14534 +1498663.91373 +1500479.53708 +1499461.224 +1500292.80045 +1498582.65252 +1497652.07251 +1500995.13419 +1499461.30565 +1504373.66059 +1504504.5596 +1495994.55079 +1488961.20841 +1497882.24091 +1494342.13713 +1487545.37347 +1498016.31339 +1501941.22821 +1494813.55796 +1497495.12216 +1498948.77702 +1499905.87121 +1492989.77834 +1487560.77564 +1492784.97912 +1501466.34069 +1505226.56038 +1484898.84182 +1488867.43351 +1492195.44524 +1504177.54457 +1495171.62786 +1501347.7667 +1498142.67505 +1501347.77662 +1500121.09924 +1493731.78868 +1499905.87282 +1492241.25801 +1501053.68067 +1502410.78718 +1492647.0962 +1501525.163 +1501942.41173 +1504743.0277 +1494992.24223 +1492916.13184 +1499765.23611 +1501123.37592 +1495994.43591 +1501651.5167 +1497903.99672 +1504184.74115 +1503097.70556 +1489147.04898 +1499507.16735 +1501941.47986 +1500289.92993 +1504283.86167 +1498621.46934 +1498582.63383 +1501868.88517 +1488867.21365 +1498031.61127 +1505874.65619 +1498031.19787 +1495875.04174 +1481376.44373 +1504858.9822 +1488867.16795 +1493018.98413 +1502564.54318 +1504741.29613 +1504741.74458 +1494180.06161 +1506230.97464 +1505971.97733 +1489191.14427 +1488866.95553 +1501665.55475 +1488860.17094 +1498466.05655 +1500682.08133 +1501525.34051 +1506604.64065 diff --git a/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt b/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..f1e0319 --- /dev/null +++ b/code/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,108 @@ +12 +15 +17 +18 +20 +22 +23 +24 +24 +26 +27 +27 +27 +27 +29 +28 +30 +30 +30 +31 +12 +31 +31 +31 +34 +34 +34 +32 +35 +16 +36 +37 +39 +38 +39 +40 +41 +20 +20 +42 +42 +41 +43 +20 +44 +43 +22 +44 +23 +23 +23 +24 +24 +24 +48 +27 +27 +51 +15 +29 +31 +56 +31 +56 +32 +58 +33 +34 +61 +35 +35 +61 +63 +37 +65 +38 +28 +38 +38 +38 +39 +39 +68 +41 +66 +57 +70 +43 +33 +73 +73 +44 +45 +46 +46 +49 +49 +49 +49 +50 +51 +51 +52 +52 +53 +54 +57 +57 diff --git a/code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..4eaa5cd --- /dev/null +++ b/code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,194 @@ +1229532.093874681 +1259051.6321158041 +1241672.1226471388 +1244186.1005044354 +1257843.7260772954 +1257842.044143739 +1257843.72609054 +1257842.0440964908 +1228993.436411611 +1257843.7261030388 +1239307.690505408 +1242157.8008714882 +1237365.5119296056 +1244186.1005043932 +1257843.726102599 +1243944.169231292 +1257843.7261036104 +1238127.214945791 +1257842.043954802 +1229499.533245439 +1259042.4317787846 +1232790.5940759038 +1233121.064760023 +1257842.0440829734 +1245605.880775705 +1244211.3664557552 +1259042.431788139 +1259035.8726351855 +1228993.4364108555 +1230802.8881390837 +1232730.2368651116 +1239246.2885464441 +1237350.7385489556 +1259035.8714819478 +1257843.726101775 +1244119.9332763467 +1257842.0441237749 +1244186.100501381 +1259051.6318968756 +1244119.9332675668 +1232790.5940747685 +1259045.3626596946 +1250919.6393924532 +1239359.2430830419 +1237671.8361628414 +1239311.9016847676 +1259051.631497978 +1259045.3637072304 +1244119.9332761718 +1245575.8043004188 +1244929.7715680397 +1219633.3307511474 +1243951.521399209 +1252930.3114645444 +1232730.2368599155 +1241601.1240450232 +1230189.3852820185 +1244211.6840666558 +1259042.4317871507 +1237582.1316639609 +1259042.4317864657 +1244186.1005017208 +1244098.659686539 +1229513.4456074843 +1257842.0441419547 +1223077.5135680633 +1257842.0441416833 +1239307.6905085347 +1259045.363633562 +1257843.7258654474 +1252930.3509140948 +1230189.3656309168 +1259042.4317880892 +1244119.9332763809 +1259045.3637284888 +1228328.3906832738 +1228449.772170521 +1233120.929726248 +1257842.0441406071 +1245666.0179538974 +1233121.0647600684 +1245710.7029995422 +1250906.5012690185 +1259051.6319547489 +1259051.6321162586 +1239307.6905081675 +1245666.200805298 +1257715.1667836988 +1229532.093874635 +1242157.8008835085 +1238479.455241522 +1259045.3637394975 +1244119.9332764146 +1252892.8248684886 +1257843.7261037105 +1242104.4746522075 +1244186.1005042524 +1259045.3637415709 +1228365.5419148284 +1239307.6905081598 +1250906.5017081902 +1257843.7260866805 +1230189.3515412484 +1259045.3637408451 +1234260.1169584931 +1244186.1005040116 +1244119.933276488 +1228877.4105910016 +1245666.1985209023 +1259035.87264211 +1259045.3637112281 +1257843.726103546 +1238127.20718843 +1239246.2885509224 +1230189.3402774655 +1228959.4132530724 +1244953.3856894132 +1245605.887208753 +1259042.431781559 +1259051.632115298 +1233065.7224854159 +1252927.8565764923 +1244119.9332647366 +1248993.2444400673 +1245345.2307038293 +1257842.0441385277 +1257842.0441163704 +1228993.436411644 +1233121.0647600624 +1259051.6321137035 +1241624.2595303557 +1259042.431753589 +1259051.6148469478 +1259042.4317871805 +1242157.800884241 +1244929.7715711596 +1207846.5587595354 +1252892.8532100553 +1237362.3190020134 +1244953.3856891985 +1259051.6321161613 +1245666.2008163566 +1239311.901684334 +1228959.413252658 +1252930.3504240394 +1245666.348384798 +1244186.1005038642 +1230189.348777415 +1238257.4864138714 +1244186.1005040412 +1239311.9016843115 +1239359.2431220214 +1257842.0441409345 +1242104.4746521853 +1257842.044143503 +1257842.0439426356 +1245605.887825987 +1237671.8361628398 +1232790.594076268 +1245666.1971273816 +1259051.632106131 +1259051.6320238395 +1259051.6321154798 +1228366.3683136608 +1228843.4710502208 +1244687.0974366337 +1233065.7528957839 +1259051.6321160095 +1252892.8530798757 +1244119.9332731995 +1239359.243122002 +1259045.3637406388 +1245604.8608313731 +1239359.2431220196 +1259042.431778821 +1244186.1005025725 +1229513.4456073819 +1242104.4746522098 +1252892.8532911374 +1237671.8361628414 +1239246.2885508048 +1238459.4463941827 +1242157.8008843672 +1241591.796434652 +1259051.6320948245 +1257842.0441425454 +1238572.657656981 +1228449.8401373054 +1257842.044103855 +1257842.0441178593 +1250906.5016886943 +1259051.6321147992 +1239307.6905077896 +1259051.6311171588 diff --git a/code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..1a3ddde --- /dev/null +++ b/code/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,194 @@ +1261293.38888 +1300361.14078 +1280524.78915 +1284372.24633 +1299391.76202 +1299326.83 +1299391.76416 +1299326.83199 +1256375.01256 +1299391.76619 +1272753.05346 +1280036.41663 +1274894.50177 +1284372.24565 +1299391.76612 +1286173.62432 +1299391.76591 +1280140.46258 +1299326.83703 +1261434.14807 +1300385.34741 +1263854.01089 +1267133.75601 +1299326.82407 +1285054.85069 +1280327.20209 +1300385.34738 +1300342.38074 +1256375.01248 +1268819.77384 +1263871.64384 +1272732.19358 +1276550.0321 +1300342.3965 +1299391.76627 +1284283.64303 +1299326.83242 +1284372.24269 +1300361.14152 +1284283.65038 +1263854.01072 +1300321.5781 +1293267.84888 +1274945.86546 +1274062.53391 +1274956.6002 +1300361.14288 +1300321.57936 +1284283.64348 +1284969.91398 +1284244.50567 +1258765.85072 +1281112.05799 +1294292.34248 +1263871.64381 +1280216.09952 +1259611.8034 +1280327.54293 +1300385.34738 +1274023.59131 +1300385.34737 +1284372.24334 +1280516.82945 +1261360.13039 +1299326.83059 +1252299.66668 +1299326.83051 +1272752.95555 +1300321.57834 +1299391.79587 +1294292.38509 +1259611.78105 +1300385.34737 +1284283.64175 +1300321.57898 +1258806.42114 +1258948.60083 +1267133.60081 +1299326.82944 +1286141.23922 +1267133.75607 +1286228.23037 +1293223.50146 +1300361.14164 +1300361.14045 +1272752.99692 +1286141.42679 +1299164.58767 +1261293.38903 +1280036.41855 +1280228.74142 +1300321.57903 +1284283.64181 +1294272.3449 +1299391.76592 +1280009.87448 +1284372.24526 +1300321.57874 +1258882.02826 +1272752.99171 +1293223.51151 +1299391.75731 +1259611.76513 +1300321.57881 +1273579.73 +1284372.24776 +1284283.64206 +1257957.67 +1286141.42445 +1300342.38385 +1300321.57842 +1299391.76598 +1280140.45443 +1272732.20494 +1259611.75223 +1256429.41099 +1284328.39268 +1285055.13746 +1300385.34741 +1300361.14094 +1267124.1927 +1294328.09693 +1284283.6364 +1293025.41968 +1284826.12616 +1299326.83112 +1299326.82638 +1256375.0125 +1267133.75609 +1300361.14104 +1280225.15212 +1300385.34699 +1300361.12365 +1300385.34737 +1280036.41782 +1284244.50629 +1243203.80973 +1294272.37553 +1276798.05705 +1284328.39302 +1300361.14096 +1286141.4268 +1274956.59997 +1256429.41151 +1294292.38456 +1286141.6231 +1284372.24969 +1259611.76189 +1280164.53304 +1284372.24777 +1274956.59995 +1274945.86498 +1299326.83086 +1280009.87454 +1299326.83021 +1299326.8159 +1285055.13781 +1274062.5339 +1263854.01101 +1286141.42302 +1300361.14116 +1300361.14113 +1300361.14094 +1258882.95053 +1258014.44937 +1290167.97626 +1267124.2286 +1300361.14094 +1294272.37537 +1284283.64404 +1274945.86497 +1300321.57877 +1285056.38909 +1274945.86498 +1300385.34737 +1284372.24308 +1261360.13051 +1280009.87447 +1294272.37561 +1274062.5339 +1272732.19362 +1280272.60163 +1280036.4182 +1280141.43404 +1300361.14102 +1299326.83033 +1280320.01761 +1258948.67773 +1299326.83185 +1299326.83248 +1293223.50881 +1300361.14094 +1272752.98174 +1300361.14235 diff --git a/code/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..f0fd735 --- /dev/null +++ b/code/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,194 @@ +21 +24 +24 +26 +35 +37 +41 +42 +42 +42 +43 +44 +45 +47 +48 +48 +49 +49 +49 +51 +54 +54 +55 +55 +57 +57 +61 +62 +62 +63 +65 +65 +66 +68 +69 +70 +74 +74 +75 +76 +77 +78 +79 +80 +82 +83 +84 +85 +87 +87 +90 +91 +94 +97 +96 +99 +102 +103 +102 +104 +32 +107 +109 +111 +112 +108 +113 +113 +114 +117 +119 +121 +122 +129 +134 +136 +136 +137 +66 +140 +43 +143 +140 +31 +49 +64 +145 +33 +148 +26 +54 +153 +155 +157 +41 +61 +162 +70 +164 +63 +97 +41 +171 +47 +85 +67 +90 +35 +180 +36 +43 +66 +47 +30 +185 +46 +46 +58 +82 +195 +77 +197 +83 +76 +88 +75 +207 +107 +73 +44 +45 +116 +83 +28 +33 +112 +64 +223 +224 +35 +66 +131 +131 +38 +126 +143 +68 +114 +133 +72 +54 +52 +130 +57 +60 +144 +70 +121 +18 +158 +60 +59 +88 +186 +116 +116 +45 +54 +131 +49 +55 +111 +71 +24 +122 +74 +155 +30 +188 +68 +59 +169 +84 +126 +194 +73 +155 +116 +115 +151 +126 +58 +45 +55 diff --git a/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt b/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..1095b8f --- /dev/null +++ b/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,140 @@ +1286109.0267094078 +1278341.6886210605 +1279555.20396101 +1278341.683966443 +1284516.106330155 +1283294.656652576 +1284262.2909808054 +1286109.1354566857 +1283956.0541536834 +1279555.204019581 +1280947.7283757746 +1283294.6566717112 +1284516.1070517832 +1286109.1349327525 +1285230.5708497535 +1283294.6563062372 +1284273.8392760134 +1288342.63661845 +1288337.4439244114 +1278329.836348348 +1286115.8515044074 +1288343.1965139932 +1284516.1044717913 +1283963.9027528288 +1288342.6367399385 +1283963.9026474722 +1288337.4439933237 +1285236.509490949 +1286109.135596205 +1286109.1345582108 +1288342.3962774437 +1279555.2035645703 +1283963.902697464 +1279317.2210011177 +1284516.1065895604 +1279317.546753578 +1284273.8393678127 +1283281.4211431546 +1279555.2039581724 +1286109.1355990798 +1279555.2035953004 +1279317.2207618975 +1288341.167167586 +1283281.4216381612 +1286109.13541371 +1288343.1963905809 +1285236.513440098 +1284273.8394088943 +1288337.4440461202 +1283963.9027866751 +1279317.5464337652 +1288337.4440176408 +1283956.0555421885 +1284511.498010624 +1284516.1070516554 +1279317.2189573015 +1288343.1953359852 +1283294.6566716058 +1286115.855510538 +1288343.195282641 +1286115.8554095265 +1288340.9878140294 +1288340.9877802406 +1280943.6536038462 +1283963.891072033 +1288337.443825313 +1279555.204025718 +1280939.6860646328 +1285236.5136375972 +1288342.3297214403 +1285230.5187289135 +1279317.5537343968 +1284262.1934414874 +1283281.4218629654 +1285236.513828624 +1285230.5685048348 +1283963.9027433968 +1284516.1042499312 +1285230.5574501236 +1288340.9873396398 +1283281.4200986072 +1283963.9026164724 +1280947.7283171813 +1279317.552371148 +1280939.6875448322 +1284273.8394141064 +1288337.4440341594 +1280947.0033795757 +1286115.8080886698 +1279317.221171816 +1285236.5093621328 +1285230.5718273064 +1286115.855252018 +1284272.7982550517 +1284262.2897894618 +1279553.8509871417 +1283281.4218013086 +1285230.5676025436 +1288343.196518258 +1288343.196487065 +1286109.1355939338 +1283956.0552762907 +1279555.2032037938 +1283956.0555229273 +1288343.1961918448 +1288342.6367156513 +1286109.1355817402 +1279555.2016367216 +1279317.2203658933 +1284511.4950046383 +1288342.580534595 +1288340.9848013092 +1284511.495862288 +1284516.107039202 +1278329.8322883719 +1288342.3742355437 +1284262.2038324429 +1285236.5138432162 +1284511.4967071519 +1284262.2910314337 +1288342.6365991386 +1288337.4437006332 +1283963.9019127486 +1277372.2720314588 +1283281.4215900872 +1284516.1069471943 +1284273.8315371748 +1283963.9027680422 +1285230.5641330073 +1280947.7285140548 +1283963.9025579004 +1279317.2211272602 +1283963.9025218077 +1284516.1054594135 +1280947.7282445228 +1280947.7285424573 +1288340.9877807836 +1283294.652094207 +1277372.27203633 +1280947.7280138428 diff --git a/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..bd19a34 --- /dev/null +++ b/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,140 @@ +1324603.69717 +1317264.6324 +1319351.88671 +1317264.55775 +1325102.04408 +1324175.51677 +1322037.23283 +1324603.92005 +1324451.73546 +1319351.8103 +1319596.6504 +1324175.51372 +1325102.00134 +1324603.92301 +1324172.00911 +1324175.5446 +1322048.28763 +1329364.69271 +1329373.22315 +1317279.5018 +1324610.03055 +1329353.55051 +1325102.06896 +1324436.77733 +1329364.68242 +1324436.76241 +1329373.22312 +1324180.05856 +1324603.91986 +1324603.92662 +1329364.44023 +1319351.77903 +1324436.78511 +1318979.45504 +1325102.03155 +1318983.39533 +1322048.30877 +1324184.37345 +1319351.77327 +1324603.92096 +1319351.82158 +1318979.45751 +1329355.87262 +1324184.36461 +1324603.91713 +1329353.5612 +1324180.06272 +1322048.30839 +1329373.2229 +1324436.7772 +1318983.39371 +1329373.22306 +1324451.77043 +1325115.37853 +1325102.00131 +1318979.45249 +1329353.52406 +1324175.51477 +1324610.0328 +1329353.59796 +1324610.03326 +1329345.82781 +1329345.82512 +1319592.29334 +1324436.78692 +1329373.2229 +1319351.83331 +1319584.39038 +1324180.06266 +1329364.35918 +1324171.9301 +1318983.41346 +1322037.12755 +1324184.34272 +1324180.06256 +1324171.98414 +1324436.77762 +1325102.06428 +1324171.97167 +1329345.79786 +1324184.35749 +1324436.75023 +1319596.64685 +1318983.41202 +1319584.407 +1322048.31041 +1329373.22301 +1319595.13345 +1324610.07131 +1318979.48638 +1324180.05798 +1324171.97743 +1324610.03232 +1322072.29924 +1322037.20821 +1319338.38688 +1324184.34556 +1324171.98322 +1329353.56043 +1329353.56595 +1324603.92091 +1324451.77459 +1319351.83805 +1324451.771 +1329353.57454 +1329364.69112 +1324603.91869 +1319351.86277 +1318979.45436 +1325115.40234 +1329352.93873 +1329345.78434 +1325115.37309 +1325102.00103 +1317279.49152 +1329364.40981 +1322037.14064 +1324180.06005 +1325115.379 +1322037.24062 +1329364.69834 +1329373.21855 +1324436.81564 +1316728.96474 +1324184.34516 +1325102.01399 +1322048.29259 +1324436.7805 +1324171.97894 +1319596.66949 +1324436.78002 +1318979.45517 +1324436.79706 +1325101.94994 +1319596.66717 +1319596.66974 +1329345.78912 +1324175.60445 +1316728.94756 +1319596.66446 diff --git a/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt b/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..d2d52d5 --- /dev/null +++ b/code/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,140 @@ +13 +15 +17 +18 +19 +19 +19 +20 +20 +22 +22 +23 +23 +24 +24 +23 +24 +25 +26 +26 +26 +27 +27 +28 +28 +28 +29 +29 +29 +30 +32 +31 +33 +33 +33 +33 +33 +33 +33 +34 +34 +34 +34 +34 +34 +35 +34 +34 +34 +35 +35 +35 +35 +36 +36 +36 +36 +37 +37 +36 +24 +38 +38 +36 +40 +40 +40 +40 +40 +41 +26 +41 +41 +41 +41 +43 +43 +43 +44 +44 +43 +44 +44 +43 +45 +45 +30 +45 +45 +46 +47 +47 +49 +49 +50 +50 +50 +51 +51 +51 +52 +54 +54 +55 +53 +55 +55 +55 +57 +57 +57 +41 +58 +58 +59 +59 +43 +62 +44 +62 +44 +61 +45 +64 +46 +65 +47 +47 +47 +48 +68 +69 +49 +50 +51 +70 +51 +51 +72 +53 diff --git a/code/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..64ac640 --- /dev/null +++ b/code/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,334 @@ +1290563.732576732 +1286135.7302718684 +1300487.084550429 +1274133.7240020037 +1281339.3273782763 +1274339.6777689895 +1286325.1297519049 +1288296.2170166045 +1275511.464512655 +1255838.1047482605 +1282754.629291202 +1262034.581356667 +1273754.7462131784 +1275552.428571875 +1270912.8203531145 +1275552.4279842125 +1278352.5030003132 +1259358.0424372319 +1266219.0275526159 +1302498.3574684619 +1275528.4823780877 +1262215.102952849 +1264815.808507438 +1282166.080366571 +1276784.3771827526 +1292709.927198308 +1290145.4684663792 +1287336.4604916682 +1252512.5668199682 +1288571.8084416962 +1275552.427562846 +1282956.088958767 +1300656.2507272873 +1274339.6773116244 +1277598.7127849741 +1292704.9195128896 +1292991.3990509263 +1259223.9572938296 +1255468.6596423397 +1296514.7437015506 +1282166.081212124 +1293869.250601271 +1282166.0816993506 +1292704.8703544387 +1300477.981509853 +1279776.3528518104 +1255435.6324910417 +1264687.299012645 +1286325.2208211347 +1268808.320078722 +1282158.478555177 +1302498.263167376 +1255468.6668219888 +1275552.4260751081 +1293001.263017316 +1255435.6329269155 +1300477.981483858 +1286956.5203932172 +1300487.0819928201 +1293504.5986796992 +1264687.2991577634 +1277355.653513309 +1282166.0803656073 +1265569.6149416473 +1296163.526866771 +1295382.104857833 +1282757.9710903596 +1292574.5378912953 +1302801.6310573649 +1279142.2834811585 +1285386.6300526098 +1275528.4843910588 +1268808.4466887487 +1295525.5744078867 +1282628.372147593 +1300633.3773419808 +1282166.0804978146 +1288571.807506608 +1267613.1637495 +1268805.8189973636 +1256692.9710831533 +1254859.0118673346 +1288571.8075779718 +1273754.7453943782 +1274339.6779212616 +1283854.3543582677 +1283385.035012525 +1256644.5289106688 +1274046.5841611954 +1273754.7461102982 +1275511.4645482013 +1275511.4604952952 +1282166.0803879804 +1254614.6336817325 +1210527.9677557603 +1289221.3190473854 +1293869.2506779912 +1282754.628434235 +1264322.4698612294 +1262217.8166158812 +1286325.129758143 +1291405.2383513793 +1292704.919617143 +1259223.9572941938 +1282956.0981787937 +1292566.2146768968 +1264815.6631891308 +1286841.2378994517 +1220986.4697970657 +1293875.2287821318 +1300656.2663825022 +1293875.4041917478 +1283855.5007203957 +1269623.6528988043 +1302801.6290987781 +1259419.0773934533 +1286841.2379078595 +1287334.6768934808 +1280049.6698581458 +1263495.7679758794 +1286328.068480584 +1263498.808193641 +1292991.194300384 +1254556.3918383678 +1283855.561489574 +1283042.781068253 +1277590.82858124 +1268805.8702301262 +1256635.6002388122 +1300487.0820305115 +1262215.089001233 +1268808.3200496216 +1269623.6528282294 +1287334.6730368424 +1300656.2714276891 +1290557.1586155805 +1285386.6300420908 +1286325.1296470833 +1293869.2497268594 +1290556.4044831803 +1275535.2009105769 +1267724.1418734787 +1287334.675515094 +1277003.44193654 +1256144.565876691 +1300656.271427942 +1281349.6363172904 +1275535.200876377 +1293470.767678207 +1288272.1497440813 +1283854.642501799 +1293875.4044644276 +1262217.816818184 +1292709.927211256 +1277598.7187425892 +1279142.2834804205 +1280747.5134611852 +1296163.4305822991 +1279776.3529070104 +1284741.4726743537 +1264658.1709400213 +1286325.1296470775 +1288571.8293754961 +1282158.4746924266 +1273255.182091048 +1284741.4726538502 +1282933.681403905 +1286131.5426693761 +1286871.278092008 +1292709.9271987032 +1293869.2506624954 +1259208.3370306839 +1270912.8534554036 +1283854.352779358 +1302498.263153192 +1270838.3331299315 +1269109.4434650417 +1259419.1140597337 +1275990.0278389482 +1282166.0803996585 +1258877.409907971 +1278352.503449692 +1279996.6876308606 +1300633.37586543 +1287752.8684509716 +1280746.2971399655 +1286368.9001997914 +1289224.678741787 +1275552.4297974273 +1264815.8472173826 +1300487.0820114585 +1265545.9110559865 +1287752.8713580067 +1258071.1180783415 +1292709.9271986813 +1286462.0351942433 +1256644.642527769 +1276784.3751997424 +1277590.8285812342 +1286325.5803265055 +1279142.2834811346 +1286328.070786738 +1279142.2834811592 +1302793.361603873 +1283385.0498580844 +1279770.2535192303 +1300656.2714289105 +1293001.2687154557 +1256644.6423886034 +1290557.1205408531 +1263499.2845558547 +1296493.802591396 +1279776.352903361 +1279776.352905385 +1293875.340185574 +1279770.2535546888 +1292991.1199393852 +1263498.8057591955 +1275528.4823798668 +1286841.2379082798 +1265545.9110564664 +1277068.9966667746 +1283854.3550129866 +1275535.2008848994 +1302801.6310573376 +1293869.2504032752 +1270214.4109522183 +1254950.2953764389 +1296163.4506364812 +1286131.5434170652 +1261018.6829520215 +1280378.4833106578 +1284741.4726814188 +1269973.1150631555 +1300477.9814835952 +1293001.2567742972 +1279776.35277282 +1274178.2282502507 +1277355.4553404064 +1269386.3049130086 +1289224.64324488 +1295525.5743745265 +1275535.200877614 +1277355.6521932017 +1286328.0706336875 +1282166.0813011504 +1295525.5712270534 +1235323.2838643873 +1293875.404468866 +1274389.0749425902 +1255838.1047341349 +1259419.0844659056 +1275511.4645316454 +1267612.8228990422 +1275993.9225294073 +1252048.2667081624 +1274339.6920250978 +1293869.250571839 +1277068.9964004036 +1302801.6297389136 +1300633.3773146784 +1279005.55397203 +1258543.1376979318 +1281349.6495153424 +1283580.7091514098 +1264704.66601248 +1249949.537593142 +1273613.5579072179 +1234140.2655159377 +1290343.3863426389 +1300487.0820547095 +1274389.0991825322 +1285405.496479156 +1288587.1535300582 +1277598.7187425946 +1273664.259595231 +1234070.3339422331 +1259208.337032917 +1300487.0819862133 +1281966.1760507273 +1236241.1769362125 +1264658.1727847173 +1275535.2008801312 +1263495.305670311 +1291381.6094224507 +1284741.4727165042 +1264815.8472174043 +1275552.4275613092 +1269386.304914522 +1251588.4021337708 +1289074.2648767333 +1289132.5679701213 +1288587.1641241247 +1275511.4645317793 +1293001.371066867 +1270252.7844019227 +1288272.1400030178 +1262215.0866764302 +1261022.908471694 +1275528.4824753462 +1282141.8304889575 +1252664.7282090497 +1302498.3396475886 +1234140.2626735452 +1281349.6886868617 +1275528.482378443 +1283854.4697505836 +1271990.9261532323 +1267615.6672078467 +1290557.1586285161 +1273623.9448535058 +1291405.238358813 +1296514.8021779507 +1287761.6789010582 +1289221.318896587 +1302801.6310445992 +1286871.2780920083 +1290557.158620867 +1283855.5011943546 +1293875.40446857 +1290191.20558696 +1291405.2383161206 +1293875.3633116956 +1266219.035454541 +1281339.2574740339 +1293001.2765678538 +1272182.5554889282 +1288296.4873386165 +1277590.8285811762 +1277598.718426046 +1269388.286697504 +1280376.9204635858 +1263498.8059860354 +1263498.8059998695 diff --git a/code/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..ae76c20 --- /dev/null +++ b/code/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,334 @@ +1336611.92983 +1333991.22339 +1346112.53055 +1317109.15513 +1328409.50778 +1318097.23566 +1331130.48531 +1336237.44833 +1319611.9233 +1295047.10492 +1335815.47301 +1290522.14371 +1317284.8064 +1319612.27838 +1312832.1533 +1319612.27773 +1323712.07162 +1302753.22503 +1301682.90242 +1344632.87389 +1314420.66481 +1296213.27493 +1318717.26291 +1326886.83336 +1317774.88986 +1333201.56556 +1333331.31079 +1334748.49637 +1305494.50432 +1336285.42555 +1319612.27726 +1325374.00022 +1346111.06825 +1318097.23522 +1315376.6102 +1333205.12094 +1332922.56022 +1301678.32666 +1299423.58794 +1345469.89838 +1326886.83394 +1333961.36131 +1326886.83429 +1333205.07746 +1346093.01169 +1319123.54155 +1299400.43524 +1296411.03806 +1331130.58184 +1314780.07276 +1322548.57189 +1344637.22172 +1299423.6535 +1319612.27617 +1332908.1534 +1299400.23704 +1346093.0128 +1332676.16306 +1346112.53376 +1338866.81118 +1296411.03991 +1320015.87679 +1326886.83336 +1319208.62585 +1338362.05754 +1337618.47345 +1335816.8059 +1344685.36166 +1344805.38453 +1316480.47056 +1331236.4996 +1314420.66541 +1314780.17636 +1333083.13251 +1325530.74272 +1346107.39948 +1326886.83345 +1336285.42488 +1299297.10669 +1314772.2343 +1297680.65368 +1292855.70669 +1336285.42494 +1317284.8048 +1318097.23582 +1328265.62087 +1332216.1354 +1288506.14974 +1319741.14057 +1317284.80632 +1319611.92334 +1319611.92033 +1326886.83337 +1296587.74217 +1238358.46366 +1333734.50561 +1333961.32157 +1335815.47174 +1298936.09564 +1296206.89925 +1331130.48532 +1338696.28617 +1333205.12102 +1301678.32666 +1325374.0075 +1344676.21374 +1318717.11505 +1321521.80775 +1258088.09687 +1333975.64788 +1346111.09131 +1333975.73069 +1328275.1688 +1304292.73324 +1344805.38307 +1302837.29838 +1321522.08402 +1334758.38296 +1323820.56331 +1293347.29828 +1331130.46267 +1293355.21518 +1332922.23128 +1296562.56502 +1328275.13132 +1324492.1948 +1315379.60605 +1314772.28136 +1288510.08151 +1346112.53161 +1296213.28981 +1314780.07266 +1304292.73321 +1334758.37969 +1346111.09524 +1336605.87255 +1331236.49959 +1331130.48514 +1333961.32827 +1336605.26312 +1314414.21552 +1298101.58008 +1334758.38162 +1315415.52799 +1289311.65913 +1346111.09524 +1328417.07614 +1314414.21551 +1338853.28065 +1336223.58398 +1328265.84268 +1333975.73081 +1296206.9014 +1333201.56557 +1315376.67518 +1316480.47097 +1319889.14868 +1338361.98661 +1319123.46666 +1322748.55306 +1308073.8072 +1331130.48514 +1336285.44067 +1322548.56973 +1318414.97469 +1322749.11333 +1319195.51076 +1334005.03484 +1321566.58921 +1333201.56556 +1333961.30682 +1301672.8558 +1312832.1941 +1328265.61991 +1344637.22172 +1312830.66476 +1305878.88059 +1302837.30619 +1314919.91728 +1326886.83338 +1297479.80866 +1323712.07323 +1324132.16652 +1346107.39794 +1337044.83533 +1319894.14863 +1322489.14234 +1333728.95279 +1319612.27975 +1318717.29962 +1346112.53267 +1319202.58412 +1337044.86174 +1292554.95771 +1333201.56556 +1320701.97778 +1288506.257 +1317773.88137 +1315379.60637 +1319953.20079 +1316480.47004 +1331130.4663 +1316480.47058 +1344803.87407 +1332216.15909 +1319143.90317 +1346111.09524 +1332908.16101 +1288506.25687 +1336605.82492 +1293355.57639 +1345452.49421 +1319123.47545 +1319123.48495 +1333975.71015 +1319143.90321 +1332922.11768 +1293355.21558 +1314420.66481 +1321522.16617 +1319202.58412 +1318101.34486 +1328265.6221 +1314414.21587 +1344805.38453 +1333961.14057 +1304252.10022 +1289482.47413 +1338362.00032 +1334005.03553 +1297536.9778 +1323355.81727 +1322748.22055 +1303265.26982 +1346093.01281 +1332908.14235 +1319123.4094 +1315439.69323 +1320015.79513 +1303760.02688 +1333728.92308 +1333083.13167 +1314414.21562 +1320015.87346 +1331130.46606 +1326886.83401 +1333083.13087 +1268109.87504 +1333975.73081 +1318091.94508 +1295047.10499 +1302837.30377 +1319611.92332 +1299296.82304 +1314920.31551 +1298191.97599 +1318097.24996 +1333961.15364 +1318101.34452 +1344805.38367 +1346107.39946 +1316782.71127 +1293762.16657 +1328417.09133 +1318922.42567 +1296416.43484 +1280463.83125 +1311108.58317 +1262515.42984 +1333239.41521 +1346112.53183 +1318091.96938 +1331252.32542 +1336274.58987 +1315376.6749 +1311141.34161 +1262456.44174 +1301672.8558 +1346112.53375 +1318309.46773 +1254860.54473 +1308073.80985 +1314414.21551 +1293346.95026 +1338695.49433 +1322747.75604 +1318717.29962 +1319612.27726 +1303760.11014 +1297850.17562 +1332318.16046 +1332231.20692 +1336274.5953 +1319611.92332 +1332908.31893 +1303155.30858 +1336223.57122 +1296213.28962 +1297548.32402 +1314420.66484 +1322542.89655 +1281618.48081 +1344632.8605 +1262515.43283 +1328417.13652 +1314420.66481 +1328265.70999 +1308074.56738 +1299303.09536 +1336605.87256 +1317772.5863 +1338696.28491 +1345469.98285 +1337044.60956 +1333734.50556 +1344805.38452 +1321566.59288 +1336605.87255 +1328275.16775 +1333975.73081 +1333351.10617 +1338696.28615 +1333975.7122 +1301238.68274 +1328409.42757 +1332908.17424 +1313986.74748 +1336237.7835 +1315379.60535 +1315376.67465 +1303752.54366 +1323368.15728 +1293355.21584 +1293355.21585 diff --git a/code/opt-results/grid/amalia_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/grid/square_4.0_northIslandRose/funcCalls.txt similarity index 56% rename from code/opt-results/grid/amalia_4.0_northIslandRose/funcCalls.txt rename to code/opt-results-revision/grid/square_4.0_northIslandRose/funcCalls.txt index 2d97358..e8bbf02 100644 --- a/code/opt-results/grid/amalia_4.0_northIslandRose/funcCalls.txt +++ b/code/opt-results-revision/grid/square_4.0_northIslandRose/funcCalls.txt @@ -1,397 +1,334 @@ -41 -29 -35 -40 -39 -80 -32 -20 -35 -43 +9 +9 +9 +11 +11 +11 +12 +12 +13 +14 +15 +15 +16 +16 +16 +16 +16 +17 +17 +17 +18 18 +20 +20 +21 +21 +21 +22 +23 +23 24 -45 -53 -27 +24 +24 +24 +25 +25 +25 +25 +25 +26 +26 26 -57 -36 -34 -110 -34 -41 -39 -22 26 -61 -20 27 -21 -38 -30 -18 -32 27 -16 -283 -132 -37 -18 -37 -18 -44 -33 -51 -68 -14 -74 -16 -26 +27 +28 +28 +29 +29 +30 +30 +30 +30 30 31 -34 -22 -57 -21 -33 -49 -29 -43 -42 -33 31 31 -29 -38 -16 -22 -44 -47 -25 -29 -33 -17 -46 -22 -28 -27 -23 -36 -23 32 -57 +33 34 -46 -44 -44 -19 -37 -29 -22 -44 -28 -53 -49 -78 -32 -18 -44 -38 -29 +34 +36 37 -47 -18 -26 -23 -40 -30 -30 -58 37 -50 -94 -43 -14 +38 +38 +38 +39 41 -33 -29 +41 +42 +45 +46 +47 +47 +47 +53 +53 +57 +59 +60 +62 +64 +12 +71 +13 +73 +15 +10 +20 +16 +19 +17 +88 +24 +21 27 +89 +15 19 -12 -23 +11 +17 18 -26 -44 +11 +16 +15 +24 +22 97 +20 +99 +22 28 -54 -23 -38 -25 -17 -39 -21 -32 -39 -25 31 +20 +24 +30 +21 37 -27 -35 -53 -47 -28 -53 -102 -55 -53 -48 -32 -34 -34 +16 28 -32 +25 29 -35 -52 -26 -22 17 -39 -32 +104 +27 +40 +107 +21 +25 +21 22 +17 +110 +45 +36 +47 +23 42 -63 32 -31 -46 -53 -39 -29 -22 -22 -24 -43 -30 -55 -43 -34 -20 -41 -21 -40 -29 -24 -34 33 +12 21 +120 +122 +54 +39 35 -36 -41 -32 -32 -30 -21 -30 -23 -47 -32 +29 39 -30 +129 +17 +16 +33 +48 +69 +32 +38 +24 +8 +37 +56 +13 +9 15 -31 -43 +154 +34 +14 26 -63 -36 21 -47 17 -36 -50 -32 -42 -142 -30 -60 -53 -12 -35 -28 -29 -54 -18 -29 20 -27 -43 -61 -19 -47 -53 -27 -23 -61 -29 -34 -29 44 -27 +28 21 +101 +9 +96 +24 +99 18 +171 +122 +39 +12 +101 +17 +22 +23 +22 +24 31 -26 -20 -45 -21 +29 +22 +55 +108 +25 +53 +110 +32 41 -59 -35 -26 -112 -21 -40 -45 -31 31 +22 21 -19 -37 -60 -36 -23 -31 -29 +112 +24 28 +93 +35 +42 +27 29 -135 -51 -31 -49 -25 -45 -38 +37 +120 +137 +46 23 27 -26 -44 -157 -45 +22 +34 +11 +28 +22 +50 +36 57 +135 +9 +25 +136 +20 +18 +136 +120 +14 40 -16 -23 +149 +46 +159 +14 +81 +27 +14 +20 +52 +90 65 -22 -35 -24 -45 -22 -38 -26 -31 +98 +43 +9 +14 +16 +10 +118 17 -28 -33 -34 27 -39 -69 -23 -61 -49 26 -24 -23 -20 -63 -63 -17 -40 -13 +41 +15 +69 +39 +141 +14 25 -37 -95 -32 -31 +16 +121 +25 +9 +39 +92 31 -18 +21 +38 +25 +40 +20 +48 +47 +32 +30 32 -49 +44 +52 27 +32 40 -64 -36 -41 -39 -28 -35 -15 -20 -41 -35 -21 -73 -34 -24 -26 -23 -37 +27 +117 +18 +22 +47 +18 24 -19 -26 -53 +32 43 -46 -20 -20 -51 -58 -37 -45 -23 -26 -36 -28 -26 -29 29 -45 -72 -32 -32 -22 -36 +30 +126 +27 +13 39 -43 -22 -23 -17 -79 -19 -28 -38 -354 -101 29 -66 -53 -32 -63 +12 +26 26 -28 -31 -69 -42 -69 -20 -42 -37 -29 -39 -20 -34 -30 34 -40 -46 +122 +41 +55 +79 +26 +70 +155 +23 +54 +21 +65 +14 +106 +55 +19 +107 +41 +10 +24 +90 +14 +25 +44 +151 +15 +50 +38 diff --git a/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt b/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..0ce2682 --- /dev/null +++ b/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,185 @@ +1287938.884342186 +1280699.2918217694 +1276724.0835068005 +1287454.325429401 +1284182.646300971 +1276724.641344215 +1272289.4872830492 +1284194.0840740295 +1285094.3422781008 +1285094.549587618 +1285339.0427444247 +1281333.4314485746 +1287479.782883568 +1286579.1817265768 +1266900.4143321766 +1284438.7537980767 +1286997.8708513407 +1266900.456785588 +1260581.7337746504 +1287434.1948871687 +1287434.1948812064 +1285378.6714541311 +1280699.297462692 +1285669.312511721 +1284374.9869568506 +1261890.618224317 +1285854.4457891078 +1283495.5923259736 +1284234.8732270643 +1283074.2733984096 +1279462.2163802648 +1266900.4709532736 +1275084.6404211044 +1287479.770849496 +1266881.275056771 +1266900.4552346999 +1278302.08778136 +1278699.1964226204 +1283559.6421630685 +1285378.676789661 +1278238.1916825806 +1262937.183030901 +1262937.2023500344 +1284554.297968688 +1285835.0911802095 +1281018.7394954755 +1281333.4309134996 +1271525.7095369748 +1287459.7348293497 +1291771.7910619904 +1262937.1950738148 +1284549.7704922038 +1285112.8623852308 +1283073.3256382912 +1263631.3349734773 +1274295.054141024 +1283557.922124308 +1278699.1966485945 +1281333.387087616 +1283074.2677807738 +1287434.1947170629 +1283316.5836024277 +1284438.753793872 +1284549.778155728 +1274290.8601783738 +1278317.9638184148 +1271976.4118437166 +1281316.3967056696 +1291783.381245259 +1283079.5915342022 +1281730.3380899897 +1283088.9568775014 +1262992.3957759028 +1280692.550478973 +1287434.1934966666 +1285945.6622431446 +1284011.606314574 +1286579.424032547 +1297001.6340031796 +1285844.378221846 +1282196.8288983307 +1262992.393026811 +1284589.5298058998 +1279744.9734376795 +1258787.494662654 +1283079.5915569728 +1283481.3662383652 +1278453.1701778227 +1278302.1564754439 +1284591.0487158224 +1289236.6805703065 +1284388.188485076 +1287948.3916793505 +1284234.8738866146 +1281495.2936467489 +1279613.4418296444 +1279744.9734376795 +1263631.3601338658 +1297001.5695931758 +1284194.1622128307 +1278452.96722371 +1258245.1022514564 +1279744.9734374979 +1279611.7791225088 +1283088.9571034291 +1284483.4745834714 +1280699.296743772 +1281466.1203165967 +1283481.3825719329 +1290913.052260849 +1281535.6145724552 +1285676.1967343744 +1284549.693323534 +1263637.5999455343 +1283687.5059770665 +1280699.3025573988 +1287459.7943283694 +1283316.5436755184 +1273953.1705194328 +1285676.2012062066 +1279613.4325217959 +1281006.6985314006 +1260581.7311196327 +1279462.2196175624 +1284031.5924249701 +1287479.762087885 +1285807.0227519367 +1284374.9868934385 +1275202.8539685654 +1279611.7289668554 +1285676.214461199 +1286579.4242441345 +1287454.3383410033 +1278417.2196641434 +1290138.032816213 +1287832.3498478536 +1273958.513437056 +1273967.8295140213 +1287931.484735077 +1279739.917480238 +1279613.4369411997 +1281535.6189823572 +1257505.2571811494 +1287833.803882437 +1287931.4307920337 +1292003.6400721918 +1285844.3774430978 +1285669.3726053436 +1278302.1204353257 +1287459.9971540903 +1284554.3085449918 +1285854.446460834 +1262992.3951582944 +1281535.6171040745 +1295535.5496020697 +1281018.753674538 +1284194.079923328 +1286997.8836496356 +1279222.928961996 +1290145.1131573971 +1281010.0816183086 +1287479.7622007167 +1273953.1757947165 +1290145.1156879393 +1278699.1949015772 +1283559.6442842209 +1283073.3751828761 +1285094.5494598679 +1283073.6747561789 +1257505.2567246808 +1280045.8306159007 +1274290.860021432 +1283073.885273462 +1287948.3916793808 +1262937.2032739979 +1278302.1547037198 +1281014.3685711757 +1258798.8441265647 +1262937.1991733268 +1279744.973431502 +1262937.203150522 +1283557.8746765961 +1284537.250320643 +1291771.797715244 +1286579.4240483867 diff --git a/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt b/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..9ec0958 --- /dev/null +++ b/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,185 @@ +1332760.83315 +1321850.81714 +1315700.30516 +1329767.40916 +1322505.64403 +1315700.98163 +1313365.06143 +1322506.62049 +1328865.87687 +1328866.12338 +1323991.11218 +1323025.41954 +1335361.54902 +1326838.76988 +1309166.08598 +1326980.32439 +1333013.7352 +1309176.2224 +1301394.99633 +1329761.15851 +1329761.15851 +1324009.63565 +1321850.82541 +1327906.3605 +1329331.85301 +1302099.83696 +1330188.18434 +1323138.10683 +1329739.53771 +1329058.53436 +1318919.45906 +1309180.50454 +1315945.14221 +1335361.52379 +1309107.05751 +1309179.32223 +1317680.20711 +1317671.84596 +1323377.18039 +1324009.65081 +1317835.55061 +1301134.49049 +1301129.67949 +1320562.58635 +1330176.10146 +1320738.93112 +1323025.41872 +1314597.16396 +1335339.53679 +1331728.04301 +1301127.56101 +1324818.00661 +1328846.1328 +1329061.72569 +1301307.16784 +1315155.91089 +1323383.82299 +1317672.02233 +1323025.38728 +1329054.48747 +1329761.15824 +1327190.79385 +1326980.32438 +1324818.05588 +1315153.41189 +1320669.53927 +1313336.19319 +1323012.82866 +1331741.79259 +1321713.2128 +1322875.25512 +1330046.5397 +1301141.43497 +1321848.45026 +1329761.15633 +1326467.44595 +1323087.83998 +1326875.01335 +1340693.94169 +1324044.11979 +1324939.9923 +1301141.52554 +1321973.562 +1322354.3447 +1300832.00126 +1321713.21282 +1323135.22693 +1321267.91476 +1317684.28862 +1320572.88121 +1332612.68288 +1329317.7728 +1332769.39086 +1329739.53786 +1321568.97731 +1319328.55784 +1322354.3447 +1301306.97372 +1340693.92624 +1322506.72457 +1321267.71034 +1300500.26835 +1322354.3447 +1319338.79556 +1330046.53981 +1326992.80376 +1321850.82408 +1329194.88039 +1331319.27251 +1331828.74351 +1321569.84064 +1327912.30143 +1324817.97238 +1301292.06856 +1322269.31687 +1321850.84061 +1335339.6048 +1327190.74297 +1311856.53982 +1327912.3078 +1319328.55469 +1317817.78746 +1301394.99357 +1318919.4608 +1323114.76028 +1335361.5107 +1324031.79282 +1329331.85292 +1320456.56647 +1319338.71006 +1327912.32595 +1326875.01374 +1329767.42302 +1320061.55944 +1339038.24763 +1328666.26863 +1311947.92874 +1311953.32001 +1332755.10844 +1322356.57941 +1319328.55204 +1321570.2635 +1299373.37747 +1328567.97541 +1332755.05727 +1334048.99134 +1324044.12033 +1327906.44167 +1317682.73181 +1335339.93427 +1320562.97952 +1330188.1854 +1301142.99093 +1321569.89114 +1334099.71132 +1320738.94292 +1322506.61504 +1333013.73798 +1321558.45534 +1339032.86834 +1320736.75711 +1335361.5109 +1311856.27093 +1339032.86979 +1317671.15253 +1323377.18235 +1329025.54916 +1328866.1233 +1329125.66521 +1299371.94969 +1322348.95293 +1315153.71511 +1329073.10792 +1332769.39085 +1301131.55801 +1317683.97468 +1323100.7537 +1301027.60605 +1301135.44782 +1322354.3447 +1301131.02638 +1323383.77312 +1324808.44743 +1331728.04843 +1326875.01338 diff --git a/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt b/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..5e59ae8 --- /dev/null +++ b/code/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,185 @@ +7 +8 +8 +9 +9 +9 +9 +9 +9 +10 +10 +10 +10 +10 +12 +10 +11 +11 +11 +11 +11 +9 +12 +12 +12 +12 +12 +12 +13 +13 +13 +13 +13 +13 +13 +13 +13 +14 +14 +11 +14 +14 +14 +15 +15 +15 +15 +15 +15 +15 +15 +17 +16 +16 +16 +16 +16 +16 +16 +16 +17 +17 +17 +17 +17 +17 +17 +17 +17 +18 +18 +18 +18 +19 +19 +19 +20 +19 +20 +20 +20 +21 +10 +21 +21 +21 +21 +11 +21 +22 +19 +12 +12 +23 +23 +13 +24 +13 +24 +13 +13 +13 +25 +14 +14 +14 +14 +14 +26 +15 +26 +15 +15 +15 +15 +15 +15 +16 +16 +16 +16 +16 +17 +17 +17 +18 +18 +18 +18 +19 +19 +19 +19 +19 +19 +19 +19 +20 +20 +20 +20 +20 +33 +21 +21 +22 +22 +22 +22 +22 +22 +23 +23 +23 +24 +24 +24 +25 +25 +25 +25 +26 +26 +27 +27 +27 +27 +28 +28 +29 +29 +30 +30 +31 +31 +32 +33 +34 +35 +35 +35 +36 +37 +56 +39 diff --git a/code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..210c023 --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,145 @@ +1307327.6926631343 +1311662.336757071 +1309963.9157739044 +1299540.0074102562 +1304696.1351559379 +1297582.7255067336 +1314391.2249976734 +1293949.0402559293 +1309955.2120311342 +1310557.9255518198 +1306658.3280507952 +1316000.2277715523 +1310809.9371766003 +1304435.134701684 +1305628.7194802675 +1302983.4604843652 +1298247.049144745 +1299540.0523957491 +1321706.7114587454 +1321381.8626717818 +1305647.8290735092 +1299706.2486218764 +1317306.3689864352 +1317774.9307485 +1305647.8549055958 +1321843.446633551 +1306223.0213511216 +1298173.7639281712 +1305647.6672830621 +1311816.81679103 +1311848.5413259168 +1310120.4218835873 +1305628.7231220468 +1302824.0114002228 +1312006.227306671 +1298246.9098091691 +1311578.2526850102 +1317594.6206020461 +1305628.7210292683 +1299400.3417842095 +1294165.4447619014 +1311858.3976565732 +1296354.7381375819 +1286034.6460922537 +1305628.6515840234 +1310563.0727491074 +1317306.3808002425 +1297876.1353929087 +1305628.7156575928 +1298173.7639664516 +1308674.8145511725 +1302843.4375599404 +1309254.7193368317 +1304593.6115360877 +1321120.0045938098 +1317425.7914599099 +1316648.8247700925 +1279790.424037451 +1317624.9768416632 +1302030.2962976478 +1305628.6991510894 +1312172.9752469824 +1311790.730802119 +1317041.7643624528 +1307495.258064679 +1294888.9400272574 +1310419.741460809 +1302450.5372394416 +1295055.8613280258 +1305899.3630783926 +1311165.0690735274 +1296031.1737272118 +1316410.5646678004 +1299428.7637247632 +1313546.3469870947 +1306095.485466563 +1321119.9540597813 +1320716.5839227762 +1309730.6861294725 +1279789.5540187326 +1312164.6498074718 +1289217.0324679087 +1314390.5712269922 +1321848.6760216402 +1297956.4684298208 +1310421.3289937894 +1317965.368460483 +1295823.8570366476 +1302824.0088161596 +1321069.7511237059 +1299706.2309429406 +1294546.1645838204 +1298246.9091978297 +1294888.94028036 +1310554.914716698 +1304602.184073614 +1309414.967497103 +1311635.1154077672 +1298173.7634870626 +1312179.2272282587 +1305647.7892130956 +1322130.0580124026 +1321848.797831431 +1315568.2452674047 +1302194.758725201 +1321706.0957274404 +1312169.0598774212 +1295975.2448896768 +1310423.7303722263 +1306658.394037457 +1284625.575859106 +1305628.7182256135 +1319137.1927973446 +1291104.5696189695 +1310708.3811357468 +1309007.7066571563 +1298246.901423961 +1291038.4297346 +1292701.7906781216 +1309761.2381976522 +1278441.0844981566 +1316751.8220348873 +1320169.2573020938 +1297018.3911617177 +1299400.225891108 +1319766.1991671075 +1317594.6205519214 +1278454.5131783434 +1309200.7605930488 +1301901.5064749185 +1294596.813334447 +1296397.451170405 +1311867.2115356238 +1296485.3909140767 +1295984.3188937765 +1294449.341398696 +1296397.916559147 +1302969.7027343994 +1311858.4226685155 +1321843.641343222 +1315876.5415368043 +1302983.5539385919 +1296354.755560312 +1302843.3641659766 +1297920.4666347324 diff --git a/code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..288b10e --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,145 @@ +1348034.89957 +1347961.22928 +1347457.36011 +1332789.08482 +1340865.15456 +1330653.77046 +1351559.77053 +1324152.32214 +1347444.97425 +1347669.9059 +1343536.35627 +1353909.66772 +1346328.94328 +1335811.56023 +1341708.01794 +1337915.21263 +1324069.15658 +1332789.60357 +1360054.33782 +1359556.57962 +1341951.52202 +1332869.78438 +1354969.70869 +1356963.85059 +1341950.36603 +1360265.71365 +1342962.29029 +1326147.91313 +1341952.61381 +1347646.87308 +1346126.73148 +1344577.97264 +1341707.79775 +1337511.8825 +1345617.56384 +1324059.02672 +1348111.60097 +1356233.3314 +1341708.92874 +1332441.39344 +1320449.22024 +1347591.0365 +1323514.67709 +1308360.37118 +1341709.10353 +1347592.51976 +1354971.42798 +1330893.85027 +1341707.96579 +1326148.04398 +1346055.94963 +1337599.2584 +1342774.06251 +1340937.35494 +1360423.10875 +1357024.53662 +1355016.38991 +1316486.84434 +1354945.17697 +1336407.45261 +1341704.05832 +1347988.79001 +1347450.76701 +1355471.32933 +1344177.41343 +1321953.99545 +1347406.68346 +1336785.2613 +1322643.68037 +1348605.42169 +1346380.061 +1323933.8771 +1352868.63369 +1332505.0506 +1352382.02797 +1343968.73893 +1360420.04918 +1359038.59648 +1346788.41998 +1316476.55056 +1348110.61119 +1316580.1936 +1351560.11319 +1360088.06148 +1323872.58902 +1348414.97754 +1355391.77687 +1323663.21874 +1337511.58678 +1360629.14391 +1332870.1344 +1322327.27248 +1324061.2329 +1321954.03179 +1347540.98475 +1340926.69681 +1342423.07201 +1347344.22808 +1326147.95579 +1346182.93897 +1341953.34495 +1360712.20699 +1360083.92701 +1352396.39856 +1335116.29405 +1360040.14844 +1346201.47111 +1324489.28167 +1348398.89051 +1343531.16779 +1321058.05623 +1341708.17914 +1358532.63275 +1318675.56949 +1346491.8883 +1344771.5665 +1324063.85764 +1318732.65444 +1320401.89462 +1343282.14886 +1312805.99627 +1353114.30211 +1359024.18458 +1323747.98154 +1332432.46078 +1358993.88861 +1356235.23736 +1312940.47202 +1346735.51484 +1344500.23825 +1321884.51965 +1325291.68131 +1346219.14343 +1325378.23173 +1324434.16834 +1321141.41213 +1325383.60205 +1337855.9232 +1347593.30327 +1360264.15241 +1353867.42191 +1337918.04372 +1323512.59544 +1337598.95022 +1324111.66362 diff --git a/code/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..3f8e431 --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,145 @@ +18 +28 +29 +32 +34 +34 +36 +38 +39 +39 +39 +44 +46 +47 +47 +49 +52 +52 +53 +54 +55 +56 +56 +58 +59 +61 +63 +64 +65 +67 +70 +70 +72 +75 +76 +78 +78 +79 +80 +80 +82 +84 +84 +88 +90 +92 +94 +98 +101 +108 +108 +111 +113 +114 +118 +120 +43 +35 +130 +133 +45 +135 +137 +138 +136 +44 +144 +145 +156 +152 +50 +153 +153 +54 +156 +156 +159 +64 +96 +31 +168 +38 +61 +51 +65 +94 +65 +84 +77 +184 +54 +62 +61 +67 +30 +44 +193 +193 +82 +55 +66 +201 +76 +210 +210 +26 +43 +224 +141 +81 +31 +51 +245 +61 +34 +246 +249 +165 +56 +52 +29 +252 +58 +163 +59 +265 +45 +24 +163 +82 +55 +109 +191 +158 +188 +53 +61 +130 +100 +80 +62 +139 +100 +131 +315 diff --git a/code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt b/code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt new file mode 100644 index 0000000..37dad6b --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt @@ -0,0 +1,128 @@ +1409863.9131496556 +1388337.1786893134 +1410350.9246905264 +1375747.0375830722 +1416280.4054812521 +1416658.7855007292 +1355061.920738095 +1368502.443056428 +1405481.4260442485 +1374722.1056013505 +1390080.0431212892 +1408633.6266692113 +1411990.3756938553 +1376229.3252011966 +1377931.2494974737 +1410361.3348590136 +1391617.0424469016 +1415283.5225534232 +1398097.7645919584 +1416071.865530771 +1415249.6147199513 +1372443.6342467156 +1403434.648291782 +1415016.6400948502 +1397867.5894873824 +1386049.1980978008 +1415776.4508156364 +1410110.023998349 +1415747.4712207925 +1410362.2097515925 +1415037.1033344676 +1377935.6239413323 +1377931.5551788642 +1417439.4876242485 +1415703.899269185 +1412127.118393274 +1378606.5426244244 +1415703.8326056162 +1415283.8668314554 +1415664.7720158359 +1413316.7534290776 +1412474.6113351712 +1413900.2502541 +1413317.1240363892 +1392475.6558990115 +1391861.5914640178 +1372656.912155319 +1412579.7824642637 +1387744.2500054822 +1416664.8677973072 +1392333.2537752804 +1415655.2501665708 +1416644.0391303203 +1413924.1075019094 +1375210.6713662392 +1414112.9040439425 +1392649.0114528153 +1403434.5934665748 +1413506.3600650982 +1408323.8232874158 +1386162.8258407803 +1414155.7195324993 +1391146.4466560853 +1413205.9648773838 +1377339.7042514894 +1416222.2980561275 +1416279.6705737696 +1375207.2501192677 +1370357.91409432 +1388843.684264978 +1384405.4399983156 +1385689.6973836538 +1397050.467951394 +1377806.9984252425 +1388870.1428149175 +1413939.6412310721 +1414155.7195879146 +1413298.3499530135 +1410730.7866475924 +1388828.5040499908 +1413939.715822517 +1368154.0482501097 +1413885.2856304897 +1384405.4384087329 +1415302.7765847216 +1392649.0702973667 +1385561.3728955225 +1414194.1858720232 +1413939.681815158 +1372676.8359264259 +1396369.6228253774 +1385673.8536681635 +1370508.0570050837 +1377343.1390031814 +1406511.992355033 +1415044.9606997548 +1414988.4859167791 +1377317.4629336286 +1391861.571317638 +1391808.6222055112 +1416356.2321516988 +1385369.4661780233 +1396380.8605381174 +1392478.32702922 +1370437.0117096528 +1415285.3170392106 +1392955.307883314 +1413309.2405985359 +1370437.2846918807 +1386686.0078985826 +1416284.682101985 +1377339.704923517 +1410362.1923188546 +1413317.107226112 +1415651.068519934 +1376786.498044068 +1415037.1922881058 +1391861.6116462327 +1413511.969290024 +1408555.7562482934 +1389070.7507251508 +1410110.8551001693 +1377935.6205482578 +1396380.8606687023 +1379907.4359740966 +1415740.4450353319 +1415585.1814775942 +1408106.260005491 diff --git a/code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt b/code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt new file mode 100644 index 0000000..fbe55a5 --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt @@ -0,0 +1,128 @@ +1467306.36592 +1433555.22671 +1467997.88861 +1419767.38567 +1473656.6637 +1474659.63653 +1402071.83387 +1406407.29202 +1460697.41191 +1416847.98422 +1439310.39528 +1462541.28672 +1470254.18269 +1416134.08932 +1419945.83655 +1468073.90443 +1441607.14664 +1472869.33682 +1450340.31793 +1472336.66468 +1472768.66476 +1414007.73694 +1463738.84467 +1473367.395 +1459773.93665 +1430173.43224 +1474032.97677 +1467871.25697 +1473252.15221 +1468068.14418 +1473312.00069 +1419691.39724 +1419910.49421 +1473661.54548 +1473315.65312 +1471462.22248 +1420722.51544 +1473316.47145 +1472873.2352 +1474646.8935 +1471588.4119 +1469400.96157 +1471439.60816 +1471590.15919 +1442536.69656 +1436594.90564 +1413352.91227 +1472048.45193 +1435786.45478 +1473260.80496 +1442192.43445 +1473570.35852 +1473204.73246 +1471324.60524 +1416476.34488 +1471919.0473 +1438072.18153 +1463738.86654 +1472019.73055 +1462459.32434 +1431071.09473 +1471580.8433 +1438440.02713 +1471950.94934 +1419337.1184 +1472442.68884 +1473924.96623 +1416554.30748 +1408012.80174 +1435142.83214 +1431052.81853 +1430982.5664 +1447077.76863 +1419580.58678 +1442928.82494 +1471213.93655 +1471580.71599 +1471909.07853 +1464889.16527 +1435270.08206 +1471219.71085 +1406152.2621 +1472725.57531 +1431051.93642 +1471695.78121 +1438065.24694 +1430629.30814 +1472222.83627 +1471220.23627 +1413555.412 +1446661.55993 +1431389.9775 +1408123.73311 +1419392.44579 +1461008.84807 +1473884.78113 +1473110.52934 +1419502.76857 +1436599.50537 +1441591.63975 +1474604.92257 +1429587.17656 +1446661.85536 +1442520.34831 +1408347.95164 +1472885.62317 +1438421.3601 +1470822.09544 +1408363.22724 +1431005.22983 +1473727.19711 +1419334.30723 +1468070.05831 +1471594.05073 +1472854.37655 +1417822.06831 +1473310.82724 +1436597.68109 +1471259.02484 +1463369.95305 +1435514.00183 +1467851.81919 +1419693.28906 +1446662.01751 +1423291.53719 +1474391.05512 +1474199.99537 +1465387.20481 diff --git a/code/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt b/code/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt new file mode 100644 index 0000000..2e1df2a --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt @@ -0,0 +1,128 @@ +24 +32 +34 +34 +37 +37 +38 +40 +57 +45 +45 +47 +48 +49 +50 +50 +51 +54 +56 +56 +57 +57 +58 +61 +62 +64 +65 +67 +69 +69 +69 +70 +72 +72 +76 +77 +77 +79 +79 +81 +83 +92 +93 +97 +113 +116 +117 +124 +123 +126 +127 +128 +47 +131 +134 +134 +139 +44 +145 +143 +144 +146 +147 +150 +151 +160 +55 +162 +67 +168 +49 +50 +173 +179 +49 +73 +182 +52 +183 +90 +102 +44 +187 +66 +58 +196 +203 +102 +111 +119 +53 +129 +64 +125 +115 +40 +174 +130 +241 +141 +79 +125 +248 +254 +143 +136 +47 +150 +46 +104 +42 +105 +53 +91 +204 +296 +58 +70 +158 +211 +305 +44 +76 +127 +210 +98 +150 +39 diff --git a/code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt b/code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt new file mode 100644 index 0000000..1ca6e8e --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt @@ -0,0 +1,108 @@ +1485871.7580895342 +1487370.8976715978 +1497379.8025684557 +1485972.0104565169 +1469259.483333686 +1493313.1468177268 +1480069.717508436 +1468461.8170913572 +1468461.6106221299 +1485727.798366767 +1495768.4460471703 +1497851.0585714146 +1492092.0416066202 +1492866.0587894272 +1498082.258298188 +1465855.2718731654 +1495553.9343427853 +1468645.390610795 +1465855.2710406461 +1481966.7227391822 +1495440.8736738407 +1497067.07782094 +1491548.291522581 +1498899.2947109619 +1487970.5528588388 +1495095.4252448385 +1492812.0381152604 +1495553.9350488854 +1471673.2761244792 +1468318.139967611 +1465934.4979556587 +1496246.1467061008 +1477332.347177573 +1481427.823525103 +1466144.1667310772 +1468453.9152630218 +1478724.8157106736 +1471344.3360892972 +1466676.2562446527 +1496677.5595267115 +1474807.5811536214 +1468450.9626607252 +1492640.6591443531 +1496515.0767122451 +1488122.8178558815 +1487645.01012405 +1468318.417724322 +1491310.9700267664 +1466608.7912140377 +1475742.7967310338 +1468318.8919049227 +1474807.7102764738 +1492090.8768907744 +1465855.2727174542 +1468295.7004880728 +1471430.1472974534 +1471430.147319075 +1489571.2501800214 +1468716.5883387672 +1486425.2683436421 +1468461.7694762577 +1465780.1371362288 +1474807.8106113079 +1470893.5423505148 +1488688.9883547837 +1474627.647932513 +1486409.17692717 +1488080.6103838158 +1479628.3373776725 +1474249.2386590103 +1485064.5053878715 +1479628.6553303525 +1484063.2652118565 +1471392.2994079078 +1489745.1447873118 +1481430.774585079 +1491602.102370359 +1468461.819651171 +1471182.01149405 +1498899.2925417188 +1468205.0039766405 +1468194.5100227518 +1494016.251647594 +1471344.3355389491 +1491479.843665744 +1498899.2727564715 +1474623.9490897327 +1476039.10081572 +1488060.926649917 +1465845.092904751 +1471344.3362023865 +1489629.2667206996 +1487791.5454061937 +1498898.9489753356 +1465855.2728963555 +1488022.7252869825 +1489747.0772315601 +1494079.374854169 +1496320.1927625854 +1488404.3341795478 +1495553.9133073613 +1488127.5823513074 +1488193.8218188493 +1487824.0337018308 +1488060.7475104376 +1477653.3460885799 +1496277.0398481162 +1484877.3807312076 diff --git a/code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt b/code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt new file mode 100644 index 0000000..6680239 --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt @@ -0,0 +1,108 @@ +1548663.28839 +1550533.57771 +1563985.97919 +1548860.29422 +1525276.99345 +1560769.08929 +1540937.32725 +1522160.89357 +1522170.03152 +1547943.58454 +1562129.883 +1563633.12951 +1558426.651 +1560558.4614 +1562322.77681 +1518904.83054 +1561820.18943 +1523991.62873 +1518904.84698 +1544169.37398 +1561529.00727 +1563527.47883 +1558208.90647 +1562935.87518 +1549565.85497 +1561553.74719 +1560278.89229 +1561821.54366 +1532602.80871 +1522834.83888 +1518903.64712 +1562835.59765 +1539579.68652 +1539843.5027 +1519252.16933 +1523073.14032 +1542665.90124 +1525856.67155 +1520577.20649 +1564138.02158 +1531968.24412 +1523092.94053 +1558286.43354 +1563327.64901 +1549557.93322 +1548858.43231 +1522842.46271 +1559396.08922 +1520499.759 +1533967.33062 +1522622.21585 +1531968.41285 +1558460.83649 +1518904.49219 +1522074.57282 +1526195.99122 +1526195.73319 +1545885.71006 +1524069.02107 +1543141.4294 +1522162.16768 +1521184.86849 +1531968.54451 +1525928.41028 +1553948.95091 +1532850.92024 +1543271.77044 +1549333.0955 +1543817.15322 +1533119.04567 +1541094.45276 +1543802.29446 +1542774.92492 +1526279.88903 +1545449.66747 +1539820.17615 +1561700.60278 +1522160.19723 +1533506.92496 +1562936.46015 +1521186.19487 +1520980.86933 +1560378.64108 +1525857.14186 +1558006.98753 +1562936.40854 +1532834.81421 +1534670.09093 +1549195.94686 +1518936.33904 +1525856.6925 +1544716.24118 +1549610.43283 +1562945.15474 +1518904.58231 +1546620.22317 +1545418.64839 +1560515.96016 +1561395.33991 +1554954.89156 +1561825.01785 +1549481.24568 +1549526.37479 +1549072.07227 +1549193.10063 +1541584.37026 +1562643.2564 +1547337.50583 diff --git a/code/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt b/code/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt new file mode 100644 index 0000000..080142f --- /dev/null +++ b/code/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt @@ -0,0 +1,108 @@ +24 +28 +29 +37 +37 +41 +43 +44 +44 +45 +53 +53 +56 +57 +58 +59 +60 +62 +63 +63 +72 +73 +46 +82 +87 +88 +92 +100 +112 +115 +121 +124 +127 +127 +129 +133 +40 +135 +135 +136 +138 +139 +144 +50 +148 +148 +149 +44 +155 +154 +158 +158 +82 +49 +165 +170 +170 +178 +74 +182 +182 +186 +102 +192 +105 +198 +207 +210 +76 +215 +219 +18 +83 +227 +132 +229 +127 +47 +239 +45 +70 +70 +139 +39 +132 +259 +258 +188 +266 +143 +79 +275 +104 +125 +59 +92 +285 +288 +187 +291 +292 +160 +129 +159 +119 +39 +172 +104 diff --git a/code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..2784009 --- /dev/null +++ b/code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt @@ -0,0 +1,216 @@ +1438066.6154642846 +1435336.7820191982 +1423519.6843713422 +1439719.9463182664 +1439467.4428366749 +1435164.1164964407 +1428087.2979984735 +1440338.4504968703 +1439317.4930025453 +1446241.479769181 +1427831.1280170938 +1420318.4593037774 +1429458.6892251535 +1446658.1250180271 +1434257.4368542696 +1415456.7692177612 +1427833.8589781588 +1433231.0166527862 +1440651.4889983807 +1446304.9558507656 +1433738.341595135 +1438532.7037940691 +1427239.7682677524 +1437391.7602395555 +1440298.4386645393 +1447893.613673995 +1428740.749678513 +1426381.209808996 +1425443.2296103882 +1435363.8711371366 +1441164.4404963139 +1423224.8897132818 +1437083.5885232682 +1446181.2576879554 +1426315.4016530914 +1444167.5528071849 +1439023.636327138 +1433760.428307435 +1427050.5458858742 +1437379.5923802862 +1428850.5955524114 +1422896.1331823724 +1433038.9651571605 +1427722.1632800284 +1425149.936253211 +1426524.3527882393 +1442734.1719184902 +1426238.1599405427 +1446658.7596192176 +1440056.5900812983 +1439122.3149856543 +1434456.7955735112 +1439240.5916877086 +1446638.7410461316 +1429606.3098321268 +1430012.8108413015 +1440380.6542825145 +1447662.353458021 +1428844.315904211 +1428854.8803509225 +1447584.782959934 +1418599.1347112968 +1428762.6442171715 +1428669.4084375096 +1434075.5760688006 +1428704.0244820134 +1446416.4933812418 +1424823.659293259 +1435136.2274077304 +1437748.3817377228 +1425495.2035762037 +1439649.5843651947 +1446638.9301546575 +1446396.2338018133 +1427700.5024469972 +1437319.1809118392 +1437395.5720922572 +1447282.7857265465 +1429994.2661099853 +1447706.5533239369 +1437707.4935464407 +1439248.5313245638 +1440181.2531381475 +1442384.7706630623 +1436829.9208254055 +1428739.1532623034 +1426515.6202681065 +1426835.9624076693 +1439182.5043871228 +1437417.4350360134 +1436998.7939748657 +1447939.702717834 +1441086.817794954 +1426333.7425112417 +1431985.6822413974 +1440186.6087686464 +1423488.9664835988 +1435109.112196242 +1437383.6909209217 +1429848.5200671998 +1435884.2695753223 +1434409.3335476632 +1439152.6946682082 +1434856.7129420976 +1440952.325355818 +1446144.2776234485 +1426409.9047727268 +1447725.662063764 +1447468.6763026991 +1428704.5920488057 +1440726.035505261 +1438958.9616470702 +1426625.8138918714 +1437318.2440552474 +1423480.7608405293 +1445805.9632132677 +1417766.1258731366 +1429192.545460369 +1439003.784692442 +1443016.8363139979 +1425493.3051011376 +1436089.6069732662 +1437807.263609016 +1428670.4657056457 +1435137.997202877 +1447940.8880463727 +1446569.6655012073 +1437290.2510621648 +1441734.8110408515 +1425136.308595417 +1431330.1836339089 +1442384.3200267828 +1435284.3122363747 +1439493.1181775236 +1436112.1448990772 +1424911.9295055869 +1429246.7813616209 +1426538.8637368393 +1428761.22683127 +1440288.034330594 +1447282.2962897725 +1434915.7434097864 +1446865.4513984967 +1426149.2380145013 +1445886.343297216 +1432295.870091512 +1425196.404715374 +1437290.2309934376 +1428678.6965195534 +1445828.4357483226 +1437484.854010071 +1433758.377168376 +1447282.1196989154 +1425662.7569643308 +1423551.907499748 +1447055.2395629727 +1426737.935941749 +1428208.3621581178 +1446640.044614877 +1433038.7478642506 +1418122.955898482 +1445788.5992466197 +1446649.063980858 +1448211.6825713024 +1446147.9847285778 +1424587.36599626 +1419644.5279561712 +1429032.6235754138 +1433759.5329877152 +1431985.7104246074 +1445234.7413814666 +1431776.5542774703 +1419943.9731439154 +1431927.083831776 +1446572.1330382593 +1439323.0838757597 +1434206.1758976246 +1447904.1725480356 +1441811.3599783846 +1428670.1300268283 +1439897.905794222 +1443264.0842967688 +1439159.4308758166 +1442592.642897306 +1439491.7530879618 +1436977.4638571306 +1439822.9837913697 +1421026.5072057822 +1439286.0225391875 +1429026.969439579 +1429876.9401384206 +1427412.5521020573 +1437246.5682411368 +1441615.3186900984 +1428704.5325912663 +1446658.9306226822 +1442734.2696341772 +1426738.0008960182 +1440977.2720364742 +1446571.631897763 +1435141.3771609005 +1447219.3003948315 +1445745.461323892 +1428703.9796963662 +1440963.3506078308 +1435670.4738141156 +1447189.7241396238 +1434020.3318238077 +1432675.7439695175 +1429198.0119917537 +1440290.2102408193 +1444071.0516015259 +1429792.8506214123 +1439197.155361252 +1425877.2158901969 +1415620.3037014245 diff --git a/code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..c84204f --- /dev/null +++ b/code/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,216 @@ +1466661.4433 +1463981.15529 +1450878.16839 +1467962.58337 +1467011.66878 +1463398.28019 +1456705.74908 +1467906.07169 +1465840.07714 +1473250.29254 +1452977.61945 +1445488.12844 +1455608.09314 +1474278.17659 +1460900.13866 +1440669.08816 +1453098.35476 +1460082.57934 +1467594.89118 +1475289.49887 +1461836.78869 +1466072.9096 +1453061.07941 +1465401.12886 +1468572.38092 +1475519.11985 +1456840.84223 +1455458.93404 +1451419.06717 +1463959.40921 +1470102.00102 +1448834.49332 +1465257.13305 +1472803.50863 +1455078.60699 +1471618.07484 +1466124.69177 +1462198.65925 +1453770.41226 +1465321.68377 +1454689.46921 +1449296.42194 +1461487.42876 +1452448.94624 +1452698.09547 +1453033.25394 +1470006.4861 +1453216.71347 +1474272.03928 +1466487.07811 +1465895.59279 +1463458.41944 +1467112.11491 +1474164.45528 +1455406.55633 +1455976.3341 +1467473.46788 +1474462.55684 +1454837.20108 +1454588.97816 +1474649.8653 +1443518.32984 +1454899.08177 +1454346.03227 +1462211.48742 +1454462.80562 +1474080.93814 +1451013.41293 +1463578.01703 +1465198.7877 +1452829.46423 +1466396.5453 +1473716.35448 +1473138.60199 +1454072.35022 +1465374.72064 +1465113.73062 +1474275.92124 +1456060.95286 +1475450.11816 +1464577.68681 +1466870.30579 +1468241.36664 +1468969.98508 +1465328.51163 +1453711.82589 +1452611.84951 +1453371.87125 +1469273.56441 +1465395.16491 +1465218.26266 +1475491.96177 +1467825.33147 +1454742.89909 +1460430.33384 +1467046.75177 +1448971.09702 +1463911.27637 +1465317.70006 +1455475.40676 +1464549.02454 +1463411.37898 +1467147.64449 +1463734.74095 +1467720.32306 +1473500.38111 +1451319.48929 +1474554.82208 +1474401.3192 +1454468.51389 +1468062.90969 +1468800.79754 +1453152.90692 +1465392.27676 +1448845.0337 +1474459.86906 +1443671.54726 +1455324.29615 +1466811.56077 +1470437.08561 +1452789.79589 +1463908.38258 +1465362.04523 +1456972.20322 +1463576.57759 +1475497.39885 +1473753.21952 +1465040.77489 +1469119.03801 +1451653.45399 +1459887.0728 +1468974.93048 +1463495.68448 +1466307.6263 +1463824.77253 +1449670.10796 +1456866.86646 +1452645.62596 +1454488.37881 +1468246.82523 +1474272.73858 +1463752.13001 +1474324.50231 +1453854.43263 +1474027.28748 +1461900.71829 +1452497.42729 +1465579.86608 +1453858.66311 +1473057.55769 +1465420.75042 +1462188.44603 +1474260.67925 +1452360.04861 +1451073.85559 +1473736.70414 +1454566.46767 +1453497.49539 +1474045.19925 +1461475.56221 +1444342.36663 +1473656.41512 +1474061.54417 +1475240.24182 +1473197.95053 +1453444.77766 +1448719.8363 +1455505.34893 +1462202.63228 +1460427.7357 +1473004.02634 +1461098.94551 +1448817.961 +1461797.28569 +1473740.03431 +1467059.8826 +1462178.25484 +1475466.23629 +1468944.37607 +1454371.53879 +1467653.41976 +1472599.67388 +1467266.07325 +1469844.21819 +1466324.8065 +1464971.82096 +1468479.88469 +1445388.08262 +1466942.43856 +1455535.04579 +1458477.49563 +1454193.88524 +1465009.02665 +1469484.61299 +1454467.71375 +1474281.37334 +1470013.78325 +1454569.12632 +1467634.82678 +1473743.78612 +1463584.74167 +1474359.71557 +1474701.85296 +1454462.52733 +1468153.44534 +1464751.45586 +1474082.37057 +1462834.07733 +1460996.84658 +1456711.44787 +1467821.29946 +1471501.68055 +1455452.57295 +1466989.59126 +1453904.29097 +1440663.71514 diff --git a/code/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..e42a7df --- /dev/null +++ b/code/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt @@ -0,0 +1,216 @@ +14 +18 +18 +19 +20 +21 +23 +23 +27 +29 +26 +30 +35 +35 +36 +37 +38 +39 +39 +40 +40 +41 +44 +45 +46 +46 +48 +49 +50 +51 +51 +52 +53 +55 +55 +55 +58 +58 +58 +58 +62 +62 +62 +63 +64 +65 +65 +68 +68 +69 +69 +68 +70 +70 +72 +73 +73 +77 +77 +77 +77 +80 +81 +82 +86 +88 +88 +93 +93 +93 +95 +102 +106 +109 +109 +108 +109 +110 +49 +115 +115 +30 +46 +74 +30 +124 +55 +49 +27 +43 +31 +32 +33 +58 +40 +56 +140 +143 +30 +36 +33 +29 +41 +42 +56 +153 +64 +45 +52 +86 +55 +39 +46 +91 +162 +26 +162 +96 +60 +65 +45 +52 +61 +104 +31 +47 +37 +66 +64 +58 +89 +74 +37 +50 +66 +57 +46 +99 +99 +71 +78 +38 +73 +80 +77 +39 +75 +22 +49 +137 +23 +54 +38 +59 +52 +55 +125 +49 +61 +52 +105 +75 +229 +37 +112 +150 +22 +44 +41 +96 +47 +44 +45 +151 +42 +44 +98 +64 +83 +48 +24 +28 +55 +115 +53 +267 +40 +55 +59 +158 +32 +58 +54 +280 +61 +94 +51 +79 +70 +32 +83 +122 +48 +79 +73 +35 +94 +35 +63 +84 +26 +57 +48 +44 +50 +39 diff --git a/code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..c0bf1b8 --- /dev/null +++ b/code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt @@ -0,0 +1,283 @@ +1493177.7015159833 +1498335.9002587784 +1482930.6916914827 +1494294.5973610294 +1489389.6530351536 +1497664.9667578642 +1487925.0837133364 +1482001.6802894087 +1493360.0790387646 +1485379.42403259 +1499361.176513183 +1506651.7825755035 +1484030.976122997 +1495459.9915797259 +1486314.7539031904 +1491782.0339442529 +1498967.2570296163 +1497103.374663175 +1506630.244769005 +1488610.6896037685 +1497345.324823592 +1488481.0536835839 +1480302.7411041136 +1495673.9570735833 +1494544.31052356 +1502060.150157965 +1496608.1638352128 +1489551.9210886706 +1482536.8628349171 +1498688.421392781 +1486813.192295795 +1484060.55841591 +1498431.0280997516 +1496661.8945148194 +1489151.4218043815 +1493314.9295159199 +1495217.4903332447 +1495006.65017125 +1495530.890031431 +1501485.7554489356 +1506833.071098384 +1488827.199898604 +1497736.491315346 +1487982.4767138176 +1489360.8158599166 +1490921.951117178 +1494746.1023492012 +1492920.8741533165 +1505830.3478960467 +1498567.0958349884 +1501486.086736023 +1491562.1287481198 +1506760.7300091733 +1484413.0580178173 +1486158.916306258 +1504997.490263335 +1499626.4358632008 +1505593.5130699323 +1493806.3344102178 +1505830.7991805691 +1488990.082091265 +1492425.1378020027 +1495987.4531613474 +1506364.5358095649 +1500251.64248874 +1502623.7418039783 +1489509.3490418212 +1490976.7236399406 +1492920.946872803 +1491649.6827389812 +1498594.3109702442 +1500769.516418427 +1499695.5396554025 +1490607.6038440336 +1505347.3555019682 +1507076.2508215704 +1506155.4565899994 +1483856.6669429361 +1498654.0691765104 +1506157.8849037774 +1490941.3666065158 +1506537.6624301977 +1506305.4171788604 +1498525.915469084 +1505360.1437721704 +1499487.3063541607 +1506142.9543377592 +1486734.4391920785 +1501850.4914175328 +1502439.4636052055 +1499366.9388896287 +1490403.6663103267 +1498540.6790687281 +1500139.201032597 +1496361.6557050878 +1490932.199896328 +1500661.5400909795 +1486625.6445326544 +1491478.0893830506 +1484067.6947817705 +1490853.0501333221 +1490118.680058748 +1482568.6343842628 +1496166.5004218013 +1497353.2432703439 +1491967.391316233 +1494416.4424560997 +1488962.3332998464 +1496212.36195768 +1495304.746533854 +1500102.1838641774 +1491287.416917533 +1490623.8914300431 +1506833.182282739 +1503090.9709595947 +1505550.9893834884 +1499776.3328173002 +1484197.0775114722 +1505101.861881745 +1487483.438435734 +1499515.485352328 +1491273.5056311456 +1501638.6724635093 +1487144.543411533 +1496145.1190169416 +1482679.1506148144 +1505912.4993623046 +1486161.6196112402 +1501469.3535080587 +1486845.8610075172 +1486756.9310841486 +1488717.5848886091 +1496181.0026368005 +1488797.2176816086 +1494060.805268314 +1486238.3830747379 +1487053.3352604317 +1498929.9041905296 +1499173.8585800903 +1484379.328066809 +1499516.0702265678 +1500033.7204761978 +1493259.0231747222 +1504877.0487026311 +1500582.3769672066 +1486659.209980644 +1486170.7491343636 +1493160.408218862 +1494962.3835224733 +1505809.8891006697 +1494468.6778272926 +1484445.4549686313 +1486207.1126049403 +1486655.6079822588 +1499676.696908386 +1505452.882524737 +1506143.562773461 +1502428.509049578 +1490147.9470913706 +1486250.9659170555 +1486318.9350214817 +1489866.1381326003 +1499586.9420598622 +1504662.3887739142 +1488962.703702528 +1498609.6837807703 +1488774.7027282529 +1505773.173049149 +1506337.7970410753 +1494773.032525936 +1506371.7824764745 +1505047.8972781627 +1491325.517845753 +1499672.2505544955 +1503311.8101180522 +1494053.5198839738 +1502403.8803692334 +1490106.9078493572 +1502860.7025270897 +1489353.968359348 +1499390.4300066368 +1505666.7385763803 +1497583.780126706 +1493687.9433843475 +1498659.5820881487 +1485080.5990415008 +1498599.0640896298 +1497934.5285344135 +1506290.4927723694 +1488989.7655745903 +1507084.4308789745 +1506120.7336726238 +1503981.489480612 +1494075.1758767678 +1506974.0698552586 +1497979.933728912 +1492497.8304225786 +1496419.6840660244 +1488590.8340847425 +1498498.1372227448 +1495603.4240629468 +1499247.3995643747 +1488942.4473405392 +1490289.5553074037 +1490185.191347437 +1493676.262774717 +1494128.697707567 +1494981.273518938 +1491326.884055996 +1500753.008723349 +1499481.438952238 +1491125.052191887 +1483778.2755935048 +1504291.1484936252 +1498710.7344852646 +1494751.7643223559 +1492294.5556906217 +1493023.99105922 +1494624.9083865616 +1491255.358487576 +1498437.476648291 +1500576.575168631 +1495197.9622728506 +1491043.3228298677 +1483878.933756729 +1483490.8893300688 +1487436.247201088 +1493862.214191934 +1486642.6113026945 +1505490.3226025244 +1506342.3056526787 +1495731.0517095977 +1491782.569473688 +1504869.8483369078 +1505276.882935368 +1501711.4534854167 +1491692.0985791434 +1504469.866862411 +1507102.362118805 +1481952.6210031016 +1488855.2844325681 +1494239.8536457943 +1498648.6789781787 +1482862.159809072 +1477635.9642719463 +1501687.1170774298 +1495471.5021145963 +1478718.3348676534 +1501564.0619987908 +1499382.326067631 +1505051.0688091544 +1498525.9243569344 +1497261.6144294364 +1491323.371219192 +1483993.4348672759 +1489411.5118933883 +1500322.6774002728 +1505064.3778607782 +1495278.7079664788 +1498656.6995955822 +1506113.152676446 +1495108.717160222 +1507193.8442543126 +1506844.3873729191 +1506964.7217501453 +1496115.4856513343 +1489137.6958688856 +1490477.1161646317 +1498023.9105262356 +1505544.8740218529 +1489430.8240319854 +1488990.4103441492 +1493743.9303654872 +1498634.3389664365 +1479846.0630832196 +1490717.543620994 +1493958.4434047884 +1491066.4356001175 +1483527.696666684 +1489148.622457852 +1506563.7581200318 +1496013.9671904428 +1496375.9095621663 diff --git a/code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..64b8c63 --- /dev/null +++ b/code/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,283 @@ +1513586.11863 +1517787.97989 +1503614.10512 +1513460.67689 +1509255.08295 +1518153.28169 +1509671.37352 +1502627.4095 +1511449.08232 +1504148.91238 +1517824.80252 +1523915.45298 +1504581.24919 +1515712.92494 +1506936.71755 +1512542.0432 +1517754.6137 +1516306.97313 +1524311.50938 +1508190.52428 +1518137.41616 +1508014.37428 +1500547.17791 +1514985.72348 +1514456.99165 +1522076.73824 +1516235.45163 +1509582.93262 +1503929.03849 +1520208.0233 +1508396.68562 +1503735.19572 +1519148.99491 +1516340.85241 +1508608.03898 +1513328.80971 +1515135.07674 +1514581.33557 +1515436.57045 +1519167.25893 +1524358.24114 +1508416.96629 +1517242.70988 +1509547.56224 +1508743.0713 +1509463.73047 +1514356.91717 +1510975.02744 +1522894.98279 +1517832.14986 +1519170.1733 +1509895.2007 +1524274.49629 +1504651.57661 +1507097.4156 +1522896.96438 +1518098.87776 +1523350.65972 +1522886.92811 +1513937.45746 +1508690.26383 +1510628.96031 +1515307.42769 +1523422.93351 +1518288.74873 +1522732.60901 +1508956.72306 +1508858.24816 +1510974.76399 +1509868.22968 +1517382.39519 +1519397.36499 +1517377.43285 +1509349.94192 +1523324.85995 +1523995.82856 +1523599.08057 +1503440.12775 +1516894.78052 +1522571.25256 +1509337.75162 +1523982.47949 +1523585.77091 +1516818.08826 +1523329.89803 +1517066.56776 +1523296.07654 +1507008.68401 +1520455.59376 +1520414.21683 +1517937.21253 +1508585.12987 +1517735.14892 +1519023.46515 +1516318.97596 +1509326.49636 +1519001.16454 +1507164.2884 +1509587.46498 +1503050.45138 +1511275.27413 +1511470.89491 +1503733.25988 +1517273.23946 +1517980.76632 +1511758.34434 +1514704.91431 +1508693.05587 +1515418.53244 +1514009.13788 +1519641.03013 +1509667.09817 +1508900.34396 +1523705.94769 +1521357.17655 +1522954.18285 +1519176.94492 +1505035.56685 +1523273.67781 +1509126.5463 +1517470.89071 +1509795.55267 +1520651.3881 +1508451.86052 +1515644.28138 +1503252.13659 +1523739.81175 +1508500.51476 +1519811.14791 +1506459.47568 +1508067.38544 +1508630.05561 +1515041.11657 +1508274.17911 +1512820.19449 +1505442.10463 +1507476.18088 +1517455.6214 +1520100.30994 +1502957.69476 +1518051.37353 +1518231.22499 +1513106.92154 +1522524.8468 +1519427.57661 +1507440.85202 +1505724.52452 +1514109.64946 +1515435.48513 +1523479.23452 +1513252.85319 +1504550.37228 +1507727.7039 +1507540.14231 +1518187.72166 +1523068.73814 +1523290.36425 +1520140.87558 +1509668.65682 +1506120.85535 +1505719.99425 +1508995.43411 +1517584.62162 +1523840.92615 +1507763.91483 +1516986.96986 +1510456.99678 +1523236.06607 +1523513.12627 +1515286.7093 +1523459.30736 +1523389.82954 +1510229.53411 +1519307.04623 +1522232.74264 +1513338.64392 +1519793.6685 +1508895.9216 +1520683.18093 +1509058.79653 +1517429.55786 +1523665.92272 +1516917.91949 +1512836.98596 +1517849.43473 +1503809.83905 +1519030.01606 +1517388.33945 +1523307.99906 +1508690.82798 +1523959.07136 +1522497.67585 +1522493.71773 +1514486.88433 +1524343.44972 +1516801.20215 +1511067.66837 +1515232.6541 +1509899.60217 +1517683.98933 +1513726.47454 +1519517.17029 +1508520.24613 +1511103.33688 +1509712.68646 +1515004.86555 +1513928.27923 +1514952.52984 +1509496.18822 +1519348.00643 +1517680.40282 +1511359.25264 +1503327.66954 +1522161.00379 +1517150.12405 +1514336.69914 +1510900.62249 +1513486.80976 +1514236.6347 +1509588.41943 +1517311.48014 +1519455.85649 +1515574.44589 +1510046.02967 +1503414.05069 +1503749.56744 +1505694.24628 +1514136.55198 +1506857.25364 +1523079.6304 +1523500.46378 +1515945.87246 +1509994.44528 +1522940.20447 +1522817.71775 +1519830.02481 +1509900.4074 +1521441.37553 +1524017.78669 +1502315.98749 +1509251.52009 +1514433.21904 +1516687.2058 +1501999.54598 +1498184.43509 +1520016.10872 +1516013.97112 +1498892.54079 +1519631.42789 +1517416.06545 +1523922.09429 +1516818.71468 +1516575.709 +1513634.67771 +1502210.86149 +1507725.87348 +1522417.70422 +1523957.08632 +1514850.99204 +1516916.82629 +1523560.80132 +1515954.45242 +1524068.05747 +1524353.70633 +1524283.10105 +1515587.42653 +1510041.72083 +1511311.59403 +1517034.04027 +1522970.03078 +1509911.26516 +1508689.33841 +1513315.63543 +1517951.69259 +1499320.50547 +1509879.34933 +1514349.37873 +1509092.18575 +1503373.98555 +1510063.27108 +1523634.17326 +1514950.83433 +1516176.22887 diff --git a/code/opt-results/grid/amalia_6.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt similarity index 50% rename from code/opt-results/grid/amalia_6.0_northIslandRose/funcCalls.txt rename to code/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt index 0e6aa70..58d0288 100644 --- a/code/opt-results/grid/amalia_6.0_northIslandRose/funcCalls.txt +++ b/code/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt @@ -1,398 +1,283 @@ -36 -27 -32 -21 -29 -22 -60 -59 -31 -157 -253 -204 -77 -51 -36 +13 +14 +15 +15 +15 +16 +17 +17 +17 +17 +20 21 -40 -68 -56 -69 -52 -193 -66 -76 -36 -42 +23 +23 +24 +24 +24 +24 +24 +25 26 -62 -89 -33 -33 -19 +26 +27 +27 +27 +27 +27 +27 +27 +28 +28 +28 +28 29 -58 -47 +29 +29 +30 31 -36 32 -126 -23 -34 33 -48 -23 -49 -74 -48 -44 -55 -25 -46 -32 -89 -50 -25 -107 -168 +33 +33 +35 +35 +36 +38 +38 39 -72 -41 -27 -76 -49 -217 -34 39 +41 +41 +41 +44 +44 +46 +46 49 -130 -28 -29 -56 -75 +50 +50 +50 +51 +53 +53 +53 +54 +55 +55 +55 +57 +58 +61 +62 +63 64 +65 +65 +65 +70 +71 +73 +73 +74 +74 75 -35 -28 -49 -24 -46 -48 -34 -39 +79 +80 +84 +84 +18 +89 +12 +18 20 -31 +27 +26 +98 +23 +32 35 -548 -38 -53 +23 +11 +27 28 -47 -46 -34 -26 -581 +21 29 +37 +48 +47 31 -18 +39 +36 +26 +19 +120 +43 +38 +37 +33 +56 +44 28 -64 +44 47 -22 -58 24 +52 +52 +56 +28 +28 +28 +50 +56 39 -14 -27 -26 -65 -1896 -105 -49 +56 +30 60 +25 +52 +139 28 -26 -55 -127 -42 +27 +41 65 +54 +37 26 -39 -44 -157 -64 -33 -44 -33 +24 +22 +19 62 -245 -49 -160 -254 -39 -23 -39 -54 -46 -33 -20 +57 +22 +9 +153 +30 +31 +91 +70 18 -64 -62 -25 -36 +63 +34 27 -1504 -36 -29 -31 -68 -37 -247 -76 -52 -30 -127 +102 +20 32 -29 -52 -71 +37 +20 +70 +59 +80 100 +43 +63 +31 +15 +27 +35 37 -32 -172 -50 +186 84 -71 -37 -23 -81 -50 -32 -45 -58 -370 +39 +70 18 -51 -30 -60 -46 -653 -49 -50 -44 -17 -20 -20 -79 -59 -24 -32 -42 -26 -61 -87 -29 +22 +22 +22 +21 44 -53 31 -53 +54 52 -79 -38 +41 14 -25 -1530 -28 -29 -34 -38 -22 -252 -30 -36 -49 -49 -63 -17 -24 -35 -45 -25 -54 -83 -48 -21 40 -29 -154 42 -52 -27 -33 23 -35 -43 31 -39 -322 -31 -112 -31 -64 -50 -25 -29 -26 -27 -470 -26 -77 -54 -21 -31 -58 -24 -21 -81 42 -28 -37 -38 +52 +23 30 +25 28 -41 -452 -60 +25 +42 27 -43 -34 -127 -32 -77 -57 -59 -53 -29 -33 -31 -29 -43 -20 -74 -23 -26 -169 -94 -31 38 -32 -54 -43 -59 -46 +121 +42 40 +25 +27 +148 +22 +24 +84 +12 +32 +134 +50 +27 +12 +69 +121 +155 +27 29 31 -57 -51 -121 -39 -25 -47 -39 +53 21 -35 -29 -23 -65 -42 -47 -42 -87 -103 -58 -20 -13 +55 +46 +71 +83 36 -18 +63 45 +74 +69 +39 +96 +95 +195 +40 26 -94 -32 -27 -45 +18 +20 +30 +209 +51 35 -85 -77 -24 56 -30 -59 +24 +18 +73 +96 +15 +38 +91 26 -121 -49 -52 -64 -56 -37 -41 -34 -188 -157 -1179 -36 -14 -35 +58 +21 +84 +51 +58 33 -358 -52 +50 13 30 -24 -33 -30 -34 -15 -25 -20 -42 -48 -49 -52 -43 -111 -63 -28 -52 -62 -242 -40 -24 -602 -21 -28 -32 -39 -133 +95 +26 +100 +41 +22 25 -48 -27 -39 -35 -24 31 -262 -30 -37 -26 -26 -48 -30 -56 -34 -47 -32 -20 -62 -42 +59 +311 +11 +54 +93 +142 +21 diff --git a/code/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..5616640 --- /dev/null +++ b/code/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,178 @@ +1310211.0587212215 +1298121.3855190175 +1309908.2284135749 +1310185.585932474 +1309897.420760492 +1321373.4257267897 +1310259.9559883783 +1316594.3562896405 +1304889.8241031794 +1311598.9678539273 +1307303.3739057346 +1321172.336089144 +1310931.4515545429 +1311010.4664850188 +1307311.4172794218 +1298119.3462744635 +1302910.6559697143 +1311652.204489413 +1311322.2724492145 +1321423.5713745388 +1302968.5852112088 +1301091.6048377631 +1321178.1978271978 +1297094.0370025006 +1318305.2196724555 +1321178.4273876604 +1298238.9411698445 +1302899.3330830352 +1300772.466548711 +1302909.974494415 +1304890.390046914 +1301256.967850871 +1320589.5871414894 +1311653.0680125093 +1311298.252720231 +1321187.4322193924 +1316587.9870704848 +1311295.2440330063 +1311323.186928451 +1301099.3053505674 +1302914.0148773487 +1318644.5070603942 +1305261.4406365682 +1305078.4419510309 +1321423.57182612 +1321429.8945051455 +1296840.1210163268 +1315943.9731663815 +1311648.3080768897 +1302922.1147917653 +1301257.7003458017 +1310267.3012970646 +1301009.9626288544 +1305261.6267895617 +1305261.626483563 +1311487.3735309378 +1302891.5172024306 +1310267.3436349174 +1307320.5729849243 +1311601.3192958308 +1301083.302395062 +1321424.006625763 +1298156.0344158001 +1321178.4376039295 +1309933.124350011 +1321423.2603285227 +1311293.0271978204 +1310267.343847722 +1318665.987331813 +1311655.9328185557 +1297094.319176069 +1310162.5353367967 +1321183.4367306768 +1321178.3540527595 +1301257.6866429558 +1301087.769185089 +1321187.0533162635 +1321188.5590370195 +1321423.5713253776 +1305184.7548775445 +1302962.0770366392 +1311319.2166209333 +1321429.88593513 +1296941.3075827672 +1311499.6817409727 +1307320.3590241224 +1316587.9864905362 +1321429.191698846 +1311655.963072849 +1318660.376862458 +1316578.2999541208 +1309908.3934235268 +1302975.3037171464 +1311498.9269169376 +1311035.0361316341 +1302864.9710018616 +1298162.099786903 +1318704.815105939 +1311031.3650878195 +1318643.4398992816 +1311478.1626711877 +1318291.965329017 +1318911.530360575 +1310267.3411036872 +1311491.0652278126 +1316584.5821302393 +1311035.559539997 +1316594.184839037 +1303508.2579757068 +1301257.7001582 +1301083.4932077762 +1307315.1554987163 +1301088.3566289104 +1310267.0879519642 +1305261.6270343862 +1318660.378110228 +1316582.816392318 +1311022.0622715284 +1318657.863889257 +1316584.5842971778 +1311651.8810329286 +1307317.4689265904 +1310942.9274093849 +1320582.0183875556 +1307320.5305313836 +1307307.2461644823 +1318704.8139046119 +1311622.79694913 +1310947.4696426988 +1307311.3049382712 +1321430.2492925515 +1296862.225179483 +1297061.5361394335 +1302917.3457619143 +1321176.9460988413 +1321424.0198926444 +1321178.4303877004 +1296837.7655224267 +1296840.0037618699 +1302971.6982833857 +1302964.4085627913 +1297224.980474452 +1298037.2665337666 +1311641.411517427 +1321423.5468713725 +1318275.4111678952 +1301096.5903128134 +1305055.269788471 +1321178.4040060418 +1318701.8640986688 +1298233.151379607 +1301097.0092424664 +1305263.663904166 +1309887.2826498784 +1296478.837501369 +1318838.1287922934 +1318704.8151120923 +1296891.371329898 +1307092.8430621845 +1305263.6612556202 +1310234.2821795736 +1300835.4328129797 +1318262.9187715221 +1298124.8349312157 +1307077.4766412524 +1311478.504390801 +1298161.2289627688 +1306954.0761166483 +1296840.1514868697 +1305261.8186900986 +1305261.6270247514 +1311655.0538314357 +1310267.3459172412 +1297092.9409053246 +1318669.6877858397 +1316588.57473235 +1311445.992540792 +1311656.1944816287 diff --git a/code/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..60415c4 --- /dev/null +++ b/code/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,178 @@ +1347620.43951 +1328776.15111 +1348107.9825 +1347703.49595 +1348117.68485 +1360955.2908 +1347726.93405 +1354458.56589 +1338231.73492 +1347684.83524 +1344211.14912 +1360647.10926 +1347962.58923 +1348052.58418 +1344202.50964 +1328959.13983 +1338378.24264 +1347669.6941 +1347870.80436 +1360845.5583 +1337854.93686 +1333315.17078 +1360627.46168 +1326216.18851 +1357393.4888 +1360627.46217 +1329483.40199 +1338544.38605 +1335098.02845 +1338538.34557 +1338190.47593 +1333163.53573 +1360790.50077 +1347673.01621 +1347867.12166 +1360728.97441 +1354527.9245 +1347946.70725 +1347881.06016 +1333244.48466 +1338564.63876 +1357461.15158 +1338287.17176 +1338393.30929 +1360845.51042 +1360812.44797 +1326239.63982 +1354448.09096 +1347717.91683 +1338640.48035 +1333169.91336 +1347721.72287 +1333277.54924 +1338291.67676 +1338291.28515 +1348216.31284 +1338499.92413 +1347722.06181 +1344209.31407 +1347633.16245 +1333346.92052 +1360836.3184 +1328904.63943 +1360626.61051 +1348069.09159 +1360853.55234 +1347883.89871 +1347721.85241 +1357436.41492 +1347721.37873 +1326218.1465 +1347695.74615 +1360727.48507 +1360624.45592 +1333168.96283 +1333392.32656 +1360749.85898 +1360729.26358 +1360845.62124 +1338712.56304 +1338065.6661 +1347839.10638 +1360814.61525 +1326302.74622 +1348110.92805 +1344210.44828 +1354527.81127 +1360820.37673 +1347709.20664 +1357502.26551 +1354500.8664 +1348105.48141 +1337877.51058 +1348138.11196 +1348089.58989 +1338652.43278 +1328947.29386 +1357898.72856 +1347910.8497 +1357474.26462 +1347522.67247 +1357588.48273 +1357747.81804 +1347720.37783 +1348185.18016 +1354444.96672 +1348092.466 +1354454.62734 +1339130.4665 +1333169.72535 +1333336.2488 +1344196.96915 +1333413.98055 +1347727.19296 +1338291.63868 +1357501.75018 +1354431.30639 +1348075.96715 +1357366.84761 +1354445.32741 +1347657.14596 +1344191.1613 +1348028.41626 +1360782.72036 +1344212.32273 +1344185.73529 +1357898.45937 +1347681.37972 +1348028.28835 +1344191.55637 +1360824.13791 +1326168.18018 +1335490.92827 +1338348.76357 +1360635.14156 +1360838.83453 +1360626.99087 +1326224.59171 +1326238.96743 +1338689.1769 +1338000.18824 +1335692.56741 +1328553.17184 +1347650.03718 +1360845.49633 +1357465.39422 +1333236.34202 +1338620.82106 +1360625.91098 +1357896.54298 +1329208.39601 +1333237.29057 +1338323.12668 +1347980.30513 +1329921.5343 +1357634.06454 +1357898.70716 +1326356.4959 +1344664.26126 +1338321.72656 +1347705.42816 +1332984.41961 +1359435.81327 +1328220.33152 +1344650.85287 +1347550.038 +1328947.61271 +1344307.91375 +1326243.42647 +1338314.97987 +1338291.48205 +1347707.44138 +1347720.77403 +1326219.99906 +1357379.45091 +1354486.83758 +1348106.89511 +1347715.03215 diff --git a/code/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..c621353 --- /dev/null +++ b/code/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,178 @@ +22 +25 +28 +31 +40 +42 +42 +43 +44 +44 +45 +48 +51 +51 +53 +54 +54 +55 +55 +55 +57 +57 +57 +57 +58 +59 +59 +59 +60 +63 +63 +63 +64 +64 +64 +65 +67 +65 +66 +71 +71 +71 +73 +75 +75 +78 +78 +80 +79 +83 +86 +89 +92 +94 +99 +100 +100 +105 +108 +109 +112 +112 +115 +119 +120 +121 +122 +122 +127 +130 +132 +133 +134 +135 +40 +49 +141 +141 +142 +144 +52 +55 +148 +148 +57 +76 +48 +152 +153 +153 +44 +155 +164 +45 +165 +28 +164 +164 +49 +36 +50 +62 +169 +48 +79 +97 +70 +60 +180 +69 +53 +80 +112 +84 +91 +194 +45 +94 +95 +201 +83 +50 +94 +73 +108 +94 +216 +92 +107 +106 +142 +119 +50 +69 +125 +235 +62 +57 +55 +89 +68 +69 +58 +132 +246 +57 +54 +79 +86 +63 +58 +24 +103 +33 +52 +150 +159 +53 +48 +81 +75 +43 +174 +120 +60 +76 +43 +44 +85 +44 +55 +201 +137 +53 +99 +105 +43 +182 diff --git a/code/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt b/code/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..1d2fdcc --- /dev/null +++ b/code/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,179 @@ +1328050.8097200685 +1315883.9910106487 +1321469.204159989 +1311860.4564526314 +1315275.246540353 +1321246.3539270607 +1321523.1693518085 +1305694.9153287492 +1311872.8023071622 +1309564.5730049198 +1310119.1778614768 +1310312.20432437 +1310387.0962398648 +1307254.5698456918 +1322997.9369343014 +1308258.1314606834 +1310878.342051207 +1322644.6437445185 +1308258.1163841358 +1310387.3760045234 +1307254.3379988882 +1310383.673508084 +1329372.7604448313 +1307346.969510353 +1306284.506430931 +1329247.1840916867 +1301939.4253367 +1313991.8931437442 +1323072.8494580921 +1329258.7264849984 +1328835.9177130915 +1306860.5246460112 +1321417.490634089 +1308250.4000562576 +1327722.400298598 +1328835.9631374013 +1328138.243215218 +1315894.5474234754 +1331333.0339552658 +1310900.6265514074 +1331340.6592818862 +1314461.5925071323 +1325133.4756210945 +1312102.3455142747 +1328145.9453263155 +1314324.3866091098 +1310950.0815478002 +1317922.0844395254 +1328408.799857137 +1329290.2580739423 +1306892.560419264 +1306790.0197077887 +1310277.8908582956 +1328860.7758509761 +1328520.0646095653 +1325809.6081946192 +1312377.4440770869 +1322608.0212997145 +1328010.4103208221 +1312693.473473936 +1306797.4139606678 +1310979.2621551976 +1310142.682737947 +1298571.1932924846 +1312693.4734047123 +1310562.114655372 +1308315.4372243672 +1311302.6502949807 +1310609.1824874913 +1320609.7203727134 +1325824.6777105792 +1316790.7724075522 +1328088.5733150777 +1327321.6648694796 +1310038.2353222559 +1306292.9043285311 +1325414.647228247 +1308315.4405109545 +1311407.6915092466 +1310383.8544937107 +1310611.648992474 +1308589.346693814 +1308018.2588251724 +1309967.5413229596 +1306292.9033644143 +1310540.3907666095 +1328999.662261653 +1329852.5399463756 +1306795.1138631122 +1320627.1478603003 +1309653.859035321 +1299876.603340266 +1328143.246474063 +1309700.727866703 +1321876.987131478 +1306985.6752753523 +1306030.9907153659 +1328408.7988021697 +1321928.9935197316 +1331340.662503046 +1312102.345973973 +1311868.933695354 +1312120.9814295403 +1308273.1312107493 +1310539.9346365079 +1301939.138715428 +1313990.118968736 +1308573.1926095332 +1329343.1647045277 +1298094.7108768125 +1309580.9099841714 +1316852.0770577553 +1315285.4933833878 +1315275.8214495117 +1329258.7214528846 +1311355.3123026548 +1327758.5004522118 +1331337.7917801428 +1320368.5106791093 +1321877.056429796 +1322605.0713250819 +1308487.8073064857 +1315326.6054934424 +1306292.7697357032 +1306331.7191606334 +1327732.8191505866 +1329255.1367522662 +1313834.6099736698 +1314129.8926408545 +1310387.110223911 +1306797.6735238233 +1321954.1792834534 +1328861.1862714353 +1308320.7759544838 +1305393.2151429676 +1319534.9178827608 +1307744.8077689137 +1309943.7256667847 +1307819.364512756 +1329852.5447620277 +1310611.649003524 +1307080.7414100876 +1307216.3364916726 +1328408.8000747033 +1310397.9476243814 +1321251.104140496 +1307306.540272036 +1315894.2974721065 +1306797.401862974 +1331340.6594739384 +1298333.1107938853 +1321469.4092926611 +1322359.0594752568 +1308487.7887065122 +1310979.2116580845 +1310139.3205296113 +1306292.7866817433 +1328408.7992425025 +1312102.346764534 +1321399.2101203713 +1313823.1207281142 +1327958.1926324584 +1306964.8347920906 +1313158.5385265187 +1316791.3059890608 +1309578.283070418 +1329341.1770896453 +1321959.2393025474 +1310245.765154371 +1328408.7900669936 +1314268.20663606 +1319326.1359440603 +1313991.871614735 +1328784.0489868687 +1310950.039513519 +1311407.7194082923 +1312817.4757464565 +1308315.4479250838 +1325824.9289926896 diff --git a/code/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt b/code/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..e0b82ff --- /dev/null +++ b/code/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,179 @@ +1369430.5632 +1352202.43382 +1356978.35565 +1347599.64381 +1352369.84906 +1357442.79106 +1357477.54283 +1333680.98452 +1347667.45732 +1340224.91058 +1341094.87272 +1340960.18555 +1341204.44879 +1336335.77833 +1359622.34407 +1336880.93162 +1343772.89948 +1359330.52346 +1336880.98794 +1341200.37445 +1336329.64672 +1341203.66837 +1369599.45516 +1338035.85838 +1333728.71893 +1369657.72411 +1328116.38015 +1348153.754 +1359840.10589 +1369571.65735 +1366580.55402 +1335942.1503 +1363534.94803 +1336900.51535 +1368358.96901 +1366576.14514 +1368326.99861 +1352202.03287 +1370108.53573 +1343966.33722 +1370144.71767 +1351803.16563 +1363159.88329 +1347485.54824 +1369352.48183 +1350341.05682 +1344605.24622 +1356148.79796 +1366319.99552 +1367225.67583 +1336693.98018 +1333450.30018 +1340715.48526 +1366658.08701 +1369523.65012 +1363742.8048 +1346667.14881 +1359660.11827 +1368852.77751 +1348531.3035 +1333515.59959 +1343339.35998 +1344880.48359 +1323229.21606 +1348531.30781 +1340439.88722 +1336220.83247 +1343487.9966 +1347055.608 +1356801.64691 +1363697.84404 +1351349.54007 +1367646.71103 +1368840.25684 +1340852.72032 +1333752.33924 +1366976.13895 +1336221.73631 +1342239.03767 +1343273.97485 +1346918.24994 +1337069.38697 +1339702.0053 +1346386.28879 +1333751.7136 +1346816.85562 +1367380.75869 +1367449.49031 +1333479.9411 +1355561.76898 +1340666.41091 +1326805.99222 +1369364.45735 +1341532.58118 +1357658.59475 +1337100.0667 +1335546.65794 +1366318.94997 +1357058.23688 +1370147.21542 +1347484.44424 +1347654.11366 +1347552.28845 +1336404.14256 +1346808.59183 +1328106.16981 +1348171.9026 +1337019.99044 +1368064.97977 +1334604.87255 +1340324.35255 +1352028.33539 +1351387.19664 +1352363.31484 +1369571.68678 +1344340.75773 +1368312.84281 +1370170.85883 +1355624.47126 +1357636.60088 +1359659.47711 +1337112.76908 +1352125.78254 +1333758.40408 +1336193.85528 +1365534.6108 +1369595.77665 +1347577.5766 +1351148.51708 +1341203.71354 +1333510.40731 +1357132.62191 +1366700.63884 +1347622.2526 +1345966.08762 +1354492.61112 +1339406.41759 +1341321.75156 +1337922.16281 +1367448.39863 +1346918.23052 +1336112.24416 +1336882.2674 +1366319.69905 +1340858.75381 +1356524.15907 +1336209.85087 +1352205.59167 +1333513.27463 +1370144.27652 +1334377.75625 +1356983.13436 +1357616.7255 +1337111.85953 +1343337.76065 +1346756.71451 +1333749.80259 +1366319.4735 +1347484.8218 +1356588.17036 +1347674.67479 +1367713.97418 +1337436.70123 +1349818.10526 +1351322.08256 +1340277.67101 +1368063.45307 +1357118.92856 +1345205.50636 +1366319.27469 +1348936.78775 +1354159.87742 +1348155.287 +1366832.12285 +1344605.28419 +1342238.38972 +1346838.72618 +1336221.5773 +1363705.61619 diff --git a/code/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt b/code/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..2941f47 --- /dev/null +++ b/code/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,179 @@ +17 +25 +30 +32 +37 +37 +38 +39 +39 +40 +41 +42 +42 +43 +44 +44 +44 +45 +46 +47 +47 +48 +49 +51 +53 +56 +58 +59 +59 +60 +60 +62 +64 +66 +68 +66 +70 +71 +71 +71 +71 +74 +76 +79 +79 +80 +80 +81 +81 +81 +82 +83 +84 +88 +92 +99 +99 +100 +100 +104 +105 +107 +108 +110 +111 +115 +116 +117 +120 +70 +122 +123 +48 +30 +136 +140 +141 +142 +50 +144 +147 +148 +149 +150 +63 +152 +45 +56 +25 +67 +157 +159 +49 +33 +51 +165 +165 +168 +31 +76 +53 +178 +183 +92 +182 +186 +57 +82 +194 +20 +101 +199 +206 +55 +87 +79 +45 +39 +45 +80 +85 +214 +68 +219 +65 +109 +54 +112 +59 +72 +79 +106 +102 +29 +33 +41 +108 +137 +32 +80 +241 +123 +52 +138 +245 +126 +63 +47 +50 +65 +29 +51 +103 +173 +175 +95 +103 +56 +67 +75 +189 +85 +124 +43 +167 +227 +67 +55 +181 +88 +203 +209 +37 +46 +73 +123 +51 +76 +196 diff --git a/code/opt-results/direct/amalia_4.0_northIslandRose/AEP.txt b/code/opt-results/direct/amalia_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 62decc1..0000000 --- a/code/opt-results/direct/amalia_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,122 +0,0 @@ -887650.215164 -885007.938691 -886897.153372 -883597.010011 -881621.41941 -883281.533375 -879606.923994 -885431.406158 -885897.304192 -886255.137549 -885689.068858 -886156.978115 -887924.964435 -880634.515427 -882605.298661 -888294.14788 -887375.335689 -881960.269473 -876644.009139 -882412.614344 -882628.892337 -881397.270663 -885493.806698 -879914.363121 -883390.361246 -882207.77176 -885360.11733 -883920.286798 -877701.039988 -881652.545746 -886530.304073 -886164.272437 -883572.543886 -882120.583251 -887477.783616 -883890.355624 -883344.1471 -882294.390685 -887833.475913 -886236.915069 -883777.871577 -880849.550515 -882995.577141 -883364.816784 -886506.076488 -885240.02458 -886516.114117 -886868.019144 -884544.11792 -882382.394856 -880792.137974 -885700.915942 -881658.097851 -884637.722417 -883705.277584 -878166.852766 -883915.201097 -882344.453015 -887278.716892 -881651.7178 -880341.146323 -883107.207901 -882492.48138 -884442.703358 -880938.5222 -883038.261653 -882008.611441 -880292.090164 -879619.709549 -886590.971349 -883839.638324 -877734.486646 -885296.731856 -880271.901369 -882259.503689 -886557.044892 -878194.454947 -885315.436367 -887947.11762 -888066.218648 -889885.834065 -885917.05584 -882146.523544 -886319.668668 -880401.608434 -884667.07485 -876222.710792 -887714.246481 -885982.388955 -878957.470651 -881533.17989 -879224.770615 -884179.135259 -882635.918777 -879640.199483 -881538.801478 -880189.874513 -877403.781951 -886464.851117 -882422.676844 -883836.305191 -883556.372471 -885805.556908 -881711.480704 -881597.930623 -877227.650717 -878648.711999 -883113.856275 -885426.654178 -879820.420501 -886475.544119 -885528.807526 -884845.254408 -881237.298442 -880874.088445 -886678.002819 -879082.38194 -884345.491884 -882558.330892 -887716.531349 -881712.038786 -886108.515923 diff --git a/code/opt-results/direct/amalia_4.0_northIslandRose/funcCalls.txt b/code/opt-results/direct/amalia_4.0_northIslandRose/funcCalls.txt deleted file mode 100644 index ad54d90..0000000 --- a/code/opt-results/direct/amalia_4.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,122 +0,0 @@ -479 -613 -675 -604 -1181 -1173 -787 -877 -617 -432 -962 -768 -512 -1193 -693 -656 -472 -731 -1006 -894 -803 -719 -671 -1125 -843 -924 -482 -671 -1201 -1889 -642 -509 -1141 -828 -466 -709 -1271 -672 -609 -643 -629 -1132 -792 -708 -421 -623 -631 -488 -1304 -1193 -1096 -653 -968 -1040 -811 -1655 -1704 -499 -846 -630 -930 -1582 -1130 -453 -1595 -1418 -728 -1088 -757 -626 -690 -626 -880 -617 -1090 -770 -1421 -971 -849 -515 -695 -529 -985 -1069 -607 -561 -408 -500 -958 -683 -905 -1353 -811 -429 -755 -651 -935 -840 -905 -1207 -806 -897 -676 -1074 -889 -763 -1241 -1145 -634 -1301 -1026 -499 -876 -788 -473 -599 -1020 -618 -1256 -1225 -983 -985 diff --git a/code/opt-results/direct/amalia_4.0_ukiahRose/AEP.txt b/code/opt-results/direct/amalia_4.0_ukiahRose/AEP.txt deleted file mode 100644 index 6ca271d..0000000 --- a/code/opt-results/direct/amalia_4.0_ukiahRose/AEP.txt +++ /dev/null @@ -1,119 +0,0 @@ -958207.454138 -959143.849974 -960234.295268 -960731.804331 -955212.789197 -957616.979849 -957265.345972 -960204.125782 -960209.159461 -957584.163871 -957789.218522 -956549.297435 -956903.394506 -957671.136142 -961409.842411 -958259.325622 -958957.355148 -960123.652915 -960025.689668 -958386.66669 -959016.815897 -960498.31048 -956368.12865 -958294.796787 -959726.899222 -960065.245632 -959792.478954 -958061.375291 -957972.425305 -957942.07165 -958296.865169 -958438.301252 -959198.412589 -963477.76992 -958886.560946 -958834.925559 -959829.822645 -962919.312755 -955618.766796 -955176.478442 -955547.160761 -959585.820926 -963562.582858 -953925.251095 -957825.179261 -958488.511437 -957145.825499 -961960.909584 -954125.947474 -958259.201877 -956361.425658 -952939.845819 -956028.048415 -959945.536066 -953436.128848 -958271.966004 -960441.35418 -957227.287274 -956058.921809 -957842.367073 -956494.119058 -956940.624177 -963872.640356 -957077.522922 -955700.200097 -957396.939035 -954598.771153 -958058.498692 -954849.684809 -958947.996552 -958553.04982 -960358.456426 -956300.70503 -959444.934488 -952601.648084 -956997.624608 -955271.634638 -957734.837459 -956770.944983 -956930.034713 -962213.662134 -953344.795032 -961693.547144 -956660.233086 -955876.936805 -955695.578412 -956809.365903 -958805.983336 -960818.211252 -955038.782957 -960075.016151 -955433.264045 -957019.612533 -954521.549696 -955071.222343 -955298.608055 -959185.563697 -958949.601832 -957780.266195 -956053.062642 -959101.444642 -960659.714153 -961106.067296 -957357.990858 -956383.192883 -957702.766267 -958643.618452 -961848.816626 -962789.021794 -958993.452087 -955100.193709 -958888.302343 -956252.620663 -960616.089984 -960452.687827 -954732.036577 -955893.673586 -952909.860877 -955652.764235 diff --git a/code/opt-results/direct/amalia_4.0_ukiahRose/funcCalls.txt b/code/opt-results/direct/amalia_4.0_ukiahRose/funcCalls.txt deleted file mode 100644 index 09af7c3..0000000 --- a/code/opt-results/direct/amalia_4.0_ukiahRose/funcCalls.txt +++ /dev/null @@ -1,119 +0,0 @@ -533 -568 -629 -778 -902 -411 -928 -961 -794 -1174 -634 -913 -837 -951 -404 -519 -491 -587 -963 -698 -982 -1439 -677 -606 -867 -771 -558 -707 -933 -1244 -572 -481 -1112 -1136 -468 -752 -536 -1113 -1140 -777 -1366 -649 -872 -1059 -1227 -1304 -1097 -568 -1014 -968 -802 -675 -629 -916 -643 -535 -720 -663 -791 -401 -889 -1566 -1076 -751 -873 -707 -1047 -1082 -1045 -1086 -359 -676 -824 -757 -928 -1192 -985 -531 -846 -439 -786 -1161 -698 -596 -1203 -797 -1195 -1394 -851 -1080 -794 -720 -509 -909 -1101 -1347 -639 -1055 -673 -684 -681 -718 -329 -791 -997 -476 -586 -645 -607 -569 -1256 -687 -1450 -526 -673 -1052 -575 -656 -689 diff --git a/code/opt-results/direct/amalia_4.0_victorvilleRose/AEP.txt b/code/opt-results/direct/amalia_4.0_victorvilleRose/AEP.txt deleted file mode 100644 index b463627..0000000 --- a/code/opt-results/direct/amalia_4.0_victorvilleRose/AEP.txt +++ /dev/null @@ -1,110 +0,0 @@ -1103574.0587 -1098773.39908 -1101024.62048 -1104131.40548 -1106695.10132 -1104796.42968 -1098328.68085 -1098504.15877 -1102550.87832 -1101288.2323 -1098198.24432 -1100247.60842 -1102345.9821 -1106011.76289 -1104096.28282 -1100416.49891 -1096299.21448 -1103669.57428 -1095378.55937 -1104500.30113 -1106019.93741 -1099371.9642 -1106960.85494 -1098359.5646 -1106677.8015 -1099366.90385 -1097910.82998 -1101824.58646 -1098903.26389 -1100158.71259 -1106807.57274 -1103927.59207 -1095527.73651 -1100283.64175 -1095243.29544 -1102374.89376 -1100356.78656 -1097072.19279 -1100663.27224 -1098348.59553 -1099206.60814 -1105375.04625 -1101679.16301 -1106413.48222 -1105974.99909 -1105229.1577 -1103891.4053 -1103707.04768 -1102531.75619 -1107145.87876 -1106640.78155 -1099118.49113 -1105836.8592 -1098255.81889 -1099326.28324 -1104046.39121 -1102842.88929 -1098942.27176 -1095988.68922 -1097788.69703 -1095955.97296 -1097709.96716 -1093503.42724 -1098531.7552 -1097860.46945 -1096425.80476 -1104323.76395 -1099874.64843 -1095854.48338 -1105201.93358 -1103660.60163 -1099194.38929 -1105424.90731 -1106403.54881 -1098928.25074 -1099937.89845 -1097608.80143 -1105553.84671 -1092223.37602 -1097169.6642 -1097282.79071 -1097648.09968 -1099922.85311 -1106760.83517 -1101314.20389 -1106649.55758 -1104568.5453 -1095218.79359 -1106018.77523 -1097756.33447 -1095710.8507 -1107248.95024 -1099340.58258 -1098240.85927 -1103311.3028 -1097943.769 -1100587.74213 -1098849.15126 -1100264.25569 -1104686.34846 -1104775.8069 -1097264.16992 -1098859.22493 -1097671.72459 -1100051.58425 -1107944.79167 -1094319.3955 -1099944.31166 -1099996.88647 -1098569.68301 diff --git a/code/opt-results/direct/amalia_4.0_victorvilleRose/funcCalls.txt b/code/opt-results/direct/amalia_4.0_victorvilleRose/funcCalls.txt deleted file mode 100644 index 953595f..0000000 --- a/code/opt-results/direct/amalia_4.0_victorvilleRose/funcCalls.txt +++ /dev/null @@ -1,110 +0,0 @@ -650 -712 -762 -929 -1038 -554 -819 -1111 -1160 -1328 -654 -1002 -700 -961 -447 -857 -1083 -1070 -834 -661 -797 -1274 -674 -1109 -497 -842 -822 -979 -2310 -848 -770 -844 -983 -893 -1454 -1182 -1029 -820 -942 -1110 -558 -991 -720 -605 -1052 -601 -1170 -685 -715 -550 -636 -1549 -1130 -759 -1105 -528 -799 -1211 -1557 -595 -761 -826 -1277 -905 -1143 -603 -804 -996 -1564 -714 -503 -804 -972 -1255 -1057 -1068 -745 -911 -876 -1455 -808 -1080 -411 -866 -1162 -778 -1330 -1108 -607 -978 -1147 -836 -671 -1379 -865 -921 -568 -1060 -968 -818 -1273 -1047 -1121 -875 -932 -1292 -1161 -1020 -1442 -776 diff --git a/code/opt-results/direct/amalia_6.0_northIslandRose/AEP.txt b/code/opt-results/direct/amalia_6.0_northIslandRose/AEP.txt deleted file mode 100644 index a17116f..0000000 --- a/code/opt-results/direct/amalia_6.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,101 +0,0 @@ -954863.056918 -960125.095332 -952970.560584 -952511.113843 -956172.382693 -954925.556395 -959276.868941 -958133.84252 -955465.601834 -960019.865525 -956989.230363 -952822.092117 -959625.75605 -960027.19296 -956595.244009 -952335.876115 -955123.243907 -958369.012217 -954645.75304 -959333.944083 -956586.080237 -954957.546525 -959109.94549 -957957.039912 -957331.654261 -956190.517417 -959588.140177 -959978.973128 -960088.472093 -954351.624664 -955451.917532 -960274.289533 -953794.158607 -956999.842866 -960140.66309 -956742.997619 -954174.422878 -955605.081639 -957661.786142 -954980.794903 -954494.448275 -956383.871832 -955243.703087 -955991.894089 -953942.155619 -948742.174606 -952752.545771 -959279.357027 -953763.540323 -954601.935657 -956588.596247 -957912.295557 -952786.173133 -956721.784116 -958793.158266 -956719.842619 -955520.53437 -960352.923286 -954919.057186 -955022.005958 -954522.062563 -957181.747167 -957491.227008 -956692.742196 -957846.270288 -955049.186824 -955530.144674 -958958.192237 -954596.592684 -957021.062123 -955176.284641 -953993.74593 -954966.470817 -951686.448335 -960288.432743 -956372.797737 -954660.49087 -951864.39786 -956303.85596 -955990.77795 -960579.846175 -957894.233239 -952985.164556 -959304.743594 -951558.68674 -953209.239314 -953088.792809 -951651.643066 -953963.831913 -958891.241691 -954651.308672 -960932.660336 -956061.933504 -956703.916605 -955042.531273 -960132.245073 -954618.094509 -959955.85155 -957309.009078 -955484.440674 -957578.478169 diff --git a/code/opt-results/direct/amalia_6.0_northIslandRose/funcCalls.txt b/code/opt-results/direct/amalia_6.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 6515abb..0000000 --- a/code/opt-results/direct/amalia_6.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,101 +0,0 @@ -759 -763 -1077 -1246 -1345 -734 -436 -509 -820 -495 -1318 -1163 -708 -681 -884 -1120 -2046 -963 -1293 -1273 -743 -739 -571 -703 -1112 -1017 -1396 -586 -919 -449 -934 -459 -795 -1204 -669 -991 -1630 -897 -479 -2017 -1162 -2042 -1953 -638 -1172 -1011 -1071 -732 -2425 -1616 -681 -1133 -1582 -952 -1287 -1129 -993 -635 -757 -968 -940 -723 -706 -659 -853 -769 -733 -856 -1176 -2695 -1036 -1164 -779 -838 -385 -1562 -1537 -752 -1270 -1158 -944 -642 -1049 -495 -1203 -1557 -1238 -1811 -802 -797 -1754 -611 -1093 -1399 -1329 -984 -1060 -472 -621 -764 -830 diff --git a/code/opt-results/direct/amalia_8.0_northIslandRose/AEP.txt b/code/opt-results/direct/amalia_8.0_northIslandRose/AEP.txt deleted file mode 100644 index c7bab69..0000000 --- a/code/opt-results/direct/amalia_8.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,112 +0,0 @@ -994081.174198 -987860.784093 -992615.692106 -993014.61108 -987434.423722 -994421.631848 -989390.039417 -991661.719699 -989905.508088 -987669.253159 -992295.619023 -992008.441627 -987199.455701 -992740.854874 -993097.710965 -992912.510966 -989294.559697 -990079.800767 -989054.593665 -990703.885512 -989804.335732 -988769.514777 -991951.862838 -990450.692918 -991155.355284 -992052.942516 -990347.300602 -992058.348252 -989141.725445 -992673.307962 -990451.840277 -989169.364737 -987798.700146 -989762.792858 -992673.970427 -992675.566569 -990979.089621 -991506.477586 -989128.947265 -993481.038286 -989922.188339 -990146.326274 -989023.846983 -989797.50205 -990635.100264 -987447.448078 -994287.069174 -986483.081821 -992067.343622 -990453.80638 -990280.295827 -989152.743339 -988230.865126 -993531.111611 -992994.763349 -989880.52831 -987027.128363 -993417.327456 -988969.341914 -994109.014867 -988639.145054 -989115.433763 -994089.491995 -987278.363471 -990486.684229 -990933.135916 -986226.864247 -989142.438787 -989573.238577 -987564.736659 -991248.164363 -988967.836493 -991356.801814 -991330.126772 -987313.755638 -990341.244712 -990151.043956 -991379.990361 -990274.519749 -990861.531681 -988360.499099 -992077.98084 -988424.553602 -990652.119482 -994266.554746 -989775.09891 -989289.363342 -989872.123498 -994438.529361 -986297.79278 -989633.458163 -988981.118889 -988468.541888 -988201.253457 -991042.637554 -989912.4021 -987612.282979 -987475.230894 -987266.594241 -990048.819869 -988489.199196 -989214.219455 -988414.634079 -990886.857424 -991030.884938 -992594.409814 -988641.296389 -989501.091415 -990750.037511 -990439.555159 -992071.42415 -988284.011366 diff --git a/code/opt-results/direct/amalia_8.0_northIslandRose/funcCalls.txt b/code/opt-results/direct/amalia_8.0_northIslandRose/funcCalls.txt deleted file mode 100644 index a962a7c..0000000 --- a/code/opt-results/direct/amalia_8.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,112 +0,0 @@ -353 -765 -899 -1055 -1190 -511 -994 -632 -611 -879 -586 -804 -920 -606 -680 -506 -515 -946 -896 -911 -1046 -1687 -677 -1077 -912 -853 -1238 -574 -834 -459 -1033 -663 -778 -839 -491 -799 -1236 -827 -1113 -669 -875 -1106 -1377 -1996 -754 -1610 -669 -1037 -483 -1058 -1612 -982 -1160 -714 -635 -946 -1016 -464 -637 -317 -1753 -1831 -889 -732 -996 -706 -1603 -662 -919 -1220 -1700 -1109 -1700 -702 -1310 -899 -860 -891 -1366 -589 -1433 -428 -750 -873 -397 -943 -1110 -597 -317 -1674 -1194 -780 -808 -738 -499 -634 -1189 -1226 -1042 -860 -1089 -494 -1059 -749 -1283 -559 -998 -706 -1648 -1101 -431 -1099 diff --git a/code/opt-results/direct/circle_4.0_northIslandRose/AEP.txt b/code/opt-results/direct/circle_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 643b4de..0000000 --- a/code/opt-results/direct/circle_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,138 +0,0 @@ -877496.120488 -881800.465509 -882485.208478 -880171.828553 -882684.236657 -883120.860472 -882035.147506 -882270.85982 -885911.870531 -884728.507304 -884921.270016 -884860.278235 -886863.27018 -886883.80149 -878870.77404 -880019.147955 -878104.116587 -879493.007931 -883442.274323 -879510.120341 -882231.593745 -879189.420053 -882339.663416 -885579.548459 -880410.814827 -878302.310292 -880798.210277 -880178.278264 -876098.702187 -878697.32438 -880687.108082 -883358.714439 -881162.753169 -881232.87033 -882273.973945 -884393.990451 -879962.975039 -884089.228231 -885552.245968 -881344.643081 -877791.698585 -876314.410684 -884224.227721 -877035.217309 -885822.733844 -882179.597157 -882336.651254 -883203.59519 -887737.856703 -885429.504836 -884645.824403 -878235.201493 -887909.788146 -879592.703442 -879783.213325 -886763.120456 -877992.749995 -887764.812251 -887298.09174 -885270.931853 -879765.912817 -877567.359637 -884851.505024 -880426.081417 -882191.525096 -882190.595843 -879602.958173 -880140.166451 -884674.744054 -879326.657569 -884971.377486 -880401.53131 -882873.869992 -884082.586009 -885702.308062 -882369.679653 -883093.443466 -881929.986248 -880530.086709 -879121.903124 -880434.240151 -884075.156465 -880676.066744 -878362.311518 -884888.985736 -882854.344801 -880828.020346 -877805.95168 -886642.3237 -881874.054749 -884770.935685 -887259.121982 -879250.700704 -878781.754511 -886183.215004 -879628.709361 -876690.072687 -882360.277513 -886460.88068 -886567.085782 -885065.651817 -880039.633898 -877687.799764 -882810.544538 -879913.995023 -880415.462288 -881313.299407 -884261.606557 -879258.631903 -881849.921221 -886558.73288 -886116.06958 -878034.034174 -883523.014041 -888007.370816 -883898.681556 -882668.640204 -879544.284249 -877501.941958 -887045.248534 -883914.906169 -888455.117806 -884538.355237 -878934.605414 -876708.960432 -878814.173786 -881839.702971 -883417.508831 -883618.375631 -886276.791151 -880466.271243 -879869.873179 -883626.595261 -884416.982212 -879154.163994 -884927.451698 -882134.251051 -880927.638253 diff --git a/code/opt-results/direct/circle_4.0_northIslandRose/funcCalls.txt b/code/opt-results/direct/circle_4.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 6021dd0..0000000 --- a/code/opt-results/direct/circle_4.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,138 +0,0 @@ -621 -681 -743 -1058 -600 -526 -1279 -1033 -477 -499 -937 -627 -443 -738 -1051 -740 -572 -1453 -747 -932 -998 -587 -950 -820 -844 -848 -655 -1114 -1237 -1543 -635 -588 -837 -870 -806 -834 -665 -500 -713 -1059 -866 -779 -927 -759 -557 -775 -1147 -1143 -806 -480 -674 -1272 -798 -1449 -783 -646 -669 -490 -572 -706 -1029 -1085 -427 -1048 -641 -908 -627 -807 -397 -746 -579 -695 -723 -1306 -482 -714 -525 -886 -802 -1001 -627 -632 -1202 -991 -724 -741 -657 -1135 -473 -784 -444 -1145 -904 -1093 -936 -796 -932 -665 -588 -897 -638 -1069 -957 -604 -558 -734 -805 -745 -687 -1379 -458 -434 -765 -996 -492 -578 -913 -789 -912 -663 -643 -488 -891 -962 -938 -505 -553 -816 -382 -520 -683 -859 -821 -654 -728 -987 -1155 -1210 diff --git a/code/opt-results/direct/square_4.0_northIslandRose/AEP.txt b/code/opt-results/direct/square_4.0_northIslandRose/AEP.txt deleted file mode 100644 index aa8ac26..0000000 --- a/code/opt-results/direct/square_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,110 +0,0 @@ -888149.075415 -882047.540491 -889178.938271 -880511.429839 -892674.486632 -891916.059374 -881363.304108 -887456.689163 -880023.904562 -889393.946902 -885835.323036 -881981.716298 -880487.048692 -889054.001605 -882637.45144 -888176.841939 -884212.457378 -888449.811182 -886635.928687 -892007.519001 -883050.082548 -889461.533222 -883957.8292 -879086.471512 -884276.610353 -891227.13231 -891006.447352 -879147.988611 -883596.025281 -884266.458914 -880664.792837 -873049.951046 -880596.033029 -887826.216137 -885349.041568 -886824.505714 -879391.749009 -887783.088833 -881106.249433 -890500.111719 -883820.570231 -880271.94642 -888930.944733 -892719.886631 -884603.215207 -887619.472411 -881027.039688 -888899.252191 -887020.852963 -881578.156192 -876034.257334 -884571.076263 -888180.49099 -891901.68963 -884612.93211 -884562.365276 -881617.01307 -889981.571979 -881888.354706 -891154.322036 -880696.12613 -878923.934482 -886329.312185 -879154.251441 -878198.67101 -877648.464345 -878839.255365 -892230.857433 -880365.817116 -889255.622915 -889984.221135 -880292.712717 -884075.810138 -875121.804659 -892462.40012 -884558.83618 -880451.274459 -882575.901632 -881223.105505 -881446.618264 -879389.887476 -883663.654587 -886823.376483 -881930.40345 -878857.392175 -882996.055282 -887425.973451 -881759.895338 -883605.847069 -880693.457717 -886198.286581 -882589.354219 -883461.273605 -890118.491693 -883455.645859 -891589.246575 -878799.095402 -884397.513006 -883765.773394 -886160.211559 -881815.760998 -891921.97801 -881284.041299 -878987.814443 -884829.701817 -882424.646334 -886948.092398 -888663.172643 -891438.977427 -877273.47392 diff --git a/code/opt-results/direct/square_4.0_northIslandRose/funcCalls.txt b/code/opt-results/direct/square_4.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 3ec94af..0000000 --- a/code/opt-results/direct/square_4.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,110 +0,0 @@ -606 -751 -781 -566 -842 -992 -816 -783 -991 -732 -1146 -1075 -1693 -619 -1336 -414 -1943 -633 -761 -678 -1387 -927 -696 -941 -1231 -655 -904 -859 -367 -614 -631 -774 -1950 -662 -1037 -816 -789 -1553 -1409 -1055 -969 -687 -1501 -1337 -2983 -931 -1177 -567 -705 -1761 -597 -878 -976 -1079 -1232 -1037 -777 -490 -1258 -727 -1098 -739 -795 -1137 -883 -633 -1595 -1291 -670 -472 -640 -1358 -1403 -1024 -554 -706 -766 -1610 -865 -982 -628 -631 -659 -690 -705 -740 -813 -828 -849 -918 -960 -946 -985 -1000 -1150 -1108 -1122 -489 -597 -1335 -767 -676 -802 -1377 -569 -906 -967 -641 -455 -758 diff --git a/code/opt-results/grid/amalia_4.0_northIslandRose/AEP.txt b/code/opt-results/grid/amalia_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 0d206a3..0000000 --- a/code/opt-results/grid/amalia_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,397 +0,0 @@ -867679.634022 -847533.061084 -841555.115656 -836831.700775 -849298.689423 -848048.733616 -867821.224994 -819556.197112 -867821.224994 -861712.173245 -864143.982193 -860433.640129 -873169.69392 -842514.936034 -865204.305652 -860433.640129 -867337.506028 -847840.532484 -853033.52603 -841168.486521 -872346.10526 -866837.469206 -847533.061084 -818168.125486 -853313.948991 -861712.173245 -837183.217069 -839877.176796 -867337.506028 -837363.531651 -847533.061084 -866371.036336 -845173.917555 -858923.961078 -837163.858328 -839500.332344 -810346.2353 -861712.173237 -873169.69392 -834851.07832 -871600.62105 -863933.50349 -868582.853835 -866371.036395 -843952.994681 -862306.467814 -837645.565843 -845923.808067 -867836.951015 -847840.532484 -854580.767039 -841433.448853 -849512.23684 -855904.608157 -872346.10526 -841171.761066 -821730.310023 -847840.532474 -844103.714349 -841612.695632 -831260.284746 -872966.569675 -859215.243389 -852598.357223 -865690.106069 -856948.290632 -850516.791435 -862523.156774 -842244.267559 -839089.687045 -845173.917555 -873169.69392 -860444.820557 -861712.173245 -847259.739579 -854718.303353 -841433.448853 -839089.687045 -837163.858327 -847691.204673 -867145.516153 -866640.357443 -872346.10526 -867679.634022 -843952.994681 -846268.210996 -837183.217069 -867145.516154 -860433.640129 -858923.961097 -864320.209757 -853579.845015 -851891.711762 -847048.381402 -866640.357443 -841159.675205 -849692.114651 -848971.625829 -868582.853835 -852598.357246 -866837.469206 -854837.401976 -832785.69457 -837183.217069 -841906.634181 -861043.903296 -851891.711762 -841906.634181 -866640.357443 -866837.469206 -872346.10526 -843952.994681 -850516.791435 -844068.258167 -837925.288769 -861671.651333 -839089.687045 -850516.791435 -865971.50652 -870299.549867 -867836.951015 -850473.527107 -830453.734712 -847321.734012 -853579.845015 -868582.853835 -861712.173245 -873169.69392 -852026.134629 -855904.608157 -872346.10526 -844368.349892 -857667.027403 -847247.852276 -810176.164933 -847259.739745 -866371.036369 -853033.52603 -862306.467813 -839452.800629 -837762.495576 -873169.69392 -844103.714349 -861671.651334 -870738.940698 -850238.603009 -861712.173245 -873169.69392 -836831.700777 -868728.13438 -867836.951014 -866837.469206 -847533.061084 -864143.982193 -847533.061084 -854837.401976 -865204.305694 -841612.695632 -837163.858327 -866837.469206 -854580.76704 -836720.448884 -860040.458685 -871600.62105 -844368.349896 -847533.061084 -866640.357443 -866640.357443 -853033.52603 -867337.506029 -844762.351958 -864856.24023 -847234.468456 -807252.67212 -851584.433525 -866640.357443 -849669.150757 -849909.583164 -866837.469206 -861712.173245 -864143.982191 -848971.625829 -854580.76704 -864017.319466 -866371.036366 -862797.037099 -856882.680893 -841612.695632 -846268.210996 -854622.542179 -864978.611249 -847259.739743 -848971.625829 -830851.355842 -854165.875176 -850516.791509 -873169.69392 -841814.942797 -839452.800629 -814671.558671 -867406.610335 -830406.664242 -863933.50349 -847840.532481 -831123.736968 -850244.028743 -859086.795935 -861712.173245 -847259.739736 -847259.739744 -843952.994681 -839263.298227 -872346.10526 -836831.700775 -847840.532484 -847004.059356 -838763.332101 -847610.21509 -872944.328166 -847840.532484 -838580.273149 -863933.50349 -866371.036369 -853579.845015 -837363.531651 -864856.24023 -839263.298227 -837163.858327 -856095.693989 -866640.357444 -863875.843814 -865704.592394 -844531.046112 -866640.357443 -839089.687045 -847259.739739 -865204.305694 -848300.806044 -853033.526048 -864136.845912 -819556.197096 -848823.473037 -846377.050568 -837394.871675 -847038.830557 -844368.349895 -845923.808067 -864136.845914 -866837.469206 -863739.663451 -846900.53466 -859001.232063 -860040.458685 -873169.69392 -822878.656073 -871600.62105 -847840.532484 -863739.663451 -867679.634022 -864856.240251 -866837.469206 -815306.904444 -859215.243389 -844068.258167 -864856.240232 -847148.948194 -864766.007542 -861671.651334 -850516.791435 -866640.357444 -844469.978984 -837677.471437 -846130.740953 -837363.531651 -865704.592394 -864017.319466 -866640.357443 -867821.224994 -847259.739745 -871600.62105 -837183.217069 -872346.10526 -847234.467758 -864902.317026 -837394.871674 -863933.50349 -837163.858327 -857741.804923 -867679.634022 -872811.881599 -864017.319466 -849692.114651 -839877.1768 -864856.24023 -849298.689423 -847259.739743 -850516.791435 -866837.469206 -847533.061084 -854165.875176 -850734.175788 -838651.480676 -867337.506029 -819556.197112 -842131.620271 -852726.472229 -856527.609215 -861712.173245 -843731.511218 -855904.608157 -826780.062314 -861525.045016 -837465.286401 -870738.885674 -847533.061084 -865704.592394 -837183.217069 -867821.224949 -848300.806044 -867337.506028 -819556.197112 -832941.58759 -865690.106069 -867557.979276 -867557.979276 -849160.97929 -868406.126847 -836831.700775 -847259.739745 -854097.814527 -844469.978984 -867679.634022 -865971.50652 -852598.357246 -865971.50652 -839089.687045 -849692.114651 -861525.045025 -862306.467814 -834851.078339 -846745.917484 -847533.061084 -861712.173245 -836831.700775 -864136.845912 -867337.506028 -871600.62105 -843635.653156 -873074.720953 -847533.061084 -866837.469206 -867679.634022 -867337.506029 -850244.028747 -863933.50349 -837000.551849 -835323.281108 -865971.50652 -842143.868 -823487.163915 -859086.795917 -847840.532484 -857667.027402 -867836.951015 -873169.69392 -852026.134629 -819556.197111 -839089.687045 -834851.07833 -834851.078339 -864143.982193 -868772.719548 -864766.007542 -836918.155772 -851891.711762 -844068.258167 -847533.061081 -857458.44481 -847331.66822 -870299.549867 -867145.516154 -849160.979289 -865101.859852 -866371.036369 -863933.50349 -866039.293238 -843635.653156 -873169.69392 -847730.691447 -863739.663451 -839089.687045 -866640.357443 -858923.961097 -860433.640129 -872346.105258 -852944.446941 -870299.549866 diff --git a/code/opt-results/grid/amalia_4.0_ukiahRose/AEP.txt b/code/opt-results/grid/amalia_4.0_ukiahRose/AEP.txt deleted file mode 100644 index 81e920a..0000000 --- a/code/opt-results/grid/amalia_4.0_ukiahRose/AEP.txt +++ /dev/null @@ -1,383 +0,0 @@ -886716.30971 -917748.920715 -922049.167073 -919012.717876 -917748.920688 -917343.027633 -923422.005565 -902291.658901 -886722.463513 -917826.715317 -923729.897091 -914945.383922 -915620.9072 -917290.406508 -927694.932959 -920560.267106 -886716.30971 -880865.481244 -923896.443295 -921416.730417 -914509.643172 -913386.775903 -923022.733896 -914487.386569 -904071.676896 -896606.929096 -918660.816802 -888214.76269 -923729.89709 -923311.077033 -921089.216598 -909892.920539 -910473.878054 -917290.406807 -884357.050364 -874864.518601 -919835.140366 -920071.676668 -914509.643172 -925108.346749 -888484.600179 -914945.383922 -922049.167073 -906027.469513 -927566.653256 -903577.298972 -921416.730418 -903023.203231 -908229.340404 -916524.76046 -905273.660011 -892417.237739 -897794.788274 -886049.973027 -919711.609021 -898061.899437 -907356.443256 -916298.247591 -918013.568689 -919711.605027 -923234.33805 -921797.751544 -925407.041623 -898356.926833 -921786.283781 -901363.886942 -898380.737435 -903577.298916 -888214.76269 -866998.075272 -888484.599902 -902374.973387 -922079.660475 -914945.383922 -909115.932471 -886177.921134 -916298.247591 -895412.821061 -905737.55156 -923771.490405 -924097.532876 -924097.532876 -892114.672884 -898208.681063 -917290.406807 -914295.779737 -927694.932959 -884881.637038 -925781.148366 -916298.247594 -917748.920825 -886716.30971 -911486.241563 -901363.887056 -925108.34675 -886051.4257 -908229.34039 -923771.490464 -907356.443256 -923422.005566 -920560.266895 -909501.397877 -897358.89762 -882035.555601 -905737.551561 -897652.245114 -927435.779003 -899234.388245 -897815.945316 -907733.835925 -898061.899436 -919677.843778 -927566.653256 -915015.093988 -895082.297017 -919012.717876 -921089.216602 -908579.191838 -899258.601259 -921089.216602 -871755.082445 -928479.549087 -901039.613696 -917097.679855 -895939.160601 -922006.099081 -903575.850841 -925381.796024 -927694.932959 -907925.111457 -888214.76269 -916298.247596 -884881.637038 -923311.077101 -917245.047176 -919711.612916 -917245.047196 -909115.932471 -903495.872748 -903577.29897 -909115.932471 -886722.463513 -903189.319328 -881848.962329 -919711.612911 -909501.397877 -895939.160601 -885495.712989 -897652.245114 -919657.579931 -922049.167072 -923771.490462 -923422.005566 -917097.679855 -910306.350123 -922049.167072 -916298.247596 -914385.582275 -923422.005551 -903495.872748 -916880.428586 -898134.755564 -923771.490464 -917097.679855 -916524.760412 -903495.872748 -889291.99098 -901831.424503 -897652.245114 -908229.340404 -887424.475645 -920560.266935 -881141.655919 -914103.022847 -920395.060982 -886177.921134 -917245.047196 -919012.717876 -903495.872747 -909892.920543 -917290.406805 -903495.872741 -885495.712989 -919736.901405 -910473.901874 -923666.751032 -909892.920539 -923022.733905 -920368.615237 -915620.907188 -885495.712989 -897652.245114 -920560.267106 -921416.730399 -917097.679855 -922049.167072 -918069.712588 -879506.204685 -897270.627443 -905737.551547 -923311.077101 -881848.962318 -920110.872122 -886722.463513 -889400.483773 -907356.443256 -886030.342623 -898380.73743 -923422.005566 -897652.245114 -923311.077102 -886716.30971 -903577.298972 -916298.247591 -890949.136805 -915620.9072 -895939.160601 -908229.340349 -900310.67172 -889291.99098 -903577.298972 -919012.717876 -903374.683075 -923896.443294 -923311.077102 -927694.932959 -917097.679856 -897358.897619 -886716.30971 -888484.599902 -919059.731286 -913462.247446 -919012.717876 -919835.140366 -907356.443256 -897794.788274 -902305.295199 -913386.775903 -886716.30971 -927435.779003 -925407.041438 -897358.897619 -916298.247589 -903495.872748 -886579.273438 -920368.615237 -923213.653733 -886177.921135 -879345.147495 -901363.887058 -897358.897619 -927694.932959 -928480.310162 -909892.920539 -887174.275466 -905737.551524 -904267.609655 -913386.775903 -919012.717876 -894888.150761 -894888.150758 -920560.267103 -906134.671583 -921797.751544 -917826.715317 -922006.099082 -919012.717876 -905737.55156 -908229.340394 -908229.340393 -884357.050363 -922049.167072 -875358.290943 -896606.929096 -909892.920539 -922049.167072 -903577.298972 -917343.027633 -894494.19265 -921033.087105 -923729.897091 -922049.167072 -903495.872747 -886177.921134 -927694.932959 -922049.167072 -903577.298972 -900310.67172 -906134.671584 -918660.816802 -913462.247446 -897270.627443 -920560.267099 -918699.771329 -905737.551561 -917748.920668 -919430.935175 -890949.136805 -922175.311767 -906134.671581 -925407.041623 -919184.451394 -919657.579931 -921416.730417 -900310.67172 -923896.443294 -891826.608255 -915620.9072 -917097.679855 -916623.840701 -917748.919982 -920110.872122 -911675.277716 -917290.40614 -917097.679855 -924097.532876 -902305.295199 -914603.815438 -881755.727579 -906134.671583 -886722.463513 -915015.093988 -907356.443256 -927435.779003 -912763.678707 -917245.047196 -903495.872681 -903577.297532 -923311.077102 -916483.178524 -923422.005565 -887424.475644 -922006.099083 -906134.671582 -896823.812999 -925381.796025 -905737.551561 -906134.671584 -897358.897619 -925407.041622 -917748.920664 -907356.443256 -927694.932959 -923422.005566 -905737.551561 -919012.717876 -917245.047196 -898380.737432 -923311.077102 -917245.047189 -909501.397877 -897652.245114 -916298.247592 -910303.523174 -923422.005507 -906134.671578 -905737.551561 -910681.697583 -886177.921135 -915015.093988 -910379.993942 -903577.298972 -903495.872746 -903189.319328 -908229.340403 -897543.941722 -927566.653239 -914603.815438 -895939.160601 -907356.443256 -925381.796025 -917245.047196 -897652.245114 -913608.050996 -914487.386569 -893478.637435 -909892.92054 -920560.267106 -925407.041615 -925322.688796 -915620.9072 -915620.9072 -919657.579931 diff --git a/code/opt-results/grid/amalia_4.0_victorvilleRose/AEP.txt b/code/opt-results/grid/amalia_4.0_victorvilleRose/AEP.txt deleted file mode 100644 index c1a7296..0000000 --- a/code/opt-results/grid/amalia_4.0_victorvilleRose/AEP.txt +++ /dev/null @@ -1,399 +0,0 @@ -1036709.91414 -1085907.22906 -1056111.95736 -1056878.75327 -1087004.99052 -1080604.70441 -1087684.36248 -1063517.58359 -1061383.14566 -1070476.69592 -1084132.19992 -1035492.9983 -1072240.15296 -1065871.65912 -1082385.58983 -1064580.19262 -1015401.6597 -1061714.86951 -1076088.44084 -1063063.7563 -1056484.79983 -1077446.12191 -1030644.37792 -1087684.36248 -1044771.19276 -1062243.00207 -1063678.7879 -1076501.75528 -1076142.24863 -1063174.65391 -1047010.93172 -1073367.80719 -1043976.77648 -1084132.19992 -1063174.65391 -1072590.12915 -1077446.12191 -1087684.36248 -1076655.76327 -1052084.75947 -1078661.20428 -1073367.80709 -1072590.12915 -1066556.1197 -1064378.07265 -1072411.14753 -1073367.80718 -1058448.88004 -1050010.51109 -1052264.84197 -1036709.91414 -1043976.77522 -1053552.91783 -1051603.27732 -1072590.12915 -1078661.20428 -1084132.19992 -1043033.62754 -1089947.64585 -1046993.03835 -1070027.55876 -1077492.69168 -1075571.33069 -1076602.52772 -1070027.55876 -1051715.98946 -1087684.36248 -1050356.19037 -1030557.46903 -1070349.44613 -1061574.2081 -1072240.15296 -1062319.1243 -1082385.58983 -1061508.05444 -1073280.06564 -1089269.81694 -1072314.92564 -1071523.54453 -1076602.52772 -1081450.33801 -1071560.23818 -1076655.76327 -1081356.67052 -1073280.06564 -1067457.43875 -1077492.69168 -1056196.67785 -1076142.24864 -1055332.95377 -1085006.2531 -1081941.82071 -1067146.493 -1078390.82096 -1071849.56393 -1050530.29638 -1072411.14753 -1044771.19276 -1056082.50898 -1059777.66199 -1081577.09467 -1077446.12191 -1048819.351 -1070230.68949 -1067426.15197 -1076602.52772 -1066956.34149 -1061551.59132 -1073367.80719 -1043970.2628 -1070120.87061 -1064346.92894 -1061491.94549 -1074299.91585 -1056395.77701 -1080815.38305 -1084574.77862 -1076142.24864 -1076031.78524 -1061551.59383 -1080815.38305 -1061714.86951 -1082385.58983 -1066556.11971 -1052431.17517 -1071108.99892 -1071594.89701 -1061714.86951 -1060139.57353 -1071985.70731 -1082678.80247 -1055294.50438 -1078661.20428 -1078661.20428 -1076602.52772 -1080144.29561 -1043976.77522 -1078904.00559 -1089947.64585 -1075152.28018 -1066956.34149 -1085907.22906 -1051107.83039 -1080063.16894 -1051266.06368 -1061231.09249 -1071108.99892 -1082385.58983 -1066995.06759 -1077446.12191 -1066556.1197 -1076602.52772 -1084725.91812 -1063517.58359 -1056878.75327 -1087004.99052 -1062243.00207 -1080815.38304 -1036906.62927 -1061487.95888 -1043276.55317 -1061487.95888 -1076501.75528 -1087004.99052 -1089269.81694 -1061551.59421 -1084132.19992 -1030557.46903 -1076602.52772 -1056054.48642 -1066556.11971 -1081429.0985 -1076602.52772 -1076602.52772 -1072240.15296 -1020170.29786 -1083127.78766 -1084132.19992 -1061714.86951 -1077582.09892 -1077636.91316 -1077492.69168 -1059221.78775 -1057358.12358 -1062692.35421 -1064316.93914 -1078661.20428 -1085006.2531 -1089947.64585 -1087004.99052 -1083127.7877 -1080815.38305 -1060936.43392 -1081577.09467 -1056395.77701 -1076142.24864 -1073280.06564 -1086771.07472 -1083127.78769 -1078369.39951 -1076602.52772 -1043264.21937 -1075571.33069 -1085484.95291 -1057358.12358 -1052264.84197 -1081563.37698 -1087004.99052 -1046948.1587 -1072870.16667 -1073280.06564 -1046972.65349 -1063678.7879 -1081356.67052 -1082385.58983 -1062631.542 -1044539.15368 -1053467.57989 -1061714.86951 -1070855.96587 -1068646.10715 -1063579.52394 -1081429.0985 -1084132.19992 -1085006.2531 -1056395.77701 -1060828.81038 -1082385.58983 -1059221.78775 -1039560.55788 -1073280.06564 -1056878.75327 -1051266.06369 -1085907.22906 -1071594.89709 -1063301.59482 -1081356.67052 -1073987.37617 -1060358.56886 -1082101.15475 -1089947.64585 -1064346.92894 -1063301.59482 -1072825.62457 -1061383.14566 -1056878.75327 -1051895.69728 -1072050.06654 -1062631.542 -1035195.89665 -1053552.91783 -1032534.87724 -1089947.64585 -1081584.4336 -1036709.91414 -1078904.00559 -1064580.19262 -1063633.22579 -1054124.75854 -1063063.7563 -1082385.58983 -1076602.52772 -1057219.06849 -1076501.75528 -1078958.62826 -1072411.14753 -1073280.06564 -1035460.54717 -1079862.73025 -1080590.54525 -1081577.09466 -1087004.99052 -1072841.82791 -1062836.65896 -1049378.48611 -1085907.22906 -1068936.07429 -1078958.62826 -1085006.2531 -1068646.10715 -1066506.73994 -1051259.96316 -1077492.69168 -1080144.29561 -1080144.29561 -1051603.59765 -1077492.69168 -1087004.99052 -1065871.65915 -1074991.49479 -1087004.99052 -1070230.68949 -1056878.75327 -1065015.30301 -1076602.52772 -1084825.60521 -1072411.14753 -1037234.34089 -1085484.95291 -1067766.19059 -1089269.81694 -1061231.09249 -1069496.12283 -1084825.60521 -1077492.69168 -1080063.16894 -1061383.14566 -1072590.12915 -1089947.64585 -1072411.14753 -1070759.39792 -1085006.2531 -1061776.99489 -1081429.0985 -1077446.12191 -1071985.70731 -1064346.92894 -1075450.60988 -1083127.7877 -1084193.40316 -1066556.11971 -1063678.7879 -1056204.47176 -1080815.38305 -1073280.06564 -1087684.36248 -1064378.07263 -1072590.12915 -1036906.62927 -1073280.06564 -1034903.60477 -1089269.81694 -1057344.0704 -1071699.8411 -1059221.78775 -1059810.1425 -1082385.58983 -1086771.07472 -1080082.09112 -1049597.76625 -1046972.65349 -1081574.21896 -1084825.60521 -1072314.92564 -1055975.93122 -1062948.70035 -1069083.33704 -1061491.94579 -1075309.30824 -1082385.58983 -1063063.7563 -1035711.83366 -1070749.05769 -1061821.25066 -1072411.14753 -1063715.04584 -1063174.65391 -1073367.80719 -1076655.76327 -1053427.96385 -1063403.89098 -1078904.00559 -1063174.65391 -1082385.58983 -1075309.30824 -1061487.95888 -1072240.15296 -1087684.36248 -1073280.06564 -1089947.64585 -1076730.19746 -1080269.5728 -1067146.493 -1077136.7559 -1078661.20428 -1072825.62457 -1061718.9106 -1079862.73025 -1072825.62457 -1063066.29988 -1056395.77701 -1087004.99052 -981316.875654 -1081577.09466 -1070120.87061 -1085686.4553 -1077446.12191 -1072411.14753 -1077446.12191 -1084132.19992 -1076602.52772 -1060315.49122 -1071594.89709 -1071985.7073 -1061551.59081 -1086581.22101 -1076602.52772 -1080815.38305 -1053462.17967 diff --git a/code/opt-results/grid/amalia_6.0_northIslandRose/AEP.txt b/code/opt-results/grid/amalia_6.0_northIslandRose/AEP.txt deleted file mode 100644 index 02cc2d4..0000000 --- a/code/opt-results/grid/amalia_6.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,398 +0,0 @@ -953193.79854 -950900.830121 -949996.765776 -934403.263278 -949392.02256 -940260.42711 -938687.81122 -937140.835348 -945493.277704 -934934.126432 -912468.667473 -914678.399472 -930732.085961 -941864.360006 -934622.527867 -949198.730048 -938884.360799 -945505.122547 -934209.61008 -939885.304929 -948038.831602 -918721.212434 -949198.730048 -926972.541009 -914668.098246 -941347.379431 -944633.414182 -954136.187431 -926768.199255 -941265.192316 -949987.537115 -949996.765777 -938687.322723 -949987.537115 -933476.853205 -942796.089023 -943504.883733 -935280.463748 -926972.540869 -953193.79854 -935973.60689 -935808.130265 -938687.322723 -944228.948548 -950528.05291 -941864.360006 -931359.356949 -941582.541378 -952001.396371 -941347.37943 -938429.140898 -948975.39601 -918501.397568 -935722.824927 -947255.554385 -919879.179807 -930223.122621 -941622.85803 -914842.398916 -933476.853199 -951166.276533 -903373.502378 -931769.399011 -940880.290165 -932119.26633 -943699.520549 -941265.192316 -923420.65705 -914668.098247 -940070.056878 -949392.02256 -954136.187431 -947859.449016 -942968.833388 -951365.940822 -941622.85803 -931543.984683 -937854.038982 -952001.396371 -927760.967516 -940924.100976 -948065.114889 -942796.089023 -951166.276533 -938687.322723 -934115.23567 -928644.21999 -935973.60689 -948975.396018 -935973.60689 -942389.910439 -949987.537115 -942871.790885 -926972.540783 -948975.396018 -935842.537381 -940260.42711 -947011.015758 -949526.890152 -926069.5447 -952001.396371 -927757.631813 -931543.984683 -905810.971844 -941638.302752 -940070.056878 -949848.997851 -949392.02256 -912510.851848 -948038.831602 -949437.045704 -943317.59532 -933437.408088 -949392.02256 -954136.187431 -874719.047726 -942389.910439 -942957.45069 -951352.096427 -912478.16346 -940901.199739 -941342.5483 -924984.002191 -921946.93817 -935419.313949 -931543.984683 -949292.104607 -890506.073077 -932450.519808 -932829.343347 -934115.23567 -940070.056878 -935842.537381 -949987.537115 -933476.853205 -941247.291622 -944611.637661 -941622.85803 -931651.103628 -947255.554385 -947011.015758 -934723.845185 -949996.765777 -939537.455511 -937627.030275 -929490.728235 -935973.60689 -945745.787991 -923924.539425 -928803.173877 -911050.706412 -928935.655111 -874719.047729 -950900.830121 -942968.833388 -952001.396371 -950900.830121 -942078.977637 -942503.558454 -925167.652935 -953325.242588 -945537.378276 -924001.831105 -947088.99097 -941657.084109 -928611.8055 -942643.902558 -938758.827214 -933476.853205 -940916.133536 -943504.883733 -949292.104609 -941265.192316 -930461.681916 -944556.145236 -949392.02256 -942055.463051 -943715.217508 -950125.041095 -927314.718024 -924807.126845 -939611.475461 -942839.599679 -953325.242588 -948773.572111 -944228.948548 -938687.81122 -941410.16966 -953325.242586 -950125.041095 -936440.393687 -944609.617574 -950900.830121 -921879.324929 -935808.130265 -948447.740864 -937140.835348 -934403.263278 -950528.05291 -942389.910439 -926972.541005 -925851.737934 -948773.572111 -950900.830115 -927122.177604 -941335.981883 -933947.504252 -897674.779188 -937961.754162 -943504.883733 -939448.082669 -954136.187431 -938621.858576 -942389.910439 -907463.451106 -922767.233714 -945612.594907 -948614.332111 -942839.599679 -936181.810997 -946384.213677 -942389.910439 -908290.028675 -950900.830121 -935808.130265 -954084.504191 -944641.319454 -932919.77741 -943178.904369 -949392.02256 -931543.984683 -935808.130265 -933947.504252 -941308.023572 -953325.242588 -935722.824927 -938261.336662 -938518.971634 -952001.396371 -934386.249986 -953966.986391 -950900.83012 -944641.319451 -944352.251068 -934574.372779 -952001.396371 -935735.192204 -928888.503548 -914668.098246 -942389.910433 -949392.022559 -920266.51501 -950125.041095 -923705.229366 -943504.883733 -944311.249599 -937652.901709 -924807.126845 -940901.199739 -950019.069448 -949848.997851 -947088.99097 -943504.883733 -934115.23567 -920239.283258 -933947.504252 -942389.910439 -952001.396371 -928755.128557 -924802.632923 -947859.449016 -891517.853004 -932806.732254 -947255.554385 -921008.313709 -947859.449016 -938687.322717 -949292.104607 -939554.810886 -950397.356548 -947011.015758 -945612.594545 -953909.64484 -934723.845174 -924687.636673 -904408.350678 -953998.627711 -947184.572339 -942389.910439 -937257.205281 -934137.632485 -949392.02256 -935547.349983 -940193.142107 -935973.60689 -928635.899619 -935547.349983 -947859.449016 -928762.787887 -936769.625304 -943471.308308 -940931.339081 -935907.542906 -947754.245777 -935547.349983 -936965.334619 -935973.60689 -942078.977637 -936903.962341 -939162.766635 -947255.554385 -913972.21805 -922072.282108 -942078.977637 -933947.504252 -949597.341631 -919634.598647 -941638.302752 -933674.064498 -949848.997851 -932583.653082 -947088.99097 -921861.058081 -934622.527867 -935547.349983 -927318.297127 -901341.272456 -942871.790885 -913322.521657 -949392.02256 -921861.058178 -939225.032685 -934609.515875 -932544.97161 -945612.594908 -941864.360006 -940931.339081 -938791.863621 -944228.948548 -935280.463837 -930180.424596 -917821.435497 -930518.607501 -949444.11872 -952001.396371 -938791.863621 -950397.356548 -925886.89588 -940931.339081 -936181.810997 -940070.056877 -937854.038982 -919634.598668 -937854.038982 -950125.041095 -941638.302752 -935808.130265 -932952.409445 -934723.845185 -938159.412225 -939958.657929 -954136.187431 -928877.817173 -950494.27525 -919689.247308 -949444.11872 -941582.541377 -953193.79854 -936060.269557 -929412.222576 -949987.537115 -930812.847763 -951166.276533 -935973.60689 -954136.187431 -940193.142107 -924984.002188 -936094.43182 -950019.069448 -935973.606989 -947184.572347 -937107.926907 -937961.754163 -952001.396371 -934115.23567 -948065.114889 -935722.824927 -949392.022515 -951352.096427 -914491.559416 -937854.038982 -941582.541376 -949996.765777 -947011.015758 -935973.60689 -947255.554392 -945612.594908 -949198.730048 diff --git a/code/opt-results/grid/amalia_8.0_northIslandRose/AEP.txt b/code/opt-results/grid/amalia_8.0_northIslandRose/AEP.txt deleted file mode 100644 index 9ce8083..0000000 --- a/code/opt-results/grid/amalia_8.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,389 +0,0 @@ -978254.836234 -981283.878244 -988350.620473 -987462.754496 -990296.622437 -979488.083814 -987873.219598 -984234.186592 -967280.189807 -973962.950801 -952464.891224 -987318.641569 -968653.447265 -940053.529679 -950859.811888 -986437.188633 -988379.093593 -970230.880968 -989201.491498 -979964.168826 -984214.176177 -982460.471199 -989218.36944 -982202.602481 -989218.36944 -989201.491498 -965267.679557 -988350.620472 -982438.425817 -982949.741135 -974578.219889 -980556.979759 -975483.081937 -959883.770795 -955568.643916 -957220.495129 -956171.343416 -974323.343221 -974747.051504 -988350.620472 -973826.756883 -971190.592391 -971069.524922 -990837.903024 -982438.425817 -987362.050201 -991404.674718 -967875.119633 -981377.182102 -977242.845279 -982997.581805 -956893.937347 -987462.754496 -974243.794921 -991404.674718 -986437.188633 -988340.940362 -969954.794779 -968985.170476 -983936.556404 -977981.135269 -968296.413673 -974771.264979 -982997.581806 -972482.920117 -988108.591054 -980157.39325 -986387.130163 -977298.369118 -988977.069038 -989874.349026 -992642.870223 -971785.388186 -989218.36944 -958606.038715 -988340.940362 -988565.24402 -987318.641568 -974747.051513 -941393.94172 -983450.518087 -988350.620472 -965912.623258 -990837.903024 -968892.731759 -989874.349026 -982380.126956 -964217.973066 -941497.618065 -989874.349026 -990682.582105 -988991.908653 -938490.36492 -981800.160701 -978261.875446 -974376.478081 -956767.122696 -966384.686953 -988100.497659 -986100.933417 -989856.052545 -964883.95452 -988350.620472 -983586.406914 -975790.576054 -982438.425817 -982438.425817 -983066.140135 -947505.408531 -989218.36944 -939493.09942 -984322.061272 -982977.519312 -968680.34231 -978616.895536 -978566.733346 -982460.471199 -973149.303483 -992663.637117 -988436.75534 -970295.289331 -987234.783003 -987234.783003 -991404.674718 -974747.051507 -967280.189856 -975790.58616 -979525.883686 -974771.264982 -951434.560103 -978092.951964 -977242.845279 -982380.126956 -989030.933718 -987318.641569 -988379.093593 -965172.72049 -968058.975509 -975483.081937 -977774.569885 -981800.160701 -983246.916774 -976581.481381 -978421.402452 -966245.484554 -990296.622437 -949092.904453 -982321.611904 -965788.459524 -987168.331543 -982977.544202 -979491.63967 -987287.900424 -988379.093593 -987462.754497 -982460.471199 -961490.874401 -990837.903024 -974771.264981 -971753.257368 -987900.054064 -987234.783003 -967875.11942 -988991.908653 -940785.451402 -988991.908653 -987900.054083 -985999.472109 -986150.404174 -975467.115876 -957225.731662 -958281.025893 -988108.591054 -971775.267405 -975853.757096 -915833.716051 -967917.640683 -944156.745 -984922.627808 -988991.908653 -983692.728482 -939582.5302 -990009.462621 -984322.061272 -989218.36944 -954632.184711 -974473.341516 -967917.640683 -964965.092084 -979122.835279 -975483.081937 -972705.232076 -977203.431935 -972321.849055 -990682.582105 -982321.611905 -970066.051189 -974117.533087 -971581.119789 -989218.36944 -990837.903024 -982763.05074 -986437.188633 -978166.214033 -984709.3293 -992663.637117 -984322.061272 -988350.620472 -957273.74886 -972969.318092 -967875.119631 -982255.192387 -990296.622436 -970366.771445 -988350.620472 -985999.472109 -991404.674718 -982360.966135 -980437.437547 -977915.836936 -974062.461096 -970452.221647 -969191.527353 -974953.940174 -975457.342876 -982460.471199 -958124.552568 -967280.189893 -984322.061272 -987287.900422 -988556.862587 -952355.180738 -990837.903024 -982879.018592 -978926.079657 -988340.940362 -967917.640683 -982321.611905 -978926.079657 -969618.578312 -955098.615762 -988924.388063 -921178.492807 -978254.836234 -973963.177114 -977233.883271 -971428.297335 -988350.620472 -970230.880968 -981961.917824 -953268.957584 -937143.675908 -978156.999077 -978092.951964 -984922.627808 -969603.039031 -982321.611905 -978246.61007 -971018.24833 -991404.674718 -948546.098558 -971063.418453 -981800.160702 -971581.11979 -969603.039034 -988924.388062 -980157.393253 -991404.674718 -984709.329299 -989792.831747 -982321.611899 -947752.833784 -979428.654333 -940196.741751 -968481.693658 -977498.445847 -990296.622437 -982321.611905 -967508.966667 -970766.0947 -981274.186997 -977485.257014 -987287.900423 -987234.783003 -977774.569885 -982321.611929 -952162.081305 -980603.958493 -969613.55793 -976581.481381 -967875.119631 -968892.731758 -988350.620472 -978623.232918 -967875.11963 -955710.037053 -971370.272495 -972675.332415 -983261.292739 -972482.920118 -964189.963954 -966978.343079 -971785.388186 -988977.069038 -977242.845279 -988565.24402 -988108.591054 -990837.903024 -988379.093593 -982147.870939 -970784.342544 -958701.088555 -988340.940362 -975422.098647 -984709.3293 -992333.793258 -978920.696915 -992547.803362 -992528.929102 -957787.413835 -972482.920117 -975236.790563 -984234.186592 -954315.179875 -982380.126956 -987287.900424 -977981.13527 -959955.165029 -945147.278041 -974747.051507 -958658.344217 -967770.586644 -983782.3232 -987318.641569 -990837.903024 -952072.389376 -983450.518087 -978926.079657 -978642.970946 -983936.529919 -972937.789139 -980501.23438 -950983.658391 -988350.620472 -988977.069038 -979554.017232 -957055.908499 -955568.643913 -970836.928932 -977298.369118 -947676.506622 -987462.754496 -973766.886401 -987234.783003 -982321.611905 -990009.462621 -988924.388062 -988340.940362 -980566.486569 -971898.078294 -989874.349 -983343.525142 -988350.620481 -977916.357859 -991404.674718 -977851.987675 -975630.510134 -974747.051507 -955790.497613 -984135.11492 -972967.473624 -988340.940362 -979525.883686 -974061.901154 -965484.623583 -976837.053273 -951119.949622 -982532.329546 -988108.591054 -990837.903024 -981800.160701 -969574.060456 -981084.002879 -978246.61007 -973343.631838 -982438.425817 -990682.582105 -977298.369118 -975483.081937 diff --git a/code/opt-results/grid/amalia_8.0_northIslandRose/funcCalls.txt b/code/opt-results/grid/amalia_8.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 68f1bfd..0000000 --- a/code/opt-results/grid/amalia_8.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,389 +0,0 @@ -31 -29 -48 -43 -47 -99 -55 -53 -119 -106 -112 -38 -239 -73 -83 -41 -24 -301 -496 -89 -917 -34 -21 -995 -34 -37 -402 -27 -30 -151 -65 -496 -18 -254 -288 -2091 -127 -47 -20 -21 -329 -54 -682 -54 -63 -42 -26 -111 -21 -18 -34 -338 -49 -27 -24 -44 -37 -76 -597 -149 -15 -1414 -112 -29 -76 -31 -90 -20 -41 -47 -40 -66 -27 -28 -629 -58 -32 -57 -31 -71 -47 -58 -80 -45 -149 -31 -54 -1062 -376 -39 -24 -20 -244 -31 -41 -47 -445 -1039 -25 -138 -34 -64 -34 -41 -2144 -64 -16 -50 -1362 -35 -33 -38 -193 -56 -1509 -1191 -28 -182 -30 -36 -49 -23 -28 -26 -37 -274 -181 -217 -180 -176 -45 -32 -36 -26 -51 -25 -463 -74 -25 -60 -18 -45 -67 -19 -136 -59 -591 -14 -707 -39 -145 -15 -37 -31 -54 -22 -156 -60 -10281 -40 -46 -20 -132 -47 -196 -29 -37 -18 -35 -1363 -387 -48 -18 -178 -34 -53 -30 -2439 -49 -22 -72 -45 -51 -41 -25 -768 -54 -31 -1418 -27 -41 -203 -76 -37 -14 -34 -1771 -371 -47 -22 -116 -131 -21 -23 -38 -62 -39 -28 -64 -234 -101 -32 -63 -130 -44 -38 -50 -783 -20 -121 -157 -74 -2357 -184 -20 -35 -1461 -167 -236 -63 -117 -47 -18 -60 -35 -58 -40 -45 -40 -97 -101 -21 -1027 -24 -38 -127 -561 -20 -171 -669 -99 -51 -29 -56 -33 -58 -26 -22 -165 -63 -1653 -94 -51 -46 -29 -41 -39 -50 -35 -57 -44 -55 -79 -58 -25 -178 -16 -73 -493 -451 -24 -23 -30 -52 -35 -20 -508 -18 -134 -110 -194 -102 -31 -85 -14006 -568 -73 -34 -36 -190 -28 -21 -23 -39 -18 -41 -39 -61 -35 -26 -73 -350 -24 -528 -28 -24 -79 -57 -56 -223 -55 -770 -20 -153 -34 -31 -14 -301 -113 -24 -469 -176 -22 -47 -23 -2150 -44 -30 -930 -211 -28 -46 -1781 -32 -83 -237 -70 -73 -39 -58 -151 -35 -44 -50 -40 -45 -35 -30 -231 -276 -51 -50 -17 -67 -22 -37 -914 -27 -165 -1120 -69 -57 -35 -209 -85 -1190 -189 -48 -49 -52 -50 -1477 -110 -20 -169 -28 -43 -22 -57 diff --git a/code/opt-results/grid/circle_4.0_northIslandRose/AEP.txt b/code/opt-results/grid/circle_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 0db5970..0000000 --- a/code/opt-results/grid/circle_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,393 +0,0 @@ -872362.937471 -869046.085122 -877288.63491 -866276.531259 -872402.099089 -866276.531259 -866276.531259 -876836.416327 -876415.878381 -876446.605631 -882751.999051 -872362.937471 -850062.177994 -860631.593752 -869046.085122 -877288.63491 -877307.196759 -872349.841984 -878292.377382 -882782.998293 -876446.605631 -869046.085122 -872402.099088 -866276.531259 -872349.841984 -837454.799435 -882751.999051 -873173.829037 -882751.99905 -876836.416327 -872349.841984 -872349.841984 -876415.878381 -872402.099088 -868999.922394 -877288.63491 -882751.999051 -876446.605631 -878266.289706 -860622.455518 -882751.999051 -868999.922394 -869046.085122 -877307.196759 -877288.63491 -878266.289706 -876836.416327 -872362.937471 -866307.061438 -872586.794131 -868999.922394 -856338.640048 -872349.841984 -872392.045664 -878266.289706 -882782.998293 -882751.999051 -866276.531259 -869046.085122 -866307.061438 -877307.196759 -878292.377382 -882782.998293 -872402.099089 -866276.531259 -869046.085121 -869046.085122 -876446.605631 -872392.045654 -866276.531259 -872392.045664 -860622.455518 -877288.63491 -878292.377382 -837454.799435 -878292.377382 -872402.099089 -878292.377382 -860631.593752 -872402.099089 -841940.36396 -866276.531259 -866276.531259 -866276.531259 -872541.976048 -849176.590349 -868999.922394 -878292.377382 -872586.793203 -860631.593752 -876836.416327 -856386.883943 -878266.289706 -882751.999051 -872392.045664 -872349.841984 -866307.061438 -877307.196759 -876415.878381 -872349.841984 -876836.416327 -878292.377382 -868999.922394 -876446.605631 -872362.937471 -837463.025244 -868999.922394 -876836.416327 -876446.605631 -872349.841984 -856338.711567 -872362.937471 -877288.63491 -877288.63491 -877288.63491 -876415.878381 -882751.99905 -876836.416327 -878292.377382 -876446.605631 -872392.045663 -877288.63491 -876415.878381 -882751.999051 -878266.289706 -872541.971676 -876836.416328 -868999.922394 -872402.099084 -837454.799435 -866276.531259 -872362.937471 -876446.605631 -882751.999049 -877307.196759 -849115.165974 -872392.045664 -872392.045664 -868999.922394 -877307.196759 -876415.878381 -878292.377382 -872402.099089 -882782.998292 -869046.085122 -872349.841984 -878292.377385 -869046.085122 -876446.605631 -882782.998293 -876836.416327 -866276.531259 -866276.531259 -876836.416327 -860622.455518 -878266.289706 -877307.196759 -882751.999051 -860622.455518 -866307.061438 -876415.878381 -877307.196759 -882751.999049 -876415.878381 -877307.196759 -872392.045664 -876873.426969 -882751.99905 -868999.922394 -877288.63491 -882782.998293 -872349.841984 -866307.061438 -872392.045664 -866276.531259 -876836.416327 -866276.531259 -872392.045663 -877307.196759 -872392.045664 -860631.593752 -877307.196759 -866307.061438 -878266.289706 -872349.841984 -876873.426969 -876446.605631 -876446.605631 -866307.061438 -877307.196759 -882782.998293 -876415.878381 -882751.999051 -868999.922394 -868999.922394 -869046.085122 -865051.420871 -866276.531259 -837463.025244 -872349.841984 -877307.196759 -856386.882172 -877288.63491 -872402.099089 -877307.196759 -876873.426969 -868999.922394 -869046.085122 -849953.805715 -860631.593752 -878292.377382 -856386.20907 -873173.829037 -872402.099089 -876415.878381 -872402.099089 -876873.426969 -876836.416327 -878292.377382 -837463.025244 -876415.878381 -872349.841984 -868999.922394 -876446.605631 -877307.196759 -872402.099089 -876873.426969 -882751.999051 -877288.63491 -877288.63491 -877307.196759 -866307.061438 -872402.099089 -872362.937471 -872362.937471 -872349.841984 -877307.196759 -866307.061438 -882782.998293 -878266.289706 -779523.388571 -877288.63491 -878292.377382 -856386.885112 -878266.289706 -872392.045664 -872349.841984 -860631.593752 -882782.998293 -872402.099088 -869046.085122 -872402.099089 -876873.426969 -873173.829037 -866276.531259 -877288.63491 -878292.377382 -872402.099089 -872362.937471 -877307.196759 -876873.426969 -866276.531259 -869046.085122 -882751.999046 -866276.531259 -866276.531259 -856338.703172 -876446.605631 -876446.605631 -856385.897125 -878266.289706 -872362.937471 -882782.998293 -856386.873651 -872392.045664 -868999.922394 -872586.777789 -872541.956088 -876415.878381 -869046.085122 -877307.196759 -872541.976314 -882751.999051 -878266.289706 -877307.196759 -869046.085122 -866276.531259 -882782.998293 -866307.061438 -873173.829037 -860631.593752 -882782.998293 -878266.289706 -872402.099089 -856338.702584 -868999.922394 -878266.289706 -876415.878381 -868999.922394 -860622.455518 -866307.061438 -872362.937471 -869046.085122 -877307.196759 -873173.829037 -866307.061438 -866307.061438 -869046.085122 -866307.061438 -869046.085122 -878266.289706 -878266.289706 -876836.416327 -873173.829037 -872349.841984 -872349.841984 -866307.061438 -882782.998293 -856338.695248 -872392.045664 -876446.605631 -872392.045664 -876415.878381 -882751.99905 -866307.061438 -882782.998292 -878292.377382 -877307.196759 -882751.999051 -876446.605631 -860622.455518 -860631.593752 -878292.377382 -872362.937471 -873173.829037 -866307.061438 -866276.531259 -878266.289706 -856386.876085 -872392.045664 -882751.999051 -872362.937471 -868999.922394 -856338.69745 -876446.605631 -872349.841984 -868999.922394 -877307.196759 -878292.377382 -872541.959887 -882751.99905 -878292.377382 -876836.416327 -882782.998293 -876836.416327 -876873.426969 -856338.708685 -872586.786447 -866307.061438 -872586.794048 -877288.63491 -860622.455518 -872541.954572 -878292.377382 -876873.426969 -856337.890651 -876446.605631 -860631.593752 -877307.196759 -876446.605631 -878292.377382 -866307.061438 -866307.061438 -878292.377382 -882782.998293 -868999.922394 -866307.061438 -877288.63491 -860622.455518 -882782.998293 -866276.531259 -878292.377382 -868999.922394 -876415.878381 -869046.085122 -877288.63491 -876446.605631 -869046.085122 -869046.085122 -876415.878381 -876415.878381 -877288.63491 -878266.289706 diff --git a/code/opt-results/grid/square_4.0_northIslandRose/AEP.txt b/code/opt-results/grid/square_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 162a893..0000000 --- a/code/opt-results/grid/square_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,399 +0,0 @@ -872646.306257 -875449.463872 -871440.637256 -860972.838232 -851743.641608 -861198.552481 -866249.090048 -874344.28182 -867703.578353 -866719.527674 -851337.964251 -859992.119319 -864707.261226 -830700.386501 -871630.659524 -864684.129682 -838782.285479 -865619.018429 -871440.637256 -856763.16006 -874139.000622 -859049.568097 -864368.717244 -851909.664773 -856682.094735 -865589.949363 -866584.820977 -866723.566158 -856982.33327 -880949.020931 -853919.750757 -870936.381154 -847821.937749 -876000.993287 -856728.093446 -867219.86039 -860274.194857 -851327.379071 -871440.637256 -886954.157891 -851802.01692 -843647.373499 -856982.33327 -864651.445855 -858981.181871 -856123.71432 -859992.119319 -875533.485869 -871429.295169 -854796.745913 -875433.944751 -859974.653421 -880949.020932 -870716.151945 -864136.7009 -853919.750757 -821751.40781 -858981.181871 -855347.73478 -863503.386603 -872637.105872 -855106.019417 -853972.981643 -838913.235875 -873365.749286 -876473.110975 -859049.568097 -871630.659528 -859049.568097 -871076.9577 -825169.754805 -856595.436668 -866249.090048 -861703.017382 -858981.181872 -876473.110867 -868344.633463 -875746.180865 -866405.060947 -828578.563463 -846939.94803 -854878.406647 -861491.907125 -871429.295169 -874407.966269 -875729.488166 -853972.981643 -849277.926878 -866640.242397 -870718.518556 -850676.438269 -870688.632527 -845990.507195 -871429.295169 -872646.306254 -871429.295169 -875454.014567 -875454.014567 -839290.984587 -851327.379071 -871440.637256 -828649.157519 -874407.966269 -856728.09344 -856541.507132 -859992.11932 -862791.197531 -847576.815026 -856595.436668 -862791.31841 -871315.283913 -871440.637256 -870433.184834 -872646.306257 -850705.193295 -871300.18635 -850149.641834 -854876.746206 -866737.511026 -828649.157525 -840844.343578 -864584.410675 -854900.295337 -866249.090038 -870718.518629 -859974.653421 -871429.295169 -867703.578353 -859049.568097 -872646.306256 -880969.293851 -859203.391767 -858981.181871 -852803.495081 -851327.379071 -864167.281613 -875729.488374 -875729.488554 -880949.020932 -866719.527674 -875433.944751 -861703.017382 -875454.014567 -828649.157519 -835579.631399 -838913.235857 -864532.842933 -869196.579015 -872646.306257 -862963.882525 -853040.539769 -842759.276162 -875533.485869 -866604.431589 -871076.957691 -842759.276163 -870999.148788 -856541.507132 -876000.993287 -841988.397852 -868283.005201 -870584.964454 -804245.170683 -870378.948654 -874139.00062 -867914.396133 -842210.987956 -878081.808392 -876000.993287 -871440.637255 -878014.431078 -875746.180857 -880215.003953 -862963.882606 -861198.552481 -866719.527674 -856121.283609 -863007.426029 -856123.714319 -858981.18187 -876000.993287 -846822.603477 -867914.396134 -849844.969172 -874151.270871 -866604.431625 -851802.017095 -875996.351389 -871429.295169 -859992.119319 -852853.237333 -880969.293958 -875729.488177 -875454.014567 -874151.270928 -875454.014552 -876000.993287 -866405.141627 -868330.517363 -871429.295169 -878081.808391 -864107.654517 -868330.517363 -854986.702923 -864107.654517 -874344.28182 -875454.014567 -875454.014567 -853740.053721 -864707.498519 -853040.539769 -853972.981642 -859046.469914 -828563.374819 -830763.959294 -857455.693712 -875454.014567 -862316.282545 -860144.098054 -866719.527674 -861533.770644 -867703.578353 -870936.3812 -870716.151946 -870688.632527 -868351.279579 -858981.181871 -856595.436668 -875996.351387 -871429.295169 -853972.981638 -862328.005732 -854878.406685 -871440.637256 -855248.778222 -853919.750757 -852853.237333 -839490.734269 -875433.94475 -856121.283609 -867914.396122 -853972.981643 -845990.507221 -875454.014567 -867703.578347 -867219.86039 -866405.060947 -874151.270928 -871300.186349 -855368.634408 -863007.426027 -856982.333269 -854878.406646 -851802.016915 -875996.351387 -871440.637256 -875433.944751 -849277.926878 -862800.235445 -864940.160374 -867900.802798 -866604.430745 -855347.734781 -880949.020932 -871315.283915 -875454.014566 -846964.428326 -864369.185775 -875454.014567 -862800.235454 -859992.119236 -861475.73952 -866640.242397 -872637.105871 -874179.233077 -860935.749319 -867240.323184 -858981.181873 -864369.185826 -872576.558562 -840039.888551 -880969.293959 -875996.351387 -854021.660833 -875746.180864 -856763.16005 -870759.249612 -856982.33327 -872646.306257 -871300.18635 -858935.73942 -870810.513726 -880949.020932 -854063.672762 -840769.770977 -846997.890526 -866737.511026 -868233.58895 -863482.330193 -838427.829165 -872646.306257 -874344.28182 -856121.283609 -854836.390947 -863872.512516 -863482.330193 -875996.351387 -844101.718842 -859203.391766 -842227.732852 -870576.110487 -853972.981642 -875454.014548 -864369.185825 -837504.498462 -876000.993287 -868233.588953 -871315.283917 -864172.307096 -866604.431079 -859046.469915 -853040.539782 -863650.513903 -859046.469915 -863007.426032 -854876.746206 -852998.419838 -843890.916018 -866748.725431 -839298.378675 -854876.746205 -874151.270927 -875746.18063 -856128.448559 -870488.897326 -846939.948031 -866241.362226 -856763.16006 -851669.424856 -878014.431078 -862738.633201 -866447.047013 -845983.658159 -880195.85188 -856123.714318 -864107.723015 -862201.441825 -866405.141618 -871076.9577 -859952.166798 -871365.74082 -861198.61722 -856121.283609 -862800.235441 -857745.985982 -854876.746209 -870433.184833 -875729.488554 -875746.180304 -867703.578346 -870810.513726 -854063.672783 -880949.020931 -855347.73478 -846939.948029 -867711.386846 -801890.940425 -856126.116503 -870716.115427 -853095.259405 -866405.060947 -870759.249612 -875996.351387 -853040.539772 -880215.003953 -867703.578352 -871300.18635 -875729.488553 -846964.428335 -863007.42603 -875746.180864 -867914.396133 -874139.000622 -840464.909531 -870716.151945 -853814.304193 -859974.653416 -842759.276162 -854796.745917 -873365.749287 -875433.944751 -872576.558569 -868233.58895 -864368.717243 -856728.093445 -851337.964339 -863647.142331 -875585.534479 -847312.120747 diff --git a/code/opt-results/param/amalia_4.0_northIslandRose/AEP.txt b/code/opt-results/param/amalia_4.0_northIslandRose/AEP.txt deleted file mode 100644 index c94119b..0000000 --- a/code/opt-results/param/amalia_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,113 +0,0 @@ -838576.413995 -885657.012655 -883623.413511 -871273.706477 -849149.353715 -881594.553786 -844096.039991 -844810.407778 -874726.641553 -872597.263465 -884888.26434 -880073.777923 -875024.950503 -858457.197855 -877120.242477 -829431.329857 -874040.16302 -850841.470735 -831140.126519 -850841.470735 -846776.425352 -880294.630252 -877482.020393 -879916.649687 -885052.592698 -873471.378438 -849149.353715 -876740.104158 -872575.035525 -883543.189851 -832793.696779 -883242.083198 -883641.94914 -884888.26434 -833615.292696 -883785.491953 -850618.917899 -847555.279 -874037.940915 -884751.123203 -886639.398754 -878561.276431 -883980.186407 -849772.69999 -877659.919082 -878016.053927 -884888.26434 -837338.5154 -880942.225293 -874617.021658 -879023.220961 -849149.353715 -853148.446016 -848707.241565 -852929.912719 -876369.425056 -850380.6096 -847608.468972 -874040.163019 -844810.386671 -877920.24404 -851991.74446 -885125.100048 -879064.978712 -856827.900193 -866106.0025 -883242.083198 -879608.362739 -874820.80871 -875618.029737 -842943.656544 -877846.373872 -868461.948023 -883641.94914 -851404.779278 -849772.699991 -885657.012655 -876948.628973 -875042.184663 -832716.035597 -832793.696779 -865822.532659 -872237.37495 -873874.001434 -845591.766494 -877819.660237 -885241.357232 -878016.053927 -829431.329854 -884851.651786 -875454.348046 -879088.148155 -879556.210984 -872237.374951 -868461.948023 -881901.493407 -879278.253631 -876276.437745 -864049.881534 -879278.253631 -878322.531417 -873309.98217 -885657.012655 -848851.880985 -867337.663346 -847869.881779 -843240.703843 -872575.035525 -877960.941498 -883237.142281 -857060.249189 -863730.928677 -871504.128415 diff --git a/code/opt-results/param/amalia_4.0_northIslandRose/funcCalls.txt b/code/opt-results/param/amalia_4.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 2ec1b7f..0000000 --- a/code/opt-results/param/amalia_4.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,113 +0,0 @@ -56 -84 -94 -74 -111 -64 -189 -133 -73 -221 -106 -111 -57 -60 -63 -43 -96 -78 -52 -138 -73 -234 -966 -145 -60 -223 -427 -74 -47 -63 -86 -85 -80 -108 -65 -151 -289 -202 -54 -55 -65 -94 -51 -57 -77 -33 -114 -47 -258 -43 -98 -120 -49 -94 -65 -67 -47 -87 -320 -148 -94 -72 -92 -71 -53 -153 -82 -87 -70 -1022 -267 -46 -48 -47 -35 -56 -80 -191 -285 -40 -98 -54 -70 -115 -43 -53 -78 -82 -75 -83 -41 -83 -229 -124 -75 -231 -62 -41 -45 -110 -90 -224 -69 -76 -189 -445 -77 -90 -100 -57 -99 -68 -66 diff --git a/code/opt-results/param/amalia_4.0_ukiahRose/AEP.txt b/code/opt-results/param/amalia_4.0_ukiahRose/AEP.txt deleted file mode 100644 index e353ed7..0000000 --- a/code/opt-results/param/amalia_4.0_ukiahRose/AEP.txt +++ /dev/null @@ -1,101 +0,0 @@ -911114.95283 -959249.599237 -912695.175037 -937625.234186 -914305.723159 -911846.467161 -957543.021947 -941066.389848 -955814.618272 -958163.517938 -937715.991938 -935989.080548 -953526.344207 -959274.315733 -935662.915866 -935742.388899 -959099.990857 -954045.996481 -957043.041045 -933739.907612 -939788.893121 -935114.843047 -958136.837221 -957414.139826 -959541.001759 -912310.67658 -957879.954257 -935180.760105 -937421.97396 -956902.59094 -959117.204897 -915782.104615 -958200.010621 -956573.734869 -954478.307338 -955302.642652 -915790.948576 -955782.636566 -956798.76168 -957112.24327 -959501.263132 -914811.641288 -954741.17026 -937215.27804 -928706.038464 -949030.53794 -958321.438157 -955292.447625 -959723.985024 -952153.621869 -958378.766149 -901326.468799 -914159.298667 -928706.038464 -931940.512969 -899067.290604 -931040.711251 -915731.098534 -954023.350724 -957832.292615 -914305.723159 -914970.114733 -956498.476616 -916996.534507 -915628.559467 -915684.572862 -953047.844916 -909542.851471 -959011.453597 -958769.851907 -958820.20125 -898057.202768 -958867.995737 -954628.999213 -957912.826034 -953831.451474 -957410.303232 -928706.038462 -958290.420569 -958683.282756 -959280.868823 -958526.990506 -915722.449535 -941066.389848 -959998.056736 -957562.533467 -959588.299832 -935213.297881 -933460.332493 -957312.004951 -959117.204897 -953941.865665 -899597.078306 -937097.068954 -925695.30616 -935213.297881 -940556.960658 -948872.911093 -939774.380581 -916988.772713 -957390.661337 diff --git a/code/opt-results/param/amalia_4.0_ukiahRose/funcCalls.txt b/code/opt-results/param/amalia_4.0_ukiahRose/funcCalls.txt deleted file mode 100644 index c414377..0000000 --- a/code/opt-results/param/amalia_4.0_ukiahRose/funcCalls.txt +++ /dev/null @@ -1,101 +0,0 @@ -61 -106 -39 -112 -23 -65 -103 -72 -293 -300 -272 -119 -66 -99 -93 -141 -75 -64 -144 -732 -219 -267 -66 -230 -153 -85 -127 -204 -66 -135 -76 -95 -76 -111 -85 -70 -84 -184 -118 -165 -58 -137 -139 -256 -90 -279 -47 -335 -65 -298 -75 -99 -58 -180 -58 -79 -135 -99 -92 -181 -62 -105 -88 -86 -146 -46 -708 -206 -76 -189 -120 -50 -63 -71 -85 -98 -79 -150 -79 -77 -74 -81 -127 -44 -91 -83 -116 -53 -193 -500 -76 -243 -56 -123 -130 -410 -370 -110 -55 -44 -203 diff --git a/code/opt-results/param/amalia_4.0_victorvilleRose/AEP.txt b/code/opt-results/param/amalia_4.0_victorvilleRose/AEP.txt deleted file mode 100644 index 11fb4c2..0000000 --- a/code/opt-results/param/amalia_4.0_victorvilleRose/AEP.txt +++ /dev/null @@ -1,100 +0,0 @@ -1086976.20319 -1097179.06001 -1084343.64333 -1086943.62372 -1080281.5233 -1102932.19062 -1105054.84256 -1101148.04451 -1081762.00269 -1081884.43127 -1098292.10872 -1078501.51331 -1100768.14747 -1098675.19078 -1104606.6131 -1089645.36159 -1096942.40565 -1091551.62978 -1105097.95187 -1093770.38659 -1080623.7721 -1104328.28397 -1076052.0379 -1103330.1306 -1104613.54676 -1100851.42568 -1104814.50269 -1104900.14275 -1088212.99749 -1087370.46565 -1056939.69719 -1103653.93198 -1093929.32968 -1088513.01258 -1105213.7469 -1059965.37883 -1077163.36642 -1055246.06986 -1083534.78971 -1076953.94724 -1104408.46359 -1072920.87395 -1090483.82058 -1077163.36642 -1078271.53614 -1105064.92751 -1062162.19015 -1083114.38341 -1089349.16027 -1083159.68878 -1105098.83077 -1074556.51997 -1091618.44787 -1088434.82292 -1076438.53188 -1093202.32458 -1103520.24204 -1090978.11459 -1105525.8565 -1089284.88728 -1077692.79917 -1100047.14587 -1100204.48811 -1076086.00389 -1105064.92751 -1067550.59859 -1104609.08164 -1094039.73681 -1096290.76766 -1105097.95187 -1081593.60162 -1088624.81335 -1102932.19062 -1088434.82292 -1087745.02126 -1090518.05221 -1088584.44538 -1083013.7567 -1102847.75991 -1081776.22575 -1067855.71825 -1097199.92419 -1087447.61992 -1079139.26904 -1082258.8534 -1082841.46469 -1096347.68849 -1067152.65412 -1082508.71549 -1088308.11259 -1091139.09659 -1090001.57744 -1087176.91589 -1088434.82292 -1095760.53287 -1083533.83333 -1103516.15564 -1081884.43127 -1095246.07957 -1073278.19114 diff --git a/code/opt-results/param/amalia_4.0_victorvilleRose/funcCalls.txt b/code/opt-results/param/amalia_4.0_victorvilleRose/funcCalls.txt deleted file mode 100644 index 9b9a51a..0000000 --- a/code/opt-results/param/amalia_4.0_victorvilleRose/funcCalls.txt +++ /dev/null @@ -1,100 +0,0 @@ -42 -59 -59 -47 -57 -48 -80 -144 -65 -99 -292 -121 -58 -67 -62 -43 -98 -130 -69 -41 -40 -68 -144 -79 -191 -123 -73 -61 -89 -71 -77 -69 -46 -56 -152 -188 -101 -66 -276 -159 -87 -143 -108 -153 -786 -115 -670 -142 -692 -173 -119 -107 -63 -68 -69 -92 -68 -100 -96 -96 -317 -97 -90 -72 -138 -98 -63 -52 -128 -59 -944 -97 -54 -79 -273 -105 -53 -229 -165 -169 -921 -113 -82 -74 -112 -46 -98 -48 -142 -63 -48 -48 -36 -90 -37 -100 -219 -67 -67 -80 diff --git a/code/opt-results/param/amalia_6.0_northIslandRose/AEP.txt b/code/opt-results/param/amalia_6.0_northIslandRose/AEP.txt deleted file mode 100644 index 60a7976..0000000 --- a/code/opt-results/param/amalia_6.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,102 +0,0 @@ -953995.570905 -958112.103463 -955663.916459 -943313.782151 -950529.178235 -958411.123437 -960476.8279 -941482.684253 -934339.411854 -948385.578271 -942713.512031 -956827.460353 -955568.579528 -944559.814605 -955460.612178 -957142.121727 -946061.601684 -949877.297851 -953043.045323 -957437.696538 -953974.064357 -940920.399488 -943228.033201 -942487.092215 -953974.064357 -955175.244177 -959445.93536 -956940.819443 -937388.020008 -956248.515877 -942220.770348 -946658.402959 -958167.422188 -948828.000327 -954414.704556 -954803.756332 -960476.8279 -946643.123003 -946168.618172 -943400.345381 -951073.656397 -956958.935185 -931787.981729 -950930.680327 -949817.204343 -957034.470262 -955561.860106 -955175.249775 -949944.459777 -956390.667188 -949425.187107 -955091.373886 -948044.129609 -931786.576134 -955907.301454 -943084.584063 -957045.982646 -955015.855421 -956367.512106 -952682.398102 -954843.057895 -948791.274502 -955897.614352 -943561.022467 -953994.681101 -942148.734377 -944208.119027 -944326.400964 -945794.155082 -950150.773724 -960398.36241 -949396.84961 -934346.367876 -940139.935696 -938391.90095 -946778.636412 -944897.948292 -949296.091253 -956270.188246 -955299.083133 -943145.504334 -955663.916459 -944630.771792 -948880.301449 -958795.636825 -950727.122199 -954803.756332 -959445.93536 -956256.249926 -955080.927305 -942148.734377 -955340.587477 -956998.289552 -949930.953788 -948718.293631 -945868.914875 -945649.618122 -943305.297914 -955501.9196 -955880.624442 -953557.519847 -943250.751196 diff --git a/code/opt-results/param/amalia_6.0_northIslandRose/funcCalls.txt b/code/opt-results/param/amalia_6.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 58b052a..0000000 --- a/code/opt-results/param/amalia_6.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,102 +0,0 @@ -47 -95 -121 -52 -168 -162 -58 -39 -92 -89 -51 -59 -74 -65 -67 -135 -106 -63 -53 -175 -53 -66 -54 -70 -104 -164 -112 -92 -59 -62 -55 -117 -101 -161 -88 -92 -84 -99 -91 -49 -1799 -144 -264 -92 -125 -74 -221 -862 -30 -106 -81 -81 -66 -1690 -203 -88 -95 -56 -57 -56 -54 -135 -86 -98 -54 -79 -116 -77 -111 -65 -91 -102 -59 -67 -75 -50 -68 -71 -77 -88 -102 -125 -133 -152 -119 -143 -81 -176 -67 -108 -92 -168 -87 -129 -71 -105 -127 -227 -91 -118 -46 -59 diff --git a/code/opt-results/param/amalia_8.0_northIslandRose/AEP.txt b/code/opt-results/param/amalia_8.0_northIslandRose/AEP.txt deleted file mode 100644 index c17daa1..0000000 --- a/code/opt-results/param/amalia_8.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,132 +0,0 @@ -985767.631501 -986711.184475 -978293.833176 -991041.359815 -983388.910254 -991041.359815 -991748.02224 -989021.527011 -993711.226684 -991184.462915 -986768.818949 -988856.326696 -988629.24874 -983699.744476 -985224.64046 -990558.578788 -993051.286454 -991184.462915 -991475.679844 -983685.457999 -983671.085821 -990942.400232 -990602.216259 -984884.13599 -991295.084959 -984322.855219 -990646.819507 -985633.233457 -981659.403986 -992687.147467 -994080.871712 -987712.879417 -988243.788672 -989416.028426 -991085.29546 -992819.361898 -977643.08324 -990849.661601 -990921.107185 -984758.783981 -987400.787364 -993025.350963 -982555.186819 -985487.837727 -983211.751121 -989623.036782 -991475.017673 -991135.104373 -987897.956198 -983674.505129 -993755.336695 -993051.286454 -985881.260673 -988480.165856 -986718.112679 -989661.179195 -991371.917311 -992657.327533 -982616.885547 -985340.842751 -992064.53905 -991327.452468 -991517.700265 -994902.113881 -983531.58291 -991135.104373 -982876.042886 -990041.584247 -992814.348627 -983871.206393 -977643.08324 -984037.918744 -979780.611374 -978848.153634 -982398.359148 -987983.447137 -991403.045055 -991600.570276 -988703.775474 -991316.038857 -991041.359815 -982727.189018 -990448.352588 -989451.112213 -990948.41983 -978579.723852 -991174.396876 -979207.231944 -991818.101115 -982954.415564 -990787.173958 -992814.348627 -982145.09797 -982263.734984 -985625.110925 -981408.540937 -990293.582613 -989717.722805 -994762.674484 -991124.220032 -991148.521051 -989280.667083 -989661.179195 -991327.452468 -983888.699425 -985420.668499 -990558.578788 -982904.577576 -993051.286454 -981777.716663 -985759.10891 -984322.855219 -984880.105737 -980697.588981 -984796.66064 -994089.877383 -986711.184475 -983097.674378 -994423.296823 -986931.941427 -984364.687774 -991748.015006 -980559.215458 -981043.444145 -982794.333776 -994762.674484 -985291.246798 -991124.220032 -993245.294393 -984981.588938 -983775.75469 -985656.374771 diff --git a/code/opt-results/param/amalia_8.0_northIslandRose/funcCalls.txt b/code/opt-results/param/amalia_8.0_northIslandRose/funcCalls.txt deleted file mode 100644 index fefd365..0000000 --- a/code/opt-results/param/amalia_8.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,132 +0,0 @@ -92 -104 -65 -78 -182 -58 -75 -241 -85 -59 -76 -78 -82 -147 -121 -69 -120 -76 -63 -136 -188 -203 -83 -99 -102 -122 -184 -414 -54 -65 -93 -181 -123 -197 -62 -107 -128 -85 -52 -82 -75 -145 -131 -148 -91 -90 -113 -91 -61 -241 -118 -101 -58 -77 -100 -53 -317 -60 -158 -123 -200 -110 -96 -289 -112 -68 -101 -69 -79 -173 -112 -182 -101 -61 -155 -53 -340 -51 -118 -67 -74 -70 -59 -50 -95 -75 -86 -90 -72 -81 -192 -100 -66 -91 -49 -54 -68 -193 -57 -48 -282 -121 -92 -86 -124 -148 -60 -83 -98 -60 -64 -86 -95 -83 -107 -106 -83 -70 -70 -52 -67 -80 -112 -80 -51 -55 -196 -91 -88 -82 -128 -69 diff --git a/code/opt-results/param/circle_4.0_northIslandRose/AEP.txt b/code/opt-results/param/circle_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 99931b2..0000000 --- a/code/opt-results/param/circle_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,140 +0,0 @@ -879245.192813 -882602.134351 -883793.561797 -872482.677635 -856233.436097 -855414.454433 -856902.998735 -866168.793375 -878764.247353 -882556.032112 -886315.754861 -855449.234681 -879657.943699 -882101.916829 -885509.941596 -884549.977305 -882889.087484 -882138.453793 -883061.057226 -885829.228919 -857276.956052 -870831.152652 -872880.086064 -879245.192813 -872880.075999 -856902.998735 -855373.777682 -885777.551826 -878916.959367 -870128.474924 -862871.746155 -883537.134163 -878434.808435 -885777.551826 -879444.345394 -885818.055997 -886315.754861 -865421.853922 -875440.093708 -886084.06405 -879529.361431 -886084.06405 -886304.007553 -847527.103723 -886084.06405 -879245.192813 -866130.248536 -870128.474924 -879444.345394 -867925.059427 -883715.038652 -879529.361431 -870831.152652 -879532.66665 -879532.66665 -879444.345394 -879245.192813 -846404.949105 -885272.903576 -879444.345394 -879005.066281 -879657.94364 -853876.009948 -871984.91159 -885829.228918 -866140.072895 -871984.911267 -875238.809311 -876833.34037 -879529.361431 -873079.014607 -883793.561797 -885834.556029 -879657.943698 -879529.361431 -886084.06405 -885598.921482 -875238.809311 -871984.911581 -879053.25014 -845871.826713 -878926.891486 -882519.829624 -868326.38069 -883793.561797 -886040.00921 -844979.663701 -877761.511757 -879242.629996 -884994.105906 -866129.471421 -886084.06405 -845730.623451 -847519.475612 -883793.561797 -869638.730945 -879242.63012 -885829.228804 -856758.24667 -881990.640203 -866129.471421 -879444.345394 -878764.247353 -872877.994903 -879657.943471 -883096.329895 -847527.103724 -846290.839142 -883793.561797 -846995.408852 -872880.086064 -885509.941596 -877467.649788 -885777.551826 -870831.152652 -857276.956052 -879005.066281 -886315.754861 -883537.134163 -883715.038652 -885834.556029 -872880.086064 -879657.943696 -879444.345394 -871184.067948 -874771.948018 -846290.839142 -870831.152652 -855800.447411 -878834.780037 -886304.007553 -866129.471417 -846876.122484 -882889.087484 -870831.152652 -845730.623451 -879657.94357 -886084.06405 -886304.007553 -885829.228902 diff --git a/code/opt-results/param/circle_4.0_northIslandRose/funcCalls.txt b/code/opt-results/param/circle_4.0_northIslandRose/funcCalls.txt deleted file mode 100644 index f7fe813..0000000 --- a/code/opt-results/param/circle_4.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,140 +0,0 @@ -51 -77 -70 -94 -68 -64 -73 -96 -84 -81 -68 -81 -146 -106 -78 -67 -115 -72 -78 -207 -52 -61 -153 -83 -50 -65 -83 -114 -80 -80 -61 -126 -155 -149 -46 -136 -85 -69 -94 -59 -63 -112 -63 -37 -49 -66 -105 -51 -109 -66 -74 -75 -50 -56 -74 -83 -75 -101 -77 -72 -49 -192 -46 -191 -232 -62 -296 -102 -373 -77 -44 -214 -135 -320 -42 -67 -114 -306 -242 -79 -87 -62 -96 -93 -68 -51 -95 -272 -271 -68 -93 -90 -50 -79 -121 -75 -165 -160 -80 -138 -97 -51 -69 -90 -190 -96 -108 -61 -106 -72 -57 -109 -75 -70 -78 -53 -38 -93 -72 -85 -77 -121 -168 -73 -81 -110 -130 -90 -93 -110 -109 -79 -33 -47 -82 -71 -1133 -74 -95 -286 diff --git a/code/opt-results/param/square_4.0_northIslandRose/AEP.txt b/code/opt-results/param/square_4.0_northIslandRose/AEP.txt deleted file mode 100644 index 6b63a6b..0000000 --- a/code/opt-results/param/square_4.0_northIslandRose/AEP.txt +++ /dev/null @@ -1,177 +0,0 @@ -876868.877863 -890191.747513 -892710.895002 -890515.804346 -888978.501066 -891060.976008 -856813.958974 -855053.631167 -891143.661388 -883725.263238 -886047.213352 -878186.641268 -854770.43612 -890703.517888 -889949.296574 -863332.13511 -876503.759067 -871854.290395 -848303.983923 -857456.599914 -890160.780787 -889574.247813 -892159.883192 -889986.128979 -855331.227229 -873132.024853 -884643.346174 -873384.834684 -865161.193241 -892883.370424 -890959.100214 -858063.559851 -888687.359438 -855120.59482 -882742.958357 -855133.669298 -883531.992717 -872745.029338 -892159.883192 -855247.700723 -882538.866546 -883820.441633 -857674.72648 -889713.588371 -891057.625823 -877822.76661 -876171.752504 -891924.644935 -890925.36757 -882977.869757 -857079.111888 -873022.695984 -883886.765069 -854579.159522 -873645.680123 -887038.85269 -848773.307254 -864170.810171 -892883.370424 -888957.137394 -887565.829461 -855472.827962 -861242.277458 -855885.505179 -858493.972441 -868191.357441 -889649.883062 -856690.748712 -857572.644156 -883445.368965 -883886.765069 -882702.104666 -873022.695984 -892272.140568 -875805.532454 -883739.617837 -887532.303513 -883822.865353 -890925.36757 -884643.346173 -877316.319286 -892694.172048 -877291.945838 -865925.308266 -883886.765069 -877189.207272 -876784.941444 -876353.632677 -854543.985974 -854656.357067 -857890.724526 -891660.171194 -890449.830032 -892883.370424 -887532.303513 -867359.461924 -863085.063631 -891714.086922 -870844.262474 -892883.370424 -889910.394624 -857655.517873 -882974.43228 -867402.236854 -885070.606982 -858058.302003 -871472.317382 -883212.656751 -892641.279696 -890925.36757 -872745.029338 -883886.765069 -876173.956879 -890515.804346 -892883.370424 -883031.994515 -853694.324587 -873798.460368 -865528.444372 -892710.895002 -889949.296574 -874655.875122 -892883.370424 -871725.063338 -892710.895002 -888948.279339 -855895.70105 -870501.478633 -891919.087174 -887532.303513 -885063.125211 -883255.97565 -887532.303513 -849664.838532 -847262.570701 -887004.237772 -890463.600306 -886365.062294 -883255.97565 -882343.002975 -889898.120424 -848576.910021 -890703.517888 -871453.139778 -870996.900194 -887532.303513 -863343.621544 -855141.74832 -883522.189888 -854773.112505 -892159.883192 -890532.94006 -858164.078255 -891446.292288 -854955.523076 -857334.943744 -872741.741697 -848705.303716 -879266.22188 -873022.695984 -866084.245413 -881807.363842 -875310.594622 -858058.302003 -892710.895002 -891660.171194 -855472.827962 -877433.002407 -889375.50221 -890959.100214 -892710.895002 -857334.943745 -889446.63171 -857684.933571 -856690.748712 -855701.891894 -883036.465983 diff --git a/code/opt-results/param/square_4.0_northIslandRose/funcCalls.txt b/code/opt-results/param/square_4.0_northIslandRose/funcCalls.txt deleted file mode 100644 index 192020f..0000000 --- a/code/opt-results/param/square_4.0_northIslandRose/funcCalls.txt +++ /dev/null @@ -1,177 +0,0 @@ -55 -84 -137 -136 -88 -118 -75 -67 -93 -66 -58 -53 -84 -62 -76 -47 -96 -31 -43 -67 -69 -129 -57 -81 -58 -64 -38 -75 -75 -72 -51 -88 -77 -72 -95 -82 -96 -38 -50 -33 -68 -80 -46 -63 -88 -62 -47 -111 -65 -54 -61 -84 -57 -114 -51 -41 -60 -50 -75 -67 -69 -42 -52 -57 -28 -98 -164 -86 -146 -119 -82 -118 -67 -43 -74 -76 -34 -59 -117 -62 -100 -94 -68 -166 -106 -77 -49 -49 -102 -88 -88 -41 -86 -72 -53 -94 -71 -90 -49 -101 -89 -110 -63 -79 -50 -48 -65 -66 -54 -63 -64 -91 -51 -84 -62 -82 -30 -48 -63 -94 -90 -150 -88 -32 -86 -77 -62 -56 -64 -63 -87 -737 -53 -218 -51 -218 -26 -59 -123 -76 -60 -78 -85 -58 -36 -54 -52 -56 -106 -71 -166 -48 -425 -95 -61 -51 -38 -84 -93 -82 -126 -104 -59 -64 -77 -80 -40 -106 -62 -95 -112 -45 -38 -79 -69 -66 -69 diff --git a/code/optComponents.py b/code/optComponents.py new file mode 100644 index 0000000..1761307 --- /dev/null +++ b/code/optComponents.py @@ -0,0 +1,494 @@ +from openmdao.api import Group, Component +import numpy as np +import full_aep +import grid_param_fortran +import param_fortran +import constraints +import sys +sys.path.insert(0, '/home/flowlab/PJ/older_projects/reduction/') +sys.dont_write_bytecode = True + + + + +def random_start(N,D,xmin,xmax,ymin,ymax): + x = np.zeros(N) + y = np.zeros(N) + i = 0 + while i < N: + good = True + xtemp = float(np.random.rand(1))*(xmax-xmin)+xmin + ytemp = float(np.random.rand(1))*(ymax-ymin)+ymin + for j in range(i): + dist = np.sqrt((x[j]-xtemp)**2+(y[j]-ytemp)**2) + if dist < D: + good = False + if good == True: + x[i] = xtemp + y[i] = ytemp + i += 1 + return x,y + + +class AEP_obj(Component): + """ Calculates aep with a gaussian wake model """ + + def __init__(self, nTurbines, nDirections, nRotorPoints, nCtPoints): + + # print 'entering windframe __init__ - analytic' + + super(AEP_obj, self).__init__() + + self.nTurbines = nTurbines + + # Explicitly size input arrays + self.add_param('turbineX', val=np.zeros(nTurbines)) + self.add_param('turbineY', val=np.zeros(nTurbines)) + self.add_param('turbineZ', val=np.ones(nTurbines)*110.) + self.add_param('rotorDiameter', val=np.ones(nTurbines)*130.) + self.add_param('Ct', val=np.ones(nTurbines)*8./9.) + self.add_param('yaw', val=np.zeros(nTurbines)) + + self.add_param('windDirections', val=np.zeros(nDirections)) + self.add_param('windSpeeds', val=np.zeros(nDirections)) + self.add_param('windFrequencies', val=np.zeros(nDirections)) + + self.add_param('RotorPointsY', val=np.zeros(nRotorPoints)) + self.add_param('RotorPointsZ', val=np.zeros(nRotorPoints)) + + self.add_param('ct_curve_wind_speed', val=np.zeros(nCtPoints)) + self.add_param('ct_curve_ct', val=np.zeros(nCtPoints)) + + self.add_param('shear_exp', val=0.1) + self.add_param('rated_ws', val=9.8) + self.add_param('rated_power', val=3.6) + self.add_param('cut_in_speed', val=4.0) + self.add_param('cut_out_speed', val=25.0) + self.add_param('zref', val=50.0) + self.add_param('z0', val=0.0) + self.add_param('ky', val=0.022) + self.add_param('kz', val=0.022) + self.add_param('alpha', val=2.32) + self.add_param('beta', val=0.154) + self.add_param('TI', val=0.11) + self.add_param('relaxationFactor', val=1.0) + self.add_param('sm_smoothing', val=700.) + self.add_param('generator_efficiency', val=0.936) + + self.add_param('wake_combination_method', val=1) + self.add_param('ti_calculation_method', val=2) + self.add_param('wake_model_version', val=2016) + self.add_param('interp_type', val=1) + self.add_param('calc_k_star', val=True) + self.add_param('print_ti', val=False) + self.add_param('use_ct_curve', val=True) + + self.add_output('negAEP', val=0.0, pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + nTurbines = self.nTurbines + + global nCalls_obj + nCalls_obj += 1 + + turbineX = params['turbineX'] + turbineY = params['turbineY'] + turbineZ = params['turbineZ'] + rotorDiameter = params['rotorDiameter'] + Ct = params['Ct'] + yaw = params['yaw'] + + windDirections = params['windDirections'] + windSpeeds = params['windSpeeds'] + windFrequencies = params['windFrequencies'] + + RotorPointsY = params['RotorPointsY'] + RotorPointsZ = params['RotorPointsZ'] + + ct_curve_wind_speed = params['ct_curve_wind_speed'] + ct_curve_ct = params['ct_curve_ct'] + + shear_exp = params['shear_exp'] + rated_ws = params['rated_ws'] + rated_power = params['rated_power'] + cut_in_speed = params['cut_in_speed'] + cut_out_speed = params['cut_out_speed'] + zref = params['zref'] + z0 = params['z0'] + ky = params['ky'] + kz = params['kz'] + alpha = params['alpha'] + beta = params['beta'] + TI = params['TI'] + relaxationFactor = params['relaxationFactor'] + sm_smoothing = params['sm_smoothing'] + generator_efficiency = params['generator_efficiency'] + + wake_combination_method = params['wake_combination_method'] + ti_calculation_method = params['ti_calculation_method'] + wake_model_version = params['wake_model_version'] + interp_type = params['interp_type'] + calc_k_star = params['calc_k_star'] + print_ti = params['print_ti'] + use_ct_curve = params['use_ct_curve'] + + + turbineYd = np.zeros((nTurbines,nTurbines)) + turbineXd = np.eye(nTurbines) + _,daep_dx = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter, + Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + turbineXd = np.zeros((nTurbines,nTurbines)) + turbineYd = np.eye(nTurbines) + aep,daep_dy = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + self.daep_dx = daep_dx*generator_efficiency + self.daep_dy = daep_dy*generator_efficiency + unknowns['negAEP'] = -aep*generator_efficiency + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + d_dx = np.zeros((1,self.nTurbines)) + d_dy = np.zeros((1,self.nTurbines)) + for i in range(self.nTurbines): + d_dx[0][i] = -self.daep_dx[i] + d_dy[0][i] = -self.daep_dy[i] + # populate Jacobian dict + J[('negAEP', 'turbineX')] = d_dx + J[('negAEP', 'turbineY')] = d_dy + + return J + + +class constraint_calc(Component): + """ Calculates spacing and boundary constraints""" + + def __init__(self, nTurbines, nBoundaries): + + super(constraint_calc, self).__init__() + + self.nTurbines = nTurbines + # Explicitly size input arrays + self.add_param('turbineX', val=np.zeros(nTurbines)) + self.add_param('turbineY', val=np.zeros(nTurbines)) + self.add_param('rotorDiameter', val=np.ones(nTurbines)*130.) + + self.add_param('boundaryVertices', val=np.zeros((nBoundaries,2))) + self.add_param('boundaryNormals', val=np.zeros((nBoundaries,2))) + + # self.add_param('nCalls_con', val=0) + + self.add_output('spacing_constraint', val=np.zeros((nTurbines-1)*nTurbines/2), pass_by_object=True) + # self.add_output('spacing_constraint', val=np.zeros(nTurbines), pass_by_object=True) + self.add_output('boundary_constraint', val=np.zeros(nTurbines), pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + # params['nCalls_con'] += 1 + + turbineX = params['turbineX'] + turbineY = params['turbineY'] + rotorDiameter = params['rotorDiameter'] + + boundaryVertices = params['boundaryVertices'] + boundaryNormals = params['boundaryNormals'] + + dx = np.eye(self.nTurbines) + dy = np.zeros((self.nTurbines,self.nTurbines)) + _,ss_dx,_,bd_dx = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, + boundaryVertices,boundaryNormals) + + dx = np.zeros((self.nTurbines,self.nTurbines)) + dy = np.eye(self.nTurbines) + ss,ss_dy,bd,bd_dy = constraints.constraints_position_dv(turbineX,dx,turbineY,dy, + boundaryVertices,boundaryNormals) + + bounds = np.zeros(self.nTurbines) + bounds_index = np.zeros(self.nTurbines, dtype=int) + for i in range(self.nTurbines): + bounds[i] = np.min(bd[i]) + bounds_index[i] = np.argmin(bd[i]) + + # seps = np.zeros(self.nTurbines) + # seps_index = np.zeros(self.nTurbines) + # for i in range(self.nTurbines): + # seps[i] = np.min(ss[i]) + # seps_index[i] = np.argmin(ss[i]) + + self.bounds_index = bounds_index + # self.seps_index = seps_index + self.ss_dx = ss_dx + self.ss_dy = ss_dy + self.bd_dx = bd_dx + self.bd_dy = bd_dy + + unknowns['spacing_constraint'] = ss-(2.*rotorDiameter[0])**2 + # unknowns['spacing_constraint'] = seps-(2.*rotorDiameter[0])**2 + unknowns['boundary_constraint'] = bounds + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + # populate Jacobian dict + + # ds_dx = np.zeros((self.nTurbines,self.nTurbines)) + # ds_dy = np.zeros((self.nTurbines,self.nTurbines)) + # for i in range(self.nTurbines): + # ds_dx[i][i] = self.ss_dx[i][i][self.seps_index[i]] + # ds_dy[i][i] = self.ss_dy[i][i][self.seps_index[i]] + # J[('spacing_constraint', 'turbineX')] = ds_dx + # J[('spacing_constraint', 'turbineY')] = ds_dy + J[('spacing_constraint', 'turbineX')] = self.ss_dx.T + J[('spacing_constraint', 'turbineY')] = self.ss_dy.T + + db_dx = np.zeros((self.nTurbines,self.nTurbines)) + db_dy = np.zeros((self.nTurbines,self.nTurbines)) + for i in range(self.nTurbines): + db_dx[i][i] = self.bd_dx[i][i][self.bounds_index[i]] + db_dy[i][i] = self.bd_dy[i][i][self.bounds_index[i]] + J[('boundary_constraint','turbineX')] = db_dx + J[('boundary_constraint','turbineY')] = db_dy + + return J + + +class form_grid(Component): + """get turbine locations from grid variables""" + + def __init__(self, nTurbines, nRows): + + super(form_grid, self).__init__() + + self.nTurbines = nTurbines + + # Explicitly size input arrays + self.add_param('dx', val=0.) + self.add_param('dy', val=0.) + self.add_param('shear', val=0.) + self.add_param('rotate', val=0.) + self.add_param('y0', val=0.) + + self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) + self.add_param('x_start', val=np.zeros(nRows)) + + self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) + self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + nTurbines = self.nTurbines + dx = params['dx'] + dy = params['dy'] + shear = params['shear'] + rotate = params['rotate'] + y0 = params['y0'] + turbs_per_row = params['turbs_per_row'] + x_start = params['x_start'] + + dxd = 1. + dyd = 0. + sheard = 0. + rotated = 0. + turbineX,dx_ddx,turbineY,dy_ddx = grid_param_fortran.makegrid_fortran_dv(nTurbines, + dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) + + dxd = 0. + dyd = 1. + sheard = 0. + rotated = 0. + turbineX,dx_ddy,turbineY,dy_ddy = grid_param_fortran.makegrid_fortran_dv(nTurbines, + dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) + + dxd = 0. + dyd = 0. + sheard = 1. + rotated = 0. + turbineX,dx_dshear,turbineY,dy_dshear = grid_param_fortran.makegrid_fortran_dv(nTurbines, + dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) + + dxd = 0. + dyd = 0. + sheard = 0. + rotated = 1. + turbineX,dx_drotate,turbineY,dy_drotate = grid_param_fortran.makegrid_fortran_dv(nTurbines, + dx,dxd,dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0) + + self.dx_ddx = dx_ddx + self.dy_ddx = dy_ddx + self.dx_ddy = dx_ddy + self.dy_ddy = dy_ddy + self.dx_dshear = dx_dshear + self.dy_dshear = dy_dshear + self.dx_drotate = dx_drotate + self.dy_drotate = dy_drotate + + unknowns['turbineX'] = turbineX + unknowns['turbineY'] = turbineY + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + # populate Jacobian dict + J[('turbineX', 'dx')] = self.dx_ddx.T + J[('turbineY', 'dx')] = self.dy_ddx.T + + J[('turbineX', 'dy')] = self.dx_ddy.T + J[('turbineY', 'dy')] = self.dy_ddy.T + + J[('turbineX', 'shear')] = self.dx_dshear.T + J[('turbineY', 'shear')] = self.dy_dshear.T + + J[('turbineX', 'rotate')] = self.dx_drotate.T + J[('turbineY', 'rotate')] = self.dy_drotate.T + + + return J + + +class get_turbine_locs(Component): + """get turbine locations from grid variables""" + + def __init__(self, nTurbines, nRows, nOuter, nGrid, nBoundaries): + + super(get_turbine_locs, self).__init__() + + self.nTurbines = nTurbines + self.nOuter = nOuter + self.nGrid = nGrid + self.nRows = nRows + self.nBoundaries = nBoundaries + + # Explicitly size input arrays + self.add_param('dx', val=0.) + self.add_param('dy', val=0.) + self.add_param('shear', val=0.) + self.add_param('rotate', val=0.) + self.add_param('start', val=0.) + self.add_param('y0', val=0.) + + self.add_param('turbs_per_row', val=np.zeros(nRows,dtype=int)) + self.add_param('x_start', val=np.zeros(nRows)) + + self.add_param('bx', val=np.zeros(nBoundaries)) + self.add_param('by', val=np.zeros(nBoundaries)) + + self.add_output('turbineX', val=np.zeros(nTurbines), pass_by_object=True) + self.add_output('turbineY', val=np.zeros(nTurbines), pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + dx = params['dx'] + dy = params['dy'] + shear = params['shear'] + rotate = params['rotate'] + start = params['start'] + y0 = params['y0'] + + turbs_per_row = params['turbs_per_row'] + x_start = params['x_start'] + + bx = params['bx'] + by = params['by'] + + dxd = 1. + dyd = 0. + sheard = 0. + rotated = 0. + startd = 0. + turbineX,dx_ddx,turbineY,dy_ddx = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, + dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, + start,startd,bx,by) + dxd = 0. + dyd = 1. + sheard = 0. + rotated = 0. + startd = 0. + turbineX,dx_ddy,turbineY,dy_ddy = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, + dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, + start,startd,bx,by) + + dxd = 0. + dyd = 0. + sheard = 1. + rotated = 0. + startd = 0. + turbineX,dx_dshear,turbineY,dy_dshear = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, + dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, + start,startd,bx,by) + + dxd = 0. + dyd = 0. + sheard = 0. + rotated = 1. + startd = 0. + turbineX,dx_drotate,turbineY,dy_drotate = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, + dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, + start,startd,bx,by) + + dxd = 0. + dyd = 0. + sheard = 0. + rotated = 0. + startd = 1. + turbineX,dx_dstart,turbineY,dy_dstart = param_fortran.turbinelocations_dv(self.nTurbines,self.nOuter,self.nGrid,dx,dxd, + dy,dyd,shear,sheard,rotate,rotated,turbs_per_row,x_start,y0, + start,startd,bx,by) + + self.dx_ddx = dx_ddx + self.dy_ddx = dy_ddx + self.dx_ddy = dx_ddy + self.dy_ddy = dy_ddy + self.dx_dshear = dx_dshear + self.dy_dshear = dy_dshear + self.dx_drotate = dx_drotate + self.dy_drotate = dy_drotate + self.dx_dstart = dx_dstart + self.dy_dstart = dy_dstart + + unknowns['turbineX'] = turbineX + unknowns['turbineY'] = turbineY + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + # populate Jacobian dict + J[('turbineX', 'dx')] = self.dx_ddx.T + J[('turbineY', 'dx')] = self.dy_ddx.T + + J[('turbineX', 'dy')] = self.dx_ddy.T + J[('turbineY', 'dy')] = self.dy_ddy.T + + J[('turbineX', 'shear')] = self.dx_dshear.T + J[('turbineY', 'shear')] = self.dy_dshear.T + + J[('turbineX', 'rotate')] = self.dx_drotate.T + J[('turbineY', 'rotate')] = self.dy_drotate.T + + J[('turbineX', 'start')] = self.dx_dstart.T + J[('turbineY', 'start')] = self.dy_dstart.T + + return J diff --git a/code/optDirectRevision.py b/code/optDirectRevision.py new file mode 100644 index 0000000..074a4bc --- /dev/null +++ b/code/optDirectRevision.py @@ -0,0 +1,473 @@ +from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 +from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver +import numpy as np +import scipy as sp +import os +from optComponents import * +import full_aep +import sys +from windRoses import * +from position_constraints import calculate_boundary +sys.dont_write_bytecode = True + + +def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed pattern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-points-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y + + +class AEP_obj_ncalls(Component): + """ Calculates aep with a gaussian wake model """ + + def __init__(self, nTurbines, nDirections, nRotorPoints, nCtPoints): + + # print 'entering windframe __init__ - analytic' + + super(AEP_obj_ncalls, self).__init__() + + self.nTurbines = nTurbines + + # Explicitly size input arrays + self.add_param('turbineX', val=np.zeros(nTurbines)) + self.add_param('turbineY', val=np.zeros(nTurbines)) + self.add_param('turbineZ', val=np.ones(nTurbines)*110.) + self.add_param('rotorDiameter', val=np.ones(nTurbines)*130.) + self.add_param('Ct', val=np.ones(nTurbines)*8./9.) + self.add_param('yaw', val=np.zeros(nTurbines)) + + self.add_param('windDirections', val=np.zeros(nDirections)) + self.add_param('windSpeeds', val=np.zeros(nDirections)) + self.add_param('windFrequencies', val=np.zeros(nDirections)) + + self.add_param('RotorPointsY', val=np.zeros(nRotorPoints)) + self.add_param('RotorPointsZ', val=np.zeros(nRotorPoints)) + + self.add_param('ct_curve_wind_speed', val=np.zeros(nCtPoints)) + self.add_param('ct_curve_ct', val=np.zeros(nCtPoints)) + + self.add_param('shear_exp', val=0.1) + self.add_param('rated_ws', val=9.8) + self.add_param('rated_power', val=3.6) + self.add_param('cut_in_speed', val=4.0) + self.add_param('cut_out_speed', val=25.0) + self.add_param('zref', val=50.0) + self.add_param('z0', val=0.0) + self.add_param('ky', val=0.022) + self.add_param('kz', val=0.022) + self.add_param('alpha', val=2.32) + self.add_param('beta', val=0.154) + self.add_param('TI', val=0.11) + self.add_param('relaxationFactor', val=1.0) + self.add_param('sm_smoothing', val=700.) + self.add_param('generator_efficiency', val=0.936) + + self.add_param('wake_combination_method', val=1) + self.add_param('ti_calculation_method', val=2) + self.add_param('wake_model_version', val=2016) + self.add_param('interp_type', val=1) + self.add_param('calc_k_star', val=True) + self.add_param('print_ti', val=False) + self.add_param('use_ct_curve', val=True) + + self.add_output('negAEP', val=0.0, pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + nTurbines = self.nTurbines + + global nCalls_obj + nCalls_obj += 1 + + turbineX = params['turbineX'] + turbineY = params['turbineY'] + turbineZ = params['turbineZ'] + rotorDiameter = params['rotorDiameter'] + Ct = params['Ct'] + yaw = params['yaw'] + + windDirections = params['windDirections'] + windSpeeds = params['windSpeeds'] + windFrequencies = params['windFrequencies'] + + RotorPointsY = params['RotorPointsY'] + RotorPointsZ = params['RotorPointsZ'] + + ct_curve_wind_speed = params['ct_curve_wind_speed'] + ct_curve_ct = params['ct_curve_ct'] + + shear_exp = params['shear_exp'] + rated_ws = params['rated_ws'] + rated_power = params['rated_power'] + cut_in_speed = params['cut_in_speed'] + cut_out_speed = params['cut_out_speed'] + zref = params['zref'] + z0 = params['z0'] + ky = params['ky'] + kz = params['kz'] + alpha = params['alpha'] + beta = params['beta'] + TI = params['TI'] + relaxationFactor = params['relaxationFactor'] + sm_smoothing = params['sm_smoothing'] + generator_efficiency = params['generator_efficiency'] + + wake_combination_method = params['wake_combination_method'] + ti_calculation_method = params['ti_calculation_method'] + wake_model_version = params['wake_model_version'] + interp_type = params['interp_type'] + calc_k_star = params['calc_k_star'] + print_ti = params['print_ti'] + use_ct_curve = params['use_ct_curve'] + + + turbineYd = np.zeros((nTurbines,nTurbines)) + turbineXd = np.eye(nTurbines) + _,daep_dx = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter, + Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + turbineXd = np.zeros((nTurbines,nTurbines)) + turbineYd = np.eye(nTurbines) + aep,daep_dy = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + self.daep_dx = daep_dx*generator_efficiency + self.daep_dy = daep_dy*generator_efficiency + unknowns['negAEP'] = -aep*generator_efficiency + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + d_dx = np.zeros((1,self.nTurbines)) + d_dy = np.zeros((1,self.nTurbines)) + for i in range(self.nTurbines): + d_dx[0][i] = -self.daep_dx[i] + d_dy[0][i] = -self.daep_dy[i] + # populate Jacobian dict + J[('negAEP', 'turbineX')] = d_dx + J[('negAEP', 'turbineY')] = d_dy + + return J + + +if __name__ == "__main__": + global nCalls_obj + global nCalls_con + + # run = 1 + nTurbines = 100 + # rose = 'northIslandRose' + # rose = 'ukiahRose' + # rose = 'victorvilleRose' + # spacing = 4. + # boundary = 'amalia' + # boundary = 'circle' + # boundary = 'square' + spacing = float(sys.argv[1]) + boundary = '%s'%sys.argv[2] + rose = '%s'%sys.argv[3] + run = int(sys.argv[4]) + + print 'spacing: ', spacing + print 'boundary: ', boundary + print 'rose: ', rose + print 'run: ', run + + folder = 'opt-results-revision/direct/%s_%s_%s'%(boundary,spacing,rose) + if not os.path.exists(folder): + os.makedirs(folder) + + # nDirections = 30 + # nSpeeds = 8 + nDirections = 24 + nSpeeds = 5 + if rose == 'northIslandRose': + windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = northIslandRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + elif rose == 'ukiahRose': + windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = ukiahRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + elif rose == 'victorvilleRose': + windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = victorvilleRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + + rotorDiameter = np.ones(nTurbines)*130. + turbineZ = np.ones(nTurbines)*110. + + minSpacing = 2.0 + + side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing + a = side_length**2 + circle_radius = np.sqrt(a/np.pi) + if boundary == 'circle': + nBounds = 100 + # circle_radius = 5280. + xBounds = np.zeros(nBounds) + yBounds = np.zeros(nBounds) + theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) + for i in range(nBounds): + xBounds[i] = circle_radius*np.cos(theta[i]) + yBounds[i] = circle_radius*np.sin(theta[i]) + + locations = np.zeros((nBounds,2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + elif boundary == 'square': + nBounds = 4 + x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) + y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) + xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) + yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) + + locations = np.zeros((nBounds,2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + elif boundary == 'amalia': + locations = np.loadtxt('/fslhome/pjstanle/compute/reduction/layout_amalia.txt') + xBounds = locations[:, 0] + yBounds = locations[:, 1] + xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. + yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + xBounds = boundaryVertices[:, 0] + yBounds = boundaryVertices[:, 1] + nBounds = len(xBounds) + points = np.zeros((nBounds,2)) + points[:, 0] = xBounds + points[:, 1] = yBounds + hull = sp.spatial.ConvexHull(points) + area = hull.volume + area_ratio = area/a + xBounds = xBounds/np.sqrt(area_ratio) + yBounds = yBounds/np.sqrt(area_ratio) + + locations = np.zeros((len(xBounds),2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + + nBoundaries = np.shape(boundaryVertices)[0] + + if boundary == 'circle': + xmin = -circle_radius + xmax = circle_radius + ymin = -circle_radius + ymax = circle_radius + elif boundary == 'square': + xmax = side_length/2. + xmin = -side_length/2. + ymax = side_length/2. + ymin = -side_length/2. + elif boundary =='amalia': + xmax = max(xBounds) + xmin = min(xBounds) + ymax = max(yBounds) + ymin = min(yBounds) + + ct_speeds = np.array([ 0.000001, 0.1 , 0.60816327, 1.11632653, 1.6244898 , 2.13265306, + 2.64081633, 3.14897959, 3.65714286, 4.16530612, 4.67346939, + 5.18163265, 5.68979592, 6.19795918, 6.70612245, 7.21428571, + 7.72244898, 8.23061224, 8.73877551, 9.24693878, 9.75510204, + 10.26326531, 10.77142857, 11.27959184, 11.7877551 , 12.29591837, + 12.80408163, 13.3122449 , 13.82040816, 14.32857143, 14.83673469, + 15.34489796, 15.85306122, 16.36122449, 16.86938776, 17.37755102, + 17.88571429, 18.39387755, 18.90204082, 19.41020408, 19.91836735, + 20.42653061, 20.93469388, 21.44285714, 21.95102041, 22.45918367, + 22.96734694, 23.4755102 , 23.98367347, 24.49183673, 25. ]) + ct_ct = np.array([0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, + 0.74988552, 0.74945275, 0.74736838, 0.74578062, 0.74452166, + 0.7432327 , 0.74240891, 0.74171844, 0.74113119, 0.74062551, + 0.7401854 , 0.7397988 , 0.73945643, 0.73915104, 0.71535516, + 0.50902345, 0.42264255, 0.36002829, 0.31616439, 0.27728908, + 0.2449473 , 0.2179915 , 0.19464155, 0.17388996, 0.15676952, + 0.14116089, 0.12769325, 0.11564223, 0.104593 , 0.09546578, + 0.08765315, 0.08043937, 0.07409357, 0.06822311, 0.06322334, + 0.05887784, 0.05481244, 0.05114998, 0.0474271 , 0.04415572, + 0.04104199, 0.0383636 , 0.03582949, 0.03401271, 0.03235028]) + + nCtPoints = len(ct_ct) + RotorPointsYopt = np.array([0, 0, -0.69, 0.69]) + RotorPointsZopt = np.array([0.69, -0.69, 0, 0]) + nRotorPoints_opt = 4 + + nRotorPoints_eval = 100 + RotorPointsYeval, RotorPointsZeval = sunflower_points(nRotorPoints_eval) + + nCalls_obj = 0 + + prob = Problem() + root = prob.root = Group() + root.add('turbineX', IndepVarComp('turbineX', np.zeros(nTurbines)), promotes=['*']) + root.add('turbineY', IndepVarComp('turbineY', np.zeros(nTurbines)), promotes=['*']) + + root.add('AEP_obj', AEP_obj_ncalls(nTurbines=nTurbines, nDirections=nDirections*nSpeeds, + nRotorPoints=nRotorPoints_opt, nCtPoints=nCtPoints), promotes=['*']) + root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) + + prob.driver = pyOptSparseDriver() + prob.driver.options['optimizer'] = 'SNOPT' + # prob.driver.opt_settings['Major iterations limit'] = 1000 + prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 + # prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 + prob.driver.opt_settings['Verify level'] = 3 + prob.driver.opt_settings['Scale option'] = 2 + prob.driver.opt_settings['Scale tolerance'] = .95 + + prob.driver.opt_settings['Verify level'] = 0 + + prob.driver.opt_settings['Summary file'] = '%s/%s_summary.out'%(folder,run) + prob.driver.opt_settings['Print file'] = '%s/%s_print.out'%(folder,run) + + prob.driver.add_objective('negAEP',scaler=1E-4) + + prob.driver.add_desvar('turbineX') + prob.driver.add_desvar('turbineY') + + prob.driver.add_constraint('spacing_constraint',lower=0.) + prob.driver.add_constraint('boundary_constraint',lower=0.) + + prob.setup(check=True) + + + prob['turbineZ'] = turbineZ + prob['rotorDiameter'] = rotorDiameter + + prob['boundaryVertices'] = boundaryVertices + prob['boundaryNormals'] = boundaryNormals + + prob['RotorPointsY'] = RotorPointsYopt + prob['RotorPointsZ'] = RotorPointsZopt + + prob['ct_curve_wind_speed'] = ct_speeds + prob['ct_curve_ct'] = ct_ct + + prob['windDirections'] = windDirections + prob['windSpeeds'] = windSpeeds + prob['windFrequencies'] = windFrequencies + + + num = 100 + for i in range(num): + print 'iteration: ', i + x,y = random_start(nTurbines,rotorDiameter[0],xmin,xmax,ymin,ymax) + nCalls_obj = 0 + nCalls_con = 0 + + prob['turbineX'] = x + prob['turbineY'] = y + + prob.run() + + separation = np.min(prob['spacing_constraint']) + boundary = np.min(prob['boundary_constraint']) + AEPopt = -prob['negAEP'] + + xopt = prob['turbineX'] + yopt = prob['turbineY'] + + """evaluate""" + + Ct = np.ones(nTurbines)*8./9. + yaw = np.zeros(nTurbines) + shear_exp = 0.1 + rated_ws = 9.8 + rated_power = 3.6 + cut_in_speed = 4.0 + cut_out_speed = 25. + zref = 50. + z0 = 0. + ky = 0.022 + kz = 0.022 + alpha = 2.32 + beta = 0.154 + TI = 0.11 + relaxationFactor = 1.0 + sm_smoothing = 700. + generator_efficiency = 0.936 + wake_combination_method = 1 + ti_calculation_method = 2 + wake_model_version = 2016 + interp_type = 1 + calc_k_star = True + print_ti = False + use_ct_curve = True + + if separation > -1.E-2 and boundary > -1.E-2: + + AEPtrue = full_aep.calcaep(xopt,yopt,turbineZ,rotorDiameter,Ct,yaw,windDirections_eval, + windSpeeds_eval,windFrequencies_eval,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsYeval, RotorPointsZeval,ct_speeds,ct_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + AEPtrue = AEPtrue*0.936 + + file = open('%s/AEPopt.txt'%folder, 'a') + file.write('%s'%(AEPopt) + '\n') + file.close() + + file = open('%s/AEPtrue.txt'%folder, 'a') + file.write('%s'%(AEPtrue) + '\n') + file.close() + + file = open('%s/funcCalls.txt'%folder, 'a') + file.write('%s'%nCalls_obj + '\n') + file.close() diff --git a/code/optGridRevision.py b/code/optGridRevision.py new file mode 100644 index 0000000..774b551 --- /dev/null +++ b/code/optGridRevision.py @@ -0,0 +1,500 @@ +from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 +from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver +import numpy as np +import scipy as sp +import os +from optComponents import * +import full_aep +from var_reduction_exact import * +import sys +from windRoses import * +from position_constraints import calculate_boundary +sys.dont_write_bytecode = True + + +def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed p attern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-po ints-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y + + +class AEP_obj_ncalls(Component): + """ Calculates aep with a gaussian wake model """ + + def __init__(self, nTurbines, nDirections, nRotorPoints, nCtPoints): + + # print 'entering windframe __init__ - analytic' + + super(AEP_obj_ncalls, self).__init__() + + self.nTurbines = nTurbines + + # Explicitly size input arrays + self.add_param('turbineX', val=np.zeros(nTurbines)) + self.add_param('turbineY', val=np.zeros(nTurbines)) + self.add_param('turbineZ', val=np.ones(nTurbines)*110.) + self.add_param('rotorDiameter', val=np.ones(nTurbines)*130.) + self.add_param('Ct', val=np.ones(nTurbines)*8./9.) + self.add_param('yaw', val=np.zeros(nTurbines)) + + self.add_param('windDirections', val=np.zeros(nDirections)) + self.add_param('windSpeeds', val=np.zeros(nDirections)) + self.add_param('windFrequencies', val=np.zeros(nDirections)) + + self.add_param('RotorPointsY', val=np.zeros(nRotorPoints)) + self.add_param('RotorPointsZ', val=np.zeros(nRotorPoints)) + + self.add_param('ct_curve_wind_speed', val=np.zeros(nCtPoints)) + self.add_param('ct_curve_ct', val=np.zeros(nCtPoints)) + + self.add_param('shear_exp', val=0.1) + self.add_param('rated_ws', val=9.8) + self.add_param('rated_power', val=3.6) + self.add_param('cut_in_speed', val=4.0) + self.add_param('cut_out_speed', val=25.0) + self.add_param('zref', val=50.0) + self.add_param('z0', val=0.0) + self.add_param('ky', val=0.022) + self.add_param('kz', val=0.022) + self.add_param('alpha', val=2.32) + self.add_param('beta', val=0.154) + self.add_param('TI', val=0.11) + self.add_param('relaxationFactor', val=1.0) + self.add_param('sm_smoothing', val=700.) + self.add_param('generator_efficiency', val=0.936) + + self.add_param('wake_combination_method', val=1) + self.add_param('ti_calculation_method', val=2) + self.add_param('wake_model_version', val=2016) + self.add_param('interp_type', val=1) + self.add_param('calc_k_star', val=True) + self.add_param('print_ti', val=False) + self.add_param('use_ct_curve', val=True) + + self.add_output('negAEP', val=0.0, pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + nTurbines = self.nTurbines + + global nCalls_obj + nCalls_obj += 1 + + turbineX = params['turbineX'] + turbineY = params['turbineY'] + turbineZ = params['turbineZ'] + rotorDiameter = params['rotorDiameter'] + Ct = params['Ct'] + yaw = params['yaw'] + + windDirections = params['windDirections'] + windSpeeds = params['windSpeeds'] + windFrequencies = params['windFrequencies'] + + RotorPointsY = params['RotorPointsY'] + RotorPointsZ = params['RotorPointsZ'] + + ct_curve_wind_speed = params['ct_curve_wind_speed'] + ct_curve_ct = params['ct_curve_ct'] + + shear_exp = params['shear_exp'] + rated_ws = params['rated_ws'] + rated_power = params['rated_power'] + cut_in_speed = params['cut_in_speed'] + cut_out_speed = params['cut_out_speed'] + zref = params['zref'] + z0 = params['z0'] + ky = params['ky'] + kz = params['kz'] + alpha = params['alpha'] + beta = params['beta'] + TI = params['TI'] + relaxationFactor = params['relaxationFactor'] + sm_smoothing = params['sm_smoothing'] + generator_efficiency = params['generator_efficiency'] + + wake_combination_method = params['wake_combination_method'] + ti_calculation_method = params['ti_calculation_method'] + wake_model_version = params['wake_model_version'] + interp_type = params['interp_type'] + calc_k_star = params['calc_k_star'] + print_ti = params['print_ti'] + use_ct_curve = params['use_ct_curve'] + + + turbineYd = np.zeros((nTurbines,nTurbines)) + turbineXd = np.eye(nTurbines) + _,daep_dx = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter, + Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + turbineXd = np.zeros((nTurbines,nTurbines)) + turbineYd = np.eye(nTurbines) + aep,daep_dy = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + self.daep_dx = daep_dx*generator_efficiency + self.daep_dy = daep_dy*generator_efficiency + unknowns['negAEP'] = -aep*generator_efficiency + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + d_dx = np.zeros((1,self.nTurbines)) + d_dy = np.zeros((1,self.nTurbines)) + for i in range(self.nTurbines): + d_dx[0][i] = -self.daep_dx[i] + d_dy[0][i] = -self.daep_dy[i] + # populate Jacobian dict + J[('negAEP', 'turbineX')] = d_dx + J[('negAEP', 'turbineY')] = d_dy + + return J + + +if __name__ == "__main__": + global nCalls_obj + global nCalls_con + + # run = 1 + nTurbines = 100 + # rose = 'northIslandRose' + # rose = 'ukiahRose' + # rose = 'victorvilleRose' + # spacing = 4. + # spacing = 6. + # spacing = 8. + # boundary = 'amalia' + # boundary = 'circle' + # boundary = 'square' + + spacing = float(sys.argv[1]) + boundary = '%s'%sys.argv[2] + rose = '%s'%sys.argv[3] + run = int(sys.argv[4]) + + print 'spacing: ', spacing + print 'boundary: ', boundary + print 'rose: ', rose + print 'run: ', run + + folder = 'opt-results-revision/grid/%s_%s_%s_my1'%(boundary,spacing,rose) + if not os.path.exists(folder): + os.makedirs(folder) + + # nDirections = 30 + # nSpeeds = 8 + nDirections = 24 + nSpeeds = 5 + if rose == 'northIslandRose': + windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = northIslandRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + elif rose == 'ukiahRose': + windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = ukiahRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + elif rose == 'victorvilleRose': + windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = victorvilleRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + + rotorDiameter = np.ones(nTurbines)*130. + turbineZ = np.ones(nTurbines)*110. + + minSpacing = 2.0 + + side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing + a = side_length**2 + circle_radius = np.sqrt(a/np.pi) + if boundary == 'circle': + nBounds = 100 + # circle_radius = 5280. + xBounds = np.zeros(nBounds) + yBounds = np.zeros(nBounds) + theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) + for i in range(nBounds): + xBounds[i] = circle_radius*np.cos(theta[i]) + yBounds[i] = circle_radius*np.sin(theta[i]) + + locations = np.zeros((nBounds,2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + elif boundary == 'square': + nBounds = 4 + x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) + y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) + xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) + yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) + + locations = np.zeros((nBounds,2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + elif boundary == 'amalia': + locations = np.loadtxt('/fslhome/pjstanle/compute/reduction/layout_amalia.txt') + xBounds = locations[:, 0] + yBounds = locations[:, 1] + xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. + yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + xBounds = boundaryVertices[:, 0] + yBounds = boundaryVertices[:, 1] + nBounds = len(xBounds) + points = np.zeros((nBounds,2)) + points[:, 0] = xBounds + points[:, 1] = yBounds + hull = sp.spatial.ConvexHull(points) + area = hull.volume + area_ratio = area/a + xBounds = xBounds/np.sqrt(area_ratio) + yBounds = yBounds/np.sqrt(area_ratio) + + locations = np.zeros((len(xBounds),2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + + nBoundaries = np.shape(boundaryVertices)[0] + + if boundary == 'circle': + xmin = -circle_radius + xmax = circle_radius + ymin = -circle_radius + ymax = circle_radius + elif boundary == 'square': + xmax = side_length/2. + xmin = -side_length/2. + ymax = side_length/2. + ymin = -side_length/2. + elif boundary =='amalia': + xmax = max(xBounds) + xmin = min(xBounds) + ymax = max(yBounds) + ymin = min(yBounds) + + ct_speeds = np.array([ 0.000001, 0.1 , 0.60816327, 1.11632653, 1.6244898 , 2.13265306, + 2.64081633, 3.14897959, 3.65714286, 4.16530612, 4.67346939, + 5.18163265, 5.68979592, 6.19795918, 6.70612245, 7.21428571, + 7.72244898, 8.23061224, 8.73877551, 9.24693878, 9.75510204, + 10.26326531, 10.77142857, 11.27959184, 11.7877551 , 12.29591837, + 12.80408163, 13.3122449 , 13.82040816, 14.32857143, 14.83673469, + 15.34489796, 15.85306122, 16.36122449, 16.86938776, 17.37755102, + 17.88571429, 18.39387755, 18.90204082, 19.41020408, 19.91836735, + 20.42653061, 20.93469388, 21.44285714, 21.95102041, 22.45918367, + 22.96734694, 23.4755102 , 23.98367347, 24.49183673, 25. ]) + ct_ct = np.array([0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, + 0.74988552, 0.74945275, 0.74736838, 0.74578062, 0.74452166, + 0.7432327 , 0.74240891, 0.74171844, 0.74113119, 0.74062551, + 0.7401854 , 0.7397988 , 0.73945643, 0.73915104, 0.71535516, + 0.50902345, 0.42264255, 0.36002829, 0.31616439, 0.27728908, + 0.2449473 , 0.2179915 , 0.19464155, 0.17388996, 0.15676952, + 0.14116089, 0.12769325, 0.11564223, 0.104593 , 0.09546578, + 0.08765315, 0.08043937, 0.07409357, 0.06822311, 0.06322334, + 0.05887784, 0.05481244, 0.05114998, 0.0474271 , 0.04415572, + 0.04104199, 0.0383636 , 0.03582949, 0.03401271, 0.03235028]) + + nCtPoints = len(ct_ct) + RotorPointsYopt = np.array([0, 0, -0.69, 0.69]) + RotorPointsZopt = np.array([0.69, -0.69, 0, 0]) + nRotorPoints_opt = 4 + + nRotorPoints_eval = 100 + RotorPointsYeval, RotorPointsZeval = sunflower_points(nRotorPoints_eval) + + nCalls_obj = 0 + + num = 100 + + for i in range(num): + rotate = float(np.random.rand(1))*360. + print 'rotate: ', rotate + + dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nTurbines, + boundaryVertices*0.95,boundaryNormals,rotate=rotate,my=1.0) + + nRows = len(turbs_per_row) + print turbs_per_row + print x_start + + prob = Problem() + root = prob.root = Group() + root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) + root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) + root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) + root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) + + root.add('makeGrid', form_grid(nTurbines=nTurbines,nRows=nRows),promotes=['*']) + root.add('AEP_obj', AEP_obj_ncalls(nTurbines=nTurbines, nDirections=nDirections*nSpeeds, + nRotorPoints=nRotorPoints_opt, nCtPoints=nCtPoints), promotes=['*']) + root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) + + prob.driver = pyOptSparseDriver() + prob.driver.options['optimizer'] = 'SNOPT' + # prob.driver.opt_settings['Major iterations limit'] = 1000 + prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 + # prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 + prob.driver.opt_settings['Verify level'] = 3 + prob.driver.opt_settings['Scale option'] = 2 + prob.driver.opt_settings['Scale tolerance'] = .95 + + prob.driver.opt_settings['Verify level'] = 0 + + prob.driver.opt_settings['Summary file'] = '%s/%s_summary.out'%(folder,run) + prob.driver.opt_settings['Print file'] = '%s/%s_print.out'%(folder,run) + + prob.driver.add_objective('negAEP',scaler=1E-4) + + prob.driver.add_desvar('dx') + prob.driver.add_desvar('dy') + prob.driver.add_desvar('shear') + prob.driver.add_desvar('rotate') + + prob.driver.add_constraint('spacing_constraint',lower=0.) + prob.driver.add_constraint('boundary_constraint',lower=0.) + + prob.setup(check=True) + + prob['turbineZ'] = turbineZ + prob['rotorDiameter'] = rotorDiameter + + prob['boundaryVertices'] = boundaryVertices + prob['boundaryNormals'] = boundaryNormals + + prob['RotorPointsY'] = RotorPointsYopt + prob['RotorPointsZ'] = RotorPointsZopt + + prob['ct_curve_wind_speed'] = ct_speeds + prob['ct_curve_ct'] = ct_ct + + prob['windDirections'] = windDirections + prob['windSpeeds'] = windSpeeds + prob['windFrequencies'] = windFrequencies + + prob['turbs_per_row'] = turbs_per_row + prob['x_start'] = x_start + prob['y0'] = y0 + + print 'iteration: ', i + nCalls_obj = 0 + nCalls_con = 0 + + prob['dx'] = dx_start + float(np.random.rand(1))*dx_start/5.-dx_start/10. + prob['dy'] = dy_start + float(np.random.rand(1))*dy_start/5.-dy_start/10. + prob['shear'] = shear_start + float(np.random.rand(1))*shear_start/5.-shear_start/10. + # prob['rotate'] = float(np.random.rand(1))*20.-10. + # prob['dx'] = dx_start + # prob['dy'] = dy_start + # prob['shear'] = shear_start + prob['rotate'] = rotate_start + + prob.run() + + separation = np.min(prob['spacing_constraint']) + boundary = np.min(prob['boundary_constraint']) + AEPopt = -prob['negAEP'] + + xopt = prob['turbineX'] + yopt = prob['turbineY'] + + """evaluate""" + + Ct = np.ones(nTurbines)*8./9. + yaw = np.zeros(nTurbines) + shear_exp = 0.1 + rated_ws = 9.8 + rated_power = 3.6 + cut_in_speed = 4.0 + cut_out_speed = 25. + zref = 50. + z0 = 0. + ky = 0.022 + kz = 0.022 + alpha = 2.32 + beta = 0.154 + TI = 0.11 + relaxationFactor = 1.0 + sm_smoothing = 700. + generator_efficiency = 0.936 + wake_combination_method = 1 + ti_calculation_method = 2 + wake_model_version = 2016 + interp_type = 1 + calc_k_star = True + print_ti = False + use_ct_curve = True + + if separation > -1.E-2 and boundary > -1.E-2: + + AEPtrue = full_aep.calcaep(xopt,yopt,turbineZ,rotorDiameter,Ct,yaw,windDirections_eval, + windSpeeds_eval,windFrequencies_eval,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsYeval, RotorPointsZeval,ct_speeds,ct_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + AEPtrue = AEPtrue*0.936 + + file = open('%s/AEPopt.txt'%folder, 'a') + file.write('%s'%(AEPopt) + '\n') + file.close() + + file = open('%s/AEPtrue.txt'%folder, 'a') + file.write('%s'%(AEPtrue) + '\n') + file.close() + + file = open('%s/funcCalls.txt'%folder, 'a') + file.write('%s'%nCalls_obj + '\n') + file.close() diff --git a/code/optParamRevision.py b/code/optParamRevision.py new file mode 100644 index 0000000..5ee643b --- /dev/null +++ b/code/optParamRevision.py @@ -0,0 +1,534 @@ +from pyoptsparse import Optimization, SNOPT, pyOpt_solution, NSGA2 +from openmdao.api import Group, Component, Problem, IndepVarComp, pyOptSparseDriver +import numpy as np +import scipy as sp +import os +from optComponents import * +import full_aep +import sys +from windRoses import * +from position_constraints import calculate_boundary +sys.dont_write_bytecode = True +from var_reduction_exact import * + + +def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed p attern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-po ints-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y + + +class AEP_obj_ncalls(Component): + """ Calculates aep with a gaussian wake model """ + + def __init__(self, nTurbines, nDirections, nRotorPoints, nCtPoints): + + # print 'entering windframe __init__ - analytic' + + super(AEP_obj_ncalls, self).__init__() + + self.nTurbines = nTurbines + + # Explicitly size input arrays + self.add_param('turbineX', val=np.zeros(nTurbines)) + self.add_param('turbineY', val=np.zeros(nTurbines)) + self.add_param('turbineZ', val=np.ones(nTurbines)*110.) + self.add_param('rotorDiameter', val=np.ones(nTurbines)*130.) + self.add_param('Ct', val=np.ones(nTurbines)*8./9.) + self.add_param('yaw', val=np.zeros(nTurbines)) + + self.add_param('windDirections', val=np.zeros(nDirections)) + self.add_param('windSpeeds', val=np.zeros(nDirections)) + self.add_param('windFrequencies', val=np.zeros(nDirections)) + + self.add_param('RotorPointsY', val=np.zeros(nRotorPoints)) + self.add_param('RotorPointsZ', val=np.zeros(nRotorPoints)) + + self.add_param('ct_curve_wind_speed', val=np.zeros(nCtPoints)) + self.add_param('ct_curve_ct', val=np.zeros(nCtPoints)) + + self.add_param('shear_exp', val=0.1) + self.add_param('rated_ws', val=9.8) + self.add_param('rated_power', val=3.6) + self.add_param('cut_in_speed', val=4.0) + self.add_param('cut_out_speed', val=25.0) + self.add_param('zref', val=50.0) + self.add_param('z0', val=0.0) + self.add_param('ky', val=0.022) + self.add_param('kz', val=0.022) + self.add_param('alpha', val=2.32) + self.add_param('beta', val=0.154) + self.add_param('TI', val=0.11) + self.add_param('relaxationFactor', val=1.0) + self.add_param('sm_smoothing', val=700.) + self.add_param('generator_efficiency', val=0.936) + + self.add_param('wake_combination_method', val=1) + self.add_param('ti_calculation_method', val=2) + self.add_param('wake_model_version', val=2016) + self.add_param('interp_type', val=1) + self.add_param('calc_k_star', val=True) + self.add_param('print_ti', val=False) + self.add_param('use_ct_curve', val=True) + + self.add_output('negAEP', val=0.0, pass_by_object=True) + + + def solve_nonlinear(self, params, unknowns, resids): + + nTurbines = self.nTurbines + + global nCalls_obj + nCalls_obj += 1 + + turbineX = params['turbineX'] + turbineY = params['turbineY'] + turbineZ = params['turbineZ'] + rotorDiameter = params['rotorDiameter'] + Ct = params['Ct'] + yaw = params['yaw'] + + windDirections = params['windDirections'] + windSpeeds = params['windSpeeds'] + windFrequencies = params['windFrequencies'] + + RotorPointsY = params['RotorPointsY'] + RotorPointsZ = params['RotorPointsZ'] + + ct_curve_wind_speed = params['ct_curve_wind_speed'] + ct_curve_ct = params['ct_curve_ct'] + + shear_exp = params['shear_exp'] + rated_ws = params['rated_ws'] + rated_power = params['rated_power'] + cut_in_speed = params['cut_in_speed'] + cut_out_speed = params['cut_out_speed'] + zref = params['zref'] + z0 = params['z0'] + ky = params['ky'] + kz = params['kz'] + alpha = params['alpha'] + beta = params['beta'] + TI = params['TI'] + relaxationFactor = params['relaxationFactor'] + sm_smoothing = params['sm_smoothing'] + generator_efficiency = params['generator_efficiency'] + + wake_combination_method = params['wake_combination_method'] + ti_calculation_method = params['ti_calculation_method'] + wake_model_version = params['wake_model_version'] + interp_type = params['interp_type'] + calc_k_star = params['calc_k_star'] + print_ti = params['print_ti'] + use_ct_curve = params['use_ct_curve'] + + + turbineYd = np.zeros((nTurbines,nTurbines)) + turbineXd = np.eye(nTurbines) + _,daep_dx = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter, + Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + turbineXd = np.zeros((nTurbines,nTurbines)) + turbineYd = np.eye(nTurbines) + aep,daep_dy = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + self.daep_dx = daep_dx*generator_efficiency + self.daep_dy = daep_dy*generator_efficiency + unknowns['negAEP'] = -aep*generator_efficiency + + def linearize(self, params, unknowns, resids): + + # initialize Jacobian dict + J = {} + + d_dx = np.zeros((1,self.nTurbines)) + d_dy = np.zeros((1,self.nTurbines)) + for i in range(self.nTurbines): + d_dx[0][i] = -self.daep_dx[i] + d_dy[0][i] = -self.daep_dy[i] + # populate Jacobian dict + J[('negAEP', 'turbineX')] = d_dx + J[('negAEP', 'turbineY')] = d_dy + + return J + + + +if __name__ == "__main__": + global nCalls_obj + global nCalls_con + + # run = 1 + nTurbines = 100 + # rose = 'northIslandRose' + # rose = 'ukiahRose' + # rose = 'victorvilleRose' + # spacing = 4. + # spacing = 6. + # spacing = 8. + # boundary = 'amalia' + # boundary = 'circle' + # boundary = 'square' + + spacing = float(sys.argv[1]) + boundary = '%s'%sys.argv[2] + rose = '%s'%sys.argv[3] + run = int(sys.argv[4]) + + print 'spacing: ', spacing + print 'boundary: ', boundary + print 'rose: ', rose + print 'run: ', run + + + folder = 'opt-results-revision/param/%s_%s_%s'%(boundary,spacing,rose) + if not os.path.exists(folder): + os.makedirs(folder) + + # nDirections = 30 + # nSpeeds = 8 + nDirections = 24 + nSpeeds = 5 + if rose == 'northIslandRose': + windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = northIslandRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = northIslandRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + elif rose == 'ukiahRose': + windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = ukiahRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = ukiahRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + elif rose == 'victorvilleRose': + windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections) + wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] + windDirections, windFrequencies, windSpeeds = victorvilleRose(nDirections,nSpeeds=nSpeeds) + windDirections -= wind_angle + + windDirections_eval, windFrequencies_eval, windSpeeds_eval = victorvilleRose(360,nSpeeds=50) + windDirections_eval -= wind_angle + + rotorDiameter = np.ones(nTurbines)*130. + turbineZ = np.ones(nTurbines)*110. + + minSpacing = 2.0 + + side_length = (np.sqrt(nTurbines)-1.)*rotorDiameter[0]*spacing + a = side_length**2 + circle_radius = np.sqrt(a/np.pi) + if boundary == 'circle': + nBounds = 100 + # circle_radius = 5280. + xBounds = np.zeros(nBounds) + yBounds = np.zeros(nBounds) + theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) + for i in range(nBounds): + xBounds[i] = circle_radius*np.cos(theta[i]) + yBounds[i] = circle_radius*np.sin(theta[i]) + + locations = np.zeros((nBounds,2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + elif boundary == 'square': + nBounds = 4 + x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) + y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) + xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) + yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) + + locations = np.zeros((nBounds,2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + elif boundary == 'amalia': + locations = np.loadtxt('/fslhome/pjstanle/compute/reduction/layout_amalia.txt') + xBounds = locations[:, 0] + yBounds = locations[:, 1] + xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. + yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + xBounds = boundaryVertices[:, 0] + yBounds = boundaryVertices[:, 1] + nBounds = len(xBounds) + points = np.zeros((nBounds,2)) + points[:, 0] = xBounds + points[:, 1] = yBounds + hull = sp.spatial.ConvexHull(points) + area = hull.volume + area_ratio = area/a + xBounds = xBounds/np.sqrt(area_ratio) + yBounds = yBounds/np.sqrt(area_ratio) + + locations = np.zeros((len(xBounds),2)) + locations[:, 0] = xBounds + locations[:, 1] = yBounds + boundaryVertices, boundaryNormals = calculate_boundary(locations) + + bx = boundaryVertices[:,0] + by = boundaryVertices[:,1] + bx = bx-(min(bx)+max(bx))/2. + by = by-(min(by)+max(by))/2. + bx = np.append(bx,bx[0]) + by = np.append(by,by[0]) + nBounds_con = np.shape(boundaryVertices)[0] + nBounds_outer = len(bx) + + nBoundaries = np.shape(boundaryVertices)[0] + + if boundary == 'circle': + xmin = -circle_radius + xmax = circle_radius + ymin = -circle_radius + ymax = circle_radius + elif boundary == 'square': + xmax = side_length/2. + xmin = -side_length/2. + ymax = side_length/2. + ymin = -side_length/2. + elif boundary =='amalia': + xmax = max(xBounds) + xmin = min(xBounds) + ymax = max(yBounds) + ymin = min(yBounds) + + ct_speeds = np.array([ 0.000001, 0.1 , 0.60816327, 1.11632653, 1.6244898 , 2.13265306, + 2.64081633, 3.14897959, 3.65714286, 4.16530612, 4.67346939, + 5.18163265, 5.68979592, 6.19795918, 6.70612245, 7.21428571, + 7.72244898, 8.23061224, 8.73877551, 9.24693878, 9.75510204, + 10.26326531, 10.77142857, 11.27959184, 11.7877551 , 12.29591837, + 12.80408163, 13.3122449 , 13.82040816, 14.32857143, 14.83673469, + 15.34489796, 15.85306122, 16.36122449, 16.86938776, 17.37755102, + 17.88571429, 18.39387755, 18.90204082, 19.41020408, 19.91836735, + 20.42653061, 20.93469388, 21.44285714, 21.95102041, 22.45918367, + 22.96734694, 23.4755102 , 23.98367347, 24.49183673, 25. ]) + ct_ct = np.array([0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, + 0.74988552, 0.74945275, 0.74736838, 0.74578062, 0.74452166, + 0.7432327 , 0.74240891, 0.74171844, 0.74113119, 0.74062551, + 0.7401854 , 0.7397988 , 0.73945643, 0.73915104, 0.71535516, + 0.50902345, 0.42264255, 0.36002829, 0.31616439, 0.27728908, + 0.2449473 , 0.2179915 , 0.19464155, 0.17388996, 0.15676952, + 0.14116089, 0.12769325, 0.11564223, 0.104593 , 0.09546578, + 0.08765315, 0.08043937, 0.07409357, 0.06822311, 0.06322334, + 0.05887784, 0.05481244, 0.05114998, 0.0474271 , 0.04415572, + 0.04104199, 0.0383636 , 0.03582949, 0.03401271, 0.03235028]) + + nCtPoints = len(ct_ct) + RotorPointsYopt = np.array([0, 0, -0.69, 0.69]) + RotorPointsZopt = np.array([0.69, -0.69, 0, 0]) + nRotorPoints_opt = 4 + + nRotorPoints_eval = 100 + RotorPointsYeval, RotorPointsZeval = sunflower_points(nRotorPoints_eval) + + + + """determine how many turbines will be in the grid here""" + lenBound = np.zeros(nBounds_outer-1) + for i in range(nBounds_outer-1): + lenBound[i] = np.sqrt((bx[i+1]-bx[i])**2+(by[i+1]-by[i])**2) + + + circumference = sum(lenBound) + frac = 0.45 + nOuter = int(frac*nTurbines) + spacing_outer = circumference/(nOuter*rotorDiameter[0]) + if float(spacing_outer) < 2.*np.sqrt(2.): + nOuter = int(circumference/(2.*np.sqrt(2.)*rotorDiameter[0])) + nGrid = int(nTurbines-nOuter) + + print 'nTurbines: ', nTurbines + print 'nOuter: ', nOuter + print 'nGrid: ', nGrid + + nCalls_obj = 0 + + num = 100 + + for i in range(num): + + rotate = float(np.random.rand(1))*360. + print 'rotate: ', rotate + + dx_start,dy_start,shear_start,rotate_start,turbs_per_row,x_start,y0 = startGrid(nGrid, + boundaryVertices*0.85,boundaryNormals,rotate=rotate,my=4.0) + + nRows = len(turbs_per_row) + print turbs_per_row + print x_start + prob = Problem() + root = prob.root = Group() + root.add('dx', IndepVarComp('dx', 0.), promotes=['*']) + root.add('dy', IndepVarComp('dy', 0.), promotes=['*']) + root.add('shear', IndepVarComp('shear', 0.), promotes=['*']) + root.add('rotate', IndepVarComp('rotate', 0.), promotes=['*']) + root.add('start', IndepVarComp('start', 0.), promotes=['*']) + + root.add('get_turbine_locs', get_turbine_locs(nTurbines=nTurbines,nRows=nRows, nOuter=nOuter, + nGrid=nGrid, nBoundaries=nBounds_outer),promotes=['*']) + root.add('AEP_obj', AEP_obj_ncalls(nTurbines=nTurbines, nDirections=nDirections*nSpeeds, + nRotorPoints=nRotorPoints_opt, nCtPoints=nCtPoints), promotes=['*']) + root.add('position_constraints', constraint_calc(nTurbines=nTurbines, nBoundaries=nBoundaries),promotes=['*']) + + prob.driver = pyOptSparseDriver() + prob.driver.options['optimizer'] = 'SNOPT' + # prob.driver.opt_settings['Major iterations limit'] = 1000 + prob.driver.opt_settings['Major optimality tolerance'] = 1.E-4 + # prob.driver.opt_settings['Major feasibility tolerance'] = 1.E-4 + prob.driver.opt_settings['Verify level'] = 3 + prob.driver.opt_settings['Scale option'] = 2 + prob.driver.opt_settings['Scale tolerance'] = .95 + + prob.driver.opt_settings['Verify level'] = 0 + + prob.driver.opt_settings['Summary file'] = '%s/%s_summary.out'%(folder,run) + prob.driver.opt_settings['Print file'] = '%s/%s_print.out'%(folder,run) + + prob.driver.add_objective('negAEP',scaler=1E-4) + + prob.driver.add_desvar('dx') + prob.driver.add_desvar('dy') + prob.driver.add_desvar('shear') + prob.driver.add_desvar('rotate') + prob.driver.add_desvar('start') + + prob.driver.add_constraint('spacing_constraint',lower=0.) + prob.driver.add_constraint('boundary_constraint',lower=0.) + + prob.setup(check=True) + + prob['turbineZ'] = turbineZ + prob['rotorDiameter'] = rotorDiameter + + prob['boundaryVertices'] = boundaryVertices + prob['boundaryNormals'] = boundaryNormals + + prob['RotorPointsY'] = RotorPointsYopt + prob['RotorPointsZ'] = RotorPointsZopt + + prob['ct_curve_wind_speed'] = ct_speeds + prob['ct_curve_ct'] = ct_ct + + prob['windDirections'] = windDirections + prob['windSpeeds'] = windSpeeds + prob['windFrequencies'] = windFrequencies + + prob['turbs_per_row'] = turbs_per_row + prob['x_start'] = x_start + prob['y0'] = y0 + + prob['bx'] = bx + prob['by'] = by + + print 'iteration: ', i + nCalls_obj = 0 + nCalls_con = 0 + + prob['dx'] = dx_start + float(np.random.rand(1))*dx_start/5.-dx_start/10. + prob['dy'] = dy_start + float(np.random.rand(1))*dy_start/5.-dy_start/10. + prob['shear'] = shear_start + float(np.random.rand(1))*shear_start/5.-shear_start/10. + prob['rotate'] = rotate_start + prob['start'] = float(np.random.rand(1))*rotorDiameter[0]*3. + + prob.run() + + separation = np.min(prob['spacing_constraint']) + boundary = np.min(prob['boundary_constraint']) + AEPopt = -prob['negAEP'] + + xopt = prob['turbineX'] + yopt = prob['turbineY'] + + """evaluate""" + + Ct = np.ones(nTurbines)*8./9. + yaw = np.zeros(nTurbines) + shear_exp = 0.1 + rated_ws = 9.8 + rated_power = 3.6 + cut_in_speed = 4.0 + cut_out_speed = 25. + zref = 50. + z0 = 0. + ky = 0.022 + kz = 0.022 + alpha = 2.32 + beta = 0.154 + TI = 0.11 + relaxationFactor = 1.0 + sm_smoothing = 700. + generator_efficiency = 0.936 + wake_combination_method = 1 + ti_calculation_method = 2 + wake_model_version = 2016 + interp_type = 1 + calc_k_star = True + print_ti = False + use_ct_curve = True + + if separation > -1.E-2 and boundary > -1.E-2: + + AEPtrue = full_aep.calcaep(xopt,yopt,turbineZ,rotorDiameter,Ct,yaw,windDirections_eval, + windSpeeds_eval,windFrequencies_eval,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsYeval, RotorPointsZeval,ct_speeds,ct_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + AEPtrue = AEPtrue*0.936 + + file = open('%s/AEPopt.txt'%folder, 'a') + file.write('%s'%(AEPopt) + '\n') + file.close() + + file = open('%s/AEPtrue.txt'%folder, 'a') + file.write('%s'%(AEPtrue) + '\n') + file.close() + + file = open('%s/funcCalls.txt'%folder, 'a') + file.write('%s'%nCalls_obj + '\n') + file.close() diff --git a/code/plots/data/bins-convergence/10_1/AEP_opt.txt b/code/plots/data/bins-convergence/10_1/AEP_opt.txt new file mode 100644 index 0000000..416c380 --- /dev/null +++ b/code/plots/data/bins-convergence/10_1/AEP_opt.txt @@ -0,0 +1,10 @@ +449835.816932 +445853.603715 +447850.13191 +442611.724283 +447897.298644 +440355.765515 +455076.850353 +453288.183468 +437049.787448 +447804.895849 diff --git a/code/plots/data/bins-convergence/10_1/AEP_true.txt b/code/plots/data/bins-convergence/10_1/AEP_true.txt new file mode 100644 index 0000000..6bbcac6 --- /dev/null +++ b/code/plots/data/bins-convergence/10_1/AEP_true.txt @@ -0,0 +1,10 @@ +376875.884698 +376454.096536 +377992.970257 +377052.675043 +377848.819638 +372730.808042 +379352.050854 +379514.615259 +373349.3558 +376665.419542 diff --git a/code/plots/data/bins-convergence/10_1/boundary.txt b/code/plots/data/bins-convergence/10_1/boundary.txt new file mode 100644 index 0000000..9134fcc --- /dev/null +++ b/code/plots/data/bins-convergence/10_1/boundary.txt @@ -0,0 +1,10 @@ +-0.000416746579504 +-2.73290033874e-05 +-5.61005608688e-05 +-7.20634971003e-05 +-0.0010801420301 +-5.8464806898e-06 +-4.86755500333e-05 +-2.47059085723e-05 +-1.80941542567e-05 +-0.000902358625808 diff --git a/code/plots/data/bins-convergence/10_1/separation.txt b/code/plots/data/bins-convergence/10_1/separation.txt new file mode 100644 index 0000000..fb549d4 --- /dev/null +++ b/code/plots/data/bins-convergence/10_1/separation.txt @@ -0,0 +1,10 @@ +0.000367661894416 +12847.0754374 +0.0268115884101 +0.515707685117 +0.072676387892 +6.06191752013e-05 +20260.4138583 +22043.0030639 +2.58472573478e-05 +0.000518019165611 diff --git a/code/plots/data/bins-convergence/10_1/turbineX.txt b/code/plots/data/bins-convergence/10_1/turbineX.txt new file mode 100644 index 0000000..0d3058e --- /dev/null +++ b/code/plots/data/bins-convergence/10_1/turbineX.txt @@ -0,0 +1,10 @@ +-930.014971086, 1037.6665551, -1064.50560027, -629.795486077, 899.826760988, 398.139822696, -858.073773322, -453.156450104, 1023.46713699, 296.965003125, -1164.91696093, -145.556043834, -750.334518235, -363.584286793, -35.1147727295, 125.886093577, 1170.76726232, 24.0324527244, 600.071040649, 740.030259562, -268.907233119, -633.892099958, -79.9238907986, 476.905822225, 738.629188335 +1173.42355758, 83.721963786, -547.546983764, 522.936207482, 252.370927682, -62.5028276121, 151.591686856, -913.630821191, -334.461524026, -223.826608146, -230.352251177, 712.096983121, -364.481799732, 49.5139249476, -1032.16602498, 557.645789394, -446.015569218, -1068.16227403, 845.113670883, -658.082814908, 371.696449633, 819.33616631, -808.336331851, 1075.31559788, 982.796593194 +1116.7638278, 937.559183059, 227.09201649, -781.441313663, -496.351841853, 92.8858968218, -1077.76463762, -182.799897326, 266.770483077, 61.9037426146, 425.449954005, 558.002025715, 815.359602537, -322.420114519, -283.968928972, -1171.0315981, -68.0949446594, -452.600273315, 441.474604575, -570.044431612, -663.905343783, 709.08003618, 827.780310366, 1037.88575803, -984.888359268 +-412.270128861, 1089.71916619, 711.037130531, 24.7845999756, 549.398354146, -456.582357213, -151.039269579, -107.351988921, 640.716749167, -1102.03498415, -515.715110205, -911.368626533, 502.117113029, -817.945041062, 293.742556863, -294.905802817, 957.98193889, 390.792308569, -716.877040495, 823.042592245, 198.44224306, 53.8373805511, 917.429406754, -1009.24344592, -705.858600833 +304.230530509, -671.345687449, 189.496971357, -404.889071825, 514.961659253, 450.409863923, 737.423176619, 857.259346036, -1069.44542895, -864.593063531, -253.688361024, 24.3625596686, 835.507141795, -1171.07552802, -146.422730412, 1169.61858644, 1039.41404427, 987.858473219, 31.3431895574, 362.425326801, -743.37120599, 636.589012413, -377.741621481, -1006.50181909, -568.812085502 +57.8658586575, -408.653027923, -204.583555242, 659.054946623, 460.538363173, 1044.66516051, 901.606302892, -366.831602896, -943.598547301, -508.743457343, 1008.26833369, -514.259230933, -1170.69198127, -651.733229315, 1170.00760237, -616.629952273, -789.554441896, 205.355664994, 777.913292076, 561.014040289, -259.898586797, 197.778230802, -106.582883263, 889.721176682, 346.70896538 +-503.079691577, 121.435743493, 431.959968333, -374.187621883, 1066.34829418, -1040.41825171, 945.184104264, 521.279436239, 233.789435638, 330.413434186, -916.168160347, -656.232186231, 743.933646322, 391.101594114, 29.4289449297, -721.197032652, -583.197145534, 883.646797986, 641.015692465, -271.133665078, -200.200826301, 1172.27887287, -55.8901180307, -1171.54434292, -817.460774375 +701.918407889, -188.594114369, -430.945828713, 110.356108747, 1171.04497403, -927.604084914, -587.801910166, 271.376828037, -1079.62113901, 327.269615956, -1173.50701937, -470.900967824, -204.742632529, 829.823133592, -767.611217562, 449.65627132, -328.837387199, 911.962132408, 941.959585192, 549.037897107, -967.24607698, 127.488872659, -42.137642657, 1061.07857422, -640.490827861 +-590.346756014, 552.610816458, 287.536832662, 390.883891334, 1159.67127085, -922.193863922, -289.551071824, -429.880600759, 265.318736794, -545.100982773, 920.266638479, 1033.76065353, 412.819921406, -1061.26210802, 189.233172217, -211.325851021, -352.120620114, -1156.47747146, 298.702631014, -685.989672888, -38.7125191991, 700.328543354, 77.9330554596, -801.695428053, 826.598526999 +-343.995512076, 295.986590526, 200.151123138, 827.252755452, -139.493763096, 1072.00018047, 610.176572157, -722.8412162, -294.180668812, 725.662020312, -857.943450049, 91.2656980798, -1037.99235904, 931.987513007, 1170.90263868, -1139.06473103, -16.5078126983, -673.918405095, -941.324760011, -608.179573341, 844.353815362, 478.76034172, -486.999659275, -460.063759414, -155.513602003 diff --git a/code/plots/data/bins-convergence/10_1/turbineY.txt b/code/plots/data/bins-convergence/10_1/turbineY.txt new file mode 100644 index 0000000..6697475 --- /dev/null +++ b/code/plots/data/bins-convergence/10_1/turbineY.txt @@ -0,0 +1,10 @@ +-715.687113999, -548.073239995, -493.173584005, -512.564733582, -81.1616658845, 929.74247685, 67.4126707497, -1082.49024686, 574.153193152, -32.1097689064, -141.789867066, -49.8005645627, 615.564249509, 368.464687088, -1108.45728551, -585.642471737, 80.2521929263, 635.138259955, -243.137396046, 910.764028516, -540.92379797, 987.581355493, 988.708021334, -595.905327088, -749.724671858 +-14.5961053654, -1170.52405412, 466.00340313, -806.730491608, -598.86873614, -391.554915486, 415.987554267, -144.476698241, 1124.84282804, -954.45193725, 649.685825982, 258.778417853, -614.858729194, 824.715640706, -558.362957196, 730.747765253, -113.274660105, 485.968375513, -814.198279913, 888.092553665, -27.0573012391, 840.133422754, 280.265051804, 293.98252407, -458.883764101 +360.519691403, -118.293883772, 1147.36243714, 240.611481385, 1063.37705227, 483.989780597, 464.283634648, 296.228225266, -501.561373964, -1088.59391782, -1093.67647513, 880.967638127, 843.993262347, 663.324402667, -179.050738442, -76.2949079843, -706.769208549, -658.685730423, 213.74010979, -1025.76081989, 661.227267542, 394.088294837, -831.814751627, -397.716829359, -638.068111777 +610.976995328, -209.202631632, -186.83116754, -1173.25258051, -678.28202462, -863.592038853, -658.645320079, 799.718508317, -983.167329162, 145.213403054, 1054.12230103, -265.10413667, 41.5106439692, 841.487852291, 1120.98698224, 66.3058545291, -677.795409587, 357.341533917, 409.833725038, 299.067733319, -673.041961341, 323.144516606, 731.750761061, -598.801860074, -937.496504714 +149.76953514, 323.09555312, -389.354246181, -1101.45430104, -600.523617244, 887.361309728, 912.876214931, 116.63919309, 305.395749552, 793.482864988, 101.723324314, -861.287946315, -824.053284577, -75.6342143189, -135.118726779, 95.5440210001, -324.471895611, 633.46041656, 851.008698147, -1116.14687243, -418.057639918, 411.526010759, 517.186942444, -603.398907023, -899.633419529 +-842.334506166, -473.124226158, 819.416877671, 390.115391155, 569.651690207, -345.663613788, 207.906331558, 216.996705178, 697.6802123, -758.74988293, 600.442219936, 1054.83332096, -79.8283446149, -975.899428571, 90.6538234236, 715.694279467, 228.38276755, 1155.40683164, -183.561112584, 917.429297536, -110.499609878, -408.044848673, 304.974980221, -765.200710541, 189.019506406 +571.765205416, -497.919388583, 699.6238095, -67.8238907239, 307.307879101, -542.831238395, 695.530743299, -766.676601361, 200.719256801, 1126.03858005, -117.355527008, 972.879853675, -336.748677912, -1106.42461771, 930.128412237, -756.011444102, -1018.34033121, -772.207411196, -36.7675409774, 1141.76286152, -716.959555444, -53.8351760377, -1111.16512969, 67.9689264793, 325.37313489 +-294.013809089, 1158.26083322, 361.572290348, -758.294003931, 76.0891608134, 718.809121961, -331.188508762, -1141.70508951, -325.528482305, 4.27048781635, -4.14391757503, -709.080577449, -546.521090453, 337.771934686, -887.642359063, 684.480329854, 697.979045602, -738.553323018, 699.891457917, 1037.15635636, -664.508036358, 934.457251845, -1172.75759159, -312.132100347, 913.438889595 +-274.073497512, -222.482090692, 1137.74270495, 789.991192799, 179.717673295, -48.6619157181, -1137.23177091, -702.954296053, -429.596730956, -1039.23088295, 728.179378299, -555.405084101, -790.636637548, 500.857896146, 352.315228323, 40.9460457026, 869.45241535, -199.237928455, -1134.86240235, 103.493771649, -438.598114621, -803.975958733, 27.2920602515, 515.862517942, -34.2084148177 +-729.176759239, -162.659307661, 750.257332563, 832.340187905, -201.420251234, 258.582429516, -173.763276386, 578.525127163, 347.316477022, 258.097690714, 800.667844638, -747.174541366, 363.535101156, -180.821700709, -78.2564926077, -220.53503995, 173.758246648, -517.980089157, -700.745025524, 127.116935857, -814.986277513, -1071.41333977, 1067.69345706, -1079.57303283, 1061.9036404 diff --git a/code/plots/data/bins-convergence/10_10/AEP_opt.txt b/code/plots/data/bins-convergence/10_10/AEP_opt.txt new file mode 100644 index 0000000..b361fba --- /dev/null +++ b/code/plots/data/bins-convergence/10_10/AEP_opt.txt @@ -0,0 +1,10 @@ +372549.831809 +375329.387818 +376342.539758 +377080.162752 +374089.66027 +372166.349709 +374860.749988 +372758.506998 +372028.393156 +372478.762454 diff --git a/code/plots/data/bins-convergence/10_10/AEP_true.txt b/code/plots/data/bins-convergence/10_10/AEP_true.txt new file mode 100644 index 0000000..3928793 --- /dev/null +++ b/code/plots/data/bins-convergence/10_10/AEP_true.txt @@ -0,0 +1,10 @@ +376329.399935 +377227.994692 +379047.169921 +378648.375659 +378548.181768 +374571.783617 +375969.215023 +375782.860782 +374465.140611 +375500.201596 diff --git a/code/plots/data/bins-convergence/10_10/boundary.txt b/code/plots/data/bins-convergence/10_10/boundary.txt new file mode 100644 index 0000000..e609d2d --- /dev/null +++ b/code/plots/data/bins-convergence/10_10/boundary.txt @@ -0,0 +1,10 @@ +-0.000500272396266 +-0.000129933012431 +-0.00104857653741 +-0.000519593570516 +-5.48473835806e-05 +-2.86281685931e-05 +-0.000522781598875 +-0.000726079392962 +-0.000209145752706 +-0.000280449010233 diff --git a/code/plots/data/bins-convergence/10_10/separation.txt b/code/plots/data/bins-convergence/10_10/separation.txt new file mode 100644 index 0000000..e942772 --- /dev/null +++ b/code/plots/data/bins-convergence/10_10/separation.txt @@ -0,0 +1,10 @@ +0.000998186631477 +23311.5680127 +0.00167569116456 +27808.8955086 +0.0256268505764 +0.00181340136623 +15855.6783844 +7586.45988315 +0.0175763690058 +0.00219834216114 diff --git a/code/plots/data/bins-convergence/10_10/turbineX.txt b/code/plots/data/bins-convergence/10_10/turbineX.txt new file mode 100644 index 0000000..a920a3b --- /dev/null +++ b/code/plots/data/bins-convergence/10_10/turbineX.txt @@ -0,0 +1,10 @@ +-961.34707732, 793.578707339, -846.016967553, -524.610456845, 946.931058279, 379.680207723, -728.831860999, -653.303640676, 1057.67095085, 233.067528302, -1172.61294331, -174.77196175, -580.221821374, -310.300519174, 206.259646528, 65.8410151121, 1161.75104145, 8.9572843893, 726.554602531, 607.242969898, -262.727739545, -469.854359948, -98.8350178224, 377.223773811, 573.859236963 +1173.51190919, 230.075437943, -500.878643578, 575.310404933, 107.391607889, -29.6103263307, 151.075180022, -1172.12122313, -305.926448764, -98.8325397895, -186.604931807, 708.918772809, -247.761366933, 334.990775671, -948.384472274, 577.246376246, -389.141993705, -1070.36455984, 847.330651616, -629.223141271, 438.738957755, 833.61411095, -788.846223624, 976.326203652, 1041.1572446 +1044.87264333, 948.629755667, 10.0540665926, -1166.73488231, -374.864885646, 237.733806623, -996.467419401, -119.979012585, 507.644107973, 89.1519144375, 361.446873545, 566.954927098, 840.610462415, -237.944388275, -428.446974271, -1024.5283372, -332.986618737, -724.426978376, 369.490110027, -535.311716557, -590.292516384, 687.996167549, 835.641763393, 1155.82816549, -856.262230999 +-449.853402637, 1166.94612285, 775.56579707, 63.1383200874, 642.533347756, -399.815852672, -106.43844422, -59.103470868, 446.737421229, -1170.31381715, -568.878377565, -1046.82553907, 518.187804882, -959.208158171, 184.457365226, -270.117015173, 1016.95428775, 409.682531044, -847.658721124, 989.394779454, 270.254335635, 75.1479420293, 868.713202618, -803.140239019, -668.369537382 +414.65479351, -742.84601796, 61.2599760945, -340.566827116, 859.512170931, 259.932324755, 546.636702228, 1054.24402318, -992.540585226, -637.958859023, -406.781038846, -48.9702214788, 784.093694447, -1165.07314306, -103.990646111, 1015.7001116, 1158.36865654, 891.788947166, -211.930230114, 258.683676102, -614.761302385, 682.90775504, -445.892647884, -1026.3024234, -814.846361492 +155.548481529, -215.315411941, -254.521822195, 535.223326484, 335.278393388, 1161.42246195, 901.514233556, -420.011340779, -1003.73610598, -711.500599069, 1005.99961835, -537.552716047, -1150.90712515, -331.87494961, 1039.0333446, -677.841346323, -875.782659284, 71.1136555804, 708.048187751, 441.972243502, -534.144616524, 47.3787662004, -98.0435681846, 813.299041143, 205.441559249 +-362.447405604, 306.421582789, 532.334131022, -200.301277775, 1167.08351037, -1038.42259203, 786.8256145, 422.942187617, 613.705354338, 421.910196953, -857.959866376, -501.791180827, 798.906469846, 558.367726309, 25.902830217, -664.444205581, -518.007334071, 937.381626866, 695.832105556, -85.5540452052, 90.4576760056, 1058.12009952, 223.316862524, -1173.27456753, -746.763485859 +455.495707698, 178.348107981, -392.365167998, 175.176900252, 779.833985716, -590.716785929, -120.930758159, 299.009574324, -920.06293449, 319.930134497, -1096.40375285, -241.576076116, 568.924031392, 677.593375064, -681.325817114, 554.246003082, -243.150798657, 893.973792394, 888.419822749, 445.359146816, -1034.55040986, 69.0859369099, -425.006330969, 1125.28479797, -499.664990308 +-655.174367407, 606.43271909, 67.6246018971, 496.698574174, 1169.93767521, -1029.41929056, 2.09436870716, -546.062268943, 315.894251447, -419.936433471, 1029.27928888, 1000.06791238, 485.155923378, -899.544601962, 378.230562904, -220.766756948, -328.823462346, -1138.28561633, 365.258776071, -766.051183519, -102.425042075, 734.834303864, 230.453862921, -877.248751192, 877.579717252 +-256.405839799, 289.439578269, 120.018702654, 927.513083542, -47.320414307, 1052.95074954, 579.58627158, -779.285836956, -266.702621928, 694.714082207, -888.154862578, 102.988037671, -1040.18456478, 896.992026359, 1155.13690699, -1149.21655045, -154.041401341, -562.233149867, -944.923100014, -666.196515203, 862.148774326, 413.870312133, -479.855903971, -402.14198381, -371.836958108 diff --git a/code/plots/data/bins-convergence/10_10/turbineY.txt b/code/plots/data/bins-convergence/10_10/turbineY.txt new file mode 100644 index 0000000..ee61d04 --- /dev/null +++ b/code/plots/data/bins-convergence/10_10/turbineY.txt @@ -0,0 +1,10 @@ +-673.014198854, -864.50558182, -197.383114449, -422.103920625, 17.7669348473, 1110.39584805, 302.498455999, -908.021190894, 397.666887398, 254.67626878, 45.987206082, 241.460018313, 737.374300932, 555.900997845, -928.993869518, -384.512936225, -165.742125025, 782.315454686, 155.731490985, 984.637346683, -630.348413525, 1075.34779628, 1085.50762894, -144.168047269, -680.916459871 +2.3893827455, -921.747481524, 417.789287775, -647.606353039, -642.902913023, -169.613541695, 342.434239008, -57.1640927754, 1132.93645871, -1169.34518263, 644.822742757, 294.584698875, -646.336063995, 1124.68533657, -691.160514456, 667.2636302, -171.816242388, 481.098354231, -811.89097998, 910.817052398, 103.125496791, 825.968238247, 216.014430586, 454.701491574, -365.835442427 +395.282775904, -45.9076843758, 1124.34935202, 125.958751742, 1112.03177569, 506.133230817, 619.82954753, 232.960246118, -571.832313666, -918.675389414, -1116.46412591, 753.097907546, 818.846887324, 601.166783177, 23.356795133, -400.449774353, -503.253865845, -189.990054105, -84.5226053107, -1021.99802973, 605.97607392, 145.643855157, -823.916731458, -202.970794762, -802.465599101 +645.50756366, -123.987602288, -136.487931272, -1090.50316342, -573.195712727, -779.260734555, -562.975196724, 638.797167877, -1085.15565131, 86.6133508258, 1026.4079858, -352.721047358, 35.8893738296, 676.058943838, 1158.92693062, 8.6179453609, -585.610781035, 524.060594409, 317.070679157, 438.210747454, -558.074668481, 283.968997645, 788.969750633, -542.527185419, -964.581812379 +382.841027968, 465.083014691, -379.250364196, -1123.00940764, -416.306650712, 973.154540928, 764.884620484, 144.644278507, 626.098309708, 910.258100267, 246.558071573, -911.951119196, -873.11681857, 140.500844036, 42.1124767739, 401.772079265, -187.931040172, 762.789858419, 939.759337155, -1144.64782821, -365.973429104, 154.935559616, 1085.50249009, -373.085385969, -844.488791216 +-853.84821269, -602.040226932, 468.280171615, 0.816812221998, 468.294913473, -168.029102324, -35.1671473289, 19.8566603501, 607.988312656, -889.31883801, 287.584471193, 1043.15529495, -229.235015578, -1125.60868569, 545.477423294, 616.935079539, -27.163237299, 1124.7014966, -503.821822118, 877.079017136, -322.818069781, -403.789961122, 29.7328621946, -845.979068255, 46.2945597948 +383.967811588, -121.845327469, 731.883108408, -82.7419300159, 122.686579995, -546.639274378, 870.655705264, -432.704306323, 433.87336918, 1095.04688457, -34.4591689584, 1060.82114555, -153.117816017, -933.994487924, 742.895198641, -539.31536514, -1045.98079293, -706.011140702, 156.906087504, 1079.55194897, -661.52921455, -359.087193214, -1152.07061306, -23.7208946514, 382.86261517 +-222.140020192, 1148.10402663, 308.578080523, -791.484659561, -6.77689856458, 751.30942733, -125.623895829, -1134.78174625, -6.86974248193, 272.334211055, 418.371552679, -565.758392691, -540.297720952, 279.030871728, -555.080870648, 786.493350725, 766.866509749, -760.22811414, 766.712341275, 1085.72161707, -553.932632953, 767.386834956, -1093.84895836, -237.811323118, 1061.82448574 +-248.103545368, -234.007343575, 1171.56440672, 917.653724682, -91.5544568846, 49.356854165, -1116.96694803, -644.867821562, -214.399458214, -1095.80532059, 563.666724509, -614.003308237, -631.139341726, 753.628158198, 554.453289965, 118.491373246, 456.448659039, -285.380124249, -1115.22281398, 158.067214545, -220.491275736, -836.177574793, 75.1150235518, 494.585859307, -301.18509216 +-710.458212668, -212.314937521, 717.283072637, 718.926998844, -216.161546296, 283.332624001, -174.171940469, 459.103809474, 431.039570844, 590.992657484, 767.018152867, -718.123178311, 342.026626483, -175.865055769, -206.868649109, -237.565175621, 142.587616012, -689.372098403, -695.885212971, 103.371158119, -796.137856462, -1098.1107792, 1070.92215453, -1102.45985067, 745.064190302 diff --git a/code/plots/data/bins-convergence/10_2/AEP_opt.txt b/code/plots/data/bins-convergence/10_2/AEP_opt.txt new file mode 100644 index 0000000..2ee051b --- /dev/null +++ b/code/plots/data/bins-convergence/10_2/AEP_opt.txt @@ -0,0 +1,10 @@ +303877.694647 +304880.526534 +304517.863434 +303498.303981 +305431.516813 +304409.569947 +302762.791357 +301937.999311 +298540.266541 +302814.597793 diff --git a/code/plots/data/bins-convergence/10_2/AEP_true.txt b/code/plots/data/bins-convergence/10_2/AEP_true.txt new file mode 100644 index 0000000..fe7ec6b --- /dev/null +++ b/code/plots/data/bins-convergence/10_2/AEP_true.txt @@ -0,0 +1,10 @@ +376948.440532 +377006.932844 +377281.805418 +375652.63449 +378254.26705 +377094.239957 +375935.312484 +376853.053263 +373630.138 +377030.99584 diff --git a/code/plots/data/bins-convergence/10_2/boundary.txt b/code/plots/data/bins-convergence/10_2/boundary.txt new file mode 100644 index 0000000..f09ab3a --- /dev/null +++ b/code/plots/data/bins-convergence/10_2/boundary.txt @@ -0,0 +1,10 @@ +-0.00141371811151 +-4.36067598457e-05 +-0.000366280102526 +-0.000317614990763 +-8.44076014346e-05 +-0.000595619686237 +-0.000529597022251 +-0.000128642494701 +-0.000110509585056 +-0.000828541506053 diff --git a/code/plots/data/bins-convergence/10_2/separation.txt b/code/plots/data/bins-convergence/10_2/separation.txt new file mode 100644 index 0000000..2f445c2 --- /dev/null +++ b/code/plots/data/bins-convergence/10_2/separation.txt @@ -0,0 +1,10 @@ +10847.1178937 +10491.9970597 +0.0372604879667 +3.097607987e-06 +0.00107863631274 +0.0661157431605 +2745.10589434 +4384.62897973 +1.20770710055e-06 +2862.30143941 diff --git a/code/plots/data/bins-convergence/10_2/turbineX.txt b/code/plots/data/bins-convergence/10_2/turbineX.txt new file mode 100644 index 0000000..6354ca1 --- /dev/null +++ b/code/plots/data/bins-convergence/10_2/turbineX.txt @@ -0,0 +1,10 @@ +-962.041131452, 856.026505966, -744.297814583, -413.760789741, 927.890715443, 132.009621656, -861.459417651, -595.332019747, 1034.49175479, 125.584889136, -1173.0144065, -270.171169675, -997.142531259, -591.678723555, -155.213769404, -28.4676891339, 1173.04588211, -16.6232952489, 690.9203425, 535.725485279, -294.194151616, -475.695743345, -148.006065733, 269.806109966, 412.456058891 +1173.4566074, 159.341942973, -476.785217392, 283.900083926, -133.796029743, -14.5133538004, 174.877412768, -1173.44240823, 31.4257078196, -248.826882857, -147.404536799, 764.826264914, -630.824054654, 346.646572551, -1037.08635632, 636.044006343, -364.751172835, -971.722933654, 888.765202951, -600.152437258, 501.42234478, 880.399199057, -831.531409572, 1028.01401394, 1029.42893136 +1016.25822221, 431.749204266, -267.890429012, -1158.31667938, -789.039282545, 171.335065875, -1037.81689946, -527.145572048, 322.350915166, 157.220950766, 533.344598863, 581.783020568, 841.022780708, -410.552059534, -257.115592006, -945.904164814, -372.794996509, -672.261280887, 24.61500926, -130.795705071, -916.088791533, 722.096927238, 893.6043253, 1171.37041686, -486.550933459 +-374.655121496, 1172.99615732, 893.041470548, 147.087687669, 551.973652813, -353.256849139, 15.1954753499, 156.786778213, 915.663697524, -964.418681054, -522.142961439, -772.807718417, 534.457472157, -835.10074045, 234.423784108, -161.305252628, 1043.75453577, 342.774044105, -667.433147024, 674.213227933, 414.848432179, 26.298085083, 788.906989503, -1061.12557572, -606.698870224 +444.811349645, -573.837100672, 219.605667413, -508.168078228, 813.181045786, 300.682789224, 584.318382905, 1065.33514518, -977.232702153, -689.604166306, -160.069796486, 57.5896307002, 916.014765903, -1118.67373006, 109.720628915, 1041.36671775, 1164.04076509, 897.70769297, -32.6767771545, 488.487433553, -397.444382301, 717.275990846, -340.607777068, -799.729995073, -904.188805593 +32.1655588255, -374.166371932, -229.482509952, 455.394767541, 475.669964052, 1066.55775051, 790.122322671, -590.557074368, -1005.3302488, -741.256792567, 904.416871086, -376.896974175, -1171.24305657, -220.836195544, 1130.08989819, -713.087289859, -865.977116918, 291.260005031, 653.951115885, 587.175795302, -484.459831871, 137.10699857, -84.7824261608, 526.501952851, 354.639177183 +-436.915246484, 397.056151313, 196.716129174, -231.483101778, 795.453716298, -1034.24091715, 880.748248841, 510.215702976, 636.364855979, 83.2194788286, -902.519886322, -617.151325637, 746.618067459, 614.027664267, -66.5217789123, -630.248361203, -489.266936863, 996.478130054, 307.478456512, -334.174243128, 98.510254157, 1171.43662111, 263.902029919, -1163.69790102, -783.950064767 +507.910284509, -7.60695226403, -153.637252968, 253.48205278, 1048.6588499, -831.965907248, 104.065957848, 363.145169985, -955.346259306, 213.016161515, -1067.74025851, -274.673150248, 392.580381543, 781.466414541, -718.22614789, 636.166619709, -347.760277757, 900.622802039, 922.230711922, 499.728204631, -1095.38387993, 98.0367453016, -426.336302384, 1143.77364818, -523.120808919 +-573.712796705, 560.773066009, 283.461747181, 594.710017376, 1168.70951692, -909.935435574, -27.5853922215, -530.729582639, 283.52554002, -406.51824449, 1026.10766623, 977.624910734, 434.228883364, -1022.45581958, 473.354790126, -231.518735885, -363.529141075, -1157.36624219, 327.586495641, -661.62290997, -113.046968667, 678.143648004, 189.259419234, -783.049795127, 837.645141143 +-344.272266495, 223.520809644, 372.716717696, 947.106222605, -257.625590356, 1063.88078318, 546.375388075, -506.360487123, -0.87374609617, 690.382895926, -825.251895244, -59.6516401138, -944.266488743, 896.372690937, 1132.23520911, -1168.34797194, 122.964427659, -658.676640884, -1051.04301021, -397.448188887, 813.641929739, 355.119888367, -232.107631123, -456.518961038, -116.967049408 diff --git a/code/plots/data/bins-convergence/10_2/turbineY.txt b/code/plots/data/bins-convergence/10_2/turbineY.txt new file mode 100644 index 0000000..62a236b --- /dev/null +++ b/code/plots/data/bins-convergence/10_2/turbineY.txt @@ -0,0 +1,10 @@ +-672.021461073, -802.719023512, -113.578607386, -335.941408083, 169.899306697, 1083.78284321, 188.518041581, -945.837110121, 554.042157013, 56.4882300355, -34.2903078736, 134.203166468, 618.742816485, 367.355009645, -1163.20482186, -564.70198067, -33.1935998054, 683.15272525, -27.3944003809, 1044.09506615, -745.872954687, 1072.77657137, 1089.97418474, -344.693050249, -811.930085821 +11.6401549345, -1162.64613582, 628.878821738, -820.63939039, -552.951373154, -198.164213624, 333.698619766, 12.9926232838, 1101.66753773, -886.267570397, 614.024546378, 246.955788362, -565.999946869, 864.037090455, -549.170114977, 640.325798368, 40.5034859605, 657.944095126, -766.310848705, 1008.44085573, 60.8922772693, 775.908012739, 297.016467613, 399.057524479, -387.771113686 +445.642839194, 30.2528927397, 1142.52819792, -188.253078414, 868.650427506, 730.985539144, 211.177955404, 221.557280614, -393.920476533, -1049.33775997, -1045.31309705, 704.058016341, 818.423259223, 611.682337087, -305.043810948, -694.551519318, -711.39161453, -509.138105692, 286.085075745, -806.451491471, 550.347258816, 249.494632939, -760.662620943, 20.3399500437, -1067.89709369 +572.191969043, 34.8775158076, 53.0004821145, -1106.88471657, -750.518373829, -1062.54318254, -720.386195752, 901.722508341, -733.959058191, 177.174935985, 1048.71402057, -291.780917308, 62.9147523164, 824.465214234, 1149.86178582, 50.7659275293, -357.546806633, 495.908074085, 382.420521172, 486.425734198, -380.314630208, 507.571073706, 864.847159665, -501.147197477, -1004.51610307 +389.590376356, 346.884438234, -325.877230222, -1057.78123376, -386.515926384, 1134.33934815, 946.250401602, 161.55963837, 649.732415545, 859.229403898, 320.929556753, -769.748831309, -733.520865466, 309.961970769, 130.14249962, 420.452503404, -148.812417046, 755.815338725, 877.426402093, -1067.01270703, -360.841502737, 177.727581834, 1113.28189281, -351.075538218, -748.049846518 +-999.675174865, -655.799343076, 595.836574503, -103.957707887, 607.071487346, -489.479834032, -318.377013258, 334.554625466, 605.34872015, -909.766377405, 187.160381592, 1111.34361401, -72.9862450403, -1152.54818302, 316.27951632, 854.804177715, 150.173162572, 1136.79529057, -714.499457973, 945.483356609, -98.6994315311, -335.179477412, 220.700960357, -1048.77624381, 225.702337609 +461.930832593, -73.9945005609, 828.103796434, 8.56901332152, 209.064818296, -484.648310225, 775.511872843, -609.687801431, 672.449449101, 1170.55989033, -36.0238131912, 998.128398909, -80.3056784553, -920.940260585, 765.726857632, -736.540193746, -1066.65545053, -619.812506494, 453.115707538, 826.885329775, -627.333118118, -69.8006790043, -1143.45603934, 151.473858228, 444.201710349 +99.9315470471, 1091.55683843, 64.8346879811, -756.490749431, 81.747804463, 827.628316043, -153.589500029, -1115.91298004, 131.418887707, 338.17799125, 486.89488951, -428.101106646, -375.995871547, 312.829566742, -419.330467272, 731.252332426, 847.406934048, -752.339335619, 725.690295909, 1061.79452855, -421.034558874, 754.44074298, -1093.33132015, -262.521886342, 1050.46680968 +-245.135078687, -335.726964923, 1138.7648266, 921.939650749, 106.084924638, 19.439351505, -1110.69534357, -722.126461569, -321.544505636, -1100.85370679, 569.419835483, -649.142120914, -682.799688626, 575.951408062, 563.625916045, -11.802861174, 462.462244577, -194.009103905, -1126.86422521, 225.93920518, -307.596749603, -881.729131691, -63.0398484209, 474.537624705, -138.665931803 +-689.38243731, -228.206515429, 773.824644999, 692.912432635, -197.748278194, 270.283650955, -219.090406767, 520.376799569, 495.708200502, 529.650517967, 834.323656168, -840.362893714, 479.59108684, -186.728289529, -308.51159693, -109.999387474, 133.38577092, -497.7405056, -521.962696273, 171.233146647, -845.649598115, -1118.49269346, 1150.33168189, -1081.07657381, 824.449066737 diff --git a/code/plots/data/bins-convergence/10_3/AEP_opt.txt b/code/plots/data/bins-convergence/10_3/AEP_opt.txt new file mode 100644 index 0000000..256fbfc --- /dev/null +++ b/code/plots/data/bins-convergence/10_3/AEP_opt.txt @@ -0,0 +1,10 @@ +311458.900306 +309640.22017 +307361.267273 +312329.586741 +310742.958532 +312390.752114 +311606.165923 +308417.26965 +308585.339945 +309343.924406 diff --git a/code/plots/data/bins-convergence/10_3/AEP_true.txt b/code/plots/data/bins-convergence/10_3/AEP_true.txt new file mode 100644 index 0000000..c492ac6 --- /dev/null +++ b/code/plots/data/bins-convergence/10_3/AEP_true.txt @@ -0,0 +1,10 @@ +374548.174699 +372180.23194 +366110.030594 +377031.665321 +374341.633611 +375766.124257 +374360.360241 +373332.013281 +368158.193615 +373011.453062 diff --git a/code/plots/data/bins-convergence/10_3/boundary.txt b/code/plots/data/bins-convergence/10_3/boundary.txt new file mode 100644 index 0000000..3919694 --- /dev/null +++ b/code/plots/data/bins-convergence/10_3/boundary.txt @@ -0,0 +1,10 @@ +-0.00086252347819 +-0.000443468837375 +-0.0021145778087 +-0.000928005365267 +-2.27733576139e-05 +-0.000677950193449 +-0.000141416443284 +-0.000223540544539 +-8.43850298224e-05 +-0.000920406749856 diff --git a/code/plots/data/bins-convergence/10_3/separation.txt b/code/plots/data/bins-convergence/10_3/separation.txt new file mode 100644 index 0000000..093e037 --- /dev/null +++ b/code/plots/data/bins-convergence/10_3/separation.txt @@ -0,0 +1,10 @@ +0.0659830143122 +0.363385853998 +0.06326450294 +0.0171171273978 +4.57162386738e-05 +19246.7923061 +0.00133282961906 +0.333813112375 +0.00105541021912 +0.000230533769354 diff --git a/code/plots/data/bins-convergence/10_3/turbineX.txt b/code/plots/data/bins-convergence/10_3/turbineX.txt new file mode 100644 index 0000000..be317ef --- /dev/null +++ b/code/plots/data/bins-convergence/10_3/turbineX.txt @@ -0,0 +1,10 @@ +-954.198940339, 969.167638647, -823.20877457, -557.285816498, 841.486010861, 322.730379229, -786.760224972, -685.395782255, 995.38743919, 148.258612943, -1173.5064817, -327.319747443, -952.189505311, -802.590050935, -76.7358851733, 43.6770471243, 1134.8482172, -209.574600387, 516.149655755, 626.298133373, -409.52661533, -527.273589145, -88.4662115354, 277.215221468, 625.824393148 +1171.72941458, -116.83881668, -470.370577443, 401.337025123, 92.64881481, -18.7760771211, 168.147793001, -1031.71412167, -277.838985, -164.909913976, -156.329662551, 652.813706809, -338.447659827, -148.539797276, -1111.36570349, 545.40474544, -679.259029626, -976.563687623, 936.509461528, -619.048308068, 278.424208041, 748.556620273, -740.102866646, 1043.8217311, 933.228330423 +1067.50346958, 661.822094903, -110.790124886, -956.380101866, -492.705774496, 172.597949852, -723.45443606, -395.137407565, 296.445868485, 43.7681976913, 178.741253316, 517.833033459, 896.511136258, -263.985227794, -454.120629739, -1082.80349323, -360.509176189, -622.322730695, 129.147330162, -559.084573205, -718.578002494, 784.752486401, 579.524299018, 427.119963611, -831.083438023 +-500.060513058, 1143.74007847, 311.023067168, -148.167467189, 538.332374806, -477.098658053, -320.037303058, 609.057730117, 498.07550508, -922.74965793, -515.130515118, -1092.3997846, 858.01778266, -681.320869704, 219.490398558, -182.180467972, 719.799912942, 431.314932368, -914.079166073, 1146.94556367, 175.78085466, -28.1730675214, 1013.50151248, -1017.20472785, -771.650029575 +374.343077959, -727.546938401, 166.896659707, -475.600134691, 905.851806378, 102.17050584, 545.392426117, 1053.17202276, -976.908235941, -816.216298464, -406.405841753, -132.039683087, 793.970461671, -1107.36116591, -8.9337881729, 1088.06839591, 1161.39458181, 964.567579524, -195.237396714, 388.995451076, -299.607023343, 719.299875959, -522.46209199, -711.623249049, -602.508486738 +-52.6808941088, -670.130755133, -108.46481648, 455.476687294, 312.892111702, 573.188269089, 977.096796366, -553.642528788, -1000.58837032, -461.388386096, 766.274262728, -332.478958962, -1159.18755091, -903.170200377, 1070.58712916, -453.676980714, -821.565064501, 157.915317315, 873.318877351, 554.21135101, -717.696355925, 91.8440751393, -284.524025455, 200.56534293, 307.854044781 +-396.07816507, 137.397280468, 517.81893957, -245.288952339, 1167.24722162, -1113.20241869, 968.447970316, 611.752346261, 784.795075226, 393.594490194, -925.452500845, -549.687670007, 693.634218381, 412.779531247, -35.7967957525, -795.530238211, -428.891921997, 905.61706548, 650.102011748, -156.646702906, 270.722843786, 1066.19029514, 103.127020519, -1171.47947248, -712.871317858 +590.447100508, 144.198853764, -129.329762459, 458.042444449, 850.693153858, -794.009064695, 32.8119070308, 345.575047538, -1037.12549825, 169.228957042, -1061.5069092, -329.79534491, 274.207704354, 769.112218474, -907.725017162, 649.183814327, -285.159490618, 948.121974373, 900.789807669, 420.230022496, -1041.10506546, 149.219530279, -130.639706651, 1088.59996996, -534.055411861 +-543.46527852, 690.528247709, 522.368284912, 540.892306572, 1025.79278952, -944.172741971, 119.307384133, -395.453064442, 347.420480264, -284.110835478, 1109.39960781, 965.11896529, 276.902138418, -877.791465223, 438.225989058, -114.568196402, -408.200898497, -1134.05278246, 381.771650606, -581.147650801, 31.9260986483, 721.526836517, 304.937301444, -741.079104346, 838.366617568 +-224.639641214, 197.945472739, 124.075223534, 949.447121884, -5.58536384887, 1066.15176465, 585.139517375, -621.042397331, -258.792452978, 757.618038145, -803.691140995, 56.4377906799, -977.541380749, 873.911793145, 1136.19408245, -1130.22783976, -108.473248961, -622.514964245, -925.477479739, -504.043898001, 452.577319677, 205.92284454, -504.345686189, -392.065950198, -334.245427313 diff --git a/code/plots/data/bins-convergence/10_3/turbineY.txt b/code/plots/data/bins-convergence/10_3/turbineY.txt new file mode 100644 index 0000000..5e7fd52 --- /dev/null +++ b/code/plots/data/bins-convergence/10_3/turbineY.txt @@ -0,0 +1,10 @@ +-683.110852383, -577.079914513, -295.550807837, -431.524612319, -181.078187855, 1015.45726429, 20.7145227957, -898.998767249, 621.562455202, -76.0127903149, 4.30550362948, -32.6468313093, 685.908977283, 309.371947079, -1171.00279737, -416.060473445, -298.759836433, 626.140436353, -199.259629925, 992.415092919, -696.467071408, 1048.38931286, 1050.44251931, -301.779882047, -809.08586085 +-64.7005038811, -1167.68363588, 659.27876462, -795.411638321, -592.208015991, -63.4973570134, 466.557575513, -28.3577750733, 1140.15017907, -882.205462601, 463.982890374, 328.920124869, -342.440696303, 817.947314819, -376.831782259, 711.61061322, -58.1900967267, 650.737496473, -707.167582396, 889.214842621, 21.4609058667, 903.769263555, 542.63271615, 371.70349987, -389.234842994 +487.414251883, 140.697936755, 863.024372691, 52.9795918259, 1065.07184699, 628.718057452, 324.881129144, 363.283489651, -159.47043596, -837.529345153, -1159.8243052, 504.293011969, 757.23424389, 600.235775721, 21.5377647477, -452.407673094, -523.609164959, -180.847688567, 348.880692696, -772.670350629, 584.835516797, 378.271745315, -1006.99630478, -586.631464047, -828.514645729 +448.194915612, -262.668747149, -196.125192972, -1092.09473149, -744.415302899, -1072.15346731, -574.554030975, 879.671754994, -1062.57117085, 59.4682307257, 755.526756128, -137.55677184, -145.684827448, 955.478907223, 1152.80521367, 69.4252476533, -532.406932915, 175.237066062, 452.291799126, 248.297899589, -848.327172704, 476.069240357, 591.566220314, -585.17555844, -864.053276373 +203.828224262, 386.16859855, -340.575125514, -1072.81891466, -241.179983572, 968.857126864, 1005.76875376, 172.140729721, 638.76786598, 843.164811384, 107.246577152, -783.564053772, -856.479232046, 388.441996963, -124.398153782, 439.594197332, -168.221757335, 668.390063546, 788.350033067, -1107.16685432, -358.622861617, 290.514678763, 1046.13426134, -492.630250123, -760.413892788 +-738.647305104, -488.50767653, 454.359528505, -293.052679112, 669.357399996, -1024.00766891, -259.868495185, 229.771795746, 613.154798268, -1058.14369216, 370.617495414, 1125.43096476, -182.812107552, -749.280369358, 480.603511474, 720.57275176, 101.81956738, 1162.8410097, -671.06347196, 915.4911508, -197.673865003, -139.128094118, -160.703478787, -1038.96848231, 360.959087627 +441.13774764, -198.603854004, 600.241115796, -218.223830789, 121.119072079, -371.371240846, 620.142370115, -540.547842364, 371.229003077, 1058.96216355, -153.167143291, 1036.81216269, -212.000061371, -978.867758748, 706.252011462, -701.54087086, -1092.33128303, -720.868537228, 148.837951136, 1069.20869692, -604.441574437, -225.623454569, -1168.97428337, -69.0783282884, 207.847367537 +50.5277358446, 1061.47893126, 92.9634828381, -668.320246472, 143.334365284, 864.109655666, -117.017478797, -1114.63584948, 148.613946442, 423.508552817, 500.339070827, -436.494132955, -373.891341033, 470.361186395, -318.32673659, 817.673992655, 897.396156311, -691.52051878, 752.13959003, 1095.69288801, -541.513304459, 801.523600222, -1142.19553593, -300.07472132, 1006.29088037 +-174.988307201, -485.01034394, 1050.84122033, 791.501941247, -44.2871546109, -124.150423572, -1145.84453879, -697.517744033, -395.063784204, -1138.6030976, 382.581485318, -667.593678376, -748.673600774, 778.857004348, 467.248310611, 94.2908942675, 335.410756059, -301.761842423, -1106.52202095, 87.2528977796, -287.492568109, -758.499444335, -82.8173224676, 557.701241451, -271.131219536 +-659.180723722, -87.1203864344, 750.943503936, 689.699983777, -248.909369314, 316.645451984, -252.800085878, 664.097998066, 461.689799987, 374.802660724, 855.111950936, -789.143754089, 649.267867139, -119.586802748, -293.600168264, -249.254339779, 173.560351288, -628.203646447, -721.545216551, 197.370873383, -1073.07712028, -1155.30588729, 1059.60904179, -1106.08339992, 862.972534155 diff --git a/code/plots/data/bins-convergence/10_4/AEP_opt.txt b/code/plots/data/bins-convergence/10_4/AEP_opt.txt new file mode 100644 index 0000000..b1f9640 --- /dev/null +++ b/code/plots/data/bins-convergence/10_4/AEP_opt.txt @@ -0,0 +1,10 @@ +399324.092637 +396731.422004 +393713.554625 +397346.832783 +395450.02301 +393936.336406 +395315.527375 +395174.037325 +393088.559146 +398613.113197 diff --git a/code/plots/data/bins-convergence/10_4/AEP_true.txt b/code/plots/data/bins-convergence/10_4/AEP_true.txt new file mode 100644 index 0000000..b801ffd --- /dev/null +++ b/code/plots/data/bins-convergence/10_4/AEP_true.txt @@ -0,0 +1,10 @@ +377937.833936 +377984.895198 +372370.272915 +374997.383321 +374396.677009 +374312.388803 +375790.467818 +376717.920776 +372740.576461 +377147.532862 diff --git a/code/plots/data/bins-convergence/10_4/boundary.txt b/code/plots/data/bins-convergence/10_4/boundary.txt new file mode 100644 index 0000000..b2a863f --- /dev/null +++ b/code/plots/data/bins-convergence/10_4/boundary.txt @@ -0,0 +1,10 @@ +-2.62605453827e-07 +-1.87237674254e-08 +-4.12063536714e-06 +-4.49054593901e-05 +-3.98047177441e-08 +-0.000128338104332 +-1.18660627777e-05 +-0.000150460742589 +-2.97956830764e-07 +-0.000896234743777 diff --git a/code/plots/data/bins-convergence/10_4/separation.txt b/code/plots/data/bins-convergence/10_4/separation.txt new file mode 100644 index 0000000..b5f4e2b --- /dev/null +++ b/code/plots/data/bins-convergence/10_4/separation.txt @@ -0,0 +1,10 @@ +15201.5973292 +12215.7781815 +5205.58374605 +0.00065657486266 +1.32422428578e-09 +0.00169193869806 +1.26862432808e-05 +9142.41944785 +5.53109566681e-06 +6675.56630704 diff --git a/code/plots/data/bins-convergence/10_4/turbineX.txt b/code/plots/data/bins-convergence/10_4/turbineX.txt new file mode 100644 index 0000000..39b8680 --- /dev/null +++ b/code/plots/data/bins-convergence/10_4/turbineX.txt @@ -0,0 +1,10 @@ +-902.107351442, 880.910894022, -1029.12172676, -565.388354494, 1163.17018599, 247.173114198, -945.173700911, -781.642320625, 1003.42514337, 407.684532536, -1123.52912962, 54.3819983559, -483.705441274, -386.905317635, -181.251849579, -69.0981044404, 1051.27059026, 144.644479157, 796.780970511, 606.509436948, -289.950174945, -619.435015851, -40.5794606658, 440.738454887, 310.46942793 +1173.40272599, -583.728185451, -436.169324889, 435.732612192, 173.945174931, 79.1612632728, 2.20587030285, -1173.04966778, -314.799967659, -164.490822847, -145.100214944, 747.313459635, -359.872202922, -79.4796405452, -1079.10744749, 345.220989364, -521.430776783, -981.405237819, 681.922258025, -713.416779974, 345.872052393, 690.627792789, -826.500674941, 1087.40236484, 990.426454548 +1046.6935562, 532.992091216, 4.91222549154, -943.771555123, -335.403762806, 315.807229511, -799.104145931, -270.938995605, 435.043566304, 227.679060978, 333.437571281, 600.656760044, 876.430019208, -83.7869548715, -164.543579642, -1028.29274124, -350.240696382, -558.353361098, 144.784926729, -452.893058722, -884.481305975, 792.955741082, 681.157461337, 937.158090102, -675.88549747 +-366.030388595, 1173.33070575, 836.106668203, 140.19388631, 610.00999713, -461.142613905, -67.9698997121, -26.4511885974, 693.512809899, -1058.30257378, -454.769596312, -881.571856596, 493.799843009, -718.958052713, 169.514972987, -280.039485826, 1032.60471102, 402.520909185, -656.604462516, 1017.65147171, 268.010430964, 60.496104035, 894.336749451, -987.543830087, -720.995174519 +253.769584503, -616.590705495, 111.064512473, -550.934102768, 828.215440845, 58.9070657585, 464.24697361, 982.115454615, -985.482989801, -777.900408097, -262.744667495, -102.874252165, 717.839439817, -1049.95762994, -0.24173560695, 1060.84947944, 1136.33400177, 840.679155138, -194.162157614, 330.145417075, -449.89155873, 630.345954717, -488.35973426, -809.66901768, -680.315680516 +-42.4127334398, -317.734381457, -269.297075606, 517.70813919, 214.97332999, 1093.7579895, 792.553974894, -689.365319576, -1044.00804448, -742.443256109, 851.189454788, -475.216624153, -1158.38421452, -435.114720673, 1111.08884941, -588.470288433, -920.338041846, 309.495281699, 697.562826659, 392.476442802, -593.145597836, 35.2915305833, -182.830954534, 447.291573237, 135.038890202 +-371.128007708, 134.408460189, 340.746708625, -179.21713705, 1069.35533437, -1085.94047529, 794.838584475, 782.744905132, 657.815982963, 212.401741693, -794.588825802, -434.601993582, 635.296145215, 479.059232119, 37.4421737856, -664.216489925, -565.635445911, 1001.33053122, 539.648185666, -220.860194209, 25.6050571982, 899.5776991, 226.366939021, -1151.71766092, -739.895463496 +622.14459277, 9.77351906315, -334.712490494, 443.672883974, 1056.0049177, -830.259684779, 97.2374059231, 535.538957817, -1008.96520516, 281.025013824, -914.891112786, -445.884873173, 346.05131051, 719.99836162, -800.195925725, 532.516067426, -307.887678504, 901.977769524, 854.022785853, 443.81565088, -1082.33515722, -83.7474594246, -76.971649028, 1125.39465896, -533.905266333 +-624.12327508, 626.455764031, 339.571463736, 426.18605109, 1155.79022093, -922.418075966, -81.9067977764, -542.563519826, 291.740642181, -387.226999677, 982.90820782, 1069.74029651, 501.436606672, -1052.03293714, 257.656480179, -235.231065653, -333.495444733, -1158.10793336, 380.747384563, -701.265033035, -129.203048217, 804.016016146, 182.723431037, -792.082060557, 898.781981998 +-285.446571365, 448.00968865, 204.650400093, 863.544053525, -125.065519349, 1134.60110191, 560.371857625, -601.565311382, -220.266260652, 788.623693169, -718.294766767, 263.467934174, -1041.37068866, 963.40790822, 1077.03223577, -1145.58729449, 56.1642739865, -674.639570678, -907.328703293, -531.889075405, 681.133186547, 366.479364777, -344.246510435, -442.824934592, -60.6503458901 diff --git a/code/plots/data/bins-convergence/10_4/turbineY.txt b/code/plots/data/bins-convergence/10_4/turbineY.txt new file mode 100644 index 0000000..48b9979 --- /dev/null +++ b/code/plots/data/bins-convergence/10_4/turbineY.txt @@ -0,0 +1,10 @@ +-562.170435417, -775.326956148, -254.518276346, -312.55396953, 155.470287067, 1042.31921298, 413.61354489, -875.312044251, 608.501334115, 165.578817797, 26.3261361701, 152.183328833, 683.668733325, 396.752806544, -1159.43247266, -319.738779207, -417.590602099, 654.874620518, 160.717181273, 1004.63037715, -825.083410801, 996.71267312, 1042.5494048, -785.936642256, -1131.69988333 +-16.1843824238, -956.900740128, 655.68609889, -767.97752365, -545.798107258, -231.662510682, 218.229588216, 33.0207291422, 1116.98115996, -1161.92885358, 460.081216671, 342.537696152, -450.555303921, 960.647792351, -461.153996392, 967.557855305, 116.139049597, 643.412504386, -955.048650928, 888.935716077, -21.4376215511, 948.772440273, 307.818834457, 345.663663743, -414.917671208 +530.63027786, 136.266333379, 944.061252961, -108.033073819, 1124.56222977, 732.554844049, 227.792371026, 221.75468221, -377.15167008, -816.810584369, -1125.1467805, 549.284654122, 780.38856609, 674.991973184, -73.7861734895, -565.464354748, -735.269856815, -319.762163446, 177.552999654, -1082.60047045, 756.799394584, 331.70410828, -867.301661838, -141.230951794, -930.67958312 +648.078797618, -20.7592576123, -27.1287233435, -992.62750404, -573.099717763, -934.660817232, -566.31957414, 653.938569058, -903.324126108, 124.531110806, 934.858823246, -269.177523461, -26.3067803734, 927.488677561, 1055.4137734, 19.3482235182, -557.55125539, 384.913072937, 369.222990417, 461.726963448, -558.503545976, 362.997780686, 759.801142116, -633.950443993, -925.905967221 +215.980787996, 402.303766026, -325.745738303, -1036.15032987, -312.936434759, 905.308724778, 849.406027826, 165.958949872, 637.149251274, 793.704263245, 214.067516687, -824.376239566, -928.35468989, 144.405128232, 32.5229766827, 415.796702249, -293.054479601, 818.776190295, 720.584012955, -1126.11717651, -221.612758904, 180.998681612, 980.004641381, -411.258995017, -716.893254793 +-853.413181352, -653.709586923, 457.119138822, 73.6701281233, 377.542736992, -425.240350699, -156.070102894, 149.402477106, 535.894684935, -908.798064956, 370.414995583, 1072.98885317, -187.83484889, -1089.86746038, 377.647309813, 769.6433696, -31.9548978137, 1131.96670296, -445.190043633, 803.734804897, -317.27720174, -350.566103344, 76.309967304, -1084.92692902, 76.2003567778 +563.55689497, -248.575300679, 558.754929695, -257.816869871, 391.029689468, -444.824885321, 863.346697404, -782.351183699, 375.52955175, 1154.13231271, -264.670874653, 1090.0720162, -335.165980915, -991.416330733, 767.754599484, -697.066964196, -1028.19864898, -611.942043776, 63.5771427303, 942.036739279, -715.968237322, -141.216368665, -1151.47466403, 17.8196125587, 324.930376382 +81.612323164, 1141.27658783, 2.35580330675, -729.380329822, 49.0907297727, 802.579266562, -214.818931513, -1044.19055642, -4.11843984739, 354.872435209, 328.322445619, -490.543271357, -413.151739675, 367.353993035, -467.283724881, 807.618257787, 884.84420965, -750.714412791, 804.848427121, 1086.35334551, -453.527123952, 717.682306413, -1163.89633499, -332.599989853, 1045.02682244 +-226.718795066, -243.255793299, 1123.31078185, 878.162024425, 203.186754417, -19.6867316296, -1127.64129836, -713.527473666, -263.011898233, -1107.78659633, 616.064628411, -482.484807944, -746.179705362, 519.964028416, 528.711104373, 80.4307507521, 475.077621958, -189.530753448, -1110.03032424, 139.1273848, -234.112546837, -728.903911676, 51.9750026159, 525.017915113, -0.555545626041 +-649.04351983, -41.1479127781, 741.842945879, 794.625485808, -284.052352078, 299.693797495, -414.450155366, 617.394350689, 399.542140684, 300.089592646, 928.003077052, -637.426523256, 358.479523792, -79.4190055229, -465.980986301, -220.827583572, 191.757946427, -602.354477721, -744.239409513, 112.150088802, -910.835534077, -1114.8223993, 1121.88693604, -1086.75776479, 942.438989012 diff --git a/code/plots/data/bins-convergence/10_5/AEP_opt.txt b/code/plots/data/bins-convergence/10_5/AEP_opt.txt new file mode 100644 index 0000000..c9c50e9 --- /dev/null +++ b/code/plots/data/bins-convergence/10_5/AEP_opt.txt @@ -0,0 +1,10 @@ +359286.994694 +360749.014921 +359591.728817 +363494.958704 +362723.723783 +357966.00357 +360676.425243 +361591.731699 +357879.057501 +360665.967577 diff --git a/code/plots/data/bins-convergence/10_5/AEP_true.txt b/code/plots/data/bins-convergence/10_5/AEP_true.txt new file mode 100644 index 0000000..965d2c9 --- /dev/null +++ b/code/plots/data/bins-convergence/10_5/AEP_true.txt @@ -0,0 +1,10 @@ +375353.563556 +378400.557424 +377028.779383 +377735.927934 +379073.775673 +375253.84754 +377012.423577 +377892.447676 +374236.143762 +377398.471317 diff --git a/code/plots/data/bins-convergence/10_5/boundary.txt b/code/plots/data/bins-convergence/10_5/boundary.txt new file mode 100644 index 0000000..74b0389 --- /dev/null +++ b/code/plots/data/bins-convergence/10_5/boundary.txt @@ -0,0 +1,10 @@ +-0.00266416188674 +-0.000261015283741 +-0.00125932121568 +-0.000475955634556 +-0.000508824746248 +-0.00011906069858 +-0.00246687877802 +-0.000672895809657 +-4.0301012632e-05 +-0.0014498382659 diff --git a/code/plots/data/bins-convergence/10_5/separation.txt b/code/plots/data/bins-convergence/10_5/separation.txt new file mode 100644 index 0000000..7e01856 --- /dev/null +++ b/code/plots/data/bins-convergence/10_5/separation.txt @@ -0,0 +1,10 @@ +0.0704127052741 +14154.850604 +2.59877468486 +34819.1069831 +17228.6603143 +10406.7834514 +1877.25551441 +1.00253143298 +0.361750227559 +0.0588654391613 diff --git a/code/plots/data/bins-convergence/10_5/turbineX.txt b/code/plots/data/bins-convergence/10_5/turbineX.txt new file mode 100644 index 0000000..55b4bfd --- /dev/null +++ b/code/plots/data/bins-convergence/10_5/turbineX.txt @@ -0,0 +1,10 @@ +-951.968044404, 775.387828846, -819.158524592, -469.031965558, 970.020432635, 369.251206562, -711.699870608, -580.341224836, 830.515476513, 150.827841128, -1172.34043282, -208.465794264, -916.392943613, -604.922541638, 64.2943626785, -52.7556153602, 1083.39684028, -22.2213714029, 617.421468976, 703.746096822, -294.790937362, -789.452132064, -372.720577822, 269.442655189, 423.560754939 +1167.70212716, 41.0029570139, -553.657657561, 504.479443252, 228.157702141, -92.2920156271, 131.906652394, -1150.1357473, -108.003694935, -367.781993192, -260.874306561, 615.901724033, -531.221974127, 241.44815303, -971.778814968, 488.427129126, -392.289236731, -1012.99412782, 778.335171569, -695.057272967, 369.381119765, 767.077854853, -914.211370265, 952.07495563, 1040.99297528 +1033.97595972, 648.083770365, -66.0808556026, -1059.80662127, -834.358101416, 94.6974857718, -958.568732963, -522.847213728, 325.1729491, 421.731593575, 508.599455891, 462.658892295, 881.494223106, -373.486188741, -226.327241437, -1144.84937487, -67.0954731932, -366.20138444, 221.561076331, -489.920648616, -630.593828161, 746.480871062, 859.183752158, 1172.12747763, -839.98678937 +-353.656144626, 1165.86552109, 805.687350336, 126.345859009, 636.107662468, -387.917805952, -12.5108631829, -25.8834953219, 501.30037291, -1061.31408099, -485.354833093, -565.151880343, 649.631322533, -835.059414217, 378.992644026, -191.08938138, 985.815396198, 533.784614035, -696.233018022, 1007.19384849, 323.694618442, 170.421868943, 856.181071368, -891.794804506, -721.493488155 +160.494297357, -832.740861431, 315.38174577, -400.247793885, 689.210759624, 356.699557537, 733.87616114, 882.931665871, -956.718356319, -589.527484405, -172.75019292, 130.411135691, 855.327085993, -1173.46232193, -32.3484316533, 1167.55917614, 1043.99145647, 1008.43066202, 63.8952887198, 490.859207978, -649.693036726, 509.730955897, -324.391824733, -1033.1845453, -748.780514942 +100.810363222, -280.09660444, -253.978886989, 567.266873169, 239.194540387, 1161.8215209, 846.17435584, -510.66857581, -1015.2652298, -644.240253143, 941.587153121, -368.244164248, -1169.01291089, -351.132294322, 1042.69341811, -652.6970874, -871.431815736, 448.138205346, 715.439507193, 336.766831446, -730.932307944, -3.63230201845, -149.388740736, 814.521002456, 129.451299132 +-446.879862804, 207.285480101, 433.106446906, -333.021054999, 1030.44459521, -1025.2231607, 907.203442975, 522.705552532, 336.297261511, 529.764761556, -921.575911578, -644.134317703, 796.274803669, -5.54768383345, -78.3449688319, -682.191459773, -540.499280631, 910.038387416, 685.500655312, -198.996428269, 99.5269208434, 1165.67116332, -121.837404875, -1168.93252382, -809.54005494 +469.398620023, -12.9010027744, -550.816059539, 22.4367189219, 920.066800137, -645.995024555, -228.900654705, 280.255076575, -1171.10281051, 234.015037148, -982.92288917, -443.534260212, -86.6994208894, 809.340630459, -761.843041026, 662.888383107, -395.055814184, 604.072881627, 967.510784003, 530.58678391, -1033.38849711, 102.629758563, -591.540292604, 1049.19581865, -506.048020637 +-603.234139011, 714.209192968, 428.232286286, 420.017557852, 1172.72297334, -1030.09363054, -80.7111580072, -501.363921609, 323.134813169, -385.636133861, 1010.15507767, 1005.94146751, 444.631821994, -764.636579211, 308.943033763, -158.339367143, -280.988838107, -1141.06206422, 272.230878389, -709.334559425, 13.3630740819, 583.847800292, 176.347550465, -884.429758238, 834.641913609 +-267.636410849, 241.460558218, 265.744605433, 789.62888863, -132.89646432, 1050.54807429, 554.015351012, -504.084224347, -275.171264354, 675.645036092, -767.329668431, 358.649543547, -1061.05311837, 928.931659116, 1170.85628259, -1163.30227883, 64.7151418069, -562.300434247, -884.397699554, -635.259498467, 863.932735554, 476.128994243, -103.264818236, -381.719994478, -396.050454661 diff --git a/code/plots/data/bins-convergence/10_5/turbineY.txt b/code/plots/data/bins-convergence/10_5/turbineY.txt new file mode 100644 index 0000000..969a997 --- /dev/null +++ b/code/plots/data/bins-convergence/10_5/turbineY.txt @@ -0,0 +1,10 @@ +-686.218590682, -713.592494771, -340.062553588, -630.738340854, -61.2048129092, 930.8538318, -29.9928915355, -1019.97267267, 570.221159687, -48.7457983968, -52.4963758623, -28.3207386781, 515.301548423, 303.408626242, -1088.36847095, -648.340555184, -450.986710182, 608.654602461, -70.1126478716, 939.086564521, -823.715371886, 868.274945353, 870.503864028, -411.56504432, -1092.90183175 +-14.1449481737, -1111.20834992, 300.976855673, -708.822569249, -547.214393875, -338.102126246, 458.373948381, -228.464273064, 1168.53396925, -1114.39351653, 486.619421636, 455.359220747, -653.876749897, 902.585095354, -657.861712824, 711.298819593, -120.104433998, 592.434687997, -878.254147616, 828.527259319, -53.1875936621, 888.103327337, 280.608846853, 439.217291529, -377.670378832 +555.004353921, -263.33136197, 1171.652388, 81.3341896284, 825.217388706, 744.317286793, 438.939948319, 66.4154103788, -503.618536788, -794.969377159, -1057.57401503, 531.715363783, 774.663759126, 468.993595586, -190.093661526, -257.79200122, -780.975656661, -562.549503671, 36.147339643, -1066.35669703, 663.715934473, 347.423254776, -799.336707295, 57.0402147212, -819.487184336 +595.640675249, -133.768860097, -137.795113226, -1046.60666827, -634.08035123, -936.132421963, -643.603630501, 824.217956972, -1061.05330098, 100.419099928, 1068.44132844, -277.177286584, 282.386981488, 824.507363662, 1110.63100508, 17.9340208938, -636.634822444, 580.71339184, 362.822652208, 304.981978535, -418.607084948, 291.148013056, 802.552678747, -508.010090425, -925.518317062 +198.56985426, 256.145326269, -311.857375438, -1103.14894808, -310.176893327, 1117.99028908, 802.319887904, 179.848448398, 679.578361834, 985.61982565, 177.217959028, -786.044334126, -803.462196263, 11.1024693303, -309.199057466, 118.075956829, -306.408979655, 600.1698938, 1087.82454563, -1065.92370384, -296.785346813, 193.657535052, 745.67514743, -556.476239397, -836.048855724 +-867.252352554, -627.370632801, 682.903402266, 144.340757674, 404.281437031, -165.247984629, -149.769439281, 108.288469631, 588.534154896, -891.590286932, 168.795282491, 1114.24065027, -102.688268986, -1119.75092799, 538.448078599, 910.425401658, 104.767241905, 1084.57739146, -513.695538313, 724.673570062, -386.174254955, -384.156331204, 82.7166150634, -844.802762532, 66.747406631 +398.146481829, -68.4830319412, 709.814985297, -20.1192393869, 402.446315308, -571.015894864, 744.390939273, -753.861757811, 380.522156008, 1047.13208175, -64.3366919126, 980.931656299, -135.76993361, -752.379526986, 653.54776545, -819.369935789, -1041.6323525, -740.92248196, 164.739628294, 998.775871269, -419.32862217, -135.450226161, -1167.172943, 103.601699891, 384.658329043 +-527.719609965, 1074.934445, 263.174036154, -948.682681288, -132.775838757, 657.115079135, -10.4352453652, -1139.55824396, -75.2013528308, 277.945379842, 641.091943067, -559.427458566, -573.932975308, 230.410868719, -345.697023006, 665.106693976, 725.162968373, -912.509065676, 664.123079779, 1046.71560677, -556.097396073, 700.749217963, -1010.1708388, -525.666819403, 1058.79712687 +-290.374271534, -390.708391415, 1092.59005895, 832.719167958, 43.0907643454, 96.2504903633, -1118.14053136, -761.470068201, -370.743316441, -1108.34140235, 537.975830348, -604.332404824, -636.21580202, 890.206044301, 472.807785305, 78.3079311646, 469.797356158, -274.06807027, -1141.50175157, 91.3153750594, -365.867216357, -949.77101688, 80.8912151795, 523.601249357, 52.7692883986 +-753.997001572, -322.532501538, 888.217339018, 868.114130453, -308.539920508, 268.854521599, -131.871159223, 522.437982579, 399.130165719, 513.302501736, 722.274201067, -716.862109188, 501.300533028, -174.189780857, -78.9399229852, -154.480167424, 162.075348651, -554.642424419, -771.347568572, 140.333263147, -794.201877867, -1072.58436721, 1168.96283404, -1109.69776976, 972.319933247 diff --git a/code/plots/data/bins-convergence/10_6/AEP_opt.txt b/code/plots/data/bins-convergence/10_6/AEP_opt.txt new file mode 100644 index 0000000..baf4618 --- /dev/null +++ b/code/plots/data/bins-convergence/10_6/AEP_opt.txt @@ -0,0 +1,10 @@ +365478.245792 +363539.709783 +360579.038605 +362507.833938 +363748.828749 +360636.545918 +363454.320533 +362866.247447 +360478.158572 +363654.914468 diff --git a/code/plots/data/bins-convergence/10_6/AEP_true.txt b/code/plots/data/bins-convergence/10_6/AEP_true.txt new file mode 100644 index 0000000..6e45543 --- /dev/null +++ b/code/plots/data/bins-convergence/10_6/AEP_true.txt @@ -0,0 +1,10 @@ +380222.443944 +377068.078143 +373314.498539 +376322.570499 +379883.957701 +373156.349027 +376609.3114 +377249.862606 +373989.254309 +378338.417274 diff --git a/code/plots/data/bins-convergence/10_6/boundary.txt b/code/plots/data/bins-convergence/10_6/boundary.txt new file mode 100644 index 0000000..eb919eb --- /dev/null +++ b/code/plots/data/bins-convergence/10_6/boundary.txt @@ -0,0 +1,10 @@ +-5.70971269553e-05 +-0.000806310139296 +-0.000293396860343 +-0.00230051104813 +-0.00054002371985 +-9.94802185232e-05 +-0.00106233972087 +-0.000213806489683 +-0.000699151974914 +-0.000158696781682 diff --git a/code/plots/data/bins-convergence/10_6/separation.txt b/code/plots/data/bins-convergence/10_6/separation.txt new file mode 100644 index 0000000..eefa564 --- /dev/null +++ b/code/plots/data/bins-convergence/10_6/separation.txt @@ -0,0 +1,10 @@ +35375.7979721 +23182.9049309 +0.0333521262219 +0.000289807387162 +3676.92274937 +4.65760676889e-05 +33198.421835 +19250.9825212 +0.0907054135168 +0.0378011257708 diff --git a/code/plots/data/bins-convergence/10_6/turbineX.txt b/code/plots/data/bins-convergence/10_6/turbineX.txt new file mode 100644 index 0000000..02f2173 --- /dev/null +++ b/code/plots/data/bins-convergence/10_6/turbineX.txt @@ -0,0 +1,10 @@ +-972.047948495, 942.099290278, -832.603370286, -411.620052407, 1071.33130277, 199.451010082, -734.09239957, -516.83791154, 910.036788029, 76.5933307557, -1173.22157748, -256.153470471, -987.020839543, -626.174036592, 317.716883478, 195.421969701, 1171.66778389, 12.611104012, 720.671882337, 565.662423711, -116.067840638, -477.621572337, -158.485119864, 482.070429095, 643.492460702 +1173.51341295, -28.6685235961, -608.862291215, 283.89539837, -181.371640344, -44.4379124004, 76.6558294356, -1173.20736991, -163.490642557, -290.862323884, -293.15290589, 720.653634159, -410.168021919, 234.816578216, -810.823310385, 574.398952431, -507.737949397, -1014.7628624, 872.646752143, -704.771027802, 424.720520469, 849.435719787, -879.194403257, 1057.39195663, 994.652499043 +1019.06190297, 445.371414544, -3.04404052683, -963.818534237, -386.323146621, 291.220078358, -702.647559502, -230.694057266, 323.73068614, 32.4931399259, 213.82982541, 557.868806609, 656.331019457, -138.986326291, -263.421444138, -1069.18784203, -337.716358957, -579.812976613, 165.134911192, -448.236406072, -833.720322918, 802.62125453, 545.663804959, 1107.78564852, -707.944559525 +-417.692703609, 1168.02252495, 598.257989429, 141.548553337, 681.096411115, -393.354684667, 0.818971839712, 109.011113308, 738.281566487, -1155.06806443, -553.205676287, -981.858622243, 477.071501383, -918.945008761, 197.325609427, -232.577391658, 1050.87380348, 346.805174067, -793.979217603, 940.722010877, 269.274369418, -107.671865548, 815.496505266, -1003.79509403, -719.601943866 +453.86706198, -635.210926927, 265.070327465, -520.023334239, 881.219054068, 314.89011621, 614.732925334, 993.813764986, -978.218416903, -762.095534193, -232.712448499, -199.973292895, 817.70545213, -1157.17098954, 72.8968556238, 1081.5889715, 1145.15116398, 903.340070988, -79.7586039109, 412.410153578, -358.464899504, 747.471954213, -444.304457575, -1023.34860889, -851.383711601 +-48.6121817681, -315.268998097, -233.154127381, 510.814059429, 375.332339206, 1146.31995618, 784.114908947, -655.073195907, -1053.45979269, -768.330879373, 850.982877823, -382.645927806, -1171.6501073, -437.259801141, 1021.37719372, -504.594320536, -918.233122467, 202.223887957, 660.996735077, 82.8111005995, -579.736666641, 55.1996728525, -117.128753942, 830.571158259, 212.643005638 +-284.392430418, 288.888627449, 605.591783705, -129.459068603, 1155.04824199, -1082.01940159, 961.841739758, 425.174854925, 526.39417389, 472.289520617, -831.115952982, -474.633157857, 693.043895178, 536.665439294, 56.2933024509, -663.405863415, -505.491567921, 956.363125026, 799.226393282, -66.3514709267, 57.9063598575, 1164.92977066, 215.953138262, -1170.83601822, -708.887690026 +659.603712132, 65.4340716609, -161.998865621, 307.561725916, 1037.18425039, -854.17042332, 113.929943402, 404.379640661, -960.385234678, 236.836298678, -1067.46334355, -293.640059754, 491.90241838, 772.110094527, -720.876006799, 604.520045816, -296.440838972, 919.466685944, 906.65046767, 471.639567454, -1104.61495582, -60.5852347134, -431.193612698, 1134.61735951, -537.357361717 +-491.496816635, 700.475448921, 393.990711534, 613.621273185, 1171.36493007, -913.810807408, -302.070153312, -397.271225743, 369.076532376, -647.991737545, 919.297690708, 1006.64508051, 215.014862312, -766.117776012, 289.532599134, -99.8909191828, -223.533057201, -1173.39257179, 106.145226153, -583.190037586, 52.6717124806, 831.199407275, 188.145111355, -667.146823016, 1087.26318995 +-281.016297099, 357.975307999, 242.477072948, 951.876877167, -110.413321808, 1067.07939193, 616.468796578, -570.364237727, -261.86825056, 691.932472983, -860.724447177, 118.793152841, -1039.2457922, 900.759778532, 1160.91272659, -1158.14248081, 9.59414153152, -574.490613083, -948.719731462, -725.182235456, 852.095960752, 251.091127389, -395.074368857, -412.197527612, 114.845062528 diff --git a/code/plots/data/bins-convergence/10_6/turbineY.txt b/code/plots/data/bins-convergence/10_6/turbineY.txt new file mode 100644 index 0000000..e713cc4 --- /dev/null +++ b/code/plots/data/bins-convergence/10_6/turbineY.txt @@ -0,0 +1,10 @@ +-657.46382977, -699.703474946, -257.424403782, -594.941612345, 240.269995091, 1156.44075911, 47.9792416128, -1053.57224304, 740.924384488, -154.460105206, 26.2112583531, 83.3265266391, 634.764329933, 370.119528122, -1129.68662938, -621.788243474, -65.8069299437, 703.207584347, 244.949769651, 1028.18381392, -816.455305169, 1071.92048977, 1162.76324363, -422.883773415, -911.813139481 +-1.48785338362, -1173.16449468, 330.928745568, -976.022140243, -691.05593784, -248.087179175, 298.761889631, -26.8407500742, 1162.07082134, -1024.71478595, 553.735464251, 286.90551083, -494.533953849, 861.2018385, -751.4483979, 621.674129774, -28.5862522096, 589.400026551, -784.617269456, 828.826739566, 41.7566911067, 809.688685468, 185.422799102, 324.432789792, -434.660116432 +581.935333135, 140.670312441, 909.657996623, -150.68235655, 1108.10213213, 717.30586882, 462.021281382, 167.978686884, -302.060506391, -967.543533026, -1153.86862487, 556.153370231, 972.813184183, 467.538165362, -238.69020845, -483.708235197, -656.275717541, -466.559869152, 169.327189237, -996.846877961, 823.649008192, 427.600427938, -930.853924085, -387.230599428, -935.922228932 +639.250731024, -113.399320425, -205.462910363, -972.490957681, -519.721135461, -929.57764438, -546.875269795, 912.251438865, -912.182443206, 108.249051124, 1034.93974856, -348.821369577, 40.2603404006, 729.850232465, 1156.80681871, 12.2974920806, -522.304314751, 422.642598782, 363.12913166, 452.339239109, -508.659014037, 385.721003643, 839.581074324, -607.894315859, -926.989191912 +458.834023285, 403.742427226, -352.117194808, -1052.00362345, -296.655302392, 1130.47789177, 926.899644849, 68.2570430382, 648.248303985, 848.365797004, 113.414389951, -812.037431568, -841.720680678, 16.1482629412, -138.4263994, 455.30479435, -256.446297088, 749.074502225, 825.171834242, -1098.65999797, -407.896403172, 228.581186714, 1086.15351551, -374.763432516, -807.63971363 +-822.231870844, -582.975663802, 537.169268738, 104.138125269, 576.062054504, -250.513638414, 54.8737604272, 187.397249235, 489.767881507, -871.006644254, 381.48031125, 1109.37740152, 66.1208646276, -1089.00861242, 577.862025658, 760.505343192, 7.98454340334, 1155.95908201, -326.978256693, 775.102907762, -308.357269816, -323.156737409, 119.151841302, -829.028125073, 107.034718709 +473.527488935, -137.594997057, 689.696609607, -134.645733914, 207.364589187, -361.390387957, 672.308599222, -645.331833676, 382.245539623, 1074.28092199, -156.531946388, 1073.24722332, -139.010274532, -950.67522069, 723.531757167, -673.206698263, -1059.06294405, -680.077747549, 202.628153979, 1081.72460129, -647.170820235, -141.687572231, -1153.47310297, 79.2417364776, 471.626382929 +11.1528019536, 1086.32152905, 97.9879337721, -757.025018878, 7.24610941741, 804.691760673, -92.6502768632, -1101.64108848, 136.10330118, 399.904329231, 487.502208796, -405.406259214, -373.153278118, 357.667053292, -403.676851023, 741.194348044, 842.646104008, -729.189379834, 745.064311683, 1074.5659658, -396.183918221, 665.945463202, -1091.42474186, -299.632006507, 1043.25594088 +-63.708721679, -314.714890449, 1105.3997451, 945.339585445, 70.9958112938, 2.17255310793, -1133.97140197, -389.920369792, -314.724192147, -897.466987892, 725.395420557, -603.16101864, -765.716974253, 888.931653634, 684.202473798, 246.149708547, 585.146489993, 16.9169860704, -1168.70410184, 282.956740922, -109.420451965, -808.013248248, 240.260128622, 579.090154762, -292.638991666 +-722.006098099, -208.643783648, 749.300354976, 686.342736365, -244.046743781, 253.185970746, -180.694648356, 630.803023416, 397.051416103, 510.610764848, 797.677460511, -747.198378469, 325.881130132, -184.74162806, -171.515763393, -189.320517092, 165.150458224, -689.747112159, -690.700217611, 102.363821605, -806.582282415, -1146.33732996, 1105.01227817, -1098.73977733, 1135.964916 diff --git a/code/plots/data/bins-convergence/15_1/AEP_opt.txt b/code/plots/data/bins-convergence/15_1/AEP_opt.txt new file mode 100644 index 0000000..bb6cc49 --- /dev/null +++ b/code/plots/data/bins-convergence/15_1/AEP_opt.txt @@ -0,0 +1,10 @@ +437353.312949 +433657.165403 +432798.963074 +430233.529217 +435509.625732 +420755.590306 +434263.889557 +432020.489498 +429548.907775 +427583.325813 diff --git a/code/plots/data/bins-convergence/15_1/AEP_true.txt b/code/plots/data/bins-convergence/15_1/AEP_true.txt new file mode 100644 index 0000000..89e9198 --- /dev/null +++ b/code/plots/data/bins-convergence/15_1/AEP_true.txt @@ -0,0 +1,10 @@ +379177.635336 +379137.749537 +379955.072708 +378354.475858 +380443.452546 +374464.554018 +379674.196959 +378893.60642 +377964.171865 +377464.580894 diff --git a/code/plots/data/bins-convergence/15_1/boundary.txt b/code/plots/data/bins-convergence/15_1/boundary.txt new file mode 100644 index 0000000..8279741 --- /dev/null +++ b/code/plots/data/bins-convergence/15_1/boundary.txt @@ -0,0 +1,10 @@ +-0.000264548401901 +-0.000389355129983 +-3.538551573e-05 +-3.70466100321e-05 +-3.12677002512e-07 +-4.95899760153e-05 +-0.000390375734469 +-0.000138083242746 +-2.4883404194e-05 +-5.0080616802e-05 diff --git a/code/plots/data/bins-convergence/15_1/separation.txt b/code/plots/data/bins-convergence/15_1/separation.txt new file mode 100644 index 0000000..e5c2390 --- /dev/null +++ b/code/plots/data/bins-convergence/15_1/separation.txt @@ -0,0 +1,10 @@ +0.000956172283622 +1.36927556014e-05 +0.000258107902482 +0.0346953927219 +3.69422195945e-06 +0.000441610070993 +8326.173038 +0.12505173785 +7.56918307161e-05 +0.0541885483544 diff --git a/code/plots/data/bins-convergence/15_1/turbineX.txt b/code/plots/data/bins-convergence/15_1/turbineX.txt new file mode 100644 index 0000000..1dde00a --- /dev/null +++ b/code/plots/data/bins-convergence/15_1/turbineX.txt @@ -0,0 +1,10 @@ +-917.627720185, 844.904394259, -1042.6037677, -612.708091802, 945.394647886, 402.041158441, -738.738349626, -485.401109517, 1066.79779819, 259.742347259, -1146.24348737, -202.539414287, -848.917984429, -313.952190874, 7.95332137113, 127.505601832, 1173.42508071, -0.201363786046, 543.305546703, 666.512858822, -350.064488088, -444.798364028, -107.353372053, 392.531340608, 703.708090966 +1170.40188998, -572.17376449, -570.056471931, 445.200015276, 182.665428002, 25.916079897, 163.023744938, -1035.46716261, -271.94760352, -142.552084771, -165.989431367, 788.810335425, -469.071765147, 270.17457284, -940.05545001, 680.780678304, -383.928605033, -1144.2612678, 704.79996674, -680.057110545, 404.120260354, 574.340207337, -851.782911883, 1070.0376727, 905.844185492 +1123.69220166, 582.430584331, -57.0684542758, -1019.1219691, -450.356676249, 301.800903913, -920.706086413, -300.490507422, 466.618190154, 29.0688987636, 286.675893052, 692.458102182, 798.400571326, -171.396379008, -135.356141298, -1110.7748299, -287.561432702, -437.642765074, 169.785226743, -578.823896, -812.209990202, 1012.04891006, 543.496389781, 882.785853795, -820.76604405 +-332.020381552, 1109.16789928, 459.691911368, 12.6562687867, 719.44996681, -420.259226802, -98.34791413, 345.251871093, 576.536371214, -1020.48942636, -473.370237097, -908.027817754, 582.378087375, -854.11656272, 240.565677816, -220.693334906, 1005.17217275, 464.910226022, -637.971576599, 952.448604774, 268.646206688, 51.168453324, 839.85734021, -1126.59973772, -757.606857635 +398.825793027, -813.030167816, 287.415419164, -570.409137777, 827.093446173, 203.054096646, 515.7297896, 955.878632531, -1062.25630263, -703.370867858, -308.833228684, -298.462043903, 678.228797166, -1168.53737357, -28.9092538659, 1064.35997529, 1166.54405506, 797.26184002, -145.148203331, 142.598276084, -432.939929811, 647.395728033, -429.307341213, -1057.34277137, -878.229504457 +54.8750438249, -481.355777343, -244.42760334, 547.115437034, 444.013620513, 1126.25362693, 835.574815396, -641.462317457, -989.68195911, -602.242090843, 937.612802646, -359.281367555, -1169.91548865, -715.849812902, 1120.79841487, -748.958544359, -879.547919214, 203.173001542, 663.989278982, 333.135541953, -342.561053747, 202.472129615, -126.095099992, 712.145170559, 51.3225633103 +-450.887879769, 304.067689307, 188.29619909, -234.871755173, 888.193831955, -1033.72713422, 774.297214241, 755.505576107, 487.791486673, -34.4426378543, -897.086950235, -593.431643385, 687.407200554, 446.052760359, 76.6464243711, -755.847992308, -412.131565612, 1048.81986716, 599.860902925, -335.644642528, -120.225551249, 1147.02433378, -11.9320258751, -1155.43285844, -786.96345317 +576.705590148, -33.2480175363, -450.480999622, 389.536813393, 953.280604661, -849.497939908, -200.848809135, 407.724842934, -965.84142192, 196.156573983, -1097.50826671, -568.033048263, 286.89857549, 857.510774604, -790.660217872, 743.537300326, -333.600356329, 741.417829674, 1073.60752192, 402.750643068, -1065.70306689, 80.0231544442, -77.7819554102, 1015.31992256, -592.385454683 +-753.076190101, 382.802751725, 604.639231138, 885.02241701, 1038.00257015, -1172.01745281, -203.351140885, -499.844376119, 121.409635884, -640.458473599, 1145.12202671, 895.989057649, 252.487749155, -977.916982854, 495.698272946, -330.325537717, -449.36933892, -1076.81647052, 121.863650326, -582.678770374, -115.985474511, 602.733071069, -23.7277847017, -794.276066625, 752.987995206 +-162.944212605, 374.999213273, 213.78290748, 935.873357168, -30.9370285204, 1046.07187348, 614.959080235, -731.626245019, -253.622729965, 716.872041307, -842.8765461, 259.40870604, -1109.64519988, 906.924690213, 1159.27082742, -1153.26604641, 101.283049186, -591.587401236, -968.197850492, -378.105311383, 779.393264942, 499.42611865, -381.365009292, -491.412047963, -521.755817493 diff --git a/code/plots/data/bins-convergence/15_1/turbineY.txt b/code/plots/data/bins-convergence/15_1/turbineY.txt new file mode 100644 index 0000000..853490f --- /dev/null +++ b/code/plots/data/bins-convergence/15_1/turbineY.txt @@ -0,0 +1,10 @@ +-731.50217178, -527.587930816, -211.55032495, -436.285577743, -110.43485788, 896.792623752, 76.0735681152, -987.616371057, 488.956401488, -265.919524912, 251.51895163, -20.2063910587, 810.231292706, 488.153139651, -1173.48745357, -794.677269195, 14.4735992403, 706.71086856, -99.4188593989, 965.865729581, -538.580692037, 996.568592046, 1168.5939269, -850.520031703, -939.111718659 +-85.4179216191, -905.750681788, 481.316725119, -952.710079832, -978.957061185, -339.714410456, 443.715989574, -270.642121333, 1141.56929152, -971.625379021, 652.47625098, 79.1628003803, -540.269037288, 843.187899187, -702.44692691, 590.554298215, -117.969487492, 260.388364444, -938.29254836, 956.377654809, 239.179087885, 1023.36182668, 147.970692507, 427.884192476, -468.005167544 +338.307174007, 293.729962714, 1167.18385987, -66.7181989138, 1083.65804391, 1134.04237556, 299.968445041, 462.444306669, -227.566563203, -1173.1542731, -1137.9599649, 622.617020639, 860.053735344, 688.131922022, -150.472378367, -378.569899966, -1109.08876174, -436.339125393, 187.185556629, -1020.83244073, 776.762640902, -291.90422242, -1040.07094666, -773.191460131, -814.056926646 +502.185926462, -246.522743486, -415.247853686, -1173.44608384, -648.899145538, -1016.36316868, -634.49363609, 706.962780057, -1022.12607296, 292.861288289, 1073.80468981, -187.688901759, -29.0515974714, 804.748915329, 1148.59220332, -24.3052963685, -605.611102559, 427.452813936, 99.1789455166, 355.659982751, -1127.95777337, 289.946376902, 819.619160324, -328.49506771, -896.196270509 +119.289257711, 424.676076693, -437.404225346, -1025.5580467, -502.652060813, 955.908891461, 830.240313772, 35.7181067127, 498.745866289, 939.364313702, 375.199818723, -883.851497707, -957.67509641, 107.964337597, -40.271380781, 491.332276961, -127.713974393, 861.109429767, 1111.69040546, -1126.78684324, -239.785311003, 259.497817905, 1092.16807241, -445.714094171, -778.362916524 +-754.988508849, -465.835395398, 592.496956716, 33.4034110048, 560.822154447, -329.679808003, 46.6932181572, 191.912557618, 630.607285294, -696.023623248, 534.486998587, 1117.16284109, -91.8351549968, -929.889749774, 347.774074947, 894.801907759, 87.4364997008, 1155.79267601, -511.553003164, 854.786710628, -221.290576154, -286.551743571, 85.4742256407, -932.729945661, 454.598848086 +475.209018986, -346.574528617, 159.048355401, -262.713393439, 342.448089755, -555.467571822, 875.931492897, -897.968771242, 533.503931654, 1173.00916983, -166.948879854, 1012.4106109, -443.172162593, -1064.91190448, 695.036544973, -897.680249499, -992.411377444, -526.415414933, 38.7991822638, 911.662117362, -712.889164082, 247.933834948, -1173.45373816, 205.210871848, 446.918902613 +0.678731115761, 1173.0432566, 66.7168090278, -745.950827462, -131.265553925, 701.846028249, -237.074845238, -1100.40737487, -94.7910126585, 154.955172554, 415.465420484, -588.364068338, -301.217145562, 329.240895278, -867.175030695, 907.903174771, 657.257020647, -883.169043559, 473.817244838, 992.094728341, -491.338161439, 673.382701434, -1170.93375581, -588.439837321, 1013.02289751 +-469.005205761, -88.4721188823, 1005.75708147, 600.311261197, -201.357216413, 59.2540319883, -1155.76131452, -757.220096588, -103.771173346, -983.335566166, 256.576376965, -757.851914579, -729.952097463, 648.70198709, 682.887696772, -63.8445855055, 838.830414642, -394.204903028, -1124.77346512, 252.134529972, -232.298301616, -959.734470062, 1025.56727872, 464.647609358, -127.228355966 +-745.545846241, 186.440580291, 788.515219752, 708.00914619, -402.6736325, 416.406158367, 76.1467471828, 163.218781259, 602.23052514, 529.667451277, 687.798789776, -845.762959318, 381.868484564, -119.66115766, -182.282888911, -217.056239107, 192.733899583, -533.10113205, -663.120589832, 36.1702548738, -877.315239895, -1060.3305657, 1109.81828349, -1065.66884669, 599.991249818 diff --git a/code/plots/data/bins-convergence/15_10/AEP_opt.txt b/code/plots/data/bins-convergence/15_10/AEP_opt.txt new file mode 100644 index 0000000..78eb844 --- /dev/null +++ b/code/plots/data/bins-convergence/15_10/AEP_opt.txt @@ -0,0 +1,10 @@ +365258.584885 +366212.7927 +364601.459252 +364298.378843 +367556.19554 +365484.396479 +364406.058482 +363488.248145 +365139.362922 +364510.59715 diff --git a/code/plots/data/bins-convergence/15_10/AEP_true.txt b/code/plots/data/bins-convergence/15_10/AEP_true.txt new file mode 100644 index 0000000..38e97d7 --- /dev/null +++ b/code/plots/data/bins-convergence/15_10/AEP_true.txt @@ -0,0 +1,10 @@ +380697.841497 +380639.91859 +379887.845915 +378768.116822 +381766.406411 +379614.388552 +379776.022822 +378477.025711 +379551.283594 +379125.263625 diff --git a/code/plots/data/bins-convergence/15_10/boundary.txt b/code/plots/data/bins-convergence/15_10/boundary.txt new file mode 100644 index 0000000..0edf034 --- /dev/null +++ b/code/plots/data/bins-convergence/15_10/boundary.txt @@ -0,0 +1,10 @@ +-0.000442712363565 +-0.00036967361325 +-0.000282546370045 +-5.41604542832e-05 +-0.000530240015451 +-0.000801562201332 +-0.00180889607691 +-0.000920599366964 +-0.000315104184892 +-0.000219580146904 diff --git a/code/plots/data/bins-convergence/15_10/separation.txt b/code/plots/data/bins-convergence/15_10/separation.txt new file mode 100644 index 0000000..7939877 --- /dev/null +++ b/code/plots/data/bins-convergence/15_10/separation.txt @@ -0,0 +1,10 @@ +0.0221461772016 +7550.26385741 +0.0151761484449 +5376.54716213 +2444.05115537 +0.0755604166916 +11272.7623626 +0.0490712972241 +3423.28414474 +1413.45745865 diff --git a/code/plots/data/bins-convergence/15_10/turbineX.txt b/code/plots/data/bins-convergence/15_10/turbineX.txt new file mode 100644 index 0000000..26586c8 --- /dev/null +++ b/code/plots/data/bins-convergence/15_10/turbineX.txt @@ -0,0 +1,10 @@ +-892.150090271, 983.025961972, -1106.29398027, -659.954733266, 910.231711996, 277.126962408, -770.383710929, -497.456619557, 1043.67693664, 130.854344472, -1168.18277814, -249.426195502, -927.112430709, -462.562987112, 31.6688515055, 57.6555231696, 1172.20957298, -51.4348420022, 620.069509384, 716.866452939, -348.680322218, -600.299262909, -153.803317605, 382.034184853, 504.041330594 +1173.3984953, -668.385154722, -486.465585712, 194.398482184, 333.633404546, 34.8090535394, 127.934219906, -1169.36797194, -368.36966574, -148.833157053, -86.3150118462, 700.542591072, -279.595670756, 236.213708049, -1026.91003625, 561.368387125, -604.905137408, -1092.55101038, 817.762449258, -754.516223765, 440.486826864, 821.026698605, -877.397266654, 1068.53003478, 900.289175757 +1052.87244236, 580.72345425, 18.4482239419, -924.612700943, -768.333838576, 145.73086369, -1040.466443, -651.066686753, 404.744604382, -107.28953657, 223.164041164, 679.835977452, 764.078371537, -139.549228001, -252.931049499, -1080.97881562, -573.506845034, -273.189188535, 276.248512435, -426.958700072, -488.9912292, 1162.97532638, 561.84254471, 1028.42191013, -735.588039247 +-484.552220398, 1173.30993814, 692.59522643, 56.4538809428, 577.242073879, -364.975506676, -352.039478698, -35.4382790888, 575.250895488, -1081.7279754, -592.340644138, -937.226713194, 416.014240651, -821.064309236, 180.33327451, -263.257512205, 1041.70329413, 292.222080788, -753.254235782, 1073.51621424, 166.267009302, -157.728236861, 796.829594091, -1055.94231715, -746.981845089 +254.050377167, -862.731121667, 437.991446487, -102.952753957, 767.610540911, 149.137589735, 644.798062953, 902.253943482, -970.162960236, -679.414702953, -548.441391118, -363.932688963, 579.87569822, -1168.74877608, -48.436975149, 1173.45302978, 1030.59736947, 1021.9664436, -172.842530302, 201.579165964, -740.557482817, 355.303139189, -277.202826593, -1091.87259627, -655.733993822 +121.897458852, -463.40150437, -315.509721392, 640.036361592, 122.030018982, 1083.29791079, 871.058506368, -627.761583124, -1058.39559376, -767.984410602, 993.726200936, -426.728792957, -1152.10946963, -354.561030661, 1163.16632427, -765.438759893, -893.200025066, 455.199396619, 800.733208412, 709.721462348, -87.3690012876, 355.147394881, -209.915533239, 466.032049656, 259.957820426 +-396.54263431, 120.852271994, 376.781432227, -307.188248314, 1119.50259598, -1106.29320115, 862.145173597, 506.433554587, 780.932002344, 296.242651856, -780.788621676, -528.578948656, 628.24810833, 307.511501677, -95.709038036, -898.255228441, -610.770447182, 927.72967255, 482.308729842, -216.106516261, -219.959797749, 1161.39115614, -104.389705837, -1101.86611927, -675.511625081 +478.782640778, 9.47027314718, -282.546485738, 399.052295463, 892.565662821, -865.388399886, 45.4776167143, 572.94910605, -1036.12992861, 168.452547329, -1110.35724876, -444.79537934, 360.89332635, 799.984944036, -721.941674457, 693.845537574, -376.953438363, 930.91573356, 1026.0549417, 320.805357169, -932.762162307, -105.89332964, -89.9244246789, 1164.36743126, -630.038931602 +-585.481816531, 773.290355572, 111.544894595, 608.914381832, 1173.40939482, -980.883949742, -205.494792434, -367.9866018, 327.2459158, -753.599294174, 1009.55767445, 1041.92360347, 264.694074412, -1084.88463175, 497.794819127, -243.27981481, -366.643676764, -1054.98772674, 107.250222892, -887.333922831, -60.4919147392, 552.802588201, 395.853461339, -742.422636497, 898.504713761 +-382.70179571, 319.833183003, 186.064850883, 907.714120855, -62.1846239171, 1020.36386873, 574.691449562, -631.736709385, -121.283614385, 666.447300042, -992.745716011, 203.475093283, -1111.21154237, 866.334235794, 1131.52479464, -1141.413896, 37.7072362701, -723.207165358, -851.442667796, -501.118966561, 748.476646981, 440.573494268, -523.190941767, -293.355424132, -230.193335263 diff --git a/code/plots/data/bins-convergence/15_10/turbineY.txt b/code/plots/data/bins-convergence/15_10/turbineY.txt new file mode 100644 index 0000000..ffe0a3e --- /dev/null +++ b/code/plots/data/bins-convergence/15_10/turbineY.txt @@ -0,0 +1,10 @@ +-762.367924469, -640.933937798, -391.472187076, -486.489723548, -27.8126286735, 1140.20518153, 17.842165709, -1062.86075344, 536.539244796, -26.6752627399, 111.736963065, -38.5498324579, 719.443862625, 324.261761718, -1173.08706852, -487.388377777, -55.3288841964, 671.371629233, -198.413546116, 929.106235913, -586.420838276, 1008.35345816, 1163.39178983, -93.8221906836, -1059.75391608 +-16.4885416307, -964.571330398, 563.151288327, -1157.30079148, -683.873551851, -284.388490228, 497.928035129, -98.5623388191, 1114.15283399, -1088.17103077, 722.929689129, 297.30914141, -611.574210676, 1061.30777043, -567.971727497, 926.389962907, -176.292386049, 428.33221183, -841.665463916, 898.799844345, 84.087396693, 838.481913578, 212.715143504, 485.159255402, -362.391099467 +518.26261111, 154.669591238, 1173.36935659, -54.0159599245, 887.017012565, 710.901067062, 542.739116219, 344.355077587, -257.176946017, -1168.59953563, -1103.37069384, 644.711156481, 890.685208395, 536.486015957, 143.192257329, -456.750156053, -513.552365837, -482.472433698, 267.221480981, -1093.08835875, 1063.47849388, -13.8451123666, -1030.27642392, -565.229621107, -914.355591386 +394.149758192, 21.9042864495, -124.839779294, -1172.15565848, -666.362096943, -977.083147164, -540.553972842, 966.584063375, -1022.85014833, 454.973060476, 1013.04908711, -160.022373077, 253.326709379, 838.120500339, 1159.57570015, 52.653887923, -540.361130801, 534.966822929, 366.297036765, 474.024083432, -789.866175031, 427.41988694, 841.509481056, -511.978275599, -905.071278253 +441.264052107, 121.718674712, -515.29749565, -1168.9901054, -531.55488887, 1117.75444707, 980.495574275, 46.7955213343, 660.242279575, 956.834130513, 129.496014937, -827.321954097, -1020.23532741, 105.654197565, 61.4026708027, 12.0204775082, -561.253022847, 576.819320576, 649.803536278, -1120.3118027, -500.133501035, -8.75924390525, 1140.30457883, -425.39613979, -973.215712095 +-963.979396016, -639.54474568, 569.551747666, -5.29005705495, 801.21792468, -451.223942316, -202.996416817, 259.604002807, 506.889080548, -874.960910351, 477.955316978, 1093.17827609, -223.113828609, -1118.66991282, 155.499444276, 831.199179492, -199.323597965, 1081.63279696, -791.38673678, 861.381146248, -295.221775279, -360.212788814, 47.5444821059, -1077.00976078, 203.871519808 +415.319052977, -199.256728984, 700.179271475, -115.8626824, 351.925328678, -391.473368367, 796.142459478, -683.012618771, 359.02394135, 1135.50888519, -54.9847936557, 1047.73151705, -311.279924084, -1132.50736822, 514.555260617, -755.166802802, -1002.04622745, -718.648430308, 201.133106978, 1083.64163332, -574.101854065, -168.245822861, -1168.86214666, 403.768765515, 382.929786997 +-92.2607925728, 1173.47614073, -73.1295352287, -769.85130204, -69.6722258108, 732.205089772, -274.850548201, -1024.14160225, -48.7143950735, 330.461966882, 379.79355504, -762.974787782, -439.145369101, 331.715428644, -466.989232981, 946.421820278, 930.480599973, -714.51535395, 569.514903373, 1070.68861896, -712.103082945, 660.286427639, -1170.0641972, -146.241366485, 990.043862001 +-164.32495949, -479.326012896, 1168.20110154, 1003.17455144, 15.6979639, -145.94888305, -1109.10938809, -544.116002919, -234.841171587, -899.568849965, 598.271951586, -539.936211256, -657.928748249, 447.394004596, 651.355629866, 108.271779662, 721.162759974, -513.942635857, -1168.60314217, 268.516947513, -222.272699321, -1035.15502685, 184.9141391, 908.815058065, 95.3769795702 +-650.47844024, -16.936633667, 917.950962501, 743.768129149, -578.66778382, 327.750719728, -238.519074932, 551.738837026, 500.836162229, 466.518085544, 625.773067367, -974.545083417, 76.1070609942, -284.586554768, -311.10696597, -272.598990461, 126.035018721, -496.988426504, -807.577582912, -23.8490954003, -900.81720427, -1087.67247051, 1050.4319689, -1136.25649716, 972.68657429 diff --git a/code/plots/data/bins-convergence/15_2/AEP_opt.txt b/code/plots/data/bins-convergence/15_2/AEP_opt.txt new file mode 100644 index 0000000..68931ec --- /dev/null +++ b/code/plots/data/bins-convergence/15_2/AEP_opt.txt @@ -0,0 +1,10 @@ +295686.60356 +295188.631508 +292978.430086 +294736.219533 +296564.134628 +295746.217728 +297778.342239 +295647.002731 +290788.609068 +294074.122975 diff --git a/code/plots/data/bins-convergence/15_2/AEP_true.txt b/code/plots/data/bins-convergence/15_2/AEP_true.txt new file mode 100644 index 0000000..7f245fe --- /dev/null +++ b/code/plots/data/bins-convergence/15_2/AEP_true.txt @@ -0,0 +1,10 @@ +381598.465231 +380713.165357 +378925.200119 +380245.913024 +382070.541058 +380474.366502 +382598.309358 +380199.216972 +377374.217705 +380163.457682 diff --git a/code/plots/data/bins-convergence/15_2/boundary.txt b/code/plots/data/bins-convergence/15_2/boundary.txt new file mode 100644 index 0000000..bbe5966 --- /dev/null +++ b/code/plots/data/bins-convergence/15_2/boundary.txt @@ -0,0 +1,10 @@ +-0.000863780513328 +-0.000394512560888 +-0.000130700883574 +-0.000513894214464 +-0.00041143998169 +-0.00358373829067 +-0.000206004604706 +-0.0012096575399 +-0.000884415230757 +-0.000220647230208 diff --git a/code/plots/data/bins-convergence/15_2/separation.txt b/code/plots/data/bins-convergence/15_2/separation.txt new file mode 100644 index 0000000..1eb8e50 --- /dev/null +++ b/code/plots/data/bins-convergence/15_2/separation.txt @@ -0,0 +1,10 @@ +0.00767450347485 +8222.77035883 +5.12888364028e-05 +0.00213755587174 +0.0151582289982 +0.0238989313948 +51721.7366882 +21330.039192 +0.00018810830079 +0.00693598126236 diff --git a/code/plots/data/bins-convergence/15_2/turbineX.txt b/code/plots/data/bins-convergence/15_2/turbineX.txt new file mode 100644 index 0000000..49626b0 --- /dev/null +++ b/code/plots/data/bins-convergence/15_2/turbineX.txt @@ -0,0 +1,10 @@ +-899.849545497, 973.518435845, -1114.6550258, -666.699011447, 890.866152921, 249.084203037, -793.999377946, -428.228562708, 1034.0455224, 91.5079829635, -1165.8153583, -187.72855913, -975.330709807, -466.941867645, -17.0587241385, 219.601747752, 1173.50081107, -79.0813462746, 613.401171872, 672.026670864, -297.652542913, -609.892123838, -196.798138442, 359.456192971, 525.822840979 +1162.40528855, -406.80173698, -581.598463744, 462.909227516, 192.693616468, -4.01142044679, 111.698032825, -1138.26194457, -322.296481989, -90.3573192306, -182.882042833, 633.379138095, -453.221546526, 206.267591639, -748.372097586, 534.356374455, -495.05655868, -1033.04567591, 781.663931431, -717.377249298, 362.706023983, 765.649846769, -907.788591681, 1097.47136235, 938.653429208 +1153.27889976, 641.075975124, -23.8631529851, -883.578961927, -727.817449588, 289.411350178, -970.056956945, -379.632544896, 517.081076714, 102.816683126, 411.54380431, 630.602132839, 756.546808365, -281.926488623, -517.647722388, -1109.73197415, -355.376951846, -430.459213015, 162.564186353, -198.628040859, -1021.47110797, 888.275141565, 756.989967038, 1040.59880593, -789.561973649 +-410.455560083, 1155.1322974, 654.732925155, -153.356504189, 500.582090036, -514.392435898, -170.320125999, 13.9887358905, 760.389578042, -1101.62728215, -535.111671452, -959.173268403, 513.504412051, -811.263752111, 295.23766596, -266.559121558, 1062.10253381, 414.3476555, -713.044167217, 846.737978555, 199.601899101, -96.7061070847, 929.690120226, -1040.69405154, -794.493216855 +358.973292117, -806.310276164, 277.833208136, -481.760639504, 828.484990374, 197.188516879, 493.059035668, 943.031790772, -1043.99371095, -672.567955651, -520.608475367, -199.591786178, 621.343345574, -1170.37820359, -13.4451638528, 1045.41879683, 1164.24081027, 791.279867831, -62.4502774944, 183.022366378, -352.299560834, 684.824863484, -302.270557058, -1121.48795252, -830.837034978 +34.0854057988, -180.525870156, -374.998268294, 727.623744791, 15.0044517169, 963.918965498, 866.263971954, -818.892993718, -990.393703267, -431.107183688, 1173.22377923, -250.61725855, -1048.82337551, -644.456073073, 1064.52415138, -675.639602663, -1173.40090418, 247.78564799, 432.418351524, 582.265590742, -522.457050285, 222.080251984, -103.922691205, 563.630753856, 394.688514911 +-498.836396843, 15.5910253376, 313.795441046, -332.867905803, 906.104429308, -1110.37889474, 649.731290277, 978.872342266, 101.269225654, 219.480219711, -719.21106262, -629.329150034, 565.435875203, 656.425295424, -110.888594468, -814.878993663, -470.555254084, 1083.60598379, 786.165212754, -214.861226426, 388.437716632, 1163.04673156, -117.864365511, -1168.86199586, -1013.37078829 +532.453156155, -178.649207095, -464.457063143, 172.717376535, 941.246268974, -974.023641315, -123.833432412, 475.096270237, -1173.19749586, 63.7136639873, -1086.11594387, -581.104607324, 357.743830361, 647.042762045, -1114.53228318, 757.824670825, -331.433542967, 816.817183418, 1060.35844028, 256.171151275, -851.720191516, -33.2847321739, -262.648777381, 1129.78160685, -651.216279524 +-529.871873878, 653.266226321, 616.545670384, 594.007473381, 1173.486993, -1172.62136204, -132.036458703, -384.708915359, 361.05216446, -506.99805078, 1032.70218102, 1033.00079814, 265.732909016, -1015.96649138, 494.609994423, -233.138481612, -335.405607726, -1073.91716949, 158.965619647, -628.045242928, 29.0824936144, 769.291532941, 147.912824818, -838.508323754, 903.600152828 +-281.615657876, 339.318729478, 192.391139575, 727.677648135, 68.2251073952, 1053.76890711, 587.313486497, -781.646231238, -184.852967866, 684.068196855, -997.942921535, -28.5296885298, -1148.72258249, 880.49347465, 1135.66570331, -1132.0709672, -71.144715351, -585.998083537, -892.984422661, -477.593258263, 769.416429038, 291.600117172, -699.883466546, -536.322539436, -301.569918019 diff --git a/code/plots/data/bins-convergence/15_2/turbineY.txt b/code/plots/data/bins-convergence/15_2/turbineY.txt new file mode 100644 index 0000000..6bdfcae --- /dev/null +++ b/code/plots/data/bins-convergence/15_2/turbineY.txt @@ -0,0 +1,10 @@ +-753.264386418, -655.284526677, -366.988109609, -470.536519635, -46.8669684102, 1146.77506333, 44.0787744112, -1092.59152945, 554.874958305, 15.5942135072, 134.203491531, 3.60947688901, 652.584720661, 347.75581376, -1173.39084016, -589.192536889, 5.67257390025, 676.989619761, -79.6796127135, 962.037472345, -542.209170236, 1002.58043605, 1156.89564265, -23.8947100458, -1049.11784791 +-161.092404151, -1100.74895739, 297.139390836, -1078.35566769, -1131.33013233, -45.7257146812, 468.807001431, -285.474835301, 1128.38862234, -1170.03059902, 860.187578595, -326.623538346, -632.952273664, 880.480646328, -903.922094506, 735.776077902, -114.000602541, 556.734061115, -875.293108887, 928.712203198, -233.204296392, 889.334734586, -28.917542485, 415.563189108, -433.747938864 +216.988427575, 261.611062293, 1173.27173918, -224.442890496, 920.552923339, 758.749080066, 214.55966522, 437.935034096, -513.815987643, -1143.87700964, -1098.98482842, 669.631559654, 897.091311606, 849.497502433, -45.978733031, -381.616086532, -891.371847839, -474.364119745, 133.075161362, -1156.58238783, 577.696002812, -135.791988448, -896.717406398, -542.485122478, -844.640309896 +342.963636586, 206.894406686, -398.616846364, -1163.45079209, -903.840046886, -1054.7683744, -689.712474773, 765.96658023, -893.836481838, 404.417219856, 1044.40959438, -190.599498615, 82.8991276473, 847.931040555, 1135.76879216, -253.801066589, -499.073885055, 559.338277797, 364.457658392, 300.551644976, -839.632031832, 395.616642649, 716.10989245, -542.302637807, -863.664592447 +320.685816224, 424.052846678, -469.176353358, -1070.06662307, -554.824025047, 1019.78442692, 944.097345799, 4.35866971544, 535.923452457, 961.659608322, 279.692939404, -915.480035542, -995.524307198, 85.7365345866, -50.4364752356, 533.137876356, -147.238730265, 866.609921072, 1033.48706917, -1155.77441333, -395.398483395, 125.019707867, 1133.91738664, -345.544499929, -828.76191803 +-1056.85160533, -600.668401161, 557.307749855, 451.791914181, 913.295398652, -669.325156443, -259.252112736, 312.83631005, 629.490572622, -832.119281252, 26.1686414349, 1146.44106352, -526.410206616, -980.72034214, 493.895367319, 959.504508296, -16.317676809, 1147.05632359, -652.12539355, 1018.87327279, -97.5046318132, -209.331904297, 233.123426043, -1029.2989284, 397.375998232 +291.832763557, -574.810786305, 523.170954829, -442.697345723, 745.728444233, -379.729673565, 977.233412369, -647.259541205, -87.9367100725, 1152.8071649, -419.800294973, 990.495207529, -398.797146553, -864.776185561, 707.819203313, -844.457291846, -1075.04145406, -289.929418181, 256.641756363, 1153.6770104, -1107.3626805, 156.391329044, -1167.58035978, 104.391641729, 591.790143684 +-184.5888966, 1159.8363976, -67.1621787045, -1016.65523638, -43.2494245002, 654.533408059, -537.672094569, -1073.04217814, 27.2741839315, 96.2827497717, 315.610607689, -672.55459039, -577.342660838, 349.741997313, -367.360520454, 896.01266861, 574.766687261, -758.46686544, 502.768271728, 948.005179346, -807.285136307, 580.876172892, -1143.74476909, -317.38344554, 976.244759497 +-270.990098246, -391.450924524, 998.502869211, 710.096349858, 8.01995271133, 45.7724863532, -1154.18936157, -563.464745695, -277.842393022, -1058.34263792, 557.370858658, -556.817467562, -778.575026005, 587.322747478, 242.661706189, 28.5867435296, 1124.56172999, -473.115217089, -1162.6978117, 224.085931042, -99.7507155712, -886.187623858, 427.91226217, 397.300120061, -40.7969891612 +-777.593970899, -100.193792294, 1119.1641488, 920.663419583, -424.096883338, 516.436835956, -185.306529936, 400.662293646, 596.805607051, 417.471439562, 617.451311797, -890.764895834, 239.943405702, -245.762937232, -295.634178001, -309.113772127, 119.025899595, -634.935087921, -678.253837636, -61.0829984877, -886.078021679, -1136.70808184, 941.965577491, -1043.78836395, 1134.10383924 diff --git a/code/plots/data/bins-convergence/15_3/AEP_opt.txt b/code/plots/data/bins-convergence/15_3/AEP_opt.txt new file mode 100644 index 0000000..316df1e --- /dev/null +++ b/code/plots/data/bins-convergence/15_3/AEP_opt.txt @@ -0,0 +1,10 @@ +307889.73557 +305335.581161 +302963.042595 +305886.47724 +306892.581458 +305050.262678 +305644.160743 +306023.426905 +302739.9006 +306059.03594 diff --git a/code/plots/data/bins-convergence/15_3/AEP_true.txt b/code/plots/data/bins-convergence/15_3/AEP_true.txt new file mode 100644 index 0000000..2e2f4a7 --- /dev/null +++ b/code/plots/data/bins-convergence/15_3/AEP_true.txt @@ -0,0 +1,10 @@ +376869.806211 +373150.88931 +366272.212151 +370898.209763 +376229.524451 +367747.189166 +370965.318653 +373445.742465 +364393.50008 +374862.805198 diff --git a/code/plots/data/bins-convergence/15_3/boundary.txt b/code/plots/data/bins-convergence/15_3/boundary.txt new file mode 100644 index 0000000..5506591 --- /dev/null +++ b/code/plots/data/bins-convergence/15_3/boundary.txt @@ -0,0 +1,10 @@ +-0.000604186305509 +-0.000122285714042 +-8.56510921494e-05 +-0.000296056883599 +-0.00232223783178 +-0.000228382972637 +-0.000543338215721 +-4.66229234917e-05 +-0.000119991378597 +-0.000959407054097 diff --git a/code/plots/data/bins-convergence/15_3/separation.txt b/code/plots/data/bins-convergence/15_3/separation.txt new file mode 100644 index 0000000..e8ea0c9 --- /dev/null +++ b/code/plots/data/bins-convergence/15_3/separation.txt @@ -0,0 +1,10 @@ +2298.41875013 +4052.34231271 +0.00191265094327 +0.000870224932441 +0.00269627651141 +0.000435106645455 +0.0370640967885 +0.0106459998351 +0.650118269477 +0.0144347354071 diff --git a/code/plots/data/bins-convergence/15_3/turbineX.txt b/code/plots/data/bins-convergence/15_3/turbineX.txt new file mode 100644 index 0000000..c692d24 --- /dev/null +++ b/code/plots/data/bins-convergence/15_3/turbineX.txt @@ -0,0 +1,10 @@ +-962.629768663, 944.601960209, -1033.01600197, -734.495025453, 919.560691423, 442.762289556, -911.271445035, -478.564221979, 1022.42371702, 30.1700827779, -1173.50926623, -340.219279931, -1031.66221377, -527.741958298, -78.580146568, -75.8726325414, 1128.68007666, -199.490679693, 632.987903181, 332.438130233, -447.882525945, -632.660552433, -89.3600661864, 329.106517552, 710.71214835 +1173.46770608, -454.492863268, -623.360952598, 407.465654322, 44.4426419643, -128.327398238, 29.0211345414, -1018.64623469, -265.623517138, -139.576667061, -259.49713771, 673.673150956, -335.55700442, 2.10311308264, -1103.33225094, 562.688160718, -527.205990264, -1022.51673869, 798.139032873, -734.357278079, 213.447203174, 687.665757152, -834.745067, 995.145088678, 794.461056021 +995.707747222, 561.129688786, -61.1072789159, -751.395777937, -531.012651246, 194.680128994, -585.630142252, -325.752929769, 395.034009848, -290.256382981, 373.332350193, 562.560214033, 785.6037177, -142.576680602, -213.713566625, -1087.71483881, -283.647578458, -483.86913896, 294.826965481, -487.8438608, -688.79928047, 776.647624427, 681.59469922, 167.153727216, -766.332916863 +-317.393626276, 1042.53441907, 662.072471152, 165.282534996, 624.816098922, -488.749163567, -21.8796782854, 66.2500486584, 788.62527669, -840.301419905, -439.453972596, -810.649698891, 630.642842156, -694.875062906, 213.359255112, -194.974610858, 1009.07467968, 495.334070357, -608.761275953, 911.302072916, 335.586668569, 37.1917908655, 947.585764289, -914.952889311, -747.839178046 +305.789329818, -763.864894342, 158.8277347, -576.826339252, 870.856373627, 245.340463675, 507.209729672, 979.787911232, -967.493269465, -745.78474077, -374.547034303, -336.291519242, 664.818494217, -1089.98823114, -126.190964666, 1081.4864698, 1155.3699894, 802.33117363, -18.0376963492, 279.601924325, -364.69024485, 635.482430745, -401.287366393, -888.337354099, -901.522009354 +-74.886751718, -565.53158298, -586.268677802, 389.38609477, 276.480037484, 1065.73826386, 764.828355434, -569.538582712, -976.135106961, -597.505518954, 825.745719331, -583.820788346, -1168.85543901, -732.74143467, 1132.56739144, -698.824119419, -889.327112107, 112.588754027, 691.446840535, 162.766629655, -402.882079714, -11.2103719916, -259.78459964, 669.601075082, -9.19506344007 +-368.742581109, 377.497688159, 493.683616667, -281.446653776, 1073.48963575, -1093.68307008, 960.011589752, 663.372174573, 714.141593124, 249.502469287, -834.674297557, -439.79628431, 724.060630073, 664.953118245, 338.105658503, -700.279354258, -541.704969057, 999.656861055, 611.122913904, -126.695160179, 340.127087362, 1013.44753981, 395.975569937, -1167.22860087, -735.047869435 +673.167757855, 144.386525189, -119.115319301, 441.905886478, 960.206890303, -795.65767166, 28.0570778258, 594.347787166, -1046.24582026, 104.513583704, -1072.93323755, -453.248838229, 292.92137712, 725.098889256, -837.367670132, 616.377947297, -333.651806263, 987.197388939, 954.657085351, 497.761300267, -1053.49958161, 113.41510917, -145.828248261, 1084.15423661, -587.310806539 +-395.710471305, 681.36070405, 590.011126603, 687.510249679, 1052.02391111, -916.052137847, 126.378182132, -198.496518087, 375.642289767, -364.264981472, 1166.57428874, 986.233321967, 422.986985747, -865.445074652, 648.191808234, -24.0398610249, -324.068830504, -1099.86266797, 438.775290456, -453.062024701, 137.798860971, 726.552484335, 260.269377548, -629.958003252, 929.977902584 +-210.770539233, 241.584212637, 169.836377037, 961.343096458, -37.0548097726, 1081.71030202, 632.234678795, -612.252005731, -257.890955027, 734.373572166, -755.695298157, 119.775576993, -985.537245921, 891.016390061, 1129.01819713, -1138.96857343, -105.453621496, -677.531452777, -969.742240823, -435.708931276, 596.136245581, 273.631457069, -416.523494209, -512.56716914, -320.816790018 diff --git a/code/plots/data/bins-convergence/15_3/turbineY.txt b/code/plots/data/bins-convergence/15_3/turbineY.txt new file mode 100644 index 0000000..753a40e --- /dev/null +++ b/code/plots/data/bins-convergence/15_3/turbineY.txt @@ -0,0 +1,10 @@ +-671.178000335, -696.321371588, -272.430941643, -530.871098951, -95.36629186, 840.608274891, 37.0632206387, -1071.50034155, 576.00868944, -51.5789121895, 3.4515576746, -86.4682203998, 559.293280475, 288.452448367, -1170.88055743, -684.926549889, -321.276507358, 722.420259033, -171.970837933, 1125.44258585, -571.436098212, 975.125560578, 1150.14110455, -188.423277316, -820.451431623 +-10.4632024962, -1081.9299496, 638.537300015, -861.72737999, -476.470759136, -14.1880934005, 507.347550595, 104.535207909, 1142.315239, -804.95374534, 837.098276915, 348.23513001, -276.197776891, 893.822619995, -399.742266171, 687.859217805, 38.4626654258, 575.84322274, -860.296600348, 915.344366806, 68.108727353, 950.921506349, 373.549640253, 520.296346209, -437.966235732 +621.049253065, 277.415300909, 988.863099599, 59.6771034, 1046.49962568, 620.645885497, 353.853156207, 374.716861567, -88.4600968757, -1125.43273505, -1112.546112, 628.538863986, 868.542989919, 579.746018639, -140.816652175, -440.468297679, -499.594472392, -315.895685778, 272.220312187, -728.544360238, 688.487122127, 481.003842302, -955.282458157, -590.322588273, -888.746201173 +417.895836716, -183.732194256, -355.25919557, -1161.81679712, -645.853668221, -882.629068525, -707.103051112, 656.991072847, -869.026009258, 175.218965102, 994.246768399, -132.023078247, -61.199665137, 945.666242518, 1153.9559073, 67.3378015715, -565.786325156, 421.904237441, 307.637018724, 307.633256199, -709.024120557, 398.619981644, 672.346671435, -630.562978037, -904.363052917 +315.472673395, 468.778207189, -364.854538405, -1021.96279768, -188.4670685, 933.574827996, 866.095814543, 186.803170065, 664.14811605, 906.058000461, 154.716406651, -845.402706288, -967.033192504, 434.812146213, -109.470764074, 455.552804382, -205.563512695, 856.388508245, 845.164463253, -1139.71890811, -374.278374404, 27.6231035253, 1072.48150393, -419.250860749, -751.261735204 +-781.458704424, -436.550643911, 463.243801206, 19.0804330746, 350.534592402, -337.687295681, 109.206524575, 150.453564148, 632.336704852, -694.577131088, 445.958789524, 1017.98316032, -104.46482369, -916.638491502, 307.289762406, 757.427217892, 147.074810985, 1168.10088297, -220.403919452, 850.027429779, -198.657592251, -52.4219614903, 138.252520169, -963.727308045, 207.570228713 +408.825603429, -267.066642777, 532.486732767, -278.89954513, 230.984985361, -318.070831379, 674.917613828, -585.572975446, 320.870014926, 1128.30730519, -159.737329192, 1087.98672921, -256.65125869, -965.083587137, 740.802771659, -834.960852813, -1041.00514584, -614.672593555, -10.2091357831, 1009.46863001, -524.367002784, -146.652968052, -1104.6898084, 121.303586624, 273.642764383 +43.5153637249, 1082.12119379, 87.4416901127, -669.452524476, 107.935538608, 860.436533225, -126.895209711, -1011.87282489, 191.354738355, 443.697925043, 462.013193255, -615.129461767, -313.064310067, 354.681753031, -372.46261859, 815.632608934, 948.597044087, -578.193941809, 682.470367691, 1062.71806655, -516.985999005, 734.812344698, -1157.48024292, -241.44644915, 1015.97342811 +-267.618891843, -587.890912158, 1014.40764573, 706.620283758, -147.213968642, -195.299678531, -1166.42490756, -737.619509427, -555.039995935, -1115.54784764, 127.437528932, -635.987338616, -810.859628371, 531.223796944, 407.488198188, -72.7398538004, 354.986655043, -409.191892283, -1088.39901585, 93.1426159047, -339.121824493, -874.680533823, -90.5722179196, 288.14036427, -376.790583133 +-626.112643172, -54.7867631387, 707.074032806, 673.019571303, -332.289827945, 312.416182055, -183.750688215, 676.134967085, 471.895112436, 473.171222249, 897.808762428, -784.899068195, 637.065352695, -208.916795586, -320.084064355, -282.645948264, 161.96618264, -610.788407428, -648.556662251, 246.405927229, -1003.20691739, -1141.16684105, 1097.10713893, -1039.4081465, 855.362974146 diff --git a/code/plots/data/bins-convergence/15_4/AEP_opt.txt b/code/plots/data/bins-convergence/15_4/AEP_opt.txt new file mode 100644 index 0000000..15f36d0 --- /dev/null +++ b/code/plots/data/bins-convergence/15_4/AEP_opt.txt @@ -0,0 +1,10 @@ +388200.890734 +389345.005883 +388016.564825 +389122.3847 +390234.878447 +392433.602188 +391178.185492 +390213.763083 +386074.031468 +390060.270221 diff --git a/code/plots/data/bins-convergence/15_4/AEP_true.txt b/code/plots/data/bins-convergence/15_4/AEP_true.txt new file mode 100644 index 0000000..ecdb987 --- /dev/null +++ b/code/plots/data/bins-convergence/15_4/AEP_true.txt @@ -0,0 +1,10 @@ +377920.321669 +377431.574105 +377522.213093 +377952.368902 +379802.358792 +380249.07877 +379440.492203 +378413.611635 +376655.374179 +379616.656983 diff --git a/code/plots/data/bins-convergence/15_4/boundary.txt b/code/plots/data/bins-convergence/15_4/boundary.txt new file mode 100644 index 0000000..732272c --- /dev/null +++ b/code/plots/data/bins-convergence/15_4/boundary.txt @@ -0,0 +1,10 @@ +-1.90061655303e-08 +-5.55643925964e-05 +-6.944077154e-05 +-1.93489358935e-06 +-0.00133313715651 +-1.38264947509e-05 +-8.67173889674e-05 +-3.54806638825e-06 +-3.379732334e-06 +-2.37617891798e-05 diff --git a/code/plots/data/bins-convergence/15_4/separation.txt b/code/plots/data/bins-convergence/15_4/separation.txt new file mode 100644 index 0000000..41630da --- /dev/null +++ b/code/plots/data/bins-convergence/15_4/separation.txt @@ -0,0 +1,10 @@ +777.996371649 +0.0505258381163 +1.16839801194e-05 +0.000175221357495 +2839.41117193 +22845.5406255 +55098.3310231 +0.000441344585852 +1.14960130304e-09 +7283.28715604 diff --git a/code/plots/data/bins-convergence/15_4/turbineX.txt b/code/plots/data/bins-convergence/15_4/turbineX.txt new file mode 100644 index 0000000..6a9170a --- /dev/null +++ b/code/plots/data/bins-convergence/15_4/turbineX.txt @@ -0,0 +1,10 @@ +-899.571335555, 1013.14885968, -1036.87793696, -620.553341613, 908.833638442, 305.871175911, -866.595662956, -443.973807653, 989.879977387, 178.591623772, -1127.39214294, -198.397436856, -939.482771153, -427.552672897, -0.325442827599, 103.183402292, 1168.62857817, -71.7915408272, 639.33206588, 723.002502173, -322.595210295, -494.716131699, -157.467051319, 440.115343931, 776.38652829 +1153.97586119, -706.641733507, -606.947568186, 431.447189427, 343.361523128, -136.321384545, 122.443231827, -1163.60012792, -275.266580704, -304.510009281, -224.494932498, 686.490741605, -593.442261457, 189.118911561, -1029.05375569, 628.766801302, -508.868901362, -1107.1379779, 831.22178683, -806.914054151, 268.062632755, 860.101947686, -905.937069519, 1098.40895812, 940.780009682 +1144.50317874, 521.581376711, -78.3754365538, -928.603923359, -463.753606495, 393.101585894, -798.059997072, -392.786882064, 297.73192005, -178.566127009, 187.070422057, 467.454272167, 921.864016585, -12.2651255055, -185.667024837, -1163.28241946, -445.384595147, -604.050394675, 144.265250682, -750.37628452, -872.104450399, 850.990708557, 679.732411971, 778.362207642, -1026.15761038 +-417.210986275, 1143.33309238, 564.599277018, 149.827987273, 643.945494288, -482.378191909, -240.922870155, -108.836154862, 738.824855128, -1152.74546384, -535.847169717, -918.054929735, 468.914021307, -859.355523576, -37.8279030131, -338.730333396, 1041.73871378, 409.728877918, -792.095871408, 983.944801711, 231.234283061, 17.9767492331, 903.520031013, -1009.23175263, -736.976888876 +353.659359187, -799.038818993, 266.492896226, -483.685459896, 789.987336093, 267.718510679, 513.855659918, 989.227281363, -1070.56394684, -692.630934929, -429.677626956, -194.474503817, 584.053261935, -1157.00441322, -7.65291989671, 1061.27269482, 1117.23479034, 777.353642541, -103.962798986, 160.329804654, -326.823644097, 611.624882672, -361.412782261, -1031.1347444, -733.808832719 +-52.7960332144, -560.234846816, -307.420076095, 728.816970054, 263.760395937, 958.265498254, 1173.30911183, -666.570720089, -1063.12986368, -462.241580514, 814.347981614, -377.940401251, -1134.39283483, -912.910901555, 1093.55527772, -736.605568833, -1007.49644484, 119.784023707, 510.106190122, 527.510971055, -152.101116716, 177.726004717, -225.096632156, 605.801153922, 328.350380694 +-410.663902416, 201.742800102, 314.987906618, -335.781502483, 1108.6918903, -1104.54246504, 833.516120617, 734.438572298, 765.267565639, 230.3958928, -844.027837872, -559.918404858, 598.188663911, 379.587390194, -105.689413876, -725.42882867, -520.674473929, 1031.14579487, 393.083447253, -205.19528477, -84.7050247089, 1169.5086093, 19.0155384471, -1173.17839757, -789.193648351 +705.274105015, 139.707914232, -403.495290272, 194.986635808, 1172.45621183, -854.075972356, -105.585510589, 433.152457667, -956.55709804, -10.6806483069, -1107.45477518, -464.835355993, 301.022695931, 620.261377639, -715.551019613, 544.896998839, -324.702317299, 785.094275941, 973.758864659, 460.388340337, -1052.0474501, 65.587738152, -203.020006948, 1036.41466513, -620.297417941 +-577.307148139, 600.604544448, 351.866162154, 567.004244018, 1170.96247177, -945.118993179, -307.130738369, -490.250543198, 246.733184127, -770.708071554, 1084.27836538, 1041.16465827, 324.099699701, -984.414834438, 170.716616799, -218.723223827, -290.199730757, -1149.4683374, 45.6054422605, -651.405255185, -116.438431761, 685.543179245, 102.203748208, -732.07964657, 840.532871274 +-325.527688633, 256.296438016, 375.224428449, 885.180962484, -192.902069946, 1101.1661895, 619.796479534, -644.076947562, -253.043540059, 671.858841664, -859.564563388, -69.6255319029, -1083.98976639, 907.000982028, 1160.85575172, -1147.12612168, 191.905108386, -576.394239662, -849.95734872, -738.081888756, 802.676425558, 362.124777083, -434.942504296, -435.794200595, -38.8837124534 diff --git a/code/plots/data/bins-convergence/15_4/turbineY.txt b/code/plots/data/bins-convergence/15_4/turbineY.txt new file mode 100644 index 0000000..3d69878 --- /dev/null +++ b/code/plots/data/bins-convergence/15_4/turbineY.txt @@ -0,0 +1,10 @@ +-753.596247234, -592.169975359, -268.497353982, -492.43833691, -136.714588303, 988.66077256, 361.423929575, -1086.28870458, 589.579169666, -50.8137783435, 127.670672783, -25.6663224673, 703.212638066, 318.469724676, -1107.79184735, -463.04084832, -106.972603456, 621.291033114, -98.448487126, 924.339371359, -610.380974178, 1064.13901377, 1032.18518113, -309.670565964, -826.790015002 +-213.250144526, -936.906284546, 576.026463457, -984.377362888, -534.768479987, -232.014079447, 473.719038609, -152.219080532, 1140.7735225, -829.121707212, 544.703972425, 33.9391114261, -419.104259138, 897.664758395, -564.078275778, 644.749498816, 23.9764904593, 357.203713894, -828.375661186, 852.071359222, -102.880640029, 798.348639411, 79.2589824785, 413.078421991, -362.070772888 +259.322932447, 281.701965303, 1028.21264045, -42.7086484672, 1077.9928078, 716.379359557, 440.516887316, 743.047440965, -472.024971693, -1159.84921126, -1158.50790122, 1058.83356945, 726.156100002, 606.201987291, 89.5874683368, -154.628278029, -800.197336719, -244.920447033, -73.8388470048, -902.259012456, 785.219536284, 394.139656491, -956.608469706, -509.219043942, -569.329828796 +464.495641762, -151.355146054, -272.123136741, -1163.91042058, -659.145215752, -965.957529363, -562.524065574, 839.35958614, -911.742137419, 219.803975365, 1044.03242425, -109.484790727, 193.392913484, 783.035631764, 1172.90448975, 67.7994690407, -540.292835433, 798.146603524, 345.381027826, 398.519905131, -616.426967227, 402.754196823, 748.857426485, -581.203462164, -913.23653091 +194.082698632, 355.528682868, -561.626779025, -1069.19941844, -619.701751741, 949.587771704, 847.371365143, 160.681340669, 480.654604334, 947.311369051, 145.102372337, -967.593678359, -1017.84994405, 49.5763713748, -139.176129049, 500.835487081, -359.057791698, 879.123913481, 924.11468597, -1162.51118669, -427.640836851, 358.334660705, 1053.4018212, -379.911620687, -733.014869882 +-1172.32609998, -332.247960327, 720.483825152, 79.8438619593, 620.378319797, -623.722256408, 21.9459615445, 244.112261291, 496.881074918, -955.497966335, 537.514798315, 1110.98917399, 127.116732871, -737.380234248, 425.761380357, 787.990285462, -314.242452742, 1099.59442945, -568.614937436, 1047.34735246, -550.682846479, -443.860188524, 166.686665139, -1005.05763748, 120.779530484 +385.873827156, -282.477155963, 691.889363829, -208.265667629, 330.270846476, -396.385967283, 826.067098841, -915.279126996, 428.07560474, 1150.67529695, -156.410941959, 1031.32314564, -324.456712567, -1069.20926524, 558.178477015, -654.218206773, -1051.68150771, -560.244812818, 335.551190711, 990.880245166, -535.022112002, -96.8788351011, -1173.36026274, 28.0810006021, 433.328118607 +-111.8357026, 1165.16848305, 79.678542806, -747.767163767, 49.8229992566, 804.7919764, -351.395812282, -1090.64881845, -101.65303576, 202.703673532, 388.174977133, -752.096472336, -211.918463536, 337.767193436, -409.537860201, 717.526975812, 770.969886502, -790.931999031, 654.927149248, 1079.43432885, -519.934664987, 762.043333795, -1109.02391252, -550.436675562, 918.579444676 +-316.219362428, -489.937033132, 1119.52047596, 809.036669419, 77.3484485063, -75.5914532366, -1132.61052493, -825.453311403, -434.310039516, -884.954778664, 448.861143214, -541.398233247, -905.52124225, 638.798345589, 515.359490183, 183.533363076, 555.593992949, -236.343888745, -1168.45409776, 206.806583157, -403.433187434, -952.450740925, 112.067819159, 576.132940751, -230.487070916 +-701.20489117, -495.920067188, 1004.90017519, 728.946922879, -216.578208325, 405.670960731, -106.495245907, 494.816910929, 434.592272241, 474.684668607, 785.406097522, -798.14494139, 449.557647437, -515.526390474, -171.900601707, -247.4622402, 147.054231921, -519.325665427, -809.140564249, 58.8948358089, -856.064512417, -1040.62714402, 1089.93621063, -1089.59593747, 1062.4776329 diff --git a/code/plots/data/bins-convergence/15_5/AEP_opt.txt b/code/plots/data/bins-convergence/15_5/AEP_opt.txt new file mode 100644 index 0000000..caba3cb --- /dev/null +++ b/code/plots/data/bins-convergence/15_5/AEP_opt.txt @@ -0,0 +1,10 @@ +352530.474431 +352591.873553 +351723.901973 +351463.184139 +354127.900127 +352338.559053 +351100.211671 +353225.85929 +350634.003409 +348003.637928 diff --git a/code/plots/data/bins-convergence/15_5/AEP_true.txt b/code/plots/data/bins-convergence/15_5/AEP_true.txt new file mode 100644 index 0000000..b209da0 --- /dev/null +++ b/code/plots/data/bins-convergence/15_5/AEP_true.txt @@ -0,0 +1,10 @@ +381098.633112 +381156.169323 +380819.279336 +378723.485029 +382719.289094 +380843.196779 +379540.315995 +382276.734385 +379822.748861 +377110.536585 diff --git a/code/plots/data/bins-convergence/15_5/boundary.txt b/code/plots/data/bins-convergence/15_5/boundary.txt new file mode 100644 index 0000000..f7a32b1 --- /dev/null +++ b/code/plots/data/bins-convergence/15_5/boundary.txt @@ -0,0 +1,10 @@ +-0.00172797520781 +-5.33460861334e-05 +-0.00279298684427 +-0.000498945892105 +-0.000626141917564 +-4.29554661423e-05 +-0.00354621490055 +-0.00148574364925 +-0.00258146439478 +-0.00206024095996 diff --git a/code/plots/data/bins-convergence/15_5/separation.txt b/code/plots/data/bins-convergence/15_5/separation.txt new file mode 100644 index 0000000..abb7a25 --- /dev/null +++ b/code/plots/data/bins-convergence/15_5/separation.txt @@ -0,0 +1,10 @@ +12461.9118555 +4.14058449678e-05 +16094.4058942 +0.120868952246 +2563.02998396 +0.0272232776624 +8897.52844154 +1352.35289561 +0.567828223109 +4272.41563023 diff --git a/code/plots/data/bins-convergence/15_5/turbineX.txt b/code/plots/data/bins-convergence/15_5/turbineX.txt new file mode 100644 index 0000000..edf5085 --- /dev/null +++ b/code/plots/data/bins-convergence/15_5/turbineX.txt @@ -0,0 +1,10 @@ +-852.310770085, 841.293267919, -1104.34889909, -518.723082827, 960.2507418, 241.44123713, -606.885006334, -396.758107784, 1045.53535306, 344.79961828, -1160.61357918, -4.30207878811, -976.43782476, -356.368900853, 10.7684983682, 194.697292216, 1173.39822247, -124.552207964, 723.563342696, 578.257049326, -141.544334778, -730.709640983, -238.818583441, 625.01525212, 411.973857849 +1158.29268717, -341.636381467, -683.645052112, 400.678367909, 307.330914624, -126.945142306, 13.2173940792, -1123.58416895, -201.145402744, 46.4447336745, -330.560154046, 812.395262927, -448.660062255, 175.667792057, -750.716665678, 561.452452272, -553.929217766, -1151.99525169, 721.332703708, -792.399472425, 448.669268309, 665.712809078, -947.765497991, 1070.54129573, 922.172900995 +1084.28989797, 726.819192047, 93.4212816595, -986.892948857, -504.234140197, 208.330119656, -669.261065942, -293.877309748, 332.970504381, 22.4691516238, 421.220719894, 593.910099824, 840.49651058, -172.319319992, -361.442317193, -1097.94543329, -292.212836811, -478.966645653, 309.02716048, -607.40703299, -806.062492777, 1158.95176638, 688.291104896, 959.55471687, -834.595632597 +-445.140538562, 1173.21382862, 645.110353133, 87.4753793075, 625.367061222, -393.085221501, -119.368940436, 113.812872362, 622.774119123, -1057.38241924, -570.996821862, -1155.84239821, 532.848026836, -926.772225668, 238.865307437, -258.967066831, 1048.21928584, 413.083846634, -784.529537972, 856.923875862, 224.037534326, 5.91560176603, 741.144442615, -833.076933621, -649.559411114 +290.374857222, -579.080533425, 409.240270572, -526.46342092, 833.017993301, 160.983025436, 451.195963359, 921.110615066, -1040.60419444, -703.939781152, -260.065915436, -187.818277565, 525.338621571, -1169.51249217, 15.3419023447, 1051.0519212, 1143.39766384, 748.907611785, -99.9271451289, 141.244467043, -400.820811311, 620.666997089, -377.036441362, -1118.63504976, -854.278315134 +103.840850667, -332.808675296, -235.211897928, 586.314153581, 145.412833133, 1047.1544832, 913.432452065, -565.385566088, -1028.1286868, -605.197651942, 1013.80777107, -319.956413528, -1147.30378657, -930.469079843, 1171.08923608, -696.207612997, -903.459614017, 734.687225746, 768.629591724, 445.312226331, -457.841822972, -12.3506737603, -136.808594762, 449.221291395, 312.081631153 +-374.029796291, 149.988921032, 361.342840737, -387.221252794, 1065.19938446, -1074.87477152, 945.44578514, 512.452202452, 736.170007374, 257.560207495, -799.957465637, -538.632094773, 632.538064159, 347.618014842, -14.5562159417, -899.755893517, -555.764500231, 852.023691537, 477.171770193, -268.568186554, -133.72235879, 1146.55053004, -26.576478527, -1170.19461449, -712.790878928 +352.5787468, 2.58161097939, -727.015513696, 503.583990474, 1173.50811085, -926.616545618, -223.653693457, 58.6876415737, -1166.39327805, 464.89376453, -1065.55060886, -516.039046842, 190.292150141, 1051.64381703, -890.18090094, 593.32781613, -367.988065777, 799.537597865, 943.272487999, 285.47943738, -770.00611773, -125.365462563, -279.812093999, 1082.57207305, -610.18766856 +-722.11024704, 753.865215844, 107.714361669, 204.062794726, 1173.51346056, -1166.71011757, -137.837161432, -674.0567428, 425.474469986, -468.344054686, 983.468165128, 1033.57151038, 252.514120379, -983.353443189, 653.798922659, -266.916900375, -444.578258387, -1000.21007142, 123.781806594, -588.481106798, 8.2290475867, 603.866798939, 305.507583667, -845.150138221, 859.296729113 +-284.530470619, 286.737796817, 176.191897989, 936.540840377, -74.5968827702, 1075.24767857, 534.646723526, -761.281911549, -199.229003986, 679.087849574, -979.989600541, 27.6785801983, -1133.73884628, 931.260801718, 1149.09701553, -1134.55667159, 44.4655203142, -616.372140327, -856.961187462, -465.705941082, 788.197212591, 403.158495349, -633.116780715, -524.568532564, -347.253449307 diff --git a/code/plots/data/bins-convergence/15_5/turbineY.txt b/code/plots/data/bins-convergence/15_5/turbineY.txt new file mode 100644 index 0000000..21c0fc3 --- /dev/null +++ b/code/plots/data/bins-convergence/15_5/turbineY.txt @@ -0,0 +1,10 @@ +-806.661348648, -818.146825697, -396.925426595, -490.059665284, -169.558831728, 1113.53535293, 112.823069659, -1104.40909958, 532.912246201, 49.9776361906, 173.52823073, 71.8542604769, 650.926813769, 383.356243245, -1173.46495626, -506.449201411, 16.5327138619, 607.214312194, -494.030017927, 1021.15441781, -537.256251437, 918.261056438, 1148.95829297, -20.1871994371, -1098.82391524 +-188.398693307, -1122.68454613, 377.883484671, -1102.9926295, -441.534046481, -353.228601695, 413.622527947, -338.665826084, 1156.1472464, -1172.59493536, 598.291947391, 309.391691281, -655.385581402, 1119.3574367, -901.975839613, 585.063264109, -145.881457719, 223.702562782, -925.643042881, 865.585963402, 150.161462669, 966.417274072, 62.7982193202, 480.704976522, -516.51452577 +448.83339854, 0.363631512683, 1169.78994681, 205.808538676, 1018.04513497, 631.012014331, 233.931736087, 199.210154898, -565.850208055, -1173.29936955, -1095.31237696, 537.548060398, 818.96373455, 828.53904595, -178.875822414, -414.314654929, -1102.35676687, -502.119783124, 111.124679629, -1004.08854602, 852.877436671, -184.300997538, -900.52865981, -675.567390334, -824.98034938 +441.204331951, 26.5635045667, -307.755805006, -1170.249531, -658.838126846, -934.67329039, -804.440417368, 656.842002809, -994.630038842, 230.415653178, 1025.23153095, -202.890082109, 76.644027499, 719.881813461, 1148.94702134, -203.309691804, -527.609960855, 552.623959112, 129.516247917, 408.991019008, -753.015592673, 127.243831306, 909.857586901, -685.027593783, -977.347766737 +289.907872867, 290.038832765, -526.836133586, -1007.99442176, -663.249742675, 1087.02606565, 1004.80888989, -78.4469451095, 542.474737637, 938.938058827, 361.891348759, -1089.45014626, -1049.35948712, 96.8319620463, -33.9099456832, 521.944232378, -264.154725402, 903.478654548, 1132.73069211, -1164.98350502, -410.403798374, 328.154552411, 1111.29693739, -354.671154021, -804.577188268 +-1047.39642132, -784.665916089, 705.159171176, 128.94631905, 551.84069041, -529.720104837, 110.233181341, 312.420192911, 565.76263173, -1005.42115396, 591.041195598, 1129.05437698, -246.637413476, -715.096625815, 75.4049044448, 944.68558948, -10.7448817653, 915.079544267, -804.661873695, 990.243410453, -258.967549471, -460.293092673, 157.147567921, -1084.12920111, -142.428333464 +390.674306557, -259.412395507, 631.785341016, -215.205776449, 215.50479236, -443.059676097, 695.175250221, -716.282469388, 420.230090618, 1144.9012055, -129.089469251, 1042.59885543, -310.678897523, -1120.84837431, 847.603048989, -753.381408549, -1033.56747116, -806.964478623, 92.199398877, 957.035435545, -576.32421852, -250.119340713, -1173.21341328, 88.2071749196, 254.771688722 +-57.2384662656, 1127.18753644, 19.3105391974, -769.818310483, -3.84860235271, 720.081774875, -277.716385587, -1172.04606533, -129.08387825, 450.5012501, 236.893774974, -978.211371483, -678.347059566, 293.596182507, -516.652626407, 1012.47259075, 1114.32603247, -858.996879046, 698.121191466, 1138.2609567, -885.566364702, 226.309890156, -1092.88124393, -452.964772711, 1002.40137971 +-334.994581388, -449.846478887, 1168.56061402, 770.579880894, 1.50812008589, 126.191050385, -1163.18129706, -728.979224841, -270.239062603, -1076.00698507, 640.255599564, -555.762434226, -825.821637084, 640.432202265, 853.242961956, 72.0991240843, 836.239685138, -613.77536773, -1166.96823558, 85.1464149452, -13.4206827805, -1006.22119814, 388.389477496, 420.204106137, 82.7334389412 +-774.071479308, -83.6585485818, 842.074947154, 707.127406677, -437.269828804, 209.157338649, -470.241531613, 435.760391857, 324.104424655, 411.275339894, 645.568238681, -915.009492275, 302.942106968, -538.448465138, -238.144992993, -299.862216347, 155.450459903, -591.266943551, -709.543424852, -18.8771967785, -869.414208717, -1102.08856065, 988.080902058, -1049.74524561, 595.384477179 diff --git a/code/plots/data/bins-convergence/15_6/AEP_opt.txt b/code/plots/data/bins-convergence/15_6/AEP_opt.txt new file mode 100644 index 0000000..b0a8e78 --- /dev/null +++ b/code/plots/data/bins-convergence/15_6/AEP_opt.txt @@ -0,0 +1,10 @@ +358693.052569 +357613.350708 +357254.324029 +358156.200716 +358395.710378 +357845.700772 +357058.345894 +356822.908381 +358099.352882 +357786.313706 diff --git a/code/plots/data/bins-convergence/15_6/AEP_true.txt b/code/plots/data/bins-convergence/15_6/AEP_true.txt new file mode 100644 index 0000000..3100e87 --- /dev/null +++ b/code/plots/data/bins-convergence/15_6/AEP_true.txt @@ -0,0 +1,10 @@ +381415.913231 +379910.248987 +378540.091261 +380868.96031 +380648.544475 +379738.586863 +379186.744663 +379319.843115 +380325.517675 +379463.282994 diff --git a/code/plots/data/bins-convergence/15_6/boundary.txt b/code/plots/data/bins-convergence/15_6/boundary.txt new file mode 100644 index 0000000..bcf3f28 --- /dev/null +++ b/code/plots/data/bins-convergence/15_6/boundary.txt @@ -0,0 +1,10 @@ +-0.00112240514318 +-0.000322556077208 +-0.000592261067595 +-0.00261884014139 +-0.00145520910633 +-0.000649111786743 +-0.000319845236618 +-0.00264076762005 +-0.00106748996427 +-0.00191145324493 diff --git a/code/plots/data/bins-convergence/15_6/separation.txt b/code/plots/data/bins-convergence/15_6/separation.txt new file mode 100644 index 0000000..9dbf4c0 --- /dev/null +++ b/code/plots/data/bins-convergence/15_6/separation.txt @@ -0,0 +1,10 @@ +44200.3643799 +566.468885411 +4451.74703243 +5296.98315761 +0.00171101088927 +0.00207021691313 +28823.7522148 +0.0333694781439 +0.00307240438997 +0.0127064190747 diff --git a/code/plots/data/bins-convergence/15_6/turbineX.txt b/code/plots/data/bins-convergence/15_6/turbineX.txt new file mode 100644 index 0000000..0f54a87 --- /dev/null +++ b/code/plots/data/bins-convergence/15_6/turbineX.txt @@ -0,0 +1,10 @@ +-842.422229508, 881.868028708, -1112.36228181, -655.761432823, 900.993716925, 324.580345414, -787.823286601, -418.555367437, 1007.27503084, 136.009002012, -1165.54904396, -338.580929734, -947.082812983, -464.010864869, -23.8638752999, 122.501499151, 1159.50231463, 28.1243980708, 804.096697154, 675.762249709, -211.677828171, -591.991194018, -74.7608236555, 483.201837144, 520.726042894 +1170.62151308, 194.697597323, -444.139451023, 494.417098149, 62.2378239848, -51.1482005236, 247.724383931, -1164.02959897, -197.033097084, -254.302546344, -329.388662237, 819.436656654, -425.627343661, 130.899896476, -837.820591335, 503.676422712, -576.957926088, -1053.91060679, 792.631747807, -767.20238977, 367.030423747, 720.318360004, -950.182532038, 1093.3997603, 922.520492954 +1044.85787578, 611.867008916, -54.6871015316, -889.103816003, -507.404946812, 251.497643428, -992.444450349, -367.864293435, 693.69742927, 55.4689777507, 413.185863644, 500.79385755, 788.622133362, -197.089042447, 1.39561454032, -1132.07441148, -555.891759255, -433.182495633, 126.27628378, -275.160883848, -808.833969879, 925.197858321, 721.65673475, 1141.97443157, -750.579741113 +-303.335297586, 1164.65279592, 364.377643211, 365.618245124, 639.838461057, -412.46245855, -155.49703213, 401.506782876, 870.04315206, -1135.94916364, -399.745057702, -1031.14023554, 661.032953886, -759.26078431, 91.2561549641, -214.953735427, 1135.92074156, 510.891720978, -870.792025375, 1026.65134086, 230.747653565, -38.2842322949, 773.262517022, -967.461452677, -706.256594153 +295.753035572, -810.085906513, 136.187036603, -577.004985035, 694.663631285, 179.574255845, 429.801463744, 809.937085803, -1049.27136754, -699.151568567, -529.958772894, -232.292213806, 558.736743904, -1171.45867914, -3.65269287832, 1167.93917487, 1058.14283184, 942.841468404, -104.513398539, 124.710210539, -395.257160342, 590.802860626, -236.989094316, -1044.41738547, -718.172205385 +112.640225698, -442.539071052, -158.495693979, 478.52324384, 372.984829023, 1008.84845234, 1009.77812741, -945.163048976, -1031.71322498, -287.215959072, 860.79520672, -255.931987768, -1105.36487671, -601.71044694, 1113.95081496, -748.31864482, -810.360437504, 141.470024474, 653.508449019, 707.704652295, -111.191739227, 445.336590407, -591.194931445, 503.983716137, -33.2133239712 +-326.012956165, 229.829514333, 463.400321376, -465.664385701, 1142.12332488, -1053.39150255, 957.844440248, 763.819302062, 629.164436541, 367.336105172, -823.935365397, -481.163377186, 726.14009853, 449.805098044, 66.7332654969, -728.668060222, -526.578724942, 1044.21650491, 557.642967869, -187.172816847, -78.042709849, 1116.21076843, 41.4291203926, -1173.24805524, -663.084780953 +625.807912364, -94.0089522511, -475.091712161, 482.029086323, 1173.47876824, -808.845603251, 28.6804760725, 494.314678472, -997.005066903, 162.571611245, -1081.5230691, -417.494097423, 345.033334211, 770.851190178, -958.391625794, 658.764986303, -352.412196691, 868.340010522, 975.988790798, 309.326284315, -890.638481176, -7.1502833336, -64.7771295856, 1066.64104425, -601.449989539 +-666.722240084, 713.422549023, 240.857645972, 587.861505856, 1171.14872794, -1046.50730219, -203.15553383, -391.003968996, 308.424720985, -522.588467263, 1004.70682042, 994.414595559, 318.938110418, -1103.39659748, 458.155277981, -246.991058763, -376.469987486, -939.046601895, 56.6630262441, -605.705043644, -14.0972283914, 574.596118078, 108.11075713, -761.334468229, 853.490069951 +-406.516939235, 393.236441283, 270.291364114, 930.393096049, -5.95431887647, 1133.31733359, 525.757687285, -527.870728117, -251.786072668, 682.896305701, -784.360429237, 114.716078144, -1094.21620802, 814.159593915, 1148.72343292, -1034.50478686, -149.987456588, -682.52291057, -942.484922484, -633.243394016, 763.857212801, 353.798449426, -369.70737273, -244.264371246, 158.137836831 diff --git a/code/plots/data/bins-convergence/15_6/turbineY.txt b/code/plots/data/bins-convergence/15_6/turbineY.txt new file mode 100644 index 0000000..c4b65b7 --- /dev/null +++ b/code/plots/data/bins-convergence/15_6/turbineY.txt @@ -0,0 +1,10 @@ +-816.982910689, -774.23883969, -373.87982717, -514.939858918, 90.9081123051, 1011.31553214, 43.6207119169, -1096.33377775, 602.108291733, 90.216468808, 136.497107579, -50.1359813774, 692.943039217, 424.435997533, -1173.27279068, -575.489061223, -180.809958747, 632.699018094, -316.613737485, 959.41716084, -586.648880686, 1013.25335549, 1171.13090959, -110.503653939, -1051.65597159 +-82.3508586434, -1040.84126046, 441.392752203, -855.652010174, -605.740945721, -180.978057317, 463.43401932, -148.899993827, 1156.85518111, -1145.6291435, 817.418885972, 403.321268601, -695.06513783, 1055.21669978, -821.70100975, 779.488384686, -179.839844321, 516.147596696, -865.373653979, 887.995800566, -269.948420953, 926.432594921, 0.886189945387, 426.160606032, -358.371413144 +534.235925862, 18.023575613, 1172.23940265, -195.009118754, 1058.14779562, 765.305518467, 346.205450671, 261.133370667, -533.305490688, -1046.38923463, -1098.36864954, 569.962626399, 869.028799433, 622.838308945, -228.208639839, -309.101347955, -673.171072705, -343.767442745, 192.980391239, -969.923925613, 850.249899035, -8.18275225348, -925.390506079, -270.241386396, -902.089767607 +635.808889985, 143.964936883, -182.225181987, -1115.10643264, -572.926966759, -1036.4419344, -768.168611663, 1064.16178132, -787.503774632, 294.54281847, 1103.33123915, -241.788969853, 134.746894162, 894.795486524, 1169.96081251, -49.8460525564, -294.653183119, 562.499049932, 345.421843479, 568.439093206, -744.568801596, 565.60042108, 882.723805547, -664.194535987, -937.196912921 +339.650846226, 423.581634202, -738.333615703, -1021.86161024, -573.359900805, 881.433083162, 1091.9737958, -38.4120205433, 525.514538328, 942.508915451, 22.6838141154, -1098.77073883, -1031.96387295, 69.4332780068, -46.7171349708, 114.254562877, -507.416489783, 698.705426101, 561.70776428, -1166.87006089, -372.512054974, 226.051616414, 1149.33584673, -535.097047507, -660.869522618 +-1168.09652362, -541.977306963, 785.264482442, 130.558160312, 807.502881949, -599.468134166, -195.92910919, 105.904218157, 559.199228913, -1095.55973286, 309.857771739, 1145.26661763, -394.086805951, -1007.51271507, 369.121926912, 873.044380647, -480.082515001, 1164.95647626, -634.442564791, 936.103652805, -84.3220704853, -228.035935847, 24.9537853891, -1059.78163447, 436.962535101 +343.471898303, -136.403678047, 686.55491065, -336.628503926, 269.611205996, -517.20620533, 677.989670044, -890.907713662, 349.277208278, 1114.54030699, -152.639225808, 1070.33532086, -420.866134226, -1083.88727942, 729.54356449, -763.764185146, -1048.73768791, -535.488572147, -65.8050833396, 970.368813232, -554.652427184, -89.0012033892, -1172.7831301, 25.0010892868, 466.953048395 +0.305146637567, 1169.74282997, 51.1373375919, -712.682702919, -9.14659955807, 850.238260557, -266.672620715, -1064.32758752, 89.067933631, 430.238828882, 455.466728266, -632.48790786, -397.921388527, 394.961715883, -332.725882723, 971.169218997, 792.39516791, -789.382489538, 651.600437901, 1128.53306192, -764.133089897, 743.251015456, -1171.72514624, -489.300523646, 1007.04097986 +-388.884765362, -491.211144224, 1148.53142051, 1015.65485246, 74.4760831193, -171.186602953, -1155.79679273, -521.992216075, -258.887577562, -1050.73185938, 606.383607171, -623.118608897, -954.537620193, 399.565301695, 444.541709231, 52.2843659152, 1020.41689933, -703.795560642, -1165.50858521, 216.240159129, -158.691207997, -1023.21808941, 419.756535255, 893.031842319, -11.5655378452 +-543.125267812, 161.707431066, 729.947761024, 715.195482778, -369.567464045, 304.512369412, -416.518708572, 596.344203171, 602.870747237, 487.982840056, 872.87844068, -829.848154168, 424.06516943, -72.1266920274, -239.938347284, -195.34037628, 143.403533137, -694.738072768, -699.183864945, 179.129598815, -890.87493842, -1118.91132744, 1113.75596829, -1147.81131246, 1162.81085474 diff --git a/code/plots/data/bins-convergence/20_1/AEP_opt.txt b/code/plots/data/bins-convergence/20_1/AEP_opt.txt new file mode 100644 index 0000000..002494a --- /dev/null +++ b/code/plots/data/bins-convergence/20_1/AEP_opt.txt @@ -0,0 +1,10 @@ +427021.084666 +427694.806682 +431940.797319 +432126.646141 +430096.716604 +429568.130456 +426830.572238 +428793.437143 +431836.599792 +428105.716789 diff --git a/code/plots/data/bins-convergence/20_1/AEP_true.txt b/code/plots/data/bins-convergence/20_1/AEP_true.txt new file mode 100644 index 0000000..8ea574b --- /dev/null +++ b/code/plots/data/bins-convergence/20_1/AEP_true.txt @@ -0,0 +1,10 @@ +380585.230965 +380824.207843 +381579.754103 +380857.32697 +381230.298123 +380553.137929 +379534.363954 +380872.203967 +381595.878426 +380498.072004 diff --git a/code/plots/data/bins-convergence/20_1/boundary.txt b/code/plots/data/bins-convergence/20_1/boundary.txt new file mode 100644 index 0000000..b149315 --- /dev/null +++ b/code/plots/data/bins-convergence/20_1/boundary.txt @@ -0,0 +1,10 @@ +-0.000940427411933 +-7.15027788374e-05 +-0.00022260320452 +-0.000118903582006 +-2.81033862848e-10 +-0.000297528613146 +-0.000189305313143 +-0.00112234256198 +-2.37491804e-09 +-2.45261921918e-05 diff --git a/code/plots/data/bins-convergence/20_1/separation.txt b/code/plots/data/bins-convergence/20_1/separation.txt new file mode 100644 index 0000000..b2796b1 --- /dev/null +++ b/code/plots/data/bins-convergence/20_1/separation.txt @@ -0,0 +1,10 @@ +5747.20249414 +0.000215736028622 +10663.4308613 +9748.43806906 +4.36557456851e-09 +0.0127294739941 +1471.50142401 +17623.9310516 +1.42608769238e-09 +3228.6407128 diff --git a/code/plots/data/bins-convergence/20_1/turbineX.txt b/code/plots/data/bins-convergence/20_1/turbineX.txt new file mode 100644 index 0000000..1fac98d --- /dev/null +++ b/code/plots/data/bins-convergence/20_1/turbineX.txt @@ -0,0 +1,10 @@ +-931.61018607, 976.210807102, -958.600361441, -595.786623029, 895.974719318, 396.791325873, -736.771452359, -541.438681122, 1001.90605937, 269.686229981, -1168.61881543, -133.501939297, -823.388202314, -472.345336411, 100.377087228, 192.009832077, 1162.5270155, -28.9753882563, 600.25585773, 703.811947963, -246.365141347, -597.224785268, 67.8674580316, 492.416975541, 753.774266557 +1158.78927138, -503.215835201, -501.832091036, 338.792927386, 72.6791094331, -42.1899983025, 127.171358781, -1160.56311644, -174.435509478, -211.363216658, -220.180410826, 837.558445941, -356.480142863, 226.385549118, -948.039126933, 512.18930204, -630.305007148, -1134.08254126, 615.427014349, -720.54169141, 422.814472172, 756.556642088, -833.060114089, 1081.92752405, 947.835910599 +1056.71802904, 711.639006819, 73.4644684271, -1162.76241883, -626.93987892, 186.199563548, -537.584413397, -124.826958981, 391.154025628, 102.624698002, 532.438090133, 608.021267991, 504.758997658, -232.712879293, -417.886859758, -990.898947418, -16.7067430958, -680.182814843, 296.25615732, -316.603894669, -1067.34224539, 1159.1688705, 813.247025072, 999.979281216, -770.144193768 +-394.251638742, 1173.27371414, 487.927412717, -7.44316548756, 593.049473935, -490.355185782, -186.886353259, -111.840924016, 837.494647981, -1058.95842724, -480.642350116, -962.540840571, 730.343502332, -795.055567822, 150.900336146, -283.02813089, 1062.07451392, 391.717426023, -676.597092121, 953.007436498, 224.151554578, 4.96430372354, 653.6207443, -1147.02220079, -856.607991632 +119.449777348, -827.564304749, 17.1094001725, -505.443971212, 705.800144547, 223.340193567, 474.943789485, 838.318949392, -1048.75028714, -727.527864979, -442.840360265, -132.424554297, 381.254857433, -1157.38461526, -244.507537361, 1162.68221688, 1084.17951639, 927.634428993, -55.2665261591, 127.514816474, -559.972263419, 572.887719537, -340.380447915, -928.770361315, -949.928120291 +55.3633426864, -475.922170548, -159.116339735, 550.005374865, 102.498096737, 1096.36568328, 811.001203847, -652.792600239, -993.285642378, -650.934226075, 927.912744031, -262.844585432, -1082.95884109, -853.227938766, 1158.78304204, -753.456373559, -1153.48717363, 374.263580857, 692.389096579, 652.368222269, -295.872895876, 325.542266494, -59.9527549438, 382.243957129, 217.560697859 +-364.797091754, 180.431375435, 322.033765426, -483.82792572, 1054.88587369, -1071.38499621, 946.445923421, 577.145740256, 685.75363686, -65.9112694057, -895.256018367, -567.996509227, 793.092149195, 321.587621239, 35.071514156, -798.965729499, -428.760084909, 870.412574874, 420.886262739, -282.7168461, -183.985097158, 1132.8869143, 90.4749988592, -1169.68729409, -665.389848143 +651.800868041, -1.45214590987, -647.273326768, 269.33835197, 1162.22333472, -772.918268521, -312.962576588, 571.244570677, -1163.34786761, 192.879982959, -1064.68338728, -544.036964902, -67.3892394102, 767.29386198, -875.234572045, 512.47629972, -236.690442422, 879.891421789, 1047.31714244, 414.155929856, -991.657495035, 97.9802598635, -433.051627873, 1103.03583462, -521.114573149 +-552.8558614, 582.444659763, 334.433657332, 740.027217991, 1170.40916931, -936.522701414, -243.739644299, -157.89603995, 285.000305457, -590.853587132, 1073.31978895, 945.921124331, 368.374316694, -1067.99589114, 432.292618732, -427.116154144, -252.019241355, -1159.8717842, 142.154224852, -681.32341503, -63.0428226862, 692.877220746, 29.1376541509, -777.798359638, 844.468639429 +-186.190276448, 320.986161778, 223.44542285, 978.922999035, 48.6237311249, 1158.81999878, 591.010440408, -724.064305278, -339.612951072, 684.030180535, -819.01684602, 149.228314746, -1065.06772076, 871.844218525, 1120.13058915, -1169.52252204, -59.816363617, -532.632238657, -920.110928381, -671.973512798, 755.124013357, 447.380607462, -233.966722878, -397.621226277, -603.912443196 diff --git a/code/plots/data/bins-convergence/20_1/turbineY.txt b/code/plots/data/bins-convergence/20_1/turbineY.txt new file mode 100644 index 0000000..62fe3bd --- /dev/null +++ b/code/plots/data/bins-convergence/20_1/turbineY.txt @@ -0,0 +1,10 @@ +-713.609477462, -651.266810192, -256.268304748, -515.957082888, -58.8811234593, 1041.37942235, 248.243455712, -1041.14370214, 611.001061287, 56.5003866089, 107.079315924, 90.4633057218, 780.129022863, 189.711142424, -1169.21369657, -636.032699235, -160.215595463, 657.121241679, 51.0264429835, 850.116417415, -835.586765194, 1010.17756524, 1171.55024699, -441.963720135, -899.42245657 +-185.319513323, -1060.14608182, 635.050012231, -1019.69566088, -944.155667557, -276.899013292, 532.687349364, -173.865312763, 1160.4775506, -1154.32296192, 631.360612174, 378.456911956, -361.204609694, 1083.42134253, -691.63420477, 472.426143655, -241.872344281, 301.649937182, -999.192421017, 926.258920803, -45.1675800234, 897.083017252, 91.4932045447, 289.666406396, -483.119492577 +510.375362752, -64.1355356391, 1171.2125615, -158.49116484, 992.009214345, 786.875375909, 435.932431931, 268.246183884, -649.07650802, -1169.01842994, -1045.77529102, 657.318595411, 1059.4122589, 907.639501323, -244.19423599, -572.91852998, -474.635414635, -344.578758732, 88.9310361883, -1033.89076529, 487.766828342, -182.931527371, -822.46114041, -614.147685788, -885.445676867 +554.108067625, 23.7689367559, -319.791487181, -1173.49073293, -1012.63433854, -948.646386473, -725.73199286, 918.993997854, -728.469896078, 505.710334793, 1070.56940908, -39.8208064959, 87.4222311956, 839.42964265, 1163.77188134, -135.521911414, -499.132884685, 675.628268389, 204.444116953, 417.443847548, -862.684917845, 242.899458065, 974.636249114, -247.943524624, -802.096409689 +253.493808304, 206.22655069, -493.869996987, -1059.0855884, -838.032330096, 1003.05835607, 886.592523627, -25.9364283631, 526.553631469, 920.78178591, 353.536639617, -1160.95126042, -1109.85612818, 193.898798195, 65.2605166621, 159.078452787, -449.099841709, 718.769961624, 1060.15051086, -1166.56584176, -377.679616388, 71.4471047496, 1123.06591181, -275.091657102, -689.037341416 +-967.214549981, -450.079608283, 734.91152293, -51.3156057349, 1117.85537584, -418.471256053, -164.011508172, 447.246984879, 579.722702131, -642.357514319, 718.41071831, 1143.69975136, -351.306789434, -805.691426293, 185.358453064, 899.688584174, 215.877884669, 1020.87013026, -867.839401868, 885.69163627, -228.120425059, -588.672716786, 146.976462182, -1109.51588705, 53.7408642811 +149.684225249, -150.850108714, 808.509634049, -564.685033992, 280.108042977, -478.822018892, 693.812726676, -909.230069713, 512.093870227, 1171.66201483, -94.303822545, 1026.89624025, -212.748629815, -1044.88780625, 841.618867213, -687.207407624, -1092.38306875, -787.094564089, 166.493621454, 926.89727373, -791.668370374, -306.109723773, -1170.02156349, 94.6971089402, 239.89918691 +-283.079424039, 1173.51380509, 91.9322748729, -819.927276315, 162.400351279, 831.921225798, -200.660707259, -995.474658836, -154.135105846, -111.479200251, 493.543640182, -489.279447092, -676.106930007, 395.465242158, -276.073110715, 537.915026346, 878.51308563, -776.483727923, 529.400187757, 1098.00316974, -627.498158004, 680.176711977, -1090.68895855, -400.561793831, 1051.46396569 +-496.212362195, -316.892147123, 1124.85111034, 772.686209108, -85.3127656734, -311.517401288, -1143.23651516, -638.593699403, -152.869319045, -1013.91712194, 474.468673615, -483.650230484, -841.441970952, 480.131414281, 545.253664569, 187.972615829, 1146.13358452, -178.4189895, -1164.87255438, 301.679573936, 36.7573735259, -947.130956395, 652.791934368, 878.729539354, 167.186605977 +-854.680612961, 18.0427536423, 712.868608074, 647.182870743, -435.658401703, 185.127269319, -113.150626971, 285.335677352, 384.85484242, 671.121651257, 840.444702747, -1009.95970076, 492.713549603, -254.093690759, -349.919151227, -96.7107259245, 161.681083131, -734.859871951, -621.832564469, -204.358998233, -898.289272383, -1084.89007975, 1149.95454877, -1104.09839349, 1006.19364606 diff --git a/code/plots/data/bins-convergence/20_10/AEP_opt.txt b/code/plots/data/bins-convergence/20_10/AEP_opt.txt new file mode 100644 index 0000000..cfac8c3 --- /dev/null +++ b/code/plots/data/bins-convergence/20_10/AEP_opt.txt @@ -0,0 +1,10 @@ +363683.554958 +362613.459388 +364059.786849 +365214.891033 +365073.346577 +363532.698135 +361482.158124 +363758.809983 +364997.854757 +362798.58392 diff --git a/code/plots/data/bins-convergence/20_10/AEP_true.txt b/code/plots/data/bins-convergence/20_10/AEP_true.txt new file mode 100644 index 0000000..6a34148 --- /dev/null +++ b/code/plots/data/bins-convergence/20_10/AEP_true.txt @@ -0,0 +1,10 @@ +379641.694291 +378609.193716 +379783.979163 +381414.599856 +381133.367681 +378765.030781 +378973.315534 +380833.35601 +380948.012983 +379240.690407 diff --git a/code/plots/data/bins-convergence/20_10/boundary.txt b/code/plots/data/bins-convergence/20_10/boundary.txt new file mode 100644 index 0000000..2745b98 --- /dev/null +++ b/code/plots/data/bins-convergence/20_10/boundary.txt @@ -0,0 +1,10 @@ +-0.000504570722114 +-5.43939024737e-05 +-1.97440533611e-05 +-0.000113346366788 +-0.000568342045881 +-0.000114327950087 +-0.00071554189617 +-0.00303520100692 +-0.000652189443144 +-7.17798959613e-05 diff --git a/code/plots/data/bins-convergence/20_10/separation.txt b/code/plots/data/bins-convergence/20_10/separation.txt new file mode 100644 index 0000000..8ee923d --- /dev/null +++ b/code/plots/data/bins-convergence/20_10/separation.txt @@ -0,0 +1,10 @@ +0.00214287667768 +15530.3117273 +32450.7459759 +2.53449834418e-05 +3.98388339502 +11122.592956 +0.229407948937 +0.0243373411213 +0.0663647040201 +2052.00406838 diff --git a/code/plots/data/bins-convergence/20_10/turbineX.txt b/code/plots/data/bins-convergence/20_10/turbineX.txt new file mode 100644 index 0000000..e6b74c7 --- /dev/null +++ b/code/plots/data/bins-convergence/20_10/turbineX.txt @@ -0,0 +1,10 @@ +-892.366804587, 883.6090495, -950.121069065, -511.572702417, 945.37029458, 347.347543992, -796.872706742, -575.717741359, 1062.51206961, 153.259872949, -1172.88519936, -105.124241439, -1062.39138292, -370.913445297, 89.2052253342, 130.357946452, 1171.09912523, 34.3327864744, 683.361993886, 774.16980688, -234.508624586, -680.110491052, -237.964752532, 475.565284351, 557.021567795 +1169.26907474, -581.893064475, -494.691802842, 457.395509492, 167.318064213, 7.6476101215, 124.754764825, -1153.96976436, -184.545287872, -268.361065006, -181.103787552, 601.636280591, -373.517567193, 231.669901845, -972.499619299, 500.622199058, -701.07025151, -1028.87201506, 769.811183516, -564.650229666, 337.765152714, 707.520575496, -836.647857025, 1064.77210726, 956.855602248 +1080.12229482, 559.214728287, 20.1468648151, -1009.98845159, -462.339239317, 362.164979975, -721.749865078, -353.361216616, 486.589573942, 378.208444097, 84.9891449138, 627.41305404, 736.034874423, -219.392123011, -314.796170323, -1116.59374647, -148.001411152, -589.6444137, 229.994547061, -448.498233653, -896.606664236, 873.320620258, 899.306496566, 1151.20730972, -889.893694025 +-287.527866919, 1173.48416357, 321.57569255, -128.085106851, 639.717470398, -498.334388238, -122.406998353, -14.2601761283, 527.717558619, -1119.84746116, -399.559874129, -1065.36713061, 752.306207449, -846.798616409, 195.116701476, -656.568385581, 1061.27916651, 474.888766777, -799.343261333, 1103.5624802, 227.090945385, 63.1215535845, 860.493912943, -964.63933206, -741.582137078 +204.76448703, -632.569114277, 117.129278605, -552.198818981, 543.428486888, 306.631197943, 559.032169683, 939.842486748, -977.476190465, -697.54980287, -357.125813733, -203.804824804, 831.280180036, -1165.01275204, -126.719281676, 1057.35530639, 1153.75452755, 794.359821492, -24.9097111097, 225.19136251, -493.215427728, 685.090407975, -241.079257432, -1063.67727997, -832.50036034 +-17.7106355094, -468.426420422, -277.37002023, 545.060904406, 288.812652577, 1039.60909386, 933.574215747, -587.422421704, -1042.29713651, -798.354544487, 834.917024821, -444.434964851, -1158.68125831, -456.70500971, 1149.94497895, -657.975518391, -938.317235303, 170.647003774, 687.211547988, 437.080037041, -830.97213456, -125.743953743, -308.143991548, 505.030516998, 47.3903871467 +-532.774005123, 246.440871494, 331.180814469, -338.388328608, 1137.93202114, -1055.30337997, 856.588836248, 375.320554312, 622.579987806, 67.8570287819, -953.925699823, -505.681703337, 766.247171832, 443.481877369, 69.0550592344, -748.905299746, -625.439013705, 1059.01989902, 477.83234435, -271.082714701, 8.23322189763, 1171.93643587, -221.44130797, -1164.53349962, -871.221524482 +609.25339103, 85.0142152971, -147.375557465, 5.70093443047, 1166.16365459, -862.301503762, 190.361414379, 347.165250205, -1099.84705788, 265.192952631, -1069.84819878, -560.515960152, 476.319500565, 857.604914813, -818.820719195, 754.307085759, -309.434561838, 759.341743177, 1059.03754103, 410.60531757, -1077.73320219, -24.7181704717, -465.862434743, 1060.00572908, -552.020449981 +-549.728953133, 719.176341868, 125.396412434, 582.700479675, 1172.44386921, -923.45809997, -196.028674347, -860.184316234, 333.214600714, -489.738710741, 893.061593908, 1055.75892061, 324.454559609, -1038.77152951, 471.853937323, -388.910445593, -286.830426037, -1158.50742843, 87.6809653992, -665.849838569, -88.3971701826, 674.171153499, 239.063029712, -742.212041973, 779.820939795 +-215.63859032, 306.709311593, 204.603274203, 938.834942729, 56.5910569501, 1057.78214745, 587.962510806, -678.470974391, -18.5039106125, 640.560334407, -908.906451759, 104.141023165, -1122.0977594, 829.883084244, 1146.99919545, -1112.93240025, -170.586522613, -570.229132715, -845.35196439, -446.923485043, 774.523442902, 417.28815159, -326.870976797, -351.927197657, -117.68728035 diff --git a/code/plots/data/bins-convergence/20_10/turbineY.txt b/code/plots/data/bins-convergence/20_10/turbineY.txt new file mode 100644 index 0000000..6f177f8 --- /dev/null +++ b/code/plots/data/bins-convergence/20_10/turbineY.txt @@ -0,0 +1,10 @@ +-762.113784082, -772.250608249, -255.908672483, -506.616884185, -204.27458198, 1120.93103591, 176.893055219, -1022.58789859, 498.201038087, -179.498693017, 38.4236054215, -96.923216561, 498.458081499, 349.036388492, -1170.11943989, -647.955193131, -75.2532769365, 612.690994088, -272.668784235, 881.928293599, -908.293170583, 956.339694825, 1149.13388522, -428.942855906, -1032.89071313 +-99.7286266312, -1019.08604567, 458.473295264, -872.73039451, -904.920701085, -453.522786691, 403.117733287, -173.492423466, 1036.82366363, -1033.29651659, 676.44845198, 23.4220492628, -556.903172156, 837.858724663, -656.795549681, 653.339991525, -328.631379004, 564.409776566, -885.735134885, 1028.74004562, 139.62161725, 936.242781623, 322.367486487, 493.352060597, -390.565612303 +458.771971138, -48.2571658719, 1173.3413831, 42.9792550651, 1078.60017003, 1063.72163768, 493.53840482, 372.190887486, -586.781185429, -987.420783539, -1170.43271518, 580.388531847, 913.995928844, 766.993368616, -260.720548957, -361.04611591, -874.379869096, -471.846165688, -139.89957739, -1084.42852603, 757.121116248, 175.825116409, -753.912304688, -227.722703933, -765.000068646 +271.505487208, 8.41662428788, -304.35559738, -1166.50336363, -526.358981865, -1062.44940461, -664.843863867, 870.040415076, -1048.16513835, 350.824123253, 1103.3982956, -210.682789899, 109.203501473, 812.445688786, 1157.17992273, -106.107106686, -500.82201263, 651.144959058, 339.411278214, 399.106242253, -928.569506707, 271.483167061, 797.926162616, -668.286513613, -801.873518193 +303.214475758, 423.758614662, -377.1146779, -1028.37625311, -647.657596682, 938.742166688, 1001.1739963, 74.125279537, 649.366126959, 943.694958148, 237.812150229, -1029.80426481, -828.317067283, 141.001986736, -61.7697359383, 509.054267784, -214.444355855, 863.787854018, 840.950690469, -1151.70526834, -452.423657803, 182.808785573, 1148.48509661, -495.708293631, -827.090790009 +-1173.3807066, -641.640567607, 668.939866989, -82.8998363572, 404.563652076, -544.379547633, -188.785387989, 106.106961318, 539.21487625, -860.096458017, 487.443848631, 1086.10013681, -185.993638296, -1080.99788464, 234.013761002, 792.62808429, 213.340520192, 1161.0407035, -539.108601987, 839.989343426, -399.890272249, -404.710851235, 133.05415794, -1059.2828308, 51.0602947974 +573.897202162, -228.146349301, 692.574004353, -412.561635185, 286.789620187, -513.293990104, 802.117155875, -806.786741708, 480.079284881, 1171.55088222, -141.561731208, 1058.97211639, -481.101236361, -1086.48964756, 823.039529679, -667.028478235, -992.956194717, -505.582893235, 75.5933891074, 946.884900624, -662.360055833, -60.8358245711, -1152.4320543, 144.905718142, 354.072008163 +50.7096526824, 1170.43089725, -52.491492667, -1093.63219707, 131.142585009, 787.807605685, -331.960074112, -1120.98714766, 68.0568953355, 323.478998079, 482.246461527, -470.241733397, -605.204295716, 225.041101003, -440.599267356, 822.525218089, 888.674278117, -894.727121563, 505.545153337, 1099.33583295, -464.358987443, 672.372642872, -1077.08316449, -503.518489844, 1035.57200724 +-440.341144412, -402.701605219, 1166.79569881, 1018.62509328, 50.1125736926, -75.9345461497, -1148.12478226, -797.288205466, -241.147227119, -1066.43944695, 761.300008587, -512.356331918, -674.269502079, 545.975837955, 778.131646777, 197.25993589, 923.685334423, -187.073556196, -1170.23479294, 307.043204431, -297.640927692, -960.535926847, 421.305687768, 908.986920781, 156.049556053 +-741.229564045, 135.302044098, 881.010656211, 704.07732187, -276.98613987, 358.059984982, 5.97143106724, 613.657954996, 511.129800004, 789.730887531, 742.310568022, -926.784662779, 343.558604406, -140.439032146, -248.049892213, -372.179225858, 130.631733727, -615.652714905, -813.950835278, 239.799913818, -881.617545453, -1007.78401666, 1127.07199032, -1119.50130048, 891.724613997 diff --git a/code/plots/data/bins-convergence/20_2/AEP_opt.txt b/code/plots/data/bins-convergence/20_2/AEP_opt.txt new file mode 100644 index 0000000..3b691a5 --- /dev/null +++ b/code/plots/data/bins-convergence/20_2/AEP_opt.txt @@ -0,0 +1,10 @@ +295631.448365 +294514.254818 +293818.79259 +295078.701208 +294849.786631 +294103.426007 +293509.537833 +293937.364875 +292875.304793 +296694.67679 diff --git a/code/plots/data/bins-convergence/20_2/AEP_true.txt b/code/plots/data/bins-convergence/20_2/AEP_true.txt new file mode 100644 index 0000000..0ffaf69 --- /dev/null +++ b/code/plots/data/bins-convergence/20_2/AEP_true.txt @@ -0,0 +1,10 @@ +381485.094045 +380883.827616 +380174.043429 +381187.379836 +381095.638762 +380723.286797 +380510.232489 +380983.972721 +379179.878025 +382899.508225 diff --git a/code/plots/data/bins-convergence/20_2/boundary.txt b/code/plots/data/bins-convergence/20_2/boundary.txt new file mode 100644 index 0000000..3e576c2 --- /dev/null +++ b/code/plots/data/bins-convergence/20_2/boundary.txt @@ -0,0 +1,10 @@ +-0.000416205860574 +-0.00150396658205 +-2.58517093243e-05 +-2.03830818464e-05 +-0.000143326360785 +-0.00340073660186 +-0.000111776136919 +-0.000847522052254 +-0.00136169697839 +-0.000514640064239 diff --git a/code/plots/data/bins-convergence/20_2/separation.txt b/code/plots/data/bins-convergence/20_2/separation.txt new file mode 100644 index 0000000..1e4962e --- /dev/null +++ b/code/plots/data/bins-convergence/20_2/separation.txt @@ -0,0 +1,10 @@ +0.0212179291411 +36992.3026759 +22428.0573018 +3941.73394646 +6648.08146279 +0.273923580666 +7731.22545722 +0.0129739252152 +0.00160925880482 +1373.35849385 diff --git a/code/plots/data/bins-convergence/20_2/turbineX.txt b/code/plots/data/bins-convergence/20_2/turbineX.txt new file mode 100644 index 0000000..725582a --- /dev/null +++ b/code/plots/data/bins-convergence/20_2/turbineX.txt @@ -0,0 +1,10 @@ +-1021.48238695, 811.083260382, -1148.14831742, -519.642844394, 902.273340083, 204.44835495, -666.824529287, -503.044695522, 1010.19256359, 14.9309858042, -1161.5830664, -391.699902773, -1057.23223656, -316.555087848, 120.001891973, 357.21725483, 1154.75207782, 204.585072449, 652.499535796, 554.432694817, -114.998566355, -788.187272232, -225.271806554, 362.28766697, 493.813790281 +1172.93436282, -48.1901068563, -575.298022624, 396.758436848, 19.5308147062, 105.057261422, 208.114556837, -1160.27090883, -92.2303209329, -379.46870533, -228.736819186, 786.701659807, -407.245199425, 318.877404991, -870.768461124, 884.094478004, -509.463054725, -1051.31500179, 852.940172356, -683.015145845, 491.501421751, 637.414622031, -821.714408128, 1086.99237844, 1016.48232895 +1014.30305494, 503.236732272, -45.1383669265, -991.483484538, -390.378066736, 282.055661644, -724.649709186, -224.217292316, 376.39645902, -25.1651672026, 270.646015105, 411.113030431, 629.185460042, -325.043129155, -446.704229125, -1105.68372126, -138.275136014, -587.424910123, 143.733968944, -478.142828007, -841.057551131, 872.572387884, 738.3835136, 1150.93864056, -837.964582048 +-260.978353691, 1172.40120995, 627.083238146, 120.291315577, 523.108239125, -477.762009049, -86.4470480309, 206.176476083, 807.918485046, -988.682153463, -435.654559352, -1165.41074507, 365.952855179, -908.84326446, -108.228568081, -351.901084168, 974.811000734, 467.079163772, -706.30732263, 1089.40972944, 249.335466217, 53.8081883731, 767.301078298, -1041.44384434, -824.134815252 +324.885214677, -642.465351151, 194.949956623, -497.384156784, 665.825958168, 186.615375436, 490.925741323, 941.822578378, -1054.01443808, -773.451041987, -363.891657931, -169.767787214, 809.243921015, -1163.44179591, -15.7648088299, 1067.6433565, 1157.01827487, 842.914328099, -164.69750339, 255.545226527, -503.750216097, 604.785301813, -501.934831202, -1131.63935984, -986.197182325 +-186.061654891, -49.2231064526, -393.095102502, 581.932536497, 477.419942585, 856.248385694, 1155.68794703, -729.019444874, -1102.76979315, -635.713945189, 996.063741993, -490.429631796, -1168.97773497, -632.739462868, 1134.71098991, -842.983775912, -973.315021168, 370.343802214, 602.967945858, 710.691891065, -278.725776757, 154.710419032, -372.601794217, 224.660474875, 67.8321274983 +-508.351540724, 308.967845082, 455.248439439, -345.001406164, 1146.54958213, -1107.32446699, 801.307556648, 488.437836707, 900.967393205, 140.239461751, -973.082890902, -452.53534139, 727.676948583, 113.935251462, 135.508054766, -731.111853502, -480.737322462, 1015.20146646, 658.63386136, -172.611915407, -8.65198408082, 1165.59043491, -184.46628538, -1069.54974504, -804.83932066 +417.069778137, -37.9832091781, -405.258458085, 149.837281895, 1168.09948119, -858.189942009, 66.2397935853, 495.934944811, -1166.44068015, 122.457343706, -1099.72102597, -293.981293338, 549.478558936, 1069.00211991, -682.58401961, 740.937728699, -524.565976539, 886.211102183, 923.133822633, 281.37676673, -916.086311077, 215.237753921, -177.193801391, 1084.49038877, -536.676196904 +-647.864056086, 677.604997754, 188.263650424, 453.625162713, 1147.84691779, -960.649208615, -208.44257384, -848.389570371, 379.421882005, -482.43297669, 847.266556425, 1067.09614878, 335.794098124, -806.771891256, 533.800542495, 6.75683458773, -271.474032365, -1134.71887158, 251.726066036, -576.752125292, -117.254133355, 763.059052757, 328.955096903, -567.196100595, 946.45590045 +-196.029071487, 272.974978116, 432.58627955, 980.638782525, -275.543694401, 1122.31832542, 586.310047599, -827.353509401, 104.721374912, 714.980056652, -810.470426, 102.031739769, -1091.71595314, 853.276437794, 1145.92819516, -1147.69734408, -35.7561218697, -664.273719749, -953.034913509, -541.435777066, 885.500479944, 445.684787452, -449.962514934, -533.684019521, -156.471498517 diff --git a/code/plots/data/bins-convergence/20_2/turbineY.txt b/code/plots/data/bins-convergence/20_2/turbineY.txt new file mode 100644 index 0000000..5d777ac --- /dev/null +++ b/code/plots/data/bins-convergence/20_2/turbineY.txt @@ -0,0 +1,10 @@ +-577.676378435, -848.103824957, -242.675997032, -538.907168347, -146.921604724, 1155.56773305, 258.314616174, -1060.22754851, 597.199193884, -10.787066273, 166.915188381, 88.3171361407, 509.309469812, 626.281599736, -1167.36293118, -665.888581804, -209.006290527, 722.251147411, -74.7198116629, 1034.2825006, -709.280191632, 869.423208857, 1151.68983741, -43.3591783893, -1064.55805584 +-36.8910316584, -1172.52537728, 577.352053765, -959.236239364, -641.487540168, -16.9713329518, 427.462945821, -175.806307909, 1060.75409508, -1051.28678744, 579.655634455, 116.807906363, -536.662517944, 1129.3611566, -786.700835366, 771.694792255, -73.7320336441, 521.414158776, -805.996275589, 954.267619787, -129.869608602, 980.839123597, 225.945610427, 442.248731915, -400.374718053 +590.190820295, 54.9498354204, 1172.64590549, -37.45227217, 1106.68010887, 1139.11391027, 469.148999809, 273.558611, -632.687104256, -1049.01927284, -1141.87857794, 682.09766646, 990.586466932, 585.447282999, -110.276632144, -393.19130231, -483.799187886, -462.382852953, 162.503532468, -1071.68808059, 818.387492742, -117.09328856, -912.099605666, -229.076709987, -821.5541856 +298.884263548, -51.1008731282, -56.6292473191, -1167.33281077, -800.543358616, -840.18956955, -736.858740451, 1155.26064432, -851.119046846, 152.348630523, 1089.65179103, -137.672390576, 81.7303562816, 742.387925684, 1168.51293103, -228.508361464, -357.487795005, 654.504447159, 567.685532416, 436.259482776, -756.78725495, 192.591483147, 887.910438944, -540.861001372, -835.426684823 +241.529954104, 149.482063777, -529.183784329, -1062.89458454, -400.588456115, 1158.58129103, 1056.10985019, 116.162469159, 515.935517184, 882.558460714, 65.9084980673, -819.977469005, -849.85891665, 153.424641124, -54.8728747172, 487.107364451, -196.073013223, 816.47494546, 1161.89958383, -1145.35257838, -616.318697944, 330.07887354, 859.601354104, -310.690500716, -636.043289732 +-1103.32695549, -691.714885257, 719.916928603, -248.861281858, 427.719246011, -802.480523456, -203.76884003, 77.8084725103, 401.291278364, -605.380326159, 620.478434768, 1066.122056, -103.087344151, -988.320680174, 299.277421942, 816.403334196, -368.219135185, 1113.54455436, -743.749843908, 861.931142015, -230.738989741, -224.227322242, 301.974466496, -1151.8122869, 548.798464219 +597.590825495, -240.112300739, 537.140230681, -250.640524781, 250.119937109, -388.546567051, 857.346090842, -1067.0353418, 372.678551412, 1165.10463074, -139.50173046, 1082.75004349, -547.980140903, -1167.97033439, 729.908473577, -740.109052888, -1070.52674957, -588.644098027, 43.4322494404, 932.422019121, -607.381441822, -136.143644593, -1158.92540001, 482.907316275, 261.672503274 +167.841090225, 1172.89951655, 3.97018159658, -919.073971969, 112.60387159, 800.403651981, -253.64413151, -1063.57188423, -128.662428233, 306.385384932, 409.573019496, -640.191062651, -510.304040093, 484.118131938, -375.175688725, 910.026064505, 684.353097922, -769.263410395, 724.541304136, 1139.28190086, -733.431589296, 643.066866033, -1160.05959093, -448.349777658, 1043.60658204 +-210.928493979, -334.505436965, 1158.31479659, 1035.94478821, 244.097479055, -15.6851677447, -1154.8539865, -810.784252711, -146.997290771, -1038.89675137, 811.957891731, -488.308198576, -618.564566623, 852.206371942, 530.686809828, 106.49038488, 644.295514844, -299.247430005, -1146.19823606, 368.315117791, -437.316495802, -891.558968271, 324.096021877, 751.194282872, -6.67348996075 +-1002.11574838, -59.3607544823, 1057.87555337, 644.580494916, -351.177184503, 342.837536893, -165.315352111, 368.422791611, 984.788439017, 837.243528685, 848.690042383, -1169.07032199, 430.455773889, -215.047544664, -252.95193761, -244.799308319, 117.2719267, -499.034585616, -684.734086302, 287.62801572, -770.081239959, -1052.62215456, 1083.82220941, -892.095070618, 1012.20451757 diff --git a/code/plots/data/bins-convergence/20_3/AEP_opt.txt b/code/plots/data/bins-convergence/20_3/AEP_opt.txt new file mode 100644 index 0000000..81f507a --- /dev/null +++ b/code/plots/data/bins-convergence/20_3/AEP_opt.txt @@ -0,0 +1,10 @@ +307232.871646 +305007.663992 +302737.172906 +305573.738625 +307219.529183 +303819.788852 +306227.328636 +306919.10284 +304816.688251 +306848.723986 diff --git a/code/plots/data/bins-convergence/20_3/AEP_true.txt b/code/plots/data/bins-convergence/20_3/AEP_true.txt new file mode 100644 index 0000000..9780b6c --- /dev/null +++ b/code/plots/data/bins-convergence/20_3/AEP_true.txt @@ -0,0 +1,10 @@ +376223.846436 +372385.109652 +367032.826987 +371599.383134 +376933.435787 +368249.346528 +374635.951122 +376945.031022 +368458.052041 +375067.222445 diff --git a/code/plots/data/bins-convergence/20_3/boundary.txt b/code/plots/data/bins-convergence/20_3/boundary.txt new file mode 100644 index 0000000..f5d716e --- /dev/null +++ b/code/plots/data/bins-convergence/20_3/boundary.txt @@ -0,0 +1,10 @@ +-0.000560082730317 +-0.000380883813932 +-2.00361514544e-05 +-4.584735143e-05 +-0.000195410260631 +-0.000606621754287 +-0.000131064846073 +-0.000941855771316 +-0.000179018556082 +-0.000806978853007 diff --git a/code/plots/data/bins-convergence/20_3/separation.txt b/code/plots/data/bins-convergence/20_3/separation.txt new file mode 100644 index 0000000..aa9f505 --- /dev/null +++ b/code/plots/data/bins-convergence/20_3/separation.txt @@ -0,0 +1,10 @@ +0.201495641304 +0.0108476904279 +0.0119381127442 +1.97888584808e-06 +0.0218833180406 +0.0139215955278 +13398.6917109 +4249.44115649 +0.030088908883 +0.0072610937641 diff --git a/code/plots/data/bins-convergence/20_3/turbineX.txt b/code/plots/data/bins-convergence/20_3/turbineX.txt new file mode 100644 index 0000000..bc95b80 --- /dev/null +++ b/code/plots/data/bins-convergence/20_3/turbineX.txt @@ -0,0 +1,10 @@ +-964.6500754, 928.122626279, -923.82203876, -652.464766547, 889.420502721, 256.61930537, -801.600928802, -709.804240618, 1020.50784002, 40.4566890878, -1157.02209095, -271.931048732, -969.132572046, -504.870042166, -93.2603752924, 25.3389784428, 1148.28776586, -120.757126965, 568.710866379, 626.925112481, -352.953470732, -569.814013444, -117.040861678, 308.77687788, 635.023813398 +1172.83335428, -287.400418239, -523.687458051, 363.985480669, -2.26681386397, -134.886381369, 21.355037694, -1027.73561985, -265.203295351, -265.946586707, -267.415703281, 714.714309205, -424.611627966, -55.3975333927, -1086.13904029, 533.665752175, -528.320444756, -1004.04570398, 731.576747963, -636.979315769, 276.363389008, 648.442609577, -746.764473595, 967.028049503, 815.396086428 +1022.65516061, 544.544041956, -87.0917213881, -807.624560458, -432.909633815, 191.173256527, -605.137898659, -330.056161187, 429.314174285, 3.15293777195, 257.73342976, 529.227132141, 805.769740966, -132.118823054, -337.381791705, -1086.98283857, -397.935944672, -498.285692037, 222.795350977, -484.170906312, -729.590553878, 766.01071136, 677.096207416, 1122.34523744, -834.240130971 +-309.343973771, 1066.65497839, 593.297536753, 36.5370138408, 599.650269964, -409.951336108, -80.113445759, 22.3522069819, 757.028470183, -830.764594585, -384.551692367, -855.638963445, 660.170699266, -647.944576518, 136.886975104, -198.274976341, 1027.71890576, 514.305495127, -563.166301572, 959.012439675, 291.358622447, 1.42602650154, 956.845811314, -923.984048041, -813.583651529 +371.232112222, -789.445375653, 67.0107572472, -552.969765839, 835.026234618, 269.911510139, 502.338221678, 989.790788528, -990.659947748, -753.383782623, -467.462280396, -228.110708166, 726.638684895, -1144.72142528, -140.738934955, 1086.71842202, 1148.44099803, 878.151724057, -123.251341167, 374.536729793, -450.626824342, 629.526826178, -449.451298638, -832.45715174, -877.11458121 +-124.057706009, -435.824695089, -306.325574679, 457.773957381, 279.546696005, 1028.99526846, 736.264884137, -541.101950563, -985.737082592, -639.052076774, 805.664503337, -440.844186579, -1172.52972952, -674.890565522, 1056.6688379, -543.653348983, -849.601443024, 279.381336006, 638.716666638, 324.722452052, -539.060799291, 3.45678588641, -185.271436762, 541.66231637, 126.964955181 +-400.561692187, 469.156601838, 503.563880587, -471.372443423, 1062.21931294, -1099.15896935, 939.433154374, 555.927494068, 708.837592852, 235.189513632, -890.499574568, -334.510449973, 753.276512461, 687.977746009, 455.449902909, -717.92937876, -516.417913031, 1085.47079498, 521.682053881, -77.2587763459, -18.140881989, 1097.70810748, 262.317070937, -1169.70599615, -768.493233355 +564.984681191, 100.738717363, -274.337181501, 432.732782451, 916.960498658, -767.862072365, 260.449116457, 240.837138948, -1116.15119386, -274.42345702, -1096.63985502, -392.804875577, 684.529351623, 768.20374159, -679.96572712, 535.570002393, -192.699803898, 924.018904164, 1060.71234928, 477.109573929, -1051.02296369, 186.995883091, -558.099422013, 1088.90560504, -396.849348458 +-571.725652181, 662.830517784, 580.246920131, 580.436184504, 1032.97023084, -1025.58165807, 76.4085582777, -379.116761761, 368.17140868, -375.23175865, 1140.75861448, 945.030653712, 429.81254338, -939.746050672, 467.383250839, -200.229930322, -442.998208349, -1117.84110089, 339.198181678, -561.156735784, -13.9692465856, 654.196660091, 225.747061296, -739.667132544, 830.208660061 +-384.154697213, 253.824329742, 122.221816945, 934.424425236, -90.7417004366, 1059.86834676, 591.053571076, -658.659921523, -236.458796518, 736.202197561, -848.540553885, 73.5507110246, -1038.80776234, 883.042600485, 1140.76773182, -1104.31283557, 40.1967513441, -656.925279229, -913.260798147, -211.934455098, 759.95184718, 212.196324104, -466.380299897, -501.106402915, -354.271276275 diff --git a/code/plots/data/bins-convergence/20_3/turbineY.txt b/code/plots/data/bins-convergence/20_3/turbineY.txt new file mode 100644 index 0000000..9b2138b --- /dev/null +++ b/code/plots/data/bins-convergence/20_3/turbineY.txt @@ -0,0 +1,10 @@ +-668.271052184, -615.128003032, -370.598306819, -557.835798887, -188.093026659, 1026.50196243, -33.2199460688, -878.14587503, 579.395930489, -100.972146852, -196.050750209, -49.9516353878, 650.109643795, 208.669661919, -1168.81981254, -459.393619695, -242.015064098, 619.101251684, -269.13473111, 992.01920821, -783.820001898, 1025.88897092, 1058.2627656, -263.259093364, -986.853946916 +-39.9731778644, -1110.96985082, 686.865065699, -954.921374868, -555.984941908, -149.397439053, 509.805624183, 197.495223417, 1081.84416143, -851.856105561, 642.992539499, 430.89583724, -321.486816114, 898.978719098, -444.339853865, 743.72499859, 104.95265365, 607.476866803, -917.568660849, 985.592846057, 70.8648968785, 977.020081726, 392.851991665, 368.143989843, -417.60374397 +575.597362265, 272.17154422, 856.842370501, 5.44608807816, 1090.7452282, 663.448796929, 396.75391727, 351.23743637, -62.954389152, -899.001576717, -1107.85304936, 675.837088759, 853.153598806, 562.295394669, 83.9503753997, -442.271668439, -430.293943929, -190.439946377, 253.788037381, -712.582666218, 757.476282806, 423.151607149, -958.476197685, -274.787035914, -825.335869476 +415.589649006, -144.416337177, -294.134689035, -1067.47557098, -689.72574481, -845.846794986, -723.709855008, 679.696195237, -896.684924596, 225.397186212, 1064.09447321, -84.7850608575, 63.7565856138, 978.418994662, 1152.90849364, 69.9323549701, -566.506707758, 462.71613553, 310.693954721, 392.499741008, -750.236154734, 337.737923321, 679.398265806, -549.874390152, -845.705346768 +232.946722951, 409.150106438, -377.661880394, -1035.06537581, -282.852904424, 889.681247511, 1060.56221138, 120.116272024, 628.950268268, 899.749474155, 111.790299571, -836.587934564, -921.483896676, 258.357823405, -128.395662974, 442.921204873, -241.286514186, 778.450692954, 775.801446606, -1053.22438365, -379.485702803, 262.676550158, 1017.56146343, -495.289562778, -779.619090952 +-713.669095781, -505.40417952, 436.373897085, 108.138750689, 376.742022395, -564.184925217, -51.4580960217, 181.431561405, 580.436348806, -700.947198855, 442.677388128, 1087.56262762, -48.0616935193, -960.030685773, 510.477373025, 760.513255621, 64.5287543151, 1139.77276725, -378.512444622, 695.927384636, -187.573820177, -121.860204437, 66.133015222, -1041.02797771, 129.63737583 +454.7317342, -160.421927536, 580.313529264, -279.802315545, 365.774159771, -411.078492722, 703.278968786, -520.653288119, 375.701943024, 1149.70508896, -82.7959551544, 1078.45751598, -198.102668743, -950.695825054, 865.295875281, -814.890330176, -1051.76582876, -445.970125066, 119.291798617, 935.183672825, -505.527838354, -45.913545655, -1130.96754411, 94.4662689107, 348.906976211 +-15.7100652238, 941.704099588, -170.591093681, -721.257496846, 73.3605046459, 820.405582384, 89.1255279358, -1148.53533199, 16.7333791557, 265.190922708, 417.75433616, -597.300343809, -378.739016508, 600.418823022, -389.462085626, 733.576566107, 853.210444314, -723.413551778, 502.022009301, 1072.14863699, -522.002979658, 676.6471179, -1032.30856074, -363.909662677, 1104.37611959 +-114.481440825, -544.455096304, 1020.02427299, 743.610368208, -124.001926746, -42.6183189374, -1171.02418883, -691.406090338, -514.850452368, -1100.28081468, 275.328351095, -695.739444973, -767.440098188, 702.860798412, 396.551934833, 22.2488024079, 543.468730391, -357.165478541, -1016.58573804, 238.093853787, -247.989548736, -909.471627444, -72.187521644, 536.823282743, -328.374208754 +-562.708758105, -45.2606807198, 816.118510664, 709.920353603, -326.799703508, 396.012656687, -163.387114427, 606.844907971, 464.918557478, 533.715905169, 810.626250691, -774.522635184, 520.345591853, -309.615316216, -275.293965852, -397.02606267, 233.611199606, -636.759766119, -680.260147818, 170.130005547, -894.20870714, -1154.17012104, 1076.85903121, -1061.14491325, 828.648258085 diff --git a/code/plots/data/bins-convergence/20_4/AEP_opt.txt b/code/plots/data/bins-convergence/20_4/AEP_opt.txt new file mode 100644 index 0000000..d3aa9bb --- /dev/null +++ b/code/plots/data/bins-convergence/20_4/AEP_opt.txt @@ -0,0 +1,10 @@ +385479.551983 +389110.852544 +387289.422624 +386074.875999 +387892.043433 +389393.978578 +387074.041219 +388172.762575 +386567.084007 +386833.848483 diff --git a/code/plots/data/bins-convergence/20_4/AEP_true.txt b/code/plots/data/bins-convergence/20_4/AEP_true.txt new file mode 100644 index 0000000..dd7b510 --- /dev/null +++ b/code/plots/data/bins-convergence/20_4/AEP_true.txt @@ -0,0 +1,10 @@ +379057.661466 +380299.738709 +378355.574542 +378224.195815 +379856.906427 +379251.742163 +379172.049665 +380196.61656 +378878.725987 +378651.456339 diff --git a/code/plots/data/bins-convergence/20_4/boundary.txt b/code/plots/data/bins-convergence/20_4/boundary.txt new file mode 100644 index 0000000..eff717b --- /dev/null +++ b/code/plots/data/bins-convergence/20_4/boundary.txt @@ -0,0 +1,10 @@ +-0.00115220083126 +-1.91291746887e-08 +-0.000182736320085 +-1.4291822481e-07 +-3.35164168064e-06 +-1.86287934412e-07 +-2.27373675443e-13 +-0.000334867797847 +-1.41346504279e-06 +-6.45048833121e-05 diff --git a/code/plots/data/bins-convergence/20_4/separation.txt b/code/plots/data/bins-convergence/20_4/separation.txt new file mode 100644 index 0000000..217c75b --- /dev/null +++ b/code/plots/data/bins-convergence/20_4/separation.txt @@ -0,0 +1,10 @@ +0.0760997908365 +3.92901711166e-10 +2478.60104443 +5117.18356543 +0.00044863934454 +1469.10788308 +2.61934474111e-10 +0.0458864104003 +2.461092663e-06 +0.00426467027864 diff --git a/code/plots/data/bins-convergence/20_4/turbineX.txt b/code/plots/data/bins-convergence/20_4/turbineX.txt new file mode 100644 index 0000000..70f0119 --- /dev/null +++ b/code/plots/data/bins-convergence/20_4/turbineX.txt @@ -0,0 +1,10 @@ +-993.047462102, 1030.09472279, -832.46816869, -562.421592263, 944.100674471, 417.359601101, -867.10305004, -656.625687406, 887.055829391, 208.211058984, -1152.11867551, -170.019539419, -1010.062215, -495.916005127, 28.0900162268, 117.183992005, 1160.13776101, 132.287575676, 677.149916131, 754.33058558, -332.291960652, -392.272136711, -176.885070022, 471.309773085, 585.956156408 +1170.48072069, 26.7803890143, -686.50549327, 408.654431705, 323.16054178, -133.049313392, -4.05312878382, -1128.49960381, -56.9893838214, -257.79721321, -338.990083425, 634.925971185, -527.997639724, 175.635181568, -884.382544563, 547.527610479, -758.863622111, -1062.13565932, 813.015236398, -448.440263255, 220.520712559, 728.334610872, -1003.26588938, 1100.34011761, 1047.28075508 +1047.63957676, 566.238500543, 62.079000202, -901.158253709, -346.514810999, 343.250656222, -771.939576028, -471.126177295, 465.640070489, 113.852054526, 351.686060513, 594.901519707, 892.041972593, -133.061159099, -272.682728059, -1151.4741681, -196.950292532, -619.241185285, 147.898609144, -513.185222106, -835.405745102, 832.686825587, 729.104149384, 1131.14291067, -971.585254661 +-339.506534268, 1128.23900184, 526.370128769, 130.054848237, 600.081769514, -561.356817889, -169.617317718, 61.5545271946, 688.580609228, -1053.33149657, -405.24209398, -985.390211954, 513.388584581, -795.669764841, 230.644915029, -262.399322502, 969.90054306, 431.300131175, -728.44922809, 1073.47926506, 142.930316484, 10.3561648102, 883.231880031, -1114.47073401, -815.655015415 +302.922089499, -763.402874245, 218.504354693, -527.67460268, 779.016762965, 208.422465375, 566.860254929, 1003.31596355, -968.608044036, -619.956009374, -363.712143147, -162.013523118, 754.917350857, -1173.06108906, -74.1801789058, 1085.00150033, 1147.63244326, 873.783920123, -51.4189666326, 351.747406294, -453.712236273, 664.903110041, -338.071379036, -1097.54327377, -823.843891893 +45.6633174575, -424.913135438, -140.603240119, 575.441908201, 277.519499198, 1071.04114761, 820.61420316, -524.774700627, -1039.37283664, -787.355690612, 938.256447303, -395.813282345, -1131.93011774, -271.536425162, 1171.58002413, -596.771493278, -952.992981272, 350.975046204, 690.536041577, 741.785538751, -735.114715068, 97.843808821, -226.076396745, 405.978566426, 206.571319013 +-501.257263807, 205.937555675, 334.899214841, -395.537191318, 1107.48299484, -1110.36825898, 837.441496517, 516.202345713, 644.916067704, 69.5522304279, -862.195487528, -659.67994624, 739.812929901, 312.666928109, 0.252337229714, -750.897676061, -492.384911212, 1017.11952917, 411.321181249, -410.518187683, 80.0127080736, 1165.17352331, -30.604869743, -1170.3964996, -796.756449379 +622.024940204, 67.900632823, -427.175411105, 121.269762502, 1130.80683457, -903.581648979, -158.389318062, 503.357237916, -1173.16904945, 271.94264338, -965.763024008, -509.355683327, 189.801572502, 735.229968754, -829.381834894, 658.303802858, -333.195932609, 852.869610279, 1045.37971126, 425.509579578, -1079.29538515, 9.85324723993, -256.324280987, 1131.01796307, -606.766310382 +-551.355732877, 593.808256149, 230.37072612, 607.210214901, 1066.70447425, -952.608152869, -287.277019664, -576.640298322, 111.241997341, -531.67929261, 851.262339761, 1007.04706785, 305.430741019, -1027.96992973, 302.395037316, -211.98491385, -296.153353103, -1154.15257143, -10.3395686098, -621.60026403, -140.643339701, 681.921428392, 192.427783879, -703.510605614, 891.833758974 +-441.085750915, 282.334273529, 218.77282956, 937.184145685, -67.1113608597, 1121.64088114, 587.824852603, -644.356084591, -244.135914831, 709.811517499, -972.749957187, 54.9074607562, -1045.76000413, 872.22261341, 1137.76522709, -1122.21889005, -43.217056946, -692.591132383, -936.873242296, -565.74498918, 726.850719277, 403.962439515, -511.215337385, -256.383681297, -177.890803359 diff --git a/code/plots/data/bins-convergence/20_4/turbineY.txt b/code/plots/data/bins-convergence/20_4/turbineY.txt new file mode 100644 index 0000000..8321089 --- /dev/null +++ b/code/plots/data/bins-convergence/20_4/turbineY.txt @@ -0,0 +1,10 @@ +-625.294498171, -562.17542388, -201.623896617, -387.618264351, -32.0170171018, 1056.74800814, 279.80352039, -972.61570133, 570.753394166, -68.0145441599, -5.34664829845, 57.8447694576, 597.419746694, 154.119117373, -1133.92156265, -562.104767685, -176.682406144, 771.018152043, 171.409978712, 898.956293877, -792.968086169, 1106.01020112, 960.378859705, -289.746094228, -1011.80856463 +-84.3254059067, -1173.20872071, 596.819354284, -1040.32369227, -600.564763651, -392.273650979, 275.647056179, -321.90765104, 1150.43200162, -1100.02436696, 407.64672411, 1.93177190663, -565.264812094, 981.155709545, -771.364639107, 586.209725991, -52.5691690175, 499.002738257, -826.164663139, 1084.45249869, -178.326340908, 920.14378561, 36.1299389412, 407.906260272, -416.492025656 +528.760075314, 44.6291300521, 1109.87827907, -32.8474863151, 1121.18844788, 504.430206482, 413.571115502, 418.12076286, -428.034290648, -1003.32911748, -1119.57707076, 1011.5473779, 762.493966348, 718.34438047, -96.2655302668, -226.370405933, -744.708344527, -306.007460188, 119.320635315, -1055.35630525, 824.15607658, 237.261628966, -919.53414475, -312.492717293, -658.147388392 +634.205893194, -159.265411301, -230.228916536, -1072.28764402, -647.474980812, -933.427382427, -527.746186308, 861.984885702, -950.259247004, 375.972389986, 1100.97911032, -38.861978283, 174.142125495, 862.580730678, 1150.6254016, 79.8932279968, -660.627601886, 730.70108935, 447.010095849, 401.944748273, -617.023125339, 287.635704903, 772.681912504, -367.54710557, -843.707761938 +269.067601172, 235.245896846, -354.133155442, -1043.86081089, -253.470090161, 891.854950099, 914.288231767, 112.339219217, 662.521209515, 996.388698425, 165.970141016, -999.863647866, -898.462957112, 32.6125863147, -117.364943693, 393.043162484, -245.103380999, 783.350210699, 900.934083371, -1113.71537219, -464.164717789, 385.283657688, 1003.97010259, -412.709639741, -835.713548011 +-999.155496464, -757.521235651, 648.662615572, -217.331980199, 425.095368559, -479.590191719, -311.98742731, 271.747971159, 544.830247001, -686.839344195, 524.727663995, 1104.74781613, -309.628972085, -1141.66714127, 67.3508654272, 788.585630595, 60.1875704508, 1119.56244429, -918.087445372, 909.334980172, -104.556360578, -487.242080965, 153.78047008, -1101.05281233, -71.9197846473 +171.552819861, -289.602779481, 574.397557953, -421.426183441, 351.789668578, -379.760741837, 822.087362448, -848.856351092, 443.317133831, 1171.45139841, -218.782734639, 970.545341607, -369.105922068, -1131.09472797, 686.653189026, -761.547616938, -1038.01983702, -585.323632669, -23.3218378849, 896.259285899, -661.238153738, -139.665858934, -1157.866076, 85.4864042771, 276.736208172 +-175.580183459, 1171.54829894, -103.395906034, -953.750782282, 78.4843927943, 710.700503286, -293.922275865, -1037.14502449, -28.4663485047, 165.074071539, 212.700288688, -679.582134934, -414.761602188, 443.704762748, -388.997430863, 971.479686186, 777.26495396, -806.070314957, 533.214095964, 1093.65354669, -460.713979059, 662.870216203, -1145.17849963, -312.945260501, 1004.47527587 +-159.734046881, -516.874617421, 1150.68033008, 1004.20697559, 348.52194475, 50.8729451979, -1134.86018005, -585.599909133, -426.768756321, -1046.16108772, 807.767491659, -602.488252915, -1133.07014525, 566.050983074, 723.75144076, 178.838951016, 691.012165416, -212.291623621, -1121.85154648, 345.078612214, -347.354785571, -955.049243417, 192.954176897, 907.625442123, 48.4687162887 +-683.576645009, 58.5560558519, 836.202956417, 706.273162121, -279.933372023, 345.047499231, -182.943243165, 479.308722987, 579.123524988, 541.943363995, 656.424732793, -969.537435373, 216.570533263, -97.9295178537, -287.447699653, -343.16273528, 167.273361014, -617.656010894, -706.685528702, -28.2420069936, -921.316417736, -1101.79410198, 1056.31189158, -1145.16521458, 1042.92834905 diff --git a/code/plots/data/bins-convergence/20_5/AEP_opt.txt b/code/plots/data/bins-convergence/20_5/AEP_opt.txt new file mode 100644 index 0000000..bbd2b99 --- /dev/null +++ b/code/plots/data/bins-convergence/20_5/AEP_opt.txt @@ -0,0 +1,10 @@ +350892.056451 +350305.523278 +352087.999532 +350130.291442 +352007.408988 +350591.80411 +351213.125044 +350171.166158 +351365.38273 +351958.131903 diff --git a/code/plots/data/bins-convergence/20_5/AEP_true.txt b/code/plots/data/bins-convergence/20_5/AEP_true.txt new file mode 100644 index 0000000..ef215c2 --- /dev/null +++ b/code/plots/data/bins-convergence/20_5/AEP_true.txt @@ -0,0 +1,10 @@ +381035.232304 +380696.805371 +382738.617627 +380693.611149 +381652.184506 +381153.502722 +381290.607104 +380219.09171 +382274.401351 +382140.766554 diff --git a/code/plots/data/bins-convergence/20_5/boundary.txt b/code/plots/data/bins-convergence/20_5/boundary.txt new file mode 100644 index 0000000..7240d8d --- /dev/null +++ b/code/plots/data/bins-convergence/20_5/boundary.txt @@ -0,0 +1,10 @@ +-0.00167414898715 +-0.000136528504527 +-0.00107799279544 +-0.00231404791589 +-0.000750393656745 +-0.00178992621522 +-0.00874951207538 +-0.00267556937229 +-0.000257921306002 +-0.000359562090807 diff --git a/code/plots/data/bins-convergence/20_5/separation.txt b/code/plots/data/bins-convergence/20_5/separation.txt new file mode 100644 index 0000000..7323da7 --- /dev/null +++ b/code/plots/data/bins-convergence/20_5/separation.txt @@ -0,0 +1,10 @@ +1.76795335719 +4900.07910791 +12020.0195085 +21238.4036395 +0.041414006002 +1.23044938176 +4445.48260815 +37744.2912756 +31895.6949202 +14972.4125158 diff --git a/code/plots/data/bins-convergence/20_5/turbineX.txt b/code/plots/data/bins-convergence/20_5/turbineX.txt new file mode 100644 index 0000000..12a5acb --- /dev/null +++ b/code/plots/data/bins-convergence/20_5/turbineX.txt @@ -0,0 +1,10 @@ +-904.367879262, 920.733018214, -921.517203263, -576.973002118, 899.708409498, 417.156389345, -715.377375164, -621.041388905, 1007.28700199, 308.386060785, -1162.97449088, -118.643900823, -1047.40929303, -452.896386219, 67.0328239312, 170.716730815, 1154.57160524, -14.4548268332, 625.668349026, 736.456800522, -250.084894508, -606.875462126, -270.738260728, 429.748562562, 489.746594386 +1168.67283742, -538.931106444, -667.056185756, 329.889205826, 56.4389090379, -149.150684986, 72.2426628182, -1150.15370542, -47.7647673729, -263.026769898, -383.676401229, 735.710591197, -378.335828316, 357.51707739, -898.381636531, 622.87128376, -794.433744813, -941.935059258, 831.864445318, -549.006916444, 480.089370608, 680.581449514, -1053.71961645, 1051.46312145, 965.306569443 +1068.71726177, 654.9825095, -255.107107295, -1130.24981955, -602.549792665, 113.920141085, -743.288219874, -418.821290375, 349.56586671, -0.513892892992, 437.029258794, 537.407839226, 774.898439007, -264.707975217, -106.673396189, -1147.76808311, -549.11506144, -446.767953264, 218.704957511, -289.838688241, -975.525133519, 1172.94989539, 796.825152995, 1029.93620496, -881.68455121 +-278.348298072, 1172.76321919, 338.700373003, -66.6820688407, 671.055807216, -519.295509196, -139.279647672, 124.350838207, 546.722281308, -1063.15423389, -381.775185175, -1166.74662303, 738.015712432, -802.561653408, 170.647135354, -207.42778527, 1011.10106111, 485.140322133, -730.612167341, 1113.46905199, 205.628430696, 19.6328797288, 846.565703911, -1074.97453828, -825.084227818 +369.449123436, -762.776121788, 243.571897597, -581.322118171, 580.142272764, 249.339562639, 501.410897877, 934.497933306, -1061.9210906, -625.627214404, -449.335533199, -221.131528484, 810.071195841, -1171.75055082, -73.2609900711, 1030.44571073, 1158.37119178, 752.255660738, -10.6352307822, 150.798024682, -349.166027566, 654.017785736, -266.891073203, -904.810860642, -869.068259273 +134.974744171, -354.727044074, -250.48760991, 554.481916854, 228.693882266, 1073.7482732, 896.714050515, -538.062412811, -1031.37262978, -692.193614819, 988.910072338, -363.021345782, -1138.06838671, -924.907681685, 1167.33005022, -674.785710839, -1158.08740324, 327.262678527, 788.273695642, 722.59251455, -626.6497324, -89.9336931428, -192.281725844, 405.133597057, 248.212490795 +-355.355269986, -21.1859110862, 235.088548169, -630.746923063, 862.259646045, -1052.54023746, 865.841870369, 316.239167162, 516.837090184, 140.173532836, -945.050210026, -521.419080079, 707.88690237, 565.30533381, 491.6176903, -832.840913979, -510.37895505, 1044.47360157, 386.453210191, -212.429092016, -139.762686139, 1161.04482769, -143.809405944, -1172.61339376, -829.844448961 +556.301846391, -102.344461128, -382.864905391, 120.309508615, 1159.03323229, -869.094856997, 105.854641962, 127.123356359, -1167.72403529, 120.885968089, -1131.97707376, -620.563386764, 437.686270457, 785.643678956, -767.406111957, 675.371702087, -252.61401273, 892.64260669, 1011.11762911, 340.333284512, -1032.32854634, 9.27659389418, -479.968608401, 1149.05837851, -577.185410516 +-696.605521273, 586.312213626, 163.654094217, 744.55337758, 1170.79190339, -1172.89957194, -226.968786871, -799.81165841, 305.20685777, -542.191693801, 998.263833815, 1036.73640244, 206.20057517, -1052.47343561, 445.376969986, -296.401816087, -408.490551748, -1071.57067567, 170.810806552, -679.336944559, -133.006488545, 697.507457455, 14.4500246241, -719.937158986, 873.320134291 +-359.693709097, 332.46368458, 170.434205014, 977.921199737, 17.7162159747, 1162.66182592, 591.308935463, -588.883807381, -308.412952441, 741.571408905, -986.775008157, 153.746237811, -1162.66269778, 856.431562896, 1103.75495181, -1099.63964995, -2.44494490398, -790.947483381, -581.179336735, -704.302359171, 765.2399264, 439.979500596, -496.072943857, -162.30167527, -169.260553046 diff --git a/code/plots/data/bins-convergence/20_5/turbineY.txt b/code/plots/data/bins-convergence/20_5/turbineY.txt new file mode 100644 index 0000000..8557a46 --- /dev/null +++ b/code/plots/data/bins-convergence/20_5/turbineY.txt @@ -0,0 +1,10 @@ +-747.834435141, -727.591303129, -282.780659557, -439.758544687, -158.55695871, 1096.86680916, 336.328961933, -995.714524415, 602.089247774, -32.8839106261, -156.927452332, 59.7783265158, 529.219079109, 204.200436817, -1171.59855842, -558.044965585, -210.001291801, 706.312848657, -112.228180235, 837.697974252, -640.85156187, 1004.40945113, 1141.85811711, -580.733526408, -1066.43584222 +-106.489052538, -921.767578217, 594.002650193, -1054.36601301, -889.321582594, 14.0486729929, 395.285895353, -232.98603722, 1172.5418791, -1143.6577855, 510.705659705, -234.129016652, -498.529187317, 974.995722205, -755.014225319, 434.686191727, -340.763335961, 699.924493616, -827.730384208, 1037.17288724, -44.480649601, 956.004603388, 174.372796732, 295.127293449, -374.790901615 +484.748633851, 73.1896555255, 1145.4502801, 315.708261005, 1007.01113826, 1129.12485068, 197.705497691, 110.966365759, -479.205458698, -1173.51467618, -1089.10209823, 713.706821302, 881.288286862, 746.265977876, -67.0748526094, -244.468913734, -974.352552134, -354.985086875, 337.161647214, -1085.68889754, 652.293885327, -36.3930772427, -861.514957109, -562.467630516, -774.447294531 +346.863192095, -42.0446720316, -243.253717156, -1171.61828527, -489.413348462, -1052.36366737, -716.799794395, 716.263096714, -1038.37885614, 496.829201677, 1109.67736482, -125.853941665, 97.636359938, 856.172158596, 1161.04082541, -286.668048593, -595.659784632, 594.186594257, 268.920667357, 370.571029118, -701.928526722, 353.617547423, 812.68838331, -470.707620509, -834.48955826 +173.251431567, 288.253567601, -628.764200529, -1019.41184113, -330.019352902, 1102.42306714, 1038.69890949, -52.0237627151, 499.459368049, 992.837744924, 73.6838542068, -1107.253624, -849.070405072, -64.3296154561, -16.7804190765, 561.531945848, -187.91546732, 900.692840124, 1098.79640688, -1163.7851447, -693.457057489, 295.988314434, 1142.76212807, -416.460995453, -788.578711059 +-1001.0887173, -694.119989614, 551.984014437, -203.298831697, 470.06326863, -473.501408783, 9.11056880336, 304.419622262, 559.827484909, -947.631005671, 631.820355343, 1115.95395607, -286.245684274, -722.276562757, 120.322115639, 960.10427429, 189.658978888, 1126.95860666, -693.481786672, 924.660214352, -233.468266285, -870.637863434, 80.8983506895, -1101.36519673, -84.9860167491 +184.574392534, -8.87330299206, 707.166149964, -306.187043047, 355.46694655, -518.936734159, 792.119791444, -685.258870924, 521.435936577, 1165.11398745, -96.3631140182, 1051.31254221, -313.526923556, -1028.3833545, 1065.58363051, -826.748249326, -1056.71981514, -534.989395593, -175.274690834, 1154.12751781, -710.559349395, 170.618915667, -1164.67234091, 45.9761989492, 636.519465536 +-96.9799022098, 1169.04299908, -232.847037012, -808.265725873, 183.789020457, 649.809426042, -376.99451341, -1166.60858015, -116.436212413, 45.2276028635, 309.458531504, -727.442286537, -584.330613026, 293.99923843, -370.551378282, 959.692210249, 769.039686293, -761.790766936, 595.631676144, 1123.08111653, -558.062431379, 474.065427577, -1070.87165871, -238.342220339, 1021.75970611 +-218.25782906, -292.166032558, 1162.04704522, 907.070168119, 79.8889379679, -37.9801450034, -1151.35621422, -858.741681416, -93.8854784993, -1040.75170519, 616.932323357, -549.830708005, -695.208821849, 519.072407535, 698.387572639, 126.408622185, 1100.12334383, -478.405926926, -1161.01661436, 391.938250254, -557.38556298, -943.726301276, 270.92626245, 926.728967377, -98.294519401 +-713.608996701, 25.5923896485, 1161.07195012, 648.695641351, -304.650392717, 159.227477928, -99.1936216314, 454.096161687, 309.077563996, 909.509637668, 635.146512524, -936.908494114, 159.223700121, -231.549061375, -398.573771362, -409.791014834, 145.226716523, -595.333157825, -1019.49327241, 23.7414685048, -889.687450474, -1087.91266674, 1063.50718287, -1162.2367265, 1161.24381479 diff --git a/code/plots/data/bins-convergence/20_6/AEP_opt.txt b/code/plots/data/bins-convergence/20_6/AEP_opt.txt new file mode 100644 index 0000000..4b2f63d --- /dev/null +++ b/code/plots/data/bins-convergence/20_6/AEP_opt.txt @@ -0,0 +1,10 @@ +358209.188288 +357752.07072 +357025.345403 +357673.141042 +357185.886048 +356852.373436 +357199.037705 +357437.820425 +356822.743861 +355499.195622 diff --git a/code/plots/data/bins-convergence/20_6/AEP_true.txt b/code/plots/data/bins-convergence/20_6/AEP_true.txt new file mode 100644 index 0000000..9e34a91 --- /dev/null +++ b/code/plots/data/bins-convergence/20_6/AEP_true.txt @@ -0,0 +1,10 @@ +380897.982148 +381349.565076 +380321.48815 +381536.548193 +380358.059601 +378929.299842 +379787.619611 +380074.915502 +379206.379451 +378455.454743 diff --git a/code/plots/data/bins-convergence/20_6/boundary.txt b/code/plots/data/bins-convergence/20_6/boundary.txt new file mode 100644 index 0000000..e050a47 --- /dev/null +++ b/code/plots/data/bins-convergence/20_6/boundary.txt @@ -0,0 +1,10 @@ +-0.00321284951428 +-0.00032585955114 +-0.00023120240985 +-0.000759922148745 +-0.00263633370423 +-0.000567285792386 +-0.00157893675532 +-0.000515277913337 +-0.00169703651022 +-0.00186756683524 diff --git a/code/plots/data/bins-convergence/20_6/separation.txt b/code/plots/data/bins-convergence/20_6/separation.txt new file mode 100644 index 0000000..e1adcbc --- /dev/null +++ b/code/plots/data/bins-convergence/20_6/separation.txt @@ -0,0 +1,10 @@ +22377.4797954 +31864.3092736 +16629.6014093 +13743.418107 +1048.99890472 +25752.7717501 +0.000198059700779 +38071.22427 +0.160368716039 +5695.2351685 diff --git a/code/plots/data/bins-convergence/20_6/turbineX.txt b/code/plots/data/bins-convergence/20_6/turbineX.txt new file mode 100644 index 0000000..8de5e10 --- /dev/null +++ b/code/plots/data/bins-convergence/20_6/turbineX.txt @@ -0,0 +1,10 @@ +-1042.58970669, 916.764489658, -588.948243303, -731.511993849, 818.361279312, 333.168627213, -914.400209321, -438.033864049, 1078.48698561, 122.522762033, -1155.7465427, -177.110352259, -1018.1275385, -487.333471505, -13.4629955854, 227.318979285, 1159.93937069, -30.8022782575, 519.259531337, 640.846806051, -279.671337493, -769.684072273, -358.834215961, 462.211923543, 332.532817378 +1173.15135927, -646.577671777, -481.005907028, 506.556686143, 38.3861786174, 64.4711683538, 151.450363239, -1129.59820421, -111.516768189, -194.840306155, -325.468318566, 761.312664283, -336.063745444, 264.075767736, -919.8736694, 566.965268165, -780.545475329, -1074.5740104, 840.5273083, -593.995258565, 425.302624328, 654.805828476, -1173.36901542, 1104.35201164, 1055.12801147 +1020.72831697, 490.109078122, -28.9711626787, -1015.23134518, -475.688650849, 289.158998417, -766.549907096, -386.123465421, 502.028856603, 59.8654792755, 333.356377244, 580.681193221, 813.189940821, -153.273721181, -13.1630743543, -1120.35680287, -237.352274675, -651.653235893, 139.45695917, -563.135626172, -879.188392845, 725.197971943, 683.863981052, 1096.08796483, -889.55538999 +-438.686292205, 1171.88944368, 280.988362387, 85.8444132689, 520.131574918, -473.978285473, -173.324359676, 63.3549757093, 829.354790039, -1062.97071909, -349.109392673, -1167.38832226, 683.72263056, -822.38614867, 129.402434204, -625.175331543, 1048.02093221, 426.871372117, -736.310119627, 1060.65926613, 198.0676388, 8.42894239802, 795.374091561, -1045.33370022, -719.015307859 +327.132629041, -657.470735884, 92.6492896406, -561.884916579, 686.658379467, 244.697977603, 625.580165824, 994.636801156, -962.527905629, -732.64171287, -419.335176418, -29.8452258917, 777.835366779, -1170.18750737, -201.452616406, 1094.37104035, 1146.64926246, 887.611102728, -55.8250628139, 273.457371181, -471.391858551, 588.651217559, -316.875990482, -1067.09921892, -862.8478511 +218.4636034, -299.55438742, -228.929212543, 490.643789475, 366.736229852, 1018.89232904, 836.1260899, -757.195754659, -975.078049684, -500.718231764, 908.300785609, -315.277272265, -1139.87520703, -853.624634992, 1160.44487846, -654.691549644, -1130.82471033, 268.318688543, 720.428615609, 639.926014022, -596.766747455, -6.13346541417, -222.331595724, 570.546597338, 113.554497197 +-569.93791257, 187.611023404, 342.80486851, -421.622227814, 1144.99120039, -1049.55064516, 820.092629241, 619.535319278, 802.647010373, 381.534117215, -880.389141807, -522.004688684, 690.692500711, 571.230289854, -2.30824018646, -761.421132344, -518.132007611, 974.016571144, 496.987756764, -282.151866506, 116.146660232, 1165.32497048, 22.2319342464, -1173.48750025, -926.968899567 +549.203949069, -24.0815057965, -383.245584692, 146.987517442, 1075.8389837, -871.92196986, -73.6551603583, 289.770822086, -981.304436949, 256.428625009, -1093.80214502, -608.033410821, 384.270445538, 766.545874139, -750.416784709, 661.139352133, -266.74490649, 879.181845556, 975.298906627, 376.500432219, -1051.0893999, 86.3331471507, -216.707619246, 1117.61968026, -550.940839524 +-678.085916432, 711.392635673, 85.9137213424, 552.950376817, 1170.61539639, -1154.90077264, -285.056796475, -468.53164467, 288.971601528, -736.629082159, 938.308814291, 1086.6619785, 382.735780403, -792.825579184, 459.427170881, -409.369394914, -218.128608873, -1133.31319825, 199.659328953, -900.044955641, -122.650790519, 704.740123927, 254.390573498, -536.555712425, 811.979773984 +-392.365709833, 235.058447779, 111.57829068, 937.319602986, -52.792591171, 1161.1539499, 520.061978514, -586.961632195, -248.413397124, 748.284815963, -837.866531253, 162.942663074, -1085.7764979, 830.264783672, 1122.14672484, -1133.80722558, -224.374452056, -675.896788893, -939.413003731, -730.839653506, 707.025470171, 332.145087375, -475.549980666, -372.628276869, -149.436132149 diff --git a/code/plots/data/bins-convergence/20_6/turbineY.txt b/code/plots/data/bins-convergence/20_6/turbineY.txt new file mode 100644 index 0000000..fa8f10a --- /dev/null +++ b/code/plots/data/bins-convergence/20_6/turbineY.txt @@ -0,0 +1,10 @@ +-538.65314447, -732.588767828, -328.161242656, -917.62084406, -10.6210535329, 1125.22683918, -65.2049148947, -1088.6978795, 462.606927309, 39.8427257149, 203.436512631, 53.8953630009, 583.568530824, 321.150049373, -1173.43710973, -737.497700645, -177.979250097, 779.60270574, 184.617080285, 916.024282238, -655.665424915, 885.845586598, 1117.30689692, -257.797167587, -1125.41450969 +-29.1867515127, -979.322839765, 360.573127997, -1058.55401811, -623.836375171, -161.052555405, 645.125967346, -318.031129835, 1168.20374965, -1157.22681938, 846.678516974, 181.784225593, -389.565920759, 1143.416007, -728.675739052, 481.138584039, -109.476949045, 471.621276815, -818.932089519, 1012.07982219, 57.3477331361, 973.840448778, 18.4680382135, 396.916306388, -513.654330722 +579.007424321, 8.15337286095, 1167.30677242, 36.5828862821, 1072.77970128, 1116.53731768, 434.404907001, 342.560030259, -529.112379031, -940.860440453, -1125.17108031, 1019.77706243, 846.083989166, 703.943739934, -323.899315344, -349.194665799, -858.922943946, -191.345600036, 208.748029946, -865.056126404, 777.279658844, 288.647281238, -953.659241158, -419.198259578, -765.393460968 +599.131513001, -61.7477217357, -213.055793388, -1170.37031827, -753.039215625, -1073.53672919, -651.172687375, 888.903385749, -830.244875756, 497.221567749, 1120.38320927, -119.753617869, 164.345050934, 837.149148969, 1166.35815924, -386.15319583, -528.003947129, 740.572807681, 276.659020779, 502.133910529, -748.7535204, 380.41982147, 862.853415983, -533.304378018, -927.444613169 +244.50263514, 370.103117587, -337.166192838, -1030.25435774, -454.809878374, 868.449200519, 849.283387033, 105.731752081, 671.328200612, 916.721440628, 184.462099499, -993.027298747, -878.696959403, 88.3032234696, -64.6523400633, 423.660348798, -249.66329968, 767.648282823, 998.56902145, -1141.20864991, -587.690884193, 159.918740602, 1020.96125377, -488.298396725, -795.380261416 +-721.892681031, -620.171117049, 549.65208115, -152.698377759, 486.075432062, -582.232326035, -16.1849818397, 277.624311746, 652.962495131, -927.752695181, 584.6210626, 1130.3700568, -278.963375005, -805.27078154, 174.652894811, 973.917301107, 313.642746961, 1142.42770795, -647.594268442, 983.682383791, -236.728149243, -436.504478492, 182.694290405, -1025.48160691, 150.203298249 +537.119819999, -263.817218894, 634.555059033, -206.051088173, 257.159569751, -524.960037186, 839.395314526, -639.594691025, 403.491897507, 1109.76017023, -108.588660829, 1051.02189472, -191.071325133, -1025.10096352, 790.288741843, -862.807528025, -1052.9368323, -654.543902542, 195.850692173, 950.669396541, -741.385572155, -138.398159949, -1173.30421478, -7.96289787998, 341.065818424 +-114.967764391, 1173.26722176, -192.592746582, -824.912792223, 134.534382796, 785.422470858, -415.197004126, -1137.17580643, 85.5788258046, 242.769690658, 425.1270908, -705.283547968, -534.862178518, 323.07689285, -314.170702053, 954.468722072, 823.846541522, -777.287645938, 652.631599996, 1111.47798785, -521.868730183, 653.235378153, -1153.33208952, -357.858549667, 1015.08348512 +-279.367232546, -385.740094118, 1170.36544917, 1035.0757525, 82.4350861123, 208.18292705, -1133.08882522, -635.128399699, -499.464597827, -913.518117276, 704.781131703, -443.06046176, -794.122259066, 865.195768147, 440.37194286, 81.2423853721, 600.018483577, -304.527988514, -1156.40529778, 156.69197231, -228.279592315, -938.338338023, -29.8952463595, 821.310511396, 14.1409862628 +-682.556845098, -25.0430893151, 813.173330931, 706.093375848, -462.881654597, 169.887549403, -146.570239232, 519.442095816, 532.131976204, 429.354017559, 821.654227227, -802.120569347, 445.225790257, -124.232755228, -343.39863068, -302.683172533, 160.146677322, -765.390030202, -703.305896272, 71.6112243199, -936.616718119, -1125.5290448, 1072.84115021, -1112.78217097, 963.429933911 diff --git a/code/plots/data/bins-convergence/25_1/AEP_opt.txt b/code/plots/data/bins-convergence/25_1/AEP_opt.txt new file mode 100644 index 0000000..2c86fa3 --- /dev/null +++ b/code/plots/data/bins-convergence/25_1/AEP_opt.txt @@ -0,0 +1,10 @@ +422689.050922 +423896.699022 +426616.779404 +424249.29842 +426173.064455 +424780.069169 +423594.822263 +426915.318983 +423253.351509 +421042.409827 diff --git a/code/plots/data/bins-convergence/25_1/AEP_true.txt b/code/plots/data/bins-convergence/25_1/AEP_true.txt new file mode 100644 index 0000000..016193c --- /dev/null +++ b/code/plots/data/bins-convergence/25_1/AEP_true.txt @@ -0,0 +1,10 @@ +380980.127125 +381135.84328 +381441.596559 +381388.330348 +382467.591474 +381181.181393 +380671.502845 +382845.166069 +381119.615093 +379814.749048 diff --git a/code/plots/data/bins-convergence/25_1/boundary.txt b/code/plots/data/bins-convergence/25_1/boundary.txt new file mode 100644 index 0000000..c50059e --- /dev/null +++ b/code/plots/data/bins-convergence/25_1/boundary.txt @@ -0,0 +1,10 @@ +-0.00173014994675 +-0.000157552850624 +-0.00031614084287 +-1.34034037274e-05 +-0.00128021647492 +-4.61622346393e-05 +-0.00140849853983 +-0.000236103379166 +-0.000471952487942 +-6.60465232158e-05 diff --git a/code/plots/data/bins-convergence/25_1/separation.txt b/code/plots/data/bins-convergence/25_1/separation.txt new file mode 100644 index 0000000..c6c6f30 --- /dev/null +++ b/code/plots/data/bins-convergence/25_1/separation.txt @@ -0,0 +1,10 @@ +0.0403607621702 +3.48140019923e-07 +0.000961234327406 +0.000527692202013 +14984.6340109 +0.0321556192794 +0.136357433978 +4.67429345008e-06 +2.01306829695e-06 +4.52668318758e-05 diff --git a/code/plots/data/bins-convergence/25_1/turbineX.txt b/code/plots/data/bins-convergence/25_1/turbineX.txt new file mode 100644 index 0000000..233d48f --- /dev/null +++ b/code/plots/data/bins-convergence/25_1/turbineX.txt @@ -0,0 +1,10 @@ +-844.237029551, 862.35534011, -1058.30965681, -609.346099873, 910.460808336, 273.568957858, -1075.35902234, -469.223396329, 1001.89254325, 163.561614895, -1172.41231784, -189.714838516, -822.737507534, -678.190625242, 58.3265961721, 76.2758854373, 1169.92662173, -116.406150041, 665.798410371, 593.986373924, -246.364406719, -568.349405762, -26.2129258326, 426.309008159, 524.538772465 +1155.93631439, -604.269122728, -498.244136275, 476.967860643, 235.43692822, -148.884035381, 118.459006964, -1151.30513468, -28.6876055183, -63.8069973321, -268.884426239, 824.390102271, -357.930120428, 230.47813898, -941.702611915, 599.767335856, -588.655576853, -1105.10704249, 728.046249523, -733.788886492, 360.420415801, 698.525290833, -827.680250436, 1069.9810756, 949.751396627 +1071.69356326, 577.999153108, -113.614103594, -1172.90178383, -472.631576021, 148.264034258, -759.165938637, -379.306890083, 745.21953806, 141.390684329, 404.498970053, 433.573734646, 689.025795276, 4.81485250114, -301.36418195, -1090.06218112, -159.760307122, -676.733146945, 299.572675454, -411.949593711, -1038.1468912, 798.326143511, 706.579092878, 1159.62833785, -849.627306525 +-328.93546511, 1168.21234252, 623.883680979, -108.356191, 411.217002269, -528.483479202, -234.699723323, 20.2783206761, 666.151147391, -1050.67718418, -411.094187515, -934.905197865, 715.910391137, -792.177761804, 387.863478997, -312.652869741, 1054.71696078, 485.499766477, -695.982697719, 977.118602446, 173.277077842, 107.704417752, 780.195909303, -1143.87571999, -843.514991081 +346.273985173, -752.00639299, 130.482928315, -533.543376916, 514.162487049, 324.40798334, 644.728397187, 848.931350581, -1072.61183375, -850.93905443, -381.772819156, -226.182648256, 750.998017882, -1169.11244137, -107.467613029, 1161.78696215, 1074.02404119, 939.476661805, -12.7993404198, 243.977350699, -426.137829427, 594.376411245, -491.816468091, -1027.04882549, -788.576838563 +-63.6887857382, -343.245229166, -477.222957518, 575.01838759, 466.681928905, 1083.46580985, 842.435947698, -701.692856549, -1064.62223696, -547.91383324, 935.694862794, -275.888436579, -1152.47689011, -751.395622347, 1167.04486982, -788.544603484, -932.671178555, 376.042991888, 691.945207292, 685.000226934, -98.8578770193, 207.483415671, -187.020307305, 299.20247067, 115.204442469 +-504.669944899, 49.6573418329, 159.285439855, -647.563567201, 1100.0559125, -1143.87863133, 728.100630324, 654.54935208, 490.258322937, -72.6642853788, -969.916698753, -604.055767959, 768.713100757, 403.432382795, 252.592325379, -580.581407708, -109.078438456, 970.979557149, 824.535083103, -281.640464713, -342.058505185, 1166.3146072, 150.880201762, -1059.53689898, -710.210426476 +653.827472858, -45.0462029069, -576.134089572, 83.8160759864, 1170.18904474, -925.123669747, -202.167345772, 339.498732092, -1040.52077775, 210.289944611, -1127.63547715, -456.277402773, 370.174829763, 857.686810994, -689.267896886, 566.749592388, -419.283916826, 750.715008619, 956.647914043, 473.822269619, -980.495574564, -79.8200290238, -212.003531992, 1073.95214495, -681.784959388 +-462.168435879, 789.996646344, 273.572061617, 646.873158992, 1167.2056858, -861.341299549, -120.302033218, -740.493733006, 244.594332221, -456.60672787, 928.370305203, 1078.78380904, 481.959695339, -1032.15371077, 364.150261997, -209.19487963, -286.194547741, -1127.40946115, 192.967057449, -536.669265647, -101.759706115, 749.362045838, -7.92717809312, -779.880893329, 905.577591208 +-209.696291963, 411.08338554, 321.956237795, 956.831320362, 111.266715342, 1150.45372004, 639.906557254, -714.12102106, -53.3781836641, 710.017009477, -884.347686114, 25.0864800858, -1167.38150791, 866.425897427, 1096.61191375, -1072.24892185, -1.20086535999, -607.391310436, -846.765231465, -532.747198465, 568.358717634, 282.121072975, -427.115323168, -428.0542254, -279.366929799 diff --git a/code/plots/data/bins-convergence/25_1/turbineY.txt b/code/plots/data/bins-convergence/25_1/turbineY.txt new file mode 100644 index 0000000..5f079e4 --- /dev/null +++ b/code/plots/data/bins-convergence/25_1/turbineY.txt @@ -0,0 +1,10 @@ +-815.107420135, -795.916590909, -507.06665676, -531.104079597, -108.35324687, 883.060425488, 469.8285667, -1075.62362998, 611.02151443, -39.9273874496, -50.8563913086, 31.6638855579, 836.803178248, 279.626760352, -1172.06525687, -619.488553626, -91.6929241075, 698.904145625, -196.332513647, 1012.08510848, -895.209812463, 1026.70110223, 1173.22153937, -312.693192524, -1049.75955316 +-202.354882434, -1005.97949424, 805.715246795, -852.846849326, -756.603349069, -415.484405529, 207.429184515, -227.227872353, 1173.1636555, -1171.77843364, 680.117019276, 396.598106819, -684.324243341, 1078.88053974, -700.237312741, 527.607147089, -9.30435370563, 394.80925683, -920.371983868, 915.800135415, 73.3579524879, 942.973129736, 154.722234334, 481.950750702, -573.825745195 +478.130743786, 115.100470547, 1167.34023871, 37.9168817213, 1074.13005275, 1164.11072829, 361.239377179, 538.681139568, -397.618369296, -1164.96549234, -1101.59729041, 1081.36082665, 949.936670298, 76.373492374, -168.441782947, -434.626661872, -1105.04245627, -331.753537988, -12.5238836164, -1018.85921398, 547.163289941, 253.144008104, -936.953511825, -179.9947302, -809.487247754 +622.930510933, 111.426290288, -325.532045925, -1168.50110316, -915.040567615, -1016.04479795, -611.417635003, 935.553706402, -966.115179684, 522.698152853, 1099.15307138, -44.8455708201, 233.613324231, 865.788825948, 1107.56390938, 158.377120348, -514.497867532, 643.780825414, 306.809512104, 513.821957332, -810.233159044, 361.005749307, 876.601528001, -262.076816226, -815.854369733 +209.248119073, 329.136092666, -188.281989463, -1008.42393021, -350.498963903, 1127.78338441, 980.541407804, -75.062630156, 476.067336028, 808.10990709, 179.828604493, -1151.51101915, -901.741619622, 101.560127279, -27.1479648594, 165.49304375, -472.872341584, 703.220909833, 1173.44458196, -1147.8723569, -423.075762332, 402.434065286, 1065.48231276, -567.720573017, -814.127597921 +-1061.62322339, -561.509067598, 754.095765627, -163.216654017, 359.768554639, -450.81900699, -34.3411094381, 276.035375741, 493.675386813, -739.561012706, 708.245040551, 1140.62327795, -221.208086839, -901.410305746, 123.053884727, 869.099132809, -360.080346831, 1111.63283613, -947.812074908, 898.966705236, -161.512403041, -322.538385548, 645.866469432, -1134.73070522, 532.709403934 +532.726215154, -211.778215533, 550.493435236, -443.622544747, 408.676139186, -262.064657266, 920.329174272, -952.690214175, 437.050495089, 1171.26281137, -57.1673021896, 1006.1076202, -306.1190491, -1101.9883206, 1128.95575281, -1019.83512488, -1168.43391167, -659.040751293, 401.052224943, 824.162004808, -671.272879606, -129.793998077, -1163.77450201, 504.497230768, 280.39048401 +-93.9326215653, 1172.6494499, -199.614904814, -1170.51731332, 88.2838903738, 671.578833219, -358.326566882, -1123.33277629, -56.1675227638, 435.83884138, 324.921748101, -1065.15338038, -548.135892954, 199.969298029, -949.760877776, 706.579356914, 833.781987571, -901.977201209, 679.6768953, 1073.60530677, -644.797921797, 610.674249735, -1154.20555261, -473.035711356, 955.146674614 +-308.920275673, -337.967363233, 1141.18154838, 911.285059755, 121.518705235, -153.112403896, -1167.33191221, -910.387371502, -262.555038532, -1073.07914255, 717.819521894, -461.910640038, -770.41686292, 558.385763266, 657.535323526, 192.383555531, 1138.08150052, -325.705099687, -1157.54042764, 403.556082444, -540.48441945, -903.101669328, 383.362349338, 495.469651421, 248.376281206 +-951.522318644, -45.8567277012, 953.145280943, 679.41873815, -458.746122768, 231.499757219, -169.307136462, 455.05754742, 750.521396646, 597.670852073, 771.404615396, -1098.54272569, 119.817814241, -296.935525673, -417.825570076, -476.883784792, 140.761113933, -684.9279599, -812.480488969, 150.509621118, -1026.69585, -1137.70505772, 1093.02721656, -1092.65988611, 879.086959713 diff --git a/code/plots/data/bins-convergence/25_10/AEP_opt.txt b/code/plots/data/bins-convergence/25_10/AEP_opt.txt new file mode 100644 index 0000000..e75622b --- /dev/null +++ b/code/plots/data/bins-convergence/25_10/AEP_opt.txt @@ -0,0 +1,10 @@ +361763.697078 +361552.967668 +361353.337927 +361508.037682 +363831.880275 +360545.216475 +361498.468026 +362873.054721 +362187.559252 +362289.915032 diff --git a/code/plots/data/bins-convergence/25_10/AEP_true.txt b/code/plots/data/bins-convergence/25_10/AEP_true.txt new file mode 100644 index 0000000..32c379f --- /dev/null +++ b/code/plots/data/bins-convergence/25_10/AEP_true.txt @@ -0,0 +1,10 @@ +381196.495343 +381177.879656 +381407.523269 +380609.670581 +382802.961496 +380599.848043 +381446.544263 +382703.088675 +382393.63303 +382393.504548 diff --git a/code/plots/data/bins-convergence/25_10/boundary.txt b/code/plots/data/bins-convergence/25_10/boundary.txt new file mode 100644 index 0000000..2e4e24f --- /dev/null +++ b/code/plots/data/bins-convergence/25_10/boundary.txt @@ -0,0 +1,10 @@ +-0.000259424176875 +-5.64959507301e-05 +-0.000136755191534 +-8.66197419782e-05 +-0.000853786245671 +-0.000892147758805 +-0.00164156768824 +-0.00184568432223 +-4.01730198973e-05 +-0.000122258644296 diff --git a/code/plots/data/bins-convergence/25_10/separation.txt b/code/plots/data/bins-convergence/25_10/separation.txt new file mode 100644 index 0000000..51dabc4 --- /dev/null +++ b/code/plots/data/bins-convergence/25_10/separation.txt @@ -0,0 +1,10 @@ +25469.5260382 +0.0142690105131 +26793.1938445 +29224.4821355 +2908.39706397 +0.00283953896724 +23960.079963 +6024.34751072 +0.011335837713 +0.0865920443757 diff --git a/code/plots/data/bins-convergence/25_10/turbineX.txt b/code/plots/data/bins-convergence/25_10/turbineX.txt new file mode 100644 index 0000000..84367dc --- /dev/null +++ b/code/plots/data/bins-convergence/25_10/turbineX.txt @@ -0,0 +1,10 @@ +-930.405774497, 997.290991312, -925.220893617, -571.439176525, 880.845000618, 424.710373947, -839.87641811, -434.292839548, 967.623241842, 41.577733201, -1167.03750407, -243.570640613, -1048.26633674, -568.340796306, 201.348755156, 118.655568947, 1172.85341164, 16.2314110938, 597.654443625, 729.372478873, -180.10462498, -689.369028418, -118.316513847, 333.361678678, 585.91884073 +1170.28956857, -653.937200061, -521.603620743, 444.656661973, 79.6868831468, 13.971429491, 187.634770887, -1170.13368614, -154.146809776, -307.4187558, -260.905971649, 853.074923574, -347.487335204, -44.9324792157, -971.20594061, 450.600458066, -393.105585955, -1090.96646513, 704.632160188, -751.789588162, 337.04477369, 754.942384637, -806.283804133, 1073.03837612, 992.110754361 +1038.86525171, 524.044930274, 17.9310491528, -1150.7346108, -325.498271681, 325.127509104, -804.774706534, -585.504922043, 516.679860483, -5.13071407922, 454.401754161, 566.947672833, 606.652432973, -84.6912348462, -430.001487155, -1108.83873796, 45.1710454369, -777.493965595, 137.54920111, -339.981656154, -912.97158771, 936.354298137, 822.961993878, 1126.84880147, -651.551245667 +-357.911953988, 1171.65921697, 781.102397816, -132.221041718, 633.10821106, -554.709374687, -214.320896231, -36.7780837819, 431.577546577, -1133.30851786, -495.457462138, -1025.98065451, 524.88837585, -905.029297859, 162.279958, -342.714281623, 985.913663376, 419.876527789, -631.420493255, 1068.08109369, 190.374045507, 67.6153237461, 846.578295518, -1047.76298389, -787.358263784 +202.582005122, -654.449510522, 325.347717192, -519.093646227, 734.865461528, 316.753192079, 562.474654482, 1053.2269134, -1062.95649411, -714.163952562, -394.154154332, -258.337458032, 670.042273163, -1168.41726035, -105.008905435, 1098.80015829, 1044.52711212, 895.092331506, 48.6601071033, 116.667163474, -457.765884308, 662.654423602, -290.868974092, -1010.94160742, -818.765753161 +64.5513269162, -508.665231516, -186.440295612, 518.198409398, 594.096963611, 1059.04532617, 812.799925414, -622.680419043, -969.323370473, -839.582769772, 916.152883517, -288.416949352, -1118.93465959, -399.950648137, 1149.93215288, -695.305888926, -1160.93962995, 331.87773748, 823.731827724, 485.231882531, -279.244262308, 46.7918064543, -75.1719147555, 515.281449993, 194.375548848 +-436.435231807, 79.5559781025, 426.227568744, -351.353589276, 1133.86463586, -1061.28108222, 638.233583749, 653.424618971, 863.058296466, 285.703673124, -867.460203398, -566.679364683, 600.463818943, 290.730325709, -30.3683119821, -779.15500025, -479.463502588, 984.774775, 521.12103675, -139.022900813, 12.6222702547, 1157.54125053, -159.578567274, -1152.13842463, -668.450937591 +669.00899604, 117.526852, -769.088540939, 292.623962477, 1114.37129966, -878.669063419, -301.041726468, -81.4859657936, -1170.23316351, 506.510887664, -1068.81922243, -243.518731311, 254.551241389, 1152.78387665, -706.186142374, 767.411886786, -181.334431484, 556.410273092, 1017.4091938, 462.754373167, -1119.28265199, 118.932220875, -572.61849991, 887.625015121, -441.24846695 +-562.389429913, 675.024067349, 47.5876832405, 449.922516268, 1138.34330087, -1146.31294864, -138.269088062, -885.268743264, 202.865399637, -569.153264628, 858.026087804, 1029.73137817, 309.023667482, -920.721540791, 553.430887936, -235.869114279, -369.348166576, -1136.67528579, 304.115896342, -480.641782622, -113.374222654, 691.695742478, 58.4682411072, -710.485768806, 959.676394599 +-218.977171331, 333.184529622, 424.348873988, 934.448688487, 114.570796364, 1150.6262607, 590.276941167, -721.154636588, 46.0302533527, 697.249136022, -827.372638096, 120.408651445, -1067.87913994, 848.36090444, 1105.28428826, -1169.5048286, 29.7966224424, -612.879337123, -974.155618936, -334.103757585, 779.643075045, 486.968854788, -435.175313313, -486.518673875, -227.028437554 diff --git a/code/plots/data/bins-convergence/25_10/turbineY.txt b/code/plots/data/bins-convergence/25_10/turbineY.txt new file mode 100644 index 0000000..7824681 --- /dev/null +++ b/code/plots/data/bins-convergence/25_10/turbineY.txt @@ -0,0 +1,10 @@ +-715.179001554, -618.503492518, -338.986221773, -632.165531572, -127.702541497, 1086.44904076, 149.009849038, -1090.19550081, 663.958698594, 1.87293086083, -123.123340374, 125.899396495, 527.51643838, 313.577313294, -1156.11205922, -635.701313749, -39.3814571933, 609.598495371, -270.263384845, 919.321349084, -880.295651513, 949.687502507, 1167.53477294, -114.710483548, -1016.77684017 +-86.9381828742, -974.423947797, 712.038808197, -934.847211049, -962.10535087, -91.7041952181, 454.389432825, -89.0118433903, 1163.346324, -1132.53244226, 482.691491261, 28.529982695, -738.541907383, 892.501775522, -658.707003907, 1064.52821238, -44.9157724871, 432.35178351, -938.418568888, 901.081812648, -158.502954015, 898.44196127, 226.69783948, 475.104773228, -626.779181747 +545.797496407, -173.685289731, 1173.37744534, 230.099526358, 1127.46924461, 1127.57630136, 314.360361972, 687.883995737, -641.138319196, -1173.50311903, -1081.96808873, 418.941486542, 1004.54414667, 605.85459355, 74.8774838646, -384.204197947, -737.331950942, -581.940485281, -36.4823826115, -885.943627732, 737.305092754, 124.090668498, -836.582141182, -327.639780997, -976.02097173 +546.696304921, -65.9593645792, -317.521085665, -1166.04181758, -734.453048859, -1034.13414518, -752.8331123, 805.498371587, -1091.27298271, 304.54512962, 1063.79415213, -103.566773517, -3.96936442112, 747.032721992, 1162.23973447, -71.8339610787, -636.482685379, 550.218304392, 271.397820094, 410.030428835, -760.867687912, 284.49088275, 812.675310105, -528.515652565, -827.49683844 +168.075377375, 260.01510993, -530.769963225, -1051.13390309, -504.895091021, 1051.37656432, 950.73184276, -20.9054282505, 497.251864908, 931.185333772, 134.803750273, -1132.18320902, -963.420597776, -109.260621558, -12.5390491587, 412.036636665, -534.882421603, 758.910924682, 1172.50507045, -1167.7008928, -384.652319178, 278.88885477, 1136.89539736, -595.932011084, -840.689783283 +-1171.73763613, -682.666877473, 729.901034601, -267.990726513, 378.74719053, -505.528329238, 12.2862512966, 245.499118545, 661.474662095, -819.900862856, 733.348583235, 1137.52044381, -353.725534597, -1103.2576323, 234.076800054, 936.663008274, 171.339315686, 1125.60812113, -394.950029886, 805.035807544, -298.886816499, -588.422891837, 15.5437203043, -1054.3347483, 490.604074412 +498.669384764, -185.086685714, 591.17800023, -454.876904277, 302.473211725, -500.817714544, 984.78108596, -974.767829056, 437.46953207, 1082.26609356, -86.8164515146, 1027.62402345, -412.023256219, -1136.93224595, 743.607804614, -770.470566407, -1071.09791064, -638.244952985, 34.8056121989, 1165.25044907, -723.092213357, -192.962627074, -1162.61368393, 222.972632613, 208.228209341 +-290.719121306, 1167.61437713, 165.469911625, -969.650126784, -367.848638356, 777.866677894, -72.4441512708, -1170.68210666, 87.6948344168, 221.117084188, 484.521832214, -746.727941544, -217.430157243, 219.602425769, -548.578905488, 820.583381284, 845.353417175, -1033.22000835, 584.820029947, 1078.42227484, -352.622219951, 547.294431119, -1024.32616092, -767.634063858, 1087.39859086 +-362.847599761, -306.68393523, 1172.54909957, 1083.83841749, 285.149824364, 251.202260578, -1165.34013005, -770.347440515, -106.044134599, -1026.25555562, 800.579274419, -562.840286309, -718.118467861, 727.604106779, 456.955090015, 94.6472848376, 1113.87515083, -291.728090816, -1133.42376083, 437.001090178, -520.36947769, -947.994182983, 577.586052652, 574.630476655, -62.4674823536 +-827.100232217, -42.2612863014, 1094.1041803, 709.88846083, -399.158398207, 230.640657749, -133.196805092, 348.71259483, 641.233204152, 915.087896167, 832.220224042, -1167.32072698, 486.590506494, -247.893710641, -394.312948878, -96.924452968, 51.789185384, -570.161352215, -654.336858681, 166.053212004, -877.093374873, -1067.70652681, 1089.84332846, -1067.91180604, 934.039077227 diff --git a/code/plots/data/bins-convergence/25_2/AEP_opt.txt b/code/plots/data/bins-convergence/25_2/AEP_opt.txt new file mode 100644 index 0000000..0af5231 --- /dev/null +++ b/code/plots/data/bins-convergence/25_2/AEP_opt.txt @@ -0,0 +1,10 @@ +291388.32903 +291564.287128 +291474.163822 +291409.260363 +292269.175362 +292413.09381 +293527.154194 +292797.939944 +291582.313467 +292391.614343 diff --git a/code/plots/data/bins-convergence/25_2/AEP_true.txt b/code/plots/data/bins-convergence/25_2/AEP_true.txt new file mode 100644 index 0000000..ef38bce --- /dev/null +++ b/code/plots/data/bins-convergence/25_2/AEP_true.txt @@ -0,0 +1,10 @@ +380870.321983 +381433.412073 +381148.864526 +380874.762082 +382631.007297 +381871.675856 +383007.744638 +382424.387573 +381711.848246 +381473.151533 diff --git a/code/plots/data/bins-convergence/25_2/boundary.txt b/code/plots/data/bins-convergence/25_2/boundary.txt new file mode 100644 index 0000000..cc3e5dd --- /dev/null +++ b/code/plots/data/bins-convergence/25_2/boundary.txt @@ -0,0 +1,10 @@ +-0.00141906959357 +-0.00347281018981 +-0.00139292100289 +-0.0001447859363 +-0.00235724015397 +-0.000656671973957 +-0.00105217799364 +-0.00171128315446 +-0.000505165359073 +-0.00101547206714 diff --git a/code/plots/data/bins-convergence/25_2/separation.txt b/code/plots/data/bins-convergence/25_2/separation.txt new file mode 100644 index 0000000..12bf09d --- /dev/null +++ b/code/plots/data/bins-convergence/25_2/separation.txt @@ -0,0 +1,10 @@ +20794.0253006 +4.08283207031 +2971.27726435 +11328.2680265 +0.428185673372 +210.72408201 +0.0395200675266 +13577.5093697 +0.0446681980102 +6607.68828554 diff --git a/code/plots/data/bins-convergence/25_2/turbineX.txt b/code/plots/data/bins-convergence/25_2/turbineX.txt new file mode 100644 index 0000000..0b26de8 --- /dev/null +++ b/code/plots/data/bins-convergence/25_2/turbineX.txt @@ -0,0 +1,10 @@ +-902.904343354, 1031.18455215, -904.07321787, -558.459257376, 907.934177867, 459.632855103, -813.185012709, -386.400075879, 985.611014898, 240.658267592, -1170.01369353, -143.436587146, -1017.10208625, -459.443946226, 123.489941176, -73.6675356287, 1172.2587758, 91.1563170237, 637.688874387, 767.171458183, -239.972870262, -693.465970333, -44.3527213999, 345.931550384, 572.863521506 +1165.44902761, -720.390624063, -585.221183707, 371.096938731, 118.133183493, 121.624865606, 267.815795198, -1162.51306622, -353.100614044, -427.862491946, -208.140533352, 743.916632672, -165.143383383, -23.2851747108, -983.468330623, 517.988053958, -486.081236845, -1144.11083697, 626.494032207, -892.008345359, 417.522304689, 782.101902011, -807.219309166, 1080.77011305, 956.76000436 +1040.55648309, 661.884057954, -26.4535030747, -887.419144099, -390.918368075, 290.071919352, -1158.60991932, -497.790590683, 535.628465146, -35.1668606173, 414.043805361, 430.358143644, 726.620162853, -148.213746652, -534.136964471, -1105.55510058, 35.8936442854, -641.528620084, 131.414033109, -322.480176999, -856.102892949, 835.941582638, 872.304148382, 1153.34538056, -644.863520604 +-373.374808683, 1168.6635105, 564.79572538, -191.010324547, 541.03144771, -593.248356092, -245.047804713, 119.404159527, 469.298826355, -1083.18900426, -364.991878585, -1172.57149202, 650.499585764, -768.336905807, 305.867564259, -315.667700341, 944.57978135, 444.672528295, -791.909500321, 1084.13105273, 158.83156191, -35.2676079013, 754.096826058, -995.366018615, -874.153465652 +324.218969602, -619.124105488, 247.396006377, -358.409002679, 810.076127996, 360.870144123, 605.459823888, 936.251925749, -967.293162615, -600.307114679, -331.244548625, -91.2825943357, 652.468730228, -1170.43915028, -93.2385974042, 1141.46796497, 1131.73418041, 930.015537855, 78.2443365073, 226.753144787, -490.696165435, 654.549190238, -225.089612818, -1085.77444592, -798.266598207 +-188.57749404, -284.555924604, -63.9513543387, 586.519075484, 661.380696313, 1088.78829798, 844.877716934, -517.492251026, -1024.49200834, -528.842502693, 942.919190338, -171.132882062, -1141.54420922, -765.022437732, 1155.10418009, -633.977778558, -942.59994241, 400.147944184, 622.659506792, 673.655066058, -864.11611471, 94.5114979854, -7.75299211753, 147.648586794, 284.777730648 +-514.517096855, 7.31022453682, 169.075857986, -247.924122998, 1109.45764899, -950.142863284, 754.773346646, 644.582726722, 442.48818672, 210.688189196, -1153.53432425, -626.501174497, 730.920127095, 525.06586137, -118.990478081, -697.450735895, -432.116463429, 955.111387488, 755.076474317, -387.258458682, 217.765539826, 1163.20021616, -109.412897155, -1095.00337233, -847.961749764 +512.679677595, 38.9407289241, -505.008340524, 387.889180624, 1151.3700239, -890.619101274, -153.80540613, 655.929157543, -1152.64259254, -49.3286033263, -1131.25419488, -521.805976709, 138.825084758, 682.516002357, -756.19892138, 630.835473257, -344.048780871, 995.548146632, 884.546929556, 365.97523007, -952.452316022, 8.11284802556, -127.226706141, 1147.35800017, -649.69824804 +-897.921033815, 673.974567608, 416.093446943, 595.186139404, 1168.60521114, -1121.52630167, -230.761645625, -402.027826653, 335.997239038, -631.076093516, 998.705856985, 906.612192606, 181.080881332, -986.608819002, 703.361259878, -489.860902031, -321.07922255, -1127.05606165, 217.131789166, -423.47032219, -111.5448797, 641.517251955, 37.9549618916, -733.265982295, 1108.87315488 +-277.069397832, 319.308417197, 419.375592464, 932.202333323, 27.4160985587, 1135.13433967, 584.23191004, -493.817677753, -75.7809119404, 695.696257516, -832.465659176, 127.431958109, -1105.61260157, 854.806092802, 1091.48117865, -1170.88506392, -16.5260425728, -693.393926825, -1014.13333753, -728.057318108, 661.672728755, 210.420556277, -153.63361771, -490.139306341, -79.3777624534 diff --git a/code/plots/data/bins-convergence/25_2/turbineY.txt b/code/plots/data/bins-convergence/25_2/turbineY.txt new file mode 100644 index 0000000..937833d --- /dev/null +++ b/code/plots/data/bins-convergence/25_2/turbineY.txt @@ -0,0 +1,10 @@ +-749.599676762, -560.176437905, -329.201632762, -597.459166073, -81.838837654, 1079.75624643, 174.779891812, -1108.07568897, 636.951211315, 68.949142564, -90.5757197097, 220.53549425, 585.353976029, 371.344303376, -1166.99882226, -489.921747038, 54.2733669076, 625.838682443, -212.775028318, 888.022452909, -810.308272248, 946.699989298, 1172.67592352, -358.335733506, -1024.1900697 +-137.373807976, -926.376463911, 655.245880377, -943.543561898, -871.173740198, -306.462486721, 737.594650044, -160.310473795, 1119.13203081, -1092.73519957, 484.505578649, 212.962686683, -618.184906977, 1022.251784, -640.255200858, 813.228584805, -284.574948326, 261.048895732, -992.291971881, 762.533505627, -17.0016971587, 874.901493259, 32.4265574625, 457.252670976, -549.292831898 +542.566960654, -158.21644914, 1173.21627358, -241.939078813, 1106.48995922, 1137.09902641, 186.437945785, 552.444496602, -516.710910031, -1172.98729572, -1098.04536288, 598.150525078, 921.498361319, 259.556717197, 26.0104511613, -393.556959538, -729.212426102, -552.758013621, -29.5399591344, -873.170319793, 802.635759334, 157.092394477, -784.999687936, -216.639489878, -980.453163219 +543.137502664, -106.590412258, -306.301099514, -1157.86483946, -672.290955719, -778.400577813, -782.100040451, 745.075170493, -1075.59036477, 451.484011282, 1115.31024632, -47.0331629991, 124.299814931, 887.014377363, 1132.95231904, -194.827665895, -696.351154274, 605.746518338, 455.846959929, 449.216827618, -970.7251611, 255.181162789, 899.151759507, -410.986917118, -782.937917314 +215.433422462, 501.334329597, -540.697571118, -1117.44304302, -654.777944751, 963.317400028, 861.412611975, -138.919156579, 664.439672141, 1008.34907144, 382.583251148, -887.164875523, -975.407840355, 84.9062409093, -133.180097304, 272.377949823, -310.345864822, 715.686664768, 1045.93100706, -1151.39880615, -516.052907937, 61.9163164091, 1151.72743751, -445.232761116, -860.178159638 +-1064.56067023, -627.83310858, 690.951457932, -226.774882032, 399.957513207, -437.808153596, -346.603150798, 375.402519478, 572.32294875, -754.228651328, 698.598137633, 1160.96939594, -272.052951592, -889.874464432, 207.051380195, 987.526273078, 159.078467319, 1103.185273, -994.701588446, 960.897885546, -449.446652107, -480.833316898, 88.0644806179, -1164.18889652, -74.0060511687 +132.123876967, -121.166305608, 625.757961002, -629.677526158, 382.412928565, -688.741204199, 898.583946501, -563.817673736, 517.39303801, 1154.44652681, -215.627552444, 992.286365591, -96.0232491283, -1049.49604159, 764.177895236, -943.76948037, -1091.05998337, -681.834463751, 441.822291668, 890.487728815, -888.597545989, -155.245688874, -1168.40301933, 422.023120285, 292.636760537 +-55.2964635435, 1172.86838152, -203.332609121, -827.782789899, 226.898812182, 658.086882277, -446.203802215, -973.084185439, -220.342901505, 118.3815236, 312.089992269, -1051.12055318, -658.357928377, 372.94700616, -446.825802311, 989.536759819, 838.428220024, -621.304906484, 771.178732481, 1094.54419264, -685.543974693, 664.433576122, -1166.59732809, -246.384888469, 977.255460405 +-755.562174837, -240.749753148, 1097.2704529, 768.004620591, 107.228135849, 180.027303716, -1150.60245016, -639.172510378, 114.033517477, -989.38366745, 616.216350326, -745.111123228, -461.047103757, 635.404577437, 342.383595083, -85.9999479994, 1128.73558659, -326.925942246, -1153.25180239, 462.924115261, -269.332579722, -982.645242044, 655.130788765, 576.945602441, -384.104438934 +-822.089967571, -60.7271730945, 1096.02011675, 712.835702081, -499.647385328, 297.667790439, -158.437910056, 647.395116678, 415.591541455, 945.06222766, 827.125671818, -875.945206948, 393.391530558, -296.170810535, -431.050727591, -78.5173065721, 15.5654468785, -705.233211051, -590.482490925, 168.706541303, -969.187851886, -1154.49619507, 1163.41425014, -1066.25539292, 825.746563142 diff --git a/code/plots/data/bins-convergence/25_3/AEP_opt.txt b/code/plots/data/bins-convergence/25_3/AEP_opt.txt new file mode 100644 index 0000000..7689fa1 --- /dev/null +++ b/code/plots/data/bins-convergence/25_3/AEP_opt.txt @@ -0,0 +1,10 @@ +305295.165348 +304776.192075 +302389.441356 +304280.372021 +304630.141155 +303394.884149 +305966.459284 +305925.629874 +303999.661071 +305259.091408 diff --git a/code/plots/data/bins-convergence/25_3/AEP_true.txt b/code/plots/data/bins-convergence/25_3/AEP_true.txt new file mode 100644 index 0000000..bc5dffb --- /dev/null +++ b/code/plots/data/bins-convergence/25_3/AEP_true.txt @@ -0,0 +1,10 @@ +375176.896341 +372934.344415 +367472.499629 +371418.806602 +374063.48483 +368948.85843 +376969.809502 +375081.938465 +370206.298106 +375370.956863 diff --git a/code/plots/data/bins-convergence/25_3/boundary.txt b/code/plots/data/bins-convergence/25_3/boundary.txt new file mode 100644 index 0000000..9da25e8 --- /dev/null +++ b/code/plots/data/bins-convergence/25_3/boundary.txt @@ -0,0 +1,10 @@ +-0.000994112779608 +-9.74143563326e-06 +-7.47043013689e-05 +-5.93417826167e-06 +-0.000275679775541 +-0.000190081584151 +-0.000318288637573 +-0.000349196527168 +-0.000284101154421 +-0.000519883662491 diff --git a/code/plots/data/bins-convergence/25_3/separation.txt b/code/plots/data/bins-convergence/25_3/separation.txt new file mode 100644 index 0000000..c6f70c4 --- /dev/null +++ b/code/plots/data/bins-convergence/25_3/separation.txt @@ -0,0 +1,10 @@ +0.10602182374 +4581.85413932 +0.000280870124698 +136.407448754 +4764.66158015 +0.017142044846 +0.00273346478934 +5.47224772163e-07 +0.00166861068283 +0.0486822805542 diff --git a/code/plots/data/bins-convergence/25_3/turbineX.txt b/code/plots/data/bins-convergence/25_3/turbineX.txt new file mode 100644 index 0000000..b94e119 --- /dev/null +++ b/code/plots/data/bins-convergence/25_3/turbineX.txt @@ -0,0 +1,10 @@ +-901.273058725, 956.199156013, -958.816146818, -672.951797167, 831.670009346, 399.996372885, -866.157093454, -542.348039954, 1017.55084114, 49.0476137278, -1160.17499318, -176.072311494, -944.556630751, -869.893077334, -49.1755581557, 152.452148199, 1127.84329989, -371.089536151, 596.21963933, 768.071887053, -430.609450314, -522.183399279, 2.37329560986, 360.559220454, 712.256924324 +1172.63617839, -677.779548714, -579.601245838, 408.058780001, 26.1729493711, -27.8104192904, 96.0342606924, -1028.60961009, -341.169774822, -32.2647907546, -253.681591408, 716.890517686, -219.575252348, -81.6897137494, -1108.07050929, 468.159021678, -447.516613398, -1018.75552374, 751.920675362, -739.564507154, 266.048774665, 650.073894786, -766.28778238, 986.263007007, 855.075945292 +1004.40034174, 536.463991693, -40.6959880861, -803.004011115, -459.767899585, 197.703368168, -613.766792288, -324.294002018, 446.930211883, 95.3787181169, 295.444824146, 536.771413993, 735.610756934, -158.769187114, -342.030686325, -1083.79309611, -382.441139428, -484.124333378, 193.58476433, -498.676260271, -724.898416804, 764.935495992, 673.69626169, 1010.93920257, -732.238310467 +-263.426873342, 1096.53999045, 572.512868534, 159.569926013, 640.735926958, -445.097693223, -67.8104842891, 160.147878477, 776.23839567, -775.947354855, -325.733177824, -800.867866234, 645.557503076, -628.263276562, 234.885588402, 90.3799100473, 947.896784527, 541.264779878, -554.023012157, 900.66798504, 325.018689141, 88.738464324, 908.796488539, -883.771500322, -777.352997073 +386.28739306, -796.209642431, 100.824797769, -489.441852412, 820.71095338, 242.311837386, 557.389419151, 1002.31770996, -988.224365011, -810.682197402, -324.543048431, -191.516376726, 682.120146215, -1122.94110463, -101.813909687, 1091.96673663, 1155.12630429, 852.878688761, -51.7235202337, 365.097438636, -355.350258783, 655.997985095, -486.334236307, -766.426103651, -653.928101597 +-148.066889513, -470.018162786, -367.44994339, 375.618746929, 233.354434335, 1066.75084535, 741.187997802, -571.112754017, -1040.33666481, -522.08378242, 826.935434451, -434.863463958, -1156.7141218, -655.327515941, 1132.15225568, -653.153778109, -949.309786908, 95.3135453202, 701.899547235, 331.818624006, -422.670895709, -69.8477689699, -293.841500627, 564.415487963, 53.9230882547 +-351.007839064, 134.817904136, 527.349142191, -221.189772471, 1056.47366395, -1171.99891784, 956.384574349, 742.819776014, 690.101760523, 275.196997471, -857.594108889, -415.709386844, 704.684879973, 617.877670448, 301.41200204, -720.691061973, -472.939600546, 974.085412037, 519.114469513, -152.90102863, 357.023956877, 1149.29829984, 34.0173150243, -988.88913964, -443.876197682 +649.504539507, 191.186261041, -182.363034214, 378.355944305, 993.250193052, -843.572977964, 49.2575533403, 527.707776293, -1044.30767563, -110.83294009, -1026.08764864, -425.792867286, 403.389599803, 828.039679975, -861.198934165, 729.045234685, -430.757262047, 825.429478554, 984.389277715, 534.387601389, -1038.13199259, 81.7825301601, -342.424988578, 1076.87016709, -634.000681861 +-570.555758565, 696.144045463, 453.820196977, 454.045804924, 1055.48497527, -965.888569915, 17.4006155404, -279.427909565, 321.53240613, -425.639119195, 1137.81466106, 1004.25182688, 388.382524817, -916.477265465, 366.689064775, -132.656451016, -370.250820163, -1155.12716738, 316.235744828, -562.070815327, -35.1112147697, 602.005188748, 195.560097403, -741.114815574, 861.325251826 +-264.730216453, 233.17766549, 150.706263883, 837.492198923, -56.4621756063, 1061.1456621, 649.400922091, -562.659112863, -266.902945, 731.40924222, -788.035807929, 87.0026144505, -1008.71359544, 890.275518668, 1148.67271444, -1165.86354641, -71.3501045822, -541.739012932, -847.412226071, -436.892276277, 611.38560797, 208.459003504, -491.571044128, -481.696961873, -168.276293635 diff --git a/code/plots/data/bins-convergence/25_3/turbineY.txt b/code/plots/data/bins-convergence/25_3/turbineY.txt new file mode 100644 index 0000000..a398df2 --- /dev/null +++ b/code/plots/data/bins-convergence/25_3/turbineY.txt @@ -0,0 +1,10 @@ +-751.560713969, -680.308097754, -431.391913529, -534.765680839, -319.033688938, 1033.07313528, -158.799997203, -1040.67021683, 528.159915512, -213.33143504, -176.443220329, 100.237575621, 696.383536248, 272.993656404, -973.162584537, -511.820724416, -324.200977536, 596.626094244, -101.180218137, 887.244051316, -628.947913472, 1050.93327709, 1082.76798135, -347.010816341, -872.396765234 +45.3903844593, -957.993109471, 694.008379832, -927.841376597, -512.672790372, -119.549535697, 469.96759485, 52.34827962, 1122.82637868, -779.533309573, 502.67004059, 450.727124952, -350.455847207, 865.872813929, -386.413817939, 667.371137713, 99.3862542234, 582.47153222, -900.972359618, 909.863908296, 80.3370470688, 977.005538908, 472.688279587, 493.03433187, -400.219384036 +606.890318812, 312.391648367, 870.273396169, -87.8479623579, 1079.69874207, 759.95263497, 328.786063985, 361.762300077, -61.3266422978, -930.680658509, -1135.71493016, 730.414524547, 914.337394692, 573.831253572, -31.7419443907, -450.031767473, -513.1174719, -273.825190428, 212.976026484, -745.688744768, 692.307258892, 491.450589733, -960.86901609, -259.443009207, -917.040364594 +516.543899139, -139.879878046, -376.141823593, -1156.2535, -647.313527806, -899.50295466, -683.122080033, 702.294862825, -880.107867594, 238.670501606, 1084.09848077, -173.324369773, -32.2871037709, 991.171607765, 1127.2636194, 56.3156701149, -580.486352442, 404.455558342, 374.633708271, 380.844056968, -708.084966289, 406.297039827, 742.445179344, -586.134011828, -879.123546481 +229.786717773, 403.728166323, -386.161319736, -1066.57529114, -278.572225515, 876.437294692, 807.196355901, 161.719778356, 628.662882443, 841.220587498, 45.1504582208, -840.284891402, -954.907377799, 340.791984322, -119.846928583, 429.81929254, -206.92935933, 806.06069009, 746.105224051, -1058.53889163, -312.718846006, 303.8748431, 1067.99577109, -466.038174612, -710.392141459 +-642.062976376, -485.416330942, 448.82372775, -155.993915867, 404.984204287, -489.058890204, 261.401457678, 169.48075785, 542.987594725, -750.227065972, 529.954430777, 1089.9679378, -197.859598241, -973.489580622, 308.815816498, 745.146979593, 115.16089953, 1169.63730839, -336.093089959, 763.155748409, -121.322414108, -157.61863594, 104.516032806, -1028.86885872, 166.751992418 +533.104868774, 140.029482935, 684.351586274, -364.933833565, 260.830985709, -59.6193543302, 680.04741507, -480.996066901, 418.33173728, 1140.79030049, -161.911405131, 1097.41594572, -145.780773233, -977.22616921, 882.115260587, -903.760419369, -1073.99444165, -654.441380629, 156.731100727, 1036.1775323, -499.660294565, -192.055238246, -1173.02150914, 631.849910901, -207.775972898 +61.4413264549, 1157.83579015, 11.4774977557, -709.263154915, 128.432970677, 815.794412649, -180.339781066, -1048.17002176, 117.013197267, 475.933082947, 438.184433537, -493.503148311, -413.434608938, 431.100390377, -356.679467168, 856.035365157, 818.109811925, -710.131617787, 638.838368509, 1032.80851742, -547.191164961, 846.284028743, -1122.44421634, -336.616665966, 980.258238692 +-72.1124338707, -462.911910375, 1082.21214308, 753.476874557, -33.7949291583, -23.5867094619, -1161.28979236, -710.345011528, -492.581267117, -1093.60286764, 287.25231496, -607.136058963, -859.128856199, 732.94291668, 429.113472366, 201.54141968, 467.856737911, -206.924589071, -1130.10215563, 187.749088229, -332.044802092, -1007.33600557, -7.60668151548, 540.984391008, -262.124096035 +-657.101787007, 156.947847356, 781.099079681, 822.035765315, -222.447551591, 285.551530473, -316.415418053, 593.928936453, 435.571096336, 266.475923391, 833.589627738, -732.428515776, 599.694917554, -211.35512991, -240.181123343, -133.784644294, 187.692649904, -670.106878481, -811.805662339, 127.990891035, -1001.67045371, -1007.36138511, 1060.5334951, -1070.09547958, 1161.38674242 diff --git a/code/plots/data/bins-convergence/25_4/AEP_opt.txt b/code/plots/data/bins-convergence/25_4/AEP_opt.txt new file mode 100644 index 0000000..5f951bc --- /dev/null +++ b/code/plots/data/bins-convergence/25_4/AEP_opt.txt @@ -0,0 +1,10 @@ +385487.531458 +386074.07826 +386606.598012 +384335.179664 +387411.550342 +385483.961038 +386217.435895 +386806.243806 +384724.372287 +385062.855807 diff --git a/code/plots/data/bins-convergence/25_4/AEP_true.txt b/code/plots/data/bins-convergence/25_4/AEP_true.txt new file mode 100644 index 0000000..f272909 --- /dev/null +++ b/code/plots/data/bins-convergence/25_4/AEP_true.txt @@ -0,0 +1,10 @@ +380973.616144 +380714.542056 +381848.959617 +380326.060746 +381977.545497 +380180.644292 +381308.779032 +381371.759126 +380814.118132 +380744.399002 diff --git a/code/plots/data/bins-convergence/25_4/boundary.txt b/code/plots/data/bins-convergence/25_4/boundary.txt new file mode 100644 index 0000000..94ba003 --- /dev/null +++ b/code/plots/data/bins-convergence/25_4/boundary.txt @@ -0,0 +1,10 @@ +-1.81898940355e-12 +-1.82699545803e-06 +-0.000354053311867 +-0.000418588499997 +-5.09955657435e-05 +-0.000121836921835 +-5.64577235309e-05 +-6.17089881416e-07 +-3.71256314793e-05 +-6.8212102633e-13 diff --git a/code/plots/data/bins-convergence/25_4/separation.txt b/code/plots/data/bins-convergence/25_4/separation.txt new file mode 100644 index 0000000..c867b07 --- /dev/null +++ b/code/plots/data/bins-convergence/25_4/separation.txt @@ -0,0 +1,10 @@ +1.7462298274e-10 +1581.52053668 +4421.6719784 +0.00102650854387 +1950.99746833 +19030.3961839 +18055.1883387 +3372.32439743 +0.00596503281849 +-4.36557456851e-11 diff --git a/code/plots/data/bins-convergence/25_4/turbineX.txt b/code/plots/data/bins-convergence/25_4/turbineX.txt new file mode 100644 index 0000000..858007d --- /dev/null +++ b/code/plots/data/bins-convergence/25_4/turbineX.txt @@ -0,0 +1,10 @@ +-931.489042287, 956.418062282, -947.659236941, -439.004329318, 902.038763353, 336.228552675, -766.753681697, -538.52859804, 962.171068618, 344.440798895, -1171.93820356, -2.98731781903, -833.666473295, -355.171099734, 212.521342846, 97.1372277378, 1173.48116105, 71.2450590063, 689.796914623, 684.558669681, -222.248378982, -512.284579458, -203.249972454, 481.057278737, 587.623877434 +1156.04602208, 154.943948543, -605.41933488, 443.75479091, 38.268107859, -178.955619203, 72.8729040521, -1158.73323873, -261.62143233, -455.966846868, -316.445791776, 751.744217706, -583.480100532, 1.40231602205, -911.600533428, 318.070403117, -589.686693519, -1071.64734782, 771.839597059, -749.400605555, 390.013826601, 688.749815398, -852.581481012, 1009.29751779, 1054.05293753 +977.698046715, 640.273816304, -22.6303990672, -1169.45696829, -486.024635368, 260.679258038, -921.110890463, -426.195478878, 792.663698962, 97.9803976388, 386.470763161, 491.370808554, 776.055417687, 42.1840606105, -75.5366080198, -1072.62058273, -157.700395326, -608.618714165, 306.407315489, -474.141503503, -860.415003229, 1167.77683407, 708.025155431, 1088.77027195, -850.78841821 +-368.595817877, 1172.8911311, 626.444031986, -63.085556385, 681.068931798, -420.525605529, -196.256993391, 22.1309315416, 707.722480505, -1151.32855358, -391.333655057, -963.544467413, 523.935172617, -808.214601953, 221.808276347, -275.162086623, 1069.59271072, 525.375953273, -746.091499406, 1072.81290399, 198.219762428, 107.806037189, 783.658700131, -939.002672432, -661.783459241 +308.63311927, -759.178876612, 208.136554307, -560.910459507, 969.71297199, 272.453515759, 591.428088111, 929.863509122, -1004.54837892, -698.384608443, -423.598772459, -214.961740467, 606.236253048, -1161.51766262, -108.443025691, 1104.43946754, 1164.89834552, 848.736830591, -53.03968078, 122.618391907, -492.483963273, 646.972293948, -257.112986456, -861.799202791, -892.098378266 +98.4009397203, -262.046950791, -109.806377814, 559.597273887, 487.338478793, 979.997652517, 845.426280338, -579.638226565, -992.770052341, -534.408066546, 897.146218874, -192.313452786, -1089.40503221, -807.236846077, 1159.651276, -651.301706347, -1167.75666556, 301.106366749, 422.140887972, 658.743522507, -766.903313445, 31.8241871185, -154.471968338, 696.869542281, 266.98512321 +-431.675334886, 157.273643807, 452.518973052, -367.336797156, 1113.79410477, -1105.6346848, 775.86641667, 633.22643431, 845.834444929, 224.984129406, -835.212965924, -546.864216023, 715.897896036, 294.277797819, 52.7428984382, -775.360564691, -675.931470368, 1037.28786853, 398.374180407, -224.126587146, -65.2873439182, 1159.46543653, -166.522869695, -1161.57936821, -958.819615772 +533.403044811, -21.7566115812, -557.974839595, 51.9031141815, 1169.9102931, -875.306276232, -172.716926368, 431.318969821, -1167.62202966, 254.10247337, -932.993430243, -475.441068155, 159.067938491, 904.561535546, -783.945764629, 654.020838207, -310.565708461, 836.569394152, 964.806996835, 357.672255525, -1028.83495497, -72.5758125059, -312.479076279, 1102.35341357, -610.371772212 +-801.735029963, 600.464657865, 372.954155622, 724.248828055, 1172.25583732, -897.383925786, -241.153348988, -504.423157293, 223.384240126, -774.454813922, 997.289189528, 1010.56399063, 369.529088752, -990.600635509, 448.211664342, -396.272176838, -238.566167551, -1129.88618899, 117.298345877, -653.992941016, -106.692261542, 711.580857775, 190.896484199, -561.643971275, 837.410065709 +-289.671728196, 281.96506425, 395.247008009, 933.944842917, 2.29243255915, 1164.24093892, 580.319842021, -578.580141571, -218.670240531, 768.221106268, -810.543865797, 124.592061207, -1107.45793213, 861.182892126, 1091.69083613, -1161.66455287, -5.03116940233, -711.222282799, -967.307666056, -673.64372133, 614.512682716, 117.489013751, -273.81533118, -517.293277153, 120.121852154 diff --git a/code/plots/data/bins-convergence/25_4/turbineY.txt b/code/plots/data/bins-convergence/25_4/turbineY.txt new file mode 100644 index 0000000..1c5d1c2 --- /dev/null +++ b/code/plots/data/bins-convergence/25_4/turbineY.txt @@ -0,0 +1,10 @@ +-713.767508146, -680.000280681, -192.326265414, -403.225726147, -187.992520717, 1124.31590398, 349.200843945, -1042.651831, 638.767577466, 62.3350005634, -60.8008110945, 169.941142104, 781.257515262, 215.254551232, -1154.11029387, -694.968356086, -8.82361868901, 784.383492517, 33.1220295868, 953.160699646, -894.641009408, 1027.59977015, 1155.77910532, -518.238386042, -1015.79233619 +79.7478985413, -1163.24041597, 640.656380645, -838.470677605, -716.691861915, -338.658915009, 274.003479164, -185.669532138, 1143.97994708, -1081.30945027, 538.859439078, 258.278717612, -751.759430196, 1144.14828981, -738.999566334, 908.782844472, -206.594014293, 478.234100104, -883.968058286, 903.069557, 48.4985086902, 950.136613007, -42.6276193151, 598.710624773, -515.856860723 +649.032550808, 152.702633881, 1173.29629766, 97.5003877229, 1068.13683489, 1102.23754429, 311.435665004, 590.629785109, -319.893801069, -982.207803863, -1108.05079461, 965.113219316, 858.649061541, 593.216987078, 95.442639486, -476.047357611, -701.822388711, -323.993379657, -25.0530322809, -1031.82226401, 798.011415014, 26.0157188939, -935.861466067, -437.853312484, -808.266762249 +674.88869122, 38.240046451, -237.352690273, -1171.81744049, -644.080197312, -1066.03826642, -427.066257419, 953.559553822, -936.09016612, 227.109074263, 1106.34256331, -257.907846309, 244.291362183, 847.989423096, 1152.36147984, 140.014089994, -482.286694398, 709.905816882, 370.542739946, 475.614704425, -541.881549564, 402.13084265, 873.507260173, -703.853587634, -969.112268627 +316.017463891, 449.585468447, -463.488201574, -1030.78385232, -616.125307402, 1132.20357758, 1007.52695118, -22.3198928658, 606.645306444, 943.077341762, 263.427134814, -1039.37398935, -1004.79525497, 167.370041215, -86.9981011028, 396.67285531, -141.942729935, 686.03081708, 652.316403671, -1167.09067395, -342.924375939, 128.915956165, 1145.00167635, -252.118425265, -762.428017872 +-1169.38152321, -610.477347203, 620.414144196, -71.6706860596, 662.322890716, -645.554411712, -192.083879625, 307.136467579, 625.734417909, -722.056103285, 414.810153001, 1157.64909673, -436.271271103, -851.765608267, 179.847001439, 901.494172519, 116.104596963, 1134.22702248, -821.314698998, 971.181316282, -185.855372232, -477.214173895, 175.157757001, -944.197401408, 52.3069957202 +399.526617028, -295.627574539, 617.384199026, -293.141438272, 369.592458334, -393.329287926, 880.435798404, -949.985148376, 487.290415148, 1151.74570006, -86.1999827186, 1037.94710361, -209.662463842, -1136.01787037, 738.822636289, -574.781722008, -959.297948767, -548.789370493, 157.856186171, 934.244928386, -678.024930405, -181.040865242, -1161.63940116, 166.941086224, 676.6098166 +44.7871391505, 1173.31263646, 115.076770637, -1066.91142819, 91.90102207, 781.648779651, -267.449169346, -1091.37520497, -117.450788271, 362.844795454, 302.956628082, -653.440241911, -463.767410302, 201.970678114, -459.588661996, 866.541012094, 810.668480704, -822.974811668, 668.044423267, 1077.74370537, -564.477216422, 522.058718975, -1131.14663884, -402.433651853, 1002.2884772 +-421.381817983, -331.604191304, 1112.6729503, 923.363169665, 54.3341343999, 306.518816162, -1148.46896813, -630.292634034, -223.294903899, -881.6777869, 618.506402337, -596.570462453, -810.488039105, 629.163181945, 598.681992176, 108.36755162, 909.761578853, -317.006492586, -1167.63735971, 215.081217234, -68.1885931734, -933.160556121, 287.057625818, 1030.38438458, 272.962785941 +-632.14354861, 81.0662483237, 1003.50352426, 710.551139591, -306.942827515, 147.237657306, -126.446547646, 717.279707016, 507.428065313, 418.738691843, 834.722589487, -778.57705397, 388.165969861, -282.09539015, -430.519465178, -166.347101531, 198.422739188, -541.178364369, -664.418370287, 3.69817769964, -999.75499717, -1167.61818384, 1141.12271733, -1053.34873475, 1167.35026116 diff --git a/code/plots/data/bins-convergence/25_5/AEP_opt.txt b/code/plots/data/bins-convergence/25_5/AEP_opt.txt new file mode 100644 index 0000000..44a8273 --- /dev/null +++ b/code/plots/data/bins-convergence/25_5/AEP_opt.txt @@ -0,0 +1,10 @@ +349642.055623 +348883.222174 +349163.480769 +349166.676288 +349455.563062 +348997.459821 +348270.173361 +350435.669199 +348139.069986 +347928.414455 diff --git a/code/plots/data/bins-convergence/25_5/AEP_true.txt b/code/plots/data/bins-convergence/25_5/AEP_true.txt new file mode 100644 index 0000000..954d121 --- /dev/null +++ b/code/plots/data/bins-convergence/25_5/AEP_true.txt @@ -0,0 +1,10 @@ +382512.200658 +382070.63329 +382498.900212 +382099.98407 +382489.365407 +382381.25186 +381630.040924 +383590.051566 +381428.605772 +381162.190266 diff --git a/code/plots/data/bins-convergence/25_5/boundary.txt b/code/plots/data/bins-convergence/25_5/boundary.txt new file mode 100644 index 0000000..1ae6a06 --- /dev/null +++ b/code/plots/data/bins-convergence/25_5/boundary.txt @@ -0,0 +1,10 @@ +-0.00185532045839 +-0.000508940564487 +-0.00124892007193 +-0.000539324031251 +-0.0017715404897 +-0.00225093739255 +-0.00170533634991 +-0.00101672688675 +-6.38778333268e-05 +-0.000817316842813 diff --git a/code/plots/data/bins-convergence/25_5/separation.txt b/code/plots/data/bins-convergence/25_5/separation.txt new file mode 100644 index 0000000..0bd3a68 --- /dev/null +++ b/code/plots/data/bins-convergence/25_5/separation.txt @@ -0,0 +1,10 @@ +13709.8133883 +0.0100635111157 +0.0661121261655 +0.0621352837479 +28.0004206304 +3624.04116327 +0.88754586596 +0.0067388141324 +0.0832043292176 +0.0412758744642 diff --git a/code/plots/data/bins-convergence/25_5/turbineX.txt b/code/plots/data/bins-convergence/25_5/turbineX.txt new file mode 100644 index 0000000..37a1dfc --- /dev/null +++ b/code/plots/data/bins-convergence/25_5/turbineX.txt @@ -0,0 +1,10 @@ +-871.099891647, 1037.72886841, -1091.35977715, -647.61862361, 900.108770678, 476.086273322, -741.391719927, -499.920088182, 973.300924333, 79.1750884413, -1173.23420662, -185.180422596, -1046.90928897, -447.089874373, 237.985644995, 172.628989087, 1162.61662069, -45.5102265216, 616.270553117, 749.964676291, -185.257111403, -547.961643128, -62.0957854422, 342.366690181, 698.482481933 +1172.2647267, -565.275643336, -471.895528835, 337.44584982, -15.5935820222, 12.7328464644, 119.27746414, -1135.54180502, -152.988296343, -148.258273818, -159.106696506, 744.362747951, -371.435955202, 210.059275592, -882.675032137, 486.966361439, -571.196434854, -1091.71733801, 816.691740279, -715.305312089, 419.284032359, 632.417534558, -853.050554792, 962.174913596, 1085.08148306 +1038.10803743, 715.25995577, -124.727765937, -1173.41828995, -600.381738759, 385.419423802, -739.269928855, -281.534179384, 669.670653904, -259.833541845, 182.537162767, 614.095017225, 827.936719908, -144.444891734, -169.046818602, -1116.424781, 181.641538607, -376.281449345, 44.8014320452, -576.390945719, -1061.47954071, 1163.29355992, 637.23742969, 1100.12010817, -891.694629188 +-412.343681394, 1171.24936184, 594.366795738, -144.42410193, 682.295060038, -464.177944442, -170.045442888, -0.645731570223, 444.240531544, -1162.53061246, -407.506810279, -1106.72399822, 495.07042439, -858.199925549, 309.652218815, -458.346793528, 1002.35103383, 411.893838488, -745.472140446, 1102.02389954, 171.109848205, -59.7302133474, 783.797618551, -937.139983579, -690.111770084 +258.14452569, -723.456134374, 334.082283581, -464.776674302, 710.603721219, 154.964208576, 528.327696332, 952.037037976, -1089.59741413, -726.078513919, -456.435280033, -99.3128695971, 699.34219806, -1152.93139673, -2.77662718625, 1079.61538357, 1068.00989285, 803.056672178, -115.755198077, 305.468986564, -405.007145926, 626.732762403, -374.194562532, -962.023008104, -730.953941955 +9.89773704548, -112.66535498, -249.81372232, 616.812310556, 726.497926696, 1130.69806579, 870.854682223, -694.179474818, -1014.89523489, -472.645844623, 970.159053172, -293.550905399, -1099.44691229, -800.403164924, 1140.20198909, -703.21675048, -1165.57162415, 174.036853515, 514.015566587, 467.658954809, -729.22371888, 233.521457529, -190.5163696, 753.46811141, 112.287080899 +-372.617579414, 210.652644433, 354.87003877, -449.460904602, 1111.40844256, -1099.98444256, 846.98267334, 184.680942982, 659.891080018, 342.126520474, -946.520067738, -492.007549168, 717.839464615, 472.70962341, 37.791104129, -886.563731587, -584.569132436, 978.682156925, 475.995015759, -242.978541105, -183.081247103, 1167.88146183, -177.560100877, -1072.73119445, -752.14465114 +566.677522975, 19.1732198295, -508.576245769, -50.8423617612, 1173.45262239, -1036.11149421, -172.623896963, 345.158145697, -1150.84173782, 117.867203026, -1159.54490243, -568.827764291, 215.824482372, 795.579034065, -808.503404945, 712.921831932, -370.745710049, 745.835911778, 1032.19221274, 420.775584638, -979.124941198, 43.2387362389, -330.078980202, 1011.73362633, -683.039542576 +-641.177863184, 607.968896235, 346.598604901, 557.107130066, 1170.90063158, -996.226471923, -357.293952592, -595.247831118, 169.811413912, -962.217754162, 1013.33539314, 1000.80186553, 262.157840724, -988.69002244, 737.355597283, -347.543270965, -156.309583301, -1148.57213001, -21.1063339877, -749.223757866, -73.8774394038, 678.082734569, 220.579218242, -493.384779594, 897.496275237 +-254.141731193, 315.513082559, 461.080351562, 875.435318028, -56.1922836148, 1155.22018674, 550.513340471, -779.873663615, -224.341711914, 757.631585181, -1012.21994286, 165.364018821, -1173.12592544, 764.035789599, 1067.0545431, -1112.67416153, 93.9040653554, -606.885504948, -892.683000005, -556.489789542, 669.561811844, 248.688725784, -485.986283447, -461.05724999, 71.1441571343 diff --git a/code/plots/data/bins-convergence/25_5/turbineY.txt b/code/plots/data/bins-convergence/25_5/turbineY.txt new file mode 100644 index 0000000..b2b2b57 --- /dev/null +++ b/code/plots/data/bins-convergence/25_5/turbineY.txt @@ -0,0 +1,10 @@ +-786.334043027, -547.956617376, -431.358196779, -468.096645995, -70.9409806005, 1072.60330668, 391.645400131, -1061.7044835, 655.60750749, 37.5816829256, -25.6426341487, 148.118711074, 530.204533004, 260.871770715, -1149.12980825, -711.032618677, 159.55763314, 828.480287135, -307.602172127, 902.601430891, -896.801955006, 1037.72664564, 1171.87031068, -105.591359855, -943.007141283 +54.1415846659, -995.348859565, 838.920128864, -1123.95121496, -739.953579732, -246.830167191, 569.425032841, -296.111288419, 1163.49923889, -1164.11148622, 700.085963316, 349.294061114, -477.789102952, 1154.5609526, -773.317978915, 458.542719048, 110.390721, 430.452270953, -842.704300029, 930.308814937, -551.052673036, 988.526152249, -81.087938098, 207.315645289, -446.916183272 +547.237004933, 26.8098961207, 1166.86737541, 15.0430592221, 1008.30580213, 1108.41709274, 343.124196009, 216.264486354, -528.488094022, -1144.38735747, -1159.23084562, 984.693452781, 831.65955088, 757.416996904, -289.73932184, -361.568807826, -624.380299104, -664.236512203, 124.413517689, -1022.20808523, 500.398015583, 154.544552394, -985.426639007, -408.499272318, -762.900342322 +524.32832349, -72.8759134992, -309.342069975, -1164.59342401, -730.848151252, -1077.81074094, -660.086076873, 871.680688991, -1086.18013238, 160.182665483, 1100.48855676, -390.253841657, 165.475229612, 800.393656703, 1131.92379568, -153.830402576, -610.269356941, 626.245500247, 360.836633979, 403.335249496, -893.863558614, 237.050423623, 873.382656475, -706.331825219, -949.148514294 +153.259213825, 304.533367346, -510.392442916, -1076.99346626, -468.165980519, 1017.62856115, 959.031889202, -13.7191964303, 435.790787465, 921.925391099, 198.640103282, -1169.30620599, -942.367587429, -218.830043834, -95.1190188659, 459.96404241, -486.303952919, 855.709522786, 1083.32411082, -1133.06041879, -547.845030327, 302.29371507, 1112.25671044, -672.04787215, -918.06534672 +-1173.47309639, -611.875026742, 641.827539679, -90.0484996786, 921.597156287, -314.100572516, -203.518089929, 410.735778612, 589.174253216, -771.433683723, 660.248401457, 1136.20598729, -410.30785325, -858.190942953, 277.628594161, 939.479866055, 136.305110393, 1160.53765851, -781.840519888, 1056.44696614, -157.582749699, -453.906288664, 206.003466112, -899.681599063, 130.04811803 +327.963216207, -373.801674614, 663.919518477, -411.70647067, 376.707828477, -408.864680637, 812.253905838, -981.590328575, 458.550301153, 1122.53524811, -129.892796882, 1065.39404326, -560.55017785, -1074.09664809, 869.067693598, -768.856738774, -1017.55350083, -647.547408642, 98.2304305257, 990.658237321, -686.406157013, -114.859850145, -1160.00357852, 475.797968121, 384.338772757 +-139.876002443, 1173.35775184, -180.963176691, -1172.41247762, -12.1134151428, 551.007135346, -389.320158529, -1121.60731691, -229.563092409, 254.184310362, 180.531516863, -1022.9052781, -529.533669187, 181.736126598, -850.563653619, 932.137725569, 794.015748279, -906.016068473, 558.316220237, 1060.84571381, -646.877304951, 625.12124597, -1125.85684358, -594.584697782, 954.249933825 +-258.514999672, -485.896124076, 1121.16247844, 835.81076657, 78.2790150992, 103.495596857, -1116.11975244, -1011.34363446, -236.495156354, -671.768508633, 591.850844816, -612.806264426, -946.20181074, 632.161317865, 506.31654286, 40.2304407532, 1163.05769805, -240.661494875, -1173.32451738, 480.172731727, -105.409151691, -957.778530055, 496.095605167, 1064.75694648, -186.989387932 +-751.400698362, 18.9581805308, 1061.10030061, 781.504684675, -296.217137026, 206.40337612, -153.415106244, 477.068446836, 472.066539485, 347.692770419, 593.757094532, -864.249601199, 30.2175230915, -301.766732437, -488.397800869, -372.950687615, 154.970506891, -566.391065479, -761.743558721, 322.689741927, -963.754573769, -1146.86090511, 1068.15418122, -1079.14922371, 1171.35598524 diff --git a/code/plots/data/bins-convergence/25_6/AEP_opt.txt b/code/plots/data/bins-convergence/25_6/AEP_opt.txt new file mode 100644 index 0000000..f79711f --- /dev/null +++ b/code/plots/data/bins-convergence/25_6/AEP_opt.txt @@ -0,0 +1,10 @@ +356966.850771 +356481.206362 +356766.729011 +356313.635856 +356349.881014 +356775.162386 +355917.33924 +356221.462561 +356373.844142 +356242.481349 diff --git a/code/plots/data/bins-convergence/25_6/AEP_true.txt b/code/plots/data/bins-convergence/25_6/AEP_true.txt new file mode 100644 index 0000000..452e358 --- /dev/null +++ b/code/plots/data/bins-convergence/25_6/AEP_true.txt @@ -0,0 +1,10 @@ +382288.445282 +381948.545677 +381862.02664 +381644.669069 +381276.084174 +381960.589122 +381005.715926 +381305.256424 +381612.472841 +381230.975837 diff --git a/code/plots/data/bins-convergence/25_6/boundary.txt b/code/plots/data/bins-convergence/25_6/boundary.txt new file mode 100644 index 0000000..1ee560e --- /dev/null +++ b/code/plots/data/bins-convergence/25_6/boundary.txt @@ -0,0 +1,10 @@ +-0.00089466522968 +-0.00391907765902 +-0.00232114222763 +-0.00164278695479 +-0.000819308602104 +-0.0014861738357 +-0.00188878999597 +-0.00319208323549 +-0.000666125595217 +-0.00484678257476 diff --git a/code/plots/data/bins-convergence/25_6/separation.txt b/code/plots/data/bins-convergence/25_6/separation.txt new file mode 100644 index 0000000..725acba --- /dev/null +++ b/code/plots/data/bins-convergence/25_6/separation.txt @@ -0,0 +1,10 @@ +38761.0005988 +35033.7988371 +42014.7913551 +20874.5526703 +3107.70392519 +36291.9396836 +30169.5609418 +21758.4111615 +23218.1601879 +48757.437404 diff --git a/code/plots/data/bins-convergence/25_6/turbineX.txt b/code/plots/data/bins-convergence/25_6/turbineX.txt new file mode 100644 index 0000000..5763ef1 --- /dev/null +++ b/code/plots/data/bins-convergence/25_6/turbineX.txt @@ -0,0 +1,10 @@ +-759.27611887, 937.132154114, -1143.0825997, -747.864395143, 1097.0353216, 337.181620696, -795.361953215, -374.04599888, 1054.71359119, 221.096584612, -1156.24075541, -288.852039118, -895.381844284, -403.25496171, -17.8396084685, 125.381585762, 1137.88882386, 76.2468445242, 683.954641431, 756.650919399, -320.845991854, -495.082649385, -118.73056571, 387.908168098, 562.90684021 +1172.32753339, -579.646341592, -439.385287565, 447.893417948, 154.47089874, 17.8019896046, 321.649114789, -1137.87886185, -210.087244986, -240.037277181, -101.325717377, 789.889264014, -508.983239323, 207.047578969, -910.60255136, 589.071431372, -540.10224651, -1109.31316245, 861.368826624, -724.690109769, 475.698721494, 654.258597889, -828.244292342, 1067.8162669, 980.801516864 +1039.0711162, 555.45051987, -94.1814443195, -951.367829116, -459.272621121, 248.405080387, -1142.63755435, -579.966142555, 892.090391566, -28.7045327311, 365.507124358, 374.444423297, 735.192412945, -188.232252699, -304.966670311, -1078.82819369, 197.733895525, -774.527703757, 72.9092235805, -307.937510713, -915.453942513, 1160.16393196, 751.969575412, 1146.15380648, -641.113105584 +-458.198618044, 1144.61472395, 855.847770714, 185.599223898, 575.779921103, -299.618978869, -273.531946756, 36.8084712384, 633.250298224, -1142.36347598, -391.169344376, -1048.6681115, 566.018818487, -917.569628096, 326.44844829, -544.506607917, 1115.17650863, 466.444327445, -772.073731528, 992.69868059, 48.4166617736, -121.156798483, 689.290566277, -929.833714199, -636.174103723 +267.556284335, -669.221007634, 320.068565707, -385.126016698, 698.648972609, 191.312293223, 557.945429122, 944.777168558, -991.145867587, -708.422615701, -412.05989274, 40.297654162, 845.799613676, -1173.24719096, -81.7320192371, 1072.60492616, 1134.5496908, 804.410467712, -197.392369712, 353.858482617, -467.869857455, 649.154862885, -301.77631974, -1021.05992392, -756.186971419 +-263.610710315, -386.369959933, -545.725384105, 514.51489136, 595.62734559, 949.264687554, 855.051998412, -776.185875411, -922.19152418, -854.226095292, 1018.49349235, -80.46254085, -1087.63946131, -617.999207258, 1169.15955979, -426.328062308, -1173.32400056, 324.169069288, 559.806434398, 707.006937137, -245.994409804, 163.320612473, -193.633806855, 163.682993019, 198.496818875 +-453.139719252, 175.392405504, 277.822744192, -455.636777772, 1043.36488464, -1075.23216008, 715.092286626, 976.736507093, 684.363911078, 391.924888619, -945.205907088, -466.264582443, 693.714373278, 561.560476999, -100.406007776, -737.463798815, -331.64927935, 1140.27497004, 519.965990403, 45.3704620283, 57.5886960622, 1164.92033815, 81.1238697995, -1074.53805994, -792.691487174 +744.349229996, -50.7322682849, -495.306619188, 284.579555753, 1172.63961292, -937.532262757, -212.106734297, 450.959635981, -1157.1294576, -48.5343870789, -1132.61616347, -411.681165247, 119.466728037, 711.479652514, -741.59078558, 603.163864222, -334.579502288, 853.313979042, 1059.54475142, 300.288731481, -993.47279293, 63.2508626024, -200.289039032, 1114.20702175, -629.221467259 +-689.123517498, 735.398723967, 70.9994223352, 523.416896326, 1089.31262113, -1171.44152, -351.959837146, -606.623249765, 265.834005151, -689.597185847, 814.445048997, 1060.09407706, 423.807491397, -1004.30213533, 314.795107185, -148.556904209, -289.304496871, -1061.93380395, 66.6854081906, -539.540055678, -184.981017947, 715.848533341, 231.545811924, -729.599577065, 966.710678991 +-280.203072012, 336.998217046, 406.498137232, 830.906277892, 167.473604126, 1077.14776795, 705.519951821, -740.723106209, -137.917943865, 562.964406122, -843.706111225, 79.7828638647, -1085.3355323, 1173.28760681, 1041.81891611, -1173.03083079, 8.42611816441, -703.504450269, -1001.15838931, -629.04611653, 742.473291669, 361.023549848, -421.334161222, -389.349290531, -262.568521227 diff --git a/code/plots/data/bins-convergence/25_6/turbineY.txt b/code/plots/data/bins-convergence/25_6/turbineY.txt new file mode 100644 index 0000000..1f4688f --- /dev/null +++ b/code/plots/data/bins-convergence/25_6/turbineY.txt @@ -0,0 +1,10 @@ +-894.782623342, -706.342421681, -265.51476082, -377.87660223, 36.6008752895, 1124.03048779, 298.554526121, -1112.30732359, 514.504868012, 198.17112226, 200.610606417, -2.25727471208, 758.569551637, 478.192298397, -1173.3787745, -775.902562289, -286.960543845, 619.652850708, 116.189400016, 897.004572094, -566.006359173, 1063.9692882, 1167.49268362, -252.294223377, -1029.6952615 +-52.7713127067, -1004.42144184, 751.037776422, -1084.67883981, -956.082478822, -234.689400222, 305.257899313, -287.01356334, 1154.55634102, -1148.70417798, 463.758379307, 210.898416877, -567.582856711, 1155.10575404, -740.230776336, 592.142190599, -47.1598186459, 382.834274864, -796.983792377, 923.016956642, -330.776123433, 974.208187641, 199.458480931, 486.72916446, -397.759394667 +545.406371218, 243.172278011, 1169.72896314, -109.474189012, 1079.90962115, 1146.92469475, 267.427604459, 528.738925831, -533.399250855, -1173.16337208, -1115.1415518, 757.910615746, 914.676003014, 390.699705421, -126.151919873, -461.807693912, -674.032656933, -592.25309697, -38.8607835652, -906.207750892, 734.221628197, 176.518375422, -900.931844084, -251.927708697, -982.909292865 +549.026812643, 258.833849935, -219.719137538, -1158.74459781, -498.332481853, -1134.62143081, -541.552649414, 809.597426842, -987.993814491, 268.593484009, 1106.40186612, -210.884873602, 82.8344368941, 731.575886145, 1127.1961488, -253.623169049, -365.400839756, 575.85428255, 161.86557922, 625.848147249, -690.758076219, 379.903098794, 949.745237767, -715.922591549, -986.113216678 +394.831755151, 323.541536431, -488.871005583, -1108.51884957, -463.576774198, 964.976301963, 954.249699663, 12.6202535544, 628.304628779, 906.094832003, 122.148852458, -1040.22119466, -813.485660497, 25.039773848, 13.9012548999, 476.082541127, -299.888279295, 854.436430615, 681.322331036, -1118.89280577, -570.703180494, 313.309592105, 1134.04899563, -578.422470337, -897.395229865 +-1143.52335676, -666.574077688, 576.061490526, -96.5950302508, 455.894026608, -689.953572817, -173.313524698, 186.003528324, 725.740507392, -663.274080805, 582.932211213, 1170.75277121, -440.654462477, -997.603594947, -101.005990014, 1093.33517561, 21.1783499009, 1127.85209365, -955.254274563, 936.630851125, -185.177339794, -591.404950285, 416.431039652, -1162.04433754, 221.007320197 +490.078373818, -5.58095453241, 545.894013874, -474.300108094, 537.149925192, -470.118814333, 930.473352243, -650.479393636, 349.592384509, 1106.13455295, -153.359625519, 1076.90911257, -493.34374774, -1030.43008656, 595.093681064, -912.843536317, -1125.60084463, -277.326598911, -159.958041812, 1172.63752552, -709.295054393, 141.762969534, -1170.70716071, 471.704922645, 336.308946471 +-97.4175099967, 1172.41734761, 22.6578161681, -665.572036198, 45.3061648356, 644.691348811, -175.729168348, -1083.40839373, -195.417876764, 211.35860771, 307.122141425, -842.054119177, -269.56225063, 559.985490017, -463.641687979, 1006.64258564, 858.161283663, -805.600570179, 504.481513166, 1134.43816936, -624.619529732, 677.095728918, -1156.29633747, -368.349504498, 990.563992739 +-182.867675487, -402.824601215, 1171.36524493, 1050.31951315, 436.502120485, 69.7185307645, -1095.61538324, -538.271347723, -355.587571283, -949.521824336, 844.875961845, -503.325382735, -855.525774127, 607.053552245, 669.168392258, 146.850388576, 1137.29452024, -499.432257828, -1171.61810084, 367.582181877, -496.811703901, -929.891021444, 74.2822236728, 919.141092951, 5.61641975713 +-748.523516353, 125.974938694, 1100.86122016, 828.692242214, -340.245073173, 465.713039964, -384.159412199, 317.854571063, 434.082339017, 551.539176624, 815.657462793, -877.839762123, 446.302835353, -23.3122039495, -540.138167701, -33.7434437708, 34.3353553241, -939.264276119, -612.224692706, -196.091877511, -908.773531384, -1116.60107474, 1095.26869706, -1107.04246746, 770.388887539 diff --git a/code/plots/data/bins-convergence/30_1/AEP_opt.txt b/code/plots/data/bins-convergence/30_1/AEP_opt.txt new file mode 100644 index 0000000..27aa934 --- /dev/null +++ b/code/plots/data/bins-convergence/30_1/AEP_opt.txt @@ -0,0 +1,10 @@ +422257.967351 +424894.224262 +424191.982408 +420213.034172 +428929.46844 +423611.692012 +423251.231804 +425039.096573 +427571.641924 +424058.552328 diff --git a/code/plots/data/bins-convergence/30_1/AEP_true.txt b/code/plots/data/bins-convergence/30_1/AEP_true.txt new file mode 100644 index 0000000..adc31c2 --- /dev/null +++ b/code/plots/data/bins-convergence/30_1/AEP_true.txt @@ -0,0 +1,10 @@ +381955.543512 +382001.421884 +381505.252669 +381200.264647 +383406.128663 +381154.066542 +381856.171402 +382716.893006 +383177.65623 +381698.240446 diff --git a/code/plots/data/bins-convergence/30_1/boundary.txt b/code/plots/data/bins-convergence/30_1/boundary.txt new file mode 100644 index 0000000..efd0565 --- /dev/null +++ b/code/plots/data/bins-convergence/30_1/boundary.txt @@ -0,0 +1,10 @@ +-0.000211890169794 +-0.000175035145503 +-0.000198924856932 +-3.7349309423e-08 +-0.000464625297127 +-0.00012470693764 +-0.000247591171274 +-0.000585475534535 +-0.000114839455364 +-0.00121612558019 diff --git a/code/plots/data/bins-convergence/30_1/separation.txt b/code/plots/data/bins-convergence/30_1/separation.txt new file mode 100644 index 0000000..c44e403 --- /dev/null +++ b/code/plots/data/bins-convergence/30_1/separation.txt @@ -0,0 +1,10 @@ +0.000247183212196 +2576.99439665 +0.00135807684273 +13001.7035887 +0.00825676273962 +0.00434623299225 +0.00180066554458 +0.304620473093 +0.000313060489134 +0.313305889373 diff --git a/code/plots/data/bins-convergence/30_1/turbineX.txt b/code/plots/data/bins-convergence/30_1/turbineX.txt new file mode 100644 index 0000000..bf395ba --- /dev/null +++ b/code/plots/data/bins-convergence/30_1/turbineX.txt @@ -0,0 +1,10 @@ +-867.241269924, 892.875854278, -927.852512056, -648.457943044, 912.819015174, 311.616775493, -934.934178702, -484.354885804, 1057.89448208, 232.419502963, -1164.0762558, -27.2025360004, -990.186601719, -366.152741287, 73.690734063, 54.592076326, 1148.18666701, -33.9593078316, 666.936980106, 753.016467248, -240.93291649, -579.544898297, -128.446027612, 373.174676455, 575.062760582 +1141.75122066, -464.1289142, -539.52216358, 448.030522253, 199.7826243, -80.5864032269, 35.9868936624, -1120.57881611, -211.990365439, -79.4506396619, -220.35275492, 890.86396082, -338.067384913, 217.228827395, -746.432240262, 573.532078515, -643.165840997, -1156.87639456, 724.527531648, -784.93064474, 335.197610035, 798.544184597, -869.757788204, 1143.38205602, 971.796220147 +1137.61227239, 659.442057335, 156.148503682, -986.23684299, -485.986756718, 248.103130905, -774.278864434, -474.867237874, 396.282714645, -97.6641858879, 162.236175126, 581.627227445, 831.125082982, -123.825291386, -203.86721384, -1169.72154065, -347.617974178, -548.509571759, 255.410749197, -628.390204707, -879.22877102, 897.085537842, 758.858926885, 1061.06667865, -936.772248102 +-251.308786413, 1144.5695607, 569.343915394, -91.3067233492, 641.510122577, -516.899409241, -234.343625096, 72.1091104849, 609.814614782, -1057.13512757, -343.326608765, -872.132790006, 467.541501204, -761.697599894, 349.42219121, -424.605612832, 944.553724294, 469.966565356, -629.612603067, 1058.69909512, 278.745206946, 10.0058607202, 821.83129864, -1134.57142272, -817.168258683 +368.631994305, -758.123898676, 164.313408208, -420.680456845, 491.211882488, 287.453283395, 603.166167772, 900.500222031, -1039.59664031, -666.729526453, -508.411924173, -173.791729472, 788.040597574, -1171.87064331, -86.4963037885, 1167.18651281, 1094.36026064, 969.047950255, 30.6498987795, 81.5857599381, -647.560418878, 650.693701948, -228.830159473, -1098.87059628, -876.015861792 +64.172528335, -241.131345378, -245.907514515, 576.052162781, 283.338787141, 1097.2254539, 882.690797458, -553.95078646, -955.57937078, -465.511895257, 976.847469545, -258.377373909, -1078.37157419, -729.272721229, 1162.37737941, -628.400540299, -1170.2378214, 192.178903042, 438.486833775, 653.800408444, -861.262687627, -12.8612458838, -132.526317292, 809.868617683, 333.554404767 +-500.629191337, 196.914538505, 307.700349616, -352.975492317, 1106.95947693, -1057.00485335, 854.57404106, 628.736798544, 684.015355815, 62.6241319325, -840.453042497, -505.33596712, 759.694169562, 174.129524999, 67.0660938126, -757.126652004, -532.606036512, 1007.92999811, 491.356379596, -210.811893887, -65.5696795761, 1170.41023144, -285.385581682, -1166.49227085, -939.814136537 +290.436874094, 142.162399618, -701.487516199, 282.385727043, 1172.8016981, -767.047041078, -327.283584357, 532.999761083, -1151.36775757, 376.933174797, -1059.53064613, -573.398361463, -13.291010411, 711.618260605, -931.439407999, 750.396969848, -190.691209619, 838.253886193, 1033.92230347, 465.577599392, -800.153337924, 113.728514126, -272.439624413, 1067.40754825, -453.098112196 +-895.943542908, 669.689381615, 303.382197778, 395.495560977, 1171.34039469, -962.671382584, -225.172523892, -685.16397801, 298.345713141, -460.084670395, 1072.87074433, 949.722948144, 291.410608817, -1056.03314389, 783.810843792, -404.146171039, -307.752747216, -1142.63171855, 33.9523587183, -725.970381689, -74.9661316866, 558.813927682, 10.2791335692, -643.736942091, 878.657169625 +-310.378521155, 293.556746174, 451.685384602, 941.199299685, -90.5051404972, 1144.66960543, 622.133115978, -635.492865324, 187.171840659, 615.60425228, -846.666715182, 132.671258056, -1081.45638933, 872.001810619, 1111.98995169, -1158.87219781, 31.432692661, -761.430620187, -992.436433399, -357.752366779, 734.588216289, 397.46623864, -293.626875473, -543.477214045, -60.7978066725 diff --git a/code/plots/data/bins-convergence/30_1/turbineY.txt b/code/plots/data/bins-convergence/30_1/turbineY.txt new file mode 100644 index 0000000..c0b5584 --- /dev/null +++ b/code/plots/data/bins-convergence/30_1/turbineY.txt @@ -0,0 +1,10 @@ +-790.587421773, -761.517627994, -267.431409696, -428.413531492, -132.03100724, 1131.38451019, 295.201165422, -1068.89490478, 507.932254926, 54.5465519879, -148.53484697, 121.51642669, 629.814627801, 223.600851623, -1171.19839176, -654.324993538, -242.49398165, 692.463460123, -41.1645319249, 900.056805794, -858.187492556, 1020.42324713, 1166.46367898, -484.833814236, -1022.95596366 +-271.183341133, -1077.83140194, 764.884722657, -1084.62191133, -939.098281292, -313.678152884, 455.590229242, -348.481361973, 1154.20794348, -1170.82175984, 606.380448655, 393.449058537, -532.027804034, 1153.23352663, -905.524674436, 585.974278769, -105.399375201, 196.908358325, -860.938732708, 872.364487869, 272.826910002, 859.920628689, 31.8343081924, 264.222200188, -657.836001527 +288.05251971, -318.565602968, 1163.07933394, 104.495599437, 1068.15391633, 776.734060224, 308.343801271, 606.446914337, -739.05469129, -1169.44329749, -1162.24581855, 921.761554396, 828.472686496, 950.099564423, 67.5444859689, -94.2734669559, -1097.86740227, -294.91691349, -116.877436262, -991.091320197, 777.234113545, 24.8125858311, -895.136315317, -501.2721937, -706.819717929 +703.327480393, -259.029751942, -154.122018418, -1169.95682564, -590.633904954, -1021.99023102, -525.535474466, 966.791618212, -1002.62756156, 509.510759112, 1122.1687624, 7.19942007554, 296.285185065, 892.722049634, 1120.28568851, -135.974454256, -696.38649723, 795.984895708, 319.796257409, 506.253017383, -874.691627708, 22.9168633599, 662.762923067, -299.805901126, -842.242203069 +170.510347409, 384.846374103, -357.425155422, -1040.33730689, -680.675447333, 1093.90725457, 991.88698204, -89.2961801625, 544.4039985, 965.716687559, 252.142524634, -1121.86038087, -869.556539156, 62.0941705399, -147.911350146, 121.703849375, -423.688048452, 661.87774638, 1134.55242534, -1170.67514805, -913.347745631, 402.966360474, 1150.98769323, -411.84911502, -780.853487097 +-1064.45659313, -672.286307977, 700.808475643, -218.073833484, 629.954637159, -416.211763043, 4.76262200309, 318.928374703, 681.178371753, -803.638404199, 650.311417659, 1144.71713402, -462.872218289, -919.400543081, 161.291211514, 991.084586123, 87.6319011703, 1157.67145629, -1088.51515157, 946.141494995, -103.489445158, -503.186997181, 124.765419638, -849.263643125, -124.292618796 +517.11386088, -249.304537362, 642.554730185, -390.519439256, 389.585179798, -509.781039735, 804.263080199, -990.871307718, 509.695101427, 1171.84218666, -128.457849212, 1059.13712765, -176.302357418, -1160.52352284, 741.018871024, -896.601994259, -1027.71452234, -601.009994325, 154.982079643, 908.688540531, -573.003026084, -85.2982311327, -1138.28425751, 128.188356438, 702.769725191 +-380.295297716, 1164.87161605, 199.461000401, -954.405756474, 40.8929860708, 888.130195199, -325.017213586, -1045.48912359, -226.910329318, 400.38272127, 504.510729594, -585.394541499, -807.711046228, 218.575091432, -365.58918738, 902.24188258, 853.482138518, -821.259000328, 555.10432178, 1077.20649342, -858.423286693, 561.79032683, -1141.45197716, -487.623855899, 1082.51529617 +-757.905733473, -465.464449999, 1133.62036976, 739.446287133, -71.3974281257, 20.418375333, -1151.70884434, -910.129204534, -224.254768652, -1040.28046493, 475.48324721, -689.320305, -1136.75669548, 511.790870623, 638.310214625, 192.594819241, 1100.87649493, -267.448412166, -1173.02308801, 346.324326631, 2.63859410959, -1031.92197389, 916.960818577, 981.192458685, 31.8796081247 +-846.710357858, -38.2960126071, 1083.10495349, 700.913533481, -649.955672641, 258.587583256, -183.534430568, 660.906140098, 875.10660189, 471.547881329, 812.583160249, -1079.30129631, 455.618278333, -274.954877327, -374.985798601, -184.807940856, 71.751442458, -455.626748386, -626.263675921, 206.896648883, -915.159297718, -1104.15474045, 1136.18623994, -1040.08110039, 1012.58523647 diff --git a/code/plots/data/bins-convergence/30_10/AEP_opt.txt b/code/plots/data/bins-convergence/30_10/AEP_opt.txt new file mode 100644 index 0000000..a1dc1ce --- /dev/null +++ b/code/plots/data/bins-convergence/30_10/AEP_opt.txt @@ -0,0 +1,10 @@ +361538.344045 +362274.245948 +360225.787346 +361752.582975 +362327.22155 +361594.774581 +359410.64618 +361693.007861 +361190.636064 +361553.933433 diff --git a/code/plots/data/bins-convergence/30_10/AEP_true.txt b/code/plots/data/bins-convergence/30_10/AEP_true.txt new file mode 100644 index 0000000..77b4212 --- /dev/null +++ b/code/plots/data/bins-convergence/30_10/AEP_true.txt @@ -0,0 +1,10 @@ +381676.528687 +382567.262526 +380824.521386 +382028.692703 +382587.333954 +381662.845453 +379924.352993 +382550.685117 +381656.733435 +381849.186148 diff --git a/code/plots/data/bins-convergence/30_10/boundary.txt b/code/plots/data/bins-convergence/30_10/boundary.txt new file mode 100644 index 0000000..d0f2dec --- /dev/null +++ b/code/plots/data/bins-convergence/30_10/boundary.txt @@ -0,0 +1,10 @@ +-0.00257079907215 +-0.000174887169806 +-0.000757375036301 +-0.000533773119969 +-0.00161352791974 +-0.000935266386477 +-0.00206559560888 +-0.000738027965326 +-0.00224296200213 +-0.00171895540643 diff --git a/code/plots/data/bins-convergence/30_10/separation.txt b/code/plots/data/bins-convergence/30_10/separation.txt new file mode 100644 index 0000000..a9b676b --- /dev/null +++ b/code/plots/data/bins-convergence/30_10/separation.txt @@ -0,0 +1,10 @@ +0.382724197218 +11064.9971016 +34425.1366217 +36566.9239875 +20290.7703096 +226.835317902 +4692.58128192 +6712.41210598 +0.0557992323302 +7124.40334841 diff --git a/code/plots/data/bins-convergence/30_10/turbineX.txt b/code/plots/data/bins-convergence/30_10/turbineX.txt new file mode 100644 index 0000000..7077742 --- /dev/null +++ b/code/plots/data/bins-convergence/30_10/turbineX.txt @@ -0,0 +1,10 @@ +-882.526778912, 959.107297519, -961.999938028, -677.901148566, 913.5879944, 245.164159224, -783.615719366, -500.145324506, 1042.39202377, 85.2463461323, -1171.94333161, -220.311903921, -1026.92319899, -457.805784442, 75.4472169957, 68.5918067698, 1173.47297875, -48.9904319991, 712.529574541, 609.445355321, -385.841767586, -526.370423717, -111.769444675, 380.602763486, 475.647664435 +1172.25201361, -411.659652228, -581.907403449, 534.264428401, 238.170060772, -109.688067493, 147.207733192, -1139.52017051, -273.437090415, -41.2999656927, -263.004557115, 903.342178339, -508.379493146, 82.1668095226, -876.641031467, 386.193807275, -613.387364577, -1048.93794046, 855.973177671, -708.666711977, 516.648798306, 681.96697397, -857.794501602, 985.457374173, 1106.68886411 +1034.53759921, 729.410433919, 329.34161195, -1166.05463344, -308.688708929, 133.54431923, -830.3798332, -377.812654004, 536.370002138, -57.7099697191, 362.964478945, 496.519124325, 760.783061677, 19.9567289995, -413.833515357, -1091.51906823, -390.545186398, -413.433952239, 142.727826427, -449.157785933, -810.632439886, 922.569817636, 853.645883688, 1132.01318694, -837.283930915 +-352.498211524, 1170.97187718, 664.928734136, -96.730194416, 547.338569482, -489.904973201, -198.054508072, 70.1214004356, 893.073789345, -1157.75085158, -348.967281022, -1152.48046444, 635.891484814, -799.492344322, 231.979380257, -214.917788541, 1109.74095696, 455.07009131, -798.337262804, 1036.357717, 263.552603555, -55.8055665569, 743.726368377, -1018.87433223, -802.438033366 +341.011281377, -785.36773435, 410.907649138, -437.900976836, 825.342410359, 283.222162414, 595.566156351, 882.729706486, -1051.21379964, -610.410625713, -537.581762353, -80.6653298897, 748.036419978, -1173.38693678, -115.099221634, 1083.67507411, 1156.19269082, 851.503800954, -24.1218879281, 194.08341207, -480.369800899, 607.597575431, -254.335221676, -1092.49299297, -876.468235264 +50.508521737, -14.409751548, -437.547895116, 636.73034906, 425.266547508, 955.713142358, 932.545122714, -1165.47468191, -1025.32527644, -295.937346987, 1011.68490489, -279.057222803, -1122.38650254, -551.399741233, 1172.4245583, -731.566016945, -908.384777013, 182.706620371, 625.507010651, 735.254813452, -617.07592001, 314.901267896, -153.873922116, 510.309811227, -16.7377744112 +-487.405833504, 264.006984681, 344.350215525, -310.265207545, 1070.05838, -1091.54065575, 719.123281633, 611.452212644, 460.960112264, 189.632113147, -920.144401933, -515.637798168, 671.022886538, 535.394641278, -46.6281116695, -732.06514563, -551.396404967, 953.593186832, 713.076944871, -258.784658112, -177.657286782, 1172.60703321, 60.8066980043, -1119.61576862, -814.864698713 +653.245090569, -123.896053122, -672.552600444, 302.080278963, 1173.41390709, -858.302562247, -264.0185383, 559.23804666, -1171.42720564, 188.914461074, -1081.33569623, -365.925016639, 48.3052964911, 1077.67602825, -707.992423079, 604.168297385, -331.261676143, 896.715560355, 865.462583029, 279.672285957, -996.797096697, 77.5216657715, -294.936820046, 1106.98345718, -572.426479246 +-652.806877535, 773.059083618, -46.3510559386, 356.53386206, 1172.97190771, -1142.89224477, -388.31892212, -676.52828025, 337.067478917, -713.537665035, 957.116448424, 1068.99988394, 370.526750018, -786.667362124, 653.48495964, 61.6828521433, -257.921962042, -1145.06643738, -16.7419999094, -673.313027603, -145.236615368, 627.37205754, 211.98041831, -539.797211403, 768.897129159 +-429.60619548, 417.962661601, 547.534384991, 930.48851997, 4.79729521982, 1153.33790924, 549.019927397, -538.376795361, -214.793594505, 758.064495056, -797.925856658, 9.56836179595, -1133.8186676, 852.021080744, 1121.56392995, -1135.889181, -118.283647874, -668.140728373, -938.899186222, -776.175311043, 812.770613921, 336.967111983, -228.06353203, -300.035049965, 186.66018857 diff --git a/code/plots/data/bins-convergence/30_10/turbineY.txt b/code/plots/data/bins-convergence/30_10/turbineY.txt new file mode 100644 index 0000000..c583bf0 --- /dev/null +++ b/code/plots/data/bins-convergence/30_10/turbineY.txt @@ -0,0 +1,10 @@ +-773.487245578, -676.203614712, -214.084995504, -410.020544421, -2.21762475055, 1147.61996039, 429.516796301, -1061.59937454, 539.031676026, 11.7596377148, -60.7071185036, 149.318787065, 567.947898812, 281.101590235, -1171.08657931, -603.204250924, -9.9750491554, 772.643890213, -479.814204774, 1002.85239974, -613.67999672, 1048.84239722, 1168.17971355, -199.940440982, -1072.80064534 +54.4176469972, -1098.94149733, 373.432296302, -1044.84324772, -1149.09134702, -489.576387699, 297.196340783, -280.41056158, 1141.21342118, -1172.78736798, 671.590397218, 189.397676626, -634.583724879, 1170.63424844, -780.151626187, 1090.51675421, -116.829449305, 526.179889417, -802.773927738, 935.375639801, -167.772910493, 931.165778878, 89.6944877961, 637.188885409, -390.353283074 +553.956539298, -199.669904249, 1126.35257792, 132.111047286, 1132.18689828, 402.743070128, 270.418070612, 720.961540017, -664.478381926, -1172.0945235, -1115.97171221, 714.086701391, 893.501606115, 990.840786238, 339.135752406, -430.955278702, -688.627919118, -242.139740438, -130.152751041, -1084.15558825, 848.534642937, 163.025769387, -805.248196137, -309.328003528, -822.248284897 +587.092958695, 77.208523407, -237.374883511, -1169.52100038, -1038.05432311, -1066.36256013, -673.396632771, 740.289730655, -761.285287291, 191.699932258, 1120.42748048, -221.190307758, 198.517697329, 859.038939019, 1150.35710964, -212.287998303, -381.590079588, 591.541313445, 337.377622516, 550.544152284, -884.32583021, 365.525626968, 907.748365877, -582.264750349, -856.288670166 +324.219126754, 360.475203264, -684.807490122, -1088.75130423, -467.587736761, 1138.82454701, 1006.87724977, -1.69456585365, 521.621726952, 1002.26487726, 197.708860333, -980.70256422, -904.200811647, 17.3045291371, -205.931712161, 450.318394836, -200.886543519, 807.51447671, 827.774481326, -1157.35372061, -628.210594305, 177.077047592, 1087.88020025, -428.47982391, -780.345644631 +-1172.42701746, -703.157224598, 513.153669592, 37.1563175737, 886.010517429, -680.990749577, 151.979750111, 137.130137398, 570.827598862, -899.380537703, 594.667603497, 1139.85312786, -342.614113134, -1035.90261234, 50.5662810863, 917.577113127, -714.951917221, 1159.20414089, -526.937722794, 914.623782541, -182.23298683, -374.498170291, -86.1770307889, -1056.74994795, 412.044553759 +450.730962752, -410.239645857, 758.988683092, -233.644761837, 481.778970548, -430.900908938, 927.360556052, -553.791186126, 396.154579812, 1158.09171902, -99.3662757003, 1054.16108197, -111.790802159, -1044.26459753, 568.713654876, -610.160460237, -1035.90438894, -683.956084568, 302.721801847, 971.332218138, -802.787005274, 46.1896661712, -1171.93824702, 351.563601938, 397.83047615 +62.80852867, 1166.95596474, 92.2572336463, -941.236778148, 15.4075617206, 800.28291072, -221.003583837, -1031.69281509, -69.9590537713, 223.019375689, 455.904603875, -690.861732471, -806.224259486, 464.489698392, -480.500659753, 1006.04053982, 745.975968129, -756.993094562, 792.534855378, 1139.70216997, -619.299503305, 688.315001412, -1135.8470843, -389.517788794, 1020.56171279 +-88.67981245, -323.215472449, 1172.59867853, 1097.72531538, 35.679883286, 266.333163134, -1104.83551952, -533.015433333, -101.42967989, -931.665193465, 679.017363888, -484.123421226, -908.122833078, 870.798977256, 920.287752886, 9.98419277022, 693.044543273, -256.825677065, -1173.39498864, 309.926668513, -490.329196942, -991.738603315, 511.906648768, 789.219663198, 241.207885085 +-766.26336579, -599.926690042, 915.987830452, 715.071329231, -350.018087474, 216.673994416, -51.2941034932, 774.7114179, 698.243633336, 418.867193877, 860.494214125, -991.860406173, 302.64202241, -197.630278214, -345.303166901, -294.774908248, 166.295683162, -567.368472384, -703.991635953, 228.580811707, -846.48769057, -1124.09509593, 1151.13993195, -1134.5109184, 1073.90402523 diff --git a/code/plots/data/bins-convergence/30_2/AEP_opt.txt b/code/plots/data/bins-convergence/30_2/AEP_opt.txt new file mode 100644 index 0000000..73658da --- /dev/null +++ b/code/plots/data/bins-convergence/30_2/AEP_opt.txt @@ -0,0 +1,10 @@ +291798.040066 +290450.168939 +291451.342399 +293363.243533 +294422.129934 +291533.440576 +291515.569432 +293885.308132 +293302.869417 +292532.071373 diff --git a/code/plots/data/bins-convergence/30_2/AEP_true.txt b/code/plots/data/bins-convergence/30_2/AEP_true.txt new file mode 100644 index 0000000..431ae70 --- /dev/null +++ b/code/plots/data/bins-convergence/30_2/AEP_true.txt @@ -0,0 +1,10 @@ +381614.61647 +380887.163773 +381635.405358 +383233.622592 +384059.054346 +381279.974518 +381410.189678 +383352.442093 +383015.411411 +382327.468026 diff --git a/code/plots/data/bins-convergence/30_2/boundary.txt b/code/plots/data/bins-convergence/30_2/boundary.txt new file mode 100644 index 0000000..b2e0658 --- /dev/null +++ b/code/plots/data/bins-convergence/30_2/boundary.txt @@ -0,0 +1,10 @@ +-0.00087521396722 +-0.00434525734158 +-0.00153010234249 +-0.000366889481938 +-0.00128269996389 +-4.34673193013e-05 +-0.000910720674938 +-0.00340064868192 +-0.000189030919501 +-0.00157755538316 diff --git a/code/plots/data/bins-convergence/30_2/separation.txt b/code/plots/data/bins-convergence/30_2/separation.txt new file mode 100644 index 0000000..79cf994 --- /dev/null +++ b/code/plots/data/bins-convergence/30_2/separation.txt @@ -0,0 +1,10 @@ +225.817438382 +4326.73141737 +1385.9802007 +8513.91843853 +4879.4005183 +0.0400525080331 +0.0118355058949 +1276.23701056 +0.00448422870249 +0.0276044702769 diff --git a/code/plots/data/bins-convergence/30_2/turbineX.txt b/code/plots/data/bins-convergence/30_2/turbineX.txt new file mode 100644 index 0000000..f777dfd --- /dev/null +++ b/code/plots/data/bins-convergence/30_2/turbineX.txt @@ -0,0 +1,10 @@ +-906.158941239, 1037.43141562, -905.387373089, -611.9805368, 936.594294519, 314.627286265, -806.849733943, -337.98392341, 924.410744837, 69.9204999138, -1172.57986469, -189.175338527, -948.186171735, -524.57603616, 137.301506392, 81.2466289376, 1171.93231421, -76.715868748, 685.522696729, 605.361365633, -316.646484326, -519.231064884, -68.3711938669, 437.66509519, 571.578726992 +1170.06530672, 319.720856945, -630.642766096, 625.900038307, 66.8115306354, -126.423290444, 179.782115948, -1113.14210283, -322.138870905, -405.276963108, -332.285304075, 717.893856294, -455.280285569, 54.751859558, -797.732748503, 432.770814844, -522.852796261, -1157.71561211, 865.997779034, -834.286672749, 310.348827166, 650.388006478, -872.324952367, 1024.25501176, 1115.69188907 +1008.23521552, 665.55917965, 268.250141274, -1160.38662116, -275.080262861, 167.823361631, -769.581714914, -261.639683771, 713.723679245, -71.0974636416, 393.826039381, 547.379004585, 769.174406413, -276.074184676, -544.119126407, -1113.57113694, 20.3124697119, -702.44787587, 163.370437466, -387.04861789, -866.749681755, 1152.09224538, 740.675775459, 1122.31294168, -820.159153297 +-369.723531931, 1168.49374587, 241.796434823, -251.832372438, 456.281415929, -578.587596671, -217.19194447, 12.6420841367, 719.523679457, -1127.21789908, -431.446413039, -1160.91021265, 571.006118661, -838.531235802, 463.133751911, -221.002812727, 1025.03222451, 528.529833107, -710.59250993, 1121.58211405, 127.541779459, -61.8038982465, 913.4771165, -1028.58635579, -807.081415473 +203.049929821, -681.693724685, 301.502353318, -519.776754119, 952.405265401, 354.338258147, 592.407014313, 760.492409048, -1005.51124088, -684.041306808, -416.481330487, -197.653713657, 614.091917443, -1167.45919735, -77.1343022525, 1081.91918746, 1164.77315831, 818.56168967, 84.9313402469, 95.6958927779, -533.968149223, 480.583388153, -260.028552544, -1112.07802323, -841.807994886 +392.622899416, -203.729737373, -159.889249478, 606.196751974, 473.738235839, 1101.11358645, 865.53741658, -749.749656443, -1055.13262203, -383.021128767, 835.003068537, -152.482555433, -951.645109919, -574.913423204, 1135.32568855, -647.660315036, -1173.44375298, 322.108620655, 51.859385165, 725.999201847, -869.705309555, -1.50521334449, -241.440684242, 685.401472065, 207.496086403 +-514.416345523, 310.277753222, 295.802230477, -427.95011274, 1161.74599602, -1061.42705709, 907.047862903, 388.924976345, 320.802865786, 260.574382329, -853.461231077, -542.479841381, 748.212292113, 431.286015896, -68.2735613096, -554.074944357, -663.805160648, 779.65081624, 856.124650987, -303.203664325, -271.909949356, 1082.65872635, 53.2721653976, -1172.86969653, -963.632602905 +536.061678328, 13.0227480695, -741.619652381, 701.184618561, 1135.92244603, -1092.95484084, -121.727554092, 212.868355175, -990.69825183, 280.089330724, -1167.34485755, -406.139933558, 181.815450914, 1010.69527385, -643.273239253, 623.181133227, -527.993977168, 999.989833264, 841.860746816, 388.121403114, -652.503765683, -102.347572414, -235.000760583, 1165.63475662, -856.731206777 +-640.376361966, 730.639590236, 144.927237606, 481.821522579, 1173.19869665, -1164.37033335, -326.915743637, -823.808866517, 338.184012802, -574.401333932, 915.808304666, 1040.51204406, 392.797615904, -918.215626327, 596.546363766, -173.736195275, -245.697100017, -1056.45140874, 27.5269979297, -469.870123488, -88.1490408802, 673.260098934, 214.190085864, -704.795393045, 808.775555171 +-226.685608011, 533.417527658, 473.471031822, 714.993975438, 66.0213959053, 1146.76969153, 564.287638911, -751.74736479, -349.618769936, 964.232127636, -588.964872562, 59.1163507104, -1127.34649576, 867.165248884, 1141.21507226, -1136.60939944, -124.862957351, -599.773417613, -947.922664718, -869.804052679, 823.188934685, 311.367420699, 227.507135974, -482.590618821, -58.0679652805 diff --git a/code/plots/data/bins-convergence/30_2/turbineY.txt b/code/plots/data/bins-convergence/30_2/turbineY.txt new file mode 100644 index 0000000..35b105b --- /dev/null +++ b/code/plots/data/bins-convergence/30_2/turbineY.txt @@ -0,0 +1,10 @@ +-745.662117748, -548.519191676, -218.282927911, -388.710695461, -50.6260394466, 1055.59271021, 275.007631482, -1123.7894938, 722.912664551, 22.3612032914, -46.82278938, 155.316868253, 691.433153329, 450.673211373, -1165.45452287, -749.22246189, 60.9169295123, 712.348299138, -319.456741092, 952.734748696, -567.496977179, 1052.39494891, 1171.52106128, -177.813072522, -1024.90689231 +89.9625925175, -970.567496555, 344.825032204, -644.904564808, -851.445704323, -382.035979081, 487.244662806, -371.554871428, 1128.43362374, -1101.31214258, 648.572984216, 291.607766417, -627.10724571, 1038.40109096, -860.67321311, 820.04988759, -199.887896697, 191.912953827, -791.949378511, 825.289888561, -64.3636888384, 976.79646434, -0.269393101764, 572.746863118, -363.823456432 +600.497832079, 51.2574673553, 1142.44385793, 175.043705613, 1140.81850079, 576.390448101, 357.951611028, 173.148457154, -472.25043568, -1171.35885631, -1105.45799408, 1026.97501282, 886.288197767, 664.709291199, -209.697060524, -370.263800017, -737.583743822, -542.172672927, -115.673885493, -804.422973222, 791.126339601, 223.202503033, -910.239144479, -342.860239347, -839.3316563 +654.842892628, -108.436515487, -318.727640164, -1146.17467085, -844.482345168, -1020.96634912, -683.776294648, 1173.44643517, -927.05006968, 326.367470332, 1091.32482999, -171.532489471, 167.131299679, 820.975804207, 1078.25965357, -145.179145194, -571.353535135, 663.720628441, 129.781933187, 345.238288564, -1166.56289436, 527.383537179, 736.67868266, -564.930125029, -851.912959362 +239.653782975, 419.145701837, -602.64810793, -994.637332944, -685.60930062, 1118.74054243, 993.031879814, -6.24274673036, 605.049902563, 953.532838188, 272.835199393, -1091.54274194, -1000.01407792, 119.059071273, -133.409965287, 454.521477968, -142.966813475, 840.888081311, 1170.43701147, -1169.60602306, -533.217023763, 116.049951471, 1144.343207, -374.724422619, -817.6158145 +-872.442904823, -520.905779397, 718.322039199, -170.620638658, 527.601705872, -405.813745081, -295.795981775, 362.139787182, 513.644862758, -773.295286931, 424.298452009, 1163.56565606, -686.66405261, -1023.03981827, 296.936987461, 978.607186158, -12.8705163566, 1128.44225835, -1172.36790975, 921.987575987, -174.34456212, -232.516121204, 205.918270142, -952.554860415, 54.3180252008 +394.241992836, -250.203989083, 736.169979932, -176.731212353, 165.777991235, -500.508313119, 744.581898435, -691.688688636, 361.282784128, 1144.21890059, -73.535827909, 1040.6015183, -55.7660365514, -1091.38822874, 827.491052377, -624.900251862, -967.72941602, -877.086370774, 366.524167402, 938.881619897, -1091.45916411, -452.753806375, -1172.30483404, 38.8930279448, 669.738358613 +-201.484376188, 1173.44225093, 248.499858277, -940.997545227, 294.647244306, 427.300532526, -248.626059592, -1154.04979805, -629.009528572, 472.178034114, -120.175747972, -705.018545368, -388.654013635, 596.349887599, -188.806375447, 990.755296488, 1048.02623066, -614.13117064, 817.561804095, 1107.47359107, -975.384982128, 627.912871713, -1149.74373045, -135.763408734, 801.965611531 +-160.3774487, -410.416344464, 1164.53085611, 1070.0392254, 27.2171152188, 146.210989754, -1127.05904099, -835.748250158, -200.071430927, -996.973033755, 733.778651408, -542.651841797, -818.488439251, 730.764130302, 612.019351296, 167.054273834, 1147.50548316, -510.926943272, -1173.19144354, 433.707233643, -543.521610132, -961.174712254, 387.15997407, 582.265616808, 165.85940819 +-836.920978936, -626.331938977, 1034.95119926, 923.539050778, -260.190175113, 249.108854381, 28.3370110874, 644.685344009, 913.460184784, 668.87410008, 1015.01544443, -1015.71221696, 325.923829985, -130.052646829, -273.430190791, -291.987091129, 165.512952934, -598.175787356, -691.794103337, 212.953671272, -836.358743078, -1131.4547819, 1151.24997072, -1069.69261548, 1082.0352862 diff --git a/code/plots/data/bins-convergence/30_3/AEP_opt.txt b/code/plots/data/bins-convergence/30_3/AEP_opt.txt new file mode 100644 index 0000000..d11efe8 --- /dev/null +++ b/code/plots/data/bins-convergence/30_3/AEP_opt.txt @@ -0,0 +1,10 @@ +307496.426494 +304914.761805 +302331.302255 +303472.771618 +305144.144274 +303548.393095 +306724.221291 +305514.424523 +303046.111458 +305360.813172 diff --git a/code/plots/data/bins-convergence/30_3/AEP_true.txt b/code/plots/data/bins-convergence/30_3/AEP_true.txt new file mode 100644 index 0000000..9a1fc14 --- /dev/null +++ b/code/plots/data/bins-convergence/30_3/AEP_true.txt @@ -0,0 +1,10 @@ +379536.517829 +374969.841789 +367424.969791 +371381.328865 +375775.021093 +369969.929668 +378543.00982 +375154.261454 +368718.324887 +375356.730048 diff --git a/code/plots/data/bins-convergence/30_3/boundary.txt b/code/plots/data/bins-convergence/30_3/boundary.txt new file mode 100644 index 0000000..f408faa --- /dev/null +++ b/code/plots/data/bins-convergence/30_3/boundary.txt @@ -0,0 +1,10 @@ +-0.000583951904218 +-0.000173609887725 +-6.20522432655e-05 +-0.000116843613569 +-0.000748907483739 +-0.00142093678937 +-0.000667255589406 +-0.00031720017364 +-6.17239034e-05 +-0.000263107789806 diff --git a/code/plots/data/bins-convergence/30_3/separation.txt b/code/plots/data/bins-convergence/30_3/separation.txt new file mode 100644 index 0000000..6bfe6e3 --- /dev/null +++ b/code/plots/data/bins-convergence/30_3/separation.txt @@ -0,0 +1,10 @@ +0.483416889387 +8777.0424927 +0.0123323482112 +0.377657677498 +6614.46261198 +0.0744289239519 +15379.2871415 +1325.3533694 +0.000299845138215 +0.000551277727936 diff --git a/code/plots/data/bins-convergence/30_3/turbineX.txt b/code/plots/data/bins-convergence/30_3/turbineX.txt new file mode 100644 index 0000000..79ddd51 --- /dev/null +++ b/code/plots/data/bins-convergence/30_3/turbineX.txt @@ -0,0 +1,10 @@ +-968.417799172, 832.626129484, -892.308397569, -604.016102083, 896.293200715, 291.311724729, -691.722268333, -345.835668067, 1016.74814956, 157.357627276, -1170.23949716, -92.0685249224, -780.862405117, -417.20490978, 23.3166587183, -174.190007593, 1149.29755368, -85.796832206, 669.974916043, 650.270877906, -589.949210015, -780.348786033, -147.248389612, 457.191318619, 378.750784079 +1172.35485987, 127.752297203, -516.185157478, 484.452460036, 83.0578876142, -143.798391525, 119.217531691, -1026.29435583, -195.091090193, -80.3148792637, -196.195894702, 720.887564759, -328.58678852, 151.928839373, -1116.65732276, 473.241403241, -577.130085801, -1038.534457, 811.738750516, -654.389473651, 306.696073527, 695.328130554, -870.384260858, 1008.80247682, 945.415193709 +1024.37210328, 547.007819478, 36.842647987, -789.474269782, -490.822151532, 119.106876743, -687.064130222, -388.304830766, 423.354991226, 32.0175578453, 306.550857654, 592.547572081, 785.999419189, -153.317094908, -326.744954325, -1065.81293387, -355.531825567, -456.348648822, 192.556068687, -530.874265558, -615.428367826, 802.035311276, 646.655262434, 1041.13901047, -722.816958069 +-274.571474301, 1052.40045398, 764.569629068, 137.546351051, 647.372359921, -446.796936427, -60.7415965317, -59.1324803429, 683.478659933, -880.093464058, -336.625456568, -827.115088385, 642.848461237, -628.694893713, 252.520609532, 103.015249074, 965.167206038, 519.981263449, -577.209583249, 944.199851917, 323.780887476, 45.6757320643, 984.361431831, -959.657248609, -706.740578274 +359.486498423, -765.456755405, 105.186797517, -482.888879347, 835.106281688, 277.611075697, 416.687386482, 940.732191818, -986.23052443, -764.290743519, -402.66582196, -201.225820859, 678.378170152, -1141.59447817, -119.897760251, 1098.45450109, 1159.81429806, 939.38141601, -22.8077953138, 323.251490347, -406.723099049, 625.514565792, -431.436160984, -733.969096091, -905.0303362 +-129.123067868, -327.28680888, -495.545712889, 456.766765427, 259.206362136, 1097.79262765, 732.728352293, -468.053604688, -994.866623174, -553.146495056, 873.398273475, -425.56311101, -1162.74820634, -696.377909864, 1100.37876124, -756.837730014, -843.795840741, 188.975007708, 674.633481892, 350.392118164, -337.035288806, 17.2782826277, -164.408643727, 724.406795794, 101.196071329 +-540.270003534, 377.514715455, 306.057493432, -628.81776549, 1035.02781659, -1070.09153007, 828.068588068, 512.421956592, 355.305660266, 322.730239112, -1155.15962831, -467.861770812, 745.987946835, 479.199713928, -67.2461844016, -704.43085615, -249.060225539, 927.422767669, 560.82116927, -50.114502506, -348.230254219, 1171.03647314, 110.467384426, -1084.26150204, -566.593771994 +603.702187914, 14.1100333089, -117.906869594, 372.125630192, 1073.65916721, -837.584712694, 68.7515703155, 553.809711801, -1050.47848263, 50.1136760849, -1076.91992164, -425.245749428, 242.854063267, 777.830590835, -840.112014994, 591.063797772, -324.701404466, 858.020655762, 916.111666006, 331.376566868, -1047.12854205, 101.787900788, -160.344359524, 1155.64898745, -586.522684326 +-500.257599074, 695.565563906, 471.954118405, 500.647708821, 1053.49632026, -923.680074083, 45.6658699001, -347.659172472, 409.493555424, -448.820926458, 1130.64673174, 988.780268293, 458.122690669, -912.539007627, 497.856082271, -105.276379891, -403.519817155, -1130.89534785, 291.911594346, -553.940757885, 4.62036087098, 678.418199346, 190.551614809, -714.52139049, 900.40180227 +-182.51767387, 266.050969287, 220.007728384, 901.156715294, -91.3780206237, 1082.00371998, 632.843405228, -645.48510151, -255.823341927, 691.713195691, -814.550823964, 119.938619396, -1016.6212729, 891.623447801, 1139.78699816, -1092.94003763, -151.638686985, -653.351734056, -929.914582681, -479.034467602, 606.42981762, 278.954143376, -501.036136194, -455.455619011, -415.605796281 diff --git a/code/plots/data/bins-convergence/30_3/turbineY.txt b/code/plots/data/bins-convergence/30_3/turbineY.txt new file mode 100644 index 0000000..85c85f7 --- /dev/null +++ b/code/plots/data/bins-convergence/30_3/turbineY.txt @@ -0,0 +1,10 @@ +-662.7996471, -804.347220607, -301.366016356, -490.720253954, -177.262980702, 1097.973725, 32.6148138569, -1116.98480404, 585.968547303, -142.635691786, 87.6148920592, 47.4001389827, 478.797139383, 282.092625316, -1173.28325462, -719.670070064, -237.173587428, 602.541470262, 62.56218882, 976.874474269, -863.095331728, 876.465454149, 1164.23959435, -434.601753232, -1097.74528286 +-52.1537676534, -1146.91831716, 732.19213344, -923.590807335, -575.58935428, -123.552924248, 625.477321332, 22.5793119877, 1157.18423705, -878.817331494, 702.751165921, 464.820342504, -329.117381087, 956.26026415, -360.849435905, 635.556583333, 54.7669875539, 546.42664454, -847.476548326, 971.517454883, 190.757638493, 945.33310661, 322.188837166, 377.015224583, -372.484715415 +572.536314344, 328.067548883, 925.032695304, -28.8593553894, 1065.94069549, 550.500546654, 362.573561594, 292.562731728, -47.8153337163, -964.71937246, -1128.97349972, 660.741484374, 871.401652505, 434.913226454, 25.1663553572, -491.099481255, -524.24054846, -284.582499396, 220.497992196, -728.541738854, 740.205954021, 437.753437881, -979.271662105, -541.447553008, -924.484520761 +413.463038819, -211.338562403, -358.204974576, -1139.67178014, -684.007915903, -931.383851462, -787.998693631, 615.483479759, -953.935435496, 201.141079293, 995.919792001, -158.118722821, -87.1052191406, 990.897968931, 1146.02322575, 90.4824806628, -596.172425798, 360.21618151, 316.300867845, 279.301933103, -756.877240636, 344.546975372, 638.88063323, -560.922938253, -936.831853025 +191.051396251, 388.76214244, -362.182994102, -1069.55799974, -241.81437591, 855.540840084, 1097.04493082, 103.877569858, 635.992335385, 890.503545865, 108.300060762, -838.26759098, -957.570210248, 271.842451435, -103.748301833, 402.875180308, -178.794263612, 703.348041318, 813.947160317, -1072.33701228, -313.916979211, 249.732994594, 965.393700298, -445.853534376, -712.813944718 +-789.412385314, -436.322779769, 476.036162228, -92.3189476095, 367.995896785, -414.717437411, 324.830169031, 167.583788166, 609.165813636, -727.569809495, 574.554651556, 1093.63274874, 158.595637798, -944.560215369, 407.806091641, 811.392168866, -10.5783966879, 1158.1989144, -250.112205186, 805.926305063, -143.529709409, -127.748918821, 218.094754247, -923.239863001, 129.988535687 +567.142372303, -301.630008144, 538.009133387, -498.753322388, 553.040068961, -458.789022229, 815.622335448, -667.924522009, 254.188934661, 1128.26471021, -166.149849666, 1076.21618559, -416.354541588, -1034.1148617, 630.531418197, -938.570522954, -1114.45830962, -719.043295523, 21.0887007211, 1167.66380462, -626.293702933, 76.2198920783, -1116.53346962, 448.902325811, 84.9366509908 +103.03340251, 1066.90975635, 115.126934004, -617.716649871, 181.812214287, 821.211957006, -75.4267018748, -1034.61620672, 186.394951239, 488.250555229, 466.239650857, -442.476697867, -366.449509123, 494.343869182, -368.311137449, 866.792991699, 895.788572014, -654.393348838, 733.399848281, 1125.7555271, -529.771692677, 801.309635291, -1162.50863327, -203.989520569, 1016.42858275 +-215.428028062, -495.145151311, 1074.42786046, 799.489163221, -67.8991295688, -156.34647825, -1167.55347188, -621.393801985, -496.231424021, -1084.29501999, 314.283318785, -632.020152068, -788.119035123, 737.840413578, 477.143852705, 7.57380237957, 296.644284086, -313.387334775, -1084.108608, 76.7150248909, -311.395418794, -928.160735113, -116.165463486, 503.104521459, -322.115045503 +-730.046647976, 40.3517304696, 800.387935034, 751.700011062, -287.475738261, 375.371786709, -150.142213993, 625.662533246, 453.242697137, 490.588152511, 833.78282143, -810.027675596, 586.188866271, -201.768018811, -279.323501047, -427.338368773, 158.170866556, -655.577466627, -715.81754695, 210.95909573, -983.997874117, -1139.87747651, 1061.17825992, -1074.29705065, 788.197387284 diff --git a/code/plots/data/bins-convergence/30_4/AEP_opt.txt b/code/plots/data/bins-convergence/30_4/AEP_opt.txt new file mode 100644 index 0000000..5d2cc10 --- /dev/null +++ b/code/plots/data/bins-convergence/30_4/AEP_opt.txt @@ -0,0 +1,10 @@ +383817.78216 +385243.981401 +384158.701841 +383757.059937 +387519.785008 +386727.43596 +385172.21855 +384663.374471 +382367.483307 +383944.076275 diff --git a/code/plots/data/bins-convergence/30_4/AEP_true.txt b/code/plots/data/bins-convergence/30_4/AEP_true.txt new file mode 100644 index 0000000..fe1f961 --- /dev/null +++ b/code/plots/data/bins-convergence/30_4/AEP_true.txt @@ -0,0 +1,10 @@ +380496.079225 +380253.392927 +380848.089585 +379531.10929 +382803.764932 +381986.6938 +381260.813851 +380973.152561 +379785.346772 +380158.40675 diff --git a/code/plots/data/bins-convergence/30_4/boundary.txt b/code/plots/data/bins-convergence/30_4/boundary.txt new file mode 100644 index 0000000..7a379b9 --- /dev/null +++ b/code/plots/data/bins-convergence/30_4/boundary.txt @@ -0,0 +1,10 @@ +-3.50753070961e-05 +-1.8998844098e-07 +-2.61081388544e-05 +-3.58199486072e-07 +-4.27467057307e-08 +-2.96691318908e-05 +-0.000726375208615 +-0.00349983854017 +-1.16489422908e-06 +-0.000202622795541 diff --git a/code/plots/data/bins-convergence/30_4/separation.txt b/code/plots/data/bins-convergence/30_4/separation.txt new file mode 100644 index 0000000..9901eee --- /dev/null +++ b/code/plots/data/bins-convergence/30_4/separation.txt @@ -0,0 +1,10 @@ +5844.69239576 +0.000315777855576 +2008.4758943 +8767.04205729 +31912.5491365 +2025.32850653 +0.297351600966 +640.827337093 +5330.67661204 +0.000187120618648 diff --git a/code/plots/data/bins-convergence/30_4/turbineX.txt b/code/plots/data/bins-convergence/30_4/turbineX.txt new file mode 100644 index 0000000..9467ecd --- /dev/null +++ b/code/plots/data/bins-convergence/30_4/turbineX.txt @@ -0,0 +1,10 @@ +-914.403800469, 899.355293156, -929.84139956, -600.515485542, 959.950895821, 338.802014081, -897.252104967, -568.665916344, 1024.92874974, 171.224344385, -1173.05976784, -184.542692967, -978.400615639, -532.512925541, 53.3185952481, -49.7916271084, 1172.62176535, 15.1435706322, 721.421430876, 690.178316501, -290.680051676, -647.163182623, -262.016654673, 465.34740733, 535.176728162 +1172.26266827, -420.948282984, -577.313203055, 404.973072439, 307.950629076, -154.727364091, 111.577872217, -1142.66472103, -301.244390245, -53.6291383279, -202.23515424, 668.840841648, -523.352804188, 155.485256779, -975.941170571, 610.157914306, -627.574835907, -1098.93355499, 776.703018172, -816.051887093, 244.56667969, 750.226407558, -864.376411187, 1095.14135303, 1004.75282618 +1055.50359502, 673.129968669, -35.0644543074, -1165.74662739, -686.752690288, 350.445068704, -872.492547839, -419.926285822, 543.763038442, -9.02688961138, 341.1907397, 548.262859707, 765.42771525, -74.3063652264, -185.480341826, -1094.9946532, -240.27201393, -777.556566038, 213.815097401, -526.186532978, -612.468972125, 1114.98054323, 736.509808803, 997.393408358, -793.614346118 +-443.280579429, 1102.84848167, 570.360344328, -5.49790021511, 658.347402059, -629.405212996, -280.86371806, -41.9220154891, 664.356270078, -1101.11075613, -389.602012583, -883.207336568, 485.491585088, -798.156074422, 161.121426924, -301.327587047, 1028.23660282, 420.592088387, -780.949599888, 911.407227242, 178.154565091, 39.8084809929, 817.198719848, -1155.62865354, -879.106196869 +276.43519249, -561.780742913, 353.357703117, -652.77218873, 671.100876403, 364.139155226, 668.942296208, 1166.5122665, -855.546571525, -471.770002534, -575.922574547, -170.332573423, 222.851747417, -1108.23703608, -151.424273514, 1111.20372956, 992.335919984, 918.527419665, -62.3220043504, -268.766010365, -679.070046746, 740.139022445, -21.2468699931, -1169.59324995, -1050.40115637 +-40.7417510807, -791.708761298, -326.091321973, 416.343976059, 398.364662735, 1087.8843726, 899.411684641, -707.805668765, -1002.46952736, -340.603176373, 979.620351967, -268.97352532, -1170.42577145, -600.152964428, 1160.54048767, -661.767875036, -1096.08796854, 167.102406069, 832.709075675, 681.766537085, -86.8275119437, 299.472718207, -208.090575447, 514.510995112, 173.81665225 +-411.029279643, 79.5449142478, 338.151443286, -399.267582798, 1034.55078334, -1148.14053516, 632.434885474, 848.521834396, 688.331715447, 254.493840747, -895.0234697, -505.631228021, 773.80195098, 497.534112741, 72.1378720172, -847.666900568, -503.541117485, 1122.32539653, 386.585989766, -241.559468226, -377.947123515, 1124.9697043, -8.85916419805, -1016.48940093, -717.129892151 +543.804238589, -187.530540553, -529.387347796, 49.4028586033, 1159.94519035, -996.042545765, -74.0098760535, 537.738016756, -1125.67224613, -49.6123496937, -1162.13446394, -466.934730209, 377.67398166, 785.140914138, -744.248294976, 454.146720653, -432.987261506, 882.924507214, 943.80806862, 354.528608775, -911.375889422, -100.825730315, -356.545909491, 1122.2893058, -668.134507152 +-741.073770124, 649.402255468, 385.079368838, 293.644881985, 1170.30576582, -921.524860423, -185.805923291, -682.18972195, 154.031798195, -557.178888516, 949.325212371, 1103.82555856, 417.072754651, -979.002219725, 354.793236279, -207.19301421, -311.618021538, -1168.98517344, 89.5795669591, -541.464065763, -296.77224968, 826.298326562, 242.56759388, -682.804631888, 884.224683797 +-320.731502006, 372.263991835, 476.08960655, 910.820603792, -9.58160944659, 1143.96623581, 556.555359751, -729.079890203, -204.298909863, 643.301890475, -852.802994788, 51.3378054468, -1113.12812747, 898.015236741, 1002.53338641, -1162.85617327, -95.9987383839, -784.833270232, -1037.22681425, -557.035452236, 669.507180733, 301.434268688, -412.65208017, -647.116817183, -173.58935726 diff --git a/code/plots/data/bins-convergence/30_4/turbineY.txt b/code/plots/data/bins-convergence/30_4/turbineY.txt new file mode 100644 index 0000000..b717a05 --- /dev/null +++ b/code/plots/data/bins-convergence/30_4/turbineY.txt @@ -0,0 +1,10 @@ +-735.528101103, -753.854103505, -295.497777713, -557.43456223, -213.737669399, 1123.54309594, 293.077724977, -1026.52569329, 571.539160799, 28.2682651339, 32.6603074792, 101.513891763, 647.972319879, 184.669330391, -1161.81001321, -664.68641859, -45.762094842, 784.198395346, 10.4533650009, 941.106845245, -860.671369505, 978.936018881, 1025.9488938, -346.725926506, -1044.37625798 +-54.1860524338, -1095.41701404, 624.026085114, -1101.42303513, -657.802801835, -256.247088317, 443.281527789, -267.307364231, 1134.19033208, -1052.1255059, 707.66065667, 119.868402025, -670.107196946, 1152.88904853, -651.670716908, 593.803624702, -129.899897187, 360.929957653, -879.697853344, 843.323905259, -21.5661456857, 902.38363737, 248.756223622, 421.664924597, -456.731532186 +512.882138007, 91.2940409729, 1172.99036455, 134.798736977, 951.581123248, 1119.96615563, 351.169904258, 265.815967209, -503.589484424, -1173.47961588, -1122.82001044, 601.367460952, 889.525889805, 692.383477338, -173.2951814, -422.045745183, -871.276698045, -319.577321209, -44.2447526323, -1041.50377566, 698.420294702, -32.467336609, -913.613295875, -618.338370468, -864.472190554 +557.835255557, 31.2954464716, -135.886691954, -1173.50145498, -495.666376746, -990.4468535, -661.715323441, 884.366130231, -967.350318401, 364.281498513, 1106.95355084, -250.511296738, 293.769872951, 860.280635896, 1162.40086784, -55.3978595135, -565.566424277, 734.418464264, 447.41427192, 458.447553459, -789.23320651, 247.89048745, 842.21264777, -204.103666783, -777.372617895 +268.496957811, 636.039054907, -509.57496789, -975.204779115, -962.683491745, 1079.66267889, 923.296385759, -128.00399897, 803.228457876, 1065.09546361, 31.97793963, -646.519786983, -1152.1601409, 385.935957715, -86.6399345329, 377.309108047, -626.422631692, 730.372008643, 588.359473205, -1142.32251281, -474.935537232, 129.675065271, 1173.32197717, -95.851558474, -523.252618037 +-1172.8068904, -575.187055218, 613.6328847, -607.477839151, 793.848602612, -440.04948271, -71.2761175528, 257.247880933, 609.057075135, -1055.97195579, 646.126849956, 1142.27367792, 85.0848179382, -1008.44053432, 174.01631392, 969.122923468, -419.198112965, 1161.55614609, -819.935889012, 955.15982711, -429.343948417, -68.4441127207, 104.257720056, -1054.71054646, 446.683933166 +398.960753533, -626.80702738, 635.218683876, -113.985880843, 553.933455477, -242.712523398, 988.515129789, -810.645790756, 434.898204505, 1145.58668087, -183.281483315, 1058.99620227, -179.554416792, -1062.82444986, 754.208278396, -807.316534601, -1059.99182713, -342.814342232, -35.2321083816, 954.526026314, -588.292995887, 165.438955202, -1173.48090725, 586.417845655, 455.989213392 +-135.168622759, 1158.43391849, 90.3496793947, -1006.36823536, 177.941727224, 615.377175048, -369.1815213, -1043.05981396, -331.660298439, 124.746411923, 105.243843402, -607.481311989, -613.30665146, 302.913102398, -380.660305314, 733.329179275, 850.961836027, -773.033162877, 697.397665465, 1118.68079637, -739.277237218, 786.300205939, -1118.03901511, -342.94433937, 964.74496396 +-152.27255066, -339.848359546, 1108.53496631, 854.427880167, 86.7197103774, 124.24277099, -1158.71137526, -637.868409916, -318.769534194, -1032.80568249, 689.86776666, -398.377996574, -1096.89845057, 647.063015083, 505.374670875, 388.673052801, 1131.38415304, -103.002698874, -1170.09033534, 498.280217254, -281.28703182, -833.286846753, 95.5302172308, 945.87089613, 245.604942886 +-774.463902391, 41.6734021953, 1059.58100282, 739.96071249, -307.202108697, 261.681432653, -418.13458652, 508.502072454, 545.065434348, 518.681978849, 806.140839154, -993.825709382, 362.783979044, -140.855789759, -609.969745892, -157.803318808, 93.4735483633, -486.474813259, -548.904767009, 126.794776848, -963.792547212, -1134.13990153, 1098.56930654, -978.966697071, 996.345650709 diff --git a/code/plots/data/bins-convergence/30_5/AEP_opt.txt b/code/plots/data/bins-convergence/30_5/AEP_opt.txt new file mode 100644 index 0000000..1dc3e57 --- /dev/null +++ b/code/plots/data/bins-convergence/30_5/AEP_opt.txt @@ -0,0 +1,10 @@ +349370.365968 +348248.927692 +348596.510759 +349564.492501 +349221.602282 +348987.646091 +348841.768802 +349542.970579 +347773.886929 +348407.440835 diff --git a/code/plots/data/bins-convergence/30_5/AEP_true.txt b/code/plots/data/bins-convergence/30_5/AEP_true.txt new file mode 100644 index 0000000..497be42 --- /dev/null +++ b/code/plots/data/bins-convergence/30_5/AEP_true.txt @@ -0,0 +1,10 @@ +383174.744736 +382002.192411 +382581.079898 +383094.251313 +383092.911498 +382847.230964 +382648.633661 +383375.55736 +381389.364229 +382267.97097 diff --git a/code/plots/data/bins-convergence/30_5/boundary.txt b/code/plots/data/bins-convergence/30_5/boundary.txt new file mode 100644 index 0000000..c2f97e6 --- /dev/null +++ b/code/plots/data/bins-convergence/30_5/boundary.txt @@ -0,0 +1,10 @@ +-0.000741116232575 +-0.000807457535984 +-0.000443517386657 +-0.000519973740438 +-0.00182135060049 +-0.00240280524827 +-0.000999705128606 +-0.000886887961087 +-0.00203776211288 +-0.0017535433517 diff --git a/code/plots/data/bins-convergence/30_5/separation.txt b/code/plots/data/bins-convergence/30_5/separation.txt new file mode 100644 index 0000000..a5c7120 --- /dev/null +++ b/code/plots/data/bins-convergence/30_5/separation.txt @@ -0,0 +1,10 @@ +14030.8300988 +12213.5483389 +13808.8161184 +8707.57886869 +2.51149404352 +4750.78862244 +9950.71766758 +1.1722007819 +0.0708688622544 +29.8053155832 diff --git a/code/plots/data/bins-convergence/30_5/turbineX.txt b/code/plots/data/bins-convergence/30_5/turbineX.txt new file mode 100644 index 0000000..46eac67 --- /dev/null +++ b/code/plots/data/bins-convergence/30_5/turbineX.txt @@ -0,0 +1,10 @@ +-838.812726022, 1014.57805722, -1098.56785818, -628.087856289, 902.489386055, 289.347567619, -655.563698603, -507.611563666, 926.27739256, 350.906665727, -1171.91512478, -51.4415393456, -1001.15422901, -404.076893242, -132.036085426, 270.443342666, 1173.10447063, 96.849728362, 764.714218528, 619.46702033, -267.153601371, -626.86068838, -142.430384103, 419.581695768, 560.568995832 +1149.37483377, -482.015082729, -608.581051331, 344.172150736, 224.527859298, 11.9323648287, 62.3671611984, -1151.52768221, 48.1240201011, -132.166599093, -287.192248765, 878.19209678, -484.199285752, 420.740753575, -966.159454082, 564.85469594, -558.102897819, -1132.66961057, 714.318041564, -697.146989382, 452.671108285, 745.935507883, -887.3565928, 1142.54561706, 985.956232372 +1048.12258093, 675.297564444, 102.471649531, -1170.12651641, -539.383509711, 192.740189282, -670.92351867, -352.633769717, 666.077128634, -136.637751532, 450.736027305, 638.872499105, 569.488856377, -134.332140058, -611.573248703, -1086.83201455, 169.957825976, -510.325690184, 182.590826709, -460.752192538, -970.275492655, 1170.83904872, 906.505996786, 1126.5430199, -824.906346278 +-316.350358548, 1154.63451759, 855.778602158, -114.216257252, 653.82945672, -476.772042565, -183.068176395, 415.973663395, 495.693679309, -1130.09824003, -381.493028628, -1136.13515606, 487.991186874, -770.665389031, 62.082268078, -264.193139788, 1111.3245458, 443.317008468, -877.713274631, 1007.90193954, 214.398133685, 117.13789005, 747.582406042, -976.745486836, -757.272097836 +374.57794191, -851.63148566, 319.006105834, -435.516119716, 1000.20704331, 99.6255803617, 490.716777481, 840.591921635, -1093.99861796, -756.728363473, -569.431743513, -119.135486997, 697.723716374, -1147.89973159, -129.013882302, 1110.17288742, 1164.18064256, 848.597367731, -154.84324684, 202.40418847, -556.221305342, 598.641646673, -420.819578237, -902.497413791, -809.347040235 +-23.0277373169, -536.099122974, -425.297737271, 468.242379845, 316.076654482, 1107.58264362, 803.683593216, -686.777001786, -1062.65594202, -400.460557717, 999.826814563, -137.633876231, -1160.67802188, -824.922654539, 1163.83429324, -725.066327742, -929.668826887, 276.62889235, 832.878218842, 690.229003359, -140.980252613, 97.7811354292, -120.1527106, 455.525312879, 392.019151345 +-403.921344586, 201.482652829, 346.197670313, -398.431450518, 1124.61941366, -1018.93517581, 856.812284148, 675.2081536, 654.738099286, 334.031805544, -1163.81346193, -503.328228005, 730.53893392, 209.645384389, 18.396192695, -801.138019484, -561.767671694, 1013.37206285, 446.047296182, -250.601823179, -126.053677635, 1166.25566002, -235.418041722, -1047.25769117, -746.247248043 +554.692087065, -98.6588231878, -521.054001546, 26.8113651867, 1162.55498261, -1032.73142983, 79.1799693208, 447.049328133, -1114.56768018, -203.85862706, -1161.96522654, -388.318009276, 421.030429886, 1016.30349739, -901.532776755, 563.716295724, -453.900679022, 846.519604988, 783.726760772, 259.094020447, -750.35422197, 130.484659316, -387.541832741, 1112.72727913, -693.449342274 +-689.827693932, 598.583929291, 108.79481898, 455.484020133, 1167.92830391, -1147.55835186, -339.363444345, -721.669511165, 254.965737056, -712.736445419, 951.876280721, 1051.97309316, 190.285397972, -920.6061118, 669.692155495, -150.777858863, -313.113929746, -1141.12834445, 112.44791025, -443.085365123, -19.216527036, 724.015943197, 359.640592965, -683.217064293, 877.07354044 +-118.889090657, 345.108042306, 265.245565232, 879.048718814, 116.836504496, 1148.6491166, 631.991865553, -754.689527449, -96.5456623322, 599.399686395, -990.943523281, 164.581468332, -1159.49089123, 865.21787103, 1128.64130698, -1095.23096338, 7.70358532535, -505.980367881, -854.806312798, -509.889393354, 823.83853435, 414.597974394, -435.907402507, -427.284830253, -267.926325095 diff --git a/code/plots/data/bins-convergence/30_5/turbineY.txt b/code/plots/data/bins-convergence/30_5/turbineY.txt new file mode 100644 index 0000000..5c0a5cc --- /dev/null +++ b/code/plots/data/bins-convergence/30_5/turbineY.txt @@ -0,0 +1,10 @@ +-820.688405605, -589.718227499, -412.655520898, -494.869747167, 146.934695479, 1137.2835953, 384.901872195, -1058.04854974, 720.518157742, 344.122964609, 61.251994268, 30.6922538791, 612.231386475, 237.725384952, -1166.06335581, -918.934455327, 31.0130167657, 674.237451772, -451.158160336, 981.178266219, -625.179739402, 992.059342279, 1164.8388649, -256.76433263, -1030.97043213 +-236.799486689, -1069.95220369, 468.980931526, -1121.90972829, -782.284174643, -238.708028007, 626.361754737, -226.098086583, 1172.52719123, -950.698510669, 771.472356875, 367.469600938, -491.369752238, 1095.49713239, -666.086970888, 473.897305293, -13.8789885224, 306.912880981, -931.067005208, 943.992570181, -39.8154557062, 905.933833188, 160.049423595, 267.816378939, -636.418175856 +527.802005251, 202.668872484, 1169.03193351, 89.1066635725, 1042.20982792, 691.153240121, 490.224321982, 323.879259647, -591.608149113, -1165.53257681, -1083.5003552, 615.842272248, 1026.06955824, 839.510418779, -269.849849009, -442.64216791, -1007.97262127, -652.897892476, -163.781778668, -1079.27939648, 660.076873413, 79.1951405651, -745.240097214, -328.689760095, -834.665473351 +518.603828121, 209.65688292, -222.996829104, -1167.9428702, -653.254922898, -1072.2987603, -679.677835762, 1097.3157619, -1063.68407491, 316.249794757, 1109.77483351, -293.8244834, 6.33213125488, 884.992377447, 1171.8714286, -83.1908133515, -376.95321219, 560.493982109, 203.958173928, 601.057217551, -912.794280031, 235.28527288, 904.575405282, -650.464867441, -896.479158164 +422.030305094, 330.492776444, -586.0788981, -981.938196988, -613.77692833, 788.33019974, 1065.98957502, 27.3819495125, 424.623986323, 896.938448845, 216.095140269, -1079.34003104, -943.566447178, -243.848855081, -52.221627942, 380.331800724, -147.714162906, 810.567470357, 956.109414333, -1155.92937104, -547.763363173, 201.165153576, 1095.46647871, -389.086452594, -849.761267607 +-1173.28930391, -479.247920806, 742.387860199, -329.902664061, 740.795507236, -387.811294839, -107.778577047, 221.511914291, 497.898828064, -1078.31532151, 614.396307211, 1165.41584939, -173.112855002, -834.649965276, 150.425534599, 922.721756582, -310.900882242, 1140.44461784, -826.712525414, 949.063288028, -126.70487374, -646.599061223, 538.039311717, -1081.4960935, 219.16868937 +281.321089804, -417.705308052, 642.69555919, -245.979284278, 335.215471529, -582.157255141, 801.878180644, -959.808080587, 497.653637347, 1124.97056432, -150.579273021, 1060.09273413, -248.968687335, -1154.63710928, 812.760100818, -857.504482334, -1010.11215642, -591.787933981, 91.1112017067, 943.130851572, -606.15680416, -130.324852643, -1149.65845746, 529.516135438, 403.173853388 +135.79440361, 1169.35980419, -72.2035813288, -1173.20834826, 160.009652981, 557.317663908, -334.909288199, -1085.02672634, -367.253030612, 191.414411529, 164.236383756, -695.192498839, -498.933481039, 586.739536332, -520.011713007, 1011.99791485, 845.629738975, -812.737094129, 873.446236872, 1144.55507913, -902.277382615, 490.061202637, -1107.6765058, -372.794816784, 946.71237048 +-137.533040745, -380.535805399, 1168.46089257, 1081.51331113, 114.377904947, 245.456947617, -1123.37370096, -527.64583484, -200.089859719, -932.278314563, 686.345905521, -520.08706306, -732.89001975, 727.750573304, 542.367188906, 455.504530648, 1130.97142565, -273.800613156, -1168.1153205, 522.0062983, -3.72566612545, -923.547008292, 337.337338348, 621.70100474, -144.51032752 +-870.795741064, 71.3692584354, 1143.13227863, 777.439314202, -374.157749271, 240.298198637, -59.41462257, 424.145552544, 660.713413495, 951.564027505, 628.623305171, -1008.96673315, 180.884482079, -176.634334226, -321.411487737, -421.429472829, 171.035062551, -633.059650794, -804.016455154, 172.011347621, -835.719659897, -1097.83732047, 1089.55254286, -1092.96138009, 891.027574787 diff --git a/code/plots/data/bins-convergence/30_6/AEP_opt.txt b/code/plots/data/bins-convergence/30_6/AEP_opt.txt new file mode 100644 index 0000000..dcdc0c3 --- /dev/null +++ b/code/plots/data/bins-convergence/30_6/AEP_opt.txt @@ -0,0 +1,10 @@ +356853.282418 +356064.019741 +355718.223472 +357011.485079 +357275.147105 +356287.76451 +355946.799141 +356039.854349 +356363.13432 +355854.332949 diff --git a/code/plots/data/bins-convergence/30_6/AEP_true.txt b/code/plots/data/bins-convergence/30_6/AEP_true.txt new file mode 100644 index 0000000..fa80f59 --- /dev/null +++ b/code/plots/data/bins-convergence/30_6/AEP_true.txt @@ -0,0 +1,10 @@ +382684.927841 +381376.086381 +380452.958206 +383052.952626 +383457.564557 +382034.217071 +381140.938807 +381417.367461 +381818.54622 +381181.535711 diff --git a/code/plots/data/bins-convergence/30_6/boundary.txt b/code/plots/data/bins-convergence/30_6/boundary.txt new file mode 100644 index 0000000..2459ed1 --- /dev/null +++ b/code/plots/data/bins-convergence/30_6/boundary.txt @@ -0,0 +1,10 @@ +-0.00108892883986 +-0.00308332928671 +-0.000308637065928 +-0.000753033397814 +-0.00115227612946 +-0.00239648576576 +-0.000732806760197 +-0.000373222571852 +-0.00217242112626 +-0.00232422189424 diff --git a/code/plots/data/bins-convergence/30_6/separation.txt b/code/plots/data/bins-convergence/30_6/separation.txt new file mode 100644 index 0000000..37d22c3 --- /dev/null +++ b/code/plots/data/bins-convergence/30_6/separation.txt @@ -0,0 +1,10 @@ +0.0377901066531 +3583.08581891 +6330.19137421 +22679.1307366 +10928.0852835 +10011.6906551 +0.026877249984 +9827.66089364 +44516.7749397 +30910.2287652 diff --git a/code/plots/data/bins-convergence/30_6/turbineX.txt b/code/plots/data/bins-convergence/30_6/turbineX.txt new file mode 100644 index 0000000..d48464e --- /dev/null +++ b/code/plots/data/bins-convergence/30_6/turbineX.txt @@ -0,0 +1,10 @@ +-849.651011833, 857.223724174, -1073.67794382, -627.696993268, 1161.47810121, 318.636941385, -768.189512898, -454.067617179, 989.536452307, 35.1105652497, -1171.07566869, -396.702446747, -981.315114895, -422.431908695, -17.1449430201, 221.861417459, 1124.2548416, -29.7555989362, 748.407524211, 704.511447242, -243.532301313, -517.482571415, -128.373948035, 431.108564563, 455.110489152 +1171.80542562, 241.752771531, -778.887718452, 618.591607609, 253.686442111, -42.4962904635, -6.84584669983, -1173.49957581, -251.890991531, -141.249337658, -374.841635955, 755.815935687, -545.497253417, 94.1610982083, -922.771494195, 395.730789621, -402.549126726, -1054.67496114, 885.372065445, -748.197933466, 378.353823991, 667.974106589, -736.228154198, 1061.45724361, 1115.67381443 +1169.64851081, 549.456326458, 157.691042908, -966.893418767, -362.978235206, 342.85698604, -904.729598446, -537.867576718, 529.184220724, -281.408410135, 112.106783272, 650.483463509, 826.401247217, -54.1633703701, -230.538298693, -1156.82523185, -364.250967976, -638.010414945, 77.223854323, -612.524226052, -756.305770595, 920.170208791, 487.290480663, 1047.54569995, -927.499001063 +-337.627903431, 1167.58441727, 676.777930756, -113.455241932, 369.458632424, -522.378791159, -235.292668035, 486.564234177, 660.25430643, -1129.11118452, -420.143873887, -1154.83877438, 289.619841338, -855.979565593, 73.1942208374, -311.36222511, 1023.81396216, 473.231617188, -727.50838227, 1111.3865173, 105.843627261, 111.231175297, 838.10635397, -1009.73696966, -793.107363309 +242.540271326, -780.421050551, 303.302309487, -573.288221812, 703.036328528, 169.585825763, 494.04909442, 1171.3493749, -1035.06290959, -648.839373497, -401.215150985, -268.714791582, 645.67882993, -1173.02202017, 10.2109857185, 1030.48420982, 1095.15380586, 763.688745598, -112.155854547, 81.6780974232, -473.661888469, 715.05037697, -250.897709619, -1099.25869973, -885.290306793 +88.6559282452, -201.407848572, -32.2662310849, 488.120952559, 543.12855127, 1096.34311552, 838.569249529, -703.661544315, -1021.02844085, -547.591685547, 970.946522093, -269.989061833, -1089.39325073, -834.908397855, 1152.09038802, -673.599525953, -1172.70324509, 322.521912861, 804.252382933, 684.861769098, -763.460621259, -120.400721072, -391.039393174, 395.172076878, 240.754728283 +-490.599996762, 162.034713921, 351.272699174, -211.595562, 1159.6445047, -1070.75923803, 740.984598898, 535.892806125, 385.753542357, 297.56070145, -860.804220808, -451.006997428, 688.40042931, 464.058999366, -186.747684041, -512.593018686, -657.184895116, 870.942419029, 1015.91400422, -196.796289772, -43.7939354388, 1123.98362809, -35.1886093358, -1172.02375054, -962.226954074 +740.314636861, 35.2137150535, -478.713913823, 169.071117932, 1150.52970864, -850.019384513, -152.463017358, 318.547078221, -1171.33403238, 140.454179485, -1070.07657201, -503.070688874, 254.162830767, 597.618604085, -886.678580393, 711.450083395, -330.840657476, 801.526949941, 992.996161841, 422.672976668, -953.959565679, 49.6009048126, -542.28931084, 1104.67878396, -560.074333795 +-697.247166936, 721.970098528, 114.865378917, 492.01572238, 1140.48895384, -1155.46993134, -431.884523354, -634.623684293, 279.783761156, -722.474454831, 869.77961303, 1155.51592677, 392.997495011, -949.753260239, 349.188406611, -281.406146351, -219.632266063, -1087.11404444, -36.2000213779, -602.987444317, -121.008480142, 777.736510921, 224.333925029, -573.592414112, 765.370314124 +-200.846729797, 232.632723245, 401.265250823, 754.446653812, -227.159947659, 1128.17387667, 592.839792884, -536.012308902, -224.485067456, 836.593164589, -811.110435987, 104.30532835, -1145.45609349, 899.582680415, 1103.6128231, -1138.37408273, -32.1006590625, -645.901842951, -948.788860452, -760.591539401, 729.943900623, 311.288824215, -329.407601637, -496.583277761, 118.687224145 diff --git a/code/plots/data/bins-convergence/30_6/turbineY.txt b/code/plots/data/bins-convergence/30_6/turbineY.txt new file mode 100644 index 0000000..970b338 --- /dev/null +++ b/code/plots/data/bins-convergence/30_6/turbineY.txt @@ -0,0 +1,10 @@ +-809.462766444, -801.439912936, -339.15259451, -474.713799218, 167.644773768, 1129.42830918, 494.629241383, -1082.10887459, 630.835717051, 148.619056613, 75.6155331607, -1.45500750826, 643.550413697, 386.611362072, -1173.38981425, -606.723728589, -336.435038206, 636.067058261, -191.968792171, 938.509205917, -645.999039102, 1053.25690434, 1166.47184937, 11.6325526251, -1081.67123747 +63.3093241799, -968.621273307, 276.61793694, -766.871134272, -485.329882016, -302.467512136, 315.828286627, 6.26662167948, 1146.16188119, -1164.98573076, 606.174102232, 543.974669586, -1039.02570034, 1059.3522006, -725.004171605, 810.799078389, -201.364670475, 514.585601374, -770.228683315, 904.066345933, 80.3885630535, 964.85568121, -420.497347977, 500.444535028, -363.878869138 +95.1749814545, -89.6618449976, 1162.87151094, 72.2523052912, 1115.96717815, 720.161124708, 535.202149218, 447.137935519, -554.512871564, -1139.27402256, -1168.14726142, 434.882001955, 833.185133825, 663.765255868, 53.3318711539, -197.209194849, -563.048513808, -349.322112128, -447.571720128, -1000.974676, 897.294748561, 203.298837265, -1067.55978084, -528.94603119, -718.944766732 +655.190388024, -117.825886264, -308.14029578, -1168.01728659, -894.543997261, -1014.24396587, -694.174066586, 1067.89169417, -970.154887455, 319.755895292, 1095.72587842, -208.526516317, -72.1643580736, 802.767229152, 1171.2302357, 7.76230538474, -573.533666959, 495.903060063, 187.453080448, 376.771340567, -633.356672225, 585.207253201, 821.409568202, -597.969464809, -864.938360717 +318.819300526, 435.988961517, -578.606171651, -1023.95142849, -534.954123152, 1161.19620487, 1064.21283243, 71.2509851327, 552.974468769, 977.826166659, 153.049248959, -1129.90310271, -979.915680401, 34.0284616633, -200.335432782, 561.46099701, -421.63278604, 891.019453882, 566.014412181, -1170.6689267, -478.702036156, 0.234859826947, 1146.37964973, -410.812854931, -770.323888916 +-924.354254556, -726.691918059, 784.402057101, -194.608928855, 573.338697057, -418.530894259, -312.869526363, 402.173607737, 578.478028435, -832.39184033, 659.090209619, 1142.03564279, -436.300660217, -824.660190102, 223.215697068, 960.939745691, 43.6289358257, 1128.32428408, -854.586194074, 952.943353774, -97.8856864108, -188.412149942, 288.876750137, -1104.97735837, 190.340213596 +206.819719361, -264.034805864, 758.68904567, -271.143559902, 179.890313158, -480.219285216, 909.987803905, -552.521664867, 376.947902238, 1135.16233761, -142.985501914, 1083.38754964, -28.2377714629, -1077.86137175, 538.304724624, -623.755937798, -972.236565234, -786.50824572, 587.413682339, 1028.82618061, -782.313236268, -337.337754677, -1172.98680668, 59.1433823509, 671.755317196 +-125.025093635, 1172.985893, 194.595249319, -797.841431753, 231.122719569, 809.075359624, -350.231776155, -1129.45281342, -71.5017658029, 198.636144777, 481.73854651, -499.187928116, -412.2024274, 453.535514245, -221.916799268, 933.260589724, 873.50578151, -857.140949289, 625.375557393, 1094.75293899, -683.445014667, 726.470002346, -1040.70082118, -396.007009802, 1031.23841141 +-106.433245228, -483.952008404, 1167.88138741, 1062.37019017, 276.443496299, 205.008655853, -1091.15242172, -496.207421446, -361.505909985, -924.752550792, 787.794572518, -204.748963423, -961.575362652, 689.279232901, 628.181563931, 222.925666112, 1152.77839292, -441.949084443, -1172.95606783, 407.212535047, -476.033391226, -878.784281217, 116.638204203, 1023.78128767, 168.405579172 +-755.606759987, -200.649276132, 920.688692021, 898.858402734, -239.537991728, 323.05146786, -275.170587953, 696.97797901, 585.221151625, 496.15393899, 848.078108855, -859.376940368, 255.091521786, 12.1969062783, -398.970236314, -285.026926566, 233.768437348, -533.726789818, -690.606572215, 66.2290973241, -918.868193029, -1131.47569963, 1126.33336628, -1063.26952094, 1071.75620974 diff --git a/code/plots/data/bins-convergence/50_1/AEP_opt.txt b/code/plots/data/bins-convergence/50_1/AEP_opt.txt new file mode 100644 index 0000000..b78bc7e --- /dev/null +++ b/code/plots/data/bins-convergence/50_1/AEP_opt.txt @@ -0,0 +1,10 @@ +422681.62373 +427436.898252 +423504.650872 +422803.516873 +426213.47411 +420736.537689 +424101.463523 +422284.605746 +423258.490058 +421718.8336 diff --git a/code/plots/data/bins-convergence/50_1/AEP_true.txt b/code/plots/data/bins-convergence/50_1/AEP_true.txt new file mode 100644 index 0000000..95e26b0 --- /dev/null +++ b/code/plots/data/bins-convergence/50_1/AEP_true.txt @@ -0,0 +1,10 @@ +382220.865371 +384092.957316 +382485.341916 +382675.902629 +383387.128425 +381616.091478 +382921.725091 +382387.817331 +382732.607717 +382055.478493 diff --git a/code/plots/data/bins-convergence/50_1/boundary.txt b/code/plots/data/bins-convergence/50_1/boundary.txt new file mode 100644 index 0000000..3798cf2 --- /dev/null +++ b/code/plots/data/bins-convergence/50_1/boundary.txt @@ -0,0 +1,10 @@ +-0.00156289648226 +-0.000115726858212 +-0.000115778346526 +-0.00024794762362 +-0.000644025502879 +-0.000213324306969 +-0.00300397283036 +-0.00111735257406 +-9.62328913374e-05 +-0.000213157743474 diff --git a/code/plots/data/bins-convergence/50_1/separation.txt b/code/plots/data/bins-convergence/50_1/separation.txt new file mode 100644 index 0000000..6bc04da --- /dev/null +++ b/code/plots/data/bins-convergence/50_1/separation.txt @@ -0,0 +1,10 @@ +2798.64942189 +0.00216315993748 +0.0073936767003 +0.00541752978461 +0.0188582847186 +15738.9670484 +87.7117120239 +4742.69211562 +0.0234658285772 +0.00963574188063 diff --git a/code/plots/data/bins-convergence/50_1/turbineX.txt b/code/plots/data/bins-convergence/50_1/turbineX.txt new file mode 100644 index 0000000..1f43013 --- /dev/null +++ b/code/plots/data/bins-convergence/50_1/turbineX.txt @@ -0,0 +1,10 @@ +-924.616280563, 1044.93483835, -875.007377721, -610.171421145, 956.393355412, 71.8986772812, -765.750149204, -502.002790299, 943.459348233, 158.987954825, -1169.9368985, -134.521517332, -1047.46870879, -430.36979515, 29.5239900831, 295.34389485, 1164.12010396, 374.300187477, 711.724330268, 620.882053647, -223.623155745, -595.838730238, -213.450046211, 449.247340579, 562.499643143 +1159.71731808, -460.304590241, -525.648865786, 356.784372152, 74.0158560219, 146.108505623, 96.6689194296, -990.204594877, -118.973971595, -216.334411894, -208.886362273, 805.420639671, -274.744234504, 201.452804814, -692.996499317, 472.706465975, -627.422396551, -1163.10112555, 665.942845305, -834.622151917, 533.16265598, 725.582891159, -923.913908465, 1072.81196832, 939.043835059 +1034.00821841, 903.358452891, -150.135864669, -913.848997912, -597.609419548, 165.368628563, -603.586177667, 68.8454815058, 492.778098893, -81.8215607056, 215.37811403, 455.900623814, 721.383468045, -163.769471827, -273.281097388, -1170.08448363, -341.584171263, -634.401669027, 362.847947819, -587.346848429, -1003.91841812, 634.869152561, 740.511218429, 1138.00764293, -944.033819277 +-471.507371872, 1166.96039907, 850.747142238, 8.52363345876, 508.582254325, -376.294867, -115.965985694, -146.304111152, 703.846237723, -1161.15125476, -516.227168319, -1093.14209991, 620.687395002, -917.672173256, 128.994297113, -339.873549171, 1064.02454745, 318.484592845, -817.978107763, 948.859424165, 256.742051526, 8.31713704148, 606.50852857, -833.720098303, -615.016022359 +160.690051782, -767.405827228, 348.714004375, -410.225742493, 576.225680315, 265.868228299, 548.878074929, 858.159825068, -1018.24898958, -595.284672835, -493.686903976, -157.936951102, 835.808837598, -1172.83870715, -141.589398404, 1123.23011656, 1142.99499429, 814.321758732, -11.9316104906, 101.97558483, -563.124987522, 474.309817414, -272.656396829, -1071.82863169, -812.917467151 +68.1272922608, -169.826903328, -362.821649721, 513.557745348, 499.677144516, 1146.10925534, 850.49363913, -730.3835375, -1085.00486888, -472.143742565, 825.068894281, -269.97718998, -1132.92731262, -779.929869012, 1132.92935881, -756.633789561, -935.596024285, 204.486133886, 862.09512256, 547.231232291, -436.245737642, 133.616947322, -101.426977822, 530.730251955, 190.061760964 +-468.305679723, 111.862347031, 241.28558944, -479.744888457, 1150.81418466, -1086.27126627, 814.736796453, 503.794189686, 536.170364531, 196.301744261, -845.797648348, -624.836445679, 806.759988894, 258.994257121, -95.3909079228, -756.507201468, -440.268502582, 767.089141068, 863.864324839, -374.632201466, -178.800255568, 1098.4710111, 0.439904728872, -1171.57420525, -979.778012941 +520.437901515, 26.6374888423, -688.531122812, 165.655964336, 1172.73246955, -843.674372414, -340.828053204, 470.223876164, -1170.48781819, 215.688096406, -1081.47764833, -473.257602719, -66.2540982401, 829.226269813, -742.605563028, 541.272771167, -257.802081318, 775.692939064, 1024.61206609, 451.590141045, -981.893657871, 105.006072346, -148.385680924, 1025.10961651, -565.271370664 +-534.765453499, 638.116095774, 217.722937232, 598.878273545, 1151.11885904, -932.860376377, -305.024526125, -554.932899228, 118.128020211, -853.092310802, 869.740869825, 1092.05216662, 392.335444323, -1026.25705134, 340.603544748, -221.036435219, -215.272768097, -1158.0248386, 74.3944646321, -599.458739336, -205.887932185, 745.499676268, 101.09666738, -688.262190846, 883.899097483 +-292.782283595, 321.400221641, 468.327900992, 954.264760212, 7.43273264873, 1159.32268243, 611.95368717, -621.229459023, 59.5604414544, 685.178122201, -871.346651662, 34.7758832069, -1133.98186798, 857.593196958, 1093.63733194, -1142.4390564, 27.9707814113, -705.74738906, -948.550553697, -389.106611095, 599.924448577, 302.873540988, -353.600910765, -511.863260697, 13.83222369 diff --git a/code/plots/data/bins-convergence/50_1/turbineY.txt b/code/plots/data/bins-convergence/50_1/turbineY.txt new file mode 100644 index 0000000..aa86fe3 --- /dev/null +++ b/code/plots/data/bins-convergence/50_1/turbineY.txt @@ -0,0 +1,10 @@ +-722.64866306, -534.086263089, -255.252798769, -437.207171564, -16.8780138812, 1171.31000042, 423.293649844, -1060.72123244, 697.868677558, 50.6142974903, -91.5727348246, 183.307458716, 529.101940901, 300.767735531, -1173.14307846, -977.049096595, 148.192417631, 848.658946157, -292.150800819, 995.81209715, -879.718050326, 1010.99610144, 1153.9390965, -128.013624557, -1029.91796109 +-179.42028405, -1063.52085938, 705.68978182, -1117.96279709, -1171.17784924, -399.774695219, 385.58413904, -629.786278242, 1167.46780959, -1153.40163731, 556.029107411, 242.072407438, -246.49562009, 1117.90933977, -947.043696124, 1033.7655988, -84.8552968067, 155.986099817, -966.258914571, 824.949547141, 36.2099565406, 922.315232131, 54.0572170667, 475.615817961, -703.798672417 +554.944047866, -174.50550031, 1163.87074727, 161.683809932, 1009.94994621, 1161.80428108, 423.539547043, -60.4149656538, -800.720713033, -1170.65853071, -1153.58058235, 1065.96313212, 925.603482981, 667.52713824, -227.29244288, -89.6559704486, -1108.76216168, -437.072422592, 114.039337243, -1015.95254385, 607.687174157, 278.869489988, -910.373017309, -286.4865925, -697.091130405 +552.099602358, 123.854352116, -138.889817876, -1173.48338478, -423.933044796, -1091.23276323, -683.902909744, 940.625579976, -939.00821018, 169.893108198, 1053.87162741, -426.821096538, 280.420935985, 731.446296497, 1166.40335579, -84.2107201724, -494.962287896, 748.454380849, 53.0927984543, 690.508280476, -812.932152802, 385.459114801, 1004.63097845, -825.861181769, -966.461795506 +182.325413791, 458.296619494, -953.739759364, -1099.47748573, -737.493471146, 1081.55400563, 968.654821298, -117.729453647, 583.356590697, 1011.32201475, 319.468841176, -1162.3295708, -823.747219794, 39.8236776014, -106.721224044, 339.838268362, -265.891737933, 844.994657978, 1135.95907387, -1169.0752225, -589.818984604, 72.5320637007, 1141.40021234, -477.828373605, -846.346616188 +-1171.53534488, -786.075796181, 584.406300486, -462.314145395, 334.513340899, -252.129860309, -1.65858038357, 118.220998721, 447.102153998, -1012.82891717, 834.50417327, 1142.03687296, -305.960129746, -876.838291997, 305.953238895, 897.018180644, -95.2486452646, 1155.56103848, -796.195908054, 991.836240464, -206.585986624, -630.703719274, 441.435376399, -1046.64286729, 650.375144458 +309.067024573, -177.798837659, 657.036789212, -472.614287561, 229.701233102, -444.024411593, 844.594588438, -778.828428564, 526.98622982, 1156.97980683, -142.229253728, 993.335528315, -301.400352909, -1144.57790031, 823.447504999, -897.128142709, -1087.79610892, -888.09366772, 382.574255017, 921.611150158, -636.768462464, -412.914037426, -1173.51504895, 67.4670882583, 645.887742115 +-413.249978442, 1173.21209772, 145.949467412, -1161.7635096, 42.8311097105, 815.690083229, -188.210433239, -1075.18626045, -84.2279261346, 46.990847411, 455.568727337, -1073.85433512, -303.885843228, 264.469021582, -519.850491108, 442.699638894, 885.728546907, -880.590130726, 572.106886314, 1083.14470659, -642.667020052, 692.125934082, -1164.09540007, -571.214643815, 1028.39894635 +-310.239109388, -161.079312948, 1153.14034962, 948.345203039, 228.169378832, -60.0341634905, -1133.17956914, -1034.01420155, -603.10635588, -805.834617599, 787.83687195, -429.602139816, -741.461799595, 569.150585595, 591.872705875, 356.48682114, 1153.60024767, -190.037965033, -1171.15386022, 460.449181158, -452.380611146, -906.29256693, 248.397038884, 950.489900339, 41.6107534727 +-843.043447925, -73.6020039765, 1076.01345249, 683.01878391, -525.230826718, 181.95354393, -194.642912448, 715.057558693, 675.247073501, 495.569011395, 786.060372595, -1172.9990044, 302.028225967, -316.540653519, -425.550683141, -268.271120858, 38.7222105163, -575.29035738, -690.932513986, 125.017986051, -1008.57670997, -1133.75640632, 1118.97376607, -1055.99806126, 1173.43297254 diff --git a/code/plots/data/bins-convergence/50_10/AEP_opt.txt b/code/plots/data/bins-convergence/50_10/AEP_opt.txt new file mode 100644 index 0000000..239fc0a --- /dev/null +++ b/code/plots/data/bins-convergence/50_10/AEP_opt.txt @@ -0,0 +1,10 @@ +361739.599098 +360534.997883 +360823.039384 +360403.816657 +362694.277464 +362084.040156 +360655.269127 +361755.304212 +360983.990672 +359615.008982 diff --git a/code/plots/data/bins-convergence/50_10/AEP_true.txt b/code/plots/data/bins-convergence/50_10/AEP_true.txt new file mode 100644 index 0000000..04990be --- /dev/null +++ b/code/plots/data/bins-convergence/50_10/AEP_true.txt @@ -0,0 +1,10 @@ +383278.512616 +382253.594876 +382504.240858 +381817.152292 +384211.658236 +383599.711278 +382441.778866 +383185.68035 +382640.424659 +381292.234828 diff --git a/code/plots/data/bins-convergence/50_10/boundary.txt b/code/plots/data/bins-convergence/50_10/boundary.txt new file mode 100644 index 0000000..91bcc0d --- /dev/null +++ b/code/plots/data/bins-convergence/50_10/boundary.txt @@ -0,0 +1,10 @@ +-0.000890383092838 +-0.000592300152448 +-0.00363720655264 +-0.00117391813092 +-0.000952788400582 +-0.00297819574666 +-0.00131600010218 +-0.00119256418361 +-0.00168261769068 +-0.000207100677017 diff --git a/code/plots/data/bins-convergence/50_10/separation.txt b/code/plots/data/bins-convergence/50_10/separation.txt new file mode 100644 index 0000000..75c4ed1 --- /dev/null +++ b/code/plots/data/bins-convergence/50_10/separation.txt @@ -0,0 +1,10 @@ +20446.3169793 +2890.62597826 +12003.8338179 +40387.0693006 +5800.25333823 +26489.041929 +1.16162113351 +0.0364974112163 +6176.52285991 +4734.82483763 diff --git a/code/plots/data/bins-convergence/50_10/turbineX.txt b/code/plots/data/bins-convergence/50_10/turbineX.txt new file mode 100644 index 0000000..4d7280c --- /dev/null +++ b/code/plots/data/bins-convergence/50_10/turbineX.txt @@ -0,0 +1,10 @@ +-957.204806657, 1018.71455951, -1137.45694367, -607.626794678, 1172.44890221, 233.564914176, -767.470596276, -501.226021589, 914.583932989, 161.204175862, -1155.37852795, -47.8395183162, -910.385571734, -451.753097569, -27.2257566709, 273.503301023, 1104.24620161, 346.495906821, 767.401572135, 670.73103941, -206.457539282, -557.009668626, -160.625873777, 482.199214932, 574.489082885 +1170.74363525, 157.66488358, -676.051495302, 459.79641937, 104.068570139, 2.14270379643, -64.3806691938, -1087.96151126, -303.658886491, -326.558212132, -189.549420158, 819.817128142, -430.222120398, 206.919517935, -769.550805336, 539.070520498, -565.171525948, -1165.47761105, 705.433365755, -783.765427465, 441.532397405, 599.448719997, -899.178888867, 1053.91584042, 1018.63635991 +1033.52557472, 767.137829247, -108.058762786, -1167.58715678, -555.467350493, 320.966546049, -850.978812338, -297.102133086, 505.268068617, -148.304515183, 259.844264708, 688.290125622, 580.74937609, 21.6314071873, -397.271645197, -1037.20899281, -23.044873206, -742.697866321, 157.932950235, -473.12438491, -907.910737858, 1166.24744988, 810.823809344, 1108.66498008, -726.558574775 +-375.336488101, 1171.0646849, 727.03472744, -25.1600797613, 703.551667167, -436.382638177, -153.43342607, 90.4490911851, 619.907127015, -1147.59821877, -410.977595908, -1138.03284084, 719.44291083, -844.973299973, 91.8956437167, -339.19009113, 1082.50485833, 410.413382332, -792.613068772, 1001.01866825, 270.230067841, 41.8212807856, 693.938879338, -966.633096677, -721.317158654 +205.844415975, -737.736501787, 195.664527926, -464.781223167, 900.330802643, 413.430023956, 654.977876997, 875.999013669, -996.639487748, -561.16733956, -467.225170585, -144.535891584, 567.462647365, -1172.68352816, -113.18988514, 1112.14486574, 1149.77253284, 891.543647295, 141.91543568, 224.051069621, -494.780162937, 536.769711744, -191.677714244, -1082.26498308, -811.132106678 +-11.8183810819, -509.174321966, -519.601120457, 499.386312784, 742.06906556, 1063.06298874, 881.23767934, -835.501691769, -1116.05328603, -796.47885418, 990.386286116, -282.3384389, -1144.09746373, -347.025441673, 1173.42671578, -806.736702612, -879.869778189, 482.657646093, 786.379897359, 108.435256729, -66.2255358421, 499.582725558, -174.345256989, 277.803569336, 206.289647858 +-465.505283737, 101.251469561, 375.188818588, -591.245993981, 1170.84952825, -1063.64291752, 827.386678629, 457.180031505, 1060.53324261, 290.871649565, -997.272880559, -537.652360508, 730.06186948, 426.64746378, -31.6262343842, -751.458902478, -433.516852319, 823.628985085, 440.529809716, -284.0030331, -177.923826832, 1094.03524876, -14.0614412976, -1053.69178746, -803.424939223 +372.733161919, 35.670879815, -561.263847047, -80.8762872447, 1173.51326519, -967.146310158, -69.3736054508, 244.034947783, -921.993973315, 34.4370411184, -1163.79741085, -596.337033066, 535.213075502, 865.836536848, -834.012577755, 518.702986287, -310.240591547, 688.156135902, 974.35014321, 552.618926211, -1047.01958472, 38.6631132607, -355.141808566, 987.377171051, -576.916496676 +-681.143737343, 798.868935788, 53.9431090137, 406.939859671, 1170.51986504, -1153.32344747, -331.162780862, -845.227002683, 469.363214963, -582.802057193, 883.090141499, 1060.47769936, 339.211394199, -884.48160763, 565.628220865, -170.65441528, -377.157636936, -1104.5309812, 9.64125174781, -481.670936126, -120.17807534, 671.521155073, 118.619064224, -789.337004823, 840.715445342 +-204.175706523, 310.0334656, 338.049793824, 889.071357884, 13.3392931354, 1137.30672788, 512.178013773, -737.828597126, -158.287111157, 650.466566135, -873.102894213, 115.629605783, -1145.3112364, 801.695151127, 1145.98329125, -1123.92975497, -103.482246515, -557.531828052, -893.309570897, -562.76705075, 903.120597797, 412.591285087, -331.604430635, -447.426227673, 32.2143417007 diff --git a/code/plots/data/bins-convergence/50_10/turbineY.txt b/code/plots/data/bins-convergence/50_10/turbineY.txt new file mode 100644 index 0000000..8552d45 --- /dev/null +++ b/code/plots/data/bins-convergence/50_10/turbineY.txt @@ -0,0 +1,10 @@ +-678.892711437, -582.543767695, -288.665220448, -583.310072047, -49.9957326119, 1150.03622717, 79.4661178819, -1061.08834606, 735.30552212, -91.9631906453, 205.514925195, 572.925973617, 740.495782297, 406.896903999, -1173.19870452, -910.992160377, 397.211093749, 767.187255559, -424.784142456, 962.941268813, -745.75897926, 1032.89696733, 1162.46968828, -248.600046953, -1023.2784813 +-80.5999359962, -1162.87484903, 466.951476414, -837.053790405, -725.429686536, -249.490279229, 300.810188086, -439.858789703, 1133.54646664, -1127.1628899, 786.462881632, 15.1672796382, -596.899583483, 1155.12778826, -885.961344259, 624.40977634, -138.02785533, 137.105989126, -937.816464788, 873.411514443, 117.441859738, 1008.85936153, 12.1703459333, 516.137634971, -582.681086008 +555.842721947, -250.799727478, 1168.52897288, 117.803056648, 1033.72749742, 852.978519984, 289.342729919, 607.110273792, -612.451161367, -1164.10613178, -1144.38865178, 609.782392342, 1019.73836825, 521.101576877, 24.5000756293, -548.940638046, -725.807572391, -278.039694164, -118.766120024, -1045.5465307, 743.528707373, 130.403645263, -848.35345598, -384.709122907, -921.550783893 +529.207459301, 75.7902554714, -250.656973139, -1173.24525377, -629.159510644, -1089.36042093, -716.540917191, 750.318079835, -996.419454387, 245.265335478, 1099.19667061, -286.389085686, 198.998056453, 814.343916503, 1169.91071853, -133.747876316, -453.121535191, 645.954289247, 386.533453733, 612.452130828, -865.757419769, 266.275334399, 946.354837548, -665.399401887, -925.655233653 +197.122214727, 448.923465742, -539.912861654, -1077.48216065, -752.689247472, 1029.17510677, 906.476744801, -95.6331716431, 619.552777585, 1030.64407512, 256.016495212, -1164.57963185, -1027.19242192, 44.1502047232, -153.597276774, 374.526001472, -234.860230377, 763.076914334, 1158.68611047, -1151.92803155, -520.569994527, 71.1878663302, 1157.7545502, -453.694224392, -848.056958095 +-1017.2460545, -649.526487187, 715.257349138, 178.216196378, 862.518582677, -497.024263224, 79.010296599, 225.102524205, 362.713338258, -861.834220865, 629.500555771, 1139.0438812, -261.107048435, -1121.03355183, -14.3417730754, 852.23929477, -433.35805052, 1069.66240955, -871.058300329, 1168.49388056, -325.3328022, -731.389473428, 524.293488661, -1140.1588205, 284.355469841 +348.240869369, -227.726523566, 742.507231087, -385.927611218, 79.0592338946, -495.781842755, 832.206337063, -512.976273913, 502.399396647, 1136.89518825, -111.371292473, 1043.10405428, -51.7427455154, -1093.20994264, 875.228255149, -901.357943553, -1090.50458279, -835.925381878, 250.008402191, 980.122290955, -660.73256116, -424.526589285, -1173.43026522, 516.594167128, 446.112493648 +-195.542215282, 1172.97306976, -86.9156401347, -1170.72431812, -1.87985343016, 664.653689106, -341.790232705, -1147.86133084, 55.150952068, 328.959335811, 150.709268875, -1010.70308655, -527.756340941, 231.780190575, -825.565909186, 490.708377203, 897.187265997, -950.567010701, 654.047179561, 1035.25294447, -529.986928396, 755.746186445, -1107.78501162, -634.212077312, 1021.91210978 +-117.247709531, -362.302753962, 1172.27476871, 1100.69792755, 83.780337373, 216.754022368, -1091.08906154, -814.081655896, -155.109385815, -988.843291612, 772.844192625, -502.516974402, -818.968200035, 771.251063902, 698.998808917, 279.347034137, 1111.25518936, -396.420454124, -1173.47641093, 393.72737404, -475.100889818, -962.390613319, 143.541331491, 455.231761556, 169.411196911 +-852.187150005, 41.3460160557, 1000.89097899, 765.955816974, -427.440962963, 289.257196758, -442.620700341, 391.823317773, 554.98862356, 641.848693116, 784.109285019, -1009.37548481, 255.730456613, -115.180713184, -252.702738056, -337.517587189, 133.452770185, -632.034694972, -761.008480629, 172.854977999, -749.339156437, -1098.59197364, 1125.68841358, -1084.87128794, 1115.26439037 diff --git a/code/plots/data/bins-convergence/50_2/AEP_opt.txt b/code/plots/data/bins-convergence/50_2/AEP_opt.txt new file mode 100644 index 0000000..f64b2b7 --- /dev/null +++ b/code/plots/data/bins-convergence/50_2/AEP_opt.txt @@ -0,0 +1,10 @@ +292030.900871 +290620.995735 +292624.161085 +291750.992315 +291221.071016 +291125.135704 +290824.833256 +291953.853508 +292354.302189 +289984.60145 diff --git a/code/plots/data/bins-convergence/50_2/AEP_true.txt b/code/plots/data/bins-convergence/50_2/AEP_true.txt new file mode 100644 index 0000000..ed5c21b --- /dev/null +++ b/code/plots/data/bins-convergence/50_2/AEP_true.txt @@ -0,0 +1,10 @@ +382652.023786 +381292.435889 +383192.108031 +382584.939122 +382312.903531 +381804.81555 +381612.204291 +382606.99813 +382908.603838 +380583.46228 diff --git a/code/plots/data/bins-convergence/50_2/boundary.txt b/code/plots/data/bins-convergence/50_2/boundary.txt new file mode 100644 index 0000000..d210993 --- /dev/null +++ b/code/plots/data/bins-convergence/50_2/boundary.txt @@ -0,0 +1,10 @@ +-0.000217918402313 +-0.0029825597137 +-0.000889972548748 +-0.00028684542167 +-0.00274016674143 +-0.00265686611556 +-0.000478696708342 +-0.00317939737147 +-0.0015729738177 +-0.00149582230483 diff --git a/code/plots/data/bins-convergence/50_2/separation.txt b/code/plots/data/bins-convergence/50_2/separation.txt new file mode 100644 index 0000000..75ea748 --- /dev/null +++ b/code/plots/data/bins-convergence/50_2/separation.txt @@ -0,0 +1,10 @@ +0.0351169558999 +4554.46299721 +0.025398175334 +3672.86442363 +835.959864218 +28439.121753 +22961.4733811 +25632.9772003 +0.0474758367491 +6.32614435695 diff --git a/code/plots/data/bins-convergence/50_2/turbineX.txt b/code/plots/data/bins-convergence/50_2/turbineX.txt new file mode 100644 index 0000000..402f5c1 --- /dev/null +++ b/code/plots/data/bins-convergence/50_2/turbineX.txt @@ -0,0 +1,10 @@ +-878.248012359, 879.635209635, -881.365355472, -576.181012209, 918.396584013, 346.230963016, -799.134002702, -341.845119382, 983.180677003, 146.277121178, -1168.15058205, -194.454107406, -988.485241716, -499.427873395, 199.986760742, 122.005316674, 1158.32345411, 58.6135599109, 674.96354346, 656.286807348, -270.692907503, -553.95876601, -75.2514178029, 417.279277943, 573.180219924 +1173.50047891, 194.899891463, -641.077964816, 463.437352473, -59.0154096964, -276.059424666, 91.305339781, -1092.19737689, -97.9701597465, -337.21588552, -373.101697026, 844.665135647, -511.090932407, 194.126728431, -725.072191487, 449.712218757, -605.95690213, -1150.3697707, 759.571678977, -722.411883487, 522.080844491, 717.100483405, -886.427178959, 1024.93920132, 1095.95597551 +1022.16130919, 615.092792771, 66.3005871571, -1171.61828128, -472.301610968, 359.006633902, -742.29418074, -300.657546515, 655.477848476, -184.93839204, 228.156181046, 597.136393471, 817.587492134, -123.951291697, -467.498161253, -1102.54224996, 36.6518882164, -644.228150263, 290.953585761, -491.992148623, -1017.93355498, 1170.19154096, 668.384607207, 1045.50066826, -790.878322252 +-516.798464644, 1151.89751317, 755.962583083, -9.86708921788, 713.943635276, -309.248061052, -124.846464443, 1.26809345579, 620.335864209, -1173.38321529, -420.755784226, -1030.8554627, 679.884285834, -899.225313471, 135.120669172, -548.661737326, 1114.95723394, 369.761158017, -936.139448243, 921.568604391, 282.817169298, -81.4424042964, 570.965515174, -802.358334165, -556.959983214 +239.474624556, -726.094927314, 352.232013298, -407.721740165, 730.551752811, 176.598364761, 548.63167424, 918.944957082, -1050.75426302, -739.558702481, -435.025297723, -88.8602561574, 761.057675273, -1173.51353744, -114.815694804, 1075.12284193, 1145.17855297, 840.14998721, -66.761037219, 246.850596798, -553.349179198, 624.770913976, -311.919443645, -1069.31176979, -815.264884256 +20.5076311621, -664.971463842, -169.573256715, 351.732428282, 663.435574376, 977.781438878, 836.592864699, -616.884095501, -1060.87333289, -820.827307924, 982.436005412, -106.040161783, -1147.68035144, -393.204486126, 1169.83556738, -664.152771472, -923.32383754, 270.811689786, 681.997593391, 563.2728267, -482.335073264, -96.5482064836, -173.271854484, 518.989890727, 191.258862141 +-490.467973313, 68.8649827159, 461.007593158, -464.775425702, 1163.85534152, -1054.76871982, 898.359956429, 476.808332431, 552.404962002, 350.982534107, -1172.56778569, -600.451067178, 748.56085454, 217.464133677, -64.6259632327, -797.439356323, -494.690156542, 798.240823841, 658.338387986, -129.693542776, -263.448172088, 1011.62856199, -125.860866943, -1044.47291552, -764.894054648 +654.562065589, 3.49582234871, -341.329848378, 176.353288076, 1171.73050888, -831.270773361, -212.838666916, -116.163591235, -1170.2306011, 323.479539092, -1086.12049314, -486.816613656, 426.333800937, 858.146241062, -781.791176974, 791.910453068, -182.590213762, 515.116154111, 1058.1354815, 499.811977996, -1010.85163288, 162.979963297, -610.220826463, 958.200907672, -511.074535725 +-786.989059383, 693.830397277, 23.3196527796, 437.415409121, 1144.12200129, -1173.27796173, -271.013721241, -752.35065243, 347.552940648, -523.61315816, 888.29992094, 1048.64134358, 349.442790497, -1013.58546798, 584.907757207, -273.346158332, -400.649877918, -1002.57056435, 37.0203903881, -524.846179721, 5.53445802526, 654.641332209, 211.638982666, -779.331111292, 933.644397723 +-326.537859226, 310.46607283, 499.930766326, 940.861857466, 24.7665986267, 1153.28417181, 596.359945312, -588.155780242, 32.3015429826, 676.856962471, -813.13239962, 64.6889395535, -1081.80424845, 845.797249922, 1088.76417798, -1169.20769468, 24.2254144172, -694.023291509, -1018.49609218, -336.852136685, 604.531513852, 120.008237927, -190.868307257, -561.120680838, -72.1191013884 diff --git a/code/plots/data/bins-convergence/50_2/turbineY.txt b/code/plots/data/bins-convergence/50_2/turbineY.txt new file mode 100644 index 0000000..c257bad --- /dev/null +++ b/code/plots/data/bins-convergence/50_2/turbineY.txt @@ -0,0 +1,10 @@ +-778.342035918, -776.774292196, -296.582959719, -449.94888458, -88.0338154946, 1121.27622356, 220.014347673, -1122.6209539, 640.696348099, 202.074149805, -112.072441072, 315.581164636, 632.481479306, 447.383068834, -1156.34830726, -727.637808068, -188.209322086, 734.087263062, 11.921632988, 972.843129349, -583.663700059, 1034.53640752, 1171.09925815, 106.348013268, -1024.01197076 +5.9626901999, -939.408801859, 498.744339902, -932.920733462, -780.921238933, -215.089336717, 265.994645401, -429.240936604, 1169.42000289, -1124.02186387, 876.693317812, 37.8522081234, -618.070189335, 947.169176852, -922.717099952, 708.345808027, -70.0692985232, 231.923394305, -894.53201353, 924.801683683, 72.3542298617, 928.925779104, 84.9129178278, 571.520435991, -419.544123832 +576.473893693, 195.312481252, 1171.63996653, 66.6824251843, 1074.27549491, 1095.2610478, 475.703038054, 321.461079989, -354.747710004, -1158.85026151, -1151.12147708, 990.885557357, 841.835464773, 788.073236238, -72.3039630172, -401.916012686, -685.309637747, -488.879072524, -194.759902605, -1047.59658679, 583.906927877, 88.2480944095, -964.571359975, -532.978736012, -866.975999456 +557.775840636, 224.205288331, -187.70553879, -1173.47287787, -600.649585957, -1106.23879513, -466.501568534, 772.296477972, -996.152545039, -17.5453516068, 1095.49127557, -560.779082765, 346.289163567, 754.009132439, 1165.7094757, -132.881185952, -366.06925443, 475.255913032, 236.506074422, 726.53106443, -777.245746473, 228.583714173, 1025.2484693, -856.36280431, -1006.68143456 +180.093554334, 356.644165869, -555.858418986, -1100.40969924, -418.761515844, 925.929940035, 1037.37167667, 6.76895229812, 522.543196812, 911.146987966, 189.744883485, -893.025006302, -893.26831137, -1.83975128926, -23.7157607237, 470.370148085, -256.325138665, 819.31950386, 1040.01497538, -1147.26069649, -541.834216532, 321.540621652, 1131.30197129, -483.433819196, -844.086281659 +-1173.3363557, -555.20330242, 769.326649522, -460.635503111, 489.636520742, -648.907597143, 10.8845913603, 381.003006498, 501.682503442, -838.677500179, 641.838435695, 1168.71622365, -244.884953027, -1105.67991517, -92.8644714119, 967.492655806, 40.9198462325, 1141.83397823, -556.435771695, 1029.49504392, -265.931741256, -549.891360743, 254.566741365, -1052.51409246, 156.100066475 +299.233522038, -126.323626465, 759.249401673, -290.349414189, 150.25891473, -514.392015777, 755.039919943, -774.578766074, 393.393916613, 1119.79784932, -47.1244436957, 1008.26346419, -476.306925534, -1153.18916148, 680.682071164, -860.945051644, -1064.15110915, -860.202263847, 3.45544276537, 1166.32581245, -661.18067275, -202.950637799, -1166.74592662, 534.988087311, 423.64566982 +-260.011760094, 1173.50914985, 173.433555155, -859.114252836, -64.6808431385, 828.326532481, -543.882765117, -1167.75131563, -87.7293462712, 272.643734832, 444.390362487, -409.09010248, -580.466985622, 86.3496940642, -263.036992153, 866.037636627, 774.764913643, -1054.41518969, 507.430877768, 1061.75590522, -596.083768979, 666.617716272, -1002.38040087, -677.485791196, 1056.38034778 +-166.71860037, -375.316365113, 1173.28364058, 1088.94655363, 260.99952446, -23.6306563973, -1123.1892953, -900.613501516, -197.518310435, -1033.64295984, 766.85150182, -526.772216481, -824.878139783, 591.422534403, 663.238185619, 182.414508526, 1103.0029876, -609.908317074, -1172.93031359, 332.749235215, 6.2550402343, -973.951057115, 538.437938662, 478.617641561, -60.6279316372 +-737.594902678, -91.6437787715, 1061.69977332, 701.366799669, -400.850507498, 216.966029849, -235.430445775, 702.409850616, 574.426866046, 424.379143088, 846.140759879, -835.141915965, 454.793164875, -345.277665056, -437.870310634, -100.447026649, 36.1451255192, -475.000620225, -582.926432241, 170.644712503, -1005.82196272, -1167.36218947, 1157.88975797, -1030.66996426, 870.483162561 diff --git a/code/plots/data/bins-convergence/50_3/AEP_opt.txt b/code/plots/data/bins-convergence/50_3/AEP_opt.txt new file mode 100644 index 0000000..d6fcc3a --- /dev/null +++ b/code/plots/data/bins-convergence/50_3/AEP_opt.txt @@ -0,0 +1,10 @@ +305399.294844 +304282.741325 +302380.027229 +305260.987841 +306799.041655 +306771.924391 +303711.761661 +305512.589418 +303066.911061 +305055.157571 diff --git a/code/plots/data/bins-convergence/50_3/AEP_true.txt b/code/plots/data/bins-convergence/50_3/AEP_true.txt new file mode 100644 index 0000000..6884164 --- /dev/null +++ b/code/plots/data/bins-convergence/50_3/AEP_true.txt @@ -0,0 +1,10 @@ +375906.946592 +375785.740301 +368106.832595 +376701.885776 +380085.852506 +379514.318264 +371541.541931 +375985.464906 +370603.289942 +375839.576507 diff --git a/code/plots/data/bins-convergence/50_3/boundary.txt b/code/plots/data/bins-convergence/50_3/boundary.txt new file mode 100644 index 0000000..e58d37b --- /dev/null +++ b/code/plots/data/bins-convergence/50_3/boundary.txt @@ -0,0 +1,10 @@ +-0.000352227892563 +-0.000179266647137 +-6.01224378443e-05 +-0.000384918477039 +-0.000555981859634 +-0.000363642613138 +-0.000176010351879 +-5.19666114087e-05 +-1.04623964035e-05 +-0.000572913211499 diff --git a/code/plots/data/bins-convergence/50_3/separation.txt b/code/plots/data/bins-convergence/50_3/separation.txt new file mode 100644 index 0000000..afd0850 --- /dev/null +++ b/code/plots/data/bins-convergence/50_3/separation.txt @@ -0,0 +1,10 @@ +0.0455818501359 +48.4581360138 +0.00137894807267 +1.58153707162e-05 +0.0614750136738 +0.173023943862 +0.185570660105 +0.0420205372357 +3200.72815934 +0.0475917266158 diff --git a/code/plots/data/bins-convergence/50_3/turbineX.txt b/code/plots/data/bins-convergence/50_3/turbineX.txt new file mode 100644 index 0000000..9b9d722 --- /dev/null +++ b/code/plots/data/bins-convergence/50_3/turbineX.txt @@ -0,0 +1,10 @@ +-934.759107152, 982.381627956, -889.631795407, -628.02222091, 878.778944487, 318.745198132, -901.227842081, -500.473155681, 926.297947619, 81.3020586898, -1166.39129745, -230.549851489, -935.506757271, -672.441595674, -50.6117026585, 168.16963282, 1154.47513998, -158.661706694, 622.536696464, 704.024627229, -360.221196871, -488.55868444, -125.29943484, 362.559948875, 771.869864266 +1172.94809093, -749.403993701, -538.657247099, 393.692001772, 33.5114521703, 172.18691057, 196.408932588, -1082.57716815, -323.217941711, -97.9308189195, -191.108111093, 739.096775015, -520.973736869, 75.0125370334, -1082.13668151, 403.328613841, -608.316184215, -1060.22646356, 739.557942086, -623.142232648, 306.130629327, 649.890920415, -844.936648482, 955.162673463, 839.584943036 +1007.70228602, 512.606633815, -26.7524453226, -871.596622714, -467.405630196, 243.539010572, -587.448675781, -284.21306022, 531.08033872, -32.1682578634, 225.116039242, 549.623108748, 764.797861682, -148.399617597, -327.576252186, -1129.38886109, -394.159808054, -460.090325654, 165.737702193, -515.928865311, -645.541630085, 724.469289135, 661.092490939, 1111.97406953, -701.810023963 +-374.795941529, 1049.22238786, 653.921936724, 54.5700469652, 562.527810327, -433.942909834, -190.84681355, 89.0952128662, 775.77312896, -1132.60191694, -368.983917316, -1132.29019821, 536.959847536, -750.550369336, 164.740060598, -40.7316020212, 989.040693041, 465.374745319, -776.253580592, 931.502113225, 189.46202593, 24.9813049357, 963.565173829, -954.15996952, -689.754721645 +236.057694478, -1106.60099695, 380.903456905, -595.712834024, 751.417440855, 147.864285229, 525.164273192, 911.136174814, -850.55959909, -451.453098995, -168.769875161, -77.9547658193, 619.861414358, -1115.37042086, -171.540028437, 1166.1778441, 1090.91798311, 844.525870852, -167.684252076, 207.30999984, -461.239115958, 603.164897755, -517.041556809, -995.013658147, -857.471770393 +132.417571514, -156.436464019, -373.07461903, 445.04730949, 449.763405018, 1057.47696886, 699.453994067, -793.567833079, -1071.24167306, -650.746026909, 944.686444551, -106.0975321, -1085.82973093, -530.123857917, 1120.79152402, -632.776038189, -1069.07972257, 319.599506983, 943.269602647, 711.408092785, -710.681487728, 51.8045720371, -167.544036066, 469.714872331, 178.157769087 +-367.078674007, 334.558855045, 511.002051561, -260.070913857, 1012.90411825, -1100.40613124, 960.805229097, 665.157032213, 692.157156325, 290.48222364, -905.71384985, -435.55601072, 720.114126896, 624.627334008, 340.669796884, -679.077937371, -532.325936538, 1017.85374107, 621.919786482, -168.100672931, 278.513735993, 976.681304343, 284.981305815, -1172.03484011, -733.674805453 +639.719260474, 239.700764552, -74.0153669868, 318.345373802, 1034.99832219, -812.907868809, 127.602649935, 485.714458513, -1079.25295667, -33.9338707321, -1073.48220931, -455.210264528, 456.004978784, 770.298653036, -985.340458025, 718.599913241, -342.750008445, 771.386935892, 1011.55400478, 500.133053828, -974.4971902, -79.6012266243, -369.623972513, 1163.07794827, -541.70615499 +-572.102049745, 686.468106794, 468.593720001, 510.086806097, 1008.16972409, -922.599088309, -89.3994679139, -341.13202267, 368.915292935, -483.107814463, 1133.00649825, 964.539914852, 426.030305388, -966.659966409, 465.745715377, -97.2707850866, -335.779447163, -1144.21422512, 326.523170605, -644.691363086, 99.3134798618, 639.578567683, 309.506161007, -715.51413726, 866.23532343 +-305.081238877, 220.334611228, 339.636936714, 909.369061313, -48.9897154081, 1081.92458755, 522.097990189, -601.430179747, -279.146254083, 730.993459468, -845.614619905, 190.042305362, -1080.17030737, 865.172382252, 1130.22765098, -1138.16657637, 160.76562691, -702.437473182, -931.838801876, -124.213214366, 604.603209343, 271.780086828, -510.053959137, -588.529004022, -387.718603914 diff --git a/code/plots/data/bins-convergence/50_3/turbineY.txt b/code/plots/data/bins-convergence/50_3/turbineY.txt new file mode 100644 index 0000000..32b41ab --- /dev/null +++ b/code/plots/data/bins-convergence/50_3/turbineY.txt @@ -0,0 +1,10 @@ +-709.479600908, -582.786217799, -374.843412903, -645.01201365, -213.018151706, 999.234576188, -26.3339588052, -1061.44398756, 587.831602265, -103.821965543, -129.103336053, -9.44034072971, 708.493476232, 220.42796819, -1068.56866973, -433.220229763, -210.531371164, 620.622961211, -257.064101712, 938.87445824, -689.642802354, 1066.98018928, 1047.67593546, -260.557406301, -883.941629594 +-36.4566636019, -902.333056109, 603.340732476, -936.758583254, -571.748541948, -205.764456272, 584.902186289, 3.01772212304, 1128.12505285, -1082.71492121, 732.484530837, 646.964944325, -285.504572844, 891.398274669, -454.000111956, 894.329403719, 110.637670568, 503.046715867, -911.147597978, 986.757736491, 178.735280489, 977.12727273, 324.284496542, 306.446894156, -373.967752853 +601.391715179, 394.37497319, 849.640609088, 63.0145773927, 1076.41437626, 771.05771301, 367.673456232, 320.798920664, -166.741071322, -1048.74926307, -1151.71987258, 740.54626742, 886.490883447, 542.507588848, -48.9278035179, -318.773777011, -529.017178285, -277.515352789, 121.904190046, -758.73941838, 705.023582392, 546.496307797, -969.583731787, -375.032933743, -940.531053585 +496.464753223, -178.983318022, -306.45056655, -1171.39944646, -668.607074525, -946.143454212, -790.267509707, 766.892863323, -880.517999165, 307.16321132, 1055.37218387, -220.689669839, -74.2440427218, 902.114274615, 1161.89373805, 29.0347069179, -545.059073165, 358.024179883, 408.593193723, 304.33339822, -770.658007636, 427.706192854, 669.835017586, -683.165240447, -899.663383959 +370.9043862, -118.987758538, -451.411508836, -1011.06982274, -430.59524837, 1060.20781633, 919.527137915, 181.553118633, 262.449291033, 1083.20233378, 263.105178848, -997.9976868, -996.447810341, 364.808222208, -386.657423896, 131.017899209, -432.474988363, 814.808147488, 858.562802473, -1098.21612483, -695.393214666, 294.429000027, 567.959593665, -483.526254491, -798.453479395 +-1099.0402576, -1028.69166108, 673.377522031, 58.8945772319, 649.886361796, -508.801688746, -142.845689309, 441.27031808, 478.799172186, -795.286676306, 696.206447501, 1166.23511724, -445.095770597, -1046.95029505, 329.343285127, 988.297136776, -47.7896209355, 1119.87572602, -275.227609434, 908.950592094, -297.197527746, -15.7685111725, 398.759040571, -1075.40871506, 272.981081533 +431.05964309, -286.465248028, 538.623290128, -195.4445369, 195.197054832, -394.031717352, 673.787258653, -657.514394629, 339.912945784, 1090.79589821, -155.416754156, 1088.87622967, -364.10853255, -989.288139279, 735.059306651, -818.784075781, -1045.83220015, -584.045980297, 66.6004674967, 952.844054789, -558.350161632, -262.17523757, -1138.38568158, 58.9086238505, 185.446957833 +31.7748469704, 1072.89402154, 32.4106273691, -695.803655339, 179.550375118, 806.870290328, -214.213028232, -1068.27775246, 126.326386027, 405.149438641, 474.101084741, -481.970835102, -388.311700101, 416.761126154, -298.579268024, 835.681383471, 873.62324375, -738.667707442, 594.890333562, 1057.11198049, -653.828051901, 874.816942407, -1093.4037047, -132.913039473, 1041.00452637 +-217.854204716, -508.515204173, 1075.89768081, 751.341562237, -77.0736630457, -99.5708399008, -1170.10411984, -763.957905528, -487.222638406, -1069.45909427, 305.666761956, -668.430002031, -769.93454259, 665.360357828, 422.571765263, 3.35605814162, 417.664222772, -260.594932938, -1088.22104748, 112.832524039, -300.89407501, -983.908101732, -97.9623873837, 565.412117705, -302.141106421 +-685.593320362, -87.3118435461, 841.27266704, 741.74375763, -266.562416019, 373.930476415, -141.256636648, 600.659016208, 386.620943256, 524.748816622, 813.677992811, -823.561244484, 458.659896966, -223.804869388, -315.789001055, -285.855087367, 188.299379328, -513.637692152, -713.310849295, 177.824464102, -995.624787532, -1141.60917002, 1056.87319627, -1015.26819286, 748.738082747 diff --git a/code/plots/data/bins-convergence/50_4/AEP_opt.txt b/code/plots/data/bins-convergence/50_4/AEP_opt.txt new file mode 100644 index 0000000..fe35e40 --- /dev/null +++ b/code/plots/data/bins-convergence/50_4/AEP_opt.txt @@ -0,0 +1,10 @@ +383866.030049 +385271.786041 +383080.954026 +382793.520514 +385430.40653 +383954.954157 +384864.735211 +384500.630279 +385536.91197 +383484.168158 diff --git a/code/plots/data/bins-convergence/50_4/AEP_true.txt b/code/plots/data/bins-convergence/50_4/AEP_true.txt new file mode 100644 index 0000000..16f080a --- /dev/null +++ b/code/plots/data/bins-convergence/50_4/AEP_true.txt @@ -0,0 +1,10 @@ +381946.962429 +382477.299792 +381348.623299 +381314.820404 +383375.927808 +382198.28498 +382608.686446 +382565.869626 +383526.98178 +381423.021006 diff --git a/code/plots/data/bins-convergence/50_4/boundary.txt b/code/plots/data/bins-convergence/50_4/boundary.txt new file mode 100644 index 0000000..0e02492 --- /dev/null +++ b/code/plots/data/bins-convergence/50_4/boundary.txt @@ -0,0 +1,10 @@ +-0.000457640186823 +-4.8509242788e-05 +-0.000438032714101 +-3.20596882375e-11 +-0.000185153132406 +-0.00125183105979 +-0.000685698459392 +-0.000772281779973 +-0.000510047438411 +-0.000148702963997 diff --git a/code/plots/data/bins-convergence/50_4/separation.txt b/code/plots/data/bins-convergence/50_4/separation.txt new file mode 100644 index 0000000..50e963b --- /dev/null +++ b/code/plots/data/bins-convergence/50_4/separation.txt @@ -0,0 +1,10 @@ +0.00128746943665 +38741.036089 +9289.10358343 +15957.5295771 +3375.26698348 +0.0200627324084 +63621.1091698 +21530.552259 +4576.52929927 +8173.31492565 diff --git a/code/plots/data/bins-convergence/50_4/turbineX.txt b/code/plots/data/bins-convergence/50_4/turbineX.txt new file mode 100644 index 0000000..5b842c7 --- /dev/null +++ b/code/plots/data/bins-convergence/50_4/turbineX.txt @@ -0,0 +1,10 @@ +-884.894717456, 957.553365514, -949.626751187, -528.102057742, 910.772809165, 447.146634207, -806.25046796, -528.105971242, 1045.70191217, 228.106886883, -1169.57320372, -130.422794776, -920.220854053, -492.618653934, 83.6959082565, 120.090421337, 1173.44909332, 163.742191369, 599.760621833, 772.495761603, -220.79054368, -537.4899296, -106.915976554, 455.484130039, 583.270119349 +1173.44162709, -611.435290914, -537.077773244, 493.386312139, 137.96817789, -54.850722119, 222.443575413, -1147.23329061, -204.680261646, -189.085717961, -210.60453841, 841.377576584, -362.215299268, 272.565685425, -947.924502372, 504.696322441, -487.708104279, -1134.4141702, 784.434173201, -873.114786237, 407.426951787, 690.299128714, -833.661993041, 1022.51488787, 1055.44192325 +1129.50547382, 485.25642838, -119.697921007, -864.020811503, -617.095428716, 248.331411656, -823.93277828, -329.362982103, 518.216649328, 128.26766163, 404.985011133, 609.298960915, 888.858258644, -188.66061324, -388.278282106, -1160.72159697, -129.696246638, -508.504754319, 78.0520249631, -562.420201317, -1041.4967277, 920.601921845, 834.796471611, 1084.35125577, -912.540295325 +-451.176203721, 1172.27128702, 625.672912724, -10.5261926132, 686.083091199, -417.3253302, -142.444838449, -79.1938743397, 649.190783076, -1172.99087075, -387.196861049, -947.981444438, 476.453616483, -826.529837358, 291.051140926, -327.510045115, 1082.33481566, 469.160696125, -829.505450625, 1041.02167794, 220.460234348, 13.0103132105, 760.309589863, -967.193715472, -700.416029509 +241.004481515, -830.052515427, 150.514913455, -486.136867881, 779.020778072, 158.596470704, 513.858452301, 1171.4021871, -1075.19234181, -771.631383205, -498.51069105, -168.720281336, 730.691757913, -1171.17824625, -105.893611196, 1049.52258028, 1092.35038442, 790.830417252, -75.0562493587, 283.845444873, -462.401176781, 591.549370013, -382.289039619, -1031.53801462, -775.734117968 +5.27958559583, -287.628090599, -252.475740952, 807.651017741, 325.647686641, 899.733011602, 1147.80090162, -623.900900375, -1079.96930005, -637.190305765, 912.970068802, -318.750837703, -1167.94125543, -852.75137473, 1141.17476609, -751.40628743, -918.056622795, 177.902858266, 576.449044152, 612.510355741, -407.828374364, 135.484258494, -1.84992384262, 435.987126208, 385.751520814 +-573.647938573, 66.1876013221, 273.844979407, -356.754145526, 1134.68476684, -1113.50456517, 871.89221185, 655.122859212, 707.987561434, 415.99777689, -844.062576658, -577.806238184, 559.71160997, 262.410167003, -61.2397881616, -867.359887908, -535.08320678, 974.707384885, 376.289951195, -110.42311526, -279.895190874, 1157.68578736, -113.586321072, -1163.15656253, -968.846464084 +480.864486104, 5.62233551547, -503.770104408, 234.93057771, 1173.51124175, -839.53994182, -158.949131445, 529.795810378, -1168.62308554, 154.655614309, -1100.90310441, -693.496928902, -74.052812495, 777.166597801, -789.464240943, 753.319746777, -307.447280763, 864.191865514, 1023.52473332, 432.816958421, -1023.61286897, 128.829583439, -374.825881537, 1079.911094, -542.149057066 +-691.936040537, 656.009986162, 306.718451407, 663.610668401, 1169.33131185, -1169.2530584, -264.508018187, -878.732049209, 231.504040987, -590.497292886, 1011.58498072, 1067.77828916, 382.203366354, -993.431272672, 341.878288644, -377.468732862, -214.534260008, -1097.85285124, 19.8214806067, -746.393246931, -241.813351889, 785.861176651, -73.1375544644, -622.496716956, 793.327985087 +-402.22191927, 284.880511337, 358.699222586, 881.900601903, -19.8749506085, 1130.78897092, 589.483757825, -771.901159733, -252.374698363, 686.128436788, -825.946910344, 73.5215252107, -1134.28307643, 863.958786536, 1114.21053938, -1145.17384417, -111.177653014, -717.969073505, -946.612013038, -689.182083905, 764.822220758, 394.61326747, -347.305745081, -283.51527164, 36.2351604874 diff --git a/code/plots/data/bins-convergence/50_4/turbineY.txt b/code/plots/data/bins-convergence/50_4/turbineY.txt new file mode 100644 index 0000000..a1604fb --- /dev/null +++ b/code/plots/data/bins-convergence/50_4/turbineY.txt @@ -0,0 +1,10 @@ +-770.777132912, -678.400738511, -234.745575152, -528.714969608, -133.156078908, 909.694508469, 410.352926853, -1047.96946576, 532.581828518, 199.82979285, -96.0965242911, 250.671503997, 728.237761864, 358.681582814, -1170.52620918, -645.76384137, -12.417370013, 1093.89827987, 126.939355919, 883.39470617, -915.665478221, 1043.18769418, 1168.63379622, -490.042266291, -1018.29869841 +-13.067258661, -1001.64004379, 732.85669612, -1064.75623944, -908.763642688, -181.904872647, 355.331611358, -246.965032805, 1155.52667206, -1158.18070251, 553.456683143, 117.184138795, -602.76857535, 1141.42187201, -691.791186077, 680.88358719, -6.89160547237, 300.400402878, -872.810987423, 784.09602329, -256.801742778, 949.011605853, 86.7196824964, 575.846511614, -513.009034549 +318.360491971, 191.208526145, 1167.39382817, -230.740997954, 998.16291278, 1072.52988067, 368.843389855, 400.921274666, -399.445992561, -1004.50436589, -1101.41870644, 933.602973643, 766.202995883, 800.728750493, -42.7295808208, -172.80557881, -868.607368151, -616.408205041, 71.2110567205, -1029.960915, 540.759158466, -29.5649712905, -824.773146204, -448.686163998, -737.838902296 +603.804057193, 53.9992705573, -225.044453239, -1173.46712389, -647.461436194, -1096.80237981, -539.315364823, 940.323560172, -977.592562756, 35.047235509, 1107.79713052, -146.414296631, 227.148674626, 833.057212646, 1136.8487696, 3.68753244448, -453.527549775, 682.545641262, 359.326177194, 541.673109587, -760.761175568, 360.683971872, 893.904479879, -664.584237202, -941.569581705 +157.304581333, 365.894332859, -593.942248013, -1067.08600949, -318.830414378, 1162.74824688, 1054.82319937, 70.3762355093, 470.209875833, 884.149817719, 291.757109133, -1161.3222563, -918.273082546, -74.0096707535, 51.0469639827, 525.01262112, -428.843250409, 867.019714485, 880.101803803, -1138.66925574, -427.109963327, 327.564684319, 1109.50039905, -559.522319241, -880.552367381 +-1173.50300966, -898.540817072, 730.897375876, -73.5798979861, 650.48126651, -753.404477261, -244.313707732, 285.000695143, 459.132828717, -660.822453332, 737.307277199, 1129.39556037, -114.235647802, -806.195922746, 273.601873814, 901.403029105, -186.053239939, 1159.95108748, -612.877308785, 1000.98307868, -303.600138437, -515.074754531, 192.474791734, -1089.51922692, 33.1610446522 +520.620672392, -338.280462988, 592.67195382, -88.9209056509, 299.376817614, -370.464447388, 785.455196199, -973.627430212, 418.666651455, 1097.30673745, -119.789762603, 1021.40875973, -516.8490023, -1143.79928233, 730.292111186, -790.457637451, -1044.4241875, -653.515887176, 48.3098672673, 1168.30812382, -712.61944497, -192.093490264, -1168.00431515, 155.573286514, 662.172526476 +119.626076676, 1173.50086881, 156.588992117, -1000.3717765, 2.72741750852, 819.945358084, -250.002520218, -1047.11626092, -107.033765317, 201.198598317, 406.385162283, -946.677526627, -894.106752355, 64.3068320725, -242.044706932, 899.802896133, 844.705870496, -793.919598906, 574.049821427, 1090.78202833, -573.89266493, 699.00597551, -1112.04427375, -459.268907439, 1040.7739061 +-221.975541626, -456.482929174, 1126.95917577, 967.862019651, 98.9966142706, 99.9181815029, -1062.94334279, -777.796293623, -387.305098642, -969.907408792, 594.837924361, -486.811957139, -1109.52986537, 624.684099291, 532.26158675, 469.226423599, 1153.73786165, -414.554015381, -1173.34706978, 519.096490468, -311.300562232, -871.52631194, 363.26570713, 994.803381512, 193.661661685 +-671.068457119, 78.0962357753, 892.890577364, 774.201092806, -316.526549779, 313.770982201, -120.815924696, 508.561353425, 530.468680134, 469.280057315, 833.635255277, -988.580722852, 300.895014171, -234.389577115, -368.335557242, -256.344998612, 186.493360824, -846.869247164, -693.586106775, -43.915649237, -890.046746654, -1105.17702958, 1120.94366203, -1138.75150207, 1118.46303671 diff --git a/code/plots/data/bins-convergence/50_5/AEP_opt.txt b/code/plots/data/bins-convergence/50_5/AEP_opt.txt new file mode 100644 index 0000000..2ac1683 --- /dev/null +++ b/code/plots/data/bins-convergence/50_5/AEP_opt.txt @@ -0,0 +1,10 @@ +349874.08626 +348836.595464 +348556.815779 +347556.244355 +349832.864889 +347381.047363 +348208.779971 +347141.570979 +349382.047523 +347264.452203 diff --git a/code/plots/data/bins-convergence/50_5/AEP_true.txt b/code/plots/data/bins-convergence/50_5/AEP_true.txt new file mode 100644 index 0000000..96525ea --- /dev/null +++ b/code/plots/data/bins-convergence/50_5/AEP_true.txt @@ -0,0 +1,10 @@ +384052.808629 +383527.440868 +382820.481872 +381991.111282 +384307.75046 +381865.839072 +382403.291031 +381636.644977 +384043.176003 +381390.20801 diff --git a/code/plots/data/bins-convergence/50_5/boundary.txt b/code/plots/data/bins-convergence/50_5/boundary.txt new file mode 100644 index 0000000..34f9d58 --- /dev/null +++ b/code/plots/data/bins-convergence/50_5/boundary.txt @@ -0,0 +1,10 @@ +-0.00250854129422 +-0.00294905538021 +-0.0018414952217 +-0.00119412226672 +-0.00283645310355 +-0.00262216841543 +-0.00148660422315 +-0.0037390031539 +-0.00238812616249 +-0.000667060989372 diff --git a/code/plots/data/bins-convergence/50_5/separation.txt b/code/plots/data/bins-convergence/50_5/separation.txt new file mode 100644 index 0000000..0361733 --- /dev/null +++ b/code/plots/data/bins-convergence/50_5/separation.txt @@ -0,0 +1,10 @@ +0.00242094835266 +3568.32534281 +2.57312003593 +36370.3445036 +0.083165425589 +2.36077519102 +423.877597973 +265.976473092 +1763.058293 +1.03707483444 diff --git a/code/plots/data/bins-convergence/50_5/turbineX.txt b/code/plots/data/bins-convergence/50_5/turbineX.txt new file mode 100644 index 0000000..e56fa3d --- /dev/null +++ b/code/plots/data/bins-convergence/50_5/turbineX.txt @@ -0,0 +1,10 @@ +-795.003584382, 853.869260887, -1033.5520417, -398.274100092, 906.076155564, 182.505790643, -769.269681186, -569.292980626, 1031.2558025, 64.0474652025, -1173.42474308, -218.909471734, -1020.85985523, -493.436004019, -77.2454473708, 191.688635644, 1145.7422047, 379.502329491, 648.961526161, 718.618017149, -329.011078671, -517.012025232, -171.312800522, 375.466112557, 519.880973379 +1141.57427126, -620.076875417, -545.781769831, 389.892392151, 18.2041784209, 187.046809819, 359.28128959, -1169.75875385, -119.090969169, -321.956061121, -216.167385052, 838.9784505, -262.392945606, 215.910160581, -978.918630207, 742.653425093, -643.645206957, -984.169218347, 772.053205169, -595.963875032, 544.312054113, 509.870434562, -845.849635192, 970.197380652, 1112.19151322 +1051.69255412, 789.703082867, 3.37449135075, -1171.85831449, -511.13114114, 308.48736931, -790.535385746, -256.240793432, 466.096931531, -198.436517837, 190.55801454, 548.381549958, 775.592223019, -139.495188545, -396.813691412, -1105.90952894, 49.9141620784, -604.125322952, 309.992053743, -489.186907815, -1033.61850275, 939.208779007, 758.514025543, 1112.97676059, -802.622256862 +-341.837608913, 1173.40080419, 593.164455865, -126.611343351, 615.36220166, -562.53814338, -276.786919954, 135.994358362, 617.648709369, -1071.45987742, -268.983311724, -1173.30331755, 549.688660056, -754.506469995, 318.122621255, -462.257161069, 1064.37375556, 446.047365223, -655.783190995, 1038.69190916, 236.341603536, -14.4527250312, 729.818315443, -1048.9804681, -821.602540883 +104.97799427, -763.846651405, 357.212134882, -418.123766346, 707.108532113, 273.609006616, 598.171914062, 879.876318406, -1095.69237533, -739.221774781, -408.337632838, -152.49564492, 559.210006614, -1156.80013695, -38.5141104532, 1172.08788061, 1004.56745706, 917.601633918, -130.99303463, 165.342217775, -702.365080605, 491.138060215, -280.64531547, -932.754719239, -654.22321945 +53.2981332002, -323.420443592, -83.8173714173, 648.745597698, 547.89987098, 733.029160376, 1093.4092562, -657.137495932, -985.743563427, -564.250821441, 1042.16241177, 109.127039735, -1084.67399808, -810.687768366, 1170.40733344, -489.655750014, -1168.35330094, 475.961877248, 471.723946308, 798.035035076, -781.865275321, -40.6785153566, -274.066355416, 124.929244148, 274.972377198 +-557.48689879, 194.325827104, 335.685262767, -526.620430158, 1110.18024369, -991.82922223, 879.752659223, 49.6783905884, 685.995125883, 223.254646143, -1167.72560776, -512.489302684, 679.951455775, 448.319915189, 41.1050256119, -743.163179884, -517.222590346, 961.096018645, 467.307211854, -205.21682378, -102.356908908, 1168.92944627, -273.979857032, -1092.53386084, -840.610732335 +592.15475178, 1.30723760814, -683.982543982, 309.835842023, 1165.34440273, -870.337601997, -137.16168481, 374.748164108, -1160.34401417, 148.516488955, -1098.46353086, -492.321701908, 233.178990045, 787.027216454, -829.963290869, 703.940915987, -329.417927523, 766.983708771, 985.977708334, 428.231689786, -930.815880394, 62.1932781784, -356.620481431, 1069.70195829, -562.944076612 +-592.4402116, 727.39634372, 202.674997398, 488.093537098, 1171.68519449, -1173.28804353, -237.672435941, -759.206930216, 218.222487004, -486.40455368, 981.375192514, 1042.4882319, 351.610726288, -998.971397143, 729.961653139, -406.4323779, -218.319404176, -1065.46831341, 55.0163412426, -752.118405896, -198.687884741, 621.735551613, 30.090718999, -592.685778593, 835.214941012 +-199.38344145, 345.717769273, 377.737787553, 940.41931781, 100.599429491, 1147.73094884, 603.234807502, -694.532682035, -68.8021786372, 677.566459106, -928.435470149, 206.363759351, -1143.87916039, 847.185921652, 1114.26438677, -1119.71800502, 29.9125335568, -549.393628208, -909.269177913, -470.144704267, 727.864738274, 280.921349044, -350.940550166, -473.2266063, -205.742494905 diff --git a/code/plots/data/bins-convergence/50_5/turbineY.txt b/code/plots/data/bins-convergence/50_5/turbineY.txt new file mode 100644 index 0000000..3e62444 --- /dev/null +++ b/code/plots/data/bins-convergence/50_5/turbineY.txt @@ -0,0 +1,10 @@ +-863.194759749, -805.011373035, -555.793215476, -397.523371058, -152.998573208, 1159.23611642, 467.482198079, -1006.72963407, 560.042295998, 120.030881578, -14.5267679909, 231.142854857, 578.775732714, 348.2835929, -1170.96956862, -1157.75271936, -253.796423917, 776.468899584, -60.3863138954, 927.755315069, -1106.05370526, 1053.48724351, 975.845553806, 28.6557882564, -1052.07426151 +271.929217683, -956.882068986, 466.29745189, -1106.85132887, -1173.37331943, -20.1668893494, 450.590113904, -93.8331787149, 1167.45588604, -1128.48609295, 303.069552325, -264.346396686, -350.975039026, 1138.18447708, -647.18962172, 866.829379772, -491.961136684, 639.176903159, -883.781543063, 1010.92185105, -151.413527311, 997.138261519, 144.72453399, 660.196831019, -374.38740568 +520.652210147, -234.329459416, 1173.50956162, 62.3305030397, 1056.35329829, 1107.34869783, 415.497437422, 271.152725888, -758.645849275, -1156.61600053, -1157.93952877, 1007.08227667, 880.678309305, 722.570792915, -107.495587853, -392.556748461, -579.281239494, -473.375917671, 50.5178941864, -1048.54994672, 555.670195724, 143.680769129, -895.428609924, -372.046532426, -856.117822744 +553.657429345, 16.3256069568, -246.709371201, -1166.6654456, -622.372942141, -1029.89647536, -697.479739412, 747.250424876, -997.82175636, 478.655337633, 1142.271621, -22.2849859416, 158.877406189, 898.809196849, 1129.57264778, -190.565791731, -494.213653952, 632.455072122, 355.472636815, 546.128120368, -913.875003512, 238.74753302, 918.967511754, -526.095000185, -837.917355533 +531.264131881, 255.871270491, -356.910062431, -1083.12312401, -488.250899406, 1141.17229744, 1009.61719312, 192.427693827, 420.231369699, 911.422726947, 38.0794458893, -1163.56437019, -1031.70779869, -197.356887198, -168.853750742, 57.9011999091, -606.613844894, 731.535069547, 1166.18063569, -1161.80870509, -339.051283839, 342.695630721, 708.04014497, -712.113178046, -974.232668007 +-766.496054133, -626.074917443, 823.987590805, -135.482475386, 456.63300445, -916.410600555, -426.136546089, 503.284103266, 636.746867053, -765.590199076, 539.475271797, 1168.43035002, -447.911111486, -848.482852344, 85.3411056291, 1066.47791273, 109.948843638, 1072.65903217, -844.283792709, 860.392928687, -121.178476573, -382.630601517, 342.150989577, -1166.84556681, 45.8953333755 +599.593173352, -275.045890014, 647.947386592, -197.802257885, 380.310169986, -627.225784913, 776.643186592, -1172.46320471, 497.74159127, 1152.08223998, -116.416608551, 1055.69437608, -551.803140328, -1084.50380654, 762.152671576, -908.209497061, -1038.49659388, -673.373364669, 140.891192899, 893.124329913, -575.533355429, -103.633746745, -1141.08338692, 428.377055232, 511.257178935 +-93.6080367603, 1173.51400707, 113.719183818, -788.619495815, 138.232866984, 787.17755439, -414.022813856, -1112.07072934, -175.325189991, 328.506598957, 412.9376266, -535.677883419, -448.254918793, 253.787866512, -322.624702048, 938.937207442, 914.212461305, -888.185650201, 636.383793128, 1092.59028301, -714.646097929, 746.234999244, -1118.01511212, -482.578892586, 1029.67463764 +-313.386235449, -388.50464325, 1155.8822212, 1017.78130524, 65.4965104912, 23.0780493941, -1142.73221498, -894.842706505, -78.8059490437, -1056.15628358, 643.460573649, -538.845309028, -820.66620153, 615.790259977, 884.13038564, 427.377908027, 1153.02756804, -491.846893746, -1172.22399483, 520.775920337, -195.239507348, -995.279276184, 361.883903149, 1012.84733354, 171.18919097 +-753.874006157, 46.2142762557, 1111.0587838, 701.959851101, -357.526926921, 244.644897855, -77.3026393013, 604.19853358, 582.629934206, 923.163942849, 717.734971728, -824.55337051, 262.061749341, -210.998297404, -368.172490034, -351.237293225, 157.490079419, -591.348876539, -741.866409754, 205.593224446, -920.515521957, -1139.39426736, 1119.81111917, -1073.86802959, 884.196367965 diff --git a/code/plots/data/bins-convergence/50_6/AEP_opt.txt b/code/plots/data/bins-convergence/50_6/AEP_opt.txt new file mode 100644 index 0000000..d335b0c --- /dev/null +++ b/code/plots/data/bins-convergence/50_6/AEP_opt.txt @@ -0,0 +1,10 @@ +355702.881768 +355880.63578 +354554.483248 +355898.568065 +356581.282209 +355723.690997 +355524.618025 +356429.026907 +356251.019148 +355689.095505 diff --git a/code/plots/data/bins-convergence/50_6/AEP_true.txt b/code/plots/data/bins-convergence/50_6/AEP_true.txt new file mode 100644 index 0000000..53bff3d --- /dev/null +++ b/code/plots/data/bins-convergence/50_6/AEP_true.txt @@ -0,0 +1,10 @@ +381944.984969 +382300.677139 +379439.68948 +382197.132426 +383282.63913 +381833.356278 +381391.652005 +382909.275592 +382630.00997 +381975.718729 diff --git a/code/plots/data/bins-convergence/50_6/boundary.txt b/code/plots/data/bins-convergence/50_6/boundary.txt new file mode 100644 index 0000000..75c2a20 --- /dev/null +++ b/code/plots/data/bins-convergence/50_6/boundary.txt @@ -0,0 +1,10 @@ +-0.00369440103736 +-0.0066598263752 +-0.000111114359697 +-0.00251523929751 +-0.00115846666722 +-0.00242094365149 +-0.00015392585351 +-0.00104775664727 +-0.00204986334984 +-0.000752795241851 diff --git a/code/plots/data/bins-convergence/50_6/separation.txt b/code/plots/data/bins-convergence/50_6/separation.txt new file mode 100644 index 0000000..da0102e --- /dev/null +++ b/code/plots/data/bins-convergence/50_6/separation.txt @@ -0,0 +1,10 @@ +13197.8779006 +31232.6174482 +42148.4187465 +24851.8144556 +30662.2365552 +49165.9725657 +16132.4724134 +28423.4822001 +62073.9622507 +0.0012925544579 diff --git a/code/plots/data/bins-convergence/50_6/turbineX.txt b/code/plots/data/bins-convergence/50_6/turbineX.txt new file mode 100644 index 0000000..3c7b1b3 --- /dev/null +++ b/code/plots/data/bins-convergence/50_6/turbineX.txt @@ -0,0 +1,10 @@ +-822.072476654, 870.40211382, -1125.47746578, -677.26661162, 903.026171456, 377.688194584, -848.448199268, -448.707990407, 1012.95187482, 275.564588078, -1171.38301993, -217.412573556, -978.157953261, -491.764370477, -65.5606291804, 17.3761687107, 1152.74801819, 81.6623071482, 707.434951982, 691.265488464, -307.786697058, -587.514572791, -116.142884241, 385.931605226, 425.061193503 +1167.90350663, -584.556555625, -449.770684881, 340.654031319, 100.893047982, -82.045177847, 219.132765349, -1158.58069877, -135.397103656, -144.166010314, -124.854477166, 854.73037453, -619.347841029, 232.04183199, -965.462598118, 585.919173026, -519.809801179, -1103.33873533, 766.370747587, -755.727744636, 468.855259271, 640.226146057, -820.597859772, 999.076584583, 1110.25480125 +1015.9093183, 554.251232483, -81.9099522638, -926.390292581, -534.880215882, 228.10744062, -837.848810876, -318.50958447, 560.378434766, -215.028196994, 208.071530627, 520.38265752, 795.455755078, -151.954617604, -8.87503713691, -1142.7813657, 26.2891848693, -621.717387008, 104.589560248, -542.551979656, -866.797908592, 705.606514921, 677.957555148, 1145.99718182, -874.62707767 +-333.034495123, 1159.65505353, 469.821429901, -149.597057152, 417.714379576, -585.965347753, -359.010142029, 144.286215162, 685.459599452, -1049.57603649, -238.266389423, -1172.49317794, 767.670621556, -727.637283651, 340.98693485, -492.155208432, 927.560570953, 453.461740736, -697.115746881, 1095.9727517, 41.953311405, 3.84970755698, 763.854511927, -1095.94197883, -872.138538986 +194.866181994, -797.372183928, 229.640011854, -503.589822514, 737.578001112, 248.911565888, 569.416859409, 1018.85359019, -1079.00219645, -669.934901328, -513.578351616, -163.51641224, 641.127440151, -1168.68549115, -93.5465195022, 1088.46615649, 1094.84126127, 851.798766319, -294.878695848, 202.834499246, -381.227992398, 607.358192384, -99.8410469419, -1041.69320932, -785.222927957 +-114.685120051, -239.843438684, -65.7112319959, 575.100140279, 434.653217402, 1020.77539526, 918.835523865, -679.115149327, -1046.96247772, -367.307565164, 1011.61374074, -281.517495063, -1046.15492843, -702.893583668, 1166.795457, -717.770873748, -1172.7428779, 334.299919286, 600.679859956, 770.789523612, -714.310451331, 287.21558231, -254.142623614, 483.958072955, 121.718047295 +-413.02488318, 215.374765684, 339.974209034, -377.139979017, 1143.24940092, -1074.87778139, 807.21850795, 233.215064142, 748.199869051, 455.482230351, -884.931594272, -457.196941477, 723.674007199, 531.011517011, 4.19396940487, -787.659152636, -477.049974343, 1004.5978446, 650.264084867, -30.2447352336, -163.57208288, 1159.56616718, -24.360635825, -1042.97721676, -736.209906883 +684.990648647, -35.027037232, -575.240862571, 579.417955832, 1173.51411722, -946.70800364, -194.581243318, 31.7390177327, -1171.44060529, 217.519511321, -1124.33500664, -420.877516293, 262.841507021, 720.720409029, -768.425762102, 679.366429623, -292.658557101, 893.429646421, 1090.11402978, 358.976425206, -1050.29074609, 88.0919563335, -425.766629494, 1101.27165867, -594.917427549 +-722.62662448, 752.275836342, 37.6172693216, 391.482760707, 1082.15108374, -1148.36668265, -405.162732855, -559.714211313, 331.870996394, -815.098857223, 744.024676693, 1164.81374015, 422.092479163, -973.14563589, 441.157259838, -202.413845512, -323.091990457, -1140.22295496, -49.6961272351, -573.326162669, -145.89933753, 818.770862646, 158.565012211, -669.942787415, 778.508254643 +-251.288789098, 399.722942169, 397.683751115, 706.548324322, 59.5469111835, 1106.74393756, 488.778979943, -609.432067828, -241.373363489, 845.969643132, -847.622954685, 45.5146092567, -1123.26432936, 934.364959109, 1090.43736796, -1153.01316791, -143.416243378, -653.121978067, -970.165310614, -650.190827107, 764.686589275, 373.851030113, -334.48558652, -574.626763034, 69.5566687102 diff --git a/code/plots/data/bins-convergence/50_6/turbineY.txt b/code/plots/data/bins-convergence/50_6/turbineY.txt new file mode 100644 index 0000000..61e08bb --- /dev/null +++ b/code/plots/data/bins-convergence/50_6/turbineY.txt @@ -0,0 +1,10 @@ +-837.456152483, -787.111632948, -332.319935806, -387.752415369, -84.0088415131, 1110.35839426, 312.8675182, -1084.34179622, 592.506930831, 100.58399619, 70.6951808608, 124.118304683, 648.33857697, 239.388009816, -1171.68160624, -706.755316311, -219.791304174, 643.259441495, 215.55232361, 948.308425155, -573.225179726, 1015.8556374, 1167.75312915, -438.951810572, -1093.8276301 +114.63703428, -941.346871675, 750.655443306, -1122.98506169, -716.380579933, -190.114212193, 367.68248349, -186.627743283, 1165.67951977, -1164.62587278, 619.076041883, 142.11806005, -497.902976371, 1083.34190444, -667.098579749, 485.567785481, 0.291424214876, 399.73614723, -888.722341159, 897.782988889, -285.066867659, 983.482668309, 179.045672767, 615.616342702, -380.092620603 +587.421614134, -55.1321455511, 1170.65224364, 12.0007117824, 1044.5282701, 895.865633813, 413.401081844, 327.222728381, -542.349545048, -1153.64586195, -1154.92086525, 1051.82593752, 862.778113245, 803.80572742, -281.874464577, -266.808251728, -735.328661787, -414.172969996, 194.950461401, -963.351290293, 791.07350925, 389.811750711, -957.867134041, -252.638811076, -782.40886094 +609.436951768, -179.824878003, -243.193668851, -1163.94126462, -808.4152419, -1016.75287369, -584.901606048, 747.997146473, -952.513512845, 524.907586969, 1149.07249992, 48.9684573524, 118.235040192, 920.697579737, 1122.88308206, -103.002594528, -628.42268288, 545.280899469, 411.499540675, 419.499663513, -776.723985528, 202.19804717, 890.878412627, -419.58428331, -785.181813614 +420.504146893, 323.753314441, -471.878408795, -1059.96863586, -581.73164464, 1146.81250967, 1026.10982569, -14.9643878676, 461.40059048, 963.495994344, 107.829516901, -1162.06656764, -982.899546297, -106.361803854, -63.3476355992, 438.609219745, -422.445032413, 807.202087854, 758.583502023, -1155.85212338, -488.952341566, 253.198744989, 1169.25945481, -540.381128642, -872.10166588 +-1167.89754215, -376.382664828, 867.666695992, 7.82471561855, 730.926497833, -578.927794638, -207.212706792, 394.626783257, 530.099916753, -875.31762579, 594.793420583, 1139.24800555, -531.694070981, -939.722569316, 125.401734939, 928.407731688, -42.5528405559, 1124.89208804, -707.243387248, 884.884523267, -228.506879272, -488.60433319, 239.416379937, -1069.07466399, 162.375424042 +338.854716737, -193.641832671, 500.323606274, -226.041041769, 264.795661806, -470.928537326, 851.783089062, -834.445542327, 369.825093045, 1081.51368877, -153.671001606, 1080.78991943, -537.178383951, -1046.50036566, 735.005790122, -869.901712787, -1072.17499681, -606.563324623, -34.7443454504, 1173.1246068, -672.423795213, -180.394582974, -1173.26161289, 537.898147571, 457.44391894 +-137.914622709, 1172.99153119, 187.231727053, -1020.49544547, 1.179255841, 693.455049358, -264.167073123, -1173.08504798, -69.7383990918, 28.6080954451, 336.164674891, -733.016387066, -796.015561511, 513.099007991, -652.22286353, 956.868535465, 822.351306514, -760.867803795, 434.497739548, 1117.26087594, -523.476550945, 533.047781009, -1093.55323793, -405.384727073, 1011.53858659 +-80.3448425564, -425.380690896, 1172.91140225, 1106.17927912, 453.971072467, 241.647221703, -1101.35341519, -489.452924584, -421.217658758, -844.245285236, 907.504675034, -142.648537043, -1094.97667147, 655.839335036, 584.547301851, 221.911182057, 1128.1612164, -277.543659292, -1172.46250334, 444.355394599, -608.603690094, -840.685517462, 155.318201651, 963.491101086, 184.310165222 +-899.678117619, 93.6805142644, 1104.07625747, 936.977432914, -375.898609772, 390.197265018, -366.496615144, 707.350107553, 597.110382287, 564.829666267, 811.585910956, -1056.9075611, 339.727692143, -107.66152906, -433.685953487, -218.39645326, 128.834798791, -534.269459709, -660.238725807, 204.186110553, -890.163115004, -1112.37193287, 1124.83575918, -1023.20107722, 1063.33445931 diff --git a/code/plots/data/bins-convergence/5_1/AEP_opt.txt b/code/plots/data/bins-convergence/5_1/AEP_opt.txt new file mode 100644 index 0000000..5d0d800 --- /dev/null +++ b/code/plots/data/bins-convergence/5_1/AEP_opt.txt @@ -0,0 +1,10 @@ +451875.947635 +455284.498466 +454609.280713 +458693.094877 +452207.845553 +450335.250625 +454255.340048 +460676.461783 +450768.962655 +451818.132392 diff --git a/code/plots/data/bins-convergence/5_1/AEP_true.txt b/code/plots/data/bins-convergence/5_1/AEP_true.txt new file mode 100644 index 0000000..66fe84f --- /dev/null +++ b/code/plots/data/bins-convergence/5_1/AEP_true.txt @@ -0,0 +1,10 @@ +374264.396396 +375575.644675 +373542.070855 +374933.255504 +374189.031939 +372932.956813 +375973.394744 +378098.714127 +372859.906809 +375593.552152 diff --git a/code/plots/data/bins-convergence/5_1/boundary.txt b/code/plots/data/bins-convergence/5_1/boundary.txt new file mode 100644 index 0000000..a1d0382 --- /dev/null +++ b/code/plots/data/bins-convergence/5_1/boundary.txt @@ -0,0 +1,10 @@ +-0.000396259783656 +-3.12194099479e-05 +-3.21304053159e-05 +-1.21857010527e-06 +-0.00156358674644 +-6.08136365372e-05 +-0.00010670595293 +-0.000818980086478 +-0.000122276454704 +-0.000614845303289 diff --git a/code/plots/data/bins-convergence/5_1/separation.txt b/code/plots/data/bins-convergence/5_1/separation.txt new file mode 100644 index 0000000..1e91958 --- /dev/null +++ b/code/plots/data/bins-convergence/5_1/separation.txt @@ -0,0 +1,10 @@ +0.02050178629 +0.000329162168782 +6.94690534147e-05 +4.39643918071e-06 +2.27339915e-05 +3.88331682188e-05 +0.0263958097494 +0.000313276919769 +0.000388967149775 +6.86125567881e-05 diff --git a/code/plots/data/bins-convergence/5_1/turbineX.txt b/code/plots/data/bins-convergence/5_1/turbineX.txt new file mode 100644 index 0000000..a96ffed --- /dev/null +++ b/code/plots/data/bins-convergence/5_1/turbineX.txt @@ -0,0 +1,10 @@ +-922.76247117, 811.262807543, -783.786037466, -426.861182763, 936.893029365, 411.355646069, -563.960844681, -610.25558866, 1054.7437427, 271.434563443, -1160.9664561, -162.719568986, -1018.0404046, -298.29090047, -17.6686629255, 143.544578001, 1171.74220456, 78.5355274514, 561.692303064, 709.297181907, -289.769045348, -691.390145152, -42.5159119404, 416.624940269, 666.899646278 +1170.23857269, -553.082922613, -508.334045676, 503.462722899, 255.938854081, 80.7768611948, 230.387776585, -894.684642247, -211.231259481, -78.6358592186, -76.8365393213, 652.185672344, -236.581814779, 91.4432995268, -1150.0523028, 520.693860038, -369.091315922, -1031.06299451, 795.392562084, -632.908042997, 391.236224511, 784.845783042, -762.033536867, 1054.00364313, 941.746226265 +1132.94868778, 604.050755727, 61.0762204122, -899.411491751, -644.599691843, 192.932750533, -775.382226058, -206.824274868, 470.100623636, 92.0089680081, 260.091201342, 730.203191233, 1008.31306104, -73.3705674473, -329.073365476, -1159.68224029, -78.5121966392, -456.123385754, 333.839352565, -615.431007174, -521.548776206, 866.635458243, 758.450486456, 995.776226306, -1033.83306065 +-371.890198664, 1168.23337629, 862.291785851, 76.7882037369, 563.222031381, -394.450299103, -110.894080762, -80.426269592, 705.147139559, -1047.53914928, -498.382058496, -909.651007184, 498.829682799, -782.164735616, 241.523563859, -234.885767989, 1001.88951078, 371.940611325, -657.515725417, 1039.70173724, 241.93467271, 53.1893068887, 708.623258743, -1166.92990878, -551.573847344 +324.997236738, -931.168573599, 85.6785878842, -557.249367846, 792.161776438, 182.213122181, 454.034123537, 924.870909011, -1049.66422231, -702.164222192, -294.601635904, -267.904543207, 542.401283174, -1164.32614196, -142.917623473, 1044.01885541, 1162.64671576, 712.154646882, -49.6755467491, 249.021119134, -420.834683582, 591.53911589, -574.685448049, -848.864219253, -713.651438931 +-77.1077173968, -373.048930189, -129.210345016, 590.717450973, 430.071259535, 1001.11756674, 872.35293997, -635.061016135, -1046.64099046, -509.006269488, 1039.40852402, -460.396199453, -1167.32963392, -763.924949648, 1163.96798566, -776.893364247, -914.805585165, 159.706865332, 726.021159005, 551.191274988, -244.594575422, 143.579811149, 0.719778822314, 841.72434036, 304.49572078 +-372.477523004, 229.223497884, 242.374688542, -242.955978218, 819.160512907, -1048.16268053, 1016.42987861, 696.859094399, 677.638981448, 111.524324959, -920.510268651, -511.762323646, 548.275177027, 414.150884689, -14.4293008001, -675.933259606, -529.445535614, 1118.57894247, 376.241312342, -165.1460244, -103.99016868, 936.205302837, 54.5283283899, -1171.06153958, -801.726803021 +249.488617885, 43.1103923935, -329.855985868, 105.677983516, 1036.24642468, -928.646776816, -208.820644505, 395.331804627, -1172.86807399, 522.948899714, -1051.31673531, -431.229793125, -50.3638360552, 914.282628458, -736.902212208, 656.687596468, -466.084464656, 829.785825076, 779.696438999, 384.324821056, -883.611623299, -86.1444226853, -580.825754594, 1159.34110303, -588.675641447 +-521.025979481, 608.999119155, 435.911614359, 743.70933545, 1155.67951273, -1009.28158385, 11.5202444172, -122.757905319, 420.386359607, -419.074403016, 1030.10763919, 1016.74856537, 544.465084515, -888.682713446, 306.308148634, -236.391392166, -377.462943904, -1134.62118484, 267.562298739, -650.328520503, 51.6103502937, 764.717392225, 177.667915276, -769.422938858, 890.311996824 +-216.152443188, 329.736422968, 192.087739342, 804.622418232, -80.6797711334, 1047.93152319, 560.085513155, -690.326404766, -336.005570159, 684.65822936, -866.831343397, 59.9401519821, -1021.07417049, 924.165206177, 1166.59179062, -1145.64944772, 61.2201312592, -735.734321747, -907.766684872, -571.934533427, 452.274207357, 202.735637521, -454.021984411, -395.570306213, -191.866642782 diff --git a/code/plots/data/bins-convergence/5_1/turbineY.txt b/code/plots/data/bins-convergence/5_1/turbineY.txt new file mode 100644 index 0000000..f82940a --- /dev/null +++ b/code/plots/data/bins-convergence/5_1/turbineY.txt @@ -0,0 +1,10 @@ +-725.014650486, -607.046844584, -499.894204427, -465.384632824, 216.518372096, 904.822677376, 53.2767853263, -1002.35947931, 514.442958581, 17.9505917196, 59.3092376821, 49.9923034302, 583.720590485, 271.84909188, -1091.78535579, -524.793106833, -64.4683505659, 580.845350754, 223.446300249, 934.897547279, -810.942411038, 948.21704203, 902.995088481, -337.291124901, -965.59888507 +87.6217940164, -1035.00491987, 480.972574987, -1060.02886934, -844.115027681, -265.470488791, 474.769568436, -46.9777816379, 1154.34712157, -1034.10642387, 463.132857575, 474.031032018, -418.845782588, 935.270129537, -233.485900383, 698.329724894, -2.52001239648, 513.552955532, -862.836361746, 870.219380045, -47.1286162738, 872.440849409, 283.044503849, 459.208909399, -376.512418449 +305.881084484, 33.5180198558, 1171.92388435, -135.342521819, 980.625886824, 947.839234164, 142.507092153, 88.5515772071, -333.726715272, -945.96460673, -1144.32882537, 576.813796764, 600.367112065, 461.015798816, -187.979092864, -179.646866771, -749.693027418, -529.92750664, 9.54914776672, -999.189969473, 751.587741026, 153.998376257, -895.482419061, -346.339034466, -555.27028955 +619.367511193, -111.205531299, -348.758279444, -1099.91486784, -634.963747158, -796.421724687, -738.37253502, 819.29988673, -938.031665786, 271.97471245, 1062.42704002, 51.5504391208, 342.636303014, 874.845253716, 1148.39116214, 179.148429051, -611.026431792, 569.570574435, 465.76128677, 544.202343041, -684.849435819, 360.442833583, 838.708782889, -124.138954666, -1035.80991627 +248.888413943, 293.301792732, -517.163256787, -1032.76839245, -202.294577541, 856.985087745, 892.474209191, 189.347674111, 524.729494747, 759.780025052, -73.0347437497, -840.016366673, -950.899461215, -146.570071165, -289.403518823, 535.874279046, -159.345381886, 932.723367957, 739.388377157, -1146.78937536, -521.332590621, 457.149592951, 1023.16968152, -522.458452329, -825.070192597 +-841.551040215, -597.949860681, 531.317187628, -150.739739058, 584.100330474, -612.29038041, -5.22559369665, 148.060825331, 421.552202101, -839.66532133, 544.762167577, 1079.43097617, -120.322191067, -890.81687547, 149.380551759, 879.529757063, 54.2760771689, 1162.59610447, -372.759798817, 906.133780469, -313.919864737, -319.430419103, 235.952957823, -817.701673731, 259.73609768 +108.929547341, -401.163969291, 608.167665517, -362.829844491, 151.723857057, -503.442110465, 586.520533747, -944.195855048, 369.833193238, 1168.2030932, -212.898100311, 1056.04697833, -730.491665705, -1098.00499117, 795.400398313, -740.237545445, -1047.29333507, -354.847942288, 160.5581233, 1108.73812445, -675.622459057, -151.028816764, -1116.11537146, 75.8341744185, 113.563699753 +-427.670865251, 1100.99338512, 261.258640109, -905.02728683, 47.1792111386, 717.461536022, -105.432451625, -1104.92020867, -38.9451338688, 355.857278919, 332.306304621, -632.43956921, -645.267807534, 350.60047465, -334.712351, 802.11713405, 706.308244145, -829.815219347, 573.056369381, 1108.79679287, -772.24764694, 729.817918038, -1019.6947269, -181.835418254, 1015.18319919 +-105.369631584, -123.545458647, 1089.54898129, 831.181522597, 203.816197649, -71.8241010517, -1172.43670172, -875.15687632, -570.641634609, -1096.1353158, 562.151481083, -585.967807478, -968.120074883, 766.406525215, 628.81505713, 84.2991632684, 302.699972364, -299.61783422, -1127.24235695, 120.198216518, -190.35892075, -829.957411814, 171.873460945, 535.371665174, 51.7448835041 +-650.57477699, -300.326468705, 608.198275974, 854.235763272, -303.426662887, 528.181245241, -179.747429612, 600.128486841, 373.180364717, 319.855488797, 791.036860825, -852.425288956, 388.861424912, 96.4283240837, -127.27740861, -254.211145017, 142.109836124, -258.430264083, -743.704901478, 113.742422014, -1082.85914797, -1155.86943651, 1082.12765394, -1104.83484051, 866.472441542 diff --git a/code/plots/data/bins-convergence/5_10/AEP_opt.txt b/code/plots/data/bins-convergence/5_10/AEP_opt.txt new file mode 100644 index 0000000..f0d515b --- /dev/null +++ b/code/plots/data/bins-convergence/5_10/AEP_opt.txt @@ -0,0 +1,10 @@ +371893.876963 +370252.139947 +366837.139657 +372330.532206 +375099.240386 +366346.848958 +370715.399777 +370706.789631 +370883.462285 +370948.307467 diff --git a/code/plots/data/bins-convergence/5_10/AEP_true.txt b/code/plots/data/bins-convergence/5_10/AEP_true.txt new file mode 100644 index 0000000..5f9be83 --- /dev/null +++ b/code/plots/data/bins-convergence/5_10/AEP_true.txt @@ -0,0 +1,10 @@ +374972.60279 +376058.251432 +369518.306272 +376617.957926 +378047.684424 +370561.606389 +376266.677409 +376642.829525 +373585.680234 +374367.554814 diff --git a/code/plots/data/bins-convergence/5_10/boundary.txt b/code/plots/data/bins-convergence/5_10/boundary.txt new file mode 100644 index 0000000..d72a870 --- /dev/null +++ b/code/plots/data/bins-convergence/5_10/boundary.txt @@ -0,0 +1,10 @@ +-0.0011616882814 +-0.000125969251485 +-8.08884515209e-05 +-0.000288272899752 +-0.000187868565718 +-9.85067345027e-07 +-0.000280869571725 +-0.000415039859718 +-0.00149349927142 +-0.000200714905759 diff --git a/code/plots/data/bins-convergence/5_10/separation.txt b/code/plots/data/bins-convergence/5_10/separation.txt new file mode 100644 index 0000000..298c639 --- /dev/null +++ b/code/plots/data/bins-convergence/5_10/separation.txt @@ -0,0 +1,10 @@ +4688.92069634 +0.00303631986026 +0.331841685038 +0.00144785705197 +0.0274063714605 +3.54205258191e-05 +24799.8402738 +0.00267811278172 +0.0655507677293 +0.00011354596063 diff --git a/code/plots/data/bins-convergence/5_10/turbineX.txt b/code/plots/data/bins-convergence/5_10/turbineX.txt new file mode 100644 index 0000000..45f9116 --- /dev/null +++ b/code/plots/data/bins-convergence/5_10/turbineX.txt @@ -0,0 +1,10 @@ +-906.303149158, 810.208628094, -1052.52329647, -544.394087002, 965.127792104, 463.147048825, -917.229990607, -686.827407947, 1112.21677407, 209.201242092, -1170.49906428, -266.22138232, -795.075560201, -397.41165348, -71.0097951143, 73.0868761056, 1090.63992698, -40.0501803506, 624.869869336, 739.790698282, -416.339719162, -679.16875271, -152.240532174, 333.24795912, 479.641252645 +1173.03535097, -704.793798893, -355.774377401, 412.424909378, 180.985633782, 44.28510434, 185.802308242, -912.199558219, -240.904051992, -227.315473272, -118.916091828, 683.324588219, -416.814850458, 21.9025121552, -1074.66171805, 445.190448262, -544.266184027, -1037.59556025, 580.867199919, -657.927192573, 310.150025601, 800.103946632, -783.935572503, 1063.33202129, 921.797460819 +1054.10698889, 489.720220069, 82.9527647064, -909.635584585, -312.979048243, 364.417796881, -693.929034057, -162.500474029, 330.708573677, -38.3054215104, 99.404871683, 623.922167663, 882.362449135, -29.5329887229, -282.364009684, -1159.87779922, -424.098570987, -583.612355333, 204.816570252, -525.931723392, -804.634445737, 765.64031226, 725.742679043, 1168.89200258, -1035.27508215 +-336.772267987, 1156.81281102, 694.088150147, 96.0582616623, 587.149544588, -380.010376055, -53.7865698301, -61.7311842322, 799.734793457, -1165.28848, -451.173431071, -888.149415811, 534.080524632, -767.564701502, 299.849032679, -201.392772, 943.424952401, 415.909888102, -650.832435868, 1044.15968567, 238.553423281, 88.6837212932, 826.257102255, -1022.73281662, -638.099722851 +266.784178699, -849.867816246, 113.947767401, -334.932129211, 755.903276027, -15.9460845261, 379.46846479, 908.950330731, -981.573814438, -728.350844905, -469.670671412, -27.0893584358, 601.405540291, -1170.40709982, -178.418351246, 1022.55452457, 1126.16432557, 636.970484047, -327.883935035, 297.524585374, -617.512001448, 500.05377824, -604.782828054, -1040.66908128, -791.798364939 +-157.345033607, -326.650763448, -230.634090419, 562.837297743, 240.221619812, 1121.49498482, 820.777310658, -457.621726141, -1004.31847973, -664.268895561, 925.739369593, -341.534770468, -1163.13487782, -792.728244312, 1032.15137313, -646.371479608, -888.136599414, 464.895439217, 670.807453539, 355.920823014, -549.650337338, 8.29322173578, -122.137737393, 801.452734546, 130.326278806 +-375.147543232, 213.360196172, 470.404557582, -227.923703155, 928.469596516, -1029.0227349, 813.951380065, 571.72824266, 650.628346152, 139.579991831, -916.028878791, -507.411324979, 764.052709223, 429.035580228, 22.2727861934, -783.53652212, -475.940326688, 1012.51619095, 327.867216865, -123.905965227, -46.5018080895, 1163.81904865, 109.216233034, -1113.33321776, -663.247963382 +577.583185722, 40.6726276594, -206.195252571, 275.181436665, 949.110087439, -738.437119504, 64.1273877788, 498.65926862, -1173.36642881, 189.728011442, -1025.67468457, -581.40097656, 402.18000009, 806.88429201, -816.113790123, 694.65805759, -347.543867189, 817.807284841, 1063.72164126, 388.729064626, -1042.59486532, -74.438290646, -407.370608762, 1170.54674426, -463.288562653 +-510.249861607, 603.01455151, 465.697821453, 745.093521948, 1007.66903591, -959.847023852, -99.2531711025, -280.585206351, 87.874285082, -440.739326355, 1118.70469774, 1040.995037, 467.596867902, -848.788066918, 346.137558894, -154.666929688, -339.755651698, -1073.96869596, 232.922591186, -622.480456096, -41.2446461705, 767.26422212, 230.286285741, -736.638079481, 888.94690395 +-264.341160452, 324.15411914, 203.346581894, 806.694344961, 55.7799548242, 1049.09067813, 582.971777654, -714.491741162, -186.399113188, 697.044264469, -852.18827176, 189.855210749, -998.675790698, 923.246176435, 1155.20932515, -1118.85732124, -70.5192504883, -475.305999271, -821.819021839, -593.062575936, 710.611855161, 458.359918113, -428.014399772, -349.619401352, -315.492263205 diff --git a/code/plots/data/bins-convergence/5_10/turbineY.txt b/code/plots/data/bins-convergence/5_10/turbineY.txt new file mode 100644 index 0000000..24d8091 --- /dev/null +++ b/code/plots/data/bins-convergence/5_10/turbineY.txt @@ -0,0 +1,10 @@ +-745.487185073, -639.737062768, -421.636590237, -462.681320746, -14.0703964361, 880.560035136, 6.17009837359, -951.528627943, 374.313490089, -47.8219346171, -84.0723363143, -16.1539169792, 603.59032621, 311.24201867, -1029.58299528, -535.972072974, -433.177204052, 542.919368134, -54.3295460747, 910.958688481, -768.5214802, 957.009143025, 958.271994866, -338.466074129, -904.527214096 +33.527466683, -938.29719953, 637.291259021, -821.612566556, -613.342728966, -70.9555868114, 349.03946961, -24.6471841617, 1148.52136233, -951.10907017, 360.666588156, 376.777460251, -310.404709459, 872.796626383, -471.421513569, 855.582508188, -22.5994255608, 548.207661929, -1019.67113818, 880.319206685, 24.7734666745, 858.469340291, 340.510851286, 388.814482485, -497.77320361 +515.746498975, 215.118997427, 885.355431028, -36.5759014473, 1131.0084107, 591.848257486, 188.570024354, 159.210720478, -192.510686908, -897.340567408, -1169.29666381, 575.791689156, 773.674613375, 606.444854559, -128.70133543, -178.380414609, -537.896913144, -256.216193258, 160.48534989, -862.426419613, 743.035936704, 267.742005177, -911.194451465, -104.054688918, -512.52306881 +634.277046649, -197.281563978, -229.49710289, -966.934138492, -567.534846737, -953.405301569, -694.893491817, 841.084012269, -858.813223885, 138.703461224, 1083.31829155, -83.4267120469, 145.34560246, 887.682557433, 1134.56032267, 180.042504347, -476.649913082, 558.015186473, 450.065226939, 535.599311247, -583.306871218, 377.682019308, 823.280364002, -496.04878114, -984.867827182 +96.529797989, 285.660395219, -414.706407753, -1124.70280869, -336.06048818, 950.773868899, 949.643889605, 140.913594771, 643.155313682, 707.666289218, 22.3424913586, -892.751066532, -901.051584375, -85.3424589912, -201.354459719, 575.776203988, -329.984679619, 985.598548347, 729.531661566, -1135.17199297, -435.253986998, 575.364515301, 1005.67073771, -440.805160594, -861.719395287 +-677.699435217, -479.567111558, 666.01236753, 145.640292327, 399.622840617, -345.521189836, -134.247004389, 65.5207758305, 607.025767973, -639.235719256, 194.255799151, 1122.71541014, -155.734228372, -865.284821605, 558.390038249, 910.533481069, 36.5560472576, 1077.50086876, -632.417430066, 696.367540876, -239.271222012, -241.204939611, 72.3799114279, -857.210247091, 134.524298827 +592.88788088, -178.179217032, 616.280912574, -183.939890959, 352.45511396, -564.134826662, 845.351556982, -618.34311801, 229.150288953, 944.090355976, -223.838361406, 1025.4358732, -157.767401983, -954.982077089, 583.204079462, -769.547732337, -1072.66833468, -593.251226054, 215.114467817, 1166.95489759, -677.521321299, -150.536535123, -1168.42106362, 370.978614193, 379.731050812 +-67.0466886528, 1108.36280854, -1.1195491797, -858.331588926, 181.419448488, 773.620910634, -237.785913711, -1062.29698431, 18.6330372891, 342.119475756, 570.199774925, -299.094963935, -499.242444294, 434.519689458, -410.942653165, 791.134381044, 760.666222231, -841.621813537, 495.61313495, 1107.26046061, -538.638875717, 791.656235418, -1100.53898287, -83.4044449175, 1078.19276538 +-54.3799193144, -172.306764364, 1077.15594784, 831.880735188, 119.204370252, -51.6143092093, -1083.34442584, -610.68866027, -610.129641834, -1087.60507584, 354.45292173, -541.727304128, -951.999946384, 810.368061973, 824.539210197, 262.803580933, 888.432188802, -472.998953864, -1063.930784, 262.309646208, -81.2551534965, -721.128787007, 520.648865849, 575.799424111, -151.049036475 +-358.298249732, -304.090395319, 771.305727793, 852.279375512, -346.163877539, 225.06273382, -266.14632519, 477.394654208, 464.311529871, 480.67970954, 806.79058406, -640.807362638, 423.600405683, -2.45245579761, -206.464156431, -353.969853768, 103.58635031, -835.997120087, -837.704997019, 139.690395302, -933.898839983, -1036.28285438, 1092.67542259, -1120.22419461, 780.55950351 diff --git a/code/plots/data/bins-convergence/5_2/AEP_opt.txt b/code/plots/data/bins-convergence/5_2/AEP_opt.txt new file mode 100644 index 0000000..6354b69 --- /dev/null +++ b/code/plots/data/bins-convergence/5_2/AEP_opt.txt @@ -0,0 +1,10 @@ +304094.727132 +304390.926538 +303280.608248 +304810.222157 +307023.500806 +301158.516845 +301535.320451 +305732.686894 +302554.513606 +302962.040331 diff --git a/code/plots/data/bins-convergence/5_2/AEP_true.txt b/code/plots/data/bins-convergence/5_2/AEP_true.txt new file mode 100644 index 0000000..93bc723 --- /dev/null +++ b/code/plots/data/bins-convergence/5_2/AEP_true.txt @@ -0,0 +1,10 @@ +376053.389809 +375562.854122 +374646.831012 +374409.928389 +378499.440656 +371484.396054 +374352.914175 +377358.859083 +372307.453614 +374554.644852 diff --git a/code/plots/data/bins-convergence/5_2/boundary.txt b/code/plots/data/bins-convergence/5_2/boundary.txt new file mode 100644 index 0000000..d74b3d8 --- /dev/null +++ b/code/plots/data/bins-convergence/5_2/boundary.txt @@ -0,0 +1,10 @@ +-0.000618925505478 +-0.00267155696747 +-0.000250669848811 +-0.000373934212803 +-0.00183718727908 +-0.000232587336768 +-0.000180535902246 +-8.41939206566e-05 +-9.32977377488e-06 +-2.90775460599e-06 diff --git a/code/plots/data/bins-convergence/5_2/separation.txt b/code/plots/data/bins-convergence/5_2/separation.txt new file mode 100644 index 0000000..9edabbd --- /dev/null +++ b/code/plots/data/bins-convergence/5_2/separation.txt @@ -0,0 +1,10 @@ +3.17398633189 +900.163353158 +4.29036881542e-05 +0.015566208458 +0.000113035232062 +2.74405028904e-05 +0.000141048221849 +5.94338052906e-06 +5.08649100084e-06 +9.27506334847e-05 diff --git a/code/plots/data/bins-convergence/5_2/turbineX.txt b/code/plots/data/bins-convergence/5_2/turbineX.txt new file mode 100644 index 0000000..c63152a --- /dev/null +++ b/code/plots/data/bins-convergence/5_2/turbineX.txt @@ -0,0 +1,10 @@ +-980.714547947, 716.556475606, -860.537292616, -459.981280606, 874.165938141, 315.093065546, -727.187448475, -601.569337517, 1018.25688092, 177.699741704, -1168.1187194, -261.536446886, -904.815086154, -379.925137799, -63.8548689498, 71.064784561, 1171.97490676, -14.5258466874, 483.43727047, 625.875551996, -209.663178369, -561.555394439, -143.944478759, 331.766078411, 575.002131068 +1163.17099214, -400.998999088, -483.096619812, 439.4563784, 159.523922201, -139.299594121, 156.147520161, -1031.65247717, -315.778064608, -268.078960285, -89.2637142045, 657.283739749, -555.564760874, 33.9697756118, -830.250303164, 391.533961901, -660.96275468, -1138.51230458, 683.18514933, -784.968379222, 284.160215428, 515.146852382, -911.094319716, 1015.76814258, 846.124867884 +1013.56310395, 501.237953115, -36.5771266499, -987.542595119, -578.97308573, 258.576758735, -859.884452328, -293.651957987, 384.304150409, 123.423523193, 294.312023238, 613.669842115, 735.444774183, -176.909058287, -406.077166637, -1105.89947001, -49.8616550192, -532.50092382, 135.581259251, -344.297527082, -718.466674538, 894.724643189, 842.807994353, 1131.41142264, -680.698514859 +-405.02615663, 1173.35981966, 630.902729311, 26.9079184553, 535.025321749, -423.09784275, -113.594549968, 183.542068431, 887.115784441, -1172.9092461, -551.543482841, -605.547460409, 458.214947447, -931.159590418, 49.1060564617, -252.777905014, 1036.88029201, 324.551189254, -801.797744059, 736.591253529, 197.111013236, -91.8002700497, 860.379708192, -1042.29976981, -726.47644986 +309.563593979, -718.641709863, 157.834591621, -619.766342911, 779.469121813, 40.5152106347, 426.612339504, 911.942072675, -1027.78831964, -856.301205645, -381.303589514, 10.3849197559, 633.057168904, -1173.1578343, -134.480083675, 1038.08693535, 1129.5637123, 696.028182151, -256.468227089, 320.145385623, -492.17279358, 555.464202923, -569.583778864, -1039.79156885, -891.009869014 +-103.961791189, -261.207531246, -244.502869141, 597.917697009, 265.24512644, 1126.36538685, 769.421561918, -433.697321706, -1003.08144, -651.706588292, 877.706205882, -353.242757373, -1162.55457979, -755.398726352, 994.177637981, -667.694052642, -859.245796823, 376.975840818, 663.294035074, 495.768175461, -540.920249888, 41.7115492425, -108.234307394, 285.649726335, 149.876040879 +-334.430351838, 173.683668403, 352.085430533, -135.279276211, 847.350980664, -1039.16449352, 1089.71502134, 534.397057115, 729.669843859, 207.802117268, -905.637548232, -471.09329465, 629.450601827, 295.201128082, 39.5078334494, -666.471934264, -507.715652417, 1038.00677352, 479.721234591, -209.636750476, 22.5459262975, 943.895496346, -120.174660802, -1170.02298299, -769.91439141 +609.285615463, 10.0025353001, -267.819404251, 130.5512806, 908.906455368, -800.65708173, -1.14628636464, 282.295523436, -1168.62873962, 221.889060148, -1050.73641527, -398.748501972, 470.88854858, 737.352607318, -729.225872388, 512.919192491, -491.691943194, 794.548282706, 1012.6784944, 380.143044273, -960.183700037, -137.798180321, -211.172641703, 1162.33420867, -631.88485163 +-477.908795337, 622.270697604, 479.955538496, 842.546406474, 1168.49898513, -948.091513564, -78.0880502296, -335.05808517, 146.214410655, -459.180307596, 968.896291362, 1075.3458254, 505.55434661, -831.187959729, 346.682494578, -104.897855745, -228.431344343, -1118.37304156, 345.675765234, -591.828626369, 37.7594378086, 969.84366417, 215.170761388, -707.719735432, 738.085450192 +-281.337374835, 333.990925405, 214.79458964, 910.008795935, -47.1473305846, 1041.68725416, 476.309585864, -710.0765166, -152.843223271, 624.630829227, -838.857303173, 189.496254994, -1003.69464898, 779.721761105, 1162.48577411, -1136.54279317, 67.5207935023, -588.061388211, -852.606522545, -601.145071615, 639.485586367, 343.513093334, -428.756888904, -426.010681955, -299.176961128 diff --git a/code/plots/data/bins-convergence/5_2/turbineY.txt b/code/plots/data/bins-convergence/5_2/turbineY.txt new file mode 100644 index 0000000..2a768e1 --- /dev/null +++ b/code/plots/data/bins-convergence/5_2/turbineY.txt @@ -0,0 +1,10 @@ +-644.465537138, -555.751639164, -345.770491939, -361.95504531, 186.876478031, 1004.56356751, 139.591677034, -1007.59676094, 583.34359052, 137.035954046, 102.634218509, 121.98415452, 747.292372628, 438.39899066, -1060.1158749, -490.16483126, -60.093647272, 680.185160651, -72.9723496732, 992.681790724, -698.476754743, 1030.43275378, 1036.37182766, -284.157158516, -1022.99000614 +-155.464572214, -1102.8761438, 314.955634138, -774.29506815, -585.988644748, -384.347095785, 270.558256435, -351.693248759, 1130.23288562, -877.415666911, 482.793238549, 272.099091548, -654.865417211, 785.514602136, -829.349491854, 784.892829284, -116.740043531, 284.480412561, -954.146813491, 872.330541674, -87.4005413633, 1054.40088998, 79.9547115978, 290.873762163, -448.100921321 +591.460920723, -9.61704826749, 1041.05581498, -54.8907973099, 1020.74781081, 618.609696361, 297.878648917, 308.292356285, -397.769921268, -940.05711351, -1136.00894584, 592.922424715, 914.470817806, 642.874478901, -22.0062182638, -392.584666111, -731.791028544, -417.660906048, 290.762520023, -947.386445263, 668.822226159, 239.651087332, -816.585062666, -311.519071493, -955.921332911 +289.561778892, -19.0435563635, -71.3584340196, -900.310673985, -442.519047705, -887.026721119, -671.230092422, 921.086634102, -768.219680816, 37.6917713451, 1035.82611989, -331.38309409, 304.249551454, 714.197369664, 1172.48650299, -73.2380372286, -392.116097496, 527.260796264, 290.103578399, 517.927044716, -444.843462938, 313.501349699, 798.049418971, -326.434465875, -921.611565444 +121.355930697, 322.876891881, -395.287980713, -996.507138928, -321.967210517, 927.246062947, 925.657528253, 114.990100996, 566.380985573, 761.809156127, 77.7479118057, -898.0533398, -885.066778591, -28.9260389843, -159.192862296, 547.276356085, -318.155177258, 944.820074497, 713.444066306, -1129.00082025, -428.246967914, 553.208058967, 983.561726928, -424.237463059, -763.699871396 +-899.40041625, -566.547097135, 558.307334703, 190.43002617, 489.340082241, -329.297651312, -4.98363415504, 62.7052800881, 609.067865994, -572.993219644, 391.042981775, 1119.08689894, -160.008934615, -898.058313425, 623.495999678, 890.642201808, 54.4823559518, 1111.31690039, -369.325257641, 668.275846269, -249.545007627, -350.619488072, 80.0158260579, -1138.21802854, 117.284895393 +404.071312701, -84.4763141668, 428.321030161, -101.462172615, -41.1041785769, -352.428008784, 435.496443266, -1020.02613372, 190.738766531, 1154.96947981, -129.334855288, 1074.80563749, -545.128456378, -1121.93446348, 658.241406159, -617.372791851, -1057.99864442, -547.428379099, -43.8487898375, 866.752012494, -554.088313866, -305.058672785, -1076.08275842, 90.4550900697, 396.584292085 +-245.182961911, 1089.58469301, -81.5058978056, -891.472173828, -219.690969779, 593.715076916, -299.475389121, -1139.05449261, -106.971561962, 407.614716833, 522.579098851, -540.457788883, -618.530878464, 395.710068399, -555.263733653, 626.669331207, 618.827448235, -863.61391236, 592.97400145, 1110.23744624, -674.672629621, 642.1384146, -1145.98940457, -161.601608778, 988.866838089 +-179.461367277, -261.671606647, 1070.87747823, 816.854604582, 108.379127241, -159.016800314, -1076.38903086, -530.948669107, -590.551131081, -1079.9487665, 589.619678949, -243.560092244, -599.558957688, 828.409601371, 566.83202558, 131.587939441, 515.328078513, -355.496318915, -1068.86649485, 144.6323752, -229.475027526, -598.390428373, 151.205576865, 522.694878455, 107.347696391 +-423.217732258, -304.171838479, 769.61457069, 740.95876311, -310.279593143, 238.265571059, -86.5818575338, 533.53729012, 489.892356495, 522.689707068, 820.642627625, -715.240296578, 358.131356073, 125.000217672, -160.507702303, -292.243688089, 166.3806002, -649.846000301, -806.348569865, 94.7345419211, -983.9685352, -1122.11169285, 1092.38428481, -1093.4581801, 793.203225474 diff --git a/code/plots/data/bins-convergence/5_3/AEP_opt.txt b/code/plots/data/bins-convergence/5_3/AEP_opt.txt new file mode 100644 index 0000000..8209419 --- /dev/null +++ b/code/plots/data/bins-convergence/5_3/AEP_opt.txt @@ -0,0 +1,10 @@ +304521.115747 +304560.910409 +301795.357748 +304812.388809 +308776.065405 +305692.539681 +305457.128282 +306283.899155 +304020.541044 +305579.589206 diff --git a/code/plots/data/bins-convergence/5_3/AEP_true.txt b/code/plots/data/bins-convergence/5_3/AEP_true.txt new file mode 100644 index 0000000..ea03a80 --- /dev/null +++ b/code/plots/data/bins-convergence/5_3/AEP_true.txt @@ -0,0 +1,10 @@ +370512.925287 +370589.650859 +364898.608213 +370147.562116 +376111.105707 +371132.253506 +374598.759734 +375130.420008 +368360.392789 +372437.351782 diff --git a/code/plots/data/bins-convergence/5_3/boundary.txt b/code/plots/data/bins-convergence/5_3/boundary.txt new file mode 100644 index 0000000..96cd04e --- /dev/null +++ b/code/plots/data/bins-convergence/5_3/boundary.txt @@ -0,0 +1,10 @@ +-0.00174942952367 +-0.000377396001795 +-0.000142625621493 +-2.76426962955e-05 +-0.000206867786346 +-0.000242321316819 +-0.00116377345194 +-0.000461253829599 +-0.00176094330391 +-0.0011794597051 diff --git a/code/plots/data/bins-convergence/5_3/separation.txt b/code/plots/data/bins-convergence/5_3/separation.txt new file mode 100644 index 0000000..6ab4779 --- /dev/null +++ b/code/plots/data/bins-convergence/5_3/separation.txt @@ -0,0 +1,10 @@ +0.00464419633499 +0.248998862487 +6.70930603519e-06 +7.75816006353e-05 +0.000534320133738 +0.000296418031212 +7.41546348885 +0.0827232936426 +0.357115967228 +0.0646177961316 diff --git a/code/plots/data/bins-convergence/5_3/turbineX.txt b/code/plots/data/bins-convergence/5_3/turbineX.txt new file mode 100644 index 0000000..beb8035 --- /dev/null +++ b/code/plots/data/bins-convergence/5_3/turbineX.txt @@ -0,0 +1,10 @@ +-950.389785994, 952.27331047, -948.374710645, -685.37585933, 810.259834827, 361.129668724, -828.963598788, -656.753712769, 896.948974613, 99.8386883818, -1167.72226726, -309.293233339, -1044.93699712, -629.87459642, -98.3675491972, 51.7136649187, 1106.36179772, -88.7052193627, 535.087617926, 513.183433045, -489.084238658, -493.982470994, -220.269573098, 256.167614405, 680.655650302 +1171.2828202, -120.904994553, -614.588606853, 348.252367416, 57.4708594005, -167.823344315, 30.1221777704, -1027.73071809, -308.673697961, -138.607481102, -322.062442254, 699.125202209, -340.005256904, -105.573329931, -1139.42167792, 407.261533343, -492.958395779, -900.43495414, 929.581280269, -760.447005482, 193.705814918, 556.089075756, -738.448040365, 1043.9301263, 903.86665213 +1042.24239968, 532.202876088, -30.8684471596, -914.249796734, -584.398025876, 138.588977267, -753.332634346, -319.486694452, 420.539949916, -0.465801985798, 373.472093782, 550.773603691, 862.677728337, -177.982770614, -275.566854916, -1056.58357254, -251.313833101, -454.610106502, 269.330256305, -570.745177705, -732.526302866, 798.506852962, 670.003559649, 684.722361351, -797.395033423 +-182.305176349, 1173.2949864, 813.422481623, 253.733386272, 660.334290507, -355.700848921, 126.733041095, 88.4320894479, 921.638829344, -904.925707327, -312.00403067, -930.416870714, 781.605187078, -562.796038754, 341.729188586, -52.7745023064, 992.695549859, 562.665029917, -431.225869502, 977.059779942, 392.245798351, 71.8615669385, 936.57414664, -1062.95187082, -713.211646279 +290.005708204, -855.717160062, 48.416762024, -543.697718376, 917.44988735, 150.332860913, 460.129694317, 805.565840697, -1026.52544117, -752.425596351, -662.991795846, -94.6016571359, 761.515800249, -1167.49070423, -268.1717126, 1061.77483387, 1170.73295144, 923.077970971, -98.2772397714, 500.538899611, -399.367834431, 624.251123346, -244.453201258, -904.253582589, -851.521525488 +-46.4085899741, -392.968692241, -342.472631332, 410.917075292, 161.58809661, 956.432732399, 737.530031629, -523.994549778, -1045.31267101, -453.152541363, 876.85144799, -291.660881732, -1171.46138735, -789.895696526, 1169.04790077, -289.776345892, -909.37697176, 291.244935833, 599.526559519, 283.501523852, -664.750625683, 100.617031693, -180.594488043, 323.781628047, -44.1247947113 +-355.376521868, 391.642980372, 446.714259377, -228.593142312, 1171.99326132, -1069.68649468, 979.950313382, 574.556321017, 862.805776093, 311.805772738, -1073.44338304, -454.647262573, 708.095456047, 517.016911297, -22.6214182033, -633.659674412, -355.589929827, 853.107811737, 355.463827017, -176.765455776, 314.998387906, 1040.33883247, 157.213226574, -859.740771829, -579.604835241 +621.575833939, 136.584380796, -188.341793621, 374.602125899, 878.844167322, -776.548100727, -8.99503729724, 211.003030765, -1172.37926565, 172.445334651, -1031.39510799, -510.647633743, 395.198414033, 756.362706689, -912.62793585, 612.639905689, -327.211113475, 963.113173196, 902.424842758, 487.993865349, -983.910475519, 135.644624538, -357.918493405, 1105.43902625, -583.545112089 +-607.190046107, 637.3475746, 447.608260335, 469.377557742, 954.130568909, -983.719235975, 21.5766531943, -385.281746292, 273.685474341, -435.880828483, 1068.67954804, 910.573681227, 429.16362124, -882.353801403, 468.67133376, -240.039490995, -396.895640494, -1119.96699913, 362.81754437, -572.130843926, -90.7126482377, 665.365692286, 137.349907275, -752.163492346, 773.161415085 +-235.036716747, 217.259948231, 110.962553506, 942.104862385, 22.470653009, 1061.34745886, 616.048850328, -677.726055299, -267.822590517, 752.738093488, -841.229552979, 96.4441474559, -1012.58719792, 870.51726216, 1139.1157409, -1115.9183286, -109.692122601, -592.618887547, -894.663379793, -423.593305114, 502.137553546, 266.948969899, -488.853379473, -420.226587938, -375.224833117 diff --git a/code/plots/data/bins-convergence/5_3/turbineY.txt b/code/plots/data/bins-convergence/5_3/turbineY.txt new file mode 100644 index 0000000..b6260af --- /dev/null +++ b/code/plots/data/bins-convergence/5_3/turbineY.txt @@ -0,0 +1,10 @@ +-688.400468156, -685.792817088, -409.699169447, -511.647362081, -336.84686721, 844.44775178, -61.5197187816, -937.451935977, 756.715770705, -125.974035612, -116.451231677, -113.209510058, 527.581490052, 214.077158638, -924.162425039, -494.346342832, -391.284512977, 561.264622694, -291.528557937, 1055.3573824, -709.023682182, 1002.26368655, 952.781002623, -333.726945418, -819.159744523 +-72.3417752242, -1167.26946619, 656.824441494, -839.163977715, -604.399044993, -131.048070447, 466.728915723, 93.1516947961, 1132.1910024, -872.128323541, 676.944162192, 484.150121758, -357.268194066, 920.960572276, -280.810235207, 727.588340053, 65.7592645635, 600.619029921, -716.250528558, 872.058213352, 30.4703688013, 1009.64020428, 397.24525639, 282.610008428, -382.215277466 +539.320588974, 230.951820512, 706.98225696, 16.4440388606, 1017.65163296, 509.79152938, 388.508445273, 242.798437367, -121.734816142, -1027.06133312, -1112.49924153, 527.724360407, 795.564688912, 460.919136855, -20.2831413861, -389.281555089, -487.977388949, -271.696384888, 169.803556568, -732.563016877, 647.674602154, 448.805160082, -963.447537308, -470.603173564, -860.98628735 +563.910125433, -22.6886346203, -264.074246658, -1049.31705492, -595.071561348, -1051.21359033, -602.631809954, 762.444999636, -726.441857647, 289.778517359, 1131.2777914, 31.0310498085, 55.0280250169, 1029.75556037, 1122.65625207, 160.869664139, -476.339993306, 479.791721, 476.901548782, 411.36367045, -667.673134757, 502.973544046, 707.081873736, -341.033988723, -931.914736418 +360.901639326, 357.445913933, -69.3040751648, -1039.96581059, -158.382647806, 836.698809342, 1079.54461178, 197.947523078, 568.666343521, 838.368297165, 89.7696969833, -1017.78816442, -892.877154023, 118.749360097, -282.916098935, 392.504322425, -80.7483338065, 724.612313725, 760.586879901, -975.317020094, -823.704660278, 384.293907442, 1147.77132283, -552.897675638, -807.494304892 +-790.099402163, -519.93756914, 540.44103958, -99.3284324947, 528.500118716, -679.979651976, -44.1141175759, 104.184208787, 470.851926922, -786.230916681, 374.913451795, 1136.69249473, 69.3878827868, -867.87151214, 102.288524384, 876.69932401, -13.4581791296, 1136.79918636, -406.866336953, 841.73936787, -292.361716728, -101.666612442, 48.3637584113, -1127.96353929, 293.937204627 +379.938029516, -107.249269237, 591.869365112, -122.891491127, 59.7463621327, -482.60549269, 645.626271679, -454.341941675, 316.669098265, 1131.33363032, -218.614501633, 1081.86560591, -63.041953477, -1053.48458388, 826.113514048, -987.730384421, -1062.72714881, -805.818223713, 252.503355886, 1160.12590221, -438.944057967, -168.878073178, -1105.28396432, 798.737997593, 114.469122952 +26.8232650576, 1050.49603265, 138.593948794, -706.566549146, 112.935192523, 843.928407072, -89.4573649362, -1154.38931699, 51.6018505668, 420.477992973, 559.785751524, -570.540085639, -352.55153361, 446.96094379, -244.646340477, 763.783624383, 974.632851829, -670.484086853, 740.91685918, 1067.23886894, -587.387119409, 773.409582462, -1117.6006366, -317.023795481, 1018.14105655 +-127.907546556, -500.223244541, 1084.79617719, 825.705759317, 84.9280312901, -129.000043643, -1087.83182591, -746.398251498, -383.828536966, -1089.56318217, 484.830893089, -740.267133831, -749.165549662, 773.685837209, 515.994887936, 92.4917219189, 416.415257045, -350.442933921, -1077.13647418, 188.373011596, -120.350593301, -857.854211418, 70.5996688265, 420.30192079, -130.433407203 +-574.560792512, -131.617347302, 777.432478407, 699.696624304, -311.882963823, 292.955287856, -235.267051945, 613.945149898, 494.430153476, 338.165605418, 816.100766398, -706.395142189, 590.911307309, -144.898373533, -282.048377946, -363.132129809, 162.616105013, -677.820226318, -758.071133373, 284.15916586, -1031.90449127, -1142.74850211, 1066.84506419, -1095.69470953, 823.877661509 diff --git a/code/plots/data/bins-convergence/5_4/AEP_opt.txt b/code/plots/data/bins-convergence/5_4/AEP_opt.txt new file mode 100644 index 0000000..39db4f1 --- /dev/null +++ b/code/plots/data/bins-convergence/5_4/AEP_opt.txt @@ -0,0 +1,10 @@ +394179.446608 +394003.930956 +387754.104666 +394833.291402 +393359.082742 +390444.533694 +393107.424927 +393069.53432 +393437.71696 +393205.22767 diff --git a/code/plots/data/bins-convergence/5_4/AEP_true.txt b/code/plots/data/bins-convergence/5_4/AEP_true.txt new file mode 100644 index 0000000..854ff6b --- /dev/null +++ b/code/plots/data/bins-convergence/5_4/AEP_true.txt @@ -0,0 +1,10 @@ +376357.128227 +376121.803845 +366268.751167 +375666.00173 +374687.66022 +370308.870781 +374457.300297 +374203.758088 +374460.370042 +375345.789041 diff --git a/code/plots/data/bins-convergence/5_4/boundary.txt b/code/plots/data/bins-convergence/5_4/boundary.txt new file mode 100644 index 0000000..fd6964b --- /dev/null +++ b/code/plots/data/bins-convergence/5_4/boundary.txt @@ -0,0 +1,10 @@ +-0.000245902402639 +-1.81644181794e-05 +-2.00692056751e-07 +-1.40697632105e-05 +-1.04620173715e-05 +-0.000314896377631 +-1.18388284136e-05 +-6.08647542322e-05 +-8.39635799821e-06 +-6.52659014122e-05 diff --git a/code/plots/data/bins-convergence/5_4/separation.txt b/code/plots/data/bins-convergence/5_4/separation.txt new file mode 100644 index 0000000..5a560d1 --- /dev/null +++ b/code/plots/data/bins-convergence/5_4/separation.txt @@ -0,0 +1,10 @@ +0.000114946364192 +23518.7729098 +2.58423096966e-06 +4.0423750761e-05 +0.000278865190921 +0.0115121048148 +0.000314761549816 +0.00382001996331 +3.22646519635e-06 +5.78409526497e-07 diff --git a/code/plots/data/bins-convergence/5_4/turbineX.txt b/code/plots/data/bins-convergence/5_4/turbineX.txt new file mode 100644 index 0000000..ca3e7e2 --- /dev/null +++ b/code/plots/data/bins-convergence/5_4/turbineX.txt @@ -0,0 +1,10 @@ +-934.325857619, 1066.38506621, -839.573911916, -631.322940018, 862.56001008, 294.179330691, -749.042256016, -416.724180906, 915.528750234, 205.637632843, -1172.29219402, -161.526473162, -1016.45849298, -560.71263902, 14.270242329, 133.320957796, 1171.68626446, -53.0980528313, 565.936422002, 698.604823264, -309.650772447, -479.843455604, -219.896131518, 405.551926546, 635.868250022 +1127.78871822, -629.491276309, -536.281466725, 337.222711856, 170.758387074, -14.2780487222, 109.347729018, -961.129307272, -349.711762815, -183.639332128, -161.231203642, 651.611689296, -331.98875895, -45.474025623, -1088.73870237, 409.219022481, -449.222452648, -1043.27953766, 717.790200129, -652.199796228, 281.331564761, 711.076182034, -860.427712179, 1060.05398554, 998.677129652 +1007.00571435, 434.730004233, -10.6699131104, -821.34482298, -419.135791762, 231.598045751, -695.904864468, -280.694953021, 317.088081919, 33.0595667231, 557.918975573, 471.0784278, 731.075980969, -99.3690152177, -183.482098731, -1039.96893111, -356.212185751, -607.244666824, 161.908915111, -475.583163389, -760.778092834, 634.197543337, 771.554257444, 1025.80619744, -902.107594682 +-298.561029773, 1148.94917482, 816.455222224, 78.049466707, 587.244237781, -403.905605288, -79.4069312082, 221.726541209, 686.963061727, -972.159171169, -364.486992986, -894.909436439, 483.855369861, -692.551397937, 298.270619249, -178.692400613, 999.675893985, 412.136036284, -629.849135645, 964.137848973, 210.582297146, 8.41371618504, 851.100375427, -1034.66522703, -718.753204904 +425.08698888, -761.803897932, 245.08443877, -454.786303338, 827.745775681, 65.0398377771, 531.815076835, 1006.24554324, -974.595452825, -888.77283242, -276.902176331, -105.789098632, 646.807947838, -1088.44650482, 3.78703693364, 1082.84209713, 1147.97018047, 795.903574308, -173.992366734, 333.776133358, -356.273736789, 706.242413088, -500.394912542, -728.625097168, -623.617336592 +-89.2862378226, -383.533913339, -294.052750527, 463.19701098, 264.357084287, 1078.54838348, 832.360373405, -622.893454738, -1019.38731067, -737.140412068, 923.721561662, -401.101586664, -1172.17691602, -867.540011654, 1000.05146002, -705.623224291, -931.854594131, 313.711204605, 571.807764842, 399.086252832, -539.052385486, -1.93084013947, -212.631608197, 648.860657546, 141.176693096 +-420.999634364, 171.26319191, 307.57186319, -179.743529602, 845.555215957, -1102.10739978, 1021.08579164, 608.335102025, 661.616077778, 241.04012027, -885.652764374, -491.323216971, 734.729532771, 395.221198982, -45.8522915185, -682.062570302, -587.634432651, 1069.76659056, 405.321973851, -286.272864009, 73.0399709657, 948.50751366, -59.0326147706, -1173.4573572, -824.866977531 +545.435136637, -4.54536082712, -350.959988521, 248.364470723, 1001.68757197, -803.680293709, -250.606616116, 746.907415148, -970.165334116, 333.291436211, -889.438395303, -533.686990069, 114.608774585, 677.151206913, -769.092981594, 588.344677409, -429.17571762, 927.879515419, 805.843810134, 372.268391157, -1047.94942998, -109.604522174, 24.6042159046, 1073.91881904, -505.718971993 +-595.598886371, 671.815263792, 522.487674736, 767.131225358, 1170.28852851, -899.188602386, -142.211489796, -317.434475438, 279.292397441, -471.211845185, 992.36661755, 1068.4632662, 538.280959744, -848.696132102, 435.394217567, -252.266936041, -455.176173464, -994.72191026, 200.137308123, -688.75092601, -76.3267306961, 792.058331766, 368.255918657, -772.080463379, 927.478438704 +-180.910743607, 259.272415174, 316.323297864, 811.537674769, -89.1509507143, 1074.28591793, 524.04232775, -616.446119218, -358.959791365, 736.156075505, -829.422114645, 117.411521437, -1019.08620467, 997.221361368, 1138.17538837, -1054.92306746, 54.6093541597, -667.85922556, -776.308847922, -495.03390691, 593.691736116, 343.34506692, -440.236116297, -322.195884746, -42.7997870554 diff --git a/code/plots/data/bins-convergence/5_4/turbineY.txt b/code/plots/data/bins-convergence/5_4/turbineY.txt new file mode 100644 index 0000000..a98372f --- /dev/null +++ b/code/plots/data/bins-convergence/5_4/turbineY.txt @@ -0,0 +1,10 @@ +-710.050068976, -489.856468059, -343.472893205, -499.138322924, 60.0848760604, 859.941782513, -62.379692476, -1097.03094785, 734.127373002, 21.2538838671, -53.5441960797, -2.22420597018, 586.47082525, 322.527254547, -1105.65526857, -580.299459956, 65.4766642519, 611.742316192, 46.9865603067, 925.572503943, -804.280083668, 923.482539303, 928.715971768, -398.344087272, -980.83178761 +-71.2675877156, -990.392178517, 484.334577812, -979.065617377, -643.940680155, -232.397883545, 390.929037385, -37.8415713963, 1120.19534746, -1026.22063506, 570.882664431, 374.246222251, -414.599200906, 934.841028921, -437.931421678, 932.531186429, -2.64549266087, 537.311585167, -928.392766235, 944.983256995, 7.53173981279, 933.545157277, 252.281647364, 367.675270123, -404.310996744 +602.557368929, 158.03991941, 874.51196157, -53.9262421856, 1096.11180072, 582.680732232, 251.393983763, 206.626063323, -234.586072295, -507.432192696, -1032.40607731, 919.095196174, 917.967211891, 589.982761553, -150.869276601, -497.390937123, -498.429450973, -203.387230601, 155.226688032, -812.340437696, 735.711228729, 572.775175747, -884.217122429, -302.435640192, -750.558311801 +604.818211958, -14.065594448, -197.403158071, -989.295147341, -638.646806229, -949.884521138, -614.749975253, 867.116254018, -932.723029223, 162.296248879, 1115.47529053, -85.9626452712, 22.8719314837, 920.84441965, 1134.97600389, -7.98233895351, -614.641384544, 448.233435119, 399.069577174, 396.988629221, -625.548271544, 399.034904465, 807.938148975, -553.718124526, -927.647413751 +165.810106095, 371.476896705, -496.232395915, -1081.80650299, -282.023244392, 914.739860306, 859.806792608, 140.695970404, 520.874870069, 766.30200867, 101.558613784, -859.562881888, -801.645524045, 60.1693604979, -152.124759246, 400.554180363, -243.516645079, 862.365000235, 719.116766011, -1120.3257056, -376.887295265, 369.522439912, 1005.30363613, -585.130288752, -884.079160044 +-631.362746453, -409.734074312, 536.973166371, 24.7222121102, 418.554624409, -462.460152681, 42.2758395177, 362.445674121, 581.365146896, -487.027490289, 321.040445118, 1102.83879752, -56.0170350537, -790.259621836, 614.030240801, 902.115832503, 150.941893675, 1130.80560674, -456.177905988, 712.992995238, -67.1713923962, -386.476964898, 7.30398766123, -977.811721434, -4.17554000437 +370.909435996, -269.302092758, 535.587707617, -272.069761682, 141.243338766, -342.787399131, 578.376788743, -956.021983884, 329.249942725, 974.758636111, -174.211892996, 1065.70980481, -257.456849752, -1104.95977385, 729.954380886, -722.732750061, -1015.78624372, -482.426531006, 190.161219701, 905.852515127, -680.193554161, -109.473816752, -1106.27346532, 11.5642326677, 377.374736797 +-6.8594392003, 1160.46065805, 164.143705075, -620.988982578, 33.0662743496, 833.626325368, -75.7087928236, -905.132743085, 109.800198319, 315.105390787, 426.785644877, -629.910658354, -311.216392124, 334.706812654, -299.015880101, 899.444829787, 803.24422604, -718.453599248, 713.549111569, 1112.90259777, -528.14583541, 788.1199677, -1173.25643495, -323.928878799, 1058.95436908 +-289.920803552, -190.255253088, 1048.11217006, 888.057193466, 86.9520084668, -293.467732461, -1103.28216127, -715.825768529, -427.919567956, -1074.75359503, 626.374003511, -485.306253893, -924.094968894, 810.463305741, 692.208474245, 74.4925676188, 572.21195601, -614.286027846, -1109.99919659, 107.610167913, -228.583879048, -736.057043964, 57.622123877, 562.007999278, -6.01714781985 +-507.831417733, -285.421935794, 809.473802958, 847.668875053, -252.254086191, 326.506172788, -244.740458351, 681.0426771, 498.637819242, 535.915360873, 830.177600483, -703.60138352, 439.26758849, 47.6857486716, -285.819308727, -514.075253734, 195.858415392, -548.7049232, -833.224804953, 133.087566108, -1012.25788455, -1122.16313544, 1087.80883254, -1128.41734695, 1146.07766275 diff --git a/code/plots/data/bins-convergence/5_5/AEP_opt.txt b/code/plots/data/bins-convergence/5_5/AEP_opt.txt new file mode 100644 index 0000000..8a45d10 --- /dev/null +++ b/code/plots/data/bins-convergence/5_5/AEP_opt.txt @@ -0,0 +1,10 @@ +357091.842447 +356499.804227 +352210.052941 +357549.681122 +359148.676831 +353722.384698 +359008.729387 +358680.682244 +354070.917373 +356166.745598 diff --git a/code/plots/data/bins-convergence/5_5/AEP_true.txt b/code/plots/data/bins-convergence/5_5/AEP_true.txt new file mode 100644 index 0000000..7c6987e --- /dev/null +++ b/code/plots/data/bins-convergence/5_5/AEP_true.txt @@ -0,0 +1,10 @@ +376916.35848 +374976.421566 +372365.69732 +374967.514361 +378002.747717 +372581.623767 +377232.344128 +377297.127639 +372389.779251 +376124.077636 diff --git a/code/plots/data/bins-convergence/5_5/boundary.txt b/code/plots/data/bins-convergence/5_5/boundary.txt new file mode 100644 index 0000000..07eb4fc --- /dev/null +++ b/code/plots/data/bins-convergence/5_5/boundary.txt @@ -0,0 +1,10 @@ +-0.000330982772311 +-0.00014102265277 +-0.00181591303817 +-0.000239721797698 +-0.00190063084324 +-8.8174604798e-05 +-3.39191756211e-05 +-9.19045128285e-05 +-3.40388799032e-05 +-0.00140157983151 diff --git a/code/plots/data/bins-convergence/5_5/separation.txt b/code/plots/data/bins-convergence/5_5/separation.txt new file mode 100644 index 0000000..32fe5c5 --- /dev/null +++ b/code/plots/data/bins-convergence/5_5/separation.txt @@ -0,0 +1,10 @@ +40434.3238882 +0.0248147882521 +0.0852962965146 +0.000689727210556 +5934.8064373 +0.002708878048 +19417.9730783 +7.97915272415e-05 +0.00226723327069 +0.000821731009637 diff --git a/code/plots/data/bins-convergence/5_5/turbineX.txt b/code/plots/data/bins-convergence/5_5/turbineX.txt new file mode 100644 index 0000000..6a5e11a --- /dev/null +++ b/code/plots/data/bins-convergence/5_5/turbineX.txt @@ -0,0 +1,10 @@ +-1005.89843685, 813.810848468, -868.202116196, -609.43903497, 923.071551991, 367.886841754, -754.864350611, -461.262147166, 1048.39126529, 140.324225865, -1173.2861682, -305.307321202, -961.813542542, -443.893150473, -130.252666163, 3.55932004821, 1167.53481277, -45.8419792126, 566.215189278, 697.129615617, -327.794424864, -590.376024361, -176.787803203, 270.627239136, 422.142848627 +1172.22685949, -480.657391232, -497.121593983, 319.469953049, 132.653657311, -9.50198826975, 177.285824683, -943.936300707, -304.788482366, -209.539515626, -138.94834319, 604.523440178, -335.773147356, 32.0735636742, -1066.10024564, 432.952037622, -670.761658116, -1089.14050776, 508.829364821, -631.252464317, 310.157184985, 745.393886605, -815.133528877, 1021.52344214, 864.691493352 +1099.91331672, 532.049983088, 25.4879254284, -945.365403817, -662.940319813, 157.516600528, -801.588034344, -237.91221306, 395.729852417, 215.177050925, 490.479349619, 655.073952041, 930.122355888, -122.857404523, -338.803125322, -1072.31981729, -19.7185737396, -438.546868814, 271.148038778, -562.079798527, -510.818833817, 793.888811718, 859.797184694, 991.35983788, -818.650381784 +-333.195874894, 1170.9543224, 731.783291608, 125.917639737, 624.971779288, -326.187546415, -26.5214061681, -41.0137214012, 787.895886937, -962.130167159, -460.966729551, -836.451826596, 552.851776979, -760.046809364, 293.611076797, -187.019245669, 930.297204971, 435.186760593, -633.162846481, 1038.80080195, 276.935231809, 130.892672289, 865.442049376, -1069.42665242, -576.919165081 +286.101389924, -809.882752488, 136.033575634, -644.067043981, 770.532238994, 23.8496973112, 401.706386537, 901.518610646, -965.627470075, -689.535981571, -398.468008586, -10.7543755452, 616.455779764, -1173.35990554, -161.704932706, 1033.58972599, 1131.71311241, 671.931715289, -281.666180598, 307.693364375, -508.058981727, 530.776801256, -563.224182425, -1050.61247954, -900.918884986 +-179.845681853, -325.419246619, -245.316348143, 633.605974064, 266.150931716, 1110.53624319, 762.444225501, -465.156401102, -995.587327002, -619.292318473, 888.002193671, -355.172666223, -1167.78289882, -875.325874091, 1005.1193257, -681.326734217, -815.817021112, 399.63132897, 370.513186627, 524.095657836, -566.944034239, 25.7754786729, -107.989870254, 514.559073585, 145.580704957 +-421.020348943, 189.443432099, 407.602553746, -283.096841187, 1172.83211853, -1058.51695399, 871.482760135, 494.324439874, 748.617848681, 267.634202605, -956.691270481, -604.707354376, 705.384152726, 365.889504935, 23.2805334326, -721.347107932, -565.892597534, 901.239009815, 596.689297294, -255.795521953, -152.315173472, 1049.91457247, -5.59733211764, -1165.19169008, -835.009848012 +251.069481782, 28.3118311762, -316.660115231, 113.49450025, 1024.95289391, -925.058812332, -180.273654803, 399.556602162, -1173.36350132, 482.014688388, -1055.3443864, -475.59059606, -44.8254298963, 900.656059704, -730.86007526, 623.620266988, -458.438509412, 852.569180674, 768.797633185, 362.193877201, -886.662544128, -98.8416371667, -244.087344462, 1152.86907537, -588.485044724 +-508.317320426, 517.853428592, 369.15903741, 674.101052276, 951.586387597, -1006.32133918, -79.6110542869, -318.511830616, 130.855283339, -452.683179338, 1079.86172176, 1013.90187303, 404.061143032, -866.762660015, 234.767238089, -157.885151469, -296.078147675, -1147.17386213, 293.582229683, -627.36337003, -18.6187081841, 659.670898675, 107.882783341, -745.913653974, 832.220807846 +-177.104925248, 328.416758057, 199.243570605, 799.59934068, -70.4803961681, 1035.05881998, 543.023336891, -764.463830773, -264.828575052, 661.814320825, -911.637387427, 176.23208465, -1140.10220938, 928.152057093, 1167.38773007, -988.526223644, 50.7590339033, -533.160897177, -825.010127952, -656.789061161, 835.862642048, 441.653700369, -516.846283515, -364.270826585, -388.626610005 diff --git a/code/plots/data/bins-convergence/5_5/turbineY.txt b/code/plots/data/bins-convergence/5_5/turbineY.txt new file mode 100644 index 0000000..d1b0e0b --- /dev/null +++ b/code/plots/data/bins-convergence/5_5/turbineY.txt @@ -0,0 +1,10 @@ +-604.404234917, -831.892141338, -247.349196784, -564.711977914, 101.393009338, 945.240629194, 68.4396371488, -1079.06122443, 491.069372421, 52.006879376, 23.1402110058, 56.2526512972, 672.347160384, 364.294592552, -1059.97331489, -656.267792544, -118.3159755, 617.125338148, -208.380358133, 944.005424711, -751.001361139, 983.093971086, 997.23497326, -441.074901943, -1094.95757167 +-54.9552701233, -1070.56273786, 406.912020389, -879.29756545, -698.466879874, -207.09084762, 423.759142551, -146.261278319, 1133.24307782, -971.961371402, 406.096156922, 415.333657971, -450.48043457, 878.478921291, -490.47561273, 897.397296058, -114.202125708, 436.931192909, -1057.46332532, 888.850309397, 34.2071734356, 906.379708721, 207.909259587, 417.427637852, -309.242368857 +409.056194905, 156.822989385, 1173.23803447, -127.954412094, 968.321641673, 842.272057164, 213.729387428, 166.664921069, -292.279059426, -873.27326258, -1066.09845563, 478.958876828, 715.547946775, 519.864783247, -164.455248727, -476.728814982, -695.708798442, -444.553609136, 131.767509171, -798.712355254, 757.467488026, 199.067402785, -798.677055273, -253.118974486, -840.802984895 +625.269064581, 77.4753448829, -216.037157958, -961.487491054, -539.752059352, -953.108035683, -737.093804506, 834.249360669, -869.68733802, 236.14806508, 1079.18745757, 8.54104540994, 69.021466875, 894.127921686, 1127.16665462, 145.79804251, -474.77867977, 530.122353857, 452.434879397, 468.164849462, -555.346858924, 349.961463506, 792.556813704, -483.179745971, -1021.91008792 +98.4125298371, 293.156828406, -425.488300262, -980.976734085, -327.987804784, 938.18779272, 939.453183817, 92.9024891453, 666.859489026, 718.972490627, 35.948769637, -891.435680074, -896.365828422, -19.0398243374, -179.209176893, 555.727118957, -310.421392569, 962.104411999, 732.016398278, -1132.45782198, -428.834984053, 555.642681562, 1007.29423632, -416.448775881, -751.9847496 +-752.591247657, -525.68336906, 610.355419415, 212.739312536, 620.560331845, -379.269239265, -116.228113966, 161.932065656, 621.242128116, -736.384114972, 266.429441598, 1118.47586903, -115.840582496, -781.626868599, 605.698797382, 875.74434637, 142.373467064, 1103.37242172, -838.236654793, 653.187329496, -164.17622389, -229.61200332, 185.698496371, -1054.68718506, 243.161420297 +189.261260454, -357.535843808, 797.096746051, -342.834229281, 40.009144419, -506.633758873, 785.90946984, -760.259976397, 435.213103248, 1142.58822072, -229.777291988, 1005.71611934, -336.421451759, -1115.01604971, 514.554140376, -738.660729393, -1028.05716731, -751.601060873, 39.0570280438, 760.050643442, -679.893769339, -323.51649228, -1109.11882056, 139.514456024, 176.599693843 +-413.762067569, 1105.71506253, 249.672742603, -883.697718598, 7.20245607037, 722.081804536, -131.947418722, -1103.39948077, -18.8199240807, 342.855668017, 327.467774549, -377.289268574, -659.221647396, 349.318913828, -560.594867525, 789.09543308, 712.44744415, -806.388050906, 573.402280984, 1116.22200825, -768.742895986, 729.750647242, -1147.84905472, -219.154840312, 1015.29371634 +-57.5081748386, -142.118621878, 1113.93783621, 857.054799641, 160.224084849, -28.6990626491, -1088.9943525, -720.209890301, -461.131347075, -1082.68824266, 459.384981398, -590.879763917, -659.960006481, 791.11211775, 597.136501053, 232.70535406, 543.281298642, -247.240978641, -1092.20541975, 244.233141532, -94.3735022731, -865.846465413, 274.515461163, 560.904540584, -145.363723938 +-633.662834022, -345.607712938, 689.073073617, 795.54616517, -347.220685716, 552.98277153, -198.828909486, 524.619088123, 256.453038448, 325.736890206, 738.95526149, -864.228042817, 278.035602521, 100.641332789, -119.770901362, -632.417749414, 39.0411856035, -654.512513358, -834.562516162, -0.780604480316, -823.69266768, -1087.23406854, 1053.56866368, -1115.54593778, 753.057066594 diff --git a/code/plots/data/bins-convergence/5_6/AEP_opt.txt b/code/plots/data/bins-convergence/5_6/AEP_opt.txt new file mode 100644 index 0000000..db9385d --- /dev/null +++ b/code/plots/data/bins-convergence/5_6/AEP_opt.txt @@ -0,0 +1,10 @@ +359494.79843 +358954.586237 +360322.906483 +360344.663253 +360659.055297 +358217.821343 +358991.863628 +359691.35326 +358489.811407 +358430.199456 diff --git a/code/plots/data/bins-convergence/5_6/AEP_true.txt b/code/plots/data/bins-convergence/5_6/AEP_true.txt new file mode 100644 index 0000000..89dc710 --- /dev/null +++ b/code/plots/data/bins-convergence/5_6/AEP_true.txt @@ -0,0 +1,10 @@ +375057.303204 +375507.633612 +375881.192882 +375759.651505 +378353.837185 +371653.033468 +375160.744065 +378014.443311 +372970.561915 +374697.251291 diff --git a/code/plots/data/bins-convergence/5_6/boundary.txt b/code/plots/data/bins-convergence/5_6/boundary.txt new file mode 100644 index 0000000..125834b --- /dev/null +++ b/code/plots/data/bins-convergence/5_6/boundary.txt @@ -0,0 +1,10 @@ +-0.000208901305996 +-0.00119659902111 +-0.00400613615216 +-0.000182689472467 +-0.000418655672092 +-0.000587400025097 +-0.000126989212504 +-0.000168067257619 +-0.000208552539334 +-0.000311630650458 diff --git a/code/plots/data/bins-convergence/5_6/separation.txt b/code/plots/data/bins-convergence/5_6/separation.txt new file mode 100644 index 0000000..53b3f5a --- /dev/null +++ b/code/plots/data/bins-convergence/5_6/separation.txt @@ -0,0 +1,10 @@ +0.00132015651616 +0.000233218408539 +34479.2546936 +0.000343210762367 +0.000138011280796 +6.28076959401e-05 +1008.38791257 +2394.95227447 +0.00148391866242 +0.00565203944279 diff --git a/code/plots/data/bins-convergence/5_6/turbineX.txt b/code/plots/data/bins-convergence/5_6/turbineX.txt new file mode 100644 index 0000000..9bb8fcd --- /dev/null +++ b/code/plots/data/bins-convergence/5_6/turbineX.txt @@ -0,0 +1,10 @@ +-988.82428106, 819.751989032, -843.585249973, -431.880703263, 920.213520115, 260.323624538, -721.656505958, -559.921566149, 1033.74305184, 41.0554241379, -1173.31091372, -330.348079284, -941.635284163, -501.111053014, -1.90901878292, 175.728837711, 1133.1350495, -105.495917252, 686.067846983, 499.928294034, -170.928440394, -615.375118802, -234.175127528, 380.172220878, 523.345195825 +1169.1639806, -214.052830769, -611.241061252, 383.246495688, 41.4013536092, -106.491268314, 20.0264875995, -1172.59209827, -191.845662057, -80.3290095363, -326.450300885, 601.471296915, -361.729462315, 142.438459101, -985.907035502, 453.808305858, -489.292654087, -1050.180737, 742.497786006, -745.528989876, 271.293792684, 761.655511024, -878.209722562, 1032.45314079, 895.502426533 +1104.02637477, 469.693291674, -127.414263916, -1044.0904053, -533.086083684, 228.991818112, -928.707986079, -391.810231375, 348.411847806, 151.740492921, 435.448687929, 586.711549171, 721.412213381, -259.412134563, -71.8816012994, -1157.90002356, -209.312821031, -611.234717656, 74.269196503, -343.94967121, -799.406026064, 985.687217904, 735.015590122, 867.975610684, -731.773005428 +-252.254613682, 1168.29308869, 742.463867476, 199.8152713, 495.210074921, -422.666718022, 15.0607427319, 166.126955731, 665.901958326, -1003.88619721, -399.079904287, -677.578751749, 598.68117072, -806.503420562, 306.018402036, -110.746329684, 878.251332009, 470.14095157, -556.764400176, 1031.27206309, 362.838921047, 33.3915359124, 870.509201669, -1145.33906569, -831.336451188 +322.298123409, -720.379375546, 167.525560578, -607.583100942, 774.563237429, 47.8741572944, 437.556146483, 908.552681549, -1030.3164921, -858.758478595, -375.80487627, 18.731551069, 629.487313836, -1173.08805922, -126.678471881, 1036.24691843, 1125.79128049, 694.99976279, -248.388970555, 323.2280241, -485.469190033, 560.66155174, -572.804720685, -1039.23374499, -885.371983609 +55.4709593041, -263.392599451, -224.286989462, 502.047706221, 379.976612061, 1146.4635815, 805.298461433, -549.852746295, -998.746164465, -558.758520368, 905.589998347, -357.460947905, -1169.12903409, -692.718503617, 1010.26537128, -684.451167319, -855.624053317, 196.921362482, 643.704381992, 62.9782057203, -410.19237334, 159.911851908, -86.9550092311, 768.662141767, 262.011114321 +-277.859505076, 195.741444567, 325.225617031, -393.198871362, 791.414777005, -1048.34120475, 1127.18001353, 752.219105895, 551.025405977, 196.842972523, -925.718123676, -439.911342354, 653.359678519, 403.55990196, 54.9341114276, -713.870795205, -560.811563786, 1013.39495576, 430.027457269, -135.411538057, -163.285586778, 910.397247212, -20.2690414081, -1171.496584, -783.108232274 +599.772125217, -10.9279144578, -262.981540052, 352.575999899, 1018.8656095, -906.148805323, 22.1994381792, 483.179574309, -1170.87394783, 157.267405108, -1038.1695754, -377.592044919, 232.104923344, 725.696563074, -731.387104313, 487.327575584, -456.687745148, 857.567263801, 866.331814555, 354.99108835, -939.273993306, -140.774009698, -128.274760041, 1142.64557701, -589.290849378 +-487.815914766, 687.91089108, 424.607800441, 596.887611833, 1154.08411958, -950.460818916, -71.3153736876, -350.539227524, 251.226393919, -477.372283455, 959.906416794, 1056.92779731, 557.72925494, -843.641273105, 296.664383035, -123.465302743, -244.081595859, -1120.83717097, 422.445752867, -602.920976201, 20.9344225156, 927.726952384, 144.844954862, -721.935035975, 812.014800794 +-198.672991027, 391.365584882, 215.4832964, 841.25203975, 52.5759765022, 1065.50173238, 640.701285655, -711.716088584, -257.901187931, 718.061014467, -859.30865321, 173.338233664, -1021.39508052, 953.958966556, 1159.46473453, -1148.64114064, -71.045380488, -526.548598944, -902.842644843, -612.700947713, 547.091173854, 285.223047278, -478.167806139, -368.783686849, -360.616418601 diff --git a/code/plots/data/bins-convergence/5_6/turbineY.txt b/code/plots/data/bins-convergence/5_6/turbineY.txt new file mode 100644 index 0000000..8d831a3 --- /dev/null +++ b/code/plots/data/bins-convergence/5_6/turbineY.txt @@ -0,0 +1,10 @@ +-631.951346518, -538.715776685, -384.402065362, -373.93087752, 174.682850226, 960.756764342, 15.2616267336, -1031.32157371, 555.437841177, 32.9928084605, 21.8555490757, 20.9022929409, 700.328047063, 419.449013509, -1106.82402546, -454.31628922, -305.189953264, 671.931960047, -7.33825453915, 1061.70033113, -739.275503736, 992.799317827, 1000.10522579, -252.08767763, -754.972815226 +-100.954198855, -1153.82737599, 444.109452029, -913.939281966, -604.479041495, -298.49783829, 374.680674422, 46.5453662128, 1157.72748625, -930.852175875, 641.602587918, 295.579388921, -364.498335226, 913.145520812, -450.662845423, 674.69758528, -5.88310297459, 448.590232452, -908.753718925, 906.268768821, -29.7779064489, 892.758483834, 253.55683846, 315.693458206, -422.242850395 +397.821154889, 37.3578757397, 1166.57752198, 148.139268155, 1045.44494252, 908.15690236, 446.075758077, 427.821816329, -291.723459847, -882.225003996, -1089.73837883, 405.689905045, 925.58119377, 831.327637752, -279.717787194, -190.805788931, -608.313445308, -225.221191396, 415.061179339, -925.809718276, 840.555018668, 55.3257182493, -884.386939278, -292.00735979, -917.412021773 +550.752903156, 110.57692962, -161.275952679, -967.802889229, -770.163870898, -845.632431489, -486.214407501, 792.670111543, -966.286998761, 138.758430856, 1103.57201307, -96.7890221609, 73.0444080159, 852.460107325, 1132.91164163, -31.9481856221, -493.326008917, 542.844292425, 337.345612972, 506.176919043, -471.770213427, 335.499135, 786.987694439, -255.606621505, -828.260586984 +102.281844465, 317.608880877, -406.197433888, -1003.98141319, -338.895888468, 905.290287811, 907.567536895, 94.7161849897, 561.768614016, 757.134547947, 72.0982886739, -897.914215279, -888.524653686, -31.6280639595, -165.423952007, 550.752408766, -331.255076988, 945.575065187, 704.379673335, -1128.12226854, -434.663605085, 557.226123016, 974.245638541, -431.643219702, -770.228760534 +-838.733914137, -557.220086376, 585.803754315, -18.6623346988, 272.355469379, -250.515137504, -24.4312095411, 343.510019466, 616.150950235, -724.414030878, 276.780443443, 1117.74726166, -101.357058268, -947.247428175, 597.076030768, 870.890171357, 118.154103956, 1156.87465888, -530.380736284, 794.71243235, -167.660945949, -527.736322975, 48.5514442637, -886.732431349, -194.78211586 +420.223680956, -463.495770597, 486.83686866, -492.84335869, 80.3839693351, -513.33426254, 326.498257823, -813.925207478, 305.390234341, 1134.58020978, -152.30833593, 1087.94021092, -355.150213402, -1101.25294069, 695.739680938, -739.037237195, -1030.83780468, -591.748747096, 34.1760903583, 875.675562949, -712.039885196, -295.572183406, -1094.98881131, 68.7869663463, 338.380241761 +90.805822483, 1108.27810344, -15.7442877474, -831.035344614, 98.3624872548, 745.674349861, -232.457389974, -1069.42684884, -78.6771832961, 431.358028766, 355.046824957, -503.749844893, -441.106970161, 445.832422285, -539.85165392, 778.632782589, 728.98607819, -801.070709697, 791.583920361, 1118.53351719, -703.491482993, 730.088757162, -1166.02266645, -267.389201211, 1014.82618702 +-177.45120259, -342.046441253, 1094.00370735, 899.273973878, 212.663535801, -151.252280376, -1074.88093933, -489.515626499, -397.771509344, -1072.03169375, 647.920013316, -343.087282064, -709.554818846, 815.723967346, 683.657363754, 119.00116209, 453.216330002, -347.649582154, -1082.0685017, 142.83523937, -213.830066512, -718.650876911, 151.089587471, 487.463384158, 201.502229573 +-383.488618921, -301.487984926, 749.171357827, 818.187569193, -316.600816151, 308.096826584, -227.782929793, 585.154480513, 341.068814617, 293.956738577, 799.202589336, -709.702731567, 355.56060737, 32.5771758174, -181.045812341, -240.331945458, 160.27912222, -723.592881341, -749.674321488, 95.1102923033, -967.201566563, -1138.32507706, 1071.67698282, -1114.06248268, 806.240701907 diff --git a/code/plots/multiModality.py b/code/plots/multiModality.py index 8df1e43..0b5e4a9 100644 --- a/code/plots/multiModality.py +++ b/code/plots/multiModality.py @@ -442,12 +442,12 @@ 835358.34578171, 835432.48139145, 835484.7544569 , 835584.98976928]) # - ax31.plot(d_x,AEP_x,color='C3',alpha=0.5) + ax31.plot(d_x,AEP_x,color='C2',alpha=0.5) # ax1.set_xticks([2.,3.,4.]) # ax1.set_xticklabels(['2','3','4']) # ax1.set_xlabel(r'$dx$ '+'(rotor\ndiameters)') - ax32.plot(d_y,AEP_y,color='C3',alpha=0.5) + ax32.plot(d_y,AEP_y,color='C2',alpha=0.5) # ax2.set_xticks([7.,8.,9.]) # ax2.set_xticklabels(['7','8','9']) # ax2.set_xlabel(r'$dy$ '+'(rotor\ndiameters)') @@ -769,5 +769,5 @@ plt.subplots_adjust(top = 0.93, bottom = 0.1, right = 0.96, left = 0.1, hspace = 0.7, wspace = 1.0) - plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/multimodality.pdf',transparent=True) + # plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/multimodality.pdf',transparent=True) plt.show() diff --git a/code/plots/multiModality2D.py b/code/plots/multiModality2D.py index 87f8b69..2640fc8 100644 --- a/code/plots/multiModality2D.py +++ b/code/plots/multiModality2D.py @@ -3103,6 +3103,6 @@ def linearize(self, params, unknowns, resids): plt.colorbar(m) - plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/mm2.pdf',transparent=True) + # plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/mm2.pdf',transparent=True) plt.show() diff --git a/code/plots/multiModalityR1.py b/code/plots/multiModalityR1.py new file mode 100644 index 0000000..060b34a --- /dev/null +++ b/code/plots/multiModalityR1.py @@ -0,0 +1,948 @@ +import numpy as np +import scipy as sp +import sys +import matplotlib.pyplot as plt +sys.dont_write_bytecode = True + + +if __name__ == "__main__": + + nTurbines = 100 + + num = 200 + d_dx = np.linspace(2.,3.,num) + d_dy = np.linspace(8.,10.,num) + d_shear = np.linspace(2.,4.,num) + d_rot = np.linspace(-10.,10.,num) + d_start = np.linspace(-2,2,num) + + AEP_dx = np.array([1365869.34295398, 1366080.06739614, 1366287.61447064, + 1366492.76272339, 1366701.59814303, 1366910.77902102, + 1367120.04172719, 1367328.49137441, 1367536.15363293, + 1367745.00382154, 1367953.99758509, 1368164.30236347, + 1368371.90763994, 1368577.64001879, 1368781.39674107, + 1368984.04991362, 1369183.53541418, 1369380.4793678 , + 1369575.21237656, 1369769.56589173, 1369962.17785702, + 1370155.0631664 , 1370347.16846488, 1370542.76470451, + 1370735.50052685, 1370923.82821549, 1371109.7979397 , + 1371296.04537385, 1371481.18964356, 1371663.84736328, + 1371841.43159635, 1372013.60094946, 1372182.12170136, + 1372348.46330193, 1372511.48675879, 1372670.5713426 , + 1372826.97666319, 1372984.53844126, 1373138.88734814, + 1373289.99041875, 1373437.67542877, 1373584.53729449, + 1373733.68245108, 1373883.06733339, 1374031.29727446, + 1374179.96553952, 1374329.26112036, 1374478.86524866, + 1374626.99099308, 1374776.39177778, 1374923.94530125, + 1375070.55104244, 1375216.86017668, 1375365.23147439, + 1375516.82915697, 1375673.76528889, 1375832.50711331, + 1375991.13595102, 1376149.95055537, 1376311.16729369, + 1376473.82951124, 1376637.39442855, 1376802.57666576, + 1376970.2802101 , 1377141.56156967, 1377313.63464714, + 1377488.26209934, 1377664.40802811, 1377838.72383678, + 1378014.57562113, 1378191.00739084, 1378375.68197234, + 1378561.52115432, 1378745.68376676, 1378929.97275352, + 1379112.12305377, 1379290.1264255 , 1379466.18625147, + 1379639.24459489, 1379807.77397858, 1379971.44124188, + 1380129.63538443, 1380281.47111476, 1380426.77813134, + 1380565.1834122 , 1380698.4532444 , 1380827.70351281, + 1380951.2620532 , 1381065.801706 , 1381173.32233038, + 1381273.85879395, 1381373.00491952, 1381471.16293102, + 1381563.78549068, 1381651.30733761, 1381732.00279881, + 1381806.68583179, 1381878.14469158, 1381942.35381963, + 1381999.32614642, 1382049.79213198, 1382093.74778606, + 1382129.66797316, 1382159.52257276, 1382181.64344774, + 1382198.93113182, 1382211.38521086, 1382221.35871978, + 1382232.22949156, 1382246.17228916, 1382256.94618345, + 1382264.11869495, 1382266.84927923, 1382265.35508457, + 1382261.10719169, 1382254.45788874, 1382246.80838953, + 1382239.58153309, 1382237.63610794, 1382244.61184865, + 1382253.721746 , 1382265.6726112 , 1382279.95236971, + 1382296.28732472, 1382314.48487435, 1382333.823723 , + 1382354.33170969, 1382376.19001692, 1382399.43272514, + 1382426.44857143, 1382456.20733276, 1382485.1911674 , + 1382513.07469562, 1382538.63755606, 1382562.28230141, + 1382585.70258923, 1382605.882841 , 1382625.21759164, + 1382641.45667548, 1382653.70326389, 1382663.35193243, + 1382668.62457853, 1382666.73313242, 1382659.0421128 , + 1382646.67691439, 1382627.26178386, 1382599.58070802, + 1382565.67249152, 1382525.94198833, 1382480.19419363, + 1382434.42791034, 1382388.50769965, 1382339.0409462 , + 1382285.88321734, 1382228.15429451, 1382167.68251627, + 1382100.68645642, 1382028.43014948, 1381950.38686321, + 1381867.04853563, 1381780.16359314, 1381688.68020763, + 1381592.12719032, 1381492.71277593, 1381393.84698415, + 1381295.72583577, 1381201.3425966 , 1381101.3810574 , + 1380995.12967645, 1380882.20254321, 1380765.89885477, + 1380645.38048621, 1380521.35035157, 1380398.43574159, + 1380269.52652346, 1380133.20250754, 1379989.81438156, + 1379837.29453516, 1379678.91261503, 1379513.83322803, + 1379343.92575732, 1379167.1226767 , 1378984.41192744, + 1378793.79753542, 1378594.76799783, 1378384.32741668, + 1378163.41915324, 1377936.85560314, 1377709.33418518, + 1377481.12648233, 1377247.73516619, 1377017.73010497, + 1376782.10805264, 1376541.58343903, 1376300.88800872, + 1376051.8793031 , 1375803.57915008, 1375574.11613011, + 1375711.02475498, 1375164.96635902]) + + AEP_dy = np.array([1377155.22718947, 1377244.23596889, 1377332.82191244, + 1377421.34872959, 1377509.92630941, 1377597.78970394, + 1377684.56247085, 1377770.03087281, 1377853.6447528 , + 1377935.23989045, 1378015.56399992, 1378095.54089307, + 1378173.25727948, 1378248.67284573, 1378322.06274657, + 1378393.32887259, 1378462.65034332, 1378530.03911095, + 1378595.50053859, 1378658.78621934, 1378719.83844713, + 1378778.78953004, 1378835.82806144, 1378890.36712054, + 1378942.87047987, 1378994.0795069 , 1379044.24726253, + 1379093.41403923, 1379141.23241585, 1379187.47703415, + 1379232.6097038 , 1379277.06396067, 1379321.7747803 , + 1379365.76718325, 1379415.21858046, 1379465.21603382, + 1379514.28502675, 1379562.47100466, 1379610.75692653, + 1379658.57550433, 1379705.9224215 , 1379752.33880068, + 1379797.49566848, 1379842.31968298, 1379886.54018268, + 1379930.15124728, 1379972.83078791, 1380014.72081447, + 1380055.54208158, 1380094.42793891, 1380132.16666558, + 1380168.82858667, 1380204.5046331 , 1380239.40779836, + 1380274.81931637, 1380310.1669418 , 1380344.71743606, + 1380378.80411807, 1380413.06839627, 1380448.22640086, + 1380484.2017883 , 1380519.91742761, 1380555.7888882 , + 1380591.54464444, 1380627.22452566, 1380662.73265007, + 1380698.30096443, 1380733.73510918, 1380769.01432501, + 1380803.95079656, 1380838.63248454, 1380873.11559789, + 1380907.65598487, 1380941.97106226, 1380976.74539926, + 1381011.43409457, 1381046.91444877, 1381082.03310852, + 1381116.8472863 , 1381151.45904546, 1381186.56907114, + 1381222.21040789, 1381257.80879609, 1381293.62111103, + 1381329.26039328, 1381364.83233796, 1381400.39612211, + 1381436.24568798, 1381471.64508092, 1381507.08575138, + 1381542.6274792 , 1381578.58341573, 1381614.43867004, + 1381650.2101188 , 1381685.75998913, 1381721.26902617, + 1381756.74170456, 1381792.3060374 , 1381828.28174894, + 1381864.22125476, 1381899.69319048, 1381935.95209665, + 1381972.11536179, 1382007.75732889, 1382044.23628764, + 1382080.87841754, 1382117.05841576, 1382152.41821813, + 1382187.04780057, 1382221.05510803, 1382254.3457472 , + 1382286.90420003, 1382318.62853049, 1382349.58371556, + 1382379.84992845, 1382408.94852062, 1382436.905748 , + 1382464.20981573, 1382490.68547373, 1382516.42898796, + 1382540.94645644, 1382563.87330105, 1382585.84828965, + 1382606.73675023, 1382626.37294054, 1382645.78655037, + 1382664.16215475, 1382680.98307601, 1382696.73415053, + 1382711.21256609, 1382724.95949866, 1382737.94822297, + 1382749.49938941, 1382759.91042147, 1382769.41960791, + 1382778.38059685, 1382787.5733205 , 1382796.38527543, + 1382805.76263118, 1382815.15298148, 1382824.52558659, + 1382834.0063612 , 1382843.20282192, 1382852.90112146, + 1382862.61747224, 1382872.71820965, 1382883.21663648, + 1382894.11581627, 1382904.67728344, 1382915.09311889, + 1382925.10079269, 1382934.80362702, 1382944.27330877, + 1382953.60867614, 1382962.76427005, 1382971.56141796, + 1382979.82341625, 1382989.14285524, 1382999.27846017, + 1383009.81380948, 1383020.58352224, 1383031.36372671, + 1383043.11364515, 1383054.78022272, 1383066.0270795 , + 1383077.30684052, 1383088.35166002, 1383098.93931628, + 1383109.24113405, 1383119.12977686, 1383128.51046209, + 1383137.57811115, 1383146.24546864, 1383154.64699737, + 1383162.72946065, 1383170.23181531, 1383179.41722408, + 1383188.53753883, 1383197.19813436, 1383206.36679657, + 1383214.93538484, 1383222.87689412, 1383230.09095392, + 1383236.58513987, 1383242.23750696, 1383245.97851567, + 1383248.77789349, 1383249.97301359, 1383249.701377 , + 1383248.14673468, 1383244.96244995, 1383240.19403629, + 1383233.52181712, 1383224.80718834, 1383214.77272713, + 1383202.68672703, 1383189.81630326, 1383176.10156647, + 1383161.59265707, 1383146.03284556]) + + AEP_shear = np.array([ 1380658.88138844, 1380628.899539 , 1380600.43539763, + 1380572.37094322, 1380544.05364761, 1380515.44743364, + 1380486.51913453, 1380457.42765755, 1380428.14138535, + 1380398.93588288, 1380369.46345811, 1380340.22310912, + 1380311.00276581, 1380281.7981083 , 1380253.27104804, + 1380224.16201182, 1380193.93282275, 1380163.74878269, + 1380133.25647532, 1380102.3471926 , 1380071.52437273, + 1380040.5586648 , 1380008.91539768, 1379976.18898679, + 1379941.63624338, 1379905.20186284, 1379868.68873113, + 1379831.3251683 , 1379795.00052072, 1379758.62114021, + 1379722.42788951, 1379686.25644201, 1379649.78794334, + 1379613.50204718, 1379577.37004311, 1379540.8111528 , + 1379504.64562141, 1379469.03795769, 1379433.19121362, + 1379397.71457925, 1379362.51252105, 1379328.79708386, + 1379299.2489747 , 1379271.0216068 , 1379244.42791651, + 1379219.1114494 , 1379197.82802236, 1379177.91183165, + 1379159.01954178, 1379140.85369869, 1379123.58561626, + 1379108.49624334, 1379096.30100451, 1379085.67134974, + 1379077.15504232, 1379069.40548614, 1379063.54753877, + 1379058.94759876, 1379054.82375039, 1379053.97069255, + 1379055.66725799, 1379057.5418747 , 1379059.01804996, + 1379060.14300242, 1379060.56366339, 1379060.76786114, + 1379060.98965633, 1379060.75832259, 1379061.7686613 , + 1379063.25489898, 1379064.83649982, 1379065.69338764, + 1379065.99387956, 1379066.29371666, 1379067.24309081, + 1379068.82079858, 1379071.59112742, 1379076.72774086, + 1379082.66424632, 1379088.17668496, 1379093.51728764, + 1379098.6311416 , 1379102.97799692, 1379106.38315596, + 1379109.32519006, 1379110.63350491, 1379110.21359082, + 1379108.461119 , 1379105.52209512, 1379101.31084074, + 1379100.17386516, 1379100.29821593, 1379101.05049494, + 1379102.00291562, 1379103.09657059, 1379106.69988975, + 1379110.98146045, 1379116.26729904, 1379123.72988016, + 1379132.01637418, 1379142.88672475, 1379158.34724821, + 1379175.29325763, 1379192.35496994, 1379209.18503502, + 1379225.95760057, 1379242.95779727, 1379260.10940846, + 1379278.00851861, 1379297.82671203, 1379317.2996288 , + 1379339.7922133 , 1379363.44282758, 1379388.78717459, + 1379415.34686326, 1379442.2039266 , 1379469.5097547 , + 1379496.53370906, 1379523.88773684, 1379550.94188183, + 1379578.12997871, 1379608.27053206, 1379638.58258646, + 1379671.36433796, 1379705.59329417, 1379739.67967206, + 1379773.20570218, 1379808.80819858, 1379844.76651273, + 1379880.71224409, 1379916.49557079, 1379952.45568608, + 1379988.88034869, 1380026.36600822, 1380065.12864299, + 1380104.6652932 , 1380145.46154563, 1380186.785097 , + 1380228.7921647 , 1380271.34434488, 1380314.99440946, + 1380359.38135813, 1380403.73321751, 1380448.17565633, + 1380494.11675402, 1380540.92066853, 1380587.45143989, + 1380634.10163668, 1380682.34649524, 1380731.1742783 , + 1380780.40681703, 1380831.41049484, 1380885.31152514, + 1380939.80533408, 1380993.30580985, 1381045.42782608, + 1381098.37692446, 1381150.54212008, 1381203.93464753, + 1381257.58136183, 1381311.97701136, 1381366.02205337, + 1381419.9160041 , 1381472.28574619, 1381523.26251504, + 1381573.04653941, 1381622.0540294 , 1381670.77856956, + 1381718.38152504, 1381766.23076361, 1381813.9600838 , + 1381860.98324662, 1381907.13694113, 1381953.5462114 , + 1382001.38541798, 1382049.74793041, 1382098.89112361, + 1382148.36390421, 1382196.68066245, 1382243.68573615, + 1382289.48306882, 1382334.44701755, 1382378.66659039, + 1382422.09329897, 1382465.51753256, 1382508.12787798, + 1382550.09792017, 1382591.97146882, 1382632.66924349, + 1382673.71683486, 1382715.77844635, 1382757.59100267, + 1382798.19909838, 1382837.10710657, 1382874.07721027, + 1382909.03256178, 1382944.2477578 , 1382981.45069607, + 1383014.74520529, 1383044.33073436]) + + AEP_rot = np.array([ 1385102.26029412, 1385030.28152191, 1384964.71147097, + 1384913.26498365, 1384869.09487537, 1384829.49311562, + 1384793.69809339, 1384761.80680224, 1384731.55678708, + 1384702.82257797, 1384680.69054198, 1384665.57757906, + 1384648.79328419, 1384634.751077 , 1384626.76451201, + 1384623.28907323, 1384622.03381943, 1384616.77163228, + 1384611.89134245, 1384609.59490519, 1384613.69076131, + 1384620.7286478 , 1384632.50551687, 1384651.06955323, + 1384672.14600793, 1384695.07121561, 1384720.88842073, + 1384750.95476526, 1384786.23906884, 1384821.79194084, + 1384856.56894546, 1384892.07692366, 1384927.38265397, + 1384964.80361488, 1385000.94900655, 1385037.9664144 , + 1385077.58715509, 1385116.67537648, 1385156.19675863, + 1385194.51944216, 1385232.57202376, 1385266.52341163, + 1385301.10588306, 1385345.9195551 , 1385395.36467799, + 1385451.99318013, 1385511.43191782, 1385573.07777314, + 1385634.78880589, 1385696.82765316, 1385759.49871393, + 1385824.27687423, 1385878.85035154, 1385884.17706182, + 1385861.11224647, 1385826.50590546, 1385798.85412653, + 1385776.19134176, 1385756.64288494, 1385743.07186213, + 1385722.63303946, 1385702.68845134, 1385685.59286841, + 1385667.30088526, 1385639.84840688, 1385602.11184033, + 1385568.33012955, 1385537.2274989 , 1385496.33809728, + 1385441.96817381, 1385380.79400592, 1385326.79599631, + 1385271.96815666, 1385209.76420226, 1385147.20402292, + 1385077.14381647, 1385000.31240652, 1384924.98377897, + 1384850.13918043, 1384776.04499374, 1384693.83014653, + 1384607.78242778, 1384514.0730715 , 1384410.1227144 , + 1384303.03042107, 1384194.53966005, 1384081.77575797, + 1383964.23345069, 1383841.44552471, 1383714.90376434, + 1383582.77338509, 1383443.05676332, 1383306.03859375, + 1383162.65346892, 1383017.77271659, 1382878.79758497, + 1382741.37175332, 1382606.92838081, 1382477.27129252, + 1382352.15969194, 1382230.83196958, 1382111.93744715, + 1381994.07784105, 1381880.3508731 , 1381772.36539115, + 1381669.97763064, 1381573.71853037, 1381483.46487234, + 1381396.08276426, 1381311.49662144, 1381229.41299929, + 1381149.56522683, 1381072.65780982, 1380999.41462742, + 1380927.68232136, 1380860.90938793, 1380801.82592868, + 1380746.60142755, 1380691.51814819, 1380635.288718 , + 1380582.97032902, 1380534.04109525, 1380487.19144059, + 1380447.83700068, 1380418.24054665, 1380397.13916986, + 1380379.32916922, 1380366.29436206, 1380360.9631064 , + 1380351.01363529, 1380329.89018832, 1380307.52705614, + 1380283.25591791, 1380265.47331658, 1380255.19819706, + 1380248.34981082, 1380244.4594854 , 1380237.75704507, + 1380247.49535574, 1380262.21547142, 1380273.61264856, + 1380291.2572832 , 1380315.04440286, 1380345.71733255, + 1380384.30520667, 1380431.28176219, 1380474.98784764, + 1380480.72044805, 1380444.49824403, 1380407.68489778, + 1380377.38969982, 1380357.29265446, 1380342.23045053, + 1380332.57149023, 1380328.58815042, 1380334.77039557, + 1380344.36478561, 1380353.51657213, 1380366.69338411, + 1380383.45922113, 1380404.53885105, 1380426.09239361, + 1380448.10304655, 1380469.64261414, 1380492.2814891 , + 1380515.36079812, 1380537.79996951, 1380564.19619025, + 1380595.74902191, 1380634.21729767, 1380674.06842609, + 1380714.91059507, 1380757.83212928, 1380804.1311434 , + 1380853.86790878, 1380908.66302461, 1380965.95625408, + 1381025.30562181, 1381086.07355571, 1381149.21635396, + 1381216.88754637, 1381285.61787137, 1381356.27698288, + 1381429.24161393, 1381502.50781796, 1381576.58443398, + 1381652.39084292, 1381729.20385518, 1381803.73433022, + 1381875.80652429, 1381942.07743299, 1382004.59813471, + 1382071.22389393, 1382142.15009633, 1382214.53937804, + 1382292.0402508 , 1382372.43926241, 1382457.55553229, + 1382545.77853709, 1382635.98688656]) + + AEP_start = np.array([1382792.62875479, 1382837.084754 , 1382883.32851408, + 1382930.26783325, 1382977.00336878, 1383027.36843932, + 1383078.81144897, 1383129.99695197, 1383181.25874553, + 1383233.43885664, 1383284.87942932, 1383335.34214402, + 1383381.18016575, 1383427.11641844, 1383474.37499029, + 1383520.34000493, 1383565.44109278, 1383609.42556245, + 1383652.80385354, 1383695.87521647, 1383737.37906624, + 1383774.05212857, 1383805.44120713, 1383836.64838148, + 1383868.9777338 , 1383898.72654478, 1383925.66215039, + 1383949.89514142, 1383973.00702913, 1383997.43371413, + 1384020.17822011, 1384041.15068966, 1384059.70113304, + 1384076.84151511, 1384092.53265406, 1384105.90713353, + 1384117.57258127, 1384128.19990901, 1384138.2937838 , + 1384144.78167486, 1384149.98180547, 1384156.0465562 , + 1384161.20377949, 1384165.21811922, 1384166.6313897 , + 1384166.11374855, 1384164.50669001, 1384159.69888083, + 1384151.73241463, 1384140.32320822, 1384123.19682188, + 1384105.86188093, 1384088.27666984, 1384069.63172052, + 1384050.51718319, 1384030.28869677, 1384008.81795435, + 1383986.56703209, 1383961.9551437 , 1383935.45887433, + 1383907.38321658, 1383877.20294308, 1383846.45176739, + 1383814.07902239, 1383779.64806357, 1383735.23018284, + 1383689.60483752, 1383642.73866813, 1383590.61061501, + 1383536.0776211 , 1383480.41972169, 1383423.72413078, + 1383365.42160961, 1383305.14107645, 1383243.54342404, + 1383180.45406366, 1383116.15126449, 1383055.78194821, + 1382997.19382921, 1382940.14030834, 1382884.29728411, + 1382830.04615776, 1382777.24641782, 1382725.95041182, + 1382678.61969431, 1382636.88096882, 1382597.67570124, + 1382560.35504596, 1382524.40191356, 1382492.37887294, + 1382462.08877711, 1382434.16258507, 1382409.19214857, + 1382386.61883076, 1382367.58623438, 1382350.77946458, + 1382336.37892761, 1382322.29033984, 1382308.94324774, + 1382296.46225351, 1382282.98050862, 1382268.18046157, + 1382255.07435261, 1382244.01098186, 1382235.19710553, + 1382229.07571337, 1382225.0747963 , 1382223.37117379, + 1382224.61797377, 1382228.87943764, 1382237.48946736, + 1382248.02003238, 1382259.84038231, 1382273.48605844, + 1382290.19346535, 1382308.72634901, 1382327.64613522, + 1382346.30343687, 1382365.30332936, 1382383.58627975, + 1382402.52175266, 1382421.32577284, 1382441.4479894 , + 1382462.24460652, 1382484.06434231, 1382503.88447736, + 1382520.99610992, 1382536.26729934, 1382549.45463612, + 1382560.62919686, 1382570.38050502, 1382578.23173839, + 1382585.32748647, 1382591.53582198, 1382596.85933886, + 1382600.10496465, 1382601.73675662, 1382603.7653407 , + 1382605.88788214, 1382605.98258111, 1382601.7978705 , + 1382593.88108026, 1382582.16162012, 1382568.45875076, + 1382552.95221858, 1382535.08580022, 1382515.47875296, + 1382493.78641758, 1382469.81564184, 1382445.12082121, + 1382420.53292559, 1382397.19400314, 1382375.30259096, + 1382354.37523848, 1382335.69134907, 1382320.75214278, + 1382307.70114038, 1382296.09048932, 1382286.34606613, + 1382279.87155075, 1382278.0215114 , 1382279.00570972, + 1382280.90353518, 1382278.7908062 , 1382279.75732389, + 1382285.35296138, 1382292.65396425, 1382302.01355371, + 1382313.68978241, 1382327.63769436, 1382344.20497199, + 1382364.49242501, 1382386.38308712, 1382409.93888779, + 1382436.89982123, 1382465.65897255, 1382495.4140197 , + 1382527.50264502, 1382563.00783964, 1382601.24015684, + 1382640.79125872, 1382677.55658468, 1382715.87601949, + 1382757.32886634, 1382800.5524993 , 1382845.35409232, + 1382891.67026089, 1382938.70991977, 1382985.54258075, + 1383036.57447896, 1383088.0067125 , 1383139.13087014, + 1383190.58163739, 1383242.72163239, 1383294.06308211, + 1383343.6777057 , 1383389.28437567, 1383435.67407444, + 1383482.68368629, 1383528.38223519]) + + import matplotlib as mpl + mpl.rc('font', family = 'serif', serif = 'cmr10') + plt.rcParams["mathtext.fontset"] = "dejavuserif" + fig = plt.figure(figsize=[6.5,4.]) + ax21 = plt.subplot2grid((3, 10), (1, 0),colspan=2) + ax22 = plt.subplot2grid((3, 10), (1, 2),colspan=2) + ax23 = plt.subplot2grid((3, 10), (1, 4),colspan=2) + ax24 = plt.subplot2grid((3, 10), (1, 6),colspan=2) + ax25 = plt.subplot2grid((3, 10), (1, 8),colspan=2) + + + ax21.plot(d_dx,AEP_dx,color='C0',alpha=0.5) + ax21.set_xticks([2.,2.5,3.]) + ax21.set_xticklabels(['2D','2.5D','3D']) + ax21.set_xlabel(r'$dx$',fontsize=8) + + ax22.plot(d_dy,AEP_dy,color='C0',alpha=0.5) + ax22.set_xticks([8.,9.,10.]) + ax22.set_xticklabels(['8D','9D','10D']) + ax22.set_xlabel(r'$dy$',fontsize=8) + + ax23.plot(d_shear,AEP_shear,color='C0',alpha=0.5) + ax23.set_xticks([2.,3.,4.]) + ax23.set_xticklabels(['2D','3D','4D']) + ax23.set_xlabel(r'$b$',fontsize=8) + + ax24.plot(d_rot,AEP_rot,color='C0',alpha=0.5) + ax24.set_xticks([-10.,0.,10.]) + ax24.set_xticklabels([r'-10$^\circ$',r'0$^\circ$',r'10$^\circ$']) + ax24.set_xlabel(r'$\theta$',fontsize=8) + + ax25.plot(d_start,AEP_start,color='C0',alpha=0.5) + ax25.set_xticks([-2.,0.,2.]) + ax25.set_xticklabels(['-2D','0','2D']) + ax25.set_xlabel(r'$s$',fontsize=8) + + ax21.set_xlim(2.,3.) + ax22.set_xlim(8.,10.) + ax23.set_xlim(2.,4.) + ax24.set_xlim(-10.,10.) + ax25.set_xlim(-2.,2.) + + ax21.set_yticks([1365000.,1375000.,1385000.]) + ax22.set_yticks([1365000.,1375000.,1385000.]) + ax23.set_yticks([1365000.,1375000.,1385000.]) + ax24.set_yticks([1365000.,1375000.,1385000.]) + ax25.set_yticks([1365000.,1375000.,1385000.]) + + ax21.set_yticklabels(['1365','1375','1385']) + ax22.set_yticklabels(['','','']) + ax23.set_yticklabels(['','','']) + ax24.set_yticklabels(['','','']) + ax25.set_yticklabels(['','','']) + # + ax21.set_ylim(1365000.,1387000.) + ax22.set_ylim(1365000.,1387000.) + ax23.set_ylim(1365000.,1387000.) + ax24.set_ylim(1365000.,1387000.) + ax25.set_ylim(1365000.,1387000.) + + ax21.set_ylabel('AEP (GWh)',fontsize=8) + # + ax31 = plt.subplot2grid((3, 10), (2, 3),colspan=2) + ax32 = plt.subplot2grid((3, 10), (2, 5),colspan=2) + + d_x = np.linspace(-2916.77457115,2916.77457115,num) + d_y = np.linspace(-3752.34924936,3752.34924936,num) + + AEP_x = np.array([1345007.43469253, 1344477.90434529, 1344477.90434529, + 1344522.32649628, 1345062.55787602, 1345963.2015593 , + 1346816.80249621, 1347305.89618453, 1347473.98249841, + 1347502.3364152 , 1347435.87926415, 1347336.3902033 , + 1347220.95414963, 1347119.00300069, 1346928.85475003, + 1346685.06977566, 1346380.81638993, 1346015.97718538, + 1345683.80900278, 1345380.9342986 , 1345076.31282626, + 1345123.76096528, 1345307.65801367, 1345701.54044611, + 1346024.36655705, 1346269.00565774, 1346510.03059707, + 1346656.37716066, 1346664.73722117, 1346678.45083467, + 1346650.92312441, 1346579.89791944, 1346553.84382667, + 1346510.94388742, 1346433.14958701, 1346278.79815963, + 1346130.79584256, 1346049.84166076, 1345995.80203679, + 1345941.20896091, 1345963.55299286, 1345997.16553498, + 1346018.70648407, 1346002.9674294 , 1346083.03591141, + 1346213.89902481, 1346397.1169047 , 1346525.75828558, + 1346630.63626019, 1346662.16080728, 1346614.81780703, + 1346515.5759771 , 1346388.05606836, 1346294.81094486, + 1346239.06526216, 1346205.42849078, 1346223.17304022, + 1346330.70138972, 1346361.23128729, 1346346.72401239, + 1346325.25476273, 1346270.61941334, 1346219.81630099, + 1346258.43456541, 1346307.32570228, 1346367.89182581, + 1346472.09890296, 1346560.54593701, 1346590.98072347, + 1346559.7768337 , 1346482.16704317, 1346345.78527036, + 1346159.1785784 , 1345974.45439334, 1345819.76551857, + 1345773.00724017, 1345797.88504789, 1345776.42603805, + 1345756.59392316, 1345797.4649785 , 1345871.37933806, + 1345901.37919111, 1346022.48855535, 1346203.48575741, + 1346344.75743676, 1346392.02999298, 1346421.60432574, + 1346432.25155598, 1346427.01062998, 1346369.89176694, + 1346305.55472285, 1346134.0337464 , 1345858.73107877, + 1345509.84629194, 1345283.51868058, 1345017.89308792, + 1344799.76833501, 1344684.82478903, 1345003.45510473, + 1345294.72757248, 1345598.15515876, 1345905.53193071, + 1346151.80530992, 1346338.86053195, 1346529.34942457, + 1346652.15757389, 1346741.72059216, 1346829.98190924, + 1346897.29633741, 1346940.77222234, 1346958.22466357, + 1346961.168634 , 1346977.25902668, 1347016.40140567, + 1347051.41878113, 1347081.81187256, 1347089.70173473, + 1347092.57250623, 1347110.11396557, 1347095.63645026, + 1347096.14949518, 1347091.7673848 , 1347088.48755841, + 1347016.93856226, 1346931.86196676, 1346816.33941076, + 1346717.77544873, 1346586.43953978, 1346391.91256257, + 1346207.77001476, 1345976.30808429, 1345653.14723399, + 1345346.08275423, 1345059.84685787, 1344817.50760594, + 1344912.73837443, 1345248.83631814, 1345507.20091238, + 1345825.19128264, 1346156.44905318, 1346453.16094007, + 1346572.05061363, 1346586.5297131 , 1346611.69520117, + 1346595.13960514, 1346571.23414698, 1346553.55570306, + 1346525.27703666, 1346414.81571301, 1346259.96458969, + 1346146.08936604, 1346135.60780834, 1346104.42242724, + 1346065.16372443, 1346094.65269989, 1346152.48100743, + 1346202.06857969, 1346281.96681804, 1346452.7247408 , + 1346616.19872246, 1346818.04829935, 1346960.8306902 , + 1347042.16287023, 1347049.03545048, 1346973.03415405, + 1346833.2407777 , 1346672.00845191, 1346572.65854955, + 1346521.77013359, 1346524.82048075, 1346657.59703959, + 1346824.46822474, 1346922.00938364, 1346953.42073452, + 1346893.71129803, 1346835.75771916, 1346846.70738437, + 1346893.92398194, 1346977.50252391, 1347140.75315699, + 1347371.23022525, 1347531.88872937, 1347605.0641598 , + 1347579.61815326, 1347497.0175393 , 1347344.78031745, + 1347131.08777121, 1346877.4083592 , 1346717.89127609, + 1346788.59399048, 1346906.13663168, 1346963.84564259, + 1347033.02485599, 1347180.46374314, 1347262.24393037, + 1347369.83723156, 1347625.93257314, 1348019.91209185, + 1348383.15991063, 1348647.34856706 ]) + + AEP_y = np.array([1348818.57869565, 1348554.27877293, 1348292.29741122, + 1348033.92809015, 1347623.74460089, 1346983.31865752, + 1346094.87723502, 1345493.35764193, 1345327.32997611, + 1345643.78021538, 1346189.08572525, 1346550.53632053, + 1346827.05631694, 1347116.801111 , 1347283.94755733, + 1347344.95811517, 1347304.59364256, 1347087.84860725, + 1346734.52274753, 1346306.61028929, 1345761.02277863, + 1345048.68555664, 1344371.17785943, 1344039.96051938, + 1344326.14183367, 1344326.14183367, 1345210.65809595, + 1345738.9266603 , 1346086.44098051, 1346323.32684074, + 1346512.64241795, 1346653.50948352, 1346701.56592416, + 1346653.66310006, 1346491.61291775, 1346285.26747077, + 1346164.62028648, 1346126.70556611, 1346030.68875765, + 1346086.61937026, 1346205.91012891, 1346285.07362371, + 1346335.80367318, 1346361.49518881, 1346452.12630745, + 1346518.90937918, 1346560.72661868, 1346580.48817023, + 1346594.17529777, 1346628.56493348, 1346614.47362282, + 1346557.07129094, 1346518.4088097 , 1346545.86707627, + 1346547.33308263, 1346596.74223453, 1346578.54824096, + 1346503.44954261, 1346552.72214719, 1346632.13445261, + 1346688.34943863, 1346736.73863628, 1346770.55330851, + 1346790.16121941, 1346746.09327328, 1346682.47334203, + 1346604.14478634, 1346513.94381524, 1346475.47086608, + 1346471.93408416, 1346424.96330987, 1346352.27900293, + 1346323.01129914, 1346291.58432728, 1346384.81169205, + 1346474.27758979, 1346476.74399683, 1346447.59236073, + 1346393.93091104, 1346347.79284207, 1346271.72925822, + 1346244.74377864, 1346177.32627053, 1345977.27370241, + 1345865.58989202, 1345642.75071343, 1345474.64822953, + 1345465.22372281, 1345601.16266201, 1345782.57509375, + 1345996.65048835, 1346221.36477902, 1346515.38099053, + 1346695.38150811, 1346839.568208 , 1346938.30327279, + 1347010.88292351, 1347040.56183595, 1347038.58511425, + 1347046.52847452, 1347079.79404282, 1347089.75217433, + 1347082.06569761, 1347046.55662073, 1347007.33599897, + 1346973.74275364, 1346966.5065848 , 1346974.42117538, + 1346962.75530085, 1346890.01496736, 1346763.31873451, + 1346597.21833019, 1346355.95083708, 1346075.9688466 , + 1345859.26027098, 1345643.65473532, 1345464.29674608, + 1345374.64704266, 1345466.13033546, 1345674.50848806, + 1345784.31265168, 1345980.49727419, 1346112.32017112, + 1346146.44245304, 1346214.13423821, 1346268.20795835, + 1346336.91090795, 1346395.06750263, 1346461.59977858, + 1346456.31100763, 1346386.8415597 , 1346405.25012918, + 1346430.47953164, 1346497.88238862, 1346587.50851809, + 1346574.40387957, 1346567.65620399, 1346689.33446244, + 1346760.34752513, 1346822.73895174, 1346897.85956856, + 1346930.87379387, 1346866.00670615, 1346775.3999648 , + 1346693.35465773, 1346613.88073687, 1346571.4037673 , + 1346597.00930039, 1346619.90476799, 1346581.56678182, + 1346552.65834979, 1346561.80203848, 1346633.84209879, + 1346731.564141 , 1346794.87511947, 1346774.19643804, + 1346709.30210788, 1346677.65688313, 1346685.28124963, + 1346692.24587912, 1346691.31887692, 1346655.22538467, + 1346566.71146875, 1346491.58963354, 1346335.94899084, + 1346176.39040175, 1346188.92932125, 1346232.98686421, + 1346391.80052783, 1346637.42393049, 1346848.04345008, + 1346956.29072636, 1346960.05389914, 1346949.47104318, + 1346901.48895471, 1346800.85164552, 1346562.23007416, + 1346077.60742883, 1345300.79699073, 1345216.30621018, + 1344753.4785505 , 1344715.25279866, 1345422.97135258, + 1346315.32340127, 1347024.78170645, 1347490.7747398 , + 1347847.46358767, 1348153.20403022, 1348423.35930374, + 1348685.26253803, 1348856.55660585, 1348998.3247932 , + 1349138.69597712, 1349286.78764222, 1349442.78635688, + 1349584.8460397 , 1349717.19140624, 1349846.95229659, + 1349957.33941311, 1350019.35069899]) + + ax31.plot(d_x,AEP_x,color='C2',alpha=0.5) + ax32.plot(d_y,AEP_y,color='C2',alpha=0.5) + + ax31.set_yticks([1344000.,1347000.,1350000.]) + ax32.set_yticks([1344000.,1347000.,1350000.]) + + ax31.set_yticklabels(['1344','1347','1350']) + ax32.set_yticklabels(['','','']) + + ax31.set_ylim(1344000.,1350000.) + ax32.set_ylim(1344000.,1350000.) + + ax31.set_xlim(min(d_x),max(d_x)) + ax32.set_xlim(min(d_y),max(d_y)) + + ax31.set_xticks((-2000.,0.,2000.)) + ax32.set_xticks((-2500.,0.,2500.)) + + ax31.set_xticklabels(['-2000','0','2000']) + ax32.set_xticklabels(['-2500','0','2500']) + + ax31.set_ylabel('AEP (GWh)',fontsize=8) + + ax11 = plt.subplot2grid((3, 10), (0, 1),colspan=2) + ax12 = plt.subplot2grid((3, 10), (0, 3),colspan=2) + ax13 = plt.subplot2grid((3, 10), (0, 5),colspan=2) + ax14 = plt.subplot2grid((3, 10), (0, 7),colspan=2) + + d_dx = np.linspace(2.5,4.5,num) + d_dy = np.linspace(2.5,4.5,num) + d_shear = np.linspace(1.,2.,num) + d_rot = np.linspace(-10.,10.,num) + + AEP_dx = np.array([1206606.96672513, 1207486.77444064, 1208358.97795217, + 1209227.43486414, 1210088.15705603, 1210938.76568109, + 1211778.65585759, 1212607.03662728, 1213422.93744608, + 1214226.18024391, 1215021.40024739, 1215803.3430328 , + 1216573.42485308, 1217331.7840715 , 1218081.64543102, + 1218820.19230133, 1219546.70817153, 1220261.16244309, + 1220964.17078312, 1221655.36243823, 1222336.04089695, + 1223011.26151447, 1223676.10950905, 1224332.97164707, + 1224980.24803128, 1225619.07623241, 1226254.67555377, + 1226885.18843522, 1227507.0915907 , 1228120.75622394, + 1228725.14669742, 1229318.90548843, 1229901.58839239, + 1230474.90338523, 1231039.61516795, 1231596.94114569, + 1232147.9953963 , 1232692.85807365, 1233232.93751193, + 1233766.62359172, 1234291.94879736, 1234810.04188385, + 1235320.65124351, 1235825.05784902, 1236324.00098386, + 1236817.67259095, 1237307.3433663 , 1237792.34273088, + 1238271.1717197 , 1238745.94991006, 1239217.8193361 , + 1239686.58896929, 1240147.94162619, 1240600.28394963, + 1241045.81297628, 1241493.43852519, 1241937.21604924, + 1242381.77254706, 1242824.97065557, 1243267.38293374, + 1243708.79579354, 1244152.71580234, 1244601.74749705, + 1245063.82910634, 1245537.08776178, 1246014.89945653, + 1246499.10002335, 1247028.09400143, 1247572.14132899, + 1248118.52332045, 1248668.33242746, 1249222.18585596, + 1249781.68237686, 1250353.35118612, 1250933.21496175, + 1251517.55072651, 1252107.15833225, 1252704.47421407, + 1253307.17157825, 1253915.47395452, 1254528.42215439, + 1255145.97407636, 1255768.08185944, 1256396.67934922, + 1257032.01366892, 1257670.53826616, 1258312.70566154, + 1258958.54472729, 1259607.01656294, 1260258.30492384, + 1260911.44227326, 1261566.68855984, 1262224.01188737, + 1262882.64887932, 1263541.15128942, 1264204.12623381, + 1264873.17204135, 1265543.59184151, 1266216.1740359 , + 1266893.13596448, 1267577.11623363, 1268272.05811602, + 1268970.78074099, 1269671.69539642, 1270374.54522199, + 1271079.06765751, 1271785.02132927, 1272492.13673016, + 1273200.16712658, 1273908.88546728, 1274618.04288114, + 1275327.39017616, 1276036.67795626, 1276745.65582889, + 1277454.06784476, 1278161.65640187, 1278868.15226786, + 1279573.25821422, 1280276.60295087, 1280977.46826373, + 1281676.37810279, 1282373.48308005, 1283068.58453003, + 1283761.49494907, 1284452.15103239, 1285142.04806026, + 1285829.32715634, 1286516.27598224, 1287200.46647715, + 1287881.52652913, 1288559.31371361, 1289233.68947002, + 1289904.52297544, 1290571.68951384, 1291235.07464924, + 1291895.38798821, 1292555.51658235, 1293212.03993212, + 1293864.2991451 , 1294512.23403233, 1295155.8015837 , + 1295794.96492463, 1296429.69467549, 1297059.96767828, + 1297685.77012665, 1298307.09851075, 1298923.95409348, + 1299539.02627464, 1300152.70679616, 1300763.23230166, + 1301369.07073017, 1301970.25434023, 1302566.81748855, + 1303158.79611307, 1303746.12724355, 1304327.16791611, + 1304904.35822773, 1305478.07381033, 1306046.66645648, + 1306610.24571793, 1307168.9295899 , 1307722.85452362, + 1308272.22024757, 1308817.12847127, 1309357.91178468, + 1309894.59183827, 1310427.0574158 , 1310954.82497328, + 1311478.14779031, 1311996.96783157, 1312511.89011393, + 1313023.58448032, 1313534.0858805 , 1314042.03754552, + 1314547.68824029, 1315051.00916417, 1315550.96399649, + 1316047.80233085, 1316541.28376352, 1317030.36151862, + 1317514.81961345, 1317995.28596344, 1318472.09676374, + 1318945.42357013, 1319415.37473479, 1319882.39885089, + 1320346.97170597, 1320808.49201184, 1321266.98688696, + 1321722.44879315, 1322174.789238 , 1322623.74286891, + 1323068.94449936, 1323511.12842193, 1323950.59252147, + 1324387.33334666, 1324822.05563614, 1325258.91745153, + 1325693.66495791, 1326128.23676956]) + + AEP_dy = np.array([1208000.95307666, 1208730.36293514, 1209458.38444749, + 1210184.38323625, 1210909.02320758, 1211632.61525223, + 1212356.00008021, 1213083.29977778, 1213815.36205176, + 1214547.07415156, 1215278.55996557, 1216012.02597915, + 1216748.05817782, 1217484.1763764 , 1218220.48292108, + 1218957.07525893, 1219694.66760953, 1220435.12025058, + 1221182.49873358, 1221931.803288 , 1222692.74129541, + 1223454.97774084, 1224216.63839873, 1224978.18323077, + 1225739.83492999, 1226501.68110189, 1227263.44857621, + 1228024.3693395 , 1228784.20169361, 1229543.37409912, + 1230302.02155983, 1231060.20034341, 1231825.40171043, + 1232596.264779 , 1233376.67306157, 1234162.7237114 , + 1234947.36296921, 1235730.48449772, 1236515.5417288 , + 1237299.17601893, 1238080.8727864 , 1238866.00500879, + 1239652.5122039 , 1240436.14254289, 1241217.13273299, + 1241998.09049158, 1242780.7037275 , 1243566.1728739 , + 1244349.03650235, 1245128.12386789, 1245903.72845064, + 1246675.66798319, 1247446.0302759 , 1248212.9570908 , + 1248977.92696498, 1249738.97904351, 1250496.71902077, + 1251252.98335955, 1252009.85067102, 1252762.8155475 , + 1253511.70269904, 1254256.32711831, 1254996.48690515, + 1255731.61118636, 1256460.81683343, 1257184.4812049 , + 1257902.47727426, 1258614.34018142, 1259320.22328618, + 1260020.03853003, 1260714.35505693, 1261403.12490324, + 1262086.05959313, 1262762.75224803, 1263432.42102394, + 1264095.03700859, 1264748.93991872, 1265396.48305878, + 1266039.17443853, 1266676.92234023, 1267309.64151759, + 1267937.24918018, 1268559.6700355 , 1269176.8304309 , + 1269788.66050564, 1270394.83081401, 1270994.62813993, + 1271588.42531828, 1272176.27865598, 1272757.73245773, + 1273332.904165 , 1273901.92951438, 1274464.84955021, + 1275021.24603197, 1275570.54794002, 1276113.22691355, + 1276648.35829847, 1277174.49067789, 1277692.8949835 , + 1278203.97324554, 1278707.78830794, 1279203.81659824, + 1279692.12350728, 1280172.61506344, 1280645.625476 , + 1281111.23800676, 1281570.85254872, 1282022.86817835, + 1282467.65055137, 1282905.33091925, 1283336.14954461, + 1283760.2443178 , 1284177.49209498, 1284587.85146636, + 1284991.55828889, 1285393.37896135, 1285788.95908989, + 1286177.42841552, 1286559.17301659, 1286936.49466737, + 1287309.42216391, 1287680.10004277, 1288044.49265286, + 1288402.08148397, 1288754.24365137, 1289100.62051177, + 1289442.67880949, 1289778.95295499, 1290109.3396229 , + 1290434.01762088, 1290753.15647179, 1291075.2431679 , + 1291393.1998673 , 1291706.48845381, 1292017.93346474, + 1292327.723335 , 1292634.06862764, 1292937.05828308, + 1293243.77304965, 1293552.61238437, 1293860.7727899 , + 1294173.97149322, 1294484.89130185, 1294793.63296206, + 1295100.36751796, 1295405.26653684, 1295708.50109357, + 1296010.24339882, 1296310.66586631, 1296609.94016466, + 1296909.04882933, 1297208.34851184, 1297507.28907488, + 1297806.61636372, 1298105.53323576, 1298404.20517338, + 1298702.79364518, 1299001.46425645, 1299300.37919124, + 1299599.6983761 , 1299899.58056598, 1300200.1830659 , + 1300501.60049112, 1300803.4819248 , 1301106.2062652 , + 1301410.02484021, 1301715.12830091, 1302021.6852848 , + 1302329.8525927 , 1302639.77772528, 1302951.60117814, + 1303265.45739397, 1303581.47546788, 1303899.7792295 , + 1304220.48681264, 1304543.71194913, 1304869.5646237 , + 1305198.1381312 , 1305529.57088733, 1305863.93359827, + 1306201.31719367, 1306541.80853329, 1306885.49103915, + 1307232.44192625, 1307582.73576705, 1307936.4442039 , + 1308293.64152542, 1308654.38387248, 1309018.72640802, + 1309386.72027011, 1309758.41231222, 1310133.84377435, + 1310512.50034219, 1310894.53788782, 1311280.14040069, + 1311669.39015217, 1312062.34139608, 1312459.03316538, + 1312859.49466999, 1313263.63392676]) + + AEP_shear = np.array([1294766.78885552, 1294736.55206404, 1294705.44749253, + 1294673.79598568, 1294641.89852748, 1294609.20637934, + 1294575.72181609, 1294541.37796207, 1294505.1784881 , + 1294467.23725722, 1294428.54973947, 1294389.30157665, + 1294349.60043808, 1294309.53593229, 1294269.18832566, + 1294228.63368853, 1294187.85403782, 1294146.65609762, + 1294105.25221829, 1294063.75231476, 1294022.2431843 , + 1293980.80095638, 1293939.49673826, 1293898.39716588, + 1293857.56986671, 1293817.07920467, 1293776.98823532, + 1293737.35962612, 1293698.25481796, 1293659.73587911, + 1293621.86412135, 1293584.70237658, 1293548.31393957, + 1293512.7833494 , 1293478.12695793, 1293444.56864819, + 1293412.20859436, 1293380.98997821, 1293350.81324934, + 1293320.77031989, 1293290.88547475, 1293261.55835171, + 1293232.92799283, 1293205.07408403, 1293178.03910923, + 1293151.82478318, 1293126.05553291, 1293099.98247767, + 1293074.23845411, 1293048.54353334, 1293023.2989709 , + 1292998.65505254, 1292974.70373372, 1292951.50998877, + 1292929.12196577, 1292907.57664676, 1292886.90198956, + 1292867.11849812, 1292848.2412391 , 1292830.27999455, + 1292813.23987396, 1292797.12250744, 1292781.9263925 , + 1292767.64671466, 1292754.27605357, 1292741.85051607, + 1292730.31642731, 1292719.6571988 , 1292709.85849152, + 1292700.90444635, 1292692.77812536, 1292685.46211589, + 1292678.93887965, 1292673.19041127, 1292668.19855067, + 1292663.94456065, 1292660.41021472, 1292657.64009776, + 1292661.88700553, 1292670.19108213, 1292683.34182182, + 1292697.95207284, 1292713.00818565, 1292733.0113892 , + 1292753.24239816, 1292775.55375641, 1292799.76402424, + 1292828.55489236, 1292861.7011205 , 1292908.35135284, + 1292955.52380101, 1293003.1823639 , 1293051.2906868 , + 1293099.81177103, 1293148.70815018, 1293197.94153064, + 1293247.47319529, 1293297.26364543, 1293347.27296027, + 1293397.46034388, 1293447.78481543, 1293498.20459466, + 1293548.67699203, 1293600.77048245, 1293653.73104196, + 1293706.57255093, 1293759.24785131, 1293811.61934142, + 1293871.21920217, 1293931.64404033, 1293991.72320595, + 1294055.78957382, 1294127.47556157, 1294208.91363786, + 1294294.70593885, 1294379.46632263, 1294463.05523554, + 1294545.24995667, 1294625.56214931, 1294703.86330841, + 1294788.57731622, 1294875.4324245 , 1294959.07946801, + 1295039.73370968, 1295116.52221881, 1295189.38652608, + 1295258.41777407, 1295324.82433186, 1295388.25188841, + 1295448.90425025, 1295509.86417382, 1295567.32945256, + 1295622.33533755, 1295675.83605277, 1295727.75523307, + 1295778.01358316, 1295826.53245687, 1295873.23710758, + 1295918.04724216, 1295960.95015954, 1296001.92563035, + 1296040.94304388, 1296077.6630657 , 1296111.92837946, + 1296143.61522107, 1296172.59310681, 1296198.6159116 , + 1296221.29448314, 1296239.61102807, 1296254.17462855, + 1296264.99247162, 1296272.18121492, 1296277.6784714 , + 1296281.46457917, 1296283.52057121, 1296283.73681887, + 1296279.81471272, 1296272.38021661, 1296262.00820486, + 1296247.98645658, 1296231.38536622, 1296212.29010221, + 1296190.38248547, 1296165.7528931 , 1296138.44170096, + 1296108.31078124, 1296074.88332705, 1296038.81257821, + 1296000.27488577, 1295959.41364975, 1295916.29868513, + 1295870.98744917, 1295823.53717891, 1295773.99859698, + 1295722.41935087, 1295667.484988 , 1295608.57098788, + 1295545.90549374, 1295482.00166106, 1295417.19714117, + 1295350.09536813, 1295279.25278439, 1295204.50156139, + 1295126.50061758, 1295045.739869 , 1294962.46282269, + 1294880.12031395, 1294802.86614738, 1294724.0419843 , + 1294643.7340639 , 1294562.03004153, 1294480.54008273, + 1294401.85140008, 1294330.6904868 , 1294264.0615655 , + 1294196.52873747, 1294130.42159113, 1294065.92445497, + 1294000.6776319 , 1293934.7395084 ]) + + AEP_rot = np.array([1297050.68944772, 1296841.55772424, 1296640.68996086, + 1296446.89299672, 1296258.53366842, 1296070.17736759, + 1295882.08323029, 1295694.51833079, 1295508.50065573, + 1295326.71705551, 1295146.15992252, 1294967.10176405, + 1294789.80924099, 1294614.64188943, 1294447.38135801, + 1294282.26334289, 1294119.37261082, 1293958.64838172, + 1293799.94061947, 1293643.96472075, 1293489.35777283, + 1293335.96921302, 1293184.17024796, 1293035.02817066, + 1292888.53245814, 1292748.92184591, 1292614.36076271, + 1292485.34532017, 1292361.84468629, 1292243.68011951, + 1292130.00931929, 1292021.66630118, 1291919.83025589, + 1291824.44292866, 1291738.96189288, 1291662.61879494, + 1291591.66826248, 1291525.17613172, 1291465.39124485, + 1291412.42844711, 1291364.98000211, 1291322.3562056 , + 1291285.27555841, 1291252.41186603, 1291223.6344492 , + 1291197.63207385, 1291174.10898817, 1291153.7876701 , + 1291144.10017962, 1291140.61022367, 1291140.30654012, + 1291143.10464148, 1291147.75244273, 1291155.64529243, + 1291167.11441232, 1291182.0626742 , 1291200.35249339, + 1291221.6882086 , 1291244.60576581, 1291269.2592294 , + 1291296.49187825, 1291327.33980361, 1291360.03609769, + 1291393.90390679, 1291429.31179661, 1291466.32800825, + 1291509.87744693, 1291562.40079395, 1291617.85754724, + 1291695.46122613, 1291787.29991811, 1291894.5956983 , + 1292010.7127267 , 1292131.11965696, 1292261.16421208, + 1292420.65074299, 1292583.54305073, 1292742.33279169, + 1292895.62406475, 1293045.36979747, 1293200.73868832, + 1293350.51418285, 1293497.03507672, 1293643.10710227, + 1293786.32434523, 1293923.62576877, 1294055.94065025, + 1294185.52730212, 1294309.87233172, 1294428.01029979, + 1294538.41601542, 1294643.53367802, 1294751.98530778, + 1294857.01472156, 1294955.42756991, 1295053.12427338, + 1295142.75421973, 1295226.57921488, 1295305.19910255, + 1295376.50237507, 1295436.86158517, 1295485.62913632, + 1295524.34064626, 1295554.15741053, 1295575.28434823, + 1295587.29005818, 1295588.8361973 , 1295583.67142846, + 1295573.03458668, 1295557.02361738, 1295538.13699884, + 1295516.79212907, 1295490.49306137, 1295460.08183203, + 1295426.53880788, 1295389.39346109, 1295345.07748172, + 1295294.88157279, 1295236.96864844, 1295168.79356158, + 1295089.60419524, 1295000.81832538, 1294922.88589158, + 1294840.56754221, 1294753.49382479, 1294661.78439872, + 1294564.23739851, 1294476.33538784, 1294391.57461875, + 1294318.84993584, 1294243.2975131 , 1294170.56363491, + 1294099.54687341, 1294030.55452032, 1293959.92389721, + 1293885.69234211, 1293806.37485205, 1293723.27202865, + 1293637.01261539, 1293547.61092741, 1293453.96600377, + 1293356.27941951, 1293255.21231751, 1293153.44468364, + 1293051.95047197, 1292964.4178695 , 1292897.69696145, + 1292835.1569296 , 1292774.65644203, 1292715.19416527, + 1292661.56276541, 1292620.11500924, 1292586.40931613, + 1292563.86983443, 1292542.52856069, 1292522.59612111, + 1292504.29343564, 1292487.93123142, 1292476.94263045, + 1292468.46658274, 1292462.40717408, 1292458.98412713, + 1292458.45139684, 1292465.02864146, 1292475.87652626, + 1292489.68248301, 1292506.43024212, 1292525.86691935, + 1292548.46738588, 1292573.61413044, 1292600.32392411, + 1292629.14794909, 1292660.69892802, 1292695.24996778, + 1292735.74842708, 1292781.80838127, 1292833.49859954, + 1292890.7489721 , 1292953.37617695, 1293020.76831187, + 1293092.67781454, 1293170.8656888 , 1293255.21493949, + 1293347.73698712, 1293451.60212838, 1293560.53883469, + 1293673.40404119, 1293791.83839225, 1293916.30298044, + 1294046.00774271, 1294179.47813611, 1294317.44649958, + 1294459.31051029, 1294604.38003481, 1294751.91001344, + 1294901.00742125, 1295051.22887492, 1295211.1760829 , + 1295379.20617625, 1295548.95171368]) + + ax11.plot(d_dx,AEP_dx,color='C1',alpha=0.5) + ax11.set_xticks([2.5,3.5,4.5]) + ax11.set_xticklabels(['2.5D','3.5D','4.5D']) + ax11.set_xlabel(r'$dx$',fontsize=8) + + ax12.plot(d_dy,AEP_dy,color='C1',alpha=0.5) + ax12.set_xticks([2.5,3.5,4.5]) + ax12.set_xticklabels(['2.5D','3.5D','4.5D']) + ax12.set_xlabel(r'$dy$',fontsize=8) + + ax13.plot(d_shear,AEP_shear,color='C1',alpha=0.5) + ax13.set_xticks([1.,1.5,2.]) + ax13.set_xticklabels(['1D','1.5D','2D']) + ax13.set_xlabel(r'$b$',fontsize=8) + + ax14.plot(d_rot,AEP_rot,color='C1',alpha=0.5) + ax14.set_xticks([-10.,0.,10.]) + ax14.set_xticklabels([r'-30$^\circ$',r'0$^\circ$',r'30$^\circ$']) + ax14.set_xlabel(r'$\theta$',fontsize=8) + + ax11.set_xlim(2.5,4.5) + ax12.set_xlim(2.5,4.5) + ax13.set_xlim(1.,2.) + ax14.set_xlim(-10.,10.) + + ax11.set_yticks([1225000.,1275000.,1325000.]) + ax12.set_yticks([1225000.,1275000.,1325000.]) + ax13.set_yticks([1225000.,1275000.,1325000.]) + ax14.set_yticks([1225000.,1275000.,1325000.]) + + ax11.set_yticklabels(['1225','1275','1325']) + ax12.set_yticklabels(['','','','']) + ax13.set_yticklabels(['','','','']) + ax14.set_yticklabels(['','','','']) + # + ax11.set_ylim(1200000.,1350000.) + ax12.set_ylim(1200000.,1350000.) + ax13.set_ylim(1200000.,1350000.) + ax14.set_ylim(1200000.,1350000.) + + ax11.set_ylabel('AEP (GWh)',fontsize=8) + + ax31.set_xlabel(r'$x_{50}$',fontsize=8) + ax32.set_xlabel(r'$y_{50}$',fontsize=8) + + + ax11.tick_params(axis='both', which='major', labelsize=8) + ax11.tick_params(axis='both', which='minor', labelsize=8) + ax12.tick_params(axis='both', which='major', labelsize=8) + ax12.tick_params(axis='both', which='minor', labelsize=8) + ax13.tick_params(axis='both', which='major', labelsize=8) + ax13.tick_params(axis='both', which='minor', labelsize=8) + ax14.tick_params(axis='both', which='major', labelsize=8) + ax14.tick_params(axis='both', which='minor', labelsize=8) + + ax21.tick_params(axis='both', which='major', labelsize=8) + ax21.tick_params(axis='both', which='minor', labelsize=8) + ax22.tick_params(axis='both', which='major', labelsize=8) + ax22.tick_params(axis='both', which='minor', labelsize=8) + ax23.tick_params(axis='both', which='major', labelsize=8) + ax23.tick_params(axis='both', which='minor', labelsize=8) + ax24.tick_params(axis='both', which='major', labelsize=8) + ax24.tick_params(axis='both', which='minor', labelsize=8) + ax25.tick_params(axis='both', which='major', labelsize=8) + ax25.tick_params(axis='both', which='minor', labelsize=8) + + ax31.tick_params(axis='both', which='major', labelsize=8) + ax31.tick_params(axis='both', which='minor', labelsize=8) + ax32.tick_params(axis='both', which='major', labelsize=8) + ax32.tick_params(axis='both', which='minor', labelsize=8) + + loc = 0.1 + ax11.text(1.3,1350000.,'a',fontsize=11,color='black') + ax21.text(1.4,1388000.,'b',fontsize=11,color='black') + ax31.text(-6700.,1350200.,'c',fontsize=11,color='black') + + plt.subplots_adjust(top = 0.93, bottom = 0.1, right = 0.96, left = 0.1, + hspace = 0.7, wspace = 1.0) + + plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/multimodalityR1.pdf',transparent=True) + plt.show() diff --git a/code/plots/plotBounds.py b/code/plots/plotBounds.py index 5e0605a..8df34c7 100644 --- a/code/plots/plotBounds.py +++ b/code/plots/plotBounds.py @@ -130,5 +130,5 @@ ax2.text(-2800.,2800.,'B',fontsize=14,weight='bold',color='black') ax3.text(-2800.,2800.,'C',fontsize=14,weight='bold',color='black') -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/bounds.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/bounds.pdf',transparent=True) plt.show() diff --git a/code/plots/plotConvergence.py b/code/plots/plotConvergence.py new file mode 100644 index 0000000..bb58ef8 --- /dev/null +++ b/code/plots/plotConvergence.py @@ -0,0 +1,176 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib +import sys +sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') +from position_constraints import * +import scipy as sp +from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes + +"""colors""" +robin = '#B2DBD5' +nectar = '#EAB364' +tuscan = '#B2473E' +olive = '#ACBD78' + +robin = 'C0' +nectar = 'C1' +tuscan = 'C2' +royal = 'C3' + +# dirs = np.array([5,10,15,20,25,30,50]) +# speeds = np.ones(7,dtype=int)*10 +# +# +# # dirs = np.ones(7,dtype=int)*30 +# # speeds = np.array([1,2,3,4,5,6,10]) +# +# +# nDirs = dirs[0] +# nSpeeds = speeds[0] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt5 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true5 = (data[:]*0.936)/358000. +# +# nDirs = dirs[1] +# nSpeeds = speeds[1] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt10 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true10 = (data[:]*0.936)/358000. +# +# nDirs = dirs[2] +# nSpeeds = speeds[2] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt15 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true15 = (data[:]*0.936)/358000. +# +# nDirs = dirs[3] +# nSpeeds = speeds[3] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt20 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true20 = (data[:]*0.936)/358000. +# +# nDirs = dirs[4] +# nSpeeds = speeds[4] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt25 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true25 = (data[:]*0.936)/358000. +# +# nDirs = dirs[5] +# nSpeeds = speeds[5] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt30 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true30 = (data[:]*0.936)/358000. +# +# nDirs = dirs[6] +# nSpeeds = speeds[6] +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) +# opt50 = data[:]/358000. +# data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) +# true50 = (data[:]*0.936)/358000. +# +# arr = np.zeros((7,7)) +# for i in range(7): +# arr[i][j] = +# for i in range(1): +# # plt.plot(1,true5[i+k],'o',color='C%s'%i) +# # plt.plot(2,true10[i+k],'o',color='C%s'%i) +# # plt.plot(3,true15[i+k],'o',color='C%s'%i) +# # plt.plot(4,true20[i+k],'o',color='C%s'%i) +# # plt.plot(5,true25[i+k],'o',color='C%s'%i) +# # plt.plot(6,true30[i+k],'o',color='C%s'%i) +# # plt.plot(10,true50[i+k],'o',color='C%s'%i) +# # +# # plt.plot(1,opt5[i+k],'s',color='C%s'%(i+1)) +# # plt.plot(2,opt10[i+k],'s',color='C%s'%(i+1)) +# # plt.plot(3,opt15[i+k],'s',color='C%s'%(i+1)) +# # plt.plot(4,opt20[i+k],'s',color='C%s'%(i+1)) +# # plt.plot(5,opt25[i+k],'s',color='C%s'%(i+1)) +# # plt.plot(6,opt30[i+k],'s',color='C%s'%(i+1)) +# # plt.plot(10,opt50[i+k],'s',color='C%s'%(i+1)) +# +# plt.plot(1,(true5[i+k]-opt5[i+k])/true5[i+k],'s',color='C%s'%(i+1)) +# plt.plot(2,(true10[i+k]-opt10[i+k])/true10[i+k],'s',color='C%s'%(i+1)) +# plt.plot(3,(true15[i+k]-opt15[i+k])/true15[i+k],'s',color='C%s'%(i+1)) +# plt.plot(4,(true20[i+k]-opt20[i+k])/true20[i+k],'s',color='C%s'%(i+1)) +# plt.plot(5,(true25[i+k]-opt25[i+k])/true25[i+k],'s',color='C%s'%(i+1)) +# plt.plot(6,(true30[i+k]-opt30[i+k])/true30[i+k],'s',color='C%s'%(i+1)) +# plt.plot(10,(true50[i+k]-opt50[i+k])/true50[i+k],'s',color='C%s'%(i+1)) +# +# # for i in range(10): +# # plt.plot(1,true5[i],'o',color='C%s'%i) +# # plt.plot(2,true10[i],'o',color='C%s'%i) +# # plt.plot(3,true15[i],'o',color='C%s'%i) +# # plt.plot(4,true20[i],'o',color='C%s'%i) +# # plt.plot(5,true25[i],'o',color='C%s'%i) +# # plt.plot(6,true30[i],'o',color='C%s'%i) +# # plt.plot(10,true50[i],'o',color='C%s'%i) +# +# # for i in range(10): +# # plt.plot(5,true5[i],'o',color='C%s'%i) +# # plt.plot(10,true10[i],'o',color='C%s'%i) +# # plt.plot(15,true15[i],'o',color='C%s'%i) +# # plt.plot(20,true20[i],'o',color='C%s'%i) +# # plt.plot(25,true25[i],'o',color='C%s'%i) +# # plt.plot(30,true30[i],'o',color='C%s'%i) +# # plt.plot(50,true50[i],'o',color='C%s'%i) +# +# +# # ax1.text(-2500.,2700.,'c',fontsize=10,color='black') +# # ax2.text(-2500.,2700.,'b',fontsize=10,color='black') +# # ax3.text(-2500.,2700.,'a',fontsize=10,color='black') +# # ax5.text(-2500.,2700.,'d',fontsize=10,color='black') +# # ax5.text(750.,4500.,'e',fontsize=10,color='black') +# # ax5.text(-500.,-4000.,'f',fontsize=10,color='black') +# +# +# # plt.ylim(0.98,1.005) +# # plt.tight_layout() +# # plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/layout-variable.pdf') +# plt.show() + + +dirs = np.array([5,10,15,20,25,30,50]) +speeds = np.array([1,2,3,4,5,6,10]) + +arr_true = np.zeros((10,7,7)) +arr_diff = np.zeros((10,7,7)) + +for i in range(7): + for j in range(7): + nDirs = dirs[i] + nSpeeds = speeds[j] + data = np.loadtxt('data/bins-convergence/%s_%s/AEP_opt.txt'%(nDirs,nSpeeds)) + opt = data[:] + data = np.loadtxt('data/bins-convergence/%s_%s/AEP_true.txt'%(nDirs,nSpeeds)) + tr = (data[:]*0.936) + + for k in range(10): + arr_true[k][i][j] = tr[k] + arr_diff[k][i][j] = (opt[k]-tr[k])/tr[k]*100. + +dirs = np.array([5,10,15,20,25,30,55]) +speeds = np.array([1,2,3,4,5,6,11]) + +DIRS, SPEEDS = np.meshgrid(dirs,speeds) + +for i in range(10): + fig = plt.figure(i) + # im = plt.gca().imshow(arr_true[i]/358000.,cmap='Reds') + im = plt.gca().pcolormesh(DIRS-2.5, SPEEDS-0.5, arr_true[i]/358000.,cmap='Reds') + # im = plt.gca().pcolormesh(DIRS, SPEEDS, arr_diff[i],vmin=-2.,vmax=2.,cmap='Reds',shading='gourand') + cbar = plt.colorbar(im) + # cbar.ax.set_yticklabels(['0','1','2','>3']) + cbar.set_label('normalized "true" AEP', rotation=270,labelpad=15) + + plt.xlabel('# directions') + plt.ylabel('# speeds') + plt.title('starting layout %s'%(i+1)) + +plt.show() diff --git a/code/plots/plotCt.py b/code/plots/plotCt.py new file mode 100644 index 0000000..38c4d58 --- /dev/null +++ b/code/plots/plotCt.py @@ -0,0 +1,45 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib as mpl + +Uinf = np.array([ 0.1 , 0.60816327, 1.11632653, 1.6244898 , 2.13265306, + 2.64081633, 3.14897959, 3.65714286, 4.16530612, 4.67346939, + 5.18163265, 5.68979592, 6.19795918, 6.70612245, 7.21428571, + 7.72244898, 8.23061224, 8.73877551, 9.24693878, 9.75510204, + 10.26326531, 10.77142857, 11.27959184, 11.7877551 , 12.29591837, + 12.80408163, 13.3122449 , 13.82040816, 14.32857143, 14.83673469, + 15.34489796, 15.85306122, 16.36122449, 16.86938776, 17.37755102, + 17.88571429, 18.39387755, 18.90204082, 19.41020408, 19.91836735, + 20.42653061, 20.93469388, 21.44285714, 21.95102041, 22.45918367, + 22.96734694, 23.4755102 , 23.98367347, 24.49183673, 25. ]) +CT = np.array([0.74988552, 0.74988552, 0.74988552, 0.74988552, 0.74988552, + 0.74988552, 0.74945275, 0.74736838, 0.74578062, 0.74452166, + 0.7432327 , 0.74240891, 0.74171844, 0.74113119, 0.74062551, + 0.7401854 , 0.7397988 , 0.73945643, 0.73915104, 0.71535516, + 0.50902345, 0.42264255, 0.36002829, 0.31616439, 0.27728908, + 0.2449473 , 0.2179915 , 0.19464155, 0.17388996, 0.15676952, + 0.14116089, 0.12769325, 0.11564223, 0.104593 , 0.09546578, + 0.08765315, 0.08043937, 0.07409357, 0.06822311, 0.06322334, + 0.05887784, 0.05481244, 0.05114998, 0.0474271 , 0.04415572, + 0.04104199, 0.0383636 , 0.03582949, 0.03401271, 0.03235028]) + + +mpl.rc('font', family = 'serif', serif = 'cmr10') +plt.rcParams["mathtext.fontset"] = "dejavuserif" + +fig = plt.figure(figsize=[3.25,2.]) +ax = plt.gca() + +ax.plot(Uinf,CT,'o',color='C0',markersize=3,alpha=0.5) +ax.set_ylim(0.,1.) +ax.set_xlabel('wind speed', fontsize=8, family='serif') +ax.set_ylabel(r'C$_T$', fontsize=8, family='serif') + +ax.spines['right'].set_visible(False) +ax.spines['top'].set_visible(False) + +plt.subplots_adjust(top = 0.96, bottom = 0.2, right = 1, left = 0.2, + hspace = 0, wspace = 0) + +# plt.savefig('ct_curve.pdf',transparent=True) +plt.show() diff --git a/code/plots/plotLayout1.py b/code/plots/plotLayout1.py index 1aaa2a6..9dbcc6a 100644 --- a/code/plots/plotLayout1.py +++ b/code/plots/plotLayout1.py @@ -15,8 +15,8 @@ robin = 'C0' nectar = 'C1' -tuscan = 'C2' -royal = 'C3' +tuscan = 'C1' +royal = 'C2' nTurbs = 100 rotorDiameter = np.ones(nTurbs)*130. @@ -528,5 +528,5 @@ plt.subplots_adjust(top = 1, bottom = 0, right = 1, left = 0, hspace = 0, wspace = 0) # plt.tight_layout() -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/layout-variable.pdf') +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/PJ-param.pdf',transparent=True) plt.show() diff --git a/code/plots/plotLayout2.py b/code/plots/plotLayout2.py index 43bd9fe..00e9477 100644 --- a/code/plots/plotLayout2.py +++ b/code/plots/plotLayout2.py @@ -400,5 +400,5 @@ plt.subplots_adjust(top = 1, bottom = 0, right = 1, left = 0, hspace = 0, wspace = 0) # plt.tight_layout() -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/opt-cases.pdf') +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/opt-cases.pdf') plt.show() diff --git a/code/plots/plotLayouts.py b/code/plots/plotLayouts.py index fb3db69..f70bddf 100644 --- a/code/plots/plotLayouts.py +++ b/code/plots/plotLayouts.py @@ -26,16 +26,17 @@ a = side_length**2 circle_radius = np.sqrt(a/np.pi) - +print '1' """amalia boundary""" -locations = np.loadtxt('/Users/ningrsrch/Dropbox/Projects/reduction/layout_amalia.txt') +locations = np.loadtxt('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/layout_amalia.txt') xBounds = locations[:, 0] yBounds = locations[:, 1] xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. locations[:, 0] = xBounds locations[:, 1] = yBounds +print '2' boundaryVertices, boundaryNormals = calculate_boundary(locations) xBounds = boundaryVertices[:, 0] yBounds = boundaryVertices[:, 1] @@ -45,6 +46,8 @@ points[:, 0] = xBounds points[:, 1] = yBounds +print '2' + hull = sp.spatial.ConvexHull(points) area = hull.volume area_ratio = area/(np.pi*circle_radius**2) @@ -527,5 +530,5 @@ # plt.tight_layout() -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/layout-variable.pdf') +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/layout-variable.pdf') plt.show() diff --git a/code/plots/plotResults_bounds.py b/code/plots/plotResults_bounds.py index f276ebc..703bc08 100644 --- a/code/plots/plotResults_bounds.py +++ b/code/plots/plotResults_bounds.py @@ -8,19 +8,6 @@ from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes from windRoses import * -"""colors""" -robin = '#B2DBD5' -nectar = '#EAB364' -tuscan = '#B2473E' -olive = '#ACBD78' - -robin = 'C0' -nectar = 'C1' -tuscan = 'C1' -royal = 'C3' - -# robin = '#ACBD78' - nTurbs = 100 rotorDiameter = np.ones(nTurbs)*130. @@ -185,7 +172,7 @@ xBounds = np.append(xBounds,xBounds[0]) yBounds = np.append(yBounds,yBounds[0]) -ax7.plot(xBounds,yBounds,'-',color=robin,alpha=0.5) +ax7.plot(xBounds,yBounds,'-',color='C0',alpha=0.5) """circle boundary""" @@ -207,7 +194,7 @@ xBounds = np.append(xBounds,xBounds[0]) yBounds = np.append(yBounds,yBounds[0]) -ax8.plot(xBounds,yBounds,'-',color=robin,alpha=0.5) +ax8.plot(xBounds,yBounds,'-',color='C0',alpha=0.5) """square boundary rotated 30 deg from dominant wind direction""" @@ -220,7 +207,7 @@ xBounds = np.append(xBounds,xBounds[0]) yBounds = np.append(yBounds,yBounds[0]) -ax9.plot(xBounds,yBounds,'-',color=robin,alpha=0.5) +ax9.plot(xBounds,yBounds,'-',color='C0',alpha=0.5) ax7.set_ylim(-3300.,3300.) ax8.set_ylim(-3300.,3300.) @@ -270,21 +257,21 @@ num = 100 -ax1.hist(f_grid4[0:num],bins=b4,color=tuscan,alpha=0.5) -ax2.hist(f_grid6[0:num],bins=b6,color=tuscan,alpha=0.5) -ax3.hist(f_grid8[0:num],bins=b8,color=tuscan,alpha=0.5) +ax1.hist(f_grid4[0:num],bins=b4,color='C1',alpha=0.5) +ax2.hist(f_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax3.hist(f_grid8[0:num],bins=b8,color='C1',alpha=0.5) -ax1.hist(f_param4[0:num],bins=b4,color=robin,alpha=0.5) -ax2.hist(f_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax3.hist(f_param8[0:num],bins=b8,color=robin,alpha=0.5) +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) -ax1.hist(f_direct4[0:num],bins=b4,color=royal,alpha=0.5) -ax2.hist(f_direct6[0:num],bins=b6,color=royal,alpha=0.5) -ax3.hist(f_direct8[0:num],bins=b8,color=royal,alpha=0.5) +ax1.hist(f_direct4[0:num],bins=b4,color='C2',alpha=0.5) +ax2.hist(f_direct6[0:num],bins=b6,color='C2',alpha=0.5) +ax3.hist(f_direct8[0:num],bins=b8,color='C2',alpha=0.5) -ax1.hist(f_param4[0:num],bins=b4,color=robin,alpha=0.5) -ax2.hist(f_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax3.hist(f_param8[0:num],bins=b8,color=robin,alpha=0.5) +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) min4 = np.min(np.array([np.min(AEP_param4),np.min(AEP_direct4),np.min(AEP_grid4)])) min6 = np.min(np.array([np.min(AEP_param6),np.min(AEP_direct6),np.min(AEP_grid6)])) @@ -302,18 +289,18 @@ b8 = np.linspace(min4,max4,25) -ax4.hist(AEP_grid4[0:num],bins=b4,color=tuscan,alpha=0.5,label='grid') -ax5.hist(AEP_grid6[0:num],bins=b6,color=tuscan,alpha=0.5) -ax6.hist(AEP_grid8[0:num],bins=b8,color=tuscan,alpha=0.5) -ax4.hist(AEP_param4[0:num],bins=b4,color=robin,alpha=0.5,label='parameterized') -ax5.hist(AEP_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax6.hist(AEP_param8[0:num],bins=b8,color=robin,alpha=0.5) -ax4.hist(AEP_direct4[0:num],bins=b4,color=royal,alpha=0.5,label='direct') -ax5.hist(AEP_direct6[0:num],bins=b6,color=royal,alpha=0.5) -ax6.hist(AEP_direct8[0:num],bins=b8,color=royal,alpha=0.5) -ax4.hist(AEP_param4[0:num],bins=b4,color=robin,alpha=0.5) -ax5.hist(AEP_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax6.hist(AEP_param8[0:num],bins=b8,color=robin,alpha=0.5) +ax4.hist(AEP_grid4[0:num],bins=b4,color='C1',alpha=0.5,label='grid') +ax5.hist(AEP_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax6.hist(AEP_grid8[0:num],bins=b8,color='C1',alpha=0.5) +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,label='parameterized') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5) +ax4.hist(AEP_direct4[0:num],bins=b4,color='C2',alpha=0.5,label='direct') +ax5.hist(AEP_direct6[0:num],bins=b6,color='C2',alpha=0.5) +ax6.hist(AEP_direct8[0:num],bins=b8,color='C2',alpha=0.5) +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5) ax4.legend(loc=2,prop={'size': 8}) @@ -410,5 +397,5 @@ ax6.tick_params(axis='both', which='major', labelsize=8) ax6.tick_params(axis='both', which='minor', labelsize=8) -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_bounds.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_bounds.pdf',transparent=True) plt.show() diff --git a/code/plots/plotResults_boundsR1.py b/code/plots/plotResults_boundsR1.py new file mode 100644 index 0000000..63734cd --- /dev/null +++ b/code/plots/plotResults_boundsR1.py @@ -0,0 +1,417 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib +import sys +sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') +from position_constraints import * +import scipy as sp +from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes +from windRoses import * + +nTurbs = 100 +rotorDiameter = np.ones(nTurbs)*130. + +spacing = 4. +side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing +a = side_length**2 +circle_radius = np.sqrt(a/np.pi) + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid4 = my_file.readlines() +for p in range(len(AEP_grid4)): + AEP_grid4[p] = float(AEP_grid4[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid4 = my_file.readlines() +for p in range(len(f_grid4)): + f_grid4[p] = float(f_grid4[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct4 = my_file.readlines() +for p in range(len(AEP_direct4)): + AEP_direct4[p] = float(AEP_direct4[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct4 = my_file.readlines() +for p in range(len(f_direct4)): + f_direct4[p] = float(f_direct4[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param4 = my_file.readlines() +for p in range(len(AEP_param4)): + AEP_param4[p] = float(AEP_param4[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param4 = my_file.readlines() +for p in range(len(f_param4)): + f_param4[p] = float(f_param4[p])*120. + + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid6 = my_file.readlines() +for p in range(len(AEP_grid6)): + AEP_grid6[p] = float(AEP_grid6[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid6 = my_file.readlines() +for p in range(len(f_grid6)): + f_grid6[p] = float(f_grid6[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct6 = my_file.readlines() +for p in range(len(AEP_direct6)): + AEP_direct6[p] = float(AEP_direct6[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct6 = my_file.readlines() +for p in range(len(f_direct6)): + f_direct6[p] = float(f_direct6[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param6 = my_file.readlines() +for p in range(len(AEP_param6)): + AEP_param6[p] = float(AEP_param6[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param6 = my_file.readlines() +for p in range(len(f_param6)): + f_param6[p] = float(f_param6[p])*120. + + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid8 = my_file.readlines() +for p in range(len(AEP_grid8)): + AEP_grid8[p] = float(AEP_grid8[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid8 = my_file.readlines() +for p in range(len(f_grid8)): + f_grid8[p] = float(f_grid8[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct8 = my_file.readlines() +for p in range(len(AEP_direct8)): + AEP_direct8[p] = float(AEP_direct8[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct8 = my_file.readlines() +for p in range(len(f_direct8)): + f_direct8[p] = float(f_direct8[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param8 = my_file.readlines() +for p in range(len(AEP_param8)): + AEP_param8[p] = float(AEP_param8[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param8 = my_file.readlines() +for p in range(len(f_param8)): + f_param8[p] = float(f_param8[p])*120. + +AEP_grid4 = AEP_grid4/np.max(AEP_direct4) +AEP_param4 = AEP_param4/np.max(AEP_direct4) +AEP_direct4 = AEP_direct4/np.max(AEP_direct4) + +AEP_grid6 = AEP_grid6/np.max(AEP_direct6) +AEP_param6 = AEP_param6/np.max(AEP_direct6) +AEP_direct6 = AEP_direct6/np.max(AEP_direct6) + +AEP_grid8 = AEP_grid8/np.max(AEP_direct8) +AEP_param8 = AEP_param8/np.max(AEP_direct8) +AEP_direct8 = AEP_direct8/np.max(AEP_direct8) + +import matplotlib as mpl +mpl.rc('font', family = 'serif', serif = 'cmr10') +fig = plt.figure(figsize=[6.5,6.]) +ax4 = plt.subplot2grid((3, 3), (1, 0)) +ax5 = plt.subplot2grid((3, 3), (1, 1),sharey=ax4,sharex=ax4) +ax6 = plt.subplot2grid((3, 3), (1, 2),sharey=ax4,sharex=ax4) +ax1 = plt.subplot2grid((3, 3), (2, 0)) +ax2 = plt.subplot2grid((3, 3), (2, 1),sharey=ax1,sharex=ax1) +ax3 = plt.subplot2grid((3, 3), (2, 2),sharey=ax1,sharex=ax1) + + +ax7 = plt.subplot2grid((3, 3), (0, 0)) +ax8 = plt.subplot2grid((3, 3), (0, 1)) +ax9 = plt.subplot2grid((3, 3), (0, 2)) + +ax7.axis('equal') +ax8.axis('equal') +ax9.axis('equal') + +windDirections, windFrequencies, windSpeeds = northIslandRose(30) +wind_angle = windDirections[np.argmax(windFrequencies)] + + + + +"""amalia boundary""" +locations = np.loadtxt('layout_amalia.txt') +xBounds = locations[:, 0] +yBounds = locations[:, 1] +xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. +yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. +locations[:, 0] = xBounds +locations[:, 1] = yBounds +boundaryVertices, boundaryNormals = calculate_boundary(locations) +xBounds = boundaryVertices[:, 0] +yBounds = boundaryVertices[:, 1] +nBounds = len(xBounds) +points = np.zeros((nBounds,2)) +points[:, 0] = xBounds +points[:, 1] = yBounds +hull = sp.spatial.ConvexHull(points) +area = hull.volume +area_ratio = area/(np.pi*circle_radius**2) +xBounds = xBounds/np.sqrt(area_ratio) +yBounds = yBounds/np.sqrt(area_ratio) + +xBounds = np.append(xBounds,xBounds[0]) +yBounds = np.append(yBounds,yBounds[0]) + +ax7.plot(xBounds,yBounds,'-',color='C0',alpha=0.5) + + +"""circle boundary""" +nBounds = 200 +xBounds = np.zeros(nBounds) +yBounds = np.zeros(nBounds) +theta = np.linspace(0.,2.*np.pi-2.*np.pi/float(nBounds),nBounds) +for i in range(nBounds): + xBounds[i] = circle_radius*np.cos(theta[i]) + yBounds[i] = circle_radius*np.sin(theta[i]) + +x = np.zeros_like(xBounds) +x[:] = xBounds[:] +y = np.zeros_like(yBounds) +y[:] = yBounds[:] +xBounds = x*np.cos(np.deg2rad(wind_angle)) - y*np.sin(np.deg2rad(wind_angle)) +yBounds = x*np.sin(np.deg2rad(wind_angle)) + y*np.cos(np.deg2rad(wind_angle)) + +xBounds = np.append(xBounds,xBounds[0]) +yBounds = np.append(yBounds,yBounds[0]) + +ax8.plot(xBounds,yBounds,'-',color='C0',alpha=0.5) + + +"""square boundary rotated 30 deg from dominant wind direction""" +nBounds = 4 +x = np.array([-side_length/2.,side_length/2.,side_length/2.,-side_length/2.]) +y = np.array([-side_length/2.,-side_length/2.,side_length/2.,side_length/2.]) +xBounds = x*np.cos(np.deg2rad(30.)) - y*np.sin(np.deg2rad(30.)) +yBounds = x*np.sin(np.deg2rad(30.)) + y*np.cos(np.deg2rad(30.)) + +xBounds = np.append(xBounds,xBounds[0]) +yBounds = np.append(yBounds,yBounds[0]) + +ax9.plot(xBounds,yBounds,'-',color='C0',alpha=0.5) + +ax7.set_ylim(-3300.,3300.) +ax8.set_ylim(-3300.,3300.) +ax9.set_ylim(-3300.,3300.) + +ax7.spines['right'].set_visible(False) +ax7.spines['top'].set_visible(False) +ax7.spines['bottom'].set_visible(False) +ax7.spines['left'].set_visible(False) +ax8.spines['right'].set_visible(False) +ax8.spines['top'].set_visible(False) +ax8.spines['bottom'].set_visible(False) +ax8.spines['left'].set_visible(False) +ax9.spines['right'].set_visible(False) +ax9.spines['top'].set_visible(False) +ax9.spines['bottom'].set_visible(False) +ax9.spines['left'].set_visible(False) + +ax7.set_xticks(()) +ax8.set_xticks(()) +ax9.set_xticks(()) +ax7.set_yticks(()) +ax8.set_yticks(()) +ax9.set_yticks(()) + + +ax4.set_title('Amalia',fontsize=8,rotation=0.) +ax5.set_title('circle',fontsize=8,rotation=0.) +ax6.set_title('square',fontsize=8,rotation=0.) + +ax8.set_xlabel('boundary shape',fontsize=8) + + + + +min4 = np.min(np.array([np.min(f_param4),np.min(f_direct4),np.min(f_grid4)])) +min6 = np.min(np.array([np.min(f_param6),np.min(f_direct6),np.min(f_grid6)])) +min8 = np.min(np.array([np.min(f_param8),np.min(f_direct8),np.min(f_grid8)])) + +max4 = np.max(np.array([np.max(f_param4),np.max(f_direct4),np.max(f_grid4)])) +max6 = np.max(np.array([np.max(f_param6),np.max(f_direct6),np.max(f_grid6)])) +max8 = np.max(np.array([np.max(f_param8),np.max(f_direct8),np.max(f_grid8)])) + +# b4 = np.logspace(np.log10(min4),np.log10(max4),25) +# b6 = np.logspace(np.log10(min6),np.log10(max6),25) +# b8 = np.logspace(np.log10(min8),np.log10(max8),25) + +min4 = 500. +max4 = 190000.0 + +b4 = np.logspace(np.log10(min4),np.log10(max4),25) +b6 = np.logspace(np.log10(min4),np.log10(max4),25) +b8 = np.logspace(np.log10(min4),np.log10(max4),25) + +num = 100 + +ax1.hist(f_grid4[0:num],bins=b4,color='C1',alpha=0.5) +ax2.hist(f_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax3.hist(f_grid8[0:num],bins=b8,color='C1',alpha=0.5) + +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) + +ax1.hist(f_direct4[0:num],bins=b4,color='C2',alpha=0.5) +ax2.hist(f_direct6[0:num],bins=b6,color='C2',alpha=0.5) +ax3.hist(f_direct8[0:num],bins=b8,color='C2',alpha=0.5) + +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) + +min4 = np.min(np.array([np.min(AEP_param4),np.min(AEP_direct4),np.min(AEP_grid4)])) +min6 = np.min(np.array([np.min(AEP_param6),np.min(AEP_direct6),np.min(AEP_grid6)])) +min8 = np.min(np.array([np.min(AEP_param8),np.min(AEP_direct8),np.min(AEP_grid8)])) + +max4 = np.max(np.array([np.max(AEP_param4),np.max(AEP_direct4),np.max(AEP_grid4)])) +max6 = np.max(np.array([np.max(AEP_param6),np.max(AEP_direct6),np.max(AEP_grid6)])) +max8 = np.max(np.array([np.max(AEP_param8),np.max(AEP_direct8),np.max(AEP_grid8)])) + +min4 = 0.9 +min6 = min4 +min8 = min4 + +max4 = 1.025 +max6 = max4 +max8 = max4 + +b4 = np.linspace(min4,max4,25) +b6 = np.linspace(min6,max6,25) +b8 = np.linspace(min8,max8,25) + + +ax4.hist(AEP_grid4[0:num],bins=b4,color='C1',alpha=0.5,label='grid',align='left') +ax5.hist(AEP_grid6[0:num],bins=b6,color='C1',alpha=0.5,align='left') +ax6.hist(AEP_grid8[0:num],bins=b8,color='C1',alpha=0.5,align='left') +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,label='parameterized',align='left') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5,align='left') +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5,align='left') +ax4.hist(AEP_direct4[0:num],bins=b4,color='C2',alpha=0.5,label='direct',align='left') +ax5.hist(AEP_direct6[0:num],bins=b6,color='C2',alpha=0.5,align='left') +ax6.hist(AEP_direct8[0:num],bins=b8,color='C2',alpha=0.5,align='left') +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,align='left') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5,align='left') +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5,align='left') + +ax4.legend(loc=2,prop={'size': 8}) + +ax5.set_xlabel('normalized optimal AEP',fontsize=8) +ax2.set_xlabel('function calls', fontsize=8) + +ax4.set_ylabel('# optimization runs',fontsize=8) +ax1.set_ylabel('# optimization runs', fontsize=8) + + +windDirections, windFrequencies, windSpeeds = ukiahRose(30) +print windDirections +print windFrequencies + +windDirections = 90.-windDirections +for i in range(len(windDirections)): + windDirections[i] = np.deg2rad(windDirections[i]) + + +# ax4.plot(windDirections, windFrequencies, '-', color=tuscan, linewidth=3,zorder=0) +# ax4.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE']) + +# ax4.set_rgrids([2,4,6], angle=-35.) +# ax4.set_yticklabels(['2 m/s','4 m/s','6 m/s'],horizontalalignment='center') + +ax1.set_xscale('log') +ax2.set_xscale('log') +ax3.set_xscale('log') + +ticks = np.array([1000.,10000.,100000.,1000000.]) +ax1.set_xticks(ticks) +ax1.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax2.set_xticks(ticks) +ax2.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax3.set_xticks(ticks) +ax3.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax1.set_xlim(700.,200000.) + +ticks = np.array([0.9,0.95,1.0]) +ax4.set_xticks(ticks) +ax4.set_xticklabels(('0.9','0.95','1.0')) +ax5.set_xticks(ticks) +ax5.set_xticklabels(('0.9','0.95','1.0')) +ax6.set_xticks(ticks) +ax6.set_xticklabels(('0.9','0.95','1.0')) + +ax4.set_xlim(0.89,1.01) +ax5.set_xlim(0.89,1.01) +ax6.set_xlim(0.89,1.01) + +ax1.spines['right'].set_visible(False) +ax1.spines['top'].set_visible(False) +ax1.yaxis.set_ticks_position('left') +ax1.xaxis.set_ticks_position('bottom') +ax2.spines['right'].set_visible(False) +ax2.spines['top'].set_visible(False) +ax2.yaxis.set_ticks_position('left') +ax2.xaxis.set_ticks_position('bottom') +ax3.spines['right'].set_visible(False) +ax3.spines['top'].set_visible(False) +ax3.yaxis.set_ticks_position('left') +ax3.xaxis.set_ticks_position('bottom') +ax4.spines['right'].set_visible(False) +ax4.spines['top'].set_visible(False) +ax4.yaxis.set_ticks_position('left') +ax4.xaxis.set_ticks_position('bottom') +ax5.spines['right'].set_visible(False) +ax5.spines['top'].set_visible(False) +ax5.yaxis.set_ticks_position('left') +ax5.xaxis.set_ticks_position('bottom') +ax6.spines['right'].set_visible(False) +ax6.spines['top'].set_visible(False) +ax6.yaxis.set_ticks_position('left') +ax6.xaxis.set_ticks_position('bottom') + + +plt.subplots_adjust(top = 0.94, bottom = 0.1, right = 0.98, left = 0.1, + hspace = 0.6, wspace = 0.2) + + +ax4.text(0.897,100.,'a',fontsize=11,color='black') +ax5.text(0.897,100.,'b',fontsize=11,color='black') +ax6.text(0.897,100.,'c',fontsize=11,color='black') +ax1.text(900.,48.,'d',fontsize=11,color='black') +ax2.text(900.,48.,'e',fontsize=11,color='black') +ax3.text(900.,48.,'f',fontsize=11,color='black') + +ax1.tick_params(axis='both', which='major', labelsize=8) +ax1.tick_params(axis='both', which='minor', labelsize=8) +ax2.tick_params(axis='both', which='major', labelsize=8) +ax2.tick_params(axis='both', which='minor', labelsize=8) +ax3.tick_params(axis='both', which='major', labelsize=8) +ax3.tick_params(axis='both', which='minor', labelsize=8) +ax4.tick_params(axis='both', which='major', labelsize=8) +ax4.tick_params(axis='both', which='minor', labelsize=8) +ax5.tick_params(axis='both', which='major', labelsize=8) +ax5.tick_params(axis='both', which='minor', labelsize=8) +ax6.tick_params(axis='both', which='major', labelsize=8) +ax6.tick_params(axis='both', which='minor', labelsize=8) + +plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/results_boundsR1.pdf',transparent=True) +plt.show() diff --git a/code/plots/plotResults_max.py b/code/plots/plotResults_max.py index 56b9078..bb08d78 100644 --- a/code/plots/plotResults_max.py +++ b/code/plots/plotResults_max.py @@ -224,5 +224,5 @@ ax3.text(2.,-3.,'boundary shape',fontsize=8,horizontalalignment='center') # -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_max.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/results_max.pdf',transparent=True) plt.show() diff --git a/code/plots/plotResults_maxR1.py b/code/plots/plotResults_maxR1.py new file mode 100644 index 0000000..3074795 --- /dev/null +++ b/code/plots/plotResults_maxR1.py @@ -0,0 +1,327 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib +import sys +sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') +from position_constraints import * +import scipy as sp +from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes +# from windRoses import * + +import matplotlib as mpl +mpl.rc('font', family = 'serif', serif = 'cmr10',size=8) + +# bound = 'amalia' +# spac = '4.0' +# rose = 'victorvilleRose' +# folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/%s_%s_%s'%(bound,spac,rose) +# folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/%s_%s_%s'%(bound,spac,rose) +# folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/%s_%s_%s_my1'%(bound,spac,rose) +# # +# with open('%s/AEPopt.txt'%folder_grid) as my_file: +# AEP_grid = my_file.readlines() +# for p in range(len(AEP_grid)): +# AEP_grid[p] = float(AEP_grid[p]) +# +# with open('%s/AEPopt.txt'%folder_direct) as my_file: +# AEP_direct = my_file.readlines() +# for p in range(len(AEP_direct)): +# AEP_direct[p] = float(AEP_direct[p]) +# +# with open('%s/AEPopt.txt'%folder_param) as my_file: +# AEP_param = my_file.readlines() +# for p in range(len(AEP_param)): +# AEP_param[p] = float(AEP_param[p]) + + +# print 'direct: ', np.max(AEP_direct[0:100]) +# print 'param: ', np.max(AEP_param[0:100]) +# print 'grid: ', np.max(AEP_grid[0:100]) + +# #opt base +# # base 745490.812401 +# # U 609826.62169 +# # V 1026981.87294 +# # circle 829796.857156 +# # square 845120.195615 +# # 6 944478.512624 +# # 8 1059055.59708 +# +# d_base = 1319337.4624830007 +# p_base = 1321848.6760216402 +# g_base = 1285013.9936945664 +# b_base = 1272384.14711 +# base = np.array([b_base,g_base,p_base,d_base]) +# +# # print (d_base-b_base)/b_base +# # print (p_base-b_base)/b_base +# # print (g_base-b_base)/b_base +# +# d_6 = 1444130.5355461645 +# p_6 = 1447939.702717834 +# g_6 = 1428351.7311277087 +# b_6 = 1409997.66677 +# six = np.array([b_6,g_6,p_6,d_6]) +# +# # print (d_6-b_6)/b_6 +# # print (p_6-b_6)/b_6 +# # print (g_6-b_6)/b_6 +# +# d_8 = 1504627.0471007032 +# p_8 = 1507076.2508215704 +# g_8 = 1495577.354103449 +# b_8 = 1478346.00892 +# eight = np.array([b_8,g_8,p_8,d_8]) +# +# # print (d_8-b_8)/b_8 +# # print (p_8-b_8)/b_8 +# # print (g_8-b_8)/b_8 +# +# d_circle = 1315815.5893947128 +# p_circle = 1321429.8945051455 +# # g_circle = 1259051.6321162586 +# g_circle = 1288343.196518258 +# b_circle = 1262718.1614 +# circle = np.array([b_circle,g_circle,p_circle,d_circle]) +# +# # print (d_circle-b_circle)/b_circle +# # print (p_circle-b_circle)/b_circle +# # print (g_circle-b_circle)/b_circle +# +# d_square = 1329733.8046032637 +# p_square = 1331340.662503046 +# g_square = 1302801.6310573649 +# b_square = 1269726.70336 +# square = np.array([b_square,g_square,p_square,d_square]) +# +# # print (d_square-b_square)/b_square +# # print (p_square-b_square)/b_square +# # print (g_square-b_square)/b_square +# +# d_ukiah = 1415278.9473485365 +# p_ukiah = 1417439.4876242485 +# g_ukiah = 1381832.8806432036 +# b_ukiah = 1373083.98385 +# ukiah = np.array([b_ukiah,g_ukiah,p_ukiah,d_ukiah]) +# +# # print (d_ukiah-b_ukiah)/b_ukiah +# # print (p_ukiah-b_ukiah)/b_ukiah +# # print (g_ukiah-b_ukiah)/b_ukiah +# +# d_victorville = 1497711.1393903312 +# p_victorville = 1498899.2947109619 +# g_victorville = 1462698.469289606 +# b_victorville = 1451109.14502 +# victorville = np.array([b_victorville,g_victorville,p_victorville,d_victorville]) +# +# # print (d_victorville-b_victorville)/b_victorville +# # print (p_victorville-b_victorville)/b_victorville +# # print (g_victorville-b_victorville)/b_victorville + + + + + +#true base +# U 1425429.79046 +# V 1520007.41548 +# 6 1446206.6559 +# 8 1506032.52603 +# c 1301035.62243 +# s 1307208.73706 + +d_base = 1357709.4021 +p_base = 1360629.14391 +g_base = 1326187.41196 +b_base = 1311195.09809 +base = np.array([b_base,g_base,p_base,d_base]) + +print (d_base-g_base)/d_base + +# print (d_base-b_base)/b_base +# print (p_base-b_base)/b_base +# print (g_base-b_base)/b_base + +d_6 = 1470505.76598 +p_6 = 1475519.11985 +g_6 = 1456771.55278 +b_6 = 1446206.6559 +six = np.array([b_6,g_6,p_6,d_6]) + +print (d_6-g_6)/d_6 + +# print (d_6-b_6)/b_6 +# print (p_6-b_6)/b_6 +# print (g_6-b_6)/b_6 + +d_8 = 1519337.74429 +p_8 = 1524358.24114 +g_8 = 1513847.77186 +b_8 = 1506032.52603 +eight = np.array([b_8,g_8,p_8,d_8]) + +print (d_8-g_8)/d_8 + +# print (d_8-b_8)/b_8 +# print (p_8-b_8)/b_8 +# print (g_8-b_8)/b_8 + +d_circle = 1355977.26239 +p_circle = 1360955.2908 +# g_circle = 1300385.34741 +g_circle = 1329373.22315 +b_circle = 1301035.62243 +circle = np.array([b_circle,g_circle,p_circle,d_circle]) + +print (d_circle-g_circle)/d_circle + +# print (d_circle-b_circle)/b_circle +# print (p_circle-b_circle)/b_circle +# print (g_circle-b_circle)/b_circle + +d_square = 1366805.77434 +p_square = 1370147.21542 +g_square = 1346112.53376 +b_square = 1307208.73706 +square = np.array([b_square,g_square,p_square,d_square]) + +print (d_square-g_square)/d_square + +# print (d_square-b_square)/b_square +# print (p_square-b_square)/b_square +# print (g_square-b_square)/b_square + +d_ukiah = 1470807.90913 +p_ukiah = 1474659.63653 +g_ukiah = 1442684.54864 +b_ukiah = 1425429.79046 +ukiah = np.array([b_ukiah,g_ukiah,p_ukiah,d_ukiah]) + +print (d_ukiah-g_ukiah)/d_ukiah + +# print (d_ukiah-b_ukiah)/b_ukiah +# print (p_ukiah-b_ukiah)/b_ukiah +# print (g_ukiah-b_ukiah)/b_ukiah + +d_victorville = 1561992.89748 +p_victorville = 1564138.02158 +# g_victorville = 1527258.98838 +g_victorville = 1529512.52545 +b_victorville = 1520007.41548 +victorville = np.array([b_victorville,g_victorville,p_victorville,d_victorville]) + +print (d_victorville-g_victorville)/d_victorville + +# print (d_victorville-b_victorville)/b_victorville +# print (p_victorville-b_victorville)/b_victorville +# print (g_victorville-b_victorville)/b_victorville + + +fig = plt.figure(figsize=[6.5,2.5]) +ax1 = plt.subplot2grid((1, 3), (0, 0)) +ax2 = plt.subplot2grid((1, 3), (0, 1)) +ax3 = plt.subplot2grid((1, 3), (0, 2)) + +size = 5 + +ax1.plot(1,100.*(base[3]-base[0])/base[0],'o',alpha=0.5,color='C2',markersize=size,label='direct') +ax1.plot(1,100.*(base[2]-base[0])/base[0],'o',alpha=0.5,color='C0',markersize=size,label='parameterized') +ax1.plot(1,100.*(base[1]-base[0])/base[0],'o',alpha=0.5,color='C1',markersize=size,label='grid') + +# ax1.plot(1,100.*(base[1]-base[0])/base[0],'o',alpha=0.5,color='C1',markersize=size) +# ax1.plot(1,100.*(base[3]-base[0])/base[0],'o',alpha=0.5,color='C2',markersize=size) +# ax1.plot(1,100.*(base[2]-base[0])/base[0],'o',alpha=0.5,color='C0',markersize=size) + +ax1.plot(2,100.*(six[1]-six[0])/six[0],'o',alpha=0.5,color='C1',markersize=size) +ax1.plot(2,100.*(six[3]-six[0])/six[0],'o',alpha=0.5,color='C2',markersize=size) +ax1.plot(2,100.*(six[2]-six[0])/six[0],'o',alpha=0.5,color='C0',markersize=size) + +ax1.plot(3,100.*(eight[1]-eight[0])/eight[0],'o',alpha=0.5,color='C1',markersize=size) +ax1.plot(3,100.*(eight[3]-eight[0])/eight[0],'o',alpha=0.5,color='C2',markersize=size) +ax1.plot(3,100.*(eight[2]-eight[0])/eight[0],'o',alpha=0.5,color='C0',markersize=size) + + +ax2.plot(1,100.*(base[1]-base[0])/base[0],'o',alpha=0.5,color='C1',markersize=size) +ax2.plot(1,100.*(base[3]-base[0])/base[0],'o',alpha=0.5,color='C2',markersize=size) +ax2.plot(1,100.*(base[2]-base[0])/base[0],'o',alpha=0.5,color='C0',markersize=size) + +ax2.plot(2,100.*(ukiah[1]-ukiah[0])/ukiah[0],'o',alpha=0.5,color='C1',markersize=size) +ax2.plot(2,100.*(ukiah[3]-ukiah[0])/ukiah[0],'o',alpha=0.5,color='C2',markersize=size) +ax2.plot(2,100.*(ukiah[2]-ukiah[0])/ukiah[0],'o',alpha=0.5,color='C0',markersize=size) + +ax2.plot(3,100.*(victorville[1]-victorville[0])/victorville[0],'o',alpha=0.5,color='C1',markersize=size) +ax2.plot(3,100.*(victorville[3]-victorville[0])/victorville[0],'o',alpha=0.5,color='C2',markersize=size) +ax2.plot(3,100.*(victorville[2]-victorville[0])/victorville[0],'o',alpha=0.5,color='C0',markersize=size) + +ax1.legend(loc=1,prop={'size': 8}) + + +ax3.plot(1,100.*(base[1]-base[0])/base[0],'o',alpha=0.5,color='C1',markersize=size) +ax3.plot(1,100.*(base[3]-base[0])/base[0],'o',alpha=0.5,color='C2',markersize=size) +ax3.plot(1,100.*(base[2]-base[0])/base[0],'o',alpha=0.5,color='C0',markersize=size) + +ax3.plot(2,100.*(circle[1]-circle[0])/circle[0],'o',alpha=0.5,color='C1',markersize=size) +ax3.plot(2,100.*(circle[3]-circle[0])/circle[0],'o',alpha=0.5,color='C2',markersize=size) +ax3.plot(2,100.*(circle[2]-circle[0])/circle[0],'o',alpha=0.5,color='C0',markersize=size) + +ax3.plot(3,100.*(square[1]-square[0])/square[0],'o',alpha=0.5,color='C1',markersize=size) +ax3.plot(3,100.*(square[3]-square[0])/square[0],'o',alpha=0.5,color='C2',markersize=size) +ax3.plot(3,100.*(square[2]-square[0])/square[0],'o',alpha=0.5,color='C0',markersize=size) + +ax1.set_yticks((0.,2.,4.,6.,8.)) +ax2.set_yticks((0.,2.,4.,6.,8.)) +ax3.set_yticks((0.,2.,4.,6.,8.)) + +ax1.set_yticklabels(('0','2','4','6')) +ax2.set_yticklabels(('','','','')) +ax3.set_yticklabels(('','','','')) + +ax1.set_ylim(0.,6.) +ax2.set_ylim(0.,6.) +ax3.set_ylim(0.,6.) +# +# ax1.set_xlim(0.8,3.2) +# ax2.set_xlim(0.8,3.2) +# ax3.set_xlim(0.8,3.2) + +ax1.set_xticks((1,2,3)) +ax2.set_xticks((1,2,3)) +ax3.set_xticks((1,2,3)) + +ax1.set_xticklabels(('4 D','6 D','8 D'),fontsize=8) +ax2.set_xticklabels(('North\nIsland','Ukiah','Victorville'),fontsize=8,rotation=45.) +ax3.set_xticklabels(('Amalia','circle','square'),fontsize=8,rotation=45.) + +ax1.set_ylabel('% increase over baseline',fontsize=8) + +ax1.spines['right'].set_visible(False) +ax1.spines['top'].set_visible(False) +ax1.yaxis.set_ticks_position('left') +ax1.xaxis.set_ticks_position('bottom') +ax2.spines['right'].set_visible(False) +ax2.spines['top'].set_visible(False) +ax2.yaxis.set_ticks_position('left') +ax2.xaxis.set_ticks_position('bottom') +ax3.spines['right'].set_visible(False) +ax3.spines['top'].set_visible(False) +ax3.yaxis.set_ticks_position('left') +ax3.xaxis.set_ticks_position('bottom') + +plt.subplots_adjust(top = 0.9, bottom = 0.2, right = 0.98, left = 0.1, + hspace = 0.6, wspace = 0.2) + +ax1.text(1.,6.4,'a',fontsize=11,color='black') +ax2.text(1.,6.4,'b',fontsize=11,color='black') +ax3.text(1.,6.4,'c',fontsize=11,color='black') + +# ax1.set_xlabel('turbine spacing',fontsize=8) +# ax2.set_xlabel('wind rose',fontsize=8) +# ax3.set_xlabel('boundary shape',fontsize=8) + +ax1.text(2.,-3.,'turbine spacing',fontsize=8,horizontalalignment='center') +ax2.text(2.,-3.,'wind rose',fontsize=8,horizontalalignment='center') +ax3.text(2.,-3.,'boundary shape',fontsize=8,horizontalalignment='center') + +# +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/results_maxR1.pdf',transparent=True) +plt.show() diff --git a/code/plots/plotResults_roses.py b/code/plots/plotResults_roses.py index bd8898b..b953313 100644 --- a/code/plots/plotResults_roses.py +++ b/code/plots/plotResults_roses.py @@ -8,20 +8,6 @@ import scipy as sp from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes - -"""colors""" -robin = '#55dfe6' -nectar = '#e3bf54' -tuscan = '#e37854' -royal = '#a054e3' - -robin = 'C0' -nectar = 'C1' -tuscan = 'C1' -royal = 'C3' - -# robin = '#ACBD78' - nTurbs = 100 rotorDiameter = np.ones(nTurbs)*130. @@ -169,7 +155,7 @@ wd[i] = radians(wd[i])*-1. """wind rose""" max_height = max(wf) -bars = ax7.bar(wd, wf, width=width, bottom=bottom, color=royal,alpha=0.5) +bars = ax7.bar(wd, wf, width=width, bottom=bottom, color='C3',alpha=0.5) thetaticks = np.arange(0,360,45) ax7.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) ax7.set_thetagrids(thetaticks, frac=1.2) @@ -178,7 +164,7 @@ ax7.set_ylim(0.,0.1) # max_height = max(ws) -# bars = ax10.bar(wd, ws, width=width, bottom=bottom, color=tuscan,alpha=0.5) +# bars = ax10.bar(wd, ws, width=width, bottom=bottom, color='C1',alpha=0.5) # ax10.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) # ax10.set_thetagrids(thetaticks, frac=1.2) # ax10.set_rgrids([5,10], angle=-35.) @@ -193,7 +179,7 @@ wd[i] = radians(wd[i])*-1. """wind rose""" max_height = max(wf) -bars = ax8.bar(wd, wf, width=width, bottom=bottom, color=royal,alpha=0.5) +bars = ax8.bar(wd, wf, width=width, bottom=bottom, color='C3',alpha=0.5) thetaticks = np.arange(0,360,45) ax8.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) ax8.set_thetagrids(thetaticks, frac=1.2) @@ -202,7 +188,7 @@ ax8.set_ylim(0.,0.1) # max_height = max(ws) -# bars = ax11.bar(wd, ws, width=width, bottom=bottom, color=tuscan,alpha=0.5) +# bars = ax11.bar(wd, ws, width=width, bottom=bottom, color='C1',alpha=0.5) # ax11.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) # ax11.set_thetagrids(thetaticks, frac=1.2) # ax11.set_rgrids([5,10], angle=-35.) @@ -218,7 +204,7 @@ wd[i] = radians(wd[i])*-1. """wind rose""" max_height = max(wf) -bars = ax9.bar(wd, wf, width=width, bottom=bottom, color=royal,alpha=0.5) +bars = ax9.bar(wd, wf, width=width, bottom=bottom, color='C3',alpha=0.5) # ax9.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) # tick locations @@ -230,7 +216,7 @@ ax9.set_ylim(0.,0.1) # max_height = max(ws) -# bars = ax12.bar(wd, ws, width=width, bottom=bottom, color=tuscan,alpha=0.5) +# bars = ax12.bar(wd, ws, width=width, bottom=bottom, color='C1',alpha=0.5) # ax12.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) # ax12.set_thetagrids(thetaticks, frac=1.2) # ax12.set_rgrids([5,10], angle=-35.) @@ -280,21 +266,21 @@ num = 100 -ax1.hist(f_grid4[0:num],bins=b4,color=tuscan,alpha=0.5) -ax2.hist(f_grid6[0:num],bins=b6,color=tuscan,alpha=0.5) -ax3.hist(f_grid8[0:num],bins=b8,color=tuscan,alpha=0.5) +ax1.hist(f_grid4[0:num],bins=b4,color='C1',alpha=0.5) +ax2.hist(f_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax3.hist(f_grid8[0:num],bins=b8,color='C1',alpha=0.5) -ax1.hist(f_param4[0:num],bins=b4,color=robin,alpha=0.5) -ax2.hist(f_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax3.hist(f_param8[0:num],bins=b8,color=robin,alpha=0.5) +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) -ax1.hist(f_direct4[0:num],bins=b4,color=royal,alpha=0.5) -ax2.hist(f_direct6[0:num],bins=b6,color=royal,alpha=0.5) -ax3.hist(f_direct8[0:num],bins=b8,color=royal,alpha=0.5) +ax1.hist(f_direct4[0:num],bins=b4,color='C3',alpha=0.5) +ax2.hist(f_direct6[0:num],bins=b6,color='C3',alpha=0.5) +ax3.hist(f_direct8[0:num],bins=b8,color='C3',alpha=0.5) -ax1.hist(f_param4[0:num],bins=b4,color=robin,alpha=0.5) -ax2.hist(f_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax3.hist(f_param8[0:num],bins=b8,color=robin,alpha=0.5) +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) min4 = np.min(np.array([np.min(AEP_param4),np.min(AEP_direct4),np.min(AEP_grid4)])) min6 = np.min(np.array([np.min(AEP_param6),np.min(AEP_direct6),np.min(AEP_grid6)])) @@ -324,18 +310,18 @@ # b8 = np.linspace(0.9,1.05,25) -ax4.hist(AEP_grid4[0:num],bins=b4,color=tuscan,alpha=0.5,label='grid') -ax5.hist(AEP_grid6[0:num],bins=b6,color=tuscan,alpha=0.5) -ax6.hist(AEP_grid8[0:num],bins=b8,color=tuscan,alpha=0.5) -ax4.hist(AEP_param4[0:num],bins=b4,color=robin,alpha=0.5,label='parameterized') -ax5.hist(AEP_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax6.hist(AEP_param8[0:num],bins=b8,color=robin,alpha=0.5) -ax4.hist(AEP_direct4[0:num],bins=b4,color=royal,alpha=0.5,label='direct') -ax5.hist(AEP_direct6[0:num],bins=b6,color=royal,alpha=0.5) -ax6.hist(AEP_direct8[0:num],bins=b8,color=royal,alpha=0.5) -ax4.hist(AEP_param4[0:num],bins=b4,color=robin,alpha=0.5) -ax5.hist(AEP_param6[0:num],bins=b6,color=robin,alpha=0.5) -ax6.hist(AEP_param8[0:num],bins=b8,color=robin,alpha=0.5) +ax4.hist(AEP_grid4[0:num],bins=b4,color='C1',alpha=0.5,label='grid') +ax5.hist(AEP_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax6.hist(AEP_grid8[0:num],bins=b8,color='C1',alpha=0.5) +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,label='parameterized') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5) +ax4.hist(AEP_direct4[0:num],bins=b4,color='C3',alpha=0.5,label='direct') +ax5.hist(AEP_direct6[0:num],bins=b6,color='C3',alpha=0.5) +ax6.hist(AEP_direct8[0:num],bins=b8,color='C3',alpha=0.5) +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5) ax4.legend(loc=2,prop={'size': 8}) @@ -430,5 +416,5 @@ ax6.tick_params(axis='both', which='major', labelsize=8) ax6.tick_params(axis='both', which='minor', labelsize=8) -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_roses.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_roses.pdf',transparent=True) plt.show() diff --git a/code/plots/plotResults_rosesR1.py b/code/plots/plotResults_rosesR1.py new file mode 100644 index 0000000..c66fe8c --- /dev/null +++ b/code/plots/plotResults_rosesR1.py @@ -0,0 +1,434 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib +import sys +sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') +from position_constraints import * +from windRoses import * +import scipy as sp +from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes + +nTurbs = 100 +rotorDiameter = np.ones(nTurbs)*130. + +spacing = 4. +side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing +a = side_length**2 +circle_radius = np.sqrt(a/np.pi) + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid4 = my_file.readlines() +for p in range(len(AEP_grid4)): + AEP_grid4[p] = float(AEP_grid4[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid4 = my_file.readlines() +for p in range(len(f_grid4)): + f_grid4[p] = float(f_grid4[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct4 = my_file.readlines() +for p in range(len(AEP_direct4)): + AEP_direct4[p] = float(AEP_direct4[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct4 = my_file.readlines() +for p in range(len(f_direct4)): + f_direct4[p] = float(f_direct4[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param4 = my_file.readlines() +for p in range(len(AEP_param4)): + AEP_param4[p] = float(AEP_param4[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param4 = my_file.readlines() +for p in range(len(f_param4)): + f_param4[p] = float(f_param4[p])*120. + + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid6 = my_file.readlines() +for p in range(len(AEP_grid6)): + AEP_grid6[p] = float(AEP_grid6[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid6 = my_file.readlines() +for p in range(len(f_grid6)): + f_grid6[p] = float(f_grid6[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct6 = my_file.readlines() +for p in range(len(AEP_direct6)): + AEP_direct6[p] = float(AEP_direct6[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct6 = my_file.readlines() +for p in range(len(f_direct6)): + f_direct6[p] = float(f_direct6[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param6 = my_file.readlines() +for p in range(len(AEP_param6)): + AEP_param6[p] = float(AEP_param6[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param6 = my_file.readlines() +for p in range(len(f_param6)): + f_param6[p] = float(f_param6[p])*120. + + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid8 = my_file.readlines() +for p in range(len(AEP_grid8)): + AEP_grid8[p] = float(AEP_grid8[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid8 = my_file.readlines() +for p in range(len(f_grid8)): + f_grid8[p] = float(f_grid8[p])*120. + + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct8 = my_file.readlines() +for p in range(len(AEP_direct8)): + AEP_direct8[p] = float(AEP_direct8[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct8 = my_file.readlines() +for p in range(len(f_direct8)): + f_direct8[p] = float(f_direct8[p])*120. + + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param8 = my_file.readlines() +for p in range(len(AEP_param8)): + AEP_param8[p] = float(AEP_param8[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param8 = my_file.readlines() +for p in range(len(f_param8)): + f_param8[p] = float(f_param8[p])*120. + + +AEP_grid4 = AEP_grid4/np.max(AEP_direct4) +AEP_param4 = AEP_param4/np.max(AEP_direct4) +AEP_direct4 = AEP_direct4/np.max(AEP_direct4) + +AEP_grid6 = AEP_grid6/np.max(AEP_direct6) +AEP_param6 = AEP_param6/np.max(AEP_direct6) +AEP_direct6 = AEP_direct6/np.max(AEP_direct6) + +AEP_grid8 = AEP_grid8/np.max(AEP_direct8) +AEP_param8 = AEP_param8/np.max(AEP_direct8) +AEP_direct8 = AEP_direct8/np.max(AEP_direct8) + + +import matplotlib as mpl +mpl.rc('font', family = 'serif', serif = 'cmr10') +fig = plt.figure(figsize=[6.5,6.]) +ax4 = plt.subplot2grid((3, 3), (1, 0)) +ax5 = plt.subplot2grid((3, 3), (1, 1),sharey=ax4,sharex=ax4) +ax6 = plt.subplot2grid((3, 3), (1, 2),sharey=ax4,sharex=ax4) +ax1 = plt.subplot2grid((3, 3), (2, 0)) +ax2 = plt.subplot2grid((3, 3), (2, 1),sharey=ax1,sharex=ax1) +ax3 = plt.subplot2grid((3, 3), (2, 2),sharey=ax1,sharex=ax1) + + +# ax10 = plt.subplot2grid((4, 3), (1, 0), polar=True) +# ax11 = plt.subplot2grid((4, 3), (1, 1), polar=True) +# ax12 = plt.subplot2grid((4, 3), (1, 2), polar=True) + +ax7 = plt.subplot2grid((3, 3), (0, 0), polar=True) +ax8 = plt.subplot2grid((3, 3), (0, 1), polar=True) +ax9 = plt.subplot2grid((3, 3), (0, 2), polar=True) + + +nDirections = 30 +bottom = 0 +width = (2.*np.pi) / float(nDirections) + +wd, wf, ws = northIslandRose(nDirections) +wd -= wd[np.argmax(wf*ws**3)] +wd += 270. +# wd +=180./float(nDirections) +for i in range(nDirections): + wd[i] = radians(wd[i])*-1. +"""wind rose""" +max_height = max(wf) +bars = ax7.bar(wd, wf, width=width, bottom=bottom, color='C2',alpha=0.5) +thetaticks = np.arange(0,360,45) +ax7.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) +ax7.set_thetagrids(thetaticks, frac=1.2) +ax7.set_rgrids([0.04,0.08], angle=-35.) +ax7.set_yticklabels(['0.04','0.08'],horizontalalignment='center',fontsize=8) +ax7.set_ylim(0.,0.1) + +# max_height = max(ws) +# bars = ax10.bar(wd, ws, width=width, bottom=bottom, color='C1',alpha=0.5) +# ax10.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) +# ax10.set_thetagrids(thetaticks, frac=1.2) +# ax10.set_rgrids([5,10], angle=-35.) +# ax10.set_yticklabels(['5','10 m/s'],horizontalalignment='left',fontsize=9) +# ax10.set_ylim(0.,13.) + +wd, wf, ws = ukiahRose(nDirections) +wd -= wd[np.argmax(wf*ws**3)] +wd += 270. +# wd +=180./float(nDirections) +for i in range(nDirections): + wd[i] = radians(wd[i])*-1. +"""wind rose""" +max_height = max(wf) +bars = ax8.bar(wd, wf, width=width, bottom=bottom, color='C2',alpha=0.5) +thetaticks = np.arange(0,360,45) +ax8.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) +ax8.set_thetagrids(thetaticks, frac=1.2) +ax8.set_rgrids([0.04,0.08], angle=-35.) +ax8.set_yticklabels(['0.04','0.08'],horizontalalignment='center',fontsize=8) +ax8.set_ylim(0.,0.1) + +# max_height = max(ws) +# bars = ax11.bar(wd, ws, width=width, bottom=bottom, color='C1',alpha=0.5) +# ax11.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) +# ax11.set_thetagrids(thetaticks, frac=1.2) +# ax11.set_rgrids([5,10], angle=-35.) +# ax11.set_yticklabels(['5','10 m/s'],horizontalalignment='left',fontsize=9) +# ax11.set_ylim(0.,13.) + + +wd, wf, ws = victorvilleRose(nDirections) +wd -= wd[np.argmax(wf*ws**3)] +wd += 270. +# wd +=360./float(nDirections) +for i in range(nDirections): + wd[i] = radians(wd[i])*-1. +"""wind rose""" +max_height = max(wf) +bars = ax9.bar(wd, wf, width=width, bottom=bottom, color='C2',alpha=0.5) +# ax9.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) + +# tick locations +thetaticks = np.arange(0,360,45) +ax9.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) +ax9.set_thetagrids(thetaticks, frac=1.2) +ax9.set_rgrids([0.04,0.08], angle=-35.) +ax9.set_yticklabels(['0.04','0.08'],horizontalalignment='center',fontsize=8) +ax9.set_ylim(0.,0.1) + +# max_height = max(ws) +# bars = ax12.bar(wd, ws, width=width, bottom=bottom, color='C1',alpha=0.5) +# ax12.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=9) +# ax12.set_thetagrids(thetaticks, frac=1.2) +# ax12.set_rgrids([5,10], angle=-35.) +# ax12.set_yticklabels(['5','10 m/s'],horizontalalignment='left',fontsize=9) +# ax12.set_ylim(0.,13.) + +ax4.set_title('North Island',fontsize=8,rotation=0.) +ax5.set_title('Ukiah',fontsize=8,rotation=0.) +ax6.set_title('Victorville',fontsize=8,rotation=0.) + +ax7.axhline(linewidth=0.5) +ax8.axhline(linewidth=0.5) +ax9.axhline(linewidth=0.5) +# ax10.axhline(linewidth=0.5) +# ax11.axhline(linewidth=0.5) +# ax12.axhline(linewidth=0.5) +ax7.grid(linewidth=0.5) +ax8.grid(linewidth=0.5) +ax9.grid(linewidth=0.5) +# ax10.grid(linewidth=0.5) +# ax11.grid(linewidth=0.5) +# ax12.grid(linewidth=0.5) + +ax8.set_xlabel('wind roses',fontsize=8,labelpad=2) +# ax10.set_ylabel('wind speeds',fontsize=9,labelpad=15) + + + + +# min4 = np.min(np.array([np.min(f_param4),np.min(f_direct4),np.min(f_grid4),np.min(f_param6),np.min(f_direct6),np.min(f_grid6),np.min(f_param8),np.min(f_direct8),np.min(f_grid8)])) +# min6 = np.min(np.array([np.min(f_param6),np.min(f_direct6),np.min(f_grid6)])) +# min8 = np.min(np.array([np.min(f_param8),np.min(f_direct8),np.min(f_grid8)])) +min4 = 500. +min6 = min4 +min8 = min4 + +# max4 = np.max(np.array([np.max(f_param4),np.max(f_direct4),np.max(f_grid4),np.max(f_param6),np.max(f_direct6),np.max(f_grid6),np.max(f_param8),np.max(f_direct8),np.max(f_grid8)])) +# max6 = np.max(np.array([np.max(f_param6),np.max(f_direct6),np.max(f_grid6)])) +# max8 = np.max(np.array([np.max(f_param8),np.max(f_direct8),np.max(f_grid8)])) +max4 = 190000.0 +max6 = max4 +max8 = max4 + + + +# 960.0 +# 188280.0 + +b4 = np.logspace(np.log10(min4),np.log10(max4),25) +b6 = np.logspace(np.log10(min6),np.log10(max6),25) +b8 = np.logspace(np.log10(min8),np.log10(max8),25) + +ax1.set_xscale('log') +ax2.set_xscale('log') +ax3.set_xscale('log') + +num = 100 + +ax1.hist(f_grid4[0:num],bins=b4,color='C1',alpha=0.5) +ax2.hist(f_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax3.hist(f_grid8[0:num],bins=b8,color='C1',alpha=0.5) + +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) + +ax1.hist(f_direct4[0:num],bins=b4,color='C2',alpha=0.5) +ax2.hist(f_direct6[0:num],bins=b6,color='C2',alpha=0.5) +ax3.hist(f_direct8[0:num],bins=b8,color='C2',alpha=0.5) + +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) + +min4 = np.min(np.array([np.min(AEP_param4),np.min(AEP_direct4),np.min(AEP_grid4)])) +min6 = np.min(np.array([np.min(AEP_param6),np.min(AEP_direct6),np.min(AEP_grid6)])) +min8 = np.min(np.array([np.min(AEP_param8),np.min(AEP_direct8),np.min(AEP_grid8)])) + +max4 = np.max(np.array([np.max(AEP_param4),np.max(AEP_direct4),np.max(AEP_grid4)])) +max6 = np.max(np.array([np.max(AEP_param6),np.max(AEP_direct6),np.max(AEP_grid6)])) +max8 = np.max(np.array([np.max(AEP_param8),np.max(AEP_direct8),np.max(AEP_grid8)])) + +min4 = 0.9 +min6 = min4 +min8 = min4 + +max4 = 1.025 +max6 = max4 +max8 = max4 + +b4 = np.linspace(min4,max4,25) +b6 = np.linspace(min6,max6,25) +b8 = np.linspace(min8,max8,25) + +# b4 = np.append(b4,b4[23]+b4[1]-b4[0]) +# b6 = np.append(b6,b6[23]+b6[1]-b6[0]) +# b8 = np.append(b8,b8[23]+b8[1]-b8[0]) + +# b6 = np.linspace(min4,max4,25) +# b8 = np.linspace(min4,max4,25) + +# b4 = np.linspace(0.9,1.05,25) +# b6 = np.linspace(0.9,1.05,25) +# b8 = np.linspace(0.9,1.05,25) + + +ax4.hist(AEP_grid4[0:num],bins=b4,color='C1',alpha=0.5,label='grid',align='left',ec='None') +ax5.hist(AEP_grid6[0:num],bins=b6,color='C1',alpha=0.5,align='left',ec='None') +ax6.hist(AEP_grid8[0:num],bins=b8,color='C1',alpha=0.5,align='left',ec='None') +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,label='parameterized',align='left',ec='None') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5,align='left',ec='None') +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5,align='left',ec='None') +ax4.hist(AEP_direct4[0:num],bins=b4,color='C2',alpha=0.5,label='direct',align='left',ec='None') +ax5.hist(AEP_direct6[0:num],bins=b6,color='C2',alpha=0.5,align='left',ec='None') +ax6.hist(AEP_direct8[0:num],bins=b8,color='C2',alpha=0.5,align='left',ec='None') +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,align='left',ec='None') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5,align='left',ec='None') +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5,align='left',ec='None') + +ax4.legend(loc=2,prop={'size': 8}) + +ax5.set_xlabel('normalized optimal AEP',fontsize=8) +ax2.set_xlabel('function calls', fontsize=8) + +ax4.set_ylabel('# optimization runs',fontsize=8) +ax1.set_ylabel('# optimization runs', fontsize=8) + + +windDirections, windFrequencies, windSpeeds = ukiahRose(30) +print windDirections +print windFrequencies + +windDirections = 90.-windDirections +for i in range(len(windDirections)): + windDirections[i] = np.deg2rad(windDirections[i]) + +ticks = np.array([1000.,10000.,100000.,1000000.]) +ax1.set_xticks(ticks) +ax1.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax2.set_xticks(ticks) +ax2.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax3.set_xticks(ticks) +ax3.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax1.set_xlim(700.,200000.) + + +ticks = np.array([0.9,0.95,1.0]) +ax4.set_xticks(ticks) +ax4.set_xticklabels(('0.9','0.95','1.0')) +ax5.set_xticks(ticks) +ax5.set_xticklabels(('0.9','0.95','1.0')) +ax6.set_xticks(ticks) +ax6.set_xticklabels(('0.9','0.95','1.0')) + + +ax1.spines['right'].set_visible(False) +ax1.spines['top'].set_visible(False) +ax1.yaxis.set_ticks_position('left') +ax1.xaxis.set_ticks_position('bottom') +ax2.spines['right'].set_visible(False) +ax2.spines['top'].set_visible(False) +ax2.yaxis.set_ticks_position('left') +ax2.xaxis.set_ticks_position('bottom') +ax3.spines['right'].set_visible(False) +ax3.spines['top'].set_visible(False) +ax3.yaxis.set_ticks_position('left') +ax3.xaxis.set_ticks_position('bottom') +ax4.spines['right'].set_visible(False) +ax4.spines['top'].set_visible(False) +ax4.yaxis.set_ticks_position('left') +ax4.xaxis.set_ticks_position('bottom') +ax5.spines['right'].set_visible(False) +ax5.spines['top'].set_visible(False) +ax5.yaxis.set_ticks_position('left') +ax5.xaxis.set_ticks_position('bottom') +ax6.spines['right'].set_visible(False) +ax6.spines['top'].set_visible(False) +ax6.yaxis.set_ticks_position('left') +ax6.xaxis.set_ticks_position('bottom') + +ax4.set_xlim(0.89,1.01) +ax5.set_xlim(0.89,1.01) +ax6.set_xlim(0.89,1.01) + + +plt.subplots_adjust(top = 0.94, bottom = 0.1, right = 0.98, left = 0.1, + hspace = 0.6, wspace = 0.2) + + +ax4.text(0.897,105.,'a',fontsize=11,color='black') +ax5.text(0.897,105.,'b',fontsize=11,color='black') +ax6.text(0.897,105.,'c',fontsize=11,color='black') +ax1.text(900.,34.,'d',fontsize=11,color='black') +ax2.text(900.,34.,'e',fontsize=11,color='black') +ax3.text(900.,34.,'f',fontsize=11,color='black') + +ax1.tick_params(axis='both', which='major', labelsize=8) +ax1.tick_params(axis='both', which='minor', labelsize=8) +ax2.tick_params(axis='both', which='major', labelsize=8) +ax2.tick_params(axis='both', which='minor', labelsize=8) +ax3.tick_params(axis='both', which='major', labelsize=8) +ax3.tick_params(axis='both', which='minor', labelsize=8) +ax4.tick_params(axis='both', which='major', labelsize=8) +ax4.tick_params(axis='both', which='minor', labelsize=8) +ax5.tick_params(axis='both', which='major', labelsize=8) +ax5.tick_params(axis='both', which='minor', labelsize=8) +ax6.tick_params(axis='both', which='major', labelsize=8) +ax6.tick_params(axis='both', which='minor', labelsize=8) + +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/results_rosesR1.pdf',transparent=True) +plt.show() diff --git a/code/plots/plotResults_spacing.py b/code/plots/plotResults_spacing.py index 51b6faf..1374715 100644 --- a/code/plots/plotResults_spacing.py +++ b/code/plots/plotResults_spacing.py @@ -641,5 +641,5 @@ ax6.tick_params(axis='both', which='major', labelsize=8) ax6.tick_params(axis='both', which='minor', labelsize=8) -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_spacing.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/results_spacing.pdf',transparent=True) plt.show() diff --git a/code/plots/plotResults_spacingR1.py b/code/plots/plotResults_spacingR1.py new file mode 100644 index 0000000..9c39e1a --- /dev/null +++ b/code/plots/plotResults_spacingR1.py @@ -0,0 +1,664 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib +import sys +sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') +from position_constraints import * +import scipy as sp +from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes +# from windRoses import * + +# ' = '#ACBD78' + +nTurbs = 100 +rotorDiameter = np.ones(nTurbs)*130. + +spacing = 4. +side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing +a = side_length**2 +circle_radius = np.sqrt(a/np.pi) + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid4 = my_file.readlines() +for p in range(len(AEP_grid4)): + AEP_grid4[p] = float(AEP_grid4[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid4 = my_file.readlines() +for p in range(len(f_grid4)): + f_grid4[p] = float(f_grid4[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct4 = my_file.readlines() +for p in range(len(AEP_direct4)): + AEP_direct4[p] = float(AEP_direct4[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct4 = my_file.readlines() +for p in range(len(f_direct4)): + f_direct4[p] = float(f_direct4[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param4 = my_file.readlines() +for p in range(len(AEP_param4)): + AEP_param4[p] = float(AEP_param4[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param4 = my_file.readlines() +for p in range(len(f_param4)): + f_param4[p] = float(f_param4[p])*120. + + + + + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose' + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid6 = my_file.readlines() +for p in range(len(AEP_grid6)): + AEP_grid6[p] = float(AEP_grid6[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid6 = my_file.readlines() +for p in range(len(f_grid6)): + f_grid6[p] = float(f_grid6[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct6 = my_file.readlines() +for p in range(len(AEP_direct6)): + AEP_direct6[p] = float(AEP_direct6[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct6 = my_file.readlines() +for p in range(len(f_direct6)): + f_direct6[p] = float(f_direct6[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param6 = my_file.readlines() +for p in range(len(AEP_param6)): + AEP_param6[p] = float(AEP_param6[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param6 = my_file.readlines() +for p in range(len(f_param6)): + f_param6[p] = float(f_param6[p])*120. + + +folder_direct = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose' +folder_param = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose' +folder_grid = '/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose' + + +with open('%s/AEPtrue.txt'%folder_grid) as my_file: + AEP_grid8 = my_file.readlines() +for p in range(len(AEP_grid8)): + AEP_grid8[p] = float(AEP_grid8[p]) +with open('%s/funcCalls.txt'%folder_grid) as my_file: + f_grid8 = my_file.readlines() +for p in range(len(f_grid8)): + f_grid8[p] = float(f_grid8[p])*120. + +with open('%s/AEPtrue.txt'%folder_direct) as my_file: + AEP_direct8 = my_file.readlines() +for p in range(len(AEP_direct8)): + AEP_direct8[p] = float(AEP_direct8[p]) +with open('%s/funcCalls.txt'%folder_direct) as my_file: + f_direct8 = my_file.readlines() +for p in range(len(f_direct8)): + f_direct8[p] = float(f_direct8[p])*120. + +with open('%s/AEPtrue.txt'%folder_param) as my_file: + AEP_param8 = my_file.readlines() +for p in range(len(AEP_param8)): + AEP_param8[p] = float(AEP_param8[p]) +with open('%s/funcCalls.txt'%folder_param) as my_file: + f_param8 = my_file.readlines() +for p in range(len(f_param8)): + f_param8[p] = float(f_param8[p])*120. + +AEP_grid4 = AEP_grid4/np.max(AEP_direct4) +AEP_param4 = AEP_param4/np.max(AEP_direct4) +AEP_direct4 = AEP_direct4/np.max(AEP_direct4) + +AEP_grid6 = AEP_grid6/np.max(AEP_direct6) +AEP_param6 = AEP_param6/np.max(AEP_direct6) +AEP_direct6 = AEP_direct6/np.max(AEP_direct6) + +AEP_grid8 = AEP_grid8/np.max(AEP_direct8) +AEP_param8 = AEP_param8/np.max(AEP_direct8) +AEP_direct8 = AEP_direct8/np.max(AEP_direct8) + +import matplotlib as mpl +mpl.rc('font', family = 'serif', serif = 'cmr10') +fig = plt.figure(figsize=[6.5,6.]) +ax4 = plt.subplot2grid((3, 3), (1, 0)) +ax5 = plt.subplot2grid((3, 3), (1, 1),sharey=ax4,sharex=ax4) +ax6 = plt.subplot2grid((3, 3), (1, 2),sharey=ax4,sharex=ax4) +ax1 = plt.subplot2grid((3, 3), (2, 0)) +ax2 = plt.subplot2grid((3, 3), (2, 1),sharey=ax1,sharex=ax1) +ax3 = plt.subplot2grid((3, 3), (2, 2),sharey=ax1,sharex=ax1) + + + +ax9 = plt.subplot2grid((3, 3), (0, 2)) +ax7 = plt.subplot2grid((3, 3), (0, 0),sharey=ax9,sharex=ax9) +ax8 = plt.subplot2grid((3, 3), (0, 1),sharey=ax9,sharex=ax9) + + + +# ax7.set_xlim(-4800.,4800.) +# ax8.set_xlim(-4800.,4800.) +# ax9.set_xlim(-4800.,4800.) +ax7.axis('square') +ax8.axis('square') +ax9.axis('square') + + +# s = 4. +# x = np.array([-2.*s,-s,0.,s,2.*s]) +# y = np.array([-2.*s,-s,0.,s,2.*s]) +# X,Y = np.meshgrid(x,y) +# X = np.ndarray.flatten(X) +# Y = np.ndarray.flatten(Y) +# for i in range(len(X)): +# circ = plt.Circle((X[i],Y[i]),0.5,facecolor='C0',edgecolor='C0',alpha=0.5) +# ax7.add_patch(circ) +# +# s = 6. +# x = np.array([-2.*s,-s,0.,s,2.*s]) +# y = np.array([-2.*s,-s,0.,s,2.*s]) +# X,Y = np.meshgrid(x,y) +# X = np.ndarray.flatten(X) +# Y = np.ndarray.flatten(Y) +# for i in range(len(X)): +# circ = plt.Circle((X[i],Y[i]),0.5,facecolor='C0',edgecolor='C0',alpha=0.5) +# ax8.add_patch(circ) +# +# s = 8. +# x = np.array([-2.*s,-s,0.,s,2.*s]) +# y = np.array([-2.*s,-s,0.,s,2.*s]) +# X,Y = np.meshgrid(x,y) +# X = np.ndarray.flatten(X) +# Y = np.ndarray.flatten(Y) +# for i in range(len(X)): +# circ = plt.Circle((X[i],Y[i]),0.5,facecolor='C0',edgecolor='C0',alpha=0.5) +# ax9.add_patch(circ) +# +# ax7.set_ylim(-19,19) +# ax8.set_ylim(-19,19) +# ax9.set_ylim(-19,19) + +nTurbs = 100 +rotorDiameter = np.ones(nTurbs)*130. + +spacing = 4. +side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing +a = side_length**2 +circle_radius = np.sqrt(a/np.pi) + +"""amalia boundary""" +locations = np.loadtxt('layout_amalia.txt') +xBounds = locations[:, 0] +yBounds = locations[:, 1] +xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. +yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. +locations[:, 0] = xBounds +locations[:, 1] = yBounds +boundaryVertices, boundaryNormals = calculate_boundary(locations) +xBounds = boundaryVertices[:, 0] +yBounds = boundaryVertices[:, 1] +nBounds = len(xBounds) +points = np.zeros((nBounds,2)) +points[:, 0] = xBounds +points[:, 1] = yBounds +hull = sp.spatial.ConvexHull(points) +area = hull.volume +area_ratio = area/(np.pi*circle_radius**2) +xBounds = xBounds/np.sqrt(area_ratio) +yBounds = yBounds/np.sqrt(area_ratio) + +bx4 = np.append(xBounds,xBounds[0]) +by4 = np.append(yBounds,yBounds[0]) + +x4 = np.array([-1055.45573535, -582.10981314, -108.76389094, 364.58203126, + -1356.51783135, -883.17190915, -409.82598695, 63.51993525, + 536.86585745, 1010.21177966, -1657.57992736, -1184.23400516, + -710.88808296, -237.54216076, 235.80376144, 709.14968365, + 1182.49560585, 1655.84152805, -1958.64202337, -1485.29610117, + -1011.95017897, -538.60425677, -65.25833456, 408.08758764, + 881.43350984, 1354.77943204, 1828.12535424, -1786.35819718, + -1313.01227498, -839.66635278, -366.32043057, 107.02549163, + 580.37141383, 1053.71733603, 1527.06325823, 2000.40918044, + -2087.42029319, -1614.07437099, -1140.72844879, -667.38252658, + -194.03660438, 279.30931782, 752.65524002, 1226.00116223, + 1699.34708443, 2172.69300663, -1915.136467 , -1441.79054479, + -968.44462259, -495.09870039, -21.75277819, 451.59314401, + 924.93906622, 1398.28498842, 1871.63091062, -2216.19856301, + -1742.8526408 , -1269.5067186 , -796.1607964 , -322.8148742 , + 150.531048 , 623.87697021, 1097.22289241, 1570.56881461, + 2043.91473681, -2043.91473681, -1570.56881461, -1097.22289241, + -623.87697021, -150.531048 , 322.8148742 , 796.1607964 , + 1269.5067186 , 1742.8526408 , 2216.19856301, -1871.63091062, + -1398.28498842, -924.93906622, -451.59314401, 21.75277819, + 495.09870039, 968.44462259, 1441.79054479, 1915.136467 , + -2172.69300663, -1699.34708443, -1226.00116223, -752.65524002, + -279.30931782, 194.03660438, 667.38252658, 1140.72844879, + -2000.40918044, -1527.06325823, -1053.71733603, -580.37141383, + -107.02549163, 366.32043057, -881.43350984, -408.08758764]) +y4 = np.array([-2.84007553e+03, -2.84007553e+03, -2.84007553e+03, -2.84007553e+03, + -2.36672961e+03, -2.36672961e+03, -2.36672961e+03, -2.36672961e+03, + -2.36672961e+03, -2.36672961e+03, -1.89338369e+03, -1.89338369e+03, + -1.89338369e+03, -1.89338369e+03, -1.89338369e+03, -1.89338369e+03, + -1.89338369e+03, -1.89338369e+03, -1.42003777e+03, -1.42003777e+03, + -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, + -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, -9.46691844e+02, + -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, + -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, + -4.73345922e+02, -4.73345922e+02, -4.73345922e+02, -4.73345922e+02, + -4.73345922e+02, -4.73345922e+02, -4.73345922e+02, -4.73345922e+02, + -4.73345922e+02, -4.73345922e+02, -2.27373675e-13, -2.27373675e-13, + -2.27373675e-13, -2.27373675e-13, -2.27373675e-13, -2.27373675e-13, + -2.27373675e-13, -2.27373675e-13, -2.27373675e-13, 4.73345922e+02, + 4.73345922e+02, 4.73345922e+02, 4.73345922e+02, 4.73345922e+02, + 4.73345922e+02, 4.73345922e+02, 4.73345922e+02, 4.73345922e+02, + 4.73345922e+02, 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, + 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, + 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, 1.42003777e+03, + 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, + 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, + 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, + 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, + 2.36672961e+03, 2.36672961e+03, 2.36672961e+03, 2.36672961e+03, + 2.36672961e+03, 2.36672961e+03, 2.84007553e+03, 2.84007553e+03]) + +spacing = 6. +side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing +a = side_length**2 +circle_radius = np.sqrt(a/np.pi) + +"""amalia boundary""" +locations = np.loadtxt('layout_amalia.txt') +xBounds = locations[:, 0] +yBounds = locations[:, 1] +xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. +yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. +locations[:, 0] = xBounds +locations[:, 1] = yBounds +boundaryVertices, boundaryNormals = calculate_boundary(locations) +xBounds = boundaryVertices[:, 0] +yBounds = boundaryVertices[:, 1] +nBounds = len(xBounds) +points = np.zeros((nBounds,2)) +points[:, 0] = xBounds +points[:, 1] = yBounds +hull = sp.spatial.ConvexHull(points) +area = hull.volume +area_ratio = area/(np.pi*circle_radius**2) +xBounds = xBounds/np.sqrt(area_ratio) +yBounds = yBounds/np.sqrt(area_ratio) + +bx6 = np.append(xBounds,xBounds[0]) +by6 = np.append(yBounds,yBounds[0]) + +x6 = np.array([-1583.18360302, -873.16471971, -163.14583641, 546.87304689, + -2034.77674703, -1324.75786373, -614.73898043, 95.27990288, + 805.29878618, 1515.31766948, -2486.36989105, -1776.35100774, + -1066.33212444, -356.31324114, 353.70564217, 1063.72452547, + 1773.74340877, 2483.76229208, -2937.96303506, -2227.94415176, + -1517.92526845, -807.90638515, -97.88750185, 612.13138146, + 1322.15026476, 2032.16914806, 2742.18803137, -2679.53729577, + -1969.51841247, -1259.49952916, -549.48064586, 160.53823744, + 870.55712075, 1580.57600405, 2290.59488735, 3000.61377065, + -3131.13043978, -2421.11155648, -1711.09267318, -1001.07378987, + -291.05490657, 418.96397673, 1128.98286003, 1839.00174334, + 2549.02062664, 3259.03950994, -2872.70470049, -2162.68581719, + -1452.66693389, -742.64805059, -32.62916728, 677.38971602, + 1387.40859932, 2097.42748263, 2807.44636593, -3324.29784451, + -2614.27896121, -1904.2600779 , -1194.2411946 , -484.2223113 , + 225.79657201, 935.81545531, 1645.83433861, 2355.85322192, + 3065.87210522, -3065.87210522, -2355.85322192, -1645.83433861, + -935.81545531, -225.79657201, 484.2223113 , 1194.2411946 , + 1904.2600779 , 2614.27896121, 3324.29784451, -2807.44636593, + -2097.42748263, -1387.40859932, -677.38971602, 32.62916728, + 742.64805059, 1452.66693389, 2162.68581719, 2872.70470049, + -3259.03950994, -2549.02062664, -1839.00174334, -1128.98286003, + -418.96397673, 291.05490657, 1001.07378987, 1711.09267318, + -3000.61377065, -2290.59488735, -1580.57600405, -870.55712075, + -160.53823744, 549.48064586, -1322.15026476, -612.13138146]) +y6 = np.array([-4.26011330e+03, -4.26011330e+03, -4.26011330e+03, -4.26011330e+03, + -3.55009442e+03, -3.55009442e+03, -3.55009442e+03, -3.55009442e+03, + -3.55009442e+03, -3.55009442e+03, -2.84007553e+03, -2.84007553e+03, + -2.84007553e+03, -2.84007553e+03, -2.84007553e+03, -2.84007553e+03, + -2.84007553e+03, -2.84007553e+03, -2.13005665e+03, -2.13005665e+03, + -2.13005665e+03, -2.13005665e+03, -2.13005665e+03, -2.13005665e+03, + -2.13005665e+03, -2.13005665e+03, -2.13005665e+03, -1.42003777e+03, + -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, + -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, -1.42003777e+03, + -7.10018883e+02, -7.10018883e+02, -7.10018883e+02, -7.10018883e+02, + -7.10018883e+02, -7.10018883e+02, -7.10018883e+02, -7.10018883e+02, + -7.10018883e+02, -7.10018883e+02, 6.82121026e-13, 6.82121026e-13, + 6.82121026e-13, 6.82121026e-13, 6.82121026e-13, 6.82121026e-13, + 6.82121026e-13, 6.82121026e-13, 6.82121026e-13, 7.10018883e+02, + 7.10018883e+02, 7.10018883e+02, 7.10018883e+02, 7.10018883e+02, + 7.10018883e+02, 7.10018883e+02, 7.10018883e+02, 7.10018883e+02, + 7.10018883e+02, 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, + 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, + 1.42003777e+03, 1.42003777e+03, 1.42003777e+03, 2.13005665e+03, + 2.13005665e+03, 2.13005665e+03, 2.13005665e+03, 2.13005665e+03, + 2.13005665e+03, 2.13005665e+03, 2.13005665e+03, 2.13005665e+03, + 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, + 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, + 3.55009442e+03, 3.55009442e+03, 3.55009442e+03, 3.55009442e+03, + 3.55009442e+03, 3.55009442e+03, 4.26011330e+03, 4.26011330e+03]) + +spacing = 8. +side_length = (np.sqrt(nTurbs)-1.)*rotorDiameter[0]*spacing +a = side_length**2 +circle_radius = np.sqrt(a/np.pi) + +"""amalia boundary""" +locations = np.loadtxt('layout_amalia.txt') +xBounds = locations[:, 0] +yBounds = locations[:, 1] +xBounds = xBounds - min(xBounds) - (max(xBounds)-min(xBounds))/2. +yBounds = yBounds - min(yBounds) - (max(yBounds)-min(yBounds))/2. +locations[:, 0] = xBounds +locations[:, 1] = yBounds +boundaryVertices, boundaryNormals = calculate_boundary(locations) +xBounds = boundaryVertices[:, 0] +yBounds = boundaryVertices[:, 1] +nBounds = len(xBounds) +points = np.zeros((nBounds,2)) +points[:, 0] = xBounds +points[:, 1] = yBounds +hull = sp.spatial.ConvexHull(points) +area = hull.volume +area_ratio = area/(np.pi*circle_radius**2) +xBounds = xBounds/np.sqrt(area_ratio) +yBounds = yBounds/np.sqrt(area_ratio) + +bx8 = np.append(xBounds,xBounds[0]) +by8 = np.append(yBounds,yBounds[0]) + +x8 = np.array([-2110.91147069, -1164.21962629, -217.52778188, 729.16406252, + -2713.03566271, -1766.3438183 , -819.6519739 , 127.0398705 , + 1073.73171491, 2020.42355931, -3315.15985473, -2368.46801032, + -1421.77616592, -475.08432152, 471.60752289, 1418.29936729, + 2364.9912117 , 3311.6830561 , -3917.28404675, -2970.59220234, + -2023.90035794, -1077.20851353, -130.51666913, 816.17517527, + 1762.86701968, 2709.55886408, 3656.25070849, -3572.71639436, + -2626.02454996, -1679.33270555, -732.64086115, 214.05098326, + 1160.74282766, 2107.43467206, 3054.12651647, 4000.81836087, + -4174.84058638, -3228.14874197, -2281.45689757, -1334.76505317, + -388.07320876, 558.61863564, 1505.31048005, 2452.00232445, + 3398.69416885, 4345.38601326, -3830.27293399, -2883.58108959, + -1936.88924518, -990.19740078, -43.50555638, 903.18628803, + 1849.87813243, 2796.56997684, 3743.26182124, -4432.39712601, + -3485.70528161, -2539.0134372 , -1592.3215928 , -645.62974839, + 301.06209601, 1247.75394041, 2194.44578482, 3141.13762922, + 4087.82947363, -4087.82947363, -3141.13762922, -2194.44578482, + -1247.75394041, -301.06209601, 645.62974839, 1592.3215928 , + 2539.0134372 , 3485.70528161, 4432.39712601, -3743.26182124, + -2796.56997684, -1849.87813243, -903.18628803, 43.50555638, + 990.19740078, 1936.88924518, 2883.58108959, 3830.27293399, + -4345.38601326, -3398.69416885, -2452.00232445, -1505.31048005, + -558.61863564, 388.07320876, 1334.76505317, 2281.45689757, + -4000.81836087, -3054.12651647, -2107.43467206, -1160.74282766, + -214.05098326, 732.64086115, -1762.86701968, -816.17517527]) +y8 = np.array([-5.68015107e+03, -5.68015107e+03, -5.68015107e+03, -5.68015107e+03, + -4.73345922e+03, -4.73345922e+03, -4.73345922e+03, -4.73345922e+03, + -4.73345922e+03, -4.73345922e+03, -3.78676738e+03, -3.78676738e+03, + -3.78676738e+03, -3.78676738e+03, -3.78676738e+03, -3.78676738e+03, + -3.78676738e+03, -3.78676738e+03, -2.84007553e+03, -2.84007553e+03, + -2.84007553e+03, -2.84007553e+03, -2.84007553e+03, -2.84007553e+03, + -2.84007553e+03, -2.84007553e+03, -2.84007553e+03, -1.89338369e+03, + -1.89338369e+03, -1.89338369e+03, -1.89338369e+03, -1.89338369e+03, + -1.89338369e+03, -1.89338369e+03, -1.89338369e+03, -1.89338369e+03, + -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, + -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, -9.46691844e+02, + -9.46691844e+02, -9.46691844e+02, -4.54747351e-13, -4.54747351e-13, + -4.54747351e-13, -4.54747351e-13, -4.54747351e-13, -4.54747351e-13, + -4.54747351e-13, -4.54747351e-13, -4.54747351e-13, 9.46691844e+02, + 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, + 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, 9.46691844e+02, + 9.46691844e+02, 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, + 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, + 1.89338369e+03, 1.89338369e+03, 1.89338369e+03, 2.84007553e+03, + 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, + 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, 2.84007553e+03, + 3.78676738e+03, 3.78676738e+03, 3.78676738e+03, 3.78676738e+03, + 3.78676738e+03, 3.78676738e+03, 3.78676738e+03, 3.78676738e+03, + 4.73345922e+03, 4.73345922e+03, 4.73345922e+03, 4.73345922e+03, + 4.73345922e+03, 4.73345922e+03, 5.68015107e+03, 5.68015107e+03]) + + +ax7.plot(bx4,by4,'--k',linewidth=0.5) +ax8.plot(bx6,by6,'--k',linewidth=0.5) +ax9.plot(bx8,by8,'--k',linewidth=0.5) + +ax7.set_xlim(min(bx8),max(bx8)) +ax8.set_xlim(min(bx8),max(bx8)) +ax9.set_xlim(min(bx8),max(bx8)) + +ax7.set_ylim(min(by8),max(by8)) +ax8.set_ylim(min(by8),max(by8)) +ax9.set_ylim(min(by8),max(by8)) + + +# plt.show() +for i in range(nTurbs): + circ = plt.Circle((x4[i],y4[i]),rotorDiameter[0]/2.,facecolor='C0',edgecolor='C0',alpha=0.5) + ax7.add_patch(circ) + circ = plt.Circle((x6[i],y6[i]),rotorDiameter[0]/2.,facecolor='C0',edgecolor='C0',alpha=0.5) + ax8.add_patch(circ) + circ = plt.Circle((x8[i],y8[i]),rotorDiameter[0]/2.,facecolor='C0',edgecolor='C0',alpha=0.5) + ax9.add_patch(circ) + +# plt.suptitle('average turbine spacing (rotor diameters)',fontsize=10,y=0.998) +ax7.spines['right'].set_visible(False) +ax7.spines['top'].set_visible(False) +ax7.spines['bottom'].set_visible(False) +ax7.spines['left'].set_visible(False) +ax8.spines['right'].set_visible(False) +ax8.spines['top'].set_visible(False) +ax8.spines['bottom'].set_visible(False) +ax8.spines['left'].set_visible(False) +ax9.spines['right'].set_visible(False) +ax9.spines['top'].set_visible(False) +ax9.spines['bottom'].set_visible(False) +ax9.spines['left'].set_visible(False) + + + +ax7.set_xticks(()) +ax8.set_xticks(()) +ax9.set_xticks(()) +ax7.set_yticks(()) +ax8.set_yticks(()) +ax9.set_yticks(()) + +ax4.set_title('4',fontsize=8,rotation=0.) +ax5.set_title('6',fontsize=8,rotation=0.) +ax6.set_title('8',fontsize=8,rotation=0.) + +ax8.set_xlabel('average turbine spacing (rotor diameters)',fontsize=8) + + + + +min4 = np.min(np.array([np.min(f_param4),np.min(f_direct4),np.min(f_grid4)])) +min6 = np.min(np.array([np.min(f_param6),np.min(f_direct6),np.min(f_grid6)])) +min8 = np.min(np.array([np.min(f_param8),np.min(f_direct8),np.min(f_grid8)])) + +max4 = np.max(np.array([np.max(f_param4),np.max(f_direct4),np.max(f_grid4)])) +max6 = np.max(np.array([np.max(f_param6),np.max(f_direct6),np.max(f_grid6)])) +max8 = np.max(np.array([np.max(f_param8),np.max(f_direct8),np.max(f_grid8)])) + +# min4 = np.min(np.array([np.min(f_direct4),np.min(f_grid4)])) +# min6 = np.min(np.array([np.min(f_direct6),np.min(f_grid6)])) +# min8 = np.min(np.array([np.min(f_direct8),np.min(f_grid8)])) +# +# max4 = np.max(np.array([np.max(f_direct4),np.max(f_grid4)])) +# max6 = np.max(np.array([np.max(f_direct6),np.max(f_grid6)])) +# max8 = np.max(np.array([np.max(f_direct8),np.max(f_grid8)])) + +min4 = 500. +min6 = min4 +min8 = min4 + +max4 = 190000.0 +max6 = max4 +max8 = max4 + +b4 = np.logspace(np.log10(min4),np.log10(max4),25) +b6 = np.logspace(np.log10(min6),np.log10(max6),25) +b8 = np.logspace(np.log10(min8),np.log10(max8),25) + +num = 100 + +ax1.hist(f_grid4[0:num],bins=b4,color='C1',alpha=0.5) +ax2.hist(f_grid6[0:num],bins=b6,color='C1',alpha=0.5) +ax3.hist(f_grid8[0:num],bins=b8,color='C1',alpha=0.5) + +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) + +ax1.hist(f_direct4[0:num],bins=b4,color='C2',alpha=0.5) +ax2.hist(f_direct6[0:num],bins=b6,color='C2',alpha=0.5) +ax3.hist(f_direct8[0:num],bins=b8,color='C2',alpha=0.5) + +ax1.hist(f_param4[0:num],bins=b4,color='C0',alpha=0.5) +ax2.hist(f_param6[0:num],bins=b6,color='C0',alpha=0.5) +ax3.hist(f_param8[0:num],bins=b8,color='C0',alpha=0.5) + +min4 = np.min(np.array([np.min(AEP_param4),np.min(AEP_direct4),np.min(AEP_grid4)])) +min6 = np.min(np.array([np.min(AEP_param6),np.min(AEP_direct6),np.min(AEP_grid6)])) +min8 = np.min(np.array([np.min(AEP_param8),np.min(AEP_direct8),np.min(AEP_grid8)])) + +max4 = np.max(np.array([np.max(AEP_param4),np.max(AEP_direct4),np.max(AEP_grid4)])) +max6 = np.max(np.array([np.max(AEP_param6),np.max(AEP_direct6),np.max(AEP_grid6)])) +max8 = np.max(np.array([np.max(AEP_param8),np.max(AEP_direct8),np.max(AEP_grid8)])) + +# min4 = np.min(np.array([np.min(AEP_direct4),np.min(AEP_grid4)])) +# min6 = np.min(np.array([np.min(AEP_direct6),np.min(AEP_grid6)])) +# min8 = np.min(np.array([np.min(AEP_direct8),np.min(AEP_grid8)])) +# +# max4 = np.max(np.array([np.max(AEP_direct4),np.max(AEP_grid4)])) +# max6 = np.max(np.array([np.max(AEP_direct6),np.max(AEP_grid6)])) +# max8 = np.max(np.array([np.max(AEP_direct8),np.max(AEP_grid8)])) + +min4 = 0.9 +min6 = min4 +min8 = min4 + +max4 = 1.025 +max6 = max4 +max8 = max4 + +b4 = np.linspace(min4,max4,25) +b6 = np.linspace(min6,max6,25) +b8 = np.linspace(min8,max8,25) + + +ax4.hist(AEP_grid4[0:num],bins=b4,color='C1',alpha=0.5,label='grid',align='left') +ax5.hist(AEP_grid6[0:num],bins=b6,color='C1',alpha=0.5,align='left') +ax6.hist(AEP_grid8[0:num],bins=b8,color='C1',alpha=0.5,align='left') +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,label='parameterized',align='left') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5,align='left') +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5,align='left') +ax4.hist(AEP_direct4[0:num],bins=b4,color='C2',alpha=0.5,label='direct',align='left') +ax5.hist(AEP_direct6[0:num],bins=b6,color='C2',alpha=0.5,align='left') +ax6.hist(AEP_direct8[0:num],bins=b8,color='C2',alpha=0.5,align='left') +ax4.hist(AEP_param4[0:num],bins=b4,color='C0',alpha=0.5,align='left') +ax5.hist(AEP_param6[0:num],bins=b6,color='C0',alpha=0.5,align='left') +ax6.hist(AEP_param8[0:num],bins=b8,color='C0',alpha=0.5,align='left') + +ax4.legend(loc=2,prop={'size': 8}) + +ax5.set_xlabel('normalized optimal AEP',fontsize=8) +ax2.set_xlabel('function calls', fontsize=8) + +ax4.set_ylabel('# optimization runs',fontsize=8) +ax1.set_ylabel('# optimization runs', fontsize=8) + +ax1.set_xscale('log') +ax2.set_xscale('log') +ax3.set_xscale('log') + +ticks = np.array([1000.,10000.,100000.,1000000.]) +ax1.set_xticks(ticks) +ax1.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax2.set_xticks(ticks) +ax2.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax3.set_xticks(ticks) +ax3.set_xticklabels((r'10$^3$',r'10$^4$',r'10$^5$',r'10$^6$')) +ax1.set_xlim(700.,200000.) + + +ticks = np.array([0.9,0.95,1.0]) +ax4.set_xticks(ticks) +ax4.set_xticklabels(('0.9','0.95','1.0')) +ax5.set_xticks(ticks) +ax5.set_xticklabels(('0.9','0.95','1.0')) +ax6.set_xticks(ticks) +ax6.set_xticklabels(('0.9','0.95','1.0')) + +ax4.set_xlim(0.89,1.01) +ax5.set_xlim(0.89,1.01) +ax6.set_xlim(0.89,1.01) + +ax1.spines['right'].set_visible(False) +ax1.spines['top'].set_visible(False) +ax1.yaxis.set_ticks_position('left') +ax1.xaxis.set_ticks_position('bottom') +ax2.spines['right'].set_visible(False) +ax2.spines['top'].set_visible(False) +ax2.yaxis.set_ticks_position('left') +ax2.xaxis.set_ticks_position('bottom') +ax3.spines['right'].set_visible(False) +ax3.spines['top'].set_visible(False) +ax3.yaxis.set_ticks_position('left') +ax3.xaxis.set_ticks_position('bottom') +ax4.spines['right'].set_visible(False) +ax4.spines['top'].set_visible(False) +ax4.yaxis.set_ticks_position('left') +ax4.xaxis.set_ticks_position('bottom') +ax5.spines['right'].set_visible(False) +ax5.spines['top'].set_visible(False) +ax5.yaxis.set_ticks_position('left') +ax5.xaxis.set_ticks_position('bottom') +ax6.spines['right'].set_visible(False) +ax6.spines['top'].set_visible(False) +ax6.yaxis.set_ticks_position('left') +ax6.xaxis.set_ticks_position('bottom') + + +plt.subplots_adjust(top = 0.94, bottom = 0.1, right = 0.98, left = 0.1, + hspace = 0.6, wspace = 0.2) + + +ax4.text(0.897,92.,'a',fontsize=11,color='black') +ax5.text(0.897,92.,'b',fontsize=11,color='black') +ax6.text(0.897,92.,'c',fontsize=11,color='black') +ax1.text(900.,37.,'d',fontsize=11,color='black') +ax2.text(900.,37.,'e',fontsize=11,color='black') +ax3.text(900.,37.,'f',fontsize=11,color='black') + + +ax1.tick_params(axis='both', which='major', labelsize=8) +ax1.tick_params(axis='both', which='minor', labelsize=8) +ax2.tick_params(axis='both', which='major', labelsize=8) +ax2.tick_params(axis='both', which='minor', labelsize=8) +ax3.tick_params(axis='both', which='major', labelsize=8) +ax3.tick_params(axis='both', which='minor', labelsize=8) +ax4.tick_params(axis='both', which='major', labelsize=8) +ax4.tick_params(axis='both', which='minor', labelsize=8) +ax5.tick_params(axis='both', which='major', labelsize=8) +ax5.tick_params(axis='both', which='minor', labelsize=8) +ax6.tick_params(axis='both', which='major', labelsize=8) +ax6.tick_params(axis='both', which='minor', labelsize=8) + +plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/results_spacingR1.pdf',transparent=True) +plt.show() diff --git a/code/plots/plotRoses.py b/code/plots/plotRoses.py index b3f1d36..a99cbe2 100644 --- a/code/plots/plotRoses.py +++ b/code/plots/plotRoses.py @@ -33,7 +33,7 @@ -nDirections = 23 +nDirections = 24 bottom = 0 width = (2.*np.pi) / float(nDirections) @@ -45,7 +45,7 @@ wd[i] = radians(wd[i])*-1. """wind rose""" max_height = max(wf) -bars = ax1.bar(wd, wf, width=width, bottom=bottom, color=royal,alpha=0.5, edgecolor='white', linewidth=0.5) +bars = ax1.bar(wd, wf, width=width, bottom=bottom, color='C2',alpha=0.5, edgecolor='white', linewidth=0.5) thetaticks = np.arange(0,360,45) ax1.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) ax1.set_thetagrids(thetaticks, frac=1.2) @@ -72,7 +72,7 @@ wd[i] = radians(wd[i])*-1. """wind rose""" max_height = max(wf) -bars = ax2.bar(wd, wf, width=width, bottom=bottom, color=royal,alpha=0.5, edgecolor='white', linewidth=0.5) +bars = ax2.bar(wd, wf, width=width, bottom=bottom, color='C2',alpha=0.5, edgecolor='white', linewidth=0.5) thetaticks = np.arange(0,360,45) ax2.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=8) ax2.set_thetagrids(thetaticks, frac=1.2) @@ -99,7 +99,7 @@ wd[i] = radians(wd[i])*-1. """wind rose""" max_height = max(wf) -bars = ax3.bar(wd, wf, width=width, bottom=bottom, color=royal,alpha=0.5, edgecolor='white', linewidth=0.5) +bars = ax3.bar(wd, wf, width=width, bottom=bottom, color='C2',alpha=0.5, edgecolor='white', linewidth=0.5) # ax9.set_xticklabels(['E', 'NE', 'N', 'NW', 'W', 'SW', 'S', 'SE'],fontsize=10) # tick locations @@ -127,12 +127,12 @@ ax1.set_ylabel('wind roses',fontsize=8,labelpad=20) ax4.set_ylabel('wind speeds',fontsize=8,labelpad=20) -plt.subplots_adjust(top = 1.0, bottom = 0.1, right = 0.99, left = 0.1, - hspace = 0., wspace = 0.35) +plt.subplots_adjust(top = 0.96, bottom = 0.1, right = 0.99, left = 0.1, + hspace = 0.2, wspace = 0.35) ax1.text(0.76*np.pi,0.2,'a',fontsize=11,color='black') ax2.text(0.76*np.pi,0.2,'b',fontsize=11,color='black') ax3.text(0.76*np.pi,0.2,'c',fontsize=11,color='black') -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/roses.pdf',transparent=True) +# plt.savefig('roses.pdf',transparent=True) plt.show() diff --git a/code/plots/plotRotorSample.py b/code/plots/plotRotorSample.py new file mode 100644 index 0000000..00b8503 --- /dev/null +++ b/code/plots/plotRotorSample.py @@ -0,0 +1,143 @@ +import matplotlib.pyplot as plt +import numpy as np +import matplotlib as mpl +from math import sin, cos, radians +from plantenergy.utilities import sunflower_points + +if __name__=='__main__': + + def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed pattern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-points-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y + + + mpl.rc('font', family = 'serif', serif = 'cmr10') + plt.rcParams["mathtext.fontset"] = "dejavuserif" + + fig = plt.figure(figsize=[4.5,2.5]) + ax1 = plt.subplot2grid((1, 2), (0, 0)) + ax2 = plt.subplot2grid((1, 2), (0, 1)) + + bladeX = np.array([3.,7.,10.,15.,20.,25.,30.,35.,30.,25.,20.,15.,10.,5.,3.,3.]) + bladeY = np.array([0.,0.,0.8,1.5,1.7,1.9,2.1,2.3,2.4,2.4,2.4,2.4,2.4,2.4,2.4,0.])-1.5 + + shear = np.array([75,75,75,175,175,175,275,275,275]) + spacing = np.array([0.5,1.0,1.5,0.5,1.0,1.5,0.5,1.0,1.5]) + + H = 110. + D = 130. + R = 65. + d = np.array([6.3,5.5,4.]) + + circle1 = plt.Circle((0.,H), R, color='C0', fill=False, linestyle = '--', linewidth=1.2*1.5,alpha=0.5) + ax1.add_artist(circle1) + circle1 = plt.Circle((0.,H), R, color='C0', fill=False, linestyle = '--', linewidth=1.2*1.5,alpha=0.5) + ax2.add_artist(circle1) + + c1 = R/35. + + px1 = np.array([0.-d[0]/2,0.-d[1]/2,0.-d[2]/2,0.+d[2]/2,0.+d[1]/2,0.+d[0]/2,0.-d[0]/2]) + py1 = np.array([0,H/2,H-3.*c1,H-3.*c1,H/2,0,0]) + ax1.plot(px1,py1,color='C0', linewidth=1.2*1.5,alpha=0.5) + ax2.plot(px1,py1,color='C0', linewidth=1.2*1.5,alpha=0.5) + + #add blades + hub1 = plt.Circle((0.,H), 3*c1, color='C0', fill=False, linewidth=1*1.5,alpha=0.5) + ax1.add_artist(hub1) + hub1 = plt.Circle((0.,H), 3*c1, color='C0', fill=False, linewidth=1*1.5,alpha=0.5) + ax2.add_artist(hub1) + + angle1 = 5. + + blade1X = bladeX*cos(radians(angle1))-bladeY*sin(radians(angle1)) + blade1Y = bladeX*sin(radians(angle1))+bladeY*cos(radians(angle1)) + + blade2X = bladeX*cos(radians(angle1+120.))-bladeY*sin(radians(angle1+120.)) + blade2Y = bladeX*sin(radians(angle1+120.))+bladeY*cos(radians(angle1+120.)) + + blade3X = bladeX*cos(radians(angle1+240.))-bladeY*sin(radians(angle1+240.)) + blade3Y = bladeX*sin(radians(angle1+240.))+bladeY*cos(radians(angle1+240.)) + + ax1.plot(blade1X*c1+0., blade1Y*c1+H, linewidth=1*1.5, color='C0',alpha=0.5) + ax1.plot(blade2X*c1+0., blade2Y*c1+H, linewidth=1*1.5, color='C0',alpha=0.5) + ax1.plot(blade3X*c1+0., blade3Y*c1+H, linewidth=1*1.5, color='C0',alpha=0.5) + + angle1 = 65. + + blade1X = bladeX*cos(radians(angle1))-bladeY*sin(radians(angle1)) + blade1Y = bladeX*sin(radians(angle1))+bladeY*cos(radians(angle1)) + + blade2X = bladeX*cos(radians(angle1+120.))-bladeY*sin(radians(angle1+120.)) + blade2Y = bladeX*sin(radians(angle1+120.))+bladeY*cos(radians(angle1+120.)) + + blade3X = bladeX*cos(radians(angle1+240.))-bladeY*sin(radians(angle1+240.)) + blade3Y = bladeX*sin(radians(angle1+240.))+bladeY*cos(radians(angle1+240.)) + + ax2.plot(blade1X*c1+0., blade1Y*c1+H, linewidth=1*1.5, color='C0',alpha=0.5) + ax2.plot(blade2X*c1+0., blade2Y*c1+H, linewidth=1*1.5, color='C0',alpha=0.5) + ax2.plot(blade3X*c1+0., blade3Y*c1+H, linewidth=1*1.5, color='C0',alpha=0.5) + + + x_sample = np.array([0.69*R,0.,-0.69*R,0.]) + y_sample = np.array([0.,0.69*R,0.,-0.69*R])+H + ax1.plot(x_sample,y_sample,'o',color='C2',alpha=0.5,markersize=3) + + ax1.text(0.69*R,H+7.,'(0.69,0)',horizontalalignment='center') + ax1.text(0.,H+0.69*R+7.,'(0,0.69)',horizontalalignment='center') + ax1.text(-0.69*R,H+7.,'(-0.69,0)',horizontalalignment='center') + ax1.text(0.,H-0.69*R+7.,'(0,-0.69)',horizontalalignment='center') + + x_sample, y_sample = sunflower_points(100) + x_sample = x_sample*R + y_sample = y_sample*R + H + ax2.plot(x_sample,y_sample,'o',color='C2',alpha=0.5,markersize=3) + + ax1.axis('equal') + ax1.axis('off') + + ax2.axis('equal') + ax2.axis('off') + + ax1.set_ylim(-15.,H+R+5) + ax2.set_ylim(-15.,H+R+5) + + ax1.text(0.,-10.,'optimize',horizontalalignment='center') + ax2.text(0.,-10.,'evaluate',horizontalalignment='center') + + ax1.text(-R+5.,H+R-10.,'a',fontsize=11,color='black') + ax2.text(-R+5.,H+R-10.,'b',fontsize=11,color='black') + + plt.subplots_adjust(top = 1., bottom = 0., right = 1, left = 0., + hspace = 0, wspace = 0) + + # plt.savefig('rotor_samples.pdf',transparent=True) + plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/rotor_samples.pdf',transparent=True) + + plt.show() diff --git a/code/plots/plotScaling.py b/code/plots/plotScaling.py index 5fa1d03..5af0e7e 100644 --- a/code/plots/plotScaling.py +++ b/code/plots/plotScaling.py @@ -89,5 +89,5 @@ plt.subplots_adjust(top = 0.94, bottom = 0.2, right = 0.98, left = 0.25, hspace = 0.6, wspace = 0.2) -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/scaling.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/scaling.pdf',transparent=True) plt.show() diff --git a/code/plots/plotSpacing.py b/code/plots/plotSpacing.py index 1cfaffc..3e25366 100644 --- a/code/plots/plotSpacing.py +++ b/code/plots/plotSpacing.py @@ -328,5 +328,5 @@ ax2.text(-3900.,3900.,'B',fontsize=14,weight='bold',color='black') ax3.text(-5000.,5000.,'C',fontsize=14,weight='bold',color='black') -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/spacing.pdf',transparent=True) +# plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/spacing.pdf',transparent=True) plt.show() diff --git a/code/plots/plotWeibull.py b/code/plots/plotWeibull.py index 0056801..2ade73f 100644 --- a/code/plots/plotWeibull.py +++ b/code/plots/plotWeibull.py @@ -5,11 +5,13 @@ sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') from position_constraints import * import scipy as sp +import scipy.special from mpl_toolkits.axes_grid1.inset_locator import zoomed_inset_axes from windRoses import * -def weibull(x,L): +def weibull(x,mu): k = 2.0 + L = mu/(scipy.special.gamma(1.+1./k)) return k/L*(x/L)**(k-1)*np.exp(-(x/L)**k) """colors""" @@ -57,5 +59,5 @@ def weibull(x,L): plt.subplots_adjust(top = 0.9, bottom = 0.22, right = 0.9, left = 0.22, hspace = 0.0, wspace = 0.) -plt.savefig('/Users/ningrsrch/Dropbox/Projects/reduction/paper/paper-figures/weibull.pdf',transparent=True) +plt.savefig('/Users/ningrsrch/Dropbox/Projects/stanley2019-variable-reduction/paper/paper-figures/weibullR1.pdf',transparent=True) plt.show() diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..8796945 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,110 @@ +1313785.7232220338 +1312707.8228890297 +1312084.0266410836 +1309524.6806510726 +1304666.3838834492 +1313547.4573798724 +1313075.7145099738 +1310239.437510675 +1316382.47640889 +1314108.1343081729 +1310862.3527520897 +1311317.8597231824 +1309474.543875305 +1313742.818105664 +1311314.4929883818 +1306486.1287014391 +1309808.3350636964 +1311384.1514368362 +1309402.6602744006 +1314260.3495491443 +1316483.0920148613 +1316630.0448792456 +1312561.9622953427 +1312661.5423834438 +1312748.3974237521 +1313418.7727010474 +1311098.6687407354 +1309616.2884409304 +1310750.6341443502 +1312254.502754586 +1313560.1236033132 +1313095.750780667 +1314640.2149240675 +1308520.2608764914 +1311532.662814404 +1313378.8657014326 +1315635.5237398741 +1313269.502682176 +1313433.1768462893 +1305883.60022247 +1310866.88981497 +1313290.576359514 +1309781.5343702731 +1315100.715444093 +1314876.0035664442 +1312448.3927146462 +1313402.9539281959 +1313452.8152068655 +1315343.6600264378 +1312344.3857020624 +1313946.7487380246 +1312819.260622137 +1312567.7216035074 +1310789.3586708175 +1313180.0233815454 +1303970.9839587822 +1314132.4743445534 +1308207.0755746558 +1313417.765944488 +1314492.7022938442 +1315094.1443318091 +1314542.2215186385 +1313310.8919847726 +1311782.3039646163 +1312363.0243678165 +1308122.8483703348 +1309216.6775936487 +1310683.0876798108 +1315015.3570065538 +1313130.4192062959 +1311272.9225533449 +1314389.2808961207 +1312477.9666457116 +1314968.1311532522 +1312177.520342375 +1316367.0598704887 +1316838.1609812512 +1314646.2160500803 +1313791.1118515572 +1313582.8082758766 +1316329.509244247 +1308798.1952450085 +1310693.294979965 +1315211.3760253314 +1314452.0084967215 +1313796.0546512231 +1315612.3885482189 +1315679.6517595665 +1310780.4622574276 +1312266.8134641808 +1315400.961250972 +1314782.7723521553 +1319337.4624830007 +1313750.0054644982 +1315487.039505473 +1311274.40100207 +1315724.7207074761 +1314013.0737182891 +1315159.993079227 +1311387.9887169893 +1313127.4201285634 +1313231.0164616138 +1309960.329573751 +1313109.4746758412 +1311603.6093303119 +1313397.7655431845 +1313247.7541793992 +1311520.758652729 +1316606.9051098553 +1312729.151887893 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..5e6eaad --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,110 @@ +1353970.16279 +1352411.95334 +1351919.48926 +1348969.78328 +1348304.52883 +1353699.56499 +1352636.73386 +1349940.30062 +1354539.29341 +1353564.18779 +1349855.56713 +1350853.45113 +1348360.22417 +1353571.37182 +1351043.94545 +1345644.55723 +1348097.92873 +1350382.60747 +1348601.02601 +1354073.77303 +1355724.30603 +1355654.06353 +1352170.52482 +1353111.71673 +1352050.37342 +1352465.02226 +1351237.28233 +1349630.62503 +1348908.85436 +1352457.17762 +1352930.75264 +1353373.75702 +1353403.04118 +1347663.31162 +1349847.45504 +1352907.32832 +1355073.13613 +1352967.88717 +1352961.19564 +1346560.95899 +1349467.67781 +1352681.73272 +1349759.46444 +1353903.57647 +1353891.32838 +1350775.07908 +1352524.56696 +1352561.79456 +1353656.40497 +1351173.17794 +1353558.25888 +1352775.32825 +1352365.82387 +1349704.59044 +1352688.21163 +1344726.45424 +1353395.93766 +1346750.56217 +1353514.83144 +1354493.17775 +1353556.08939 +1353755.0479 +1352883.83819 +1351556.4959 +1351227.90732 +1347757.37394 +1348614.95916 +1350324.21165 +1353985.4218 +1353202.57943 +1350917.94945 +1354436.53569 +1352007.86136 +1354009.32413 +1351746.58197 +1355177.60662 +1355893.85828 +1353735.21179 +1352693.16091 +1352478.21355 +1354120.74199 +1348819.79461 +1349383.20749 +1354301.04974 +1352634.35112 +1352519.41773 +1355622.04262 +1354038.58858 +1349053.06257 +1351811.84373 +1354764.98363 +1353236.26921 +1357709.4021 +1352589.45096 +1353617.84007 +1351498.52651 +1354556.35132 +1353756.95948 +1354702.11997 +1350435.68032 +1352831.74353 +1352511.72053 +1348877.55398 +1352171.35518 +1352082.84152 +1353083.94968 +1351770.49508 +1351388.22341 +1354687.83951 +1351591.51398 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..6697a21 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,110 @@ +59 +69 +71 +76 +105 +135 +128 +133 +145 +151 +179 +180 +184 +205 +233 +73 +255 +278 +277 +279 +321 +208 +167 +347 +354 +379 +379 +258 +106 +441 +483 +355 +201 +460 +481 +471 +523 +393 +507 +201 +143 +557 +586 +578 +598 +601 +617 +77 +129 +648 +679 +356 +190 +684 +732 +50 +634 +324 +812 +475 +818 +166 +490 +843 +701 +410 +271 +219 +588 +630 +750 +480 +64 +435 +179 +281 +464 +774 +402 +404 +614 +94 +451 +164 +789 +537 +564 +889 +563 +662 +754 +406 +732 +691 +273 +290 +858 +63 +104 +120 +277 +378 +84 +463 +253 +509 +71 +577 +137 +277 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt new file mode 100644 index 0000000..468c673 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPopt.txt @@ -0,0 +1,156 @@ +1411996.9034870549 +1403715.6981467437 +1410210.516179464 +1407627.133059403 +1408126.414261777 +1408328.8335708785 +1408824.1393230075 +1409741.1419183572 +1407752.5038472754 +1412630.8462089207 +1406820.6784454128 +1408462.447361146 +1414234.5678769841 +1413452.781717294 +1411112.8801578502 +1409353.7630264997 +1415278.9473485365 +1404951.4438136567 +1407799.3841003077 +1403743.63540862 +1411285.6970215484 +1413149.9323265906 +1407637.545634421 +1409424.4270612535 +1406523.8755689082 +1414711.3297750063 +1412876.3130195716 +1413110.1187974405 +1404142.6274553507 +1410833.181145509 +1414953.9134485137 +1411538.5124324635 +1407383.5230148095 +1405989.3335931827 +1412997.3233280675 +1407168.7910839743 +1409408.0420859805 +1411509.738630365 +1409617.1026261472 +1411010.8143508025 +1404915.9406765841 +1410054.8620817985 +1413040.9789841317 +1404001.548885659 +1411385.2832279175 +1409235.6114087522 +1410066.0227358288 +1411321.0725683665 +1411109.502783798 +1408239.3620920593 +1406185.7940893562 +1412392.6506272852 +1414207.6195796188 +1409812.0291329073 +1411785.223902788 +1412848.7668238494 +1409792.8496665792 +1407506.6627504784 +1407508.127481944 +1413954.157815523 +1410393.2779975932 +1407804.6837874176 +1413353.2207334866 +1408517.029250573 +1410482.9733353432 +1408736.0263632424 +1410702.5583538616 +1410741.3285853427 +1409000.3518448777 +1409989.051186236 +1408574.4567735288 +1415097.6938157836 +1405682.3632994206 +1413389.0003776688 +1408022.4130396722 +1405680.5800030995 +1406978.7080854538 +1412932.670515469 +1413681.7331994246 +1412254.1280558698 +1409806.4151271502 +1410245.107797527 +1407903.137011983 +1408001.1212000602 +1409533.6090015124 +1408047.44811021 +1408476.3604504128 +1407336.0313301643 +1410945.4369215113 +1408913.0613873603 +1405007.642909542 +1411926.5260353303 +1408442.759184441 +1411368.4551719858 +1412605.0790600397 +1414058.6739333074 +1409408.464732758 +1407008.8293920122 +1409274.6773680788 +1410127.493209244 +1409168.4726748366 +1403652.6092859101 +1410623.37599742 +1405002.836992987 +1412869.1292122018 +1411788.7321746193 +1408214.4337020237 +1413519.243735371 +1413940.1057594344 +1410812.8002697774 +1410472.2868187476 +1407888.5000786674 +1409064.5039671483 +1410021.632117929 +1403436.1749872311 +1411674.0969147803 +1408134.341851609 +1408553.0856601186 +1411580.0287407986 +1411354.9913644746 +1405193.703898355 +1410577.5057830494 +1413953.3631300747 +1410528.2867670404 +1406705.2745540326 +1408671.1979578228 +1407662.868435384 +1405584.5426857546 +1407338.7831949107 +1411399.0030070294 +1409909.5327641037 +1410719.4810471395 +1410404.3884742472 +1408151.0191766575 +1407466.0467242706 +1409514.3757711044 +1412467.2932708063 +1408686.9544250965 +1411742.7759579762 +1401225.7883405413 +1402476.6837464236 +1410146.2236202548 +1407961.495758741 +1411074.9011724629 +1410057.119977408 +1412591.919044447 +1407616.3075680276 +1412813.966088532 +1408778.7688881673 +1409680.2699878854 +1411437.8239869426 +1406291.9895695075 +1403618.09464186 +1404063.06283047 +1410166.6074534734 +1412064.570841421 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt new file mode 100644 index 0000000..7f1ef66 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/AEPtrue.txt @@ -0,0 +1,156 @@ +1467696.76862 +1460163.10806 +1466058.31408 +1463892.4043 +1463875.78581 +1463734.05266 +1464128.12239 +1466465.65672 +1462987.0566 +1467995.51132 +1462378.22458 +1464411.0103 +1469732.70084 +1468732.28903 +1467145.15018 +1465334.50744 +1470799.97181 +1461335.39342 +1464511.56072 +1460149.88809 +1466528.08328 +1469266.72923 +1464416.77888 +1465655.1377 +1462515.46365 +1470807.90913 +1469839.87219 +1469027.99678 +1460112.38306 +1467180.0053 +1469944.05654 +1467446.14064 +1463747.5421 +1460671.42122 +1468868.29966 +1463060.27565 +1465450.37532 +1467582.22543 +1464200.96506 +1466756.21649 +1459725.53926 +1464697.49994 +1469423.66306 +1460452.84098 +1466853.73287 +1465019.78756 +1466600.79991 +1467212.67538 +1466310.71433 +1463175.98716 +1462419.71868 +1466202.9346 +1469783.78361 +1465021.04563 +1468034.93821 +1468560.2473 +1465132.13514 +1463229.37903 +1464293.67024 +1470590.95524 +1465756.87283 +1462589.66632 +1467889.00578 +1465590.29104 +1467576.84922 +1465732.07843 +1466722.65338 +1466471.35878 +1464872.55733 +1465853.22628 +1464353.47625 +1469840.97261 +1462930.7485 +1469257.95723 +1463375.83738 +1461610.77101 +1463414.57957 +1468577.76969 +1468416.54317 +1468378.42342 +1465865.04888 +1465446.56966 +1463439.22695 +1461990.01789 +1465445.82313 +1464627.57237 +1464694.95522 +1464038.5665 +1465604.67342 +1464005.56018 +1460331.12152 +1466858.40102 +1463840.74091 +1467962.96924 +1468696.11916 +1469181.72183 +1464811.19389 +1461646.8534 +1464141.75692 +1466528.55954 +1464892.7507 +1460168.7699 +1466319.07374 +1461428.89043 +1468920.31685 +1466950.29997 +1464558.99178 +1468737.72574 +1469229.97466 +1466817.51602 +1466269.04104 +1463720.65974 +1463761.20977 +1466333.28346 +1458413.75375 +1466270.08166 +1464607.30467 +1465237.60307 +1467649.02848 +1467580.98642 +1460706.26865 +1465832.454 +1469980.79768 +1466583.3795 +1461476.93351 +1463382.4804 +1463192.47719 +1460940.67284 +1462930.91321 +1468532.57275 +1466841.21482 +1466680.05382 +1466331.20665 +1464891.73613 +1463596.17762 +1464851.38663 +1468497.1728 +1464177.30304 +1467153.99704 +1457873.01537 +1458089.50079 +1464929.08387 +1464123.87776 +1466839.02092 +1465627.13954 +1468081.11889 +1462535.52532 +1468948.74052 +1463843.17138 +1464174.43439 +1466734.36923 +1462855.89487 +1459723.85186 +1459936.45193 +1466688.99466 +1466903.64938 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt new file mode 100644 index 0000000..f302a83 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_ukiahRose/funcCalls.txt @@ -0,0 +1,156 @@ +100 +84 +118 +125 +126 +87 +94 +89 +176 +195 +201 +176 +178 +256 +149 +217 +130 +299 +91 +70 +346 +363 +283 +284 +289 +304 +318 +430 +76 +321 +347 +229 +374 +371 +381 +499 +128 +380 +335 +161 +266 +480 +498 +119 +341 +379 +749 +152 +738 +530 +673 +779 +268 +326 +812 +412 +311 +106 +664 +644 +120 +886 +187 +167 +130 +330 +709 +115 +256 +319 +688 +775 +784 +722 +152 +168 +154 +336 +655 +130 +624 +577 +215 +361 +103 +271 +912 +169 +572 +654 +543 +638 +593 +477 +1119 +485 +60 +284 +477 +1422 +592 +95 +746 +112 +165 +361 +1198 +220 +128 +178 +335 +475 +567 +233 +730 +753 +673 +94 +791 +671 +427 +491 +501 +139 +651 +125 +1569 +628 +269 +79 +175 +735 +124 +750 +555 +281 +263 +214 +290 +59 +980 +212 +99 +752 +157 +588 +541 +724 +517 +468 +166 +170 +1023 +202 +97 +292 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt new file mode 100644 index 0000000..da2cf9c --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPopt.txt @@ -0,0 +1,130 @@ +1488933.7258878048 +1491221.089274421 +1479244.930681548 +1493359.0957919187 +1489270.5742208487 +1493353.6402684043 +1494147.088328799 +1490928.2521700622 +1492019.9315746955 +1493846.7461516052 +1493481.042883461 +1494891.810209481 +1493443.504940763 +1495860.8435680363 +1494149.8782637387 +1492368.6274055704 +1495185.3605866823 +1495720.8335777293 +1493838.3585354069 +1495487.4379096697 +1497094.510607192 +1492780.740262337 +1494459.9880622418 +1496548.575199087 +1488878.0002610008 +1495946.4616738628 +1494394.9768779736 +1492480.5701696812 +1496053.1572329297 +1494266.7407867569 +1494730.684100154 +1495104.6754760037 +1491667.2608650592 +1495627.226559621 +1494022.9581801551 +1493923.509587771 +1496163.9697089724 +1491224.8413895306 +1491461.9586551567 +1496095.5878441967 +1494857.5899315374 +1492995.0575639645 +1494769.3821076162 +1496111.2538133264 +1491004.2356047595 +1494438.3887567013 +1493372.5725494134 +1495283.696241095 +1493309.9140528284 +1496191.1133414577 +1494500.310606278 +1494584.2442339663 +1495125.1012377692 +1490952.7616803423 +1495090.363815226 +1492583.9873391502 +1493138.510235926 +1497126.4117099189 +1495097.616476345 +1491461.9812601847 +1493450.6427089944 +1495751.0542677862 +1490784.0033672214 +1491381.7880200858 +1493506.5476360973 +1494746.186710019 +1490703.914754184 +1496007.9049377309 +1492153.3706945821 +1491653.0528101826 +1491239.930819626 +1492731.3976352825 +1494118.6273205404 +1495795.6864530824 +1491170.0897867675 +1495724.4217311 +1491872.6318939386 +1492450.195756997 +1493958.015827481 +1488282.4769789528 +1488026.3736647947 +1497711.1393903312 +1494076.804350872 +1496512.5146954278 +1492035.1913296937 +1494195.2430236756 +1490686.523428751 +1492440.7466289708 +1490995.0588619125 +1495646.21135002 +1493532.3015202996 +1489996.5510849329 +1493160.036310364 +1491488.6177347978 +1493612.8859138095 +1491876.4760548975 +1492612.5806717263 +1493959.2955539823 +1492833.7509379447 +1496502.8467583074 +1495921.761231866 +1496009.1198391165 +1495901.6328392283 +1491155.6023529086 +1491473.4388711734 +1493249.4233703616 +1496685.1572933171 +1492027.9502488389 +1496836.239864639 +1493909.5451323672 +1493322.2586576953 +1492951.5959815348 +1495738.338589485 +1493972.4477023894 +1494169.0643140608 +1493859.698613025 +1492767.9417632788 +1488685.452803941 +1494853.4817393485 +1494398.3801906607 +1488710.2459497163 +1493433.881362875 +1495521.2812260038 +1491768.4751505808 +1495936.4108263857 +1496539.531536559 +1491872.1962548287 +1493624.4064302372 +1492205.830753303 +1497776.3276994652 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt new file mode 100644 index 0000000..0f19510 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/AEPtrue.txt @@ -0,0 +1,130 @@ +1555647.80715 +1556425.02461 +1548237.83466 +1558690.64716 +1554386.90192 +1557963.62653 +1558220.55066 +1555520.98595 +1556776.05508 +1558643.05135 +1559019.5189 +1560074.88684 +1559449.38228 +1560767.78168 +1558842.62883 +1557991.1075 +1559664.14802 +1559945.74947 +1559438.24437 +1560166.76271 +1561992.89748 +1557604.80051 +1560883.7654 +1561331.77389 +1554431.22103 +1560390.28648 +1559290.56189 +1558239.50568 +1560587.11612 +1559473.62057 +1559139.98925 +1560514.53905 +1556571.16214 +1560845.41421 +1558641.50059 +1559364.88018 +1560128.78399 +1556707.76056 +1557495.70199 +1560734.48325 +1558844.47402 +1558051.82 +1560323.51313 +1560700.77945 +1556982.18008 +1560492.33913 +1559098.33434 +1559516.8476 +1558630.13118 +1560927.97868 +1559715.80231 +1560093.17362 +1560484.84302 +1556694.30073 +1557645.10062 +1558097.26858 +1558771.59874 +1561984.97286 +1559345.43569 +1557210.60524 +1559178.43036 +1560478.47331 +1555788.93765 +1557255.95303 +1559083.84205 +1560687.86446 +1556295.8406 +1561263.47227 +1557461.9406 +1557249.85916 +1556722.11559 +1560276.64453 +1558239.62186 +1559757.70255 +1557082.27487 +1561160.92938 +1556993.36526 +1557483.32221 +1558628.26043 +1554800.69438 +1553408.40088 +1560817.28902 +1558712.33196 +1561945.54948 +1557582.55065 +1559077.61374 +1554786.27339 +1557659.19286 +1555647.80853 +1560622.88101 +1559249.42346 +1555046.19514 +1559115.33498 +1556223.92993 +1558987.05106 +1557716.21329 +1558761.32889 +1558759.80673 +1558317.51001 +1561080.33629 +1561339.47351 +1560888.04499 +1561495.02669 +1556810.29015 +1557408.77959 +1558882.3101 +1561619.25374 +1557799.6916 +1561799.27678 +1560310.52812 +1559522.9057 +1557339.98687 +1560291.70202 +1558974.50733 +1559126.85292 +1559538.53719 +1557252.79928 +1554151.84598 +1559781.24371 +1559596.5796 +1554792.31252 +1558408.27218 +1560574.11682 +1558462.47059 +1560540.45752 +1561941.3234 +1558055.84202 +1559080.59223 +1557612.07652 +1563048.66176 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt new file mode 100644 index 0000000..1b8754c --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_4.0_victorvilleRose/funcCalls.txt @@ -0,0 +1,130 @@ +100 +160 +177 +202 +71 +227 +283 +288 +334 +352 +355 +431 +454 +475 +523 +529 +527 +532 +532 +540 +548 +581 +578 +618 +627 +634 +621 +648 +662 +658 +676 +671 +195 +694 +668 +733 +503 +437 +520 +779 +809 +607 +556 +473 +874 +843 +909 +914 +535 +956 +982 +664 +989 +172 +1026 +463 +338 +1060 +319 +82 +94 +421 +653 +408 +482 +585 +1294 +621 +593 +164 +483 +219 +637 +625 +390 +389 +602 +442 +802 +784 +1476 +426 +995 +138 +1005 +1033 +1626 +563 +166 +98 +139 +148 +152 +97 +238 +246 +309 +327 +121 +428 +424 +430 +434 +441 +444 +454 +483 +498 +515 +515 +521 +522 +534 +561 +572 +592 +575 +126 +630 +638 +657 +661 +666 +681 +680 +661 +714 +136 +98 +748 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..03b477f --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPopt.txt @@ -0,0 +1,235 @@ +1440157.870663181 +1429702.5540713759 +1430948.4851418296 +1435417.7714399626 +1437266.2559252183 +1439237.1140176153 +1439489.3071603947 +1441078.0836817103 +1438226.3946967789 +1437584.0300634282 +1434268.5806930962 +1432733.6457333982 +1429155.9718416156 +1430999.4355988007 +1438771.502168714 +1442475.1278986107 +1437756.8231208911 +1432047.7843489249 +1441558.7986120668 +1435484.17037302 +1442185.738854518 +1429261.0756757644 +1441178.4258734586 +1438720.1940719383 +1444130.5355461645 +1438905.2940595443 +1435505.4389084924 +1436414.248144639 +1439525.900655756 +1439356.5050145537 +1428852.8076421425 +1439379.827102706 +1434948.8073158765 +1432939.5407457321 +1434060.4150135417 +1440961.8302710045 +1430629.4885985998 +1437588.6442637828 +1431492.3240412918 +1439319.2369418999 +1439576.415105147 +1437607.8491564665 +1438858.5485990136 +1429648.4150139291 +1427384.9546712635 +1440472.857205781 +1440595.6499443532 +1436940.4006305567 +1433631.7371790328 +1432462.3570543525 +1439162.753418782 +1439477.946046283 +1442385.1200030982 +1439741.2141357488 +1441585.385313092 +1437317.8516524278 +1434692.4166186769 +1432680.083648855 +1436634.8162264493 +1434625.3437726498 +1436995.7447367168 +1429997.8647256235 +1440331.245358098 +1431187.2149606906 +1442662.7667033554 +1434502.4722520006 +1434212.7304235331 +1434418.1868705673 +1437847.1742884659 +1432523.5482053529 +1434267.4657846228 +1440886.1362430537 +1440374.8860048258 +1442858.6485561472 +1435625.8846851334 +1441161.1761198812 +1434029.3951086747 +1432755.9670600023 +1437917.8630897726 +1442403.6788113387 +1442952.8922752608 +1437544.163607192 +1437365.5485163708 +1430259.3312998577 +1433913.068318451 +1439219.1602293593 +1434199.8177567252 +1440535.316565938 +1436181.0081247394 +1438715.6775039071 +1443612.7204088918 +1436734.1794503147 +1438854.293745159 +1432047.5869064936 +1437197.2507800348 +1435099.2658956065 +1438167.2613023631 +1434089.2119617152 +1435071.2068754553 +1443510.4714130356 +1438827.8454960107 +1435375.7175627716 +1435786.2451111923 +1437182.6333537747 +1433479.7251259761 +1436195.980592367 +1433021.9102170274 +1438789.4453215974 +1441872.7993958003 +1438882.6979378785 +1430290.025202305 +1437204.7645026809 +1439675.599671984 +1439370.1414315666 +1430665.8984700795 +1437224.5032885405 +1438052.0052308887 +1439877.335059501 +1441438.224263589 +1443405.237934947 +1438389.5911940965 +1434517.3042534075 +1437383.0319598787 +1437661.3752823207 +1437124.2298083066 +1438744.5455424893 +1434959.15977214 +1433342.0696128327 +1436387.2391572415 +1434564.248808007 +1434753.2355991823 +1441703.8578578413 +1435701.4132924427 +1437106.7918441263 +1435941.0988913965 +1438808.2075982145 +1434167.7314068377 +1437624.876078484 +1432716.7959877907 +1434382.6153734857 +1442099.3722179732 +1438986.850483405 +1441031.7968643454 +1440351.4361043219 +1436547.609827668 +1440374.7860509395 +1440544.8812502113 +1442170.362510684 +1435630.2998109073 +1440274.6224676843 +1442763.6781759174 +1436644.0066901052 +1440899.2616559295 +1440361.8139597045 +1433843.1193735374 +1442414.381533287 +1441244.5405964558 +1440731.6865902191 +1435813.9223489887 +1432992.302875279 +1436317.576133951 +1438086.1435294948 +1442156.4762711504 +1439659.3887349546 +1431757.8740808193 +1433026.566732041 +1440051.222530952 +1439959.098243314 +1439425.0632800828 +1438642.3327165325 +1435933.1368917448 +1437803.4186131605 +1438256.0664129118 +1438321.6946769576 +1439071.1380491965 +1431197.2513602865 +1433983.5064752526 +1432350.8692498652 +1432963.4460723877 +1438285.3267195176 +1439460.7551046067 +1436353.5135963168 +1440019.4221997112 +1437304.7515922817 +1442852.619090428 +1440478.4850038236 +1435871.3368299683 +1436538.5020487153 +1438051.0673969595 +1442046.0757471772 +1434522.937736183 +1430875.6287547906 +1439259.9924187064 +1436762.7283326075 +1437772.227301226 +1438367.0607338077 +1438246.591128736 +1435643.0121245452 +1439855.7643868253 +1431425.4992622896 +1442440.0146443907 +1432267.1391905902 +1438125.1161194702 +1441229.4471825396 +1436571.1142475002 +1442392.090460457 +1441135.0603018529 +1439280.0544992057 +1439966.1920337377 +1435214.1507800943 +1438614.6861932636 +1429422.0425719735 +1431325.5604418744 +1438674.544942831 +1433174.9787407434 +1437305.2135162468 +1441121.64841236 +1434528.724627201 +1443722.454409371 +1440190.3564344125 +1439784.1548289547 +1434252.6944375238 +1436483.3547153047 +1438472.1132943216 +1437302.3364550006 +1432845.1330253899 +1437512.6541265233 +1439652.7809271505 +1440398.087151073 +1435085.820400351 +1435948.4209105086 +1434976.192110999 +1436438.3874475062 +1440054.7305167005 +1434240.7420963494 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..5fa38b4 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,235 @@ +1468578.88069 +1459000.91999 +1460516.50574 +1464084.8905 +1465752.58217 +1467390.70395 +1467825.88922 +1468160.62684 +1466210.17132 +1465559.26429 +1462550.75031 +1461166.71946 +1457985.98334 +1460545.15775 +1466246.29764 +1468999.79365 +1465404.33554 +1460349.76036 +1469390.79789 +1463089.87325 +1469074.28631 +1457890.30205 +1468100.1788 +1466132.91347 +1470505.76598 +1465445.41906 +1464186.19537 +1464035.9885 +1467089.84504 +1466979.69696 +1456919.60652 +1466394.22167 +1463090.32149 +1461245.98297 +1462261.4673 +1467851.62093 +1459391.37276 +1465091.39836 +1460634.26657 +1467568.93343 +1467334.12337 +1466019.64499 +1466273.72882 +1458959.87285 +1457451.20283 +1466954.06667 +1467712.17138 +1464605.97091 +1462038.01207 +1462414.93712 +1465385.33115 +1467044.91612 +1469537.97354 +1467708.86857 +1468369.70667 +1465077.07002 +1463345.74037 +1461151.85552 +1464346.76856 +1463170.73639 +1464237.62166 +1458946.71752 +1467335.85509 +1460724.33676 +1469510.82766 +1463784.604 +1462722.14996 +1462398.18999 +1465508.06546 +1460665.49212 +1463617.16044 +1468642.98219 +1467766.85604 +1469362.40628 +1463767.82817 +1468630.9711 +1462140.27889 +1461106.26568 +1465152.62484 +1469061.99624 +1468857.68431 +1464726.93902 +1465909.98633 +1459071.0011 +1462470.67214 +1467370.41806 +1462995.93869 +1468037.42951 +1463369.25243 +1465431.2492 +1469817.4112 +1464250.96368 +1466889.39397 +1460724.72041 +1465228.43165 +1462615.87479 +1465044.70404 +1462810.80533 +1462767.59777 +1469860.84082 +1467549.12188 +1463381.72294 +1464094.51845 +1464816.90241 +1461889.84499 +1463650.60286 +1462304.49372 +1466184.64969 +1469128.3101 +1466000.60734 +1459780.523 +1464752.1523 +1468290.87137 +1466546.06993 +1458749.25911 +1464529.94447 +1466720.91726 +1467274.92409 +1468031.16937 +1470625.14051 +1465194.05118 +1461974.63194 +1464253.24041 +1465210.92117 +1464939.33414 +1465394.57506 +1461867.04042 +1461345.60785 +1464397.24093 +1463518.15898 +1463124.60142 +1468762.55111 +1464165.12762 +1465991.17764 +1464159.98299 +1467541.26934 +1461978.51852 +1466069.08931 +1461604.08277 +1462511.92425 +1469272.00657 +1465712.1584 +1469005.55665 +1466783.02671 +1463948.88083 +1467667.39303 +1467922.68975 +1469674.74035 +1463076.58758 +1468162.40264 +1469602.02355 +1463659.9264 +1467502.56004 +1466426.4207 +1461748.74626 +1469384.40042 +1468884.03838 +1468431.42589 +1463669.40379 +1461428.84405 +1464209.17899 +1466513.13044 +1469149.2952 +1467167.69772 +1460178.66385 +1462251.30568 +1468188.75364 +1467116.38528 +1467547.77373 +1466398.23427 +1465805.84337 +1464937.50425 +1466835.90377 +1465902.58297 +1466576.78533 +1459934.77429 +1462256.13547 +1461036.09552 +1460989.2261 +1465636.75484 +1466759.27103 +1464934.8007 +1467634.99885 +1464529.40429 +1469872.89974 +1468185.51659 +1465015.6942 +1464409.16768 +1464387.10931 +1468488.46445 +1463664.32014 +1459548.79504 +1467233.02309 +1465544.1154 +1465153.02286 +1466378.46911 +1465641.47739 +1463581.35538 +1466956.06729 +1459626.47566 +1469014.14531 +1461424.29651 +1464995.70587 +1468937.02479 +1465057.90587 +1469674.177 +1467760.36884 +1466149.48995 +1467821.87791 +1463262.93097 +1465751.69997 +1458194.52294 +1459281.77575 +1466743.4244 +1462069.56423 +1464762.90043 +1468437.42919 +1462269.36256 +1470381.01397 +1467996.92995 +1466658.24331 +1462295.82291 +1463655.43095 +1467172.46986 +1464787.18949 +1461190.04033 +1464694.0745 +1468081.88792 +1468199.23536 +1463232.46573 +1463160.70804 +1462919.35351 +1465173.44421 +1466922.13371 +1463350.23363 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..4a91f0a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_6.0_northIslandRose/funcCalls.txt @@ -0,0 +1,235 @@ +47 +49 +55 +52 +55 +55 +62 +62 +62 +65 +66 +66 +68 +69 +72 +77 +85 +84 +84 +85 +87 +109 +112 +120 +124 +135 +53 +158 +160 +159 +66 +176 +59 +87 +91 +195 +79 +191 +86 +128 +120 +124 +149 +235 +51 +235 +59 +157 +129 +98 +275 +148 +64 +101 +309 +191 +62 +318 +315 +322 +208 +101 +233 +139 +118 +112 +74 +87 +170 +109 +56 +76 +128 +103 +309 +53 +217 +74 +441 +137 +459 +466 +59 +315 +121 +58 +56 +81 +203 +294 +336 +259 +104 +509 +95 +227 +175 +68 +108 +308 +51 +548 +180 +461 +48 +86 +104 +306 +60 +59 +246 +73 +61 +245 +593 +63 +95 +102 +66 +79 +657 +660 +665 +215 +78 +124 +277 +131 +74 +104 +73 +85 +82 +87 +235 +81 +614 +70 +160 +120 +95 +206 +58 +104 +157 +72 +78 +79 +71 +188 +87 +177 +493 +537 +87 +264 +95 +61 +63 +81 +111 +97 +64 +68 +124 +55 +81 +140 +155 +99 +53 +188 +150 +137 +56 +278 +106 +86 +593 +66 +72 +74 +80 +347 +154 +79 +139 +333 +1021 +211 +98 +75 +86 +57 +92 +78 +422 +288 +153 +112 +111 +63 +511 +61 +70 +328 +115 +248 +216 +102 +157 +820 +63 +69 +61 +309 +174 +297 +105 +84 +387 +67 +346 +75 +177 +59 +123 +85 +60 +949 +216 +53 +64 +383 +63 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..4ea9b7a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPopt.txt @@ -0,0 +1,367 @@ +1493880.121174869 +1487960.1416906498 +1497661.0296321583 +1498148.7542887414 +1500603.4296049026 +1502356.1625785253 +1494169.0612788845 +1497433.4998794494 +1489761.676643932 +1496756.7762398415 +1494028.4623714692 +1496454.3019105655 +1490155.188418153 +1490960.9384154128 +1490691.9442489515 +1495133.2586836703 +1504432.7607374135 +1497366.9190700676 +1501431.8852872602 +1500961.3174628941 +1497113.5369624435 +1495273.5583966933 +1498796.3542653357 +1490230.2254526096 +1498529.4773176312 +1500095.2904643512 +1491992.734102917 +1498665.5131859297 +1502838.5150105676 +1499456.8428899962 +1500936.4005270367 +1493689.690968588 +1488955.8328210483 +1493494.836921472 +1490049.6864076322 +1498932.90692084 +1492113.0776583084 +1491329.916284738 +1494902.606815565 +1487578.8963264308 +1490564.5816402198 +1491027.969982039 +1492841.2733127477 +1490469.1420149517 +1503109.4534266181 +1491272.3106273015 +1502873.8456832124 +1501397.3845884702 +1501467.846423019 +1494573.8509242681 +1493656.4453814623 +1499872.839414666 +1498260.3967311233 +1493863.2299864853 +1495672.8042592756 +1493982.2257454398 +1500238.8882466075 +1492241.177749993 +1497077.389825467 +1494106.5670791264 +1498237.4128172835 +1489724.6350818954 +1496322.5330891241 +1498255.16250634 +1495634.248449939 +1487677.8127392165 +1496527.4509872901 +1494376.3238459567 +1497873.512936728 +1496610.2179517169 +1501574.6637291864 +1495335.0314850567 +1503674.067279681 +1500867.60643823 +1494385.9580955543 +1495874.9491018786 +1493936.6026857204 +1495149.7709477777 +1497000.9355195335 +1503169.4879035112 +1502288.6624113403 +1488822.5424545796 +1504627.0471007032 +1493836.4159708275 +1492695.4165560084 +1493901.9141782813 +1494145.0420850574 +1492145.1385612527 +1491400.1935252121 +1493268.1117058995 +1499845.5660452528 +1499497.3739340573 +1494254.9563048924 +1495549.3297299931 +1503049.5320570716 +1494722.1023792552 +1495342.5644676746 +1493494.7597613276 +1494025.675597543 +1502965.7425717998 +1495761.5784953872 +1499497.9983792412 +1491042.1378346614 +1496351.8559197376 +1487918.1533927997 +1502579.422517911 +1495483.3688933507 +1495286.8051316007 +1500865.594537831 +1493110.6577574085 +1498156.6583047106 +1496253.7857050179 +1494540.4506828892 +1495817.7434747664 +1496911.2423702911 +1495896.436561625 +1499018.36659293 +1496529.133259245 +1496268.8362060129 +1497733.2111781286 +1502626.8252305095 +1495632.475523482 +1498522.0873887737 +1494682.1978821699 +1497329.0974100437 +1499307.5914575553 +1501679.2580298267 +1494894.6264651446 +1499662.326458726 +1497643.5287897922 +1501215.0324685748 +1494522.1817355363 +1493791.7955600673 +1490427.966122537 +1495059.0088997514 +1495591.1922692894 +1495225.1293975662 +1503342.6204910758 +1500390.4886607134 +1490625.3428027541 +1500368.599391217 +1498961.2913538702 +1500804.4804347309 +1500986.0619421494 +1501297.7422463999 +1490113.9686681232 +1489389.44793983 +1495840.6051252396 +1496426.525573683 +1492131.13133601 +1490768.6386636053 +1499554.2682036995 +1502883.6446718676 +1493501.2185624947 +1500899.1774241545 +1500256.8338520993 +1486948.8100861888 +1500534.3896461693 +1493101.9241711374 +1497651.617162032 +1500531.6883338555 +1492643.0191422203 +1493430.950144686 +1492520.6255623852 +1496094.1821413492 +1497024.7920145073 +1498228.049316239 +1501686.7409251546 +1499118.3718477685 +1495140.2864917954 +1499633.339046124 +1498872.7836847175 +1494205.5551854589 +1493412.7236989883 +1501943.7076793828 +1489543.1355900741 +1499162.5972134415 +1487599.6887091529 +1497947.9669794904 +1488548.7955172611 +1504112.946111831 +1486663.2521995055 +1493095.3743380026 +1495112.7779928255 +1488799.565643752 +1497584.684929503 +1492662.6520558405 +1493380.2290038352 +1502105.6510003333 +1497557.4320374774 +1496558.5223923705 +1491540.3724179529 +1493563.4234221873 +1497492.9330392012 +1500538.498566261 +1490836.6197054388 +1497729.448308813 +1496881.9224732574 +1497863.3371177 +1494999.4621766985 +1495383.3537784773 +1488177.074564759 +1498968.9480659144 +1499654.1123744494 +1489401.2439840084 +1500361.06563868 +1503533.462730565 +1494419.930785523 +1497055.623165287 +1492807.839005576 +1494375.6560448348 +1494838.4416806686 +1496087.643163856 +1500074.874799644 +1501864.7245153976 +1499175.5676176446 +1500645.8517929018 +1495121.7086519664 +1495034.370990544 +1494751.5261347333 +1494503.966765976 +1496165.5080705197 +1495349.9361740926 +1489754.2684738107 +1494468.955860293 +1501909.311386409 +1500070.9406813055 +1490754.5594387783 +1494518.2892556116 +1492683.6404417714 +1501077.0253920641 +1500952.9879576121 +1495698.4978133182 +1495923.7980711225 +1491046.5790314998 +1492199.3315455613 +1496266.868504126 +1491541.7419661288 +1491919.326525437 +1502082.0147258015 +1496213.2503997404 +1499313.225731911 +1489236.676792685 +1489372.8283144706 +1493330.6883899055 +1497449.012568769 +1493860.5713752268 +1501976.197407702 +1496587.59854668 +1494068.2148615322 +1501425.2508881672 +1497269.0830380379 +1491492.1281536745 +1495486.5952844182 +1489163.4960326839 +1499676.274789633 +1501957.9804538314 +1496468.6820265464 +1502163.902229096 +1499078.717022409 +1499910.5894152424 +1497060.4674438732 +1501721.6792498531 +1499069.1538050475 +1490559.8365926698 +1494373.5246156703 +1491282.3397063317 +1498230.1183048612 +1496534.4412027274 +1488095.6971718932 +1491196.4320145773 +1503806.7806738822 +1500594.7827066395 +1503064.418591588 +1501433.5381891294 +1500924.6426077678 +1496939.2922404562 +1493084.102976359 +1498692.938579658 +1496833.039958472 +1493518.1952568197 +1499649.5878023873 +1495027.66476857 +1496085.926119487 +1488559.2087155846 +1497402.1363952772 +1496725.479291477 +1500284.556541405 +1501182.6187489955 +1499650.9171478304 +1497132.249713456 +1494965.167282187 +1492669.3287889394 +1504371.3799829986 +1489812.2621138433 +1496359.0627382728 +1497841.4936019944 +1491156.6972330615 +1493758.9168202325 +1496184.6196109354 +1488556.470632966 +1504360.6094703674 +1500571.0278496365 +1498272.6438177756 +1500688.8059819823 +1496428.9002814821 +1498271.404769909 +1498778.294525877 +1501655.44069659 +1495028.1709608557 +1492999.1121136555 +1500630.7497328117 +1496530.3336692962 +1503236.0104117945 +1497378.6399723 +1498658.3547593893 +1502105.2174421938 +1494601.5774483483 +1499446.844635553 +1496901.2010771849 +1502527.4846155408 +1497765.4016120522 +1502128.0613627608 +1502410.81308596 +1496966.5341241327 +1500196.6050703693 +1502158.1883173932 +1496020.0824411337 +1503150.7239505306 +1503062.7679340567 +1492764.192910698 +1500107.143159278 +1502136.7729844379 +1497844.2598724333 +1500199.2256016422 +1492035.7476322164 +1494098.7713819074 +1497720.9079019693 +1499785.1509776234 +1501198.9446853783 +1493197.7083921228 +1494863.9885424646 +1494286.4724107157 +1504327.2025917782 +1497301.0140483016 +1502671.5418510365 +1496094.7953910509 +1491614.0898083993 +1494025.7561070158 +1502156.9981487873 +1500358.928106802 +1499132.4432726847 +1492746.6579540311 +1487243.6373590997 +1496261.2073088451 +1496983.2706644135 +1500820.5413876916 +1500168.0600164318 +1491387.0975499093 +1499768.1045432922 +1497945.7018626882 +1490795.864450576 +1495306.0306883485 +1496535.0663432823 +1489804.928744842 +1494791.7425791253 +1493022.6878604048 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..4be928a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,367 @@ +1511253.02143 +1507691.08885 +1514857.76963 +1515512.55921 +1517425.41177 +1518055.24164 +1511029.84956 +1514796.43133 +1509234.27566 +1514054.75768 +1512004.14646 +1513794.00675 +1508369.81563 +1509595.73568 +1508849.53132 +1512258.84404 +1519111.13289 +1513895.12264 +1517870.42765 +1517541.95123 +1514280.816 +1512412.29023 +1514996.09042 +1508538.12398 +1514291.23636 +1516418.60519 +1510282.12522 +1515098.73344 +1517763.7695 +1515035.96954 +1516252.05466 +1510854.40188 +1507570.27437 +1511615.61097 +1508524.1589 +1515964.99501 +1511025.91931 +1509673.52932 +1512708.27903 +1506625.07916 +1509241.33648 +1509392.38248 +1511511.9635 +1507812.48437 +1517773.20902 +1509232.84358 +1518248.59087 +1516009.30184 +1517238.41891 +1512521.67561 +1511865.66294 +1515663.33332 +1514193.0437 +1511178.48846 +1512555.20039 +1511626.11756 +1515959.04401 +1510830.81589 +1514392.85863 +1511548.6678 +1515450.70243 +1507838.06002 +1513835.94469 +1515323.48815 +1512942.44327 +1507575.5595 +1512477.70887 +1510814.04325 +1513430.0265 +1513171.64287 +1517560.24389 +1511859.17964 +1518158.81998 +1517501.46108 +1510617.05481 +1512551.74527 +1511905.00419 +1511663.66318 +1512576.6111 +1517766.71037 +1517522.08561 +1508272.78251 +1519337.74429 +1512558.32226 +1511501.82827 +1510831.4403 +1511456.89496 +1510001.16461 +1510019.52642 +1510991.20183 +1516254.47193 +1514935.21288 +1511622.93353 +1512591.02959 +1518120.7372 +1512182.4797 +1513357.25086 +1511727.85875 +1511472.0622 +1517817.41069 +1512545.58706 +1515505.69625 +1509493.35965 +1512903.8326 +1507738.5464 +1517618.73791 +1511963.93159 +1511912.01253 +1517127.58539 +1510743.76626 +1514516.97341 +1513630.28158 +1510991.7713 +1513657.69891 +1512357.627 +1512620.70381 +1516060.89204 +1513945.72203 +1512400.87459 +1514630.91937 +1517406.87295 +1512403.37156 +1515928.01916 +1511237.17297 +1512955.21497 +1515637.46785 +1517555.83727 +1512012.92066 +1515761.091 +1513501.44476 +1517035.0538 +1512052.25247 +1511509.13873 +1508470.47877 +1511877.51518 +1512679.24758 +1512034.98085 +1518783.6109 +1516235.65566 +1508270.52609 +1516202.73424 +1515741.33502 +1516227.44981 +1517321.04054 +1516094.50989 +1508502.24984 +1508259.00873 +1512735.94871 +1513099.5973 +1509751.78333 +1509029.46069 +1515317.62764 +1517089.56632 +1511411.93338 +1517467.68925 +1516904.83171 +1506313.86566 +1515253.37294 +1511094.26279 +1514524.75117 +1516056.04853 +1510604.65887 +1510403.75615 +1510502.32759 +1513300.95938 +1512980.09966 +1514077.11168 +1517378.06258 +1516779.61536 +1512414.78896 +1515450.79554 +1514392.5376 +1512643.97572 +1511620.11134 +1518283.6031 +1508062.67019 +1514905.09254 +1506752.75462 +1513568.09771 +1507039.27486 +1518683.41901 +1506747.84111 +1510529.34932 +1512318.34727 +1507333.22667 +1514676.97046 +1510434.46292 +1510501.47725 +1517869.44484 +1515031.43647 +1513179.56348 +1509218.26223 +1511188.74934 +1513771.14075 +1516737.5496 +1509295.55869 +1514200.24279 +1513902.73826 +1514504.57775 +1512244.23251 +1511938.69798 +1506737.85447 +1516223.66009 +1515594.31068 +1507972.1382 +1516057.03543 +1518467.5899 +1512120.79253 +1514544.70731 +1510511.23269 +1511691.98132 +1511708.47393 +1513059.8247 +1516943.54045 +1517309.27133 +1515703.35167 +1517856.64405 +1512276.68804 +1512519.01625 +1512065.56352 +1512427.40793 +1513831.58696 +1512586.50392 +1508406.20966 +1511985.07234 +1516624.12357 +1515856.12467 +1509177.75297 +1512241.97464 +1510876.36786 +1517404.49301 +1517305.26794 +1514321.1525 +1511689.21532 +1510160.11823 +1510935.0339 +1512205.20191 +1510425.10773 +1509519.93568 +1517732.3507 +1512931.59134 +1515502.99665 +1508278.62971 +1508304.13755 +1510802.24739 +1514851.29543 +1510823.27009 +1517833.42191 +1513656.86742 +1511117.41421 +1516834.16109 +1513089.83243 +1509644.11774 +1513513.17713 +1506698.03667 +1516563.43937 +1516813.44791 +1514025.77199 +1518357.25413 +1515761.71124 +1515293.59703 +1514401.37921 +1517449.80454 +1516744.16714 +1508350.80241 +1511006.11869 +1509692.82076 +1513945.22296 +1513566.94272 +1506921.99241 +1509765.81032 +1519370.14863 +1517852.5348 +1518249.29324 +1516521.1276 +1517118.49973 +1513875.02681 +1510413.51986 +1515868.08106 +1513098.25199 +1510985.1716 +1516692.35572 +1512249.67522 +1512749.86673 +1507176.29565 +1513643.53069 +1513649.64593 +1516627.12062 +1516005.93232 +1515790.12736 +1513944.38214 +1511607.48203 +1510494.52809 +1518777.39062 +1508518.12174 +1513411.60629 +1514244.64216 +1509206.47937 +1510622.22356 +1513067.50706 +1506963.87207 +1518913.69777 +1516073.52153 +1514279.80267 +1517477.81977 +1513066.39795 +1515261.52917 +1515759.66566 +1517080.75299 +1512652.23538 +1510841.20046 +1515839.16534 +1513454.73419 +1518609.44545 +1513790.226 +1516159.55261 +1516232.13931 +1512130.86048 +1515489.25779 +1513089.08942 +1519198.95701 +1514524.8196 +1517890.50165 +1517017.33687 +1514139.55359 +1516344.80685 +1518639.2974 +1512805.04361 +1518657.01949 +1518536.26318 +1510660.88761 +1516082.22665 +1518338.07143 +1514466.66655 +1516243.57817 +1510150.3695 +1511599.2447 +1514923.70528 +1516331.9842 +1517043.58012 +1511313.68773 +1512733.06281 +1511386.41649 +1518682.61217 +1513648.90524 +1517732.51339 +1512860.50525 +1510016.8416 +1511677.87979 +1518607.6491 +1516715.16921 +1514951.80973 +1510709.20747 +1505721.54187 +1513982.31075 +1513733.10141 +1516247.16785 +1515086.90642 +1509555.93015 +1516255.41416 +1514672.17197 +1509046.53026 +1511305.82731 +1513318.20889 +1509075.66693 +1512000.30051 +1510717.04099 diff --git a/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..338810f --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/amalia_8.0_northIslandRose/funcCalls.txt @@ -0,0 +1,367 @@ +37 +41 +48 +53 +54 +55 +57 +46 +61 +49 +65 +50 +50 +51 +53 +72 +76 +79 +62 +57 +59 +60 +83 +60 +69 +66 +72 +72 +99 +81 +86 +90 +92 +87 +96 +104 +38 +112 +47 +114 +56 +108 +50 +55 +78 +53 +59 +78 +89 +47 +79 +159 +56 +199 +62 +113 +65 +60 +49 +61 +54 +71 +54 +51 +60 +26 +124 +57 +290 +220 +63 +133 +120 +64 +107 +101 +125 +256 +139 +92 +80 +91 +158 +95 +235 +284 +73 +267 +52 +62 +50 +203 +195 +309 +139 +102 +54 +85 +135 +105 +65 +200 +67 +109 +59 +69 +92 +83 +79 +254 +55 +41 +91 +65 +111 +390 +63 +42 +63 +52 +141 +42 +84 +401 +308 +54 +81 +61 +62 +81 +49 +59 +33 +258 +359 +66 +271 +56 +85 +224 +50 +74 +103 +59 +362 +72 +73 +131 +87 +173 +76 +108 +154 +51 +46 +55 +336 +393 +87 +47 +96 +149 +236 +59 +279 +535 +702 +62 +85 +77 +90 +79 +44 +53 +67 +447 +140 +303 +317 +375 +146 +39 +98 +130 +574 +61 +233 +175 +89 +51 +139 +692 +48 +133 +79 +157 +133 +50 +65 +44 +130 +102 +131 +46 +48 +54 +57 +169 +44 +103 +305 +99 +93 +78 +86 +54 +45 +385 +183 +358 +76 +68 +96 +59 +39 +117 +74 +90 +99 +105 +84 +79 +68 +245 +60 +84 +592 +54 +107 +45 +372 +54 +99 +77 +62 +70 +111 +98 +70 +659 +50 +123 +382 +71 +540 +78 +66 +177 +59 +111 +69 +71 +166 +190 +788 +252 +83 +549 +55 +66 +62 +92 +55 +62 +113 +60 +47 +214 +47 +114 +75 +70 +623 +64 +85 +151 +84 +46 +237 +49 +239 +726 +43 +160 +74 +80 +56 +80 +275 +50 +344 +170 +630 +221 +91 +88 +75 +47 +53 +58 +99 +142 +74 +79 +56 +102 +709 +57 +55 +801 +48 +147 +73 +124 +50 +56 +69 +667 +74 +75 +86 +104 +66 +52 +93 +56 +121 +51 +96 +114 +111 +57 +329 +74 +178 +99 +47 +176 +78 +57 +54 +216 +43 +38 +51 +50 +59 +299 +256 +61 +106 +206 +175 +76 +40 +71 +436 diff --git a/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..fe8fc9b --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,343 @@ +1306462.7604490498 +1308639.5215851518 +1314357.6740331308 +1311342.2652301914 +1310477.7090845506 +1312767.680965439 +1313512.7822856072 +1309152.0555853548 +1306839.43798134 +1311015.5263496346 +1313183.6476027952 +1310780.8154184406 +1309467.2203011024 +1307669.1477634413 +1312286.9357615644 +1308466.0500766775 +1310786.4939798051 +1312090.8782453616 +1306846.8840864748 +1311733.224165289 +1307579.7590876943 +1308411.3661821003 +1310961.5936231434 +1312759.6457378294 +1311541.685143805 +1311496.3803562159 +1308519.5734721895 +1308386.0401697687 +1306888.7032620164 +1310290.0749622907 +1311214.545909675 +1309312.0149203122 +1313326.4033123676 +1310848.886747154 +1310594.7098906513 +1313992.2042539162 +1315760.8580728457 +1311994.4488202021 +1304821.2715047845 +1313527.5848900902 +1311375.5809360556 +1310730.3268704668 +1309105.4188083594 +1311236.5858802903 +1308114.2513458675 +1310131.7879891752 +1310907.134848875 +1308546.3319790356 +1315321.3252042287 +1311450.5239052828 +1308047.1575360366 +1309887.6847110277 +1308189.7965670754 +1304797.2173501845 +1310644.2667516007 +1308392.0296526994 +1310031.9582679437 +1310365.1350357006 +1308001.9711920987 +1311764.0661605306 +1309348.3173031372 +1308571.3562850936 +1306307.745797318 +1311569.0967505474 +1311456.3299982443 +1310457.223204364 +1310362.073665202 +1313338.7276357212 +1313547.7382258072 +1308858.9361987163 +1315143.5681194828 +1304584.6278717648 +1310035.1729414808 +1309862.109580519 +1311559.5379116242 +1311272.622903031 +1307587.0767082404 +1313354.7578003425 +1314877.8838792238 +1308224.045382443 +1311263.9798730214 +1308119.04452495 +1314939.6219975625 +1309357.4809847192 +1312109.9924670206 +1310106.011782041 +1310940.3482022483 +1305456.3311277963 +1309600.3771408224 +1309193.2107461933 +1304541.3845379523 +1310196.3788617556 +1311209.2738116186 +1311045.3603522724 +1311062.8777646401 +1305251.1248347326 +1310515.6951419122 +1305874.7758794457 +1308256.762613731 +1307524.6519854297 +1305046.7397025335 +1310514.8119223453 +1307444.106950746 +1305756.1029050588 +1311665.7594487113 +1313721.9017834018 +1307783.4581667332 +1307393.48556757 +1306037.2281461137 +1305756.293238215 +1310763.6299220563 +1306187.6197278483 +1309657.5726145208 +1308144.8559632762 +1310095.946624736 +1307096.6749530267 +1308770.0205778491 +1309810.906893728 +1309644.2336418873 +1306325.6353345325 +1311477.480749265 +1311751.076078273 +1306937.7018426491 +1314196.8155992378 +1310173.1463531535 +1310167.2694221616 +1308390.8430605063 +1311991.3492701366 +1311515.31711441 +1308439.0783631809 +1309649.9547070926 +1311752.3229144951 +1311263.9454264464 +1309331.42119749 +1307415.0449840142 +1307901.1638226951 +1312947.4174305685 +1311502.894532733 +1311141.2316533101 +1309808.791171581 +1310980.213356609 +1309165.265459976 +1310253.2623155466 +1309353.917576423 +1310146.1790760686 +1310843.1265004466 +1311003.124633059 +1312655.6269111682 +1307006.5289704292 +1310336.6252705087 +1312425.3041855893 +1310995.0419865127 +1306488.5371089329 +1314277.0711365058 +1310490.1903226725 +1311284.8002697832 +1309882.6269019712 +1309949.7298615954 +1308612.183458652 +1310902.3460673539 +1312943.567284815 +1308507.9916607887 +1312210.0213048644 +1310556.812018571 +1313762.0461591005 +1312170.9801012315 +1310711.619814418 +1311163.9060505242 +1312450.9267538954 +1310190.150252585 +1309959.225607119 +1312359.928739059 +1314113.832472376 +1313662.0671005782 +1312171.2935958025 +1308584.3845110778 +1310317.1571378966 +1308306.1187137216 +1309247.418243402 +1310249.3218595225 +1305813.612017626 +1306988.212563197 +1307148.1319822178 +1308506.5735494925 +1310470.9937380813 +1307430.9092591796 +1310803.1578410228 +1311348.86822976 +1304909.8873811634 +1313234.4235544985 +1308668.1923143496 +1313845.2698071508 +1309624.4214748186 +1310941.1054732334 +1309036.1638075393 +1307962.4071286113 +1307939.4394014322 +1313046.6635639349 +1310535.8645315806 +1308002.7231745403 +1309048.8197840746 +1310392.6500103376 +1308793.64930106 +1307804.9507734037 +1309833.607816027 +1306992.143575706 +1309095.0904247873 +1310117.6116319573 +1307195.7091516128 +1311554.1913584475 +1310219.5313749006 +1310690.2099265147 +1309710.6556891073 +1311913.2906823403 +1307700.2503578532 +1310570.4073914108 +1307407.3821741373 +1308837.9392623056 +1308936.2592358044 +1307868.1662374383 +1309661.6236840372 +1312627.172637676 +1309169.8957976825 +1304918.7900120795 +1313424.8520505084 +1310646.3903611363 +1309466.715427912 +1308811.3144734073 +1307234.4292891738 +1308303.0635483547 +1311274.0627612327 +1305886.0752605358 +1309674.83711576 +1309412.781609927 +1310272.9722675302 +1308549.5745740167 +1311373.4010066069 +1311615.3193776642 +1308499.2295482473 +1311062.7722257422 +1311930.7861324607 +1310400.5240810325 +1304132.073603237 +1311198.1737920437 +1310949.385126382 +1310682.833209343 +1312984.0036911552 +1308920.4473448442 +1312173.368565354 +1306470.6740329228 +1310666.2725951623 +1309970.595332857 +1313787.0009773439 +1312603.587116455 +1309749.0482785297 +1309946.5373021124 +1309640.0786886401 +1311071.3148009945 +1313201.7567571225 +1310950.0635814976 +1307097.7791476813 +1301578.5832859275 +1309890.8463422644 +1311866.1149025867 +1310048.609650759 +1310431.3215978618 +1313058.873327878 +1305324.3643303663 +1306540.6368259299 +1311679.0868526006 +1312390.4834748204 +1309015.3230483248 +1308258.720073048 +1309308.6242094783 +1304925.285023831 +1305002.3996953533 +1310829.1757024815 +1310163.9423475156 +1310243.478811712 +1306955.39513223 +1312641.9130968163 +1312798.813971843 +1311160.1890276347 +1309849.6791768216 +1307613.3792560648 +1308884.4070147562 +1311262.4324477692 +1308772.292915078 +1310006.4100487274 +1311777.8036778732 +1306547.9639412935 +1311455.5102324698 +1313790.1781515365 +1311396.3381141946 +1310970.8058274211 +1306242.6124720662 +1310386.2349958227 +1307568.0481473943 +1310263.737513201 +1312519.9152157472 +1307755.0536924247 +1307574.4723723065 +1315481.2053272843 +1306125.4297467968 +1310875.5518746537 +1306900.366976498 +1310089.0641808892 +1307626.2216073223 +1306315.528244381 +1305901.854797599 +1312772.3967629243 +1308538.5548290862 +1309421.7591761008 +1308472.0331236687 +1308773.0425672142 +1310718.12018964 +1312042.2839258406 +1307291.1740647652 +1308823.1970812185 +1311624.1677675436 +1311077.2297525886 +1305873.4518140545 +1309298.7191141322 +1309775.6964941586 +1313101.56574817 +1306086.752277088 +1312404.5011532274 +1312474.8809775368 +1305953.5203665048 +1313371.9029553344 +1307700.0939457503 +1310033.4061947032 +1311339.5786589074 +1308632.9777235833 +1313840.8154743966 +1311093.9898768915 +1310710.2935427171 +1307655.4514087406 +1310499.5318137787 +1311611.6427731628 +1308613.685511496 +1313461.0548664364 +1313406.3529195823 diff --git a/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..aa393b5 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,343 @@ +1346480.70467 +1349976.27334 +1354872.9171 +1351590.10408 +1352286.22199 +1352978.92279 +1354161.7423 +1348925.30441 +1347393.62852 +1352445.22217 +1354120.24982 +1350786.11272 +1349566.45783 +1348435.92162 +1352353.46213 +1349663.11076 +1350099.62766 +1352354.39972 +1346364.11041 +1351516.60592 +1347077.29946 +1349063.64252 +1352169.13293 +1353383.1487 +1350947.58403 +1352080.24802 +1349121.87938 +1348937.58415 +1348017.93117 +1349908.60787 +1352337.85633 +1349678.0316 +1353955.12944 +1350977.65373 +1351664.05664 +1353584.52348 +1355432.7627 +1352077.32916 +1345622.63307 +1352340.47239 +1351259.23136 +1351219.08056 +1349374.35094 +1351286.19167 +1348564.96829 +1350276.751 +1350591.63998 +1348730.70906 +1355844.71075 +1351558.22127 +1349068.60787 +1349495.72399 +1347763.02624 +1344675.80582 +1351800.47287 +1348409.24842 +1349924.02263 +1350800.7399 +1348656.35168 +1353448.90656 +1350100.63801 +1348872.73997 +1347457.2888 +1351816.11905 +1351074.45418 +1350210.63566 +1350907.50369 +1353759.24438 +1353776.80666 +1349215.1922 +1355208.19267 +1344275.64583 +1349769.22566 +1350408.00889 +1351700.34261 +1352042.18361 +1347901.49593 +1352824.94996 +1354285.38301 +1349108.64728 +1352419.94294 +1348597.32372 +1355220.91404 +1348285.94239 +1352047.92006 +1350330.78475 +1351125.32312 +1346076.28206 +1350580.86142 +1349639.79046 +1344583.07723 +1350085.56487 +1350783.93491 +1351405.10988 +1350412.84864 +1345777.00149 +1350383.30597 +1346048.71004 +1348704.17484 +1347689.06273 +1343952.99961 +1351045.5157 +1346913.54292 +1345524.57692 +1351501.24649 +1353859.47749 +1347516.27829 +1347544.11843 +1346158.03809 +1345969.15364 +1350488.39029 +1346902.28155 +1349966.49922 +1347500.71112 +1349503.09028 +1346762.90998 +1348174.2947 +1349898.58412 +1350983.63391 +1346859.20218 +1351740.11489 +1352439.71699 +1347194.36379 +1354443.57603 +1349447.42831 +1350572.51266 +1348490.34743 +1351548.69019 +1349279.48036 +1348435.22048 +1349528.76746 +1351857.54255 +1351349.44779 +1348846.16468 +1347872.573 +1348048.97095 +1352544.38022 +1351461.50889 +1351314.78113 +1348650.03219 +1349872.9922 +1348329.1392 +1350960.52404 +1350109.70295 +1351148.03307 +1351007.01483 +1350675.39584 +1353795.04514 +1347436.80188 +1351134.58803 +1351667.52439 +1349997.50298 +1346016.81653 +1354389.80776 +1349764.06111 +1349955.61353 +1350542.74761 +1349327.94134 +1348827.70882 +1351966.61121 +1353941.35333 +1348697.88511 +1352409.32558 +1349347.21709 +1353676.60631 +1351681.56125 +1350981.47498 +1352173.18696 +1352695.09511 +1349842.24378 +1349605.21538 +1351373.78723 +1354554.25039 +1353284.06628 +1352119.87692 +1348645.57491 +1350353.73643 +1348794.3736 +1349147.43372 +1350922.03491 +1346074.38056 +1346794.025 +1347630.64803 +1348538.12966 +1349244.80565 +1348403.27055 +1351203.02197 +1351671.0411 +1345237.02451 +1353724.90696 +1348123.16989 +1354551.46196 +1349125.00723 +1351713.50344 +1349206.81631 +1348667.44932 +1348795.65289 +1353166.82317 +1350988.0894 +1350306.65346 +1349219.83451 +1350499.34378 +1348872.79399 +1347524.20548 +1349809.00164 +1346699.80803 +1348599.03142 +1350151.1764 +1347009.41837 +1350871.40568 +1351316.715 +1350894.92001 +1349750.49737 +1353361.24457 +1348569.16168 +1349704.34336 +1347203.15004 +1349303.13391 +1348801.18582 +1347698.94431 +1350102.59918 +1351599.06954 +1349276.73866 +1344681.11492 +1352836.38305 +1351110.11498 +1348959.24025 +1349774.22184 +1347102.73623 +1348303.20766 +1352042.0779 +1346024.52737 +1349974.11813 +1348543.84743 +1351198.68017 +1349449.68832 +1351161.62608 +1351865.73758 +1349243.90319 +1351198.59326 +1351568.14073 +1350382.20433 +1344039.55252 +1351791.50135 +1350957.11431 +1350355.96068 +1353501.05425 +1349185.58156 +1353458.37763 +1346707.37143 +1351380.05459 +1350426.29651 +1352630.75828 +1353406.05915 +1350804.72181 +1349882.04705 +1350784.25092 +1350728.57385 +1353845.7522 +1350548.75278 +1346754.17302 +1340766.12163 +1350566.02508 +1352518.75706 +1350729.26038 +1350969.39514 +1353791.05123 +1346040.00555 +1347041.64175 +1352188.62276 +1352853.50625 +1349571.58296 +1349122.64037 +1349712.50873 +1343732.09139 +1345125.77772 +1351545.27458 +1349888.27715 +1350108.25108 +1347346.45215 +1352525.37601 +1352462.96952 +1350851.72472 +1348477.71619 +1347635.48456 +1348588.2206 +1351251.64129 +1349024.3536 +1349772.75221 +1351906.75052 +1345646.74855 +1350788.04733 +1354654.60882 +1351796.72618 +1349960.53747 +1347566.40286 +1350796.08358 +1349968.41263 +1350011.77289 +1351805.48786 +1348734.11233 +1348066.21094 +1354512.96975 +1345793.31762 +1350948.57414 +1347383.63662 +1349526.76699 +1348531.02374 +1346761.57115 +1346359.93046 +1352938.34459 +1347796.25102 +1350442.32636 +1348297.68897 +1348740.58444 +1351069.77458 +1352433.94091 +1347039.04895 +1349363.22889 +1351998.79283 +1351143.00552 +1347179.9289 +1348659.14989 +1350765.36201 +1353215.49734 +1346767.93596 +1352879.74619 +1351652.55603 +1345338.49253 +1353746.90671 +1347101.31964 +1349364.68717 +1351034.12326 +1347400.87502 +1353134.16499 +1351410.40384 +1351741.7883 +1348334.13595 +1350914.46085 +1352850.00271 +1348783.38339 +1354262.92429 +1354348.47317 diff --git a/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..6653ea5 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/circle2_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,343 @@ +55 +60 +58 +63 +60 +63 +66 +69 +69 +72 +74 +77 +82 +82 +85 +89 +97 +103 +103 +105 +111 +127 +138 +153 +152 +69 +180 +131 +183 +87 +70 +80 +97 +205 +212 +216 +218 +94 +94 +224 +231 +230 +133 +240 +93 +72 +109 +131 +129 +278 +49 +169 +297 +75 +194 +78 +161 +311 +215 +69 +69 +250 +84 +62 +115 +228 +71 +90 +84 +76 +93 +402 +150 +157 +81 +71 +114 +158 +171 +79 +92 +91 +63 +441 +107 +91 +259 +332 +173 +75 +47 +171 +164 +74 +124 +55 +349 +201 +61 +231 +91 +62 +137 +537 +88 +81 +77 +104 +98 +52 +102 +370 +583 +149 +133 +214 +215 +82 +73 +144 +110 +63 +333 +655 +475 +291 +96 +75 +193 +239 +291 +91 +435 +136 +298 +123 +408 +635 +164 +433 +134 +96 +93 +153 +98 +131 +286 +103 +641 +74 +134 +135 +62 +96 +170 +180 +307 +92 +102 +73 +74 +353 +132 +116 +80 +145 +184 +84 +126 +256 +196 +168 +138 +91 +142 +261 +117 +80 +106 +63 +122 +159 +205 +87 +160 +78 +47 +131 +83 +137 +426 +167 +224 +98 +104 +149 +77 +105 +542 +48 +243 +100 +184 +83 +364 +353 +157 +73 +154 +225 +70 +93 +233 +54 +65 +643 +353 +221 +335 +447 +49 +90 +325 +472 +117 +90 +138 +59 +97 +118 +49 +557 +655 +248 +69 +158 +307 +277 +57 +134 +68 +107 +112 +91 +152 +76 +59 +190 +50 +91 +71 +46 +243 +56 +498 +300 +61 +494 +75 +98 +81 +68 +76 +75 +137 +316 +81 +69 +61 +161 +82 +73 +73 +79 +207 +231 +83 +120 +106 +618 +162 +396 +148 +166 +227 +348 +224 +129 +186 +210 +72 +974 +61 +86 +283 +63 +53 +83 +80 +145 +230 +154 +213 +85 +207 +180 +289 +56 +77 +309 +93 +896 +81 +87 +128 +69 +71 +175 +190 +76 +261 +321 +278 +128 +93 +101 +66 +145 +237 +104 +118 +121 +86 +182 +233 +74 +64 +91 +91 +51 +306 +70 +147 diff --git a/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..41ec70b --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,118 @@ +1309507.4877375762 +1308005.007857323 +1307972.732913321 +1310615.6337065932 +1309681.6391762225 +1306280.479039519 +1309808.0184081302 +1305253.736614993 +1310598.9775629963 +1310530.3772524176 +1309809.5908287796 +1309203.487057261 +1311925.6333587107 +1313015.2309511346 +1314835.994987042 +1308878.783435479 +1306327.0536932545 +1306393.8909124886 +1309653.9292358626 +1309396.9722835652 +1311472.7292028845 +1310840.7146225078 +1311684.9651294958 +1306076.1670307901 +1307369.0377265906 +1309381.4675685822 +1310675.3725750863 +1311728.4952795343 +1306842.7940430923 +1307705.5593952783 +1308475.7738566992 +1310842.963054482 +1309267.8109563189 +1306834.3920203964 +1311223.2501462197 +1313413.247502285 +1307339.338994644 +1307753.9673535456 +1307227.0811057575 +1314656.2127078886 +1311647.3945134843 +1313227.2699531603 +1308031.0614720497 +1308817.4482796087 +1307091.1150188064 +1310711.973836471 +1302156.8105029939 +1304194.4076901507 +1310640.1841016274 +1311917.5871662549 +1310248.733314595 +1311688.9833408438 +1307065.6664436813 +1304870.515708649 +1307647.7975154063 +1310337.5559784237 +1311381.3535068904 +1315815.5893947128 +1314833.8909384166 +1313371.4159679906 +1309637.237404857 +1311732.831228742 +1312165.526732558 +1313109.5221594195 +1306508.9268485792 +1309147.0089234593 +1308319.8492431368 +1309348.2940977898 +1311889.8213186369 +1310416.1162334194 +1307504.7677788595 +1308747.082841133 +1311013.9210783155 +1312816.9141244413 +1302022.9553772372 +1307098.065586345 +1310372.1051815932 +1304390.7033874998 +1308938.128820697 +1309555.6023834958 +1306982.0517987646 +1309212.7359773477 +1314138.3827651073 +1309675.1682433838 +1306533.845474772 +1310238.136538341 +1311483.2982989198 +1307677.183961316 +1310875.0213969902 +1310287.6936191297 +1306201.7596806209 +1310448.832390415 +1309482.9050267944 +1311465.8964551855 +1308596.5114728766 +1312233.5484868628 +1306767.0711773813 +1307095.4543842827 +1307608.7756555155 +1310605.370881256 +1307676.5741989885 +1310976.9933003609 +1310217.351737957 +1310625.3609382033 +1310443.871183625 +1309037.010380459 +1305586.4251758035 +1313217.025434803 +1307923.8103874307 +1310697.0240615201 +1305826.3643339272 +1307872.7708077547 +1310610.1448390053 +1310647.0465586765 +1303004.2415653272 +1308105.4166655808 +1308513.6286665958 +1311315.733922838 diff --git a/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..06badc9 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,118 @@ +1350485.61987 +1349428.18615 +1348739.50519 +1351040.07391 +1350226.0236 +1347025.7616 +1351125.6402 +1345667.60759 +1351684.85584 +1351833.54483 +1350744.88163 +1350577.33037 +1352059.06376 +1353295.1472 +1355168.91139 +1350773.61841 +1346500.16948 +1345520.07933 +1350242.42644 +1349986.04372 +1352063.26801 +1351468.47082 +1352656.64461 +1346331.00498 +1348558.37245 +1350121.51865 +1351825.05329 +1351950.25308 +1348568.05806 +1347645.12463 +1348961.98343 +1350620.52705 +1351520.0685 +1346707.79496 +1352200.93097 +1354763.00397 +1347703.14908 +1348894.59626 +1348141.50908 +1354986.14453 +1350820.75417 +1353166.84358 +1348184.05657 +1348876.82784 +1347622.18945 +1350970.06025 +1342840.35111 +1344328.63354 +1351989.63698 +1351722.42319 +1351225.93464 +1351476.1679 +1347936.48631 +1344359.41885 +1348040.27141 +1351571.34394 +1351853.55659 +1355977.26239 +1354903.17248 +1353570.40236 +1350527.3676 +1353211.84166 +1352931.15566 +1354194.6668 +1347321.24274 +1350061.72339 +1348343.08341 +1350142.76783 +1351475.55149 +1351267.5158 +1347489.03663 +1349949.87908 +1351994.55614 +1352829.85754 +1341381.90364 +1347903.776 +1350999.30196 +1344469.00449 +1348681.1777 +1350161.29385 +1346956.10899 +1349655.75483 +1354114.50716 +1349227.41202 +1347261.86381 +1349835.71847 +1351850.09602 +1347203.62604 +1352100.67623 +1350071.42185 +1345713.51506 +1350509.2461 +1349266.80038 +1352689.34124 +1349852.0533 +1353109.13143 +1347633.82421 +1347534.5369 +1347585.05864 +1352339.1942 +1347606.57259 +1351362.89793 +1351337.98632 +1351808.75792 +1351707.01865 +1348489.80083 +1346462.44027 +1353303.07706 +1347034.53741 +1350933.52173 +1345216.33356 +1348984.62812 +1350743.06577 +1351359.66699 +1343091.21628 +1349086.82195 +1349706.06987 +1352035.17627 diff --git a/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..74469f9 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/circle_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,118 @@ +50 +53 +59 +61 +61 +63 +65 +65 +66 +68 +66 +44 +69 +72 +73 +74 +75 +75 +48 +75 +75 +49 +76 +52 +52 +81 +81 +53 +54 +54 +54 +83 +55 +84 +55 +56 +86 +56 +86 +88 +58 +59 +59 +88 +59 +59 +60 +60 +61 +90 +60 +90 +61 +91 +91 +62 +62 +93 +93 +63 +63 +61 +64 +94 +64 +66 +95 +98 +95 +68 +66 +68 +68 +69 +101 +101 +69 +69 +47 +69 +70 +70 +103 +103 +70 +102 +71 +71 +72 +105 +70 +73 +73 +110 +76 +53 +77 +77 +77 +78 +112 +78 +113 +71 +54 +116 +55 +56 +82 +82 +82 +83 +83 +120 +82 +83 +85 +59 diff --git a/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..afac274 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,123 @@ +1324827.6490652722 +1329520.0050574266 +1325915.310114447 +1327321.9341762557 +1325116.7845307612 +1324878.9372413876 +1329059.0979978933 +1324929.858928048 +1323620.035475362 +1328933.2092091802 +1327867.0041381142 +1324399.892420372 +1325642.678550773 +1326735.7059190355 +1324901.4232753597 +1324989.9257310326 +1324096.920352715 +1324635.366760104 +1324174.678796896 +1322084.1617345486 +1327379.179517718 +1329733.8046032637 +1324048.0093454965 +1326514.9589911562 +1324963.2012596237 +1325392.6283836225 +1329519.2146559253 +1324270.321250827 +1328356.5673284426 +1325564.4418125062 +1327487.6383320042 +1325300.2956898334 +1325433.593991441 +1326554.1219708698 +1325706.9019806383 +1327050.5587132892 +1326691.178660743 +1326581.8647739948 +1326618.5360854475 +1325897.4398893313 +1324077.0756171679 +1322962.331360683 +1325535.5400186086 +1323934.5274761994 +1323990.7049503033 +1327660.6467157805 +1324593.6318793292 +1326157.4842317535 +1323226.7747049895 +1325001.7158758338 +1325475.512615837 +1324728.0664639077 +1324866.966136997 +1326069.4675991551 +1325242.5835439663 +1326984.0342673496 +1324943.3027117236 +1323939.9117717603 +1326991.9229892604 +1322689.8362849574 +1327150.2065323042 +1325330.5735375579 +1329618.1729134303 +1327024.285663643 +1326913.6389790133 +1326394.8992737415 +1325003.419224133 +1323106.2102372546 +1326342.7354670882 +1327643.1705659 +1326769.420977662 +1327326.9668464288 +1324397.6932607978 +1324555.2484687462 +1325499.502273771 +1322957.029375136 +1326908.9916138914 +1325936.49206725 +1323226.6412505093 +1326840.00216262 +1319662.2025920441 +1323062.6132991316 +1326325.073417917 +1320091.179652719 +1325548.164035155 +1323363.4994068888 +1325123.7464487548 +1324272.358582392 +1324395.4565021156 +1322755.3463291172 +1327298.8359781778 +1323481.3865619402 +1325417.1040714711 +1326171.400766772 +1326870.0610328133 +1325741.9939797358 +1327493.546929354 +1323448.3687703602 +1325945.8066832079 +1325929.5956669848 +1321494.122041456 +1325658.7764962246 +1328059.252820554 +1325426.6140100101 +1323826.4018947482 +1325171.8952828308 +1326429.1477051503 +1326404.862768156 +1321125.0268045655 +1323898.3396038362 +1326255.9398549679 +1326738.7157695834 +1324870.1744847465 +1324033.399368701 +1327028.2239356951 +1323308.220385652 +1326589.0458181463 +1325338.5877378592 +1324645.145057551 +1327439.427417851 +1323293.2360180987 +1324720.124996219 +1325616.6343688802 diff --git a/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..857b7df --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,123 @@ +1361114.04224 +1365314.03894 +1361698.67435 +1363235.53735 +1361912.76104 +1362111.52097 +1365512.62027 +1361810.08505 +1360612.05159 +1365256.88503 +1364382.77447 +1360882.25543 +1362790.67767 +1363898.25447 +1361727.25521 +1362007.24585 +1359984.31729 +1362074.186 +1362005.05196 +1359569.98227 +1363990.26762 +1366805.77434 +1361102.11352 +1362897.30132 +1361580.66229 +1361674.25437 +1366214.31295 +1360452.3602 +1365664.47967 +1361777.56282 +1363608.22538 +1361735.38545 +1362410.38784 +1363140.06467 +1362107.9521 +1363919.42891 +1362951.45502 +1363280.91886 +1362500.3174 +1361586.86354 +1360778.67616 +1359736.3258 +1362555.94897 +1360857.71179 +1360123.67784 +1364134.18831 +1360638.21799 +1362651.68991 +1360775.65145 +1362545.03496 +1362516.91007 +1361236.8782 +1361797.06263 +1362952.32643 +1362949.05959 +1362995.69299 +1361938.02064 +1361491.66446 +1363438.35977 +1359551.27465 +1363187.12431 +1361323.7864 +1366558.61412 +1364023.93075 +1363694.58881 +1363854.61082 +1361938.11721 +1360668.47376 +1362650.77665 +1363814.38118 +1363249.30056 +1364671.61002 +1361694.19262 +1360759.00692 +1363175.96439 +1360059.44072 +1363869.73461 +1362235.68652 +1360004.76063 +1363297.21718 +1357853.46996 +1360662.85446 +1363469.46862 +1357486.55154 +1361943.24391 +1360799.54407 +1362265.04805 +1361604.46696 +1359495.14565 +1359399.57657 +1363811.0533 +1360087.20686 +1362243.17501 +1363318.64341 +1363494.07173 +1362898.22854 +1364395.99079 +1359906.09764 +1362900.06006 +1362181.68691 +1358950.37382 +1363170.34698 +1364849.22402 +1362203.32268 +1360671.56524 +1362010.66413 +1362698.25652 +1362979.78354 +1357918.43171 +1362494.90426 +1362411.30328 +1363551.72473 +1362482.47979 +1361450.78997 +1363595.45753 +1360566.88902 +1363543.02017 +1362556.19868 +1361291.04253 +1363458.57139 +1361183.07725 +1361977.55606 +1362432.57707 diff --git a/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..2fab82a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/direct/square_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,123 @@ +365 +394 +426 +439 +446 +474 +471 +484 +473 +490 +492 +500 +508 +523 +533 +571 +592 +682 +696 +689 +708 +761 +792 +808 +402 +864 +867 +870 +879 +913 +960 +957 +493 +1011 +1025 +450 +1087 +571 +678 +1112 +640 +590 +1160 +611 +1183 +464 +716 +630 +424 +664 +750 +1352 +669 +887 +625 +737 +930 +689 +1491 +1516 +564 +579 +526 +396 +398 +407 +423 +426 +433 +449 +472 +483 +471 +495 +495 +482 +505 +504 +512 +509 +514 +513 +517 +519 +526 +546 +551 +552 +559 +566 +571 +560 +576 +576 +577 +565 +593 +599 +608 +608 +614 +626 +626 +636 +626 +649 +658 +667 +672 +683 +690 +693 +698 +710 +713 +720 +718 +730 +737 +747 +756 +760 +776 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..886f929 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,266 @@ +1264889.2859179524 +1216997.4219943 +1238671.500831875 +1214724.8639870004 +1262334.6546249858 +1226172.5211017702 +1223006.9252113786 +1251640.0929945912 +1252941.6751603482 +1265279.1449187614 +1251640.092334775 +1264147.8254360897 +1279294.6566356306 +1258904.4780830047 +1275660.7349738795 +1247096.6518941466 +1244238.8992892955 +1229214.541341591 +1240476.244608972 +1268601.3822413587 +1260025.5425431235 +1239868.5583432748 +1226233.364786597 +1269341.9013386557 +1252941.509870696 +1258030.4233507682 +1272070.1431252342 +1274169.5388160166 +1275659.895073622 +1269341.901458343 +1255714.0594863237 +1252941.6415622628 +1242306.1779156218 +1264889.1999783271 +1258030.4223280584 +1255752.3148334385 +1253201.2570224872 +1279552.7550651932 +1244238.897514643 +1258030.4213119326 +1263823.606599196 +1272010.8369756837 +1256944.4586178237 +1278214.9088241467 +1272004.5111075207 +1258030.4233445295 +1226434.7179509925 +1246842.6001228022 +1214726.0457320963 +1278215.2257219187 +1263242.1003976255 +1257668.3241184582 +1257668.3242623387 +1285013.9936945664 +1250245.063573713 +1276132.098237845 +1256932.674018352 +1226672.9601544316 +1219224.132445003 +1269516.5065010437 +1264270.8665160048 +1267298.769419361 +1273572.596689025 +1246955.295399803 +1264889.2490788836 +1264921.5447142874 +1257555.0342497258 +1258778.0784247005 +1275676.7897855847 +1241425.7675636222 +1263242.0551274354 +1269341.9161840794 +1276128.6564127044 +1238671.500511707 +1226083.6334939543 +1215238.4659857152 +1275899.512073096 +1264147.825420746 +1261529.4761791683 +1265997.1978939888 +1246743.9513255572 +1249442.1830217037 +1258030.4230801477 +1238671.5019386825 +1259645.3052210154 +1256944.4593678543 +1229214.5418050853 +1285013.9930285094 +1261199.1499791618 +1275716.6593647448 +1261555.1572360091 +1235162.0668315287 +1213352.6824044986 +1260717.9715406136 +1244238.8959784645 +1226434.7171151286 +1236430.0486223998 +1276132.8925199155 +1223462.2519792079 +1262346.3242546371 +1275898.689548471 +1264921.516296661 +1260717.9715405423 +1277544.6385947415 +1255714.1354464886 +1213352.6825631734 +1202427.474672818 +1213352.6825043329 +1258030.4233523097 +1270815.7721604567 +1241384.595787527 +1259632.1349846656 +1263241.1810286301 +1226434.717617366 +1263823.6063704768 +1269341.9014583384 +1232291.6155984858 +1258034.7840342629 +1252183.8648303833 +1256925.7630775492 +1243139.596888504 +1261555.157190814 +1232101.3849457407 +1264889.2551104382 +1263823.6065281958 +1275898.343968294 +1276061.9925057618 +1232818.4593611108 +1278212.3847972043 +1257555.0327615677 +1219224.1324453745 +1249442.181904509 +1266246.5028459525 +1270740.8883702694 +1214724.0921030308 +1269516.5065014341 +1249441.630410448 +1270814.8932823772 +1266176.2226037548 +1258030.4217672243 +1276052.4139785732 +1247619.2713168173 +1271056.9619049986 +1231162.102401702 +1255714.1354543986 +1271632.8380730075 +1273490.9746054544 +1208693.2620561423 +1273489.8158379614 +1258419.1152958502 +1277544.6384062942 +1228743.9864847958 +1258148.9317531632 +1270815.772160457 +1256996.2682413303 +1240476.260225706 +1226687.424220072 +1264147.8254119228 +1256953.577634582 +1226233.364790625 +1218213.2475174316 +1264889.2816858282 +1274069.077924905 +1249667.8623632756 +1229253.9182424012 +1274169.5366368855 +1275899.5134265714 +1273490.979292002 +1214726.1466419387 +1236210.3041658797 +1249442.1829884483 +1242668.891283277 +1273984.2411421966 +1250225.941897201 +1228728.1456367744 +1223462.2534529555 +1236430.047950756 +1213352.6816219187 +1251640.1040081398 +1257664.991908302 +1252941.5551454376 +1261555.1572151557 +1220465.0394313557 +1242306.192052096 +1263008.2740883713 +1266893.498747943 +1260030.127578359 +1277536.4190444548 +1235847.4408229538 +1232101.3225977856 +1273984.2411415714 +1277527.873545228 +1256888.7349223918 +1265997.1967865988 +1242526.328955805 +1264008.7850552292 +1270769.3722689648 +1236526.777500846 +1226083.633812999 +1275899.512771989 +1235235.47146792 +1272070.1410385442 +1266899.5377478166 +1249432.2186364508 +1226693.633473791 +1274087.879852858 +1275660.856203334 +1267298.777853432 +1260717.9715405754 +1240476.260222123 +1263823.6065993323 +1272007.0530963133 +1264869.674724794 +1275703.4543440747 +1272007.0076050092 +1229214.5401664309 +1263823.5972304733 +1270814.8932823737 +1260708.342694415 +1272430.225350014 +1258649.2569291613 +1242306.1967644098 +1226434.717945105 +1272007.058280558 +1256944.45905867 +1258163.4460547874 +1263823.6065984236 +1267298.7555596854 +1281712.1601674694 +1265279.1450637782 +1269341.9014584634 +1267401.9705833888 +1229498.7609126999 +1272010.8393023259 +1264147.8253315783 +1265279.1450832011 +1221634.7669448212 +1263823.6065993232 +1285006.6744641473 +1256905.2726643493 +1249441.547063823 +1276131.3419837744 +1285013.9936827337 +1244238.8973767478 +1257555.0327730605 +1273490.9815635127 +1249432.2192710624 +1267298.7782264003 +1258030.4164561592 +1236695.9627062012 +1228814.5176264541 +1213352.6820568396 +1251640.1362994611 +1240476.260112381 +1285013.9936804632 +1264889.2867734735 +1235847.439712263 +1273955.6540622804 +1266246.50296995 +1226693.3291600074 +1258904.4508558097 +1259870.973217311 +1274090.8033095053 +1270749.1980212852 +1277544.1894433976 +1269341.901176269 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..18e0410 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,266 @@ +1308603.9393 +1257660.27891 +1271349.19909 +1245863.77621 +1304848.65228 +1253900.2197 +1248080.73312 +1296088.16627 +1298904.99353 +1301891.08725 +1296088.16588 +1305235.51871 +1318229.02886 +1300117.59201 +1315353.17478 +1291834.58833 +1285556.13984 +1257803.91947 +1279351.9739 +1313012.32908 +1303069.50453 +1275793.93427 +1253883.57612 +1314517.61533 +1298904.81562 +1289444.78128 +1310521.42462 +1317341.69785 +1315352.27401 +1314517.61545 +1300803.72598 +1298904.95796 +1274077.17016 +1308603.82398 +1289444.77939 +1294326.38071 +1292773.1016 +1320987.01204 +1285555.14777 +1289444.77841 +1296818.30728 +1307761.1734 +1301107.7198 +1317736.9711 +1308164.99133 +1289444.78127 +1253884.99215 +1285347.82896 +1245865.6269 +1317737.30205 +1308897.38223 +1291838.58612 +1291838.5972 +1326187.41074 +1286010.1516 +1315790.82344 +1290862.83341 +1253797.74056 +1247863.52675 +1310170.11198 +1306498.29349 +1308776.1169 +1317123.68415 +1279801.15655 +1308603.89024 +1300010.63864 +1285255.75698 +1300355.73071 +1317366.02898 +1279054.94155 +1308897.33633 +1314517.62482 +1315589.98361 +1271351.08318 +1253409.79049 +1239039.34971 +1317686.33063 +1305235.48098 +1290134.23134 +1301649.33702 +1291253.24677 +1288446.43246 +1289444.78075 +1271352.08881 +1304996.81979 +1301107.74288 +1257803.9146 +1326187.41196 +1305777.55194 +1318680.91914 +1289612.00392 +1273854.26241 +1236463.53528 +1296267.26854 +1285554.89583 +1253885.08048 +1265920.75702 +1315672.09104 +1248806.13725 +1297562.33784 +1317684.86974 +1300010.60741 +1296267.26854 +1319633.50493 +1300803.80813 +1236463.46677 +1231148.44071 +1236463.38092 +1289444.78128 +1304901.34069 +1284900.26195 +1302107.06391 +1308896.43122 +1253884.97936 +1296818.30281 +1314517.61545 +1264591.8137 +1292092.63496 +1286582.01606 +1297159.1706 +1274965.88443 +1289612.00388 +1266949.49482 +1308603.90111 +1296818.303 +1317684.36053 +1316072.29645 +1269240.75917 +1317734.70201 +1285255.75519 +1247863.52674 +1288447.40815 +1300653.0602 +1303935.78382 +1245862.75122 +1310170.11197 +1288184.62325 +1304859.55374 +1301001.29311 +1289444.77942 +1318968.30575 +1293148.75329 +1311865.2638 +1262803.99951 +1300803.80814 +1310549.40095 +1312903.43367 +1248235.25041 +1312972.79044 +1299931.18821 +1319633.50255 +1250424.91265 +1303397.71301 +1304901.34069 +1301055.81577 +1279365.73095 +1254322.05191 +1305235.54125 +1290640.78306 +1253883.57956 +1245892.37265 +1308603.93425 +1317255.25239 +1279907.11543 +1270859.57258 +1317341.84331 +1317686.33261 +1312902.92001 +1245866.592 +1272546.89704 +1288446.2306 +1287024.49982 +1314865.06555 +1285830.63391 +1250404.40428 +1248806.13836 +1265919.80207 +1236463.29887 +1296088.17101 +1297953.61797 +1298904.86244 +1289612.0039 +1253776.31059 +1274071.37884 +1298132.58161 +1304501.74399 +1303156.64753 +1319473.82379 +1271073.36996 +1266988.03003 +1314865.06447 +1319291.39498 +1299061.44698 +1301649.01976 +1278306.66835 +1296278.76124 +1304356.04551 +1272762.60091 +1253410.00983 +1317686.33152 +1267844.48336 +1310521.64043 +1305150.03913 +1287545.56101 +1254238.58697 +1315663.09209 +1315353.30385 +1308776.12453 +1296267.26854 +1279365.56829 +1296818.3073 +1308143.54281 +1308583.83359 +1317223.453 +1307863.78721 +1257803.89709 +1296818.29877 +1304859.55361 +1296257.16785 +1316197.32535 +1306889.49101 +1274073.51664 +1253884.9694 +1308143.54681 +1301107.73671 +1302627.70376 +1296818.30686 +1308776.08671 +1315630.30559 +1301891.12443 +1314517.61545 +1312114.95817 +1259194.76539 +1307764.74449 +1305235.51122 +1301891.11857 +1251182.39393 +1296818.30731 +1326170.07595 +1301218.17076 +1288385.52456 +1315696.01894 +1326187.41205 +1285555.18721 +1285255.75535 +1312903.2894 +1287545.25286 +1308776.12501 +1289444.77189 +1265949.18856 +1267045.06684 +1236463.64999 +1296088.20353 +1279366.54456 +1326187.41269 +1308603.94105 +1271071.51063 +1317795.23568 +1300653.06035 +1254238.3522 +1300106.20332 +1298128.70257 +1315666.48568 +1304105.68601 +1319632.9743 +1314517.61516 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..0aac39a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,266 @@ +9 +12 +12 +13 +15 +15 +16 +16 +16 +17 +16 +18 +17 +20 +22 +22 +23 +23 +24 +24 +50 +25 +27 +27 +28 +30 +32 +34 +34 +35 +33 +35 +37 +38 +39 +39 +40 +41 +42 +43 +43 +45 +46 +47 +47 +49 +50 +50 +52 +56 +56 +57 +57 +57 +60 +63 +65 +66 +66 +67 +68 +11 +73 +80 +18 +81 +83 +10 +19 +87 +90 +20 +90 +23 +30 +31 +97 +23 +98 +32 +12 +32 +19 +13 +31 +110 +44 +25 +31 +112 +115 +51 +27 +116 +38 +33 +117 +32 +122 +120 +123 +124 +128 +24 +12 +28 +131 +26 +60 +132 +41 +61 +70 +18 +64 +30 +138 +143 +144 +30 +30 +51 +151 +36 +30 +154 +59 +63 +53 +76 +67 +23 +165 +35 +18 +168 +169 +69 +171 +77 +79 +172 +176 +109 +37 +28 +174 +19 +178 +44 +23 +50 +10 +99 +19 +56 +21 +43 +122 +54 +23 +15 +56 +19 +203 +55 +110 +127 +33 +36 +46 +57 +45 +70 +25 +95 +128 +19 +28 +18 +29 +84 +88 +34 +217 +133 +45 +62 +55 +111 +43 +157 +155 +31 +158 +26 +28 +13 +19 +132 +15 +39 +79 +16 +12 +15 +29 +45 +87 +61 +43 +126 +11 +15 +44 +25 +56 +43 +110 +23 +15 +76 +30 +91 +171 +112 +168 +10 +21 +30 +56 +29 +16 +37 +21 +21 +11 +285 +12 +108 +24 +37 +33 +35 +74 +181 +22 +47 +25 +135 +74 +36 +10 +26 +44 +11 +47 +70 +160 +30 +41 +142 +20 +131 +23 +47 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..d611d02 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,148 @@ +1248926.929577071 +1255534.6766534871 +1236850.4555467963 +1255534.7429491978 +1239979.0129068976 +1237146.441802111 +1268136.5429547937 +1271709.8054945224 +1271710.0475120624 +1256212.1162036792 +1256212.5303529855 +1264331.6605080925 +1252794.6324661048 +1254601.4268296137 +1237146.441712074 +1240608.6381489758 +1237146.4418462259 +1256204.526668263 +1268131.6360276937 +1255534.677059904 +1245343.3846569217 +1236831.642338555 +1240608.6392005053 +1271235.9896632622 +1275816.0805267864 +1245592.9829431232 +1270236.7211017513 +1268032.1024445985 +1274466.227246584 +1248871.5633032415 +1273224.0438034134 +1256212.0635868262 +1271710.0319519155 +1275977.0424938914 +1271710.0275879623 +1268032.1026233349 +1256211.0466319586 +1254909.2570725407 +1274217.6099657957 +1269538.1569817762 +1254476.394681451 +1247065.9085690987 +1263629.0518710942 +1272989.876331486 +1269538.156861632 +1268137.88816399 +1254476.394918855 +1274466.2272268974 +1264331.6605488295 +1276227.4434788385 +1276006.4811423274 +1255534.1680667563 +1275816.0800530242 +1274418.4155797274 +1275976.903799802 +1262821.9084615011 +1265878.229061744 +1239563.5121155102 +1240173.2346242636 +1240173.2125617983 +1272435.1939803232 +1262564.5246060134 +1270227.9485745425 +1248934.6507381448 +1240608.639977 +1257963.08218149 +1239979.0129138683 +1256198.2242046804 +1273419.3354122161 +1263629.0628460853 +1274217.6100464195 +1275977.040118494 +1272517.7123633127 +1280183.7095750356 +1251698.031568781 +1236831.6632936727 +1272517.7095315068 +1275977.038697715 +1275977.0407000103 +1269591.71281249 +1272989.7546043186 +1254909.2561661578 +1258555.1567868798 +1248871.5619689147 +1272989.878015113 +1254476.394867741 +1263695.3958523534 +1250364.160396808 +1259296.8834733455 +1248934.650701843 +1235943.950585999 +1256212.174071508 +1275743.5063048296 +1254476.394542669 +1276387.9860204903 +1268137.887309764 +1240173.3782669515 +1261923.6464804907 +1269538.1559029075 +1271709.9860227392 +1265878.2273941142 +1271710.0419027861 +1271710.0440868794 +1250364.156540317 +1261528.2555382852 +1251809.4378154844 +1265862.013448761 +1265862.0134358166 +1258967.9520431347 +1254601.4270633545 +1262294.5676937732 +1267834.003613519 +1263629.0628078864 +1262600.3436988532 +1256308.0105156535 +1237146.441887114 +1256212.5316753045 +1268032.1026281319 +1269538.1544810876 +1246770.4148466785 +1276006.44918719 +1254476.3949139717 +1250364.1584905665 +1260107.660355009 +1245343.3846516688 +1248295.4468555038 +1258842.897029272 +1267848.1508760205 +1253769.5701646497 +1265131.2441904065 +1240173.2404629537 +1240173.212212858 +1256212.478511413 +1254601.425086056 +1273984.2593595837 +1248934.651082068 +1247065.9085889843 +1259296.889345098 +1236604.819294936 +1265862.013401484 +1235943.9463266144 +1245592.9557537518 +1261455.879084841 +1254476.3948512282 +1258555.156231137 +1275369.089894706 +1254907.3088812954 +1258015.273000669 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..20563fe --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,148 @@ +1289171.63628 +1295044.36142 +1273315.47384 +1295044.4342 +1279462.42936 +1273726.58386 +1308647.60866 +1306288.90994 +1306287.04103 +1296362.05553 +1296362.48826 +1308262.77587 +1289794.15803 +1288540.75033 +1273726.58375 +1283243.35202 +1273726.58392 +1296353.85719 +1312483.24826 +1295044.36186 +1281936.78513 +1273204.14735 +1283243.35299 +1312243.8062 +1315318.96769 +1283678.86967 +1310933.55915 +1309345.10438 +1316105.87565 +1285674.9428 +1313959.97395 +1296362.00015 +1306288.25677 +1315830.88083 +1306288.04785 +1309345.10452 +1296360.93669 +1294040.50845 +1320347.22757 +1308407.42008 +1292303.48266 +1283941.74112 +1302715.35608 +1314144.72644 +1308407.42031 +1308649.06254 +1292303.41319 +1316105.87858 +1308262.77595 +1313658.04483 +1313527.35242 +1295043.81858 +1315318.96987 +1311942.00726 +1315830.99755 +1296913.61092 +1305355.07176 +1282040.59735 +1283235.55655 +1283235.54048 +1308922.96067 +1309953.35646 +1310923.44944 +1289180.71422 +1283243.35371 +1298759.90217 +1279461.72028 +1296347.05743 +1312898.92593 +1302712.99 +1320347.22779 +1315830.91214 +1313123.75564 +1319281.29349 +1291079.88489 +1273204.17029 +1313123.75295 +1315831.37536 +1315830.95511 +1305591.87092 +1314142.80398 +1294040.50755 +1296722.33745 +1285674.93498 +1314144.19078 +1292303.64305 +1301132.52644 +1281618.32919 +1299888.54935 +1289180.71434 +1272728.02953 +1296362.11396 +1315248.85946 +1292302.79541 +1312180.80884 +1308649.0616 +1283235.67409 +1299692.66824 +1308407.37715 +1306285.43498 +1305355.07045 +1306286.38559 +1306287.58522 +1281618.30954 +1298525.82272 +1285646.99143 +1313867.3423 +1313867.34228 +1296945.71428 +1288540.76362 +1301725.4587 +1308103.60903 +1302713.21217 +1302020.71408 +1294091.53804 +1273726.58396 +1296362.48952 +1309345.10452 +1308407.40827 +1282899.88311 +1313527.33195 +1292303.46957 +1281618.29102 +1299423.10843 +1281936.78513 +1294983.53023 +1296015.27832 +1308704.09957 +1296332.93092 +1300969.0206 +1283235.56557 +1283235.54019 +1296362.43405 +1288540.78233 +1314853.6965 +1289180.71465 +1283941.73771 +1299888.55763 +1271518.93225 +1313867.34224 +1272728.02105 +1283670.05634 +1297238.34546 +1292303.69068 +1296722.30843 +1314964.14494 +1294038.68311 +1292800.60412 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..86e48f5 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,148 @@ +8 +9 +9 +10 +10 +10 +10 +11 +11 +11 +11 +12 +12 +12 +12 +12 +12 +13 +14 +14 +14 +14 +14 +14 +15 +15 +15 +15 +16 +16 +16 +16 +17 +17 +17 +17 +17 +17 +17 +17 +17 +17 +18 +18 +19 +19 +19 +19 +20 +21 +21 +11 +22 +22 +22 +22 +23 +23 +12 +12 +23 +24 +13 +13 +24 +14 +14 +14 +26 +26 +15 +15 +15 +15 +15 +15 +27 +28 +16 +28 +17 +17 +29 +17 +17 +31 +31 +31 +32 +32 +32 +20 +20 +20 +33 +21 +21 +21 +34 +21 +21 +22 +22 +22 +22 +23 +23 +23 +23 +37 +37 +24 +24 +38 +38 +25 +25 +25 +25 +25 +26 +40 +27 +27 +27 +28 +29 +29 +30 +31 +31 +32 +32 +32 +33 +48 +33 +35 +36 +36 +37 +37 +38 +38 +38 +38 +39 +39 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt new file mode 100644 index 0000000..a33d316 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPopt.txt @@ -0,0 +1,265 @@ +1362583.9910693057 +1368831.604408819 +1379652.1078271447 +1344759.5722229565 +1340276.8586731872 +1379652.107881971 +1322837.554110796 +1352551.7392756396 +1339701.0338543507 +1362584.0916979294 +1339701.0395300123 +1374828.5861792357 +1347955.4897957896 +1363733.592998341 +1335717.4124800153 +1346601.695817219 +1360788.681755162 +1344691.7769586032 +1335717.4131651788 +1335512.7327418835 +1348402.9106360828 +1366344.737317081 +1296647.9804176851 +1374300.4637238383 +1357938.7317105941 +1277536.002656741 +1373812.8312587182 +1351704.9964012322 +1356646.2955254635 +1349981.8836545323 +1307708.4125983706 +1335717.4125872368 +1360253.2005560175 +1373558.6239179506 +1374243.0582977002 +1317092.217285832 +1350800.5436175542 +1367932.4524176777 +1379706.7282884163 +1345135.8084737228 +1376132.1524179578 +1362583.9907669092 +1339365.2987816618 +1348402.9115550483 +1362583.9979833392 +1345135.7360001898 +1372783.7855483014 +1349027.565936277 +1335717.412586369 +1356646.2986316376 +1340315.6228744588 +1376132.161557729 +1331327.5991103835 +1308275.5582810729 +1331327.5997245882 +1340276.8677203786 +1359439.864687074 +1369592.345253822 +1378432.5127051675 +1381163.1441029788 +1348402.9106581276 +1373068.3872681772 +1378432.5407046506 +1331327.5997311636 +1379703.7484740661 +1346601.7000833652 +1366984.0800125848 +1357311.2014750226 +1369548.906349429 +1361188.397906064 +1339465.0094809497 +1369592.3452874967 +1306940.7149774828 +1376702.6793940691 +1358069.4709751997 +1305664.8911264914 +1335722.8348261083 +1296055.4470313068 +1356986.1940510562 +1309313.1636238473 +1356951.4182329602 +1331327.5997224585 +1352551.7432855687 +1356986.1941483535 +1374483.3298512204 +1346601.7155253189 +1308673.9724689934 +1352649.1432702234 +1308275.5466505575 +1304918.759799173 +1312792.940714565 +1331327.5997342817 +1353630.888719814 +1340276.8650596603 +1339701.031342079 +1307944.92636299 +1371008.7548959267 +1340276.8679533976 +1322386.4199733993 +1335717.4125254313 +1332170.8399845264 +1353396.4324994646 +1356646.2979928444 +1310387.6990000664 +1376132.1606089184 +1342831.8988834198 +1373341.0802167777 +1381163.144101196 +1296645.300043584 +1376702.6793944226 +1379652.1078795753 +1308673.9707189358 +1344967.9835493388 +1356951.669076981 +1356646.298634027 +1356986.1909746362 +1357938.7303039823 +1348402.9069987284 +1330717.9358043147 +1308675.3270712243 +1354154.9149744601 +1356020.0116402505 +1328299.3790136604 +1308161.8545117676 +1342831.899031713 +1348402.9144979925 +1296055.4434313094 +1349027.5663866657 +1277536.0026025884 +1300605.2889247017 +1344759.5722075899 +1296055.4342117188 +1309962.4903085239 +1308161.8573815126 +1372827.7099393455 +1304918.759776275 +1374483.90218048 +1378428.926426545 +1381163.144099184 +1349080.1409372138 +1335610.7264061426 +1376132.1560968368 +1358007.2525931143 +1359490.6329020995 +1362584.0939065316 +1362583.9908608864 +1361188.3979109474 +1308127.3251806211 +1365672.0022731377 +1345549.4818548635 +1335512.732439096 +1356019.5663199683 +1374483.902180765 +1374483.9021807646 +1330930.6936562115 +1278062.169533693 +1373812.8412758282 +1335717.4123979004 +1345135.8517085079 +1345135.8509333425 +1361188.3980533269 +1355884.4808290086 +1370351.2776945743 +1307628.0815152926 +1359490.6328548614 +1296055.435527049 +1313238.5357204177 +1356646.2985906976 +1374723.9920187092 +1357223.09011171 +1353545.9930095894 +1349509.6669345535 +1369592.3452342348 +1330717.859591748 +1308519.1314675626 +1361186.526507754 +1360253.2005685042 +1363749.9224316769 +1345135.8517453098 +1358142.5586250138 +1335512.7328259032 +1352800.965444652 +1335665.9871575043 +1313234.4864617488 +1381163.144103303 +1359723.9760544787 +1363751.1733374237 +1340276.8677716414 +1362583.2373784995 +1362584.093943659 +1335434.364098705 +1348860.8907157574 +1372783.7855482902 +1308517.8822077762 +1347832.774692147 +1354152.884414794 +1328344.5896396334 +1340276.8642076855 +1369548.9063399495 +1359109.0833665219 +1376132.1616149908 +1365358.7611404862 +1379705.2268915488 +1348402.9079764723 +1370222.9181631145 +1369875.4691425462 +1346601.6966592413 +1302164.0433535448 +1319810.7159645427 +1335722.834074925 +1336257.4308167556 +1300668.9242296303 +1352551.7432855596 +1370351.2777888845 +1370351.2777925837 +1370905.9338693565 +1349027.566339158 +1344691.7769504313 +1354542.522207212 +1357938.7314193316 +1308675.3268688752 +1335512.7327980245 +1347439.3479093704 +1371218.1149587927 +1335665.9864231956 +1373812.8291282977 +1359101.2981277509 +1349509.6666609088 +1312801.0151221245 +1331327.599735453 +1309095.4352934554 +1296055.4315687553 +1371008.7548962769 +1359490.6327673958 +1357311.2013660637 +1373341.0803183152 +1332170.864688453 +1356019.566609583 +1312637.7332089352 +1344967.9835657103 +1332767.7624052288 +1356986.205009396 +1362583.921824933 +1317092.2174918712 +1307835.6377147462 +1371979.5373838528 +1369592.3452873116 +1359490.6330212913 +1360790.9283041768 +1356950.6519834676 +1261907.4534630217 +1369548.6616079696 +1302169.1008603508 +1352649.1858169632 +1319810.715889278 +1356646.2986586653 +1308275.5583254395 +1349027.566412133 +1354154.9128363493 +1296055.4470313822 +1307708.4136962541 +1331327.599702641 +1332767.625618448 +1308275.5580975376 +1360772.5826474125 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt new file mode 100644 index 0000000..538f9ee --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/AEPtrue.txt @@ -0,0 +1,265 @@ +1418285.18998 +1429565.00592 +1438728.14729 +1408482.79976 +1389776.80898 +1438728.28364 +1381531.11554 +1413259.80994 +1396503.40913 +1418287.81558 +1396504.02558 +1430668.3203 +1409860.19286 +1417829.88468 +1380462.22821 +1406686.57846 +1417827.53945 +1401104.25152 +1380462.18716 +1386654.54185 +1399773.06331 +1424094.37554 +1330473.21557 +1430581.90466 +1423371.93937 +1307648.60149 +1432839.49113 +1401001.96711 +1404338.37688 +1398177.34782 +1349319.40144 +1380462.24473 +1406309.26112 +1438832.30852 +1433787.53749 +1360589.06191 +1406412.55098 +1432882.87362 +1440519.82583 +1401912.42663 +1434423.39065 +1418283.9392 +1395850.08936 +1399773.0642 +1418281.21573 +1401912.37935 +1432150.01959 +1395024.4308 +1380462.24405 +1404338.38842 +1387264.30465 +1434423.45514 +1386807.41054 +1362896.0818 +1386807.52405 +1389776.85411 +1415650.0235 +1430398.52498 +1442684.52717 +1441867.3101 +1399773.06337 +1437919.77277 +1442684.54864 +1386807.56985 +1440618.34443 +1406686.58124 +1423411.4641 +1411804.60086 +1422702.24285 +1413572.97023 +1383923.37309 +1430398.54683 +1361728.00102 +1434435.93582 +1418363.07077 +1345336.23833 +1386842.60653 +1330338.75445 +1415825.91413 +1352938.6813 +1408421.16055 +1386807.59635 +1413259.55165 +1415825.91419 +1431639.66668 +1406686.5873 +1351008.59119 +1400666.14392 +1362896.076 +1342263.3765 +1353195.64202 +1386807.56956 +1401977.91959 +1389776.90641 +1396505.03967 +1349786.46518 +1423181.56376 +1389776.98455 +1381083.80448 +1380462.22196 +1383037.68994 +1396267.81408 +1404338.38791 +1355200.71238 +1434423.44874 +1389903.43151 +1428997.09098 +1441867.31127 +1330570.97214 +1434435.93582 +1438728.23049 +1351008.14378 +1399513.51107 +1408421.6689 +1404338.39908 +1415825.9106 +1423371.92727 +1399773.05361 +1376544.12937 +1350832.65217 +1403059.52695 +1413679.68136 +1384207.24792 +1362756.00692 +1389903.43153 +1399773.06401 +1330338.7498 +1395024.3983 +1307648.57517 +1337556.03694 +1408482.79973 +1330338.73784 +1354325.80808 +1362756.00412 +1432182.25413 +1342263.37867 +1431640.22789 +1442680.60393 +1441867.31174 +1396685.74912 +1386486.42214 +1434423.42928 +1414135.68655 +1414410.69232 +1418284.10873 +1418283.95762 +1413572.96838 +1362642.70597 +1429774.47868 +1398330.72771 +1386654.53155 +1413696.94638 +1431640.22788 +1431640.22788 +1376934.16638 +1308453.04307 +1432839.50301 +1380462.22047 +1401912.45368 +1401912.45323 +1413572.96671 +1409730.61189 +1424730.99366 +1351668.26861 +1414410.69227 +1330338.7395 +1357915.87355 +1404338.39361 +1430333.50547 +1422667.04683 +1414023.4999 +1407937.64344 +1430398.67241 +1376543.98845 +1350342.41731 +1413559.63496 +1406309.28317 +1416968.138 +1401912.45386 +1423766.58727 +1386654.54357 +1413030.67081 +1392301.73893 +1357911.7424 +1441867.30994 +1414619.4289 +1417729.80297 +1389776.97204 +1418354.11209 +1418283.59935 +1392120.90128 +1403045.9237 +1432150.01959 +1350075.78141 +1407294.59359 +1403056.96205 +1380121.03049 +1389777.01768 +1422702.24284 +1415289.81126 +1434423.45243 +1435949.32473 +1440548.94447 +1399773.05624 +1426890.36049 +1425439.3995 +1406686.57923 +1344064.89012 +1362819.24895 +1386842.55299 +1392940.41845 +1335691.22185 +1413259.55185 +1424731.01502 +1424731.01664 +1425162.00259 +1395024.36609 +1401104.28201 +1412039.86208 +1423371.92901 +1350832.16802 +1386654.46718 +1405478.63718 +1429777.81938 +1392301.82631 +1432839.48804 +1414568.17819 +1407937.89312 +1342804.29678 +1386807.56854 +1352291.74623 +1330338.73439 +1423181.56461 +1414410.69218 +1411804.54522 +1428997.07951 +1383037.98673 +1413696.9467 +1347406.51175 +1399513.51115 +1382683.25119 +1415825.92532 +1418264.56965 +1360589.05768 +1349108.74455 +1426223.44359 +1430398.55108 +1414410.69242 +1417839.13924 +1408420.24187 +1284883.11244 +1422701.93062 +1343929.80815 +1400666.18835 +1362819.23588 +1404338.38624 +1362896.08188 +1395024.40483 +1403059.52425 +1330338.75446 +1349319.24417 +1386807.63987 +1382683.09876 +1362896.0821 +1418582.49584 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt new file mode 100644 index 0000000..2d92d5a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose/funcCalls.txt @@ -0,0 +1,265 @@ +13 +13 +14 +15 +15 +18 +18 +20 +20 +21 +21 +21 +22 +23 +25 +25 +26 +26 +27 +27 +28 +28 +28 +30 +29 +30 +30 +32 +32 +33 +33 +35 +35 +35 +35 +36 +36 +36 +36 +36 +37 +37 +38 +38 +41 +42 +43 +44 +44 +44 +45 +48 +49 +50 +51 +52 +56 +56 +61 +62 +67 +68 +70 +69 +73 +11 +75 +75 +76 +76 +77 +81 +10 +82 +84 +88 +13 +89 +11 +95 +19 +31 +33 +22 +98 +26 +21 +102 +20 +32 +34 +19 +106 +38 +17 +27 +47 +40 +22 +39 +29 +22 +35 +117 +38 +117 +19 +31 +33 +120 +26 +36 +31 +28 +41 +27 +36 +48 +127 +18 +131 +9 +135 +34 +139 +8 +77 +64 +38 +20 +20 +143 +15 +15 +147 +52 +46 +43 +66 +36 +12 +36 +157 +159 +28 +43 +89 +12 +11 +165 +40 +16 +95 +85 +15 +23 +21 +12 +108 +31 +43 +45 +40 +87 +109 +88 +12 +35 +30 +23 +24 +31 +23 +107 +50 +198 +54 +112 +32 +87 +40 +82 +44 +20 +63 +124 +122 +17 +43 +29 +36 +51 +78 +143 +16 +118 +15 +51 +221 +12 +34 +13 +72 +34 +35 +24 +25 +39 +80 +82 +35 +113 +36 +59 +48 +171 +31 +24 +20 +21 +23 +17 +25 +20 +52 +58 +97 +52 +44 +26 +112 +66 +35 +195 +83 +35 +19 +20 +44 +14 +128 +31 +28 +17 +17 +171 +42 +103 +34 +18 +28 +298 +93 +150 +130 +35 +49 +45 +106 +124 +36 +39 +113 +27 +108 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt new file mode 100644 index 0000000..7a65824 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPopt.txt @@ -0,0 +1,197 @@ +1360697.4979221392 +1325392.557750303 +1337403.6072306037 +1357102.8434680034 +1357106.340548594 +1328461.1935975922 +1345485.4413696635 +1355984.2632063513 +1332167.876289066 +1337395.0799089517 +1349691.2999244453 +1331857.0754190236 +1356393.1549001073 +1356740.9011343003 +1361439.715285999 +1347860.1498785317 +1322423.7101522563 +1332167.862831315 +1360253.38002722 +1342355.077959357 +1339978.5632822847 +1327667.5809877336 +1322336.4106764647 +1355059.421300835 +1358223.9708585523 +1339588.6109347166 +1327994.326785932 +1360253.2131000676 +1381832.8806432036 +1377614.5837691582 +1360300.4849148798 +1366103.3933729238 +1366756.0245751003 +1377614.5837729468 +1331857.0607105752 +1327388.2947114953 +1358223.9696340435 +1339824.3300178025 +1360300.4875199706 +1339205.4912752665 +1346661.1191274025 +1326370.2817048766 +1377614.583635169 +1342355.0867001594 +1340776.422497636 +1361315.5310747542 +1325508.5422886105 +1361439.714769357 +1353390.3561408287 +1350694.2089037534 +1369511.543080296 +1340352.749541031 +1330505.948366011 +1350906.1895893505 +1352571.9405260887 +1352675.6644251791 +1360697.5116733112 +1360697.5108792318 +1347860.137394245 +1366756.0245377207 +1332161.401370964 +1357945.2338560233 +1332167.8818906026 +1328463.162609435 +1325533.7626994364 +1333745.4940620484 +1369511.542556281 +1337007.3112172033 +1346661.1064250048 +1337403.605239195 +1361439.7142021377 +1377614.5834668458 +1335765.0290944136 +1339588.769164261 +1332167.8100494538 +1371907.6407594886 +1346661.1197194331 +1360253.3794790865 +1352631.753670711 +1359011.6093781034 +1366103.3874679462 +1352675.6645057246 +1346661.0849727439 +1347860.1475825803 +1366234.129135986 +1367133.6598388054 +1346661.1184983023 +1333130.2709579985 +1366103.390877776 +1358125.4316808262 +1360245.146418646 +1356968.1798209306 +1351584.0135397783 +1357543.5814776549 +1339978.5631586278 +1352675.6645083309 +1328463.162586376 +1347860.149877009 +1353758.8986999386 +1357106.340548594 +1337007.284453487 +1328463.1057254917 +1377614.583636452 +1352571.8875349013 +1339978.5638397334 +1366103.393023547 +1360697.509107223 +1358223.9689809068 +1325533.7626993486 +1345472.8437236687 +1337006.0182735536 +1365661.9416566046 +1366102.5669849978 +1381832.8806513154 +1344199.2997295682 +1347860.1367176955 +1361103.930100265 +1356967.8722799043 +1352631.7536718035 +1360697.5064177804 +1339978.5633866119 +1371235.2284070011 +1353390.3560654577 +1352571.9382560921 +1346375.2271541858 +1358223.959513392 +1353998.9533920106 +1358223.9703349154 +1337526.0100503007 +1355059.4216977453 +1361255.7069932707 +1339205.489028424 +1370082.9035133854 +1359011.6110829865 +1353390.3559213704 +1361002.8503475313 +1349867.7053281697 +1330719.4148892558 +1360300.4848281546 +1325533.7634745494 +1339205.491283229 +1366234.1420883038 +1369254.2418874847 +1371907.6430394524 +1347860.1461717782 +1339978.5631592532 +1325508.5423884743 +1352675.6645093726 +1327667.5809889804 +1360675.7734532943 +1381832.6052697597 +1336697.419645219 +1365661.940470283 +1353390.3561406343 +1361507.159400287 +1333130.2605114903 +1353390.356140639 +1340352.74955698 +1339978.5631504077 +1371235.2284262958 +1358223.970961036 +1361002.823604691 +1338950.1693053835 +1322423.708968049 +1352112.9270151746 +1360689.3454230293 +1327667.5809877338 +1360689.345377819 +1337382.7407526267 +1360697.5091101786 +1356393.172581125 +1327203.4951603347 +1366103.366130307 +1340649.0772821628 +1331902.3757528195 +1355285.1374562953 +1347350.7823471923 +1346660.8582590823 +1358666.98023624 +1360692.5587543284 +1342231.0292472222 +1337042.2537679416 +1355990.392110185 +1325508.5422886226 +1358223.966699479 +1366103.21163724 +1348085.697066046 +1348085.5750287687 +1325508.5423030185 +1325877.3156747909 +1346660.7373850252 +1352339.9478521761 +1358223.970709385 +1345485.463048213 +1360683.4445943425 +1352675.6644589994 +1359011.6110838596 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt new file mode 100644 index 0000000..a2988a4 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/AEPtrue.txt @@ -0,0 +1,197 @@ +1420213.25702 +1379111.98496 +1393685.76082 +1415461.77405 +1415465.00266 +1385786.23708 +1403785.7908 +1414315.07235 +1385112.97335 +1393677.7918 +1395764.84179 +1384740.66734 +1412295.55292 +1416685.414 +1415667.06384 +1400057.67366 +1374730.78294 +1385112.35178 +1419864.10081 +1400344.5553 +1390967.8569 +1382053.77361 +1371470.07337 +1410705.42406 +1405844.83464 +1395616.23704 +1379288.77195 +1419863.90969 +1434115.2303 +1431235.04337 +1416652.96311 +1419757.43255 +1420831.68358 +1431235.04249 +1384739.2277 +1383304.13857 +1405845.27773 +1396126.20993 +1416652.96436 +1392477.81758 +1402783.8955 +1377811.10065 +1431235.04072 +1400344.56377 +1398216.06118 +1415201.57276 +1379325.37852 +1415667.09869 +1415353.85368 +1402233.20397 +1422602.38884 +1392216.07423 +1385372.87732 +1407427.91259 +1408573.03866 +1401430.25557 +1420213.26304 +1420213.26168 +1400056.46679 +1420831.59818 +1385217.08999 +1414290.04229 +1385116.00403 +1385788.13337 +1379230.6254 +1384384.05682 +1422603.20019 +1392289.62792 +1402783.90859 +1393685.75938 +1415667.13633 +1431235.03386 +1389068.77135 +1395616.39161 +1385115.47083 +1430410.5053 +1402783.8216 +1419864.10107 +1401528.27678 +1412629.55911 +1419758.02746 +1401430.26813 +1402784.61694 +1400057.35834 +1420904.42264 +1419936.9348 +1402783.87909 +1383623.45786 +1419757.50695 +1416666.27269 +1419855.03577 +1416800.50824 +1409972.64679 +1414791.49474 +1390967.9918 +1401430.28477 +1385788.13338 +1400057.7075 +1409893.5084 +1415465.00266 +1392288.96888 +1385788.04948 +1431235.03578 +1408573.04358 +1390967.66028 +1419757.4682 +1420213.25898 +1405844.85674 +1379230.6254 +1397337.13334 +1392286.87612 +1422461.9947 +1419755.85016 +1434115.22767 +1395287.55086 +1400056.55048 +1413987.79697 +1416800.16502 +1401528.41087 +1420213.25692 +1390967.74297 +1429562.8992 +1415353.85352 +1408573.02054 +1411976.53719 +1405846.88707 +1407890.7347 +1405844.51331 +1381827.66667 +1410705.42449 +1418378.32876 +1392477.81735 +1422691.036 +1412629.4605 +1415353.85656 +1415235.32256 +1395902.16738 +1378218.94934 +1416652.96299 +1379230.62764 +1392477.81741 +1420903.91127 +1422327.90948 +1430410.59363 +1400057.46448 +1390968.00586 +1379325.37867 +1401430.28066 +1382053.77361 +1420190.10143 +1434114.93951 +1387909.65568 +1422462.0429 +1415353.85368 +1415697.75404 +1383624.19086 +1415353.85368 +1392216.13331 +1390968.00134 +1429562.89964 +1405844.98265 +1415235.25138 +1390192.22783 +1374730.78171 +1403303.28666 +1415272.48106 +1382053.77361 +1415272.3587 +1393665.16688 +1420213.25898 +1412297.85402 +1381847.97467 +1419757.27778 +1389672.35486 +1384823.76503 +1410574.19523 +1405814.51075 +1402783.96416 +1416907.32954 +1420207.93878 +1394110.33808 +1387691.61454 +1414321.51268 +1379325.37852 +1405845.65749 +1419756.352 +1400470.30944 +1400467.95358 +1379325.3786 +1379837.06722 +1402784.69426 +1403702.40243 +1405844.73776 +1403785.98836 +1420198.22112 +1401430.27425 +1412629.5347 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt new file mode 100644 index 0000000..f5948f5 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_ukiahRose_my1/funcCalls.txt @@ -0,0 +1,197 @@ +8 +9 +10 +10 +10 +11 +10 +11 +11 +12 +12 +13 +13 +14 +14 +13 +14 +13 +14 +14 +15 +15 +14 +15 +15 +16 +16 +17 +17 +17 +18 +18 +18 +19 +20 +20 +20 +20 +21 +21 +21 +22 +22 +22 +21 +23 +23 +22 +23 +23 +24 +23 +8 +25 +25 +27 +9 +9 +27 +28 +10 +10 +10 +10 +29 +28 +11 +11 +11 +11 +30 +12 +12 +12 +12 +31 +12 +12 +32 +32 +13 +32 +13 +32 +33 +14 +14 +14 +14 +14 +14 +14 +34 +14 +34 +34 +34 +15 +15 +15 +15 +15 +15 +15 +16 +16 +16 +16 +16 +16 +16 +37 +17 +36 +37 +17 +17 +18 +18 +18 +39 +39 +39 +18 +40 +19 +40 +20 +21 +21 +21 +43 +21 +22 +22 +23 +23 +23 +48 +25 +50 +26 +47 +51 +28 +29 +30 +31 +33 +33 +34 +34 +34 +35 +35 +62 +63 +38 +38 +40 +40 +42 +42 +42 +43 +71 +44 +44 +13 +10 +75 +12 +15 +48 +14 +16 +49 +13 +17 +12 +50 +16 +9 +24 +17 +16 +16 +23 +23 +19 +13 +10 +16 +16 +17 +56 +56 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt new file mode 100644 index 0000000..cd9bdac --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPopt.txt @@ -0,0 +1,299 @@ +1433152.0133785699 +1457312.3387948677 +1420710.453256691 +1420652.6224728946 +1458847.1001493514 +1451301.6766495958 +1423244.2219077495 +1435135.265671975 +1443455.053022247 +1454866.3763408097 +1436677.4550781138 +1434367.6752352915 +1428321.5338673473 +1433997.20217151 +1448650.8603823823 +1438906.1191533213 +1458847.1001384396 +1436459.975852071 +1453088.3003403433 +1457613.8197126265 +1458847.0997826387 +1451360.9120957872 +1422766.3273967826 +1449654.6788483553 +1410791.5305732607 +1433987.1723795978 +1417619.9093756594 +1441473.2282588645 +1437281.314978217 +1430303.9890785557 +1453087.8831493605 +1422250.1417720625 +1431548.1547783932 +1451361.9287617807 +1451284.478590409 +1448651.2733189885 +1448654.0996016753 +1419258.3813533962 +1424689.3843999617 +1454865.426389201 +1434771.6145925964 +1451301.6587427964 +1434904.1535264677 +1418835.0992579209 +1455727.1930479303 +1434771.6011432768 +1421259.6442983004 +1419258.3812450655 +1443454.8250544919 +1437492.628432205 +1462698.4688608998 +1422766.3272096578 +1419258.3812962046 +1429145.654965399 +1451351.741471383 +1443454.2649740963 +1422057.0137308235 +1429158.170573557 +1449422.1903894613 +1425566.41820298 +1425566.4181938476 +1428082.9403140743 +1433987.1723904447 +1417006.9630234346 +1426722.364176514 +1410028.1570853156 +1429145.6549608593 +1408357.1222873528 +1424709.7888727468 +1461430.8726237197 +1449657.1085374453 +1418835.0990289256 +1449422.1812851236 +1455709.9257015004 +1422145.539456382 +1449734.3756069397 +1449422.1891681845 +1448267.929617417 +1423427.097060722 +1448579.4992985493 +1449422.1899475816 +1438061.7355454045 +1462698.332849307 +1462697.4373005682 +1429454.7575536894 +1425164.351447112 +1422089.6875249033 +1429158.170573652 +1461430.872776013 +1435135.4002090932 +1459114.3257579878 +1422766.3271931687 +1448654.0583171363 +1434904.8057656398 +1453088.3005441483 +1418265.5239697949 +1435207.0133007956 +1421259.5937078674 +1425477.2933163878 +1433987.1723904833 +1426722.364179158 +1449899.1534448154 +1417892.5627486696 +1429454.7575510486 +1422145.5379796668 +1422145.54190598 +1434904.676319488 +1439528.0496727023 +1461430.8728240773 +1453088.298807655 +1434904.8044415726 +1456502.157565291 +1418768.422910273 +1410028.1570866453 +1422145.1241761663 +1457601.053075235 +1434771.5325569047 +1443455.10509133 +1434435.4634723368 +1429541.278038617 +1422315.8127110922 +1426068.0650564972 +1435135.264935284 +1434771.6144504782 +1429541.2780385679 +1430303.9891077157 +1409592.3760456224 +1462698.4692689825 +1451199.6283587655 +1418837.3040995284 +1450713.7807526784 +1458847.0991194074 +1422315.8155888368 +1434916.3341846077 +1443454.9177177649 +1425386.9553245367 +1435743.5515394001 +1462698.0096594545 +1434916.3406701495 +1443455.1019274779 +1436677.4550781788 +1430591.7160009325 +1451301.6766562716 +1459114.3258502458 +1418835.050710014 +1457965.8054942712 +1461430.8728402653 +1430303.9882321025 +1425566.4182029408 +1455727.193043531 +1428321.533871122 +1429495.402519531 +1419258.3813096546 +1448294.3040235427 +1430591.716000915 +1435739.0466814204 +1462698.4111870783 +1435467.356092859 +1433660.8607424265 +1435739.045141302 +1430303.9839807646 +1443455.1050915408 +1448651.263345405 +1458847.0992357912 +1430591.7160007025 +1429407.4117292229 +1433663.2247285065 +1434901.1852716603 +1417499.9351051045 +1462697.9547662477 +1435207.0132874702 +1427784.234911465 +1441514.9786201366 +1422089.6941322645 +1450058.2295442997 +1447568.100914752 +1443454.9180638404 +1430250.0070137873 +1418835.0990685069 +1451360.8952830986 +1439155.7436854718 +1433987.1723857762 +1434670.3688824242 +1462698.4588334055 +1450235.8611762307 +1421555.673217181 +1403564.819559103 +1406782.866701983 +1436677.4550852182 +1437281.314977237 +1427831.257162726 +1451361.904158903 +1462698.469289606 +1457613.819759776 +1448021.9864111473 +1430591.7160008575 +1422761.193476551 +1437717.5684922072 +1447568.1038948528 +1403564.8249876332 +1426264.8790290859 +1454951.3163803231 +1428082.9403217302 +1450244.4391036446 +1454866.3800629806 +1449895.264704692 +1458847.0998686464 +1422315.8148186274 +1458847.0995120027 +1422145.537267708 +1462696.472397849 +1430242.9153716539 +1451351.741472903 +1462698.1927958878 +1434904.8057502403 +1421094.5112158093 +1454866.3928662648 +1434962.9840036365 +1427831.258893084 +1424689.3856181926 +1431755.1452480333 +1436677.4550854142 +1449422.1886899828 +1427831.2588930726 +1418252.6444606897 +1448361.5397675394 +1426739.971162971 +1424808.5390913046 +1423919.661051554 +1437260.0083063482 +1433405.88734072 +1437714.8577118677 +1439529.220477684 +1425374.8204025102 +1417007.4477336917 +1422766.3272112038 +1436724.8910496407 +1417471.5376307084 +1457613.8196408849 +1429454.7575530426 +1403564.7810324538 +1428333.103936409 +1424531.6747436835 +1451361.9294410134 +1418580.28834387 +1453088.1361195536 +1462698.4009724904 +1405213.7276787548 +1457862.2395777998 +1443118.708253018 +1430250.0070139016 +1430591.7160010436 +1438906.1169642066 +1453044.2406730994 +1433404.7842221512 +1448654.0928651618 +1444062.4747272667 +1434152.2575964374 +1417744.0570846337 +1438061.7361327726 +1430248.240750664 +1439155.744697904 +1455727.1930480748 +1430248.2407522905 +1446456.0387868593 +1456577.789241736 +1441532.1349214949 +1453044.2155987287 +1428421.242884572 +1439155.734225838 +1421259.6491841036 +1451301.6766438251 +1427784.3476369116 +1426634.6465159028 +1441405.8289761702 +1449899.148102365 +1449422.1901644187 +1425444.831810791 +1422761.1935051063 +1430303.9886255774 +1433439.0962713594 +1422416.3509426839 +1451301.686521399 +1433987.1723903792 +1449937.130298824 +1422766.327210159 +1441117.795632378 +1442769.4707000295 +1448467.8887237217 +1422145.541725592 +1427850.6457632834 +1439529.2200585846 +1435466.5491825223 +1449422.1860983665 +1443455.1050146504 +1421662.8779355285 +1461430.8727980321 +1417687.1237438165 +1431324.8553532446 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt new file mode 100644 index 0000000..b323d01 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/AEPtrue.txt @@ -0,0 +1,299 @@ +1499631.94987 +1520340.88412 +1491271.54299 +1491058.39721 +1522937.89254 +1525014.29534 +1490418.86583 +1502617.99185 +1510822.85874 +1517409.2787 +1497018.26217 +1509005.91822 +1485585.24632 +1501501.60212 +1519885.07503 +1505727.64678 +1522937.86564 +1502810.84779 +1524216.17661 +1523314.35979 +1522937.89971 +1514853.95417 +1478417.12678 +1519400.70184 +1473627.34312 +1490861.76124 +1474841.48798 +1513159.17564 +1508894.55222 +1488974.62534 +1524215.79993 +1477508.82627 +1492913.94177 +1514770.7234 +1524996.3923 +1519885.34461 +1519889.6208 +1472141.11985 +1492467.70748 +1517406.49123 +1502101.98685 +1525014.2736 +1502323.65544 +1483653.45573 +1519340.28644 +1502102.00082 +1476056.50414 +1472141.11477 +1510823.83501 +1505653.07394 +1525220.61699 +1478417.20894 +1489305.35575 +1472141.12385 +1514929.89913 +1510822.06851 +1478463.01383 +1485560.21971 +1512786.98545 +1486028.55204 +1486028.55198 +1487115.18352 +1490861.76365 +1476086.79065 +1484660.46811 +1464699.7977 +1489305.3558 +1460831.2526 +1492261.15634 +1522153.04343 +1519426.68631 +1483653.4675 +1512787.87696 +1519604.60399 +1487531.60088 +1519696.0676 +1512787.05917 +1513192.53639 +1476520.25825 +1520236.32201 +1512786.74967 +1507091.19762 +1525220.40394 +1525219.57366 +1486445.36269 +1485540.04343 +1486615.88477 +1485560.21977 +1522153.04257 +1502617.86598 +1527258.98838 +1478417.06221 +1519889.61799 +1502324.27898 +1524216.17679 +1475411.95578 +1501642.92582 +1476057.01384 +1487755.47885 +1490861.76392 +1484660.46885 +1521342.07403 +1481821.59862 +1486445.36852 +1487531.59919 +1487531.60369 +1502324.21023 +1498339.50412 +1522153.05361 +1524216.17462 +1502324.44254 +1519172.76068 +1483638.58026 +1464699.78593 +1487531.12513 +1523302.05482 +1502102.11781 +1510822.91654 +1501023.05147 +1485906.82754 +1479179.45044 +1494876.38447 +1502617.71446 +1502101.86498 +1485906.82716 +1488974.62559 +1461440.572 +1525220.61731 +1521293.7545 +1474619.84431 +1511414.03505 +1522937.92675 +1479179.45003 +1491896.28554 +1510822.72595 +1493655.75318 +1495717.24701 +1525220.17644 +1491896.29899 +1510822.91275 +1497018.27499 +1501805.67291 +1525014.29535 +1527258.77454 +1483653.45401 +1517635.5557 +1522153.08868 +1488974.62183 +1486028.55204 +1519340.30953 +1485585.24536 +1487980.96238 +1472141.12062 +1519891.81266 +1501805.67291 +1503907.83305 +1525220.56117 +1503852.43339 +1501177.36411 +1503907.8314 +1488974.66519 +1510822.91654 +1519885.28104 +1522937.746 +1501805.67291 +1485692.3551 +1501079.94809 +1502320.05473 +1477085.54792 +1525219.95637 +1501642.92112 +1485861.30943 +1512165.66103 +1486615.89242 +1513706.2249 +1514756.77774 +1510822.70848 +1494037.43885 +1483653.45573 +1514853.93642 +1496008.07309 +1490861.76118 +1491140.50388 +1525220.60731 +1519578.44708 +1476859.21102 +1457956.00055 +1480441.12498 +1497018.26357 +1508894.55221 +1485504.7782 +1514770.68809 +1525220.61731 +1523314.35988 +1519508.41975 +1501805.67291 +1480767.62352 +1490398.19036 +1514756.88102 +1457959.83534 +1484215.52938 +1518494.94361 +1487115.20357 +1519574.60264 +1517406.49584 +1521356.51514 +1522937.79699 +1479179.43091 +1522937.76672 +1487531.59838 +1525218.08795 +1493951.58572 +1514929.90168 +1525220.35214 +1502324.18001 +1489167.57116 +1517407.94577 +1491868.18754 +1485504.7795 +1492467.76606 +1488002.25351 +1497018.26431 +1512787.0857 +1485504.7795 +1486147.0918 +1519947.70872 +1494099.65087 +1495509.94253 +1480026.57817 +1504347.64178 +1494846.55274 +1508189.06387 +1498419.80433 +1493671.75465 +1476174.52556 +1478417.14079 +1504195.74572 +1479194.99363 +1523314.35967 +1486445.36211 +1457972.20742 +1486337.63217 +1486146.103 +1514770.71791 +1475538.6044 +1524216.01779 +1525220.55222 +1454597.53551 +1528848.32765 +1513691.6867 +1494037.43882 +1501805.67291 +1505727.62418 +1524451.81361 +1494841.75016 +1519889.71218 +1513484.87773 +1492004.82709 +1482722.22527 +1507091.19822 +1493885.81585 +1496002.98766 +1519340.28538 +1493885.8341 +1517215.42747 +1517370.45709 +1513329.04457 +1524451.67701 +1485394.0843 +1496019.71163 +1476058.04597 +1525014.29536 +1485861.43282 +1484766.33801 +1511533.78307 +1521342.08349 +1512787.00354 +1494618.52233 +1480767.6254 +1488974.62856 +1492891.07858 +1486974.7778 +1525014.30345 +1490861.76655 +1520964.56298 +1478417.12549 +1499832.26451 +1511263.49496 +1510762.37145 +1487531.60348 +1485519.74454 +1498421.88551 +1503851.59191 +1512787.25857 +1510822.91674 +1472597.79058 +1522153.05398 +1481481.14867 +1490889.65804 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt new file mode 100644 index 0000000..e996ca7 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose/funcCalls.txt @@ -0,0 +1,299 @@ +11 +12 +12 +12 +13 +13 +14 +14 +14 +16 +16 +16 +17 +18 +18 +18 +30 +19 +19 +21 +21 +21 +21 +22 +22 +22 +23 +24 +25 +25 +26 +26 +26 +27 +26 +28 +29 +29 +29 +29 +30 +30 +30 +31 +32 +32 +32 +33 +33 +35 +35 +36 +36 +36 +37 +38 +40 +41 +42 +42 +42 +43 +45 +45 +50 +50 +52 +53 +55 +55 +55 +58 +75 +59 +59 +66 +67 +69 +69 +71 +76 +78 +12 +11 +26 +16 +12 +86 +19 +25 +19 +31 +15 +21 +17 +115 +20 +20 +36 +31 +25 +104 +33 +17 +105 +107 +20 +30 +14 +28 +27 +108 +30 +39 +113 +12 +50 +26 +37 +52 +37 +21 +34 +37 +54 +51 +120 +50 +121 +58 +36 +31 +30 +37 +27 +126 +128 +27 +37 +26 +41 +60 +10 +19 +30 +31 +37 +54 +62 +56 +43 +35 +29 +29 +83 +89 +18 +75 +71 +82 +41 +41 +29 +68 +61 +36 +22 +13 +169 +11 +33 +174 +13 +29 +19 +11 +22 +46 +17 +104 +122 +24 +28 +28 +22 +10 +188 +42 +33 +28 +192 +57 +23 +10 +23 +54 +73 +12 +12 +127 +50 +136 +26 +137 +13 +29 +37 +13 +40 +87 +12 +43 +26 +27 +19 +27 +38 +79 +154 +51 +66 +36 +63 +156 +231 +82 +25 +82 +20 +24 +62 +83 +78 +83 +38 +63 +45 +22 +12 +24 +84 +249 +89 +86 +17 +38 +40 +256 +27 +31 +158 +93 +26 +22 +97 +25 +49 +184 +41 +75 +17 +136 +63 +42 +35 +115 +19 +104 +81 +114 +26 +28 +134 +52 +16 +109 +76 +12 +33 +34 +23 +27 +21 +49 +127 +29 +72 +105 +49 +141 +42 +41 +66 +43 +19 +25 +21 +157 +55 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt new file mode 100644 index 0000000..637c5a1 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPopt.txt @@ -0,0 +1,209 @@ +1432810.6463987029 +1446586.5700866906 +1438501.7355034314 +1423001.9811574516 +1422712.0996911605 +1435054.3732873828 +1423001.9829549578 +1449671.4200486818 +1437412.8089826226 +1448436.574748877 +1422753.7633419982 +1449671.4209734714 +1455791.7484520993 +1434725.4158746742 +1432815.7704125836 +1452444.9750017903 +1423001.9811697672 +1455791.7484170839 +1448436.5811933067 +1454560.7353765876 +1455791.3831372352 +1429720.613660974 +1450590.014965654 +1422696.3399759345 +1441041.401177596 +1456394.065104321 +1422712.1033064378 +1429235.3815648889 +1461158.1867724431 +1446452.5166008298 +1446452.5166113467 +1441041.4013269248 +1447530.9361530584 +1449571.9109831825 +1421645.5760253132 +1439403.6564822856 +1451904.388984944 +1422714.7134456048 +1427759.0898227037 +1455791.7485288328 +1454560.7336408796 +1432433.1196671792 +1435460.1895501972 +1450808.6880858003 +1437213.6628909868 +1451106.2657308064 +1451508.4388039617 +1450808.7075090478 +1438801.0380984796 +1447560.2478808453 +1432244.8118775396 +1447162.397233155 +1449177.9560559702 +1432569.6407030022 +1439187.2586591304 +1446600.6724328324 +1455791.7484185607 +1435053.9042850574 +1448201.971105361 +1441028.6697681977 +1444672.421172412 +1438501.6427073227 +1421645.5769635665 +1436806.0962893604 +1414499.530811268 +1453265.9726028794 +1439187.2586596492 +1450773.210038622 +1423001.9811572814 +1455791.7484470184 +1454788.4992371828 +1435053.311587839 +1455791.6342283492 +1456394.0653751902 +1447560.2488657143 +1432815.770383117 +1454560.36852632 +1443253.7348212765 +1426285.894163199 +1440939.7181564136 +1453265.972301912 +1432153.864211825 +1425349.847826164 +1432433.1214227313 +1454560.7402896013 +1437136.2837376916 +1423001.9811574994 +1450663.6941321362 +1436806.0953251452 +1449671.4172674094 +1448436.5605065646 +1442359.6270795513 +1430438.9791754382 +1432244.8143277685 +1433350.5046842813 +1432433.1193260301 +1449229.9822397004 +1449229.99087454 +1440464.4865391061 +1437449.9396499272 +1451106.2657308166 +1451106.265730811 +1432433.1204404288 +1426665.4123185354 +1441041.4011789472 +1441041.3996384272 +1425127.5565631827 +1432433.1215365878 +1440464.4865699902 +1436806.1028342152 +1441041.3964965995 +1444672.4211700344 +1427099.5161811027 +1431589.6058372855 +1425349.847797353 +1422714.7134455342 +1425827.4270055098 +1430252.4096274443 +1440939.7164314946 +1450803.7389406925 +1448219.1481937438 +1448202.1429067557 +1419131.8616096685 +1432432.8199600957 +1446452.5166084035 +1461158.1732222002 +1446452.5166110266 +1448218.8216812522 +1455791.7483870594 +1449177.974137062 +1445273.8135442985 +1439799.0868071094 +1431589.6222717103 +1421817.3974088042 +1441104.7940900684 +1435885.98889007 +1430591.871505459 +1449177.9862213165 +1443835.6234381555 +1447560.2488416883 +1439403.6651753145 +1448436.5626162158 +1435949.6366833071 +1437102.3125766732 +1430438.9785476157 +1431589.63086301 +1453265.9726145533 +1427759.089862797 +1449571.858571655 +1447547.772565217 +1419131.8591149095 +1440562.054236765 +1440939.7178159843 +1448318.6566141874 +1458236.7617019794 +1448219.166288159 +1450773.8103690858 +1444538.354855357 +1446170.7592609818 +1454788.4991001175 +1440939.7176776687 +1451081.392919506 +1433350.5105044835 +1450590.014966477 +1420030.851073455 +1454788.4961819588 +1432569.6405964722 +1442179.324106583 +1448219.148221792 +1423001.9811574114 +1454365.3542027748 +1438501.6535225199 +1423001.2632008207 +1423001.981157406 +1447545.295128756 +1448318.5285678646 +1429363.7470961208 +1427099.2610849203 +1430621.0962146993 +1455791.7483313556 +1439403.5186891877 +1440281.9927002478 +1422712.0996873733 +1444672.4211559894 +1455791.7483959706 +1422971.0023761457 +1437213.6629697315 +1420030.8510704816 +1432815.7697499713 +1441041.3957393244 +1449177.9703394903 +1449126.0025580467 +1430541.5533626147 +1442359.6271368752 +1430243.8765612144 +1435885.9888405972 +1448202.1433214087 +1447261.9573135132 +1454560.7341370436 +1443671.7282737605 +1444155.1773885335 +1432815.770411984 +1448436.565820031 +1449126.002558847 +1445631.8698775957 +1443835.6232349132 +1430243.160030275 +1447162.1898491743 +1449571.914292711 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt new file mode 100644 index 0000000..1d24003 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/AEPtrue.txt @@ -0,0 +1,209 @@ +1501497.11453 +1511561.76802 +1510329.47752 +1490953.43203 +1490452.66552 +1499507.5135 +1490953.43392 +1516156.37194 +1504092.37762 +1513232.05094 +1490620.80846 +1516156.27352 +1524497.66983 +1499417.04075 +1501502.62219 +1515226.09905 +1490953.43204 +1524497.66979 +1513232.03888 +1518180.51303 +1524497.28355 +1493604.46942 +1516405.61541 +1490520.998 +1506277.26515 +1521709.13258 +1490452.66941 +1492324.50377 +1529512.45956 +1512772.59001 +1512772.5907 +1506277.25566 +1509584.30436 +1518370.2834 +1485020.94535 +1506292.28843 +1519892.99638 +1486146.26125 +1491429.59833 +1524497.66992 +1518179.99864 +1497567.90365 +1499972.42082 +1518542.3654 +1502192.7199 +1516774.18071 +1517799.92523 +1518543.34678 +1504730.13045 +1515049.00148 +1495014.72693 +1512787.55405 +1512817.10823 +1495410.4932 +1504147.60437 +1513077.50661 +1524497.66979 +1499507.06888 +1516674.40185 +1506263.78474 +1509554.83416 +1510329.39234 +1485020.94614 +1497693.20727 +1475588.40352 +1515962.5127 +1504147.6052 +1516193.69642 +1490953.43203 +1524497.66982 +1523775.66766 +1499506.39452 +1524497.54151 +1521709.13825 +1515048.99185 +1501502.62218 +1518180.40623 +1505160.56538 +1489166.92539 +1507777.33172 +1515962.51238 +1494478.43782 +1489159.9567 +1497567.95421 +1518180.53991 +1504782.31716 +1490953.43203 +1513660.07049 +1497693.20321 +1516156.70466 +1513232.03968 +1510232.39455 +1494188.69957 +1495014.50515 +1494339.10056 +1497567.89187 +1517956.70927 +1517957.40193 +1507327.11665 +1498011.76151 +1516774.1803 +1516774.18089 +1497567.84885 +1489632.74345 +1506277.26518 +1506277.40099 +1501947.56499 +1497567.86974 +1507327.12182 +1497693.2271 +1506277.55405 +1509554.83081 +1491736.89486 +1495611.36581 +1489161.39096 +1486146.26125 +1488911.44638 +1493735.8787 +1507777.67417 +1518258.38246 +1507997.10642 +1516674.54705 +1481853.39388 +1497567.0368 +1512772.59153 +1529512.52545 +1512772.59064 +1507996.71905 +1524497.66976 +1512817.17096 +1510055.36208 +1504690.67326 +1495610.92554 +1481516.75481 +1508266.04653 +1504443.46179 +1497850.38052 +1512817.1449 +1512368.30434 +1515048.95779 +1506291.53642 +1513232.04194 +1507696.58637 +1500355.99809 +1494188.67447 +1495610.79342 +1515962.51273 +1491429.4469 +1518371.02294 +1510505.89045 +1481853.44275 +1504920.1877 +1507777.94971 +1515866.87791 +1527437.17222 +1507997.13344 +1516194.44858 +1506680.57219 +1513234.19109 +1523775.28056 +1507777.91374 +1516470.04604 +1494339.10706 +1516405.62917 +1482357.32116 +1523775.28172 +1495410.52672 +1506859.18452 +1507997.10645 +1490953.43203 +1521529.81841 +1510329.42942 +1490952.50998 +1490953.43203 +1510673.91988 +1515865.90441 +1498246.41365 +1490149.02886 +1497466.10685 +1524497.66971 +1506290.16749 +1505526.55125 +1490452.66552 +1509554.83101 +1524497.66977 +1490917.09777 +1502192.71999 +1482357.32436 +1501502.62245 +1506277.16868 +1512817.12422 +1512018.42706 +1498210.51667 +1510232.57392 +1497218.24475 +1504443.46198 +1516674.54747 +1512580.46268 +1518180.59855 +1507967.53211 +1506401.19445 +1501502.62223 +1513232.04554 +1512018.42711 +1509018.7781 +1512368.30304 +1497217.46338 +1512787.33697 +1518370.24858 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt new file mode 100644 index 0000000..d7b9725 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_4.0_victorvilleRose_my1/funcCalls.txt @@ -0,0 +1,209 @@ +8 +9 +9 +9 +9 +9 +10 +11 +11 +11 +11 +12 +12 +12 +12 +13 +13 +13 +13 +13 +14 +14 +14 +14 +14 +15 +14 +15 +16 +16 +16 +16 +17 +17 +16 +17 +18 +18 +18 +19 +19 +19 +19 +20 +21 +21 +21 +22 +22 +22 +22 +22 +24 +24 +24 +24 +24 +8 +8 +8 +26 +8 +26 +26 +26 +26 +27 +9 +9 +9 +28 +10 +10 +29 +29 +11 +11 +30 +11 +11 +30 +31 +12 +12 +12 +12 +12 +13 +13 +13 +13 +13 +32 +13 +13 +13 +14 +14 +34 +14 +14 +34 +14 +34 +14 +14 +15 +15 +35 +15 +15 +15 +36 +16 +16 +16 +16 +17 +17 +17 +17 +17 +17 +17 +18 +18 +18 +18 +18 +18 +19 +19 +19 +41 +20 +20 +20 +21 +21 +21 +21 +22 +22 +44 +22 +23 +46 +46 +24 +24 +24 +48 +26 +26 +26 +27 +28 +28 +29 +30 +30 +30 +30 +32 +32 +33 +33 +35 +66 +9 +11 +14 +9 +9 +10 +17 +13 +78 +14 +16 +14 +17 +10 +15 +14 +12 +9 +51 +23 +10 +24 +24 +24 +19 +19 +16 +17 +22 +18 +20 +54 +13 +13 +89 +89 +12 +26 +23 +17 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..bc76990 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPopt.txt @@ -0,0 +1,349 @@ +1379536.5592981752 +1379765.2608072644 +1397938.8797979017 +1411117.855756931 +1379536.430631768 +1409165.0854669297 +1406335.5184109863 +1370002.7984748653 +1415100.1565371181 +1412658.3964548437 +1405487.1268447833 +1397938.8798638494 +1397938.8798065246 +1413542.8630304653 +1407376.6429945072 +1371131.8604726996 +1368204.0893103306 +1395267.7997790559 +1414107.8615015307 +1370002.2291119169 +1413542.275000528 +1412122.3805908093 +1413345.4626729062 +1409853.438007857 +1405885.1770738084 +1372971.1437431856 +1409448.4004172506 +1412122.3819118675 +1403687.1069396967 +1411752.7277575014 +1414107.8617809305 +1412122.3814945593 +1379759.550380254 +1397080.0835375644 +1389061.992052381 +1414107.8614597786 +1413345.4632131208 +1411932.1831163394 +1400362.0355403982 +1412658.3947425948 +1412122.3818398179 +1374987.0671946758 +1420356.245794297 +1403324.2854259792 +1412122.3815009776 +1394695.946689145 +1376394.7947754466 +1412122.381803338 +1424118.8420980994 +1402439.4618287322 +1379983.7882861674 +1405486.812327744 +1425930.1078157115 +1385999.9176042387 +1403252.9094012694 +1415100.1567194841 +1395055.2021068935 +1412011.7169438705 +1403687.1127655646 +1402586.7453691524 +1399819.567288239 +1397061.4793650277 +1415467.9616191573 +1400603.3305803263 +1412755.1468074943 +1402888.068896089 +1396925.020068688 +1415467.9954887095 +1409853.4526273739 +1415467.0394078586 +1428351.7311277087 +1428351.7311276933 +1420522.2640727593 +1414107.8613941094 +1415100.1566390283 +1397080.084616096 +1402449.6918931194 +1420586.429976591 +1412755.146999238 +1409165.087081326 +1370001.2683715879 +1400568.9176562915 +1402439.4617441075 +1402449.69212871 +1412011.716115445 +1412755.1469043905 +1394224.1378454366 +1415467.9915382082 +1406833.2614175149 +1403252.9415373967 +1403324.2852115105 +1402730.6440541686 +1428351.7310748054 +1374277.4460741335 +1395267.7864695012 +1400603.330591935 +1413345.4643854676 +1414107.8618401426 +1390708.3658198677 +1403571.9162646849 +1397938.879821814 +1379863.2960989543 +1414107.8618003034 +1412122.3814971172 +1378800.7300379758 +1408961.7761863524 +1413345.4645835662 +1412233.376393429 +1403548.033804423 +1404595.0800229942 +1417335.0034783175 +1405878.9516814891 +1417251.4610529745 +1420352.8555426025 +1402439.4578824968 +1371131.7968505432 +1399824.916127376 +1374328.552156467 +1404979.1696340102 +1380036.8658726255 +1396925.0194923987 +1397080.0846164022 +1395704.667321259 +1390708.3658931481 +1379983.7882871365 +1417251.4624475169 +1394224.1374854122 +1412658.4100249324 +1395826.4613085906 +1404375.7248960752 +1411422.6588646064 +1371201.8635115982 +1415100.1567748783 +1397938.879531125 +1402439.462816348 +1371590.9117915656 +1399228.2088537146 +1409719.68510719 +1412122.372574882 +1397938.8798183748 +1392644.9665479476 +1378800.728649049 +1387592.4588245843 +1387080.9830517732 +1399824.8888702265 +1403214.1196924585 +1397252.6388101534 +1409853.4460125084 +1412122.3804426307 +1398886.137489468 +1379759.5521106503 +1374986.9494938948 +1402586.7453816223 +1402233.97893408 +1417251.4624527523 +1404794.2743578695 +1400362.035590315 +1389826.2490415561 +1415100.1567975548 +1397080.0846102682 +1379536.3664142361 +1409719.681684854 +1400568.9179373076 +1400774.4195947007 +1404597.1734540598 +1376731.0403681577 +1380036.8653286335 +1420356.2457782514 +1397938.8797596553 +1402449.6920932 +1428351.7311280384 +1386869.063857726 +1380036.8383222697 +1403245.57431198 +1412237.976935622 +1411753.0482238214 +1412658.4096577603 +1412755.1468639649 +1397938.8798632761 +1369992.508498565 +1411422.6588613002 +1410099.1837654528 +1409165.0877855108 +1397812.0465389087 +1407040.6372287336 +1411303.2208971682 +1403548.0683050267 +1405690.306903698 +1415467.919982783 +1402888.1039733482 +1408053.4477945785 +1382193.1392953717 +1380444.685159038 +1397938.879813167 +1412122.3819822255 +1421615.0560105764 +1404732.5476746582 +1409165.0878329477 +1408006.4726389747 +1415467.9959646906 +1387144.687329619 +1403304.7997555265 +1370000.0744301376 +1428351.7310972393 +1420525.288101638 +1392273.0555517464 +1376394.7945755292 +1385999.9052028463 +1402449.692060624 +1425431.0201947617 +1405487.1147749184 +1379863.1971262845 +1399824.8677706262 +1411422.6588629987 +1407499.3033803445 +1420525.2881016398 +1378278.6814843833 +1413167.6591799308 +1414107.8618630264 +1412649.156358627 +1428351.731099502 +1407376.643684816 +1415466.9040491562 +1411422.6588630397 +1397080.0846148639 +1395704.6521901197 +1395055.2031621267 +1414107.861840647 +1409448.4016463696 +1402586.7453792475 +1376708.2205168132 +1413675.1218819697 +1380036.867577283 +1413345.464577719 +1397080.0846166566 +1407376.1480175485 +1397080.084616223 +1408053.4445153412 +1407100.0598370912 +1428351.729797632 +1420525.2881016396 +1395826.4603740508 +1392273.0557271843 +1411006.0096632387 +1392273.0489807758 +1402439.463248704 +1370002.2498729841 +1378800.7291844038 +1374987.0734856434 +1403324.2853992078 +1406889.377016663 +1425431.0227360723 +1389826.2884709244 +1425899.5839174895 +1404058.0576584016 +1395704.6702548072 +1405878.9516743848 +1411422.6588639359 +1398860.4035918054 +1411969.1962095662 +1410525.3639623073 +1406441.962990301 +1396631.708839115 +1415402.086986456 +1415402.123339023 +1411117.8558814423 +1403136.385242147 +1412122.381800466 +1400774.4176230305 +1412122.3819466557 +1400774.4195177334 +1412122.3819089425 +1397812.0470057772 +1400774.4141855666 +1400568.917927713 +1403742.9260823226 +1385609.6338546453 +1374987.0746556523 +1388707.9250085119 +1380255.7574629884 +1397061.4815713288 +1417077.161559115 +1397252.6513523199 +1410458.8624920957 +1402449.5815012446 +1428351.7311261054 +1428351.7311263056 +1417186.5207884496 +1417252.0089895069 +1415685.9536890476 +1410458.8622635466 +1396631.7091205344 +1388707.9249897234 +1402439.4619165543 +1397987.0701419057 +1397080.0844076078 +1420356.2458029564 +1406427.7771399019 +1389826.0301422558 +1412755.14679135 +1395704.6703037787 +1414107.861859682 +1411422.658774184 +1412122.3816775875 +1417186.520792222 +1412818.7013296229 +1412818.7013138414 +1403252.9300622856 +1399839.3678391557 +1417186.4129974712 +1412122.3803905246 +1380036.861988203 +1403687.10667975 +1415679.0426567134 +1415365.774396597 +1392273.0558894172 +1410525.3797000006 +1408962.1531174057 +1396925.0193223078 +1403687.1135768543 +1406570.0847695572 +1414107.8618640858 +1404333.3144985351 +1413167.663292087 +1397812.0465662458 +1428351.7311046391 +1396631.7078704396 +1395704.6698189215 +1415467.962190032 +1413167.6634099176 +1412122.3818216862 +1412237.9769679517 +1420356.2458020006 +1380255.0306762701 +1392273.0277462264 +1421188.9858021091 +1412755.1468176302 +1392866.8928226407 +1424118.8420283308 +1413167.6617893456 +1412658.4095892794 +1400774.4151970271 +1408962.1026751283 +1400588.3092178714 +1396631.708856932 +1395826.4613008609 +1428351.7311254279 +1374725.2077580597 +1412751.8792599174 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..5f983fb --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,349 @@ +1414332.12624 +1414576.82669 +1433025.0606 +1448422.61181 +1414332.16718 +1437231.83518 +1443470.87654 +1403271.55353 +1443211.20429 +1440491.83377 +1441350.87048 +1433025.06123 +1433025.06078 +1439471.32351 +1435365.1066 +1400493.18355 +1397302.49609 +1432800.27282 +1443386.63269 +1403268.91178 +1451224.63068 +1443807.69104 +1442099.51979 +1443440.84447 +1441499.67537 +1407555.47759 +1436168.81823 +1443807.58416 +1435714.2004 +1440494.97337 +1443386.64108 +1443807.58408 +1414654.41754 +1424791.48116 +1419225.87 +1443386.64931 +1442099.34165 +1439674.48681 +1432686.78129 +1440491.83211 +1443807.58812 +1408634.00222 +1446771.46081 +1438263.38479 +1443807.58087 +1432384.16648 +1406201.12797 +1443807.60715 +1453904.49068 +1431230.86985 +1413020.97458 +1441348.16285 +1452155.9742 +1420249.71011 +1434439.46355 +1443211.28387 +1422234.08058 +1439807.27361 +1435714.20532 +1431348.35452 +1432843.59594 +1427248.46407 +1444770.63801 +1433153.97963 +1449807.46411 +1433182.0239 +1424687.26626 +1444770.67397 +1443440.35309 +1444769.92159 +1456771.53149 +1456771.52639 +1446787.23643 +1443386.62434 +1443211.22332 +1424791.45472 +1431157.98403 +1446920.43954 +1449807.46422 +1437231.17884 +1403269.63009 +1425838.15293 +1431230.96996 +1431157.99343 +1439807.53371 +1449807.46418 +1425768.91853 +1444770.70378 +1444749.64949 +1434317.18798 +1438263.46885 +1437643.75072 +1456771.55278 +1409780.40858 +1432800.27104 +1433153.96487 +1442098.65519 +1443386.69274 +1420854.84613 +1431679.19918 +1433025.0611 +1414607.11047 +1443386.65872 +1443807.58098 +1410095.94995 +1445265.68893 +1442098.53251 +1439919.23915 +1437573.04543 +1432177.46382 +1446711.45807 +1432945.9314 +1449229.3511 +1446669.16378 +1431231.3655 +1400491.85783 +1432785.9862 +1409801.16841 +1436712.66873 +1414802.9158 +1424687.29854 +1424791.45454 +1426287.34515 +1420854.87257 +1413020.96955 +1449230.18496 +1425768.9136 +1440491.84382 +1421637.13782 +1435071.91414 +1440873.38522 +1406041.15153 +1443211.22834 +1433025.05496 +1431230.82298 +1403117.47193 +1438650.60561 +1444532.78782 +1443807.69533 +1433025.06103 +1428414.94885 +1410096.01505 +1419722.01564 +1420051.30633 +1432785.48269 +1429812.66308 +1431507.48155 +1443438.86899 +1443807.69644 +1434857.65682 +1414654.41774 +1408633.70036 +1431348.37437 +1432596.18628 +1449230.15162 +1436063.11149 +1432686.91458 +1423647.86428 +1443211.22585 +1424791.46017 +1414332.11183 +1444533.66572 +1425838.1214 +1433256.60038 +1432144.87006 +1410206.24727 +1414802.91074 +1446771.29698 +1433025.05979 +1431157.98536 +1456771.5279 +1416985.12773 +1414802.88589 +1434899.66515 +1436743.01103 +1440495.64924 +1440491.84813 +1449807.46415 +1433025.06123 +1403260.22611 +1440873.38487 +1441712.96291 +1437231.28852 +1433135.98487 +1441306.2939 +1444926.94082 +1437570.67841 +1444164.06575 +1444770.73027 +1433183.10186 +1436119.68882 +1413757.74265 +1414516.15548 +1433025.06092 +1443807.58872 +1446715.25141 +1438894.39467 +1437231.33756 +1445364.64651 +1444770.71274 +1424118.20986 +1436151.45537 +1403268.53246 +1456771.51189 +1446873.87435 +1423757.01329 +1406197.54291 +1420249.76803 +1431157.68467 +1451776.85757 +1441345.99893 +1414607.03949 +1432786.68135 +1440873.38517 +1441096.33297 +1446873.87448 +1416801.35402 +1439204.34546 +1443386.65096 +1440483.10516 +1456771.50081 +1435365.21857 +1444769.81655 +1440873.38549 +1424791.45477 +1426287.54954 +1422233.46093 +1443386.65475 +1436168.95389 +1431348.37789 +1410013.65773 +1439572.12324 +1414802.91596 +1442098.53602 +1424791.45392 +1435373.90227 +1424791.45469 +1436119.65787 +1441711.77577 +1456771.51544 +1446873.87383 +1421637.319 +1423756.91476 +1448563.23072 +1423756.66011 +1431231.3501 +1403269.01737 +1410096.03647 +1408633.85014 +1438263.39245 +1441151.65162 +1451776.85965 +1423644.77232 +1452197.15841 +1437921.00775 +1426287.73319 +1432945.93243 +1440873.38596 +1425648.24245 +1438671.51981 +1439318.95848 +1431207.27467 +1423797.11155 +1438057.96442 +1438058.04141 +1448422.61185 +1431330.19135 +1443807.63255 +1433255.56709 +1443807.58482 +1433256.5363 +1443807.55734 +1433135.98351 +1433256.65037 +1425838.15216 +1433927.5621 +1419881.83237 +1408633.83341 +1425059.12517 +1413121.03233 +1427248.46339 +1449069.68383 +1431507.11776 +1437798.9866 +1431192.95539 +1456771.53886 +1456771.53304 +1447157.76791 +1449230.01449 +1439601.06198 +1437798.9826 +1423797.107 +1425059.22949 +1431230.96289 +1426010.98936 +1424791.43779 +1446771.73367 +1433628.95968 +1423640.03714 +1449807.4641 +1426287.56554 +1443386.65034 +1440873.39012 +1443807.57971 +1447157.76792 +1440594.1546 +1440594.14956 +1434395.43204 +1435375.50253 +1447157.70266 +1443807.71931 +1414802.91439 +1435714.20007 +1446118.75785 +1444128.40906 +1423756.90603 +1439319.08426 +1445266.20693 +1424687.31195 +1435714.206 +1437964.00154 +1443386.65127 +1434837.2542 +1439235.16075 +1433135.98495 +1456771.49607 +1423797.02517 +1426287.59524 +1444770.81179 +1439235.19467 +1443807.60401 +1436742.96916 +1446771.71775 +1413159.87022 +1423756.87099 +1448549.15034 +1449807.46412 +1420528.48228 +1453904.49065 +1439235.05915 +1440491.84807 +1433256.42934 +1445266.14048 +1427472.40083 +1423797.11608 +1421637.50165 +1456771.5194 +1408530.13938 +1449804.3421 diff --git a/code/opt-results/grid/amalia_4.0_victorvilleRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/funcCalls.txt similarity index 61% rename from code/opt-results/grid/amalia_4.0_victorvilleRose/funcCalls.txt rename to code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/funcCalls.txt index c324f73..cb3786b 100644 --- a/code/opt-results/grid/amalia_4.0_victorvilleRose/funcCalls.txt +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose/funcCalls.txt @@ -1,399 +1,349 @@ -41 -37 -48 +9 +10 +12 +13 +14 +14 +15 +15 +15 +15 +15 +15 +15 16 +16 +17 +17 +17 +17 +18 18 -31 -27 -39 -66 -27 -23 -142 18 -35 -50 -33 -56 19 -61 +19 +21 +21 +21 +22 +22 +22 +22 +23 +24 +24 +24 25 -34 +25 +25 +26 +26 +26 +27 28 -39 -52 -16 +28 +28 +28 +28 +29 +29 32 -40 -41 -27 32 -40 +33 34 +34 +35 +36 +36 +36 +36 +37 +37 38 -41 -14 -29 -25 +39 40 -12 -21 41 -30 -22 -31 -19 +43 +43 +44 +45 +46 +46 +47 +47 +48 +52 +57 +61 +62 +63 +63 +64 +67 +70 +70 +71 +73 +73 +12 +76 +12 +20 +20 26 +13 +90 +21 +25 +10 +29 28 -33 -42 -46 -23 -41 22 -39 +16 27 -38 -21 -37 -32 -23 -59 +18 28 -42 -106 -26 -32 -12 -32 -40 31 -159 -24 -35 +25 +97 +33 +32 28 -246 -17 -24 -35 -44 -56 -24 -58 16 +101 23 -24 -26 -39 -57 -20 -47 -59 -29 -32 -16 -99 -55 +30 +102 27 -48 +16 25 +22 38 -37 -37 -47 -29 -60 -25 -18 -153 23 -67 -18 -39 -123 -30 -119 -33 +32 +19 +34 +109 +44 +13 +25 +44 +26 +113 35 -51 +47 36 -102 27 -27 -47 -44 -51 +117 +30 23 -41 -21 -169 -29 -46 -46 -43 -40 -49 -26 -73 -21 -53 -34 -45 -38 -44 -26 +47 25 +29 60 +60 +29 +52 34 -33 -51 -23 -39 -30 +53 +18 +44 30 -35 -35 -47 -27 -48 -57 -42 +15 +59 +19 +134 +26 39 -47 -50 -62 -31 -119 -30 -30 -54 +135 38 -31 -18 -69 -34 -36 -28 -18 +57 +8 +25 48 -47 -45 -40 -20 -31 -200 +73 +33 +150 +21 +28 +77 +72 +32 +13 +9 +13 +22 +19 16 -50 -55 -52 +49 +72 +14 +78 37 +23 +88 +166 +46 +24 +27 +25 19 +29 +55 +11 +57 21 -75 -30 +44 32 -82 -33 -29 -38 -36 -36 -27 -39 -51 +16 +21 +28 34 -106 -36 +30 +12 +41 +189 +29 +44 +10 +105 +35 20 -71 -32 +14 +35 +54 +57 +77 +27 +35 +49 +50 30 -42 +31 +24 +19 +10 26 -17 -17 -46 -58 +37 +40 +23 43 -22 -17 +147 +24 +38 25 +55 +23 +62 +20 +18 +47 +99 +73 +45 16 -42 -17 -40 -26 -74 -43 -27 +13 32 -19 -17 -16 -28 -43 -42 -34 -17 +20 24 28 -31 +20 +54 23 -37 -33 -25 -32 -13 -24 +165 +19 +35 29 -38 +58 +64 33 -23 -23 -19 -39 -32 36 +18 +44 +10 +24 +27 31 -50 -37 -17 -47 -29 -121 +69 +25 +27 +24 +92 +25 +98 54 -39 -28 -21 -21 -32 -37 -51 -31 16 -19 -38 -31 -32 -46 -31 -21 -58 -48 +17 +79 +44 +36 +28 26 +118 +40 +22 25 -23 -53 -24 -21 -21 -43 25 -32 -15 -38 -39 -37 -32 28 -39 -47 -40 -46 -47 -37 -21 -41 -27 -36 -53 -37 -44 +189 +133 +51 +23 +123 53 -253 -16 -28 -46 -19 -26 41 -46 +23 +43 +95 28 -45 +140 22 -24 -32 +76 +31 +57 21 -15 -26 -98 +137 21 -31 -47 -50 -49 -31 -36 -38 -33 -28 -42 -39 -25 -66 27 -26 -31 -31 -238 -41 -56 -14 -31 -37 40 -42 +232 +113 +12 +10 +85 26 +38 +27 19 -20 -40 -50 -31 -36 -28 -20 -36 -40 -26 -30 -24 -16 -78 -17 +44 +88 +62 +54 +27 +65 +107 +94 +27 +38 +106 35 35 -56 -44 -29 +19 +27 31 -59 -20 -608 31 -27 -36 -46 -46 -22 -58 +13 35 +72 +29 26 -65 -28 -47 +50 +27 +21 +39 +50 +13 18 -155 -38 -24 -33 -43 +67 +22 +47 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..b55b196 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,121 @@ +1410466.4844866453 +1411419.4651934018 +1398211.6715929336 +1412287.963184741 +1403257.636468706 +1406067.9364327083 +1406894.9818180616 +1407362.184001878 +1384402.4909153248 +1396077.2796565145 +1418414.1696130573 +1408151.828352505 +1405623.31896174 +1399058.7122929604 +1396394.146163684 +1395322.3004814845 +1414178.8885493155 +1396077.2796369377 +1415826.7396486613 +1415874.4647236192 +1412284.4616086492 +1410466.4870833997 +1396077.2799924319 +1400219.9563963967 +1386635.093936091 +1395432.0228950118 +1418414.1696142533 +1408461.2182389365 +1408467.7658123255 +1413070.3977400395 +1406727.3971843044 +1398211.5704264785 +1408745.4539830897 +1407352.4319090513 +1399053.9492004614 +1406381.764957655 +1406381.764957655 +1409699.610937212 +1406426.686015559 +1414764.2614305061 +1409047.8569483205 +1401930.723514046 +1405821.649983295 +1406326.9437102766 +1409952.7630354743 +1405569.554074004 +1403257.636469229 +1420340.5234643698 +1408467.7642032509 +1384104.124765202 +1408336.1460532993 +1404748.2285610407 +1413624.9963533445 +1392091.032197338 +1399058.7847248497 +1403257.6364691842 +1416142.19275178 +1399501.5968930756 +1413070.4022360859 +1395322.3033861194 +1415110.1012928411 +1399056.475679544 +1416142.1493799924 +1404374.6035493766 +1394281.1136593511 +1408477.2796587748 +1405621.571799472 +1416154.2874013977 +1409711.8791934154 +1396077.280480233 +1413067.3898962792 +1411451.6470352102 +1406797.7730277495 +1402675.720026465 +1408656.7885189706 +1414169.0828429998 +1397619.09415552 +1396077.2804523672 +1412378.8635055665 +1411784.043141954 +1383938.4143256098 +1412284.176243449 +1405170.0989566813 +1409385.5660735997 +1405170.0990118093 +1393782.848973405 +1396077.2788904489 +1389703.536829159 +1404956.5634091608 +1411151.3263902524 +1415107.0474907276 +1419307.2998261123 +1396077.2490931142 +1408467.766268247 +1407364.05096419 +1410823.3009956647 +1399014.925516485 +1413629.8886687174 +1401902.0849726745 +1419307.3274361403 +1406607.4492305352 +1412378.8637014322 +1393782.8492957156 +1395693.3184191103 +1409434.608541591 +1395693.3183954072 +1410823.3013817463 +1395432.0238883474 +1415957.762979059 +1388167.9352967043 +1386635.093136165 +1389703.5368000958 +1400868.9062377175 +1388161.2841607544 +1405841.4179693153 +1404238.5002737727 +1406568.1568509655 +1413107.1909544712 +1414915.312242788 +1396077.2796347756 +1389634.5283958912 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..e004b17 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,121 @@ +1446838.2333 +1445111.57449 +1437665.75449 +1442361.51365 +1435613.57957 +1437582.36385 +1444512.13459 +1442843.57118 +1419192.4342 +1431658.59281 +1447803.12425 +1444528.39367 +1439531.13976 +1438147.63953 +1435152.97019 +1429161.99954 +1450322.17289 +1431658.53505 +1443565.67761 +1448802.92644 +1448932.9294 +1446838.23245 +1431658.58853 +1434636.32879 +1427580.91555 +1429205.85575 +1447803.12424 +1448098.07163 +1440868.40745 +1438880.53904 +1436150.79386 +1437598.03209 +1434787.98514 +1438740.13786 +1438143.70568 +1442899.52608 +1442899.52608 +1439297.27055 +1442917.77742 +1445962.43409 +1433642.84649 +1431800.51318 +1438730.74444 +1441857.72396 +1438505.94246 +1440925.81783 +1435613.57909 +1444053.49066 +1440870.28815 +1418307.9866 +1435611.77777 +1438333.66248 +1437870.50388 +1425283.61529 +1438147.69901 +1435613.5792 +1449942.29156 +1433879.77514 +1438872.23389 +1429162.15242 +1445765.1605 +1438145.79203 +1449942.27228 +1434968.12065 +1434313.45489 +1447203.42901 +1439530.57948 +1449960.7637 +1439051.02543 +1431658.59893 +1439157.8181 +1435478.88904 +1434453.92218 +1434839.07829 +1441796.95379 +1449160.68551 +1432673.92563 +1431658.60208 +1446229.51846 +1439887.64376 +1414563.21045 +1448915.04999 +1429095.94449 +1438514.58002 +1429095.94434 +1426269.09112 +1431658.62382 +1423391.53491 +1442055.87669 +1439590.18065 +1445616.07788 +1443058.69791 +1431658.52564 +1440871.77705 +1442844.75193 +1435712.10762 +1438076.17438 +1446634.82857 +1433240.57888 +1443049.54025 +1444489.57981 +1446229.43239 +1426269.49843 +1429171.38422 +1439084.44925 +1429171.38422 +1435712.11969 +1429204.75023 +1450801.45763 +1421983.09067 +1427580.23697 +1423391.53849 +1429316.49011 +1424821.42649 +1437192.82673 +1429255.12805 +1437804.12601 +1439296.904 +1446252.43359 +1431658.53818 +1419669.62068 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..42b5575 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_6.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,121 @@ +10 +11 +12 +21 +24 +27 +28 +30 +29 +12 +30 +13 +13 +14 +14 +15 +35 +16 +17 +17 +17 +18 +18 +19 +20 +20 +20 +20 +20 +20 +20 +10 +20 +21 +11 +22 +22 +22 +22 +22 +45 +23 +46 +24 +24 +25 +14 +25 +26 +27 +27 +27 +27 +27 +28 +28 +28 +28 +28 +18 +30 +18 +46 +19 +32 +32 +20 +22 +35 +22 +23 +23 +37 +37 +37 +38 +38 +19 +38 +38 +38 +25 +39 +40 +40 +27 +27 +27 +28 +44 +30 +30 +30 +45 +31 +31 +32 +32 +78 +32 +33 +48 +33 +33 +49 +21 +34 +20 +36 +36 +20 +23 +37 +53 +54 +38 +55 +39 +56 +16 +40 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..f6004cf --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPopt.txt @@ -0,0 +1,256 @@ +1481427.7802538015 +1475320.3029836537 +1481012.618518378 +1456654.5217461803 +1483999.7766595397 +1470344.8484964906 +1478147.764347288 +1472305.0036711718 +1483054.7058374502 +1479153.332235048 +1479647.156878044 +1483054.7066659445 +1478547.4582592344 +1472606.8474374088 +1484533.8392742234 +1479645.4358878206 +1475693.8504097029 +1450199.2845197318 +1455601.517953936 +1452631.7393225455 +1474831.200683655 +1479158.367633233 +1486297.5076152475 +1475320.315983774 +1455824.6185276872 +1495577.3541018453 +1478147.7702962353 +1450199.2491912358 +1481427.7705925864 +1479092.4867033653 +1481739.1112955352 +1478548.0603308694 +1478455.0052114432 +1458166.3214571262 +1479876.2790880324 +1479153.3316340703 +1456654.5294700656 +1463450.0783509864 +1494774.3326009556 +1494774.3325921327 +1475110.2494568976 +1474947.794568428 +1491343.2443851305 +1456654.5296639535 +1476709.059701748 +1456654.526986673 +1477255.5357900965 +1475110.2494516287 +1484794.3959583687 +1450199.281751075 +1486941.4767277678 +1479876.2868846622 +1484794.5457817232 +1477280.9543876962 +1495577.354103449 +1455646.0754597776 +1483054.4170790757 +1475280.768685645 +1476709.060252776 +1491500.2419934191 +1486458.1729271794 +1486941.4765890294 +1486941.4765932504 +1475280.773319025 +1494774.3326003738 +1495577.3540905574 +1479876.2885074392 +1475280.7736245943 +1475280.773400522 +1485753.0991621702 +1485588.9994724053 +1475601.078715672 +1465621.6079533417 +1469682.2720623498 +1442369.1705186577 +1494774.3325990005 +1465274.406099048 +1465208.4409726784 +1462211.6542694897 +1453123.813446832 +1475110.2494178228 +1451765.3380295099 +1472287.0320990025 +1484533.8144170127 +1495577.3540978946 +1456831.3093990167 +1472581.134882621 +1471410.1974199878 +1478883.833296539 +1478087.6680820896 +1467829.1015394733 +1479647.1584576285 +1452375.1733580828 +1467441.5285977744 +1476011.3282147434 +1479646.730239961 +1478883.8568361362 +1469069.4369058595 +1481427.6738054312 +1471411.533018346 +1474710.596386687 +1481012.6175929666 +1471295.4897472397 +1495577.353994423 +1477938.3299888852 +1450199.2567955416 +1475811.5966141485 +1477281.012342525 +1472281.4560636994 +1479659.500509 +1491500.2419286014 +1481012.6185239565 +1456668.634049541 +1484381.0994917855 +1475693.8506897015 +1491919.3952251065 +1465208.4409624585 +1481427.7910822073 +1482008.916073443 +1484381.099489615 +1479876.2868921189 +1475259.5643661022 +1475280.773646447 +1475351.3254954515 +1452509.938369752 +1471411.5412869332 +1479623.6550401363 +1487549.8338439409 +1478135.7686661321 +1479876.286873454 +1469986.7059195284 +1494774.3325336732 +1474042.4963528141 +1482008.9164898638 +1481059.3647858168 +1478893.9665375988 +1465262.7463592424 +1463507.9157012654 +1484381.0994731372 +1475280.7736373094 +1476011.3289445117 +1486941.472558943 +1465394.296631303 +1475693.801091653 +1465394.2966945104 +1484533.8397223556 +1482008.9074071567 +1472293.0770532812 +1477642.7955954412 +1475351.328148801 +1455600.6986666187 +1475601.0782699932 +1448434.4234157468 +1486941.4767294982 +1471450.4207483984 +1446818.9732637522 +1479179.487340622 +1483597.798860809 +1476205.004695134 +1482008.9155422314 +1450199.2690278739 +1452631.7381132706 +1481811.910663999 +1469290.078571182 +1478176.955357663 +1495577.3540672231 +1451765.3215053508 +1466549.2202428905 +1466392.33586661 +1477824.314227714 +1450199.2332041678 +1475534.4315860216 +1477698.1403491457 +1486302.6937256185 +1465394.295094731 +1470157.9130218383 +1486148.3277759268 +1476442.3500038802 +1481679.8899279458 +1478883.856814297 +1458312.992545121 +1463413.429783159 +1455790.35132427 +1482475.8214565364 +1475023.0695223259 +1474710.596402271 +1474990.6113330931 +1483054.7066658004 +1475280.775858316 +1477992.332020821 +1479600.2990331517 +1484642.8355231085 +1475368.5216579721 +1455790.3129567618 +1475280.7741829765 +1479153.3262785608 +1481837.7692398275 +1474669.2235785844 +1494441.2766417945 +1467961.4011742023 +1483537.788373777 +1472306.4211043122 +1485521.314380131 +1474831.213993747 +1455824.8214579236 +1479179.398572739 +1476390.1492407497 +1462697.328539566 +1481427.7391701767 +1475110.2494487937 +1479647.1519369287 +1477056.5777220256 +1475601.0771055517 +1465394.2989775857 +1471295.489727189 +1479153.3325063093 +1484532.8433395852 +1477635.2455663695 +1486505.4762278786 +1482336.2611589425 +1467441.4874824279 +1456654.4498848922 +1484533.8398427179 +1481684.2662895322 +1481008.9243360315 +1484381.0994919324 +1462551.5646189498 +1465208.4409779934 +1475693.8199001122 +1477280.961536129 +1456006.5714982315 +1479153.330658929 +1481045.8306048454 +1486297.50454789 +1491452.5766092502 +1478341.173023702 +1477056.579679963 +1479647.153375245 +1466392.2389358457 +1455788.9868727513 +1483108.4477021906 +1481012.6183469016 +1476205.0442037769 +1456025.3856853603 +1495577.3540945686 +1483545.0742727425 +1473319.7411446779 +1483537.7883651948 +1475690.443760375 +1485694.5667620574 +1483509.4448553575 +1491343.2394278937 +1469069.3904130452 +1451525.1689227447 +1452311.1846087351 +1475259.5650284225 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..24e0793 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,256 @@ +1502678.55096 +1497203.66789 +1502838.70106 +1482155.88472 +1504450.99195 +1491899.55582 +1500828.71139 +1493216.73852 +1504441.10364 +1502911.7424 +1504692.11507 +1504441.10419 +1502267.61413 +1498527.33012 +1502817.15523 +1504691.83246 +1501494.53753 +1474672.36557 +1484832.95719 +1476629.91851 +1503360.42648 +1497797.50262 +1500388.78783 +1497203.65755 +1485003.82987 +1513847.76672 +1500828.70056 +1474677.23206 +1502678.54265 +1499158.23276 +1504725.50668 +1502267.61885 +1502649.57552 +1483413.65813 +1505501.06035 +1502911.83307 +1482153.97296 +1491466.61716 +1510747.49746 +1510747.49733 +1492324.46874 +1504954.85039 +1506611.98773 +1482154.23689 +1501184.50027 +1482153.62362 +1493466.55541 +1492324.46866 +1501320.54219 +1474672.02742 +1502562.20659 +1505501.06429 +1501320.9088 +1493472.4011 +1513847.77186 +1484900.6081 +1504440.96974 +1496253.38387 +1501184.91716 +1506703.00642 +1501507.97958 +1502562.4312 +1502563.15778 +1496251.27496 +1510747.49756 +1513847.75756 +1505501.06381 +1496251.37439 +1496251.45472 +1498618.29349 +1498565.30964 +1497907.7521 +1486004.00767 +1491627.9044 +1468614.82544 +1510747.49745 +1490930.6623 +1485681.70754 +1481889.84136 +1481886.19878 +1492324.46731 +1474239.75894 +1498142.73175 +1502840.51048 +1513847.76667 +1481190.41765 +1500662.04805 +1497358.02378 +1500450.61264 +1502156.02353 +1497216.18431 +1504692.09794 +1475285.77852 +1496971.588 +1503292.00246 +1504689.50086 +1500450.92548 +1490590.06084 +1502678.46084 +1497360.63609 +1497717.13173 +1502838.66798 +1490669.77862 +1513847.70486 +1499173.53634 +1474669.66989 +1496768.97774 +1493466.2819 +1498937.01349 +1498222.00462 +1506703.03262 +1502838.70149 +1485086.72008 +1506645.55269 +1501494.53772 +1505255.35759 +1485681.70411 +1502678.55979 +1506613.87037 +1506645.39271 +1505501.06428 +1496216.51779 +1496254.72335 +1496325.95019 +1472598.37544 +1497360.61443 +1505193.71705 +1500664.12367 +1497811.31239 +1505501.06428 +1493756.75084 +1510747.49683 +1497194.521 +1506612.91593 +1502787.24398 +1504326.3661 +1484483.46412 +1481903.69531 +1506645.47323 +1496251.29237 +1503292.00314 +1502571.10997 +1484449.01098 +1501494.51292 +1484448.92454 +1502819.93239 +1506613.31856 +1498330.61077 +1501541.44226 +1496325.79839 +1484834.21376 +1497907.79198 +1479943.64041 +1502562.28097 +1497426.7415 +1475337.60475 +1499190.01243 +1499153.05763 +1489530.48011 +1506614.08345 +1474669.91707 +1476628.78453 +1506782.68273 +1490790.206 +1497817.87404 +1513847.81755 +1474237.61745 +1485785.31815 +1488792.10264 +1499278.21905 +1474670.83063 +1497355.33966 +1502172.10421 +1499034.10093 +1484448.73501 +1489614.01619 +1498935.42903 +1496842.3218 +1501113.70668 +1500450.92765 +1483460.43184 +1495817.38766 +1485026.72725 +1498439.4824 +1492265.36338 +1497717.29886 +1491624.98837 +1504441.10419 +1496250.38438 +1500453.47427 +1498725.06059 +1502773.96972 +1498093.05177 +1485028.49431 +1496252.94196 +1502911.79345 +1507621.16424 +1496279.6307 +1510529.53574 +1489142.76163 +1495189.15364 +1489255.85629 +1498780.13211 +1503360.44611 +1485012.37105 +1499208.82245 +1500688.54697 +1491933.35031 +1502678.5109 +1492324.46866 +1504692.10255 +1504361.15145 +1497907.65234 +1484448.70706 +1490669.78247 +1502911.84493 +1502945.85904 +1502406.15685 +1500128.29275 +1503103.99652 +1496971.59628 +1482152.3929 +1502819.35678 +1501556.10266 +1508750.66198 +1506645.5523 +1484808.64536 +1485681.78911 +1501494.51587 +1493464.68676 +1485148.82645 +1502911.95665 +1509213.96243 +1500388.89058 +1506667.3391 +1493009.28316 +1504361.15666 +1504692.08588 +1488786.34722 +1485016.75924 +1500902.71798 +1502838.69309 +1489523.93218 +1485322.58924 +1513847.75929 +1499080.30157 +1498849.17259 +1495189.16008 +1501492.25847 +1502105.94616 +1502659.41193 +1506611.89757 +1490595.22369 +1475908.61494 +1481058.14857 +1496216.45858 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..f7ba1b7 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose/funcCalls.txt @@ -0,0 +1,256 @@ +10 +13 +19 +20 +20 +20 +21 +21 +21 +22 +23 +21 +24 +24 +25 +26 +27 +27 +27 +25 +28 +28 +28 +29 +29 +27 +29 +30 +30 +30 +31 +29 +31 +31 +32 +32 +33 +34 +35 +35 +36 +37 +37 +37 +37 +38 +39 +39 +40 +40 +40 +42 +42 +43 +44 +44 +46 +48 +48 +49 +50 +45 +51 +52 +53 +55 +51 +52 +57 +58 +59 +64 +66 +69 +74 +75 +76 +76 +80 +13 +91 +36 +21 +23 +17 +29 +28 +21 +30 +33 +102 +32 +22 +105 +44 +30 +34 +38 +33 +37 +36 +34 +39 +17 +34 +33 +25 +31 +12 +37 +50 +18 +31 +126 +34 +46 +48 +28 +41 +132 +47 +24 +43 +133 +132 +41 +60 +26 +136 +45 +50 +41 +51 +51 +19 +22 +30 +67 +157 +55 +16 +48 +74 +25 +45 +67 +20 +24 +64 +101 +27 +80 +32 +95 +105 +31 +28 +116 +23 +23 +104 +28 +25 +41 +83 +15 +115 +127 +35 +35 +45 +37 +23 +49 +43 +22 +208 +21 +41 +45 +49 +39 +42 +220 +133 +48 +41 +15 +42 +38 +57 +22 +20 +12 +46 +50 +88 +43 +145 +236 +112 +153 +38 +16 +26 +32 +22 +105 +28 +78 +27 +19 +80 +53 +68 +34 +24 +118 +90 +16 +142 +43 +66 +116 +26 +101 +29 +88 +30 +19 +24 +30 +46 +28 +20 +290 +30 +23 +58 +19 +54 +63 +31 +36 +35 +221 +73 +55 +33 +67 +59 +315 +33 +138 +26 +67 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..2fa4851 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,108 @@ +1470700.959359604 +1467219.1411359266 +1470030.0040485966 +1489949.3701909904 +1489949.3761034214 +1470752.4144714102 +1478850.912563043 +1485864.3413576104 +1477151.5048238318 +1485867.374787878 +1486103.050782534 +1479830.3414964022 +1489949.376733132 +1480317.3970693375 +1470916.2831203458 +1480274.8328850118 +1486103.0504809862 +1472407.419345845 +1470931.2188711953 +1470303.2328567659 +1480777.4426527175 +1470559.2133156753 +1470801.768107651 +1488892.3396530524 +1486040.9550290813 +1484775.9885098846 +1481227.8968446094 +1489203.102731004 +1472407.4388173048 +1461878.061614229 +1483315.9173979745 +1481227.8968467184 +1480769.6124011641 +1483059.2625224094 +1478281.3913592647 +1464387.7647329122 +1479830.3414448907 +1462431.9109579506 +1470559.1684955817 +1486919.9984636419 +1483349.5722502272 +1480703.8973706285 +1478801.2265860662 +1486103.0500595768 +1487924.2096538953 +1479474.830573483 +1470928.8617718795 +1478346.2416125636 +1489128.8965337977 +1483293.604203189 +1462158.6903721564 +1470752.411726969 +1477689.6887256925 +1478484.2318903024 +1484317.1039881664 +1489010.0417013764 +1485064.3228616868 +1489010.0416886855 +1478866.7972104468 +1471949.5276996172 +1487924.2099815458 +1463702.533632114 +1490370.285207951 +1486725.5576021606 +1470029.99865384 +1488892.3396930892 +1483349.601142006 +1494711.0751554663 +1475462.3857437836 +1478124.6643972357 +1485859.4384140142 +1488920.7542294953 +1478281.3914014625 +1479723.0356326117 +1486355.2729869976 +1486672.1073365428 +1485867.3652722647 +1472288.7086392674 +1483183.104323898 +1483349.6073342594 +1481199.7741117745 +1487725.8988959135 +1474927.6266189243 +1472407.438724784 +1478879.2071028687 +1470752.4144622753 +1486919.8346516774 +1480777.4428978164 +1486919.8328637152 +1473566.5079783017 +1459283.7978642026 +1484489.4694916604 +1470752.4131367365 +1474093.5615423613 +1480956.5593668132 +1494711.0810718315 +1494711.0719164922 +1482070.6924534189 +1472698.2176619752 +1482363.6274920907 +1470916.2831128447 +1470752.4144840143 +1471293.6786629823 +1464258.7142505979 +1472235.2141683225 +1478732.3416860967 +1488892.339451641 +1488640.2319217627 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..80d427b --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,108 @@ +1495784.78294 +1490224.51266 +1492640.50693 +1504975.70946 +1504976.20855 +1488866.56937 +1500336.2464 +1501665.01695 +1491471.79112 +1503103.6302 +1498949.48376 +1497882.30701 +1504976.18934 +1492591.26928 +1489191.16461 +1492583.8762 +1498949.29212 +1498582.61298 +1487774.35719 +1499873.01503 +1505872.98274 +1487515.49766 +1492160.98312 +1501525.14534 +1498663.91373 +1500479.53708 +1499461.224 +1500292.80045 +1498582.65252 +1497652.07251 +1500995.13419 +1499461.30565 +1504373.66059 +1504504.5596 +1495994.55079 +1488961.20841 +1497882.24091 +1494342.13713 +1487545.37347 +1498016.31339 +1501941.22821 +1494813.55796 +1497495.12216 +1498948.77702 +1499905.87121 +1492989.77834 +1487560.77564 +1492784.97912 +1501466.34069 +1505226.56038 +1484898.84182 +1488867.43351 +1492195.44524 +1504177.54457 +1495171.62786 +1501347.7667 +1498142.67505 +1501347.77662 +1500121.09924 +1493731.78868 +1499905.87282 +1492241.25801 +1501053.68067 +1502410.78718 +1492647.0962 +1501525.163 +1501942.41173 +1504743.0277 +1494992.24223 +1492916.13184 +1499765.23611 +1501123.37592 +1495994.43591 +1501651.5167 +1497903.99672 +1504184.74115 +1503097.70556 +1489147.04898 +1499507.16735 +1501941.47986 +1500289.92993 +1504283.86167 +1498621.46934 +1498582.63383 +1501868.88517 +1488867.21365 +1498031.61127 +1505874.65619 +1498031.19787 +1495875.04174 +1481376.44373 +1504858.9822 +1488867.16795 +1493018.98413 +1502564.54318 +1504741.29613 +1504741.74458 +1494180.06161 +1506230.97464 +1505971.97733 +1489191.14427 +1488866.95553 +1501665.55475 +1488860.17094 +1498466.05655 +1500682.08133 +1501525.34051 +1506604.64065 diff --git a/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..f1e0319 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/amalia_8.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,108 @@ +12 +15 +17 +18 +20 +22 +23 +24 +24 +26 +27 +27 +27 +27 +29 +28 +30 +30 +30 +31 +12 +31 +31 +31 +34 +34 +34 +32 +35 +16 +36 +37 +39 +38 +39 +40 +41 +20 +20 +42 +42 +41 +43 +20 +44 +43 +22 +44 +23 +23 +23 +24 +24 +24 +48 +27 +27 +51 +15 +29 +31 +56 +31 +56 +32 +58 +33 +34 +61 +35 +35 +61 +63 +37 +65 +38 +28 +38 +38 +38 +39 +39 +68 +41 +66 +57 +70 +43 +33 +73 +73 +44 +45 +46 +46 +49 +49 +49 +49 +50 +51 +51 +52 +52 +53 +54 +57 +57 diff --git a/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..4eaa5cd --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,194 @@ +1229532.093874681 +1259051.6321158041 +1241672.1226471388 +1244186.1005044354 +1257843.7260772954 +1257842.044143739 +1257843.72609054 +1257842.0440964908 +1228993.436411611 +1257843.7261030388 +1239307.690505408 +1242157.8008714882 +1237365.5119296056 +1244186.1005043932 +1257843.726102599 +1243944.169231292 +1257843.7261036104 +1238127.214945791 +1257842.043954802 +1229499.533245439 +1259042.4317787846 +1232790.5940759038 +1233121.064760023 +1257842.0440829734 +1245605.880775705 +1244211.3664557552 +1259042.431788139 +1259035.8726351855 +1228993.4364108555 +1230802.8881390837 +1232730.2368651116 +1239246.2885464441 +1237350.7385489556 +1259035.8714819478 +1257843.726101775 +1244119.9332763467 +1257842.0441237749 +1244186.100501381 +1259051.6318968756 +1244119.9332675668 +1232790.5940747685 +1259045.3626596946 +1250919.6393924532 +1239359.2430830419 +1237671.8361628414 +1239311.9016847676 +1259051.631497978 +1259045.3637072304 +1244119.9332761718 +1245575.8043004188 +1244929.7715680397 +1219633.3307511474 +1243951.521399209 +1252930.3114645444 +1232730.2368599155 +1241601.1240450232 +1230189.3852820185 +1244211.6840666558 +1259042.4317871507 +1237582.1316639609 +1259042.4317864657 +1244186.1005017208 +1244098.659686539 +1229513.4456074843 +1257842.0441419547 +1223077.5135680633 +1257842.0441416833 +1239307.6905085347 +1259045.363633562 +1257843.7258654474 +1252930.3509140948 +1230189.3656309168 +1259042.4317880892 +1244119.9332763809 +1259045.3637284888 +1228328.3906832738 +1228449.772170521 +1233120.929726248 +1257842.0441406071 +1245666.0179538974 +1233121.0647600684 +1245710.7029995422 +1250906.5012690185 +1259051.6319547489 +1259051.6321162586 +1239307.6905081675 +1245666.200805298 +1257715.1667836988 +1229532.093874635 +1242157.8008835085 +1238479.455241522 +1259045.3637394975 +1244119.9332764146 +1252892.8248684886 +1257843.7261037105 +1242104.4746522075 +1244186.1005042524 +1259045.3637415709 +1228365.5419148284 +1239307.6905081598 +1250906.5017081902 +1257843.7260866805 +1230189.3515412484 +1259045.3637408451 +1234260.1169584931 +1244186.1005040116 +1244119.933276488 +1228877.4105910016 +1245666.1985209023 +1259035.87264211 +1259045.3637112281 +1257843.726103546 +1238127.20718843 +1239246.2885509224 +1230189.3402774655 +1228959.4132530724 +1244953.3856894132 +1245605.887208753 +1259042.431781559 +1259051.632115298 +1233065.7224854159 +1252927.8565764923 +1244119.9332647366 +1248993.2444400673 +1245345.2307038293 +1257842.0441385277 +1257842.0441163704 +1228993.436411644 +1233121.0647600624 +1259051.6321137035 +1241624.2595303557 +1259042.431753589 +1259051.6148469478 +1259042.4317871805 +1242157.800884241 +1244929.7715711596 +1207846.5587595354 +1252892.8532100553 +1237362.3190020134 +1244953.3856891985 +1259051.6321161613 +1245666.2008163566 +1239311.901684334 +1228959.413252658 +1252930.3504240394 +1245666.348384798 +1244186.1005038642 +1230189.348777415 +1238257.4864138714 +1244186.1005040412 +1239311.9016843115 +1239359.2431220214 +1257842.0441409345 +1242104.4746521853 +1257842.044143503 +1257842.0439426356 +1245605.887825987 +1237671.8361628398 +1232790.594076268 +1245666.1971273816 +1259051.632106131 +1259051.6320238395 +1259051.6321154798 +1228366.3683136608 +1228843.4710502208 +1244687.0974366337 +1233065.7528957839 +1259051.6321160095 +1252892.8530798757 +1244119.9332731995 +1239359.243122002 +1259045.3637406388 +1245604.8608313731 +1239359.2431220196 +1259042.431778821 +1244186.1005025725 +1229513.4456073819 +1242104.4746522098 +1252892.8532911374 +1237671.8361628414 +1239246.2885508048 +1238459.4463941827 +1242157.8008843672 +1241591.796434652 +1259051.6320948245 +1257842.0441425454 +1238572.657656981 +1228449.8401373054 +1257842.044103855 +1257842.0441178593 +1250906.5016886943 +1259051.6321147992 +1239307.6905077896 +1259051.6311171588 diff --git a/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..1a3ddde --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,194 @@ +1261293.38888 +1300361.14078 +1280524.78915 +1284372.24633 +1299391.76202 +1299326.83 +1299391.76416 +1299326.83199 +1256375.01256 +1299391.76619 +1272753.05346 +1280036.41663 +1274894.50177 +1284372.24565 +1299391.76612 +1286173.62432 +1299391.76591 +1280140.46258 +1299326.83703 +1261434.14807 +1300385.34741 +1263854.01089 +1267133.75601 +1299326.82407 +1285054.85069 +1280327.20209 +1300385.34738 +1300342.38074 +1256375.01248 +1268819.77384 +1263871.64384 +1272732.19358 +1276550.0321 +1300342.3965 +1299391.76627 +1284283.64303 +1299326.83242 +1284372.24269 +1300361.14152 +1284283.65038 +1263854.01072 +1300321.5781 +1293267.84888 +1274945.86546 +1274062.53391 +1274956.6002 +1300361.14288 +1300321.57936 +1284283.64348 +1284969.91398 +1284244.50567 +1258765.85072 +1281112.05799 +1294292.34248 +1263871.64381 +1280216.09952 +1259611.8034 +1280327.54293 +1300385.34738 +1274023.59131 +1300385.34737 +1284372.24334 +1280516.82945 +1261360.13039 +1299326.83059 +1252299.66668 +1299326.83051 +1272752.95555 +1300321.57834 +1299391.79587 +1294292.38509 +1259611.78105 +1300385.34737 +1284283.64175 +1300321.57898 +1258806.42114 +1258948.60083 +1267133.60081 +1299326.82944 +1286141.23922 +1267133.75607 +1286228.23037 +1293223.50146 +1300361.14164 +1300361.14045 +1272752.99692 +1286141.42679 +1299164.58767 +1261293.38903 +1280036.41855 +1280228.74142 +1300321.57903 +1284283.64181 +1294272.3449 +1299391.76592 +1280009.87448 +1284372.24526 +1300321.57874 +1258882.02826 +1272752.99171 +1293223.51151 +1299391.75731 +1259611.76513 +1300321.57881 +1273579.73 +1284372.24776 +1284283.64206 +1257957.67 +1286141.42445 +1300342.38385 +1300321.57842 +1299391.76598 +1280140.45443 +1272732.20494 +1259611.75223 +1256429.41099 +1284328.39268 +1285055.13746 +1300385.34741 +1300361.14094 +1267124.1927 +1294328.09693 +1284283.6364 +1293025.41968 +1284826.12616 +1299326.83112 +1299326.82638 +1256375.0125 +1267133.75609 +1300361.14104 +1280225.15212 +1300385.34699 +1300361.12365 +1300385.34737 +1280036.41782 +1284244.50629 +1243203.80973 +1294272.37553 +1276798.05705 +1284328.39302 +1300361.14096 +1286141.4268 +1274956.59997 +1256429.41151 +1294292.38456 +1286141.6231 +1284372.24969 +1259611.76189 +1280164.53304 +1284372.24777 +1274956.59995 +1274945.86498 +1299326.83086 +1280009.87454 +1299326.83021 +1299326.8159 +1285055.13781 +1274062.5339 +1263854.01101 +1286141.42302 +1300361.14116 +1300361.14113 +1300361.14094 +1258882.95053 +1258014.44937 +1290167.97626 +1267124.2286 +1300361.14094 +1294272.37537 +1284283.64404 +1274945.86497 +1300321.57877 +1285056.38909 +1274945.86498 +1300385.34737 +1284372.24308 +1261360.13051 +1280009.87447 +1294272.37561 +1274062.5339 +1272732.19362 +1280272.60163 +1280036.4182 +1280141.43404 +1300361.14102 +1299326.83033 +1280320.01761 +1258948.67773 +1299326.83185 +1299326.83248 +1293223.50881 +1300361.14094 +1272752.98174 +1300361.14235 diff --git a/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..f0fd735 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,194 @@ +21 +24 +24 +26 +35 +37 +41 +42 +42 +42 +43 +44 +45 +47 +48 +48 +49 +49 +49 +51 +54 +54 +55 +55 +57 +57 +61 +62 +62 +63 +65 +65 +66 +68 +69 +70 +74 +74 +75 +76 +77 +78 +79 +80 +82 +83 +84 +85 +87 +87 +90 +91 +94 +97 +96 +99 +102 +103 +102 +104 +32 +107 +109 +111 +112 +108 +113 +113 +114 +117 +119 +121 +122 +129 +134 +136 +136 +137 +66 +140 +43 +143 +140 +31 +49 +64 +145 +33 +148 +26 +54 +153 +155 +157 +41 +61 +162 +70 +164 +63 +97 +41 +171 +47 +85 +67 +90 +35 +180 +36 +43 +66 +47 +30 +185 +46 +46 +58 +82 +195 +77 +197 +83 +76 +88 +75 +207 +107 +73 +44 +45 +116 +83 +28 +33 +112 +64 +223 +224 +35 +66 +131 +131 +38 +126 +143 +68 +114 +133 +72 +54 +52 +130 +57 +60 +144 +70 +121 +18 +158 +60 +59 +88 +186 +116 +116 +45 +54 +131 +49 +55 +111 +71 +24 +122 +74 +155 +30 +188 +68 +59 +169 +84 +126 +194 +73 +155 +116 +115 +151 +126 +58 +45 +55 diff --git a/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..1095b8f --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,140 @@ +1286109.0267094078 +1278341.6886210605 +1279555.20396101 +1278341.683966443 +1284516.106330155 +1283294.656652576 +1284262.2909808054 +1286109.1354566857 +1283956.0541536834 +1279555.204019581 +1280947.7283757746 +1283294.6566717112 +1284516.1070517832 +1286109.1349327525 +1285230.5708497535 +1283294.6563062372 +1284273.8392760134 +1288342.63661845 +1288337.4439244114 +1278329.836348348 +1286115.8515044074 +1288343.1965139932 +1284516.1044717913 +1283963.9027528288 +1288342.6367399385 +1283963.9026474722 +1288337.4439933237 +1285236.509490949 +1286109.135596205 +1286109.1345582108 +1288342.3962774437 +1279555.2035645703 +1283963.902697464 +1279317.2210011177 +1284516.1065895604 +1279317.546753578 +1284273.8393678127 +1283281.4211431546 +1279555.2039581724 +1286109.1355990798 +1279555.2035953004 +1279317.2207618975 +1288341.167167586 +1283281.4216381612 +1286109.13541371 +1288343.1963905809 +1285236.513440098 +1284273.8394088943 +1288337.4440461202 +1283963.9027866751 +1279317.5464337652 +1288337.4440176408 +1283956.0555421885 +1284511.498010624 +1284516.1070516554 +1279317.2189573015 +1288343.1953359852 +1283294.6566716058 +1286115.855510538 +1288343.195282641 +1286115.8554095265 +1288340.9878140294 +1288340.9877802406 +1280943.6536038462 +1283963.891072033 +1288337.443825313 +1279555.204025718 +1280939.6860646328 +1285236.5136375972 +1288342.3297214403 +1285230.5187289135 +1279317.5537343968 +1284262.1934414874 +1283281.4218629654 +1285236.513828624 +1285230.5685048348 +1283963.9027433968 +1284516.1042499312 +1285230.5574501236 +1288340.9873396398 +1283281.4200986072 +1283963.9026164724 +1280947.7283171813 +1279317.552371148 +1280939.6875448322 +1284273.8394141064 +1288337.4440341594 +1280947.0033795757 +1286115.8080886698 +1279317.221171816 +1285236.5093621328 +1285230.5718273064 +1286115.855252018 +1284272.7982550517 +1284262.2897894618 +1279553.8509871417 +1283281.4218013086 +1285230.5676025436 +1288343.196518258 +1288343.196487065 +1286109.1355939338 +1283956.0552762907 +1279555.2032037938 +1283956.0555229273 +1288343.1961918448 +1288342.6367156513 +1286109.1355817402 +1279555.2016367216 +1279317.2203658933 +1284511.4950046383 +1288342.580534595 +1288340.9848013092 +1284511.495862288 +1284516.107039202 +1278329.8322883719 +1288342.3742355437 +1284262.2038324429 +1285236.5138432162 +1284511.4967071519 +1284262.2910314337 +1288342.6365991386 +1288337.4437006332 +1283963.9019127486 +1277372.2720314588 +1283281.4215900872 +1284516.1069471943 +1284273.8315371748 +1283963.9027680422 +1285230.5641330073 +1280947.7285140548 +1283963.9025579004 +1279317.2211272602 +1283963.9025218077 +1284516.1054594135 +1280947.7282445228 +1280947.7285424573 +1288340.9877807836 +1283294.652094207 +1277372.27203633 +1280947.7280138428 diff --git a/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..bd19a34 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,140 @@ +1324603.69717 +1317264.6324 +1319351.88671 +1317264.55775 +1325102.04408 +1324175.51677 +1322037.23283 +1324603.92005 +1324451.73546 +1319351.8103 +1319596.6504 +1324175.51372 +1325102.00134 +1324603.92301 +1324172.00911 +1324175.5446 +1322048.28763 +1329364.69271 +1329373.22315 +1317279.5018 +1324610.03055 +1329353.55051 +1325102.06896 +1324436.77733 +1329364.68242 +1324436.76241 +1329373.22312 +1324180.05856 +1324603.91986 +1324603.92662 +1329364.44023 +1319351.77903 +1324436.78511 +1318979.45504 +1325102.03155 +1318983.39533 +1322048.30877 +1324184.37345 +1319351.77327 +1324603.92096 +1319351.82158 +1318979.45751 +1329355.87262 +1324184.36461 +1324603.91713 +1329353.5612 +1324180.06272 +1322048.30839 +1329373.2229 +1324436.7772 +1318983.39371 +1329373.22306 +1324451.77043 +1325115.37853 +1325102.00131 +1318979.45249 +1329353.52406 +1324175.51477 +1324610.0328 +1329353.59796 +1324610.03326 +1329345.82781 +1329345.82512 +1319592.29334 +1324436.78692 +1329373.2229 +1319351.83331 +1319584.39038 +1324180.06266 +1329364.35918 +1324171.9301 +1318983.41346 +1322037.12755 +1324184.34272 +1324180.06256 +1324171.98414 +1324436.77762 +1325102.06428 +1324171.97167 +1329345.79786 +1324184.35749 +1324436.75023 +1319596.64685 +1318983.41202 +1319584.407 +1322048.31041 +1329373.22301 +1319595.13345 +1324610.07131 +1318979.48638 +1324180.05798 +1324171.97743 +1324610.03232 +1322072.29924 +1322037.20821 +1319338.38688 +1324184.34556 +1324171.98322 +1329353.56043 +1329353.56595 +1324603.92091 +1324451.77459 +1319351.83805 +1324451.771 +1329353.57454 +1329364.69112 +1324603.91869 +1319351.86277 +1318979.45436 +1325115.40234 +1329352.93873 +1329345.78434 +1325115.37309 +1325102.00103 +1317279.49152 +1329364.40981 +1322037.14064 +1324180.06005 +1325115.379 +1322037.24062 +1329364.69834 +1329373.21855 +1324436.81564 +1316728.96474 +1324184.34516 +1325102.01399 +1322048.29259 +1324436.7805 +1324171.97894 +1319596.66949 +1324436.78002 +1318979.45517 +1324436.79706 +1325101.94994 +1319596.66717 +1319596.66974 +1329345.78912 +1324175.60445 +1316728.94756 +1319596.66446 diff --git a/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..d2d52d5 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/circle_4.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,140 @@ +13 +15 +17 +18 +19 +19 +19 +20 +20 +22 +22 +23 +23 +24 +24 +23 +24 +25 +26 +26 +26 +27 +27 +28 +28 +28 +29 +29 +29 +30 +32 +31 +33 +33 +33 +33 +33 +33 +33 +34 +34 +34 +34 +34 +34 +35 +34 +34 +34 +35 +35 +35 +35 +36 +36 +36 +36 +37 +37 +36 +24 +38 +38 +36 +40 +40 +40 +40 +40 +41 +26 +41 +41 +41 +41 +43 +43 +43 +44 +44 +43 +44 +44 +43 +45 +45 +30 +45 +45 +46 +47 +47 +49 +49 +50 +50 +50 +51 +51 +51 +52 +54 +54 +55 +53 +55 +55 +55 +57 +57 +57 +41 +58 +58 +59 +59 +43 +62 +44 +62 +44 +61 +45 +64 +46 +65 +47 +47 +47 +48 +68 +69 +49 +50 +51 +70 +51 +51 +72 +53 diff --git a/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..64ac640 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,334 @@ +1290563.732576732 +1286135.7302718684 +1300487.084550429 +1274133.7240020037 +1281339.3273782763 +1274339.6777689895 +1286325.1297519049 +1288296.2170166045 +1275511.464512655 +1255838.1047482605 +1282754.629291202 +1262034.581356667 +1273754.7462131784 +1275552.428571875 +1270912.8203531145 +1275552.4279842125 +1278352.5030003132 +1259358.0424372319 +1266219.0275526159 +1302498.3574684619 +1275528.4823780877 +1262215.102952849 +1264815.808507438 +1282166.080366571 +1276784.3771827526 +1292709.927198308 +1290145.4684663792 +1287336.4604916682 +1252512.5668199682 +1288571.8084416962 +1275552.427562846 +1282956.088958767 +1300656.2507272873 +1274339.6773116244 +1277598.7127849741 +1292704.9195128896 +1292991.3990509263 +1259223.9572938296 +1255468.6596423397 +1296514.7437015506 +1282166.081212124 +1293869.250601271 +1282166.0816993506 +1292704.8703544387 +1300477.981509853 +1279776.3528518104 +1255435.6324910417 +1264687.299012645 +1286325.2208211347 +1268808.320078722 +1282158.478555177 +1302498.263167376 +1255468.6668219888 +1275552.4260751081 +1293001.263017316 +1255435.6329269155 +1300477.981483858 +1286956.5203932172 +1300487.0819928201 +1293504.5986796992 +1264687.2991577634 +1277355.653513309 +1282166.0803656073 +1265569.6149416473 +1296163.526866771 +1295382.104857833 +1282757.9710903596 +1292574.5378912953 +1302801.6310573649 +1279142.2834811585 +1285386.6300526098 +1275528.4843910588 +1268808.4466887487 +1295525.5744078867 +1282628.372147593 +1300633.3773419808 +1282166.0804978146 +1288571.807506608 +1267613.1637495 +1268805.8189973636 +1256692.9710831533 +1254859.0118673346 +1288571.8075779718 +1273754.7453943782 +1274339.6779212616 +1283854.3543582677 +1283385.035012525 +1256644.5289106688 +1274046.5841611954 +1273754.7461102982 +1275511.4645482013 +1275511.4604952952 +1282166.0803879804 +1254614.6336817325 +1210527.9677557603 +1289221.3190473854 +1293869.2506779912 +1282754.628434235 +1264322.4698612294 +1262217.8166158812 +1286325.129758143 +1291405.2383513793 +1292704.919617143 +1259223.9572941938 +1282956.0981787937 +1292566.2146768968 +1264815.6631891308 +1286841.2378994517 +1220986.4697970657 +1293875.2287821318 +1300656.2663825022 +1293875.4041917478 +1283855.5007203957 +1269623.6528988043 +1302801.6290987781 +1259419.0773934533 +1286841.2379078595 +1287334.6768934808 +1280049.6698581458 +1263495.7679758794 +1286328.068480584 +1263498.808193641 +1292991.194300384 +1254556.3918383678 +1283855.561489574 +1283042.781068253 +1277590.82858124 +1268805.8702301262 +1256635.6002388122 +1300487.0820305115 +1262215.089001233 +1268808.3200496216 +1269623.6528282294 +1287334.6730368424 +1300656.2714276891 +1290557.1586155805 +1285386.6300420908 +1286325.1296470833 +1293869.2497268594 +1290556.4044831803 +1275535.2009105769 +1267724.1418734787 +1287334.675515094 +1277003.44193654 +1256144.565876691 +1300656.271427942 +1281349.6363172904 +1275535.200876377 +1293470.767678207 +1288272.1497440813 +1283854.642501799 +1293875.4044644276 +1262217.816818184 +1292709.927211256 +1277598.7187425892 +1279142.2834804205 +1280747.5134611852 +1296163.4305822991 +1279776.3529070104 +1284741.4726743537 +1264658.1709400213 +1286325.1296470775 +1288571.8293754961 +1282158.4746924266 +1273255.182091048 +1284741.4726538502 +1282933.681403905 +1286131.5426693761 +1286871.278092008 +1292709.9271987032 +1293869.2506624954 +1259208.3370306839 +1270912.8534554036 +1283854.352779358 +1302498.263153192 +1270838.3331299315 +1269109.4434650417 +1259419.1140597337 +1275990.0278389482 +1282166.0803996585 +1258877.409907971 +1278352.503449692 +1279996.6876308606 +1300633.37586543 +1287752.8684509716 +1280746.2971399655 +1286368.9001997914 +1289224.678741787 +1275552.4297974273 +1264815.8472173826 +1300487.0820114585 +1265545.9110559865 +1287752.8713580067 +1258071.1180783415 +1292709.9271986813 +1286462.0351942433 +1256644.642527769 +1276784.3751997424 +1277590.8285812342 +1286325.5803265055 +1279142.2834811346 +1286328.070786738 +1279142.2834811592 +1302793.361603873 +1283385.0498580844 +1279770.2535192303 +1300656.2714289105 +1293001.2687154557 +1256644.6423886034 +1290557.1205408531 +1263499.2845558547 +1296493.802591396 +1279776.352903361 +1279776.352905385 +1293875.340185574 +1279770.2535546888 +1292991.1199393852 +1263498.8057591955 +1275528.4823798668 +1286841.2379082798 +1265545.9110564664 +1277068.9966667746 +1283854.3550129866 +1275535.2008848994 +1302801.6310573376 +1293869.2504032752 +1270214.4109522183 +1254950.2953764389 +1296163.4506364812 +1286131.5434170652 +1261018.6829520215 +1280378.4833106578 +1284741.4726814188 +1269973.1150631555 +1300477.9814835952 +1293001.2567742972 +1279776.35277282 +1274178.2282502507 +1277355.4553404064 +1269386.3049130086 +1289224.64324488 +1295525.5743745265 +1275535.200877614 +1277355.6521932017 +1286328.0706336875 +1282166.0813011504 +1295525.5712270534 +1235323.2838643873 +1293875.404468866 +1274389.0749425902 +1255838.1047341349 +1259419.0844659056 +1275511.4645316454 +1267612.8228990422 +1275993.9225294073 +1252048.2667081624 +1274339.6920250978 +1293869.250571839 +1277068.9964004036 +1302801.6297389136 +1300633.3773146784 +1279005.55397203 +1258543.1376979318 +1281349.6495153424 +1283580.7091514098 +1264704.66601248 +1249949.537593142 +1273613.5579072179 +1234140.2655159377 +1290343.3863426389 +1300487.0820547095 +1274389.0991825322 +1285405.496479156 +1288587.1535300582 +1277598.7187425946 +1273664.259595231 +1234070.3339422331 +1259208.337032917 +1300487.0819862133 +1281966.1760507273 +1236241.1769362125 +1264658.1727847173 +1275535.2008801312 +1263495.305670311 +1291381.6094224507 +1284741.4727165042 +1264815.8472174043 +1275552.4275613092 +1269386.304914522 +1251588.4021337708 +1289074.2648767333 +1289132.5679701213 +1288587.1641241247 +1275511.4645317793 +1293001.371066867 +1270252.7844019227 +1288272.1400030178 +1262215.0866764302 +1261022.908471694 +1275528.4824753462 +1282141.8304889575 +1252664.7282090497 +1302498.3396475886 +1234140.2626735452 +1281349.6886868617 +1275528.482378443 +1283854.4697505836 +1271990.9261532323 +1267615.6672078467 +1290557.1586285161 +1273623.9448535058 +1291405.238358813 +1296514.8021779507 +1287761.6789010582 +1289221.318896587 +1302801.6310445992 +1286871.2780920083 +1290557.158620867 +1283855.5011943546 +1293875.40446857 +1290191.20558696 +1291405.2383161206 +1293875.3633116956 +1266219.035454541 +1281339.2574740339 +1293001.2765678538 +1272182.5554889282 +1288296.4873386165 +1277590.8285811762 +1277598.718426046 +1269388.286697504 +1280376.9204635858 +1263498.8059860354 +1263498.8059998695 diff --git a/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..ae76c20 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,334 @@ +1336611.92983 +1333991.22339 +1346112.53055 +1317109.15513 +1328409.50778 +1318097.23566 +1331130.48531 +1336237.44833 +1319611.9233 +1295047.10492 +1335815.47301 +1290522.14371 +1317284.8064 +1319612.27838 +1312832.1533 +1319612.27773 +1323712.07162 +1302753.22503 +1301682.90242 +1344632.87389 +1314420.66481 +1296213.27493 +1318717.26291 +1326886.83336 +1317774.88986 +1333201.56556 +1333331.31079 +1334748.49637 +1305494.50432 +1336285.42555 +1319612.27726 +1325374.00022 +1346111.06825 +1318097.23522 +1315376.6102 +1333205.12094 +1332922.56022 +1301678.32666 +1299423.58794 +1345469.89838 +1326886.83394 +1333961.36131 +1326886.83429 +1333205.07746 +1346093.01169 +1319123.54155 +1299400.43524 +1296411.03806 +1331130.58184 +1314780.07276 +1322548.57189 +1344637.22172 +1299423.6535 +1319612.27617 +1332908.1534 +1299400.23704 +1346093.0128 +1332676.16306 +1346112.53376 +1338866.81118 +1296411.03991 +1320015.87679 +1326886.83336 +1319208.62585 +1338362.05754 +1337618.47345 +1335816.8059 +1344685.36166 +1344805.38453 +1316480.47056 +1331236.4996 +1314420.66541 +1314780.17636 +1333083.13251 +1325530.74272 +1346107.39948 +1326886.83345 +1336285.42488 +1299297.10669 +1314772.2343 +1297680.65368 +1292855.70669 +1336285.42494 +1317284.8048 +1318097.23582 +1328265.62087 +1332216.1354 +1288506.14974 +1319741.14057 +1317284.80632 +1319611.92334 +1319611.92033 +1326886.83337 +1296587.74217 +1238358.46366 +1333734.50561 +1333961.32157 +1335815.47174 +1298936.09564 +1296206.89925 +1331130.48532 +1338696.28617 +1333205.12102 +1301678.32666 +1325374.0075 +1344676.21374 +1318717.11505 +1321521.80775 +1258088.09687 +1333975.64788 +1346111.09131 +1333975.73069 +1328275.1688 +1304292.73324 +1344805.38307 +1302837.29838 +1321522.08402 +1334758.38296 +1323820.56331 +1293347.29828 +1331130.46267 +1293355.21518 +1332922.23128 +1296562.56502 +1328275.13132 +1324492.1948 +1315379.60605 +1314772.28136 +1288510.08151 +1346112.53161 +1296213.28981 +1314780.07266 +1304292.73321 +1334758.37969 +1346111.09524 +1336605.87255 +1331236.49959 +1331130.48514 +1333961.32827 +1336605.26312 +1314414.21552 +1298101.58008 +1334758.38162 +1315415.52799 +1289311.65913 +1346111.09524 +1328417.07614 +1314414.21551 +1338853.28065 +1336223.58398 +1328265.84268 +1333975.73081 +1296206.9014 +1333201.56557 +1315376.67518 +1316480.47097 +1319889.14868 +1338361.98661 +1319123.46666 +1322748.55306 +1308073.8072 +1331130.48514 +1336285.44067 +1322548.56973 +1318414.97469 +1322749.11333 +1319195.51076 +1334005.03484 +1321566.58921 +1333201.56556 +1333961.30682 +1301672.8558 +1312832.1941 +1328265.61991 +1344637.22172 +1312830.66476 +1305878.88059 +1302837.30619 +1314919.91728 +1326886.83338 +1297479.80866 +1323712.07323 +1324132.16652 +1346107.39794 +1337044.83533 +1319894.14863 +1322489.14234 +1333728.95279 +1319612.27975 +1318717.29962 +1346112.53267 +1319202.58412 +1337044.86174 +1292554.95771 +1333201.56556 +1320701.97778 +1288506.257 +1317773.88137 +1315379.60637 +1319953.20079 +1316480.47004 +1331130.4663 +1316480.47058 +1344803.87407 +1332216.15909 +1319143.90317 +1346111.09524 +1332908.16101 +1288506.25687 +1336605.82492 +1293355.57639 +1345452.49421 +1319123.47545 +1319123.48495 +1333975.71015 +1319143.90321 +1332922.11768 +1293355.21558 +1314420.66481 +1321522.16617 +1319202.58412 +1318101.34486 +1328265.6221 +1314414.21587 +1344805.38453 +1333961.14057 +1304252.10022 +1289482.47413 +1338362.00032 +1334005.03553 +1297536.9778 +1323355.81727 +1322748.22055 +1303265.26982 +1346093.01281 +1332908.14235 +1319123.4094 +1315439.69323 +1320015.79513 +1303760.02688 +1333728.92308 +1333083.13167 +1314414.21562 +1320015.87346 +1331130.46606 +1326886.83401 +1333083.13087 +1268109.87504 +1333975.73081 +1318091.94508 +1295047.10499 +1302837.30377 +1319611.92332 +1299296.82304 +1314920.31551 +1298191.97599 +1318097.24996 +1333961.15364 +1318101.34452 +1344805.38367 +1346107.39946 +1316782.71127 +1293762.16657 +1328417.09133 +1318922.42567 +1296416.43484 +1280463.83125 +1311108.58317 +1262515.42984 +1333239.41521 +1346112.53183 +1318091.96938 +1331252.32542 +1336274.58987 +1315376.6749 +1311141.34161 +1262456.44174 +1301672.8558 +1346112.53375 +1318309.46773 +1254860.54473 +1308073.80985 +1314414.21551 +1293346.95026 +1338695.49433 +1322747.75604 +1318717.29962 +1319612.27726 +1303760.11014 +1297850.17562 +1332318.16046 +1332231.20692 +1336274.5953 +1319611.92332 +1332908.31893 +1303155.30858 +1336223.57122 +1296213.28962 +1297548.32402 +1314420.66484 +1322542.89655 +1281618.48081 +1344632.8605 +1262515.43283 +1328417.13652 +1314420.66481 +1328265.70999 +1308074.56738 +1299303.09536 +1336605.87256 +1317772.5863 +1338696.28491 +1345469.98285 +1337044.60956 +1333734.50556 +1344805.38452 +1321566.59288 +1336605.87255 +1328275.16775 +1333975.73081 +1333351.10617 +1338696.28615 +1333975.7122 +1301238.68274 +1328409.42757 +1332908.17424 +1313986.74748 +1336237.7835 +1315379.60535 +1315376.67465 +1303752.54366 +1323368.15728 +1293355.21584 +1293355.21585 diff --git a/code/opt-results/grid/square_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/funcCalls.txt similarity index 54% rename from code/opt-results/grid/square_4.0_northIslandRose/funcCalls.txt rename to code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/funcCalls.txt index 8241271..e8bbf02 100644 --- a/code/opt-results/grid/square_4.0_northIslandRose/funcCalls.txt +++ b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose/funcCalls.txt @@ -1,399 +1,334 @@ -21 -31 -38 -38 -19 -22 -41 -40 -19 +9 +9 +9 +11 +11 +11 +12 +12 +13 +14 15 +15 +16 +16 +16 +16 +16 +17 +17 +17 +18 +18 20 -61 -33 -49 +20 +21 +21 +21 +22 23 -41 -35 23 24 -35 -30 -29 -52 -21 -43 -51 -65 +24 +24 +24 +25 +25 +25 +25 +25 26 -19 -44 -27 -48 -163 -19 -32 -43 -46 -42 -42 -36 26 -18 -38 -31 26 -29 -51 -22 -25 -27 -51 -33 -42 -28 -20 26 -96 -42 27 -31 -26 -60 -511 -40 -48 +27 +27 28 -53 -63 -42 -42 -21 -14 -36 -22 -60 +28 +29 +29 +30 +30 +30 30 -33 -23 -27 -31 -36 -20 -47 -48 -36 -51 30 -29 -60 -37 -40 -35 31 -40 -18 -42 -44 -46 -19 -17 -45 -46 +31 31 32 -13 -44 -30 -130 -30 +33 34 -12 -32 -24 +34 +36 +37 +37 +38 +38 +38 39 -35 -44 -35 -22 -19 -52 -44 -44 -88 -33 -32 41 -33 -20 -40 -31 +41 +42 +45 +46 47 47 -42 -24 +47 +53 +53 +57 +59 +60 +62 +64 +12 +71 +13 +73 +15 +10 +20 +16 +19 17 +88 +24 +21 +27 +89 +15 +19 +11 17 +18 +11 +16 +15 +24 +22 +97 +20 +99 +22 28 -32 +31 20 -40 -36 +24 30 -42 -248 -20 -43 -42 -27 +21 +37 +16 28 -11 +25 +29 +17 +104 27 +40 +107 +21 +25 +21 +22 +17 +110 +45 +36 +47 +23 +42 +32 +33 +12 +21 +120 +122 +54 +39 35 -27 -92 +29 +39 +129 +17 16 -31 -37 -36 -51 -38 -28 -49 -18 -40 -108 -50 -38 +33 +48 +69 +32 38 24 +8 +37 +56 +13 +9 +15 +154 +34 +14 26 -23 -46 -27 -16 -51 -36 21 -18 +17 20 -34 44 28 -43 -37 -40 -65 +21 +101 +9 +96 +24 +99 +18 +171 +122 +39 +12 +101 +17 +22 +23 +22 24 -27 -26 31 +29 +22 +55 +108 25 -43 -28 -26 -27 -96 -39 -56 -39 +53 +110 +32 41 -38 -33 -33 -18 31 -33 -28 -73 -20 +22 21 -33 -30 -26 -24 -33 -16 -90 -31 -52 -34 +112 24 -26 -55 -26 -61 -21 -40 -43 -45 -44 -45 28 -26 +93 35 -50 -47 -24 -32 -58 -25 -20 42 -48 -31 -28 -39 -23 -43 -17 -55 -21 -37 -35 -52 -20 -46 -39 -17 -29 27 -36 -40 -41 29 37 -106 -28 -32 -27 -47 -41 -49 +120 +137 46 23 +27 +22 34 -26 -31 -35 -41 -26 -26 -14 +11 +28 +22 50 -23 -36 -23 36 -22 -35 -51 -30 -31 -38 -17 -32 -35 -49 -34 -48 -35 +57 +135 +9 25 -36 -38 -56 -28 -20 -42 -29 -37 -158 -43 -61 -41 -26 136 -48 -19 +20 18 -50 -74 -25 -45 -29 -23 -12 -48 -24 -13 -23 -49 -17 -50 -29 +136 +120 +14 +40 +149 +46 +159 +14 +81 27 +14 +20 52 +90 +65 +98 43 -38 -37 +9 14 -60 -25 -20 -42 -49 -41 -39 -156 -30 -48 +16 +10 +118 +17 +27 26 +41 15 +69 +39 +141 +14 +25 +16 +121 +25 +9 +39 +92 31 -26 -26 -30 -34 -31 +21 +38 25 -32 -42 -42 -19 +40 +20 48 -16 +47 +32 30 -43 -2420 -34 -35 -38 -41 -44 -50 -23 -46 -17 -18 -58 -13 -13 +32 44 -28 -47 -25 +52 +27 32 -138 -36 -28 -26 +40 +27 +117 18 22 -27 -32 -23 +47 18 +24 +32 +43 +29 +30 +126 27 -28 +13 +39 +29 +12 +26 +26 +34 +122 +41 +55 +79 +26 +70 +155 +23 +54 21 -28 +65 +14 +106 +55 +19 +107 +41 +10 +24 +90 +14 +25 +44 +151 +15 +50 +38 diff --git a/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt new file mode 100644 index 0000000..0ce2682 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPopt.txt @@ -0,0 +1,185 @@ +1287938.884342186 +1280699.2918217694 +1276724.0835068005 +1287454.325429401 +1284182.646300971 +1276724.641344215 +1272289.4872830492 +1284194.0840740295 +1285094.3422781008 +1285094.549587618 +1285339.0427444247 +1281333.4314485746 +1287479.782883568 +1286579.1817265768 +1266900.4143321766 +1284438.7537980767 +1286997.8708513407 +1266900.456785588 +1260581.7337746504 +1287434.1948871687 +1287434.1948812064 +1285378.6714541311 +1280699.297462692 +1285669.312511721 +1284374.9869568506 +1261890.618224317 +1285854.4457891078 +1283495.5923259736 +1284234.8732270643 +1283074.2733984096 +1279462.2163802648 +1266900.4709532736 +1275084.6404211044 +1287479.770849496 +1266881.275056771 +1266900.4552346999 +1278302.08778136 +1278699.1964226204 +1283559.6421630685 +1285378.676789661 +1278238.1916825806 +1262937.183030901 +1262937.2023500344 +1284554.297968688 +1285835.0911802095 +1281018.7394954755 +1281333.4309134996 +1271525.7095369748 +1287459.7348293497 +1291771.7910619904 +1262937.1950738148 +1284549.7704922038 +1285112.8623852308 +1283073.3256382912 +1263631.3349734773 +1274295.054141024 +1283557.922124308 +1278699.1966485945 +1281333.387087616 +1283074.2677807738 +1287434.1947170629 +1283316.5836024277 +1284438.753793872 +1284549.778155728 +1274290.8601783738 +1278317.9638184148 +1271976.4118437166 +1281316.3967056696 +1291783.381245259 +1283079.5915342022 +1281730.3380899897 +1283088.9568775014 +1262992.3957759028 +1280692.550478973 +1287434.1934966666 +1285945.6622431446 +1284011.606314574 +1286579.424032547 +1297001.6340031796 +1285844.378221846 +1282196.8288983307 +1262992.393026811 +1284589.5298058998 +1279744.9734376795 +1258787.494662654 +1283079.5915569728 +1283481.3662383652 +1278453.1701778227 +1278302.1564754439 +1284591.0487158224 +1289236.6805703065 +1284388.188485076 +1287948.3916793505 +1284234.8738866146 +1281495.2936467489 +1279613.4418296444 +1279744.9734376795 +1263631.3601338658 +1297001.5695931758 +1284194.1622128307 +1278452.96722371 +1258245.1022514564 +1279744.9734374979 +1279611.7791225088 +1283088.9571034291 +1284483.4745834714 +1280699.296743772 +1281466.1203165967 +1283481.3825719329 +1290913.052260849 +1281535.6145724552 +1285676.1967343744 +1284549.693323534 +1263637.5999455343 +1283687.5059770665 +1280699.3025573988 +1287459.7943283694 +1283316.5436755184 +1273953.1705194328 +1285676.2012062066 +1279613.4325217959 +1281006.6985314006 +1260581.7311196327 +1279462.2196175624 +1284031.5924249701 +1287479.762087885 +1285807.0227519367 +1284374.9868934385 +1275202.8539685654 +1279611.7289668554 +1285676.214461199 +1286579.4242441345 +1287454.3383410033 +1278417.2196641434 +1290138.032816213 +1287832.3498478536 +1273958.513437056 +1273967.8295140213 +1287931.484735077 +1279739.917480238 +1279613.4369411997 +1281535.6189823572 +1257505.2571811494 +1287833.803882437 +1287931.4307920337 +1292003.6400721918 +1285844.3774430978 +1285669.3726053436 +1278302.1204353257 +1287459.9971540903 +1284554.3085449918 +1285854.446460834 +1262992.3951582944 +1281535.6171040745 +1295535.5496020697 +1281018.753674538 +1284194.079923328 +1286997.8836496356 +1279222.928961996 +1290145.1131573971 +1281010.0816183086 +1287479.7622007167 +1273953.1757947165 +1290145.1156879393 +1278699.1949015772 +1283559.6442842209 +1283073.3751828761 +1285094.5494598679 +1283073.6747561789 +1257505.2567246808 +1280045.8306159007 +1274290.860021432 +1283073.885273462 +1287948.3916793808 +1262937.2032739979 +1278302.1547037198 +1281014.3685711757 +1258798.8441265647 +1262937.1991733268 +1279744.973431502 +1262937.203150522 +1283557.8746765961 +1284537.250320643 +1291771.797715244 +1286579.4240483867 diff --git a/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt new file mode 100644 index 0000000..9ec0958 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/AEPtrue.txt @@ -0,0 +1,185 @@ +1332760.83315 +1321850.81714 +1315700.30516 +1329767.40916 +1322505.64403 +1315700.98163 +1313365.06143 +1322506.62049 +1328865.87687 +1328866.12338 +1323991.11218 +1323025.41954 +1335361.54902 +1326838.76988 +1309166.08598 +1326980.32439 +1333013.7352 +1309176.2224 +1301394.99633 +1329761.15851 +1329761.15851 +1324009.63565 +1321850.82541 +1327906.3605 +1329331.85301 +1302099.83696 +1330188.18434 +1323138.10683 +1329739.53771 +1329058.53436 +1318919.45906 +1309180.50454 +1315945.14221 +1335361.52379 +1309107.05751 +1309179.32223 +1317680.20711 +1317671.84596 +1323377.18039 +1324009.65081 +1317835.55061 +1301134.49049 +1301129.67949 +1320562.58635 +1330176.10146 +1320738.93112 +1323025.41872 +1314597.16396 +1335339.53679 +1331728.04301 +1301127.56101 +1324818.00661 +1328846.1328 +1329061.72569 +1301307.16784 +1315155.91089 +1323383.82299 +1317672.02233 +1323025.38728 +1329054.48747 +1329761.15824 +1327190.79385 +1326980.32438 +1324818.05588 +1315153.41189 +1320669.53927 +1313336.19319 +1323012.82866 +1331741.79259 +1321713.2128 +1322875.25512 +1330046.5397 +1301141.43497 +1321848.45026 +1329761.15633 +1326467.44595 +1323087.83998 +1326875.01335 +1340693.94169 +1324044.11979 +1324939.9923 +1301141.52554 +1321973.562 +1322354.3447 +1300832.00126 +1321713.21282 +1323135.22693 +1321267.91476 +1317684.28862 +1320572.88121 +1332612.68288 +1329317.7728 +1332769.39086 +1329739.53786 +1321568.97731 +1319328.55784 +1322354.3447 +1301306.97372 +1340693.92624 +1322506.72457 +1321267.71034 +1300500.26835 +1322354.3447 +1319338.79556 +1330046.53981 +1326992.80376 +1321850.82408 +1329194.88039 +1331319.27251 +1331828.74351 +1321569.84064 +1327912.30143 +1324817.97238 +1301292.06856 +1322269.31687 +1321850.84061 +1335339.6048 +1327190.74297 +1311856.53982 +1327912.3078 +1319328.55469 +1317817.78746 +1301394.99357 +1318919.4608 +1323114.76028 +1335361.5107 +1324031.79282 +1329331.85292 +1320456.56647 +1319338.71006 +1327912.32595 +1326875.01374 +1329767.42302 +1320061.55944 +1339038.24763 +1328666.26863 +1311947.92874 +1311953.32001 +1332755.10844 +1322356.57941 +1319328.55204 +1321570.2635 +1299373.37747 +1328567.97541 +1332755.05727 +1334048.99134 +1324044.12033 +1327906.44167 +1317682.73181 +1335339.93427 +1320562.97952 +1330188.1854 +1301142.99093 +1321569.89114 +1334099.71132 +1320738.94292 +1322506.61504 +1333013.73798 +1321558.45534 +1339032.86834 +1320736.75711 +1335361.5109 +1311856.27093 +1339032.86979 +1317671.15253 +1323377.18235 +1329025.54916 +1328866.1233 +1329125.66521 +1299371.94969 +1322348.95293 +1315153.71511 +1329073.10792 +1332769.39085 +1301131.55801 +1317683.97468 +1323100.7537 +1301027.60605 +1301135.44782 +1322354.3447 +1301131.02638 +1323383.77312 +1324808.44743 +1331728.04843 +1326875.01338 diff --git a/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt new file mode 100644 index 0000000..5e59ae8 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/grid/square_4.0_northIslandRose_my1/funcCalls.txt @@ -0,0 +1,185 @@ +7 +8 +8 +9 +9 +9 +9 +9 +9 +10 +10 +10 +10 +10 +12 +10 +11 +11 +11 +11 +11 +9 +12 +12 +12 +12 +12 +12 +13 +13 +13 +13 +13 +13 +13 +13 +13 +14 +14 +11 +14 +14 +14 +15 +15 +15 +15 +15 +15 +15 +15 +17 +16 +16 +16 +16 +16 +16 +16 +16 +17 +17 +17 +17 +17 +17 +17 +17 +17 +18 +18 +18 +18 +19 +19 +19 +20 +19 +20 +20 +20 +21 +10 +21 +21 +21 +21 +11 +21 +22 +19 +12 +12 +23 +23 +13 +24 +13 +24 +13 +13 +13 +25 +14 +14 +14 +14 +14 +26 +15 +26 +15 +15 +15 +15 +15 +15 +16 +16 +16 +16 +16 +17 +17 +17 +18 +18 +18 +18 +19 +19 +19 +19 +19 +19 +19 +19 +20 +20 +20 +20 +20 +33 +21 +21 +22 +22 +22 +22 +22 +22 +23 +23 +23 +24 +24 +24 +25 +25 +25 +25 +26 +26 +27 +27 +27 +27 +28 +28 +29 +29 +30 +30 +31 +31 +32 +33 +34 +35 +35 +35 +36 +37 +56 +39 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..210c023 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,145 @@ +1307327.6926631343 +1311662.336757071 +1309963.9157739044 +1299540.0074102562 +1304696.1351559379 +1297582.7255067336 +1314391.2249976734 +1293949.0402559293 +1309955.2120311342 +1310557.9255518198 +1306658.3280507952 +1316000.2277715523 +1310809.9371766003 +1304435.134701684 +1305628.7194802675 +1302983.4604843652 +1298247.049144745 +1299540.0523957491 +1321706.7114587454 +1321381.8626717818 +1305647.8290735092 +1299706.2486218764 +1317306.3689864352 +1317774.9307485 +1305647.8549055958 +1321843.446633551 +1306223.0213511216 +1298173.7639281712 +1305647.6672830621 +1311816.81679103 +1311848.5413259168 +1310120.4218835873 +1305628.7231220468 +1302824.0114002228 +1312006.227306671 +1298246.9098091691 +1311578.2526850102 +1317594.6206020461 +1305628.7210292683 +1299400.3417842095 +1294165.4447619014 +1311858.3976565732 +1296354.7381375819 +1286034.6460922537 +1305628.6515840234 +1310563.0727491074 +1317306.3808002425 +1297876.1353929087 +1305628.7156575928 +1298173.7639664516 +1308674.8145511725 +1302843.4375599404 +1309254.7193368317 +1304593.6115360877 +1321120.0045938098 +1317425.7914599099 +1316648.8247700925 +1279790.424037451 +1317624.9768416632 +1302030.2962976478 +1305628.6991510894 +1312172.9752469824 +1311790.730802119 +1317041.7643624528 +1307495.258064679 +1294888.9400272574 +1310419.741460809 +1302450.5372394416 +1295055.8613280258 +1305899.3630783926 +1311165.0690735274 +1296031.1737272118 +1316410.5646678004 +1299428.7637247632 +1313546.3469870947 +1306095.485466563 +1321119.9540597813 +1320716.5839227762 +1309730.6861294725 +1279789.5540187326 +1312164.6498074718 +1289217.0324679087 +1314390.5712269922 +1321848.6760216402 +1297956.4684298208 +1310421.3289937894 +1317965.368460483 +1295823.8570366476 +1302824.0088161596 +1321069.7511237059 +1299706.2309429406 +1294546.1645838204 +1298246.9091978297 +1294888.94028036 +1310554.914716698 +1304602.184073614 +1309414.967497103 +1311635.1154077672 +1298173.7634870626 +1312179.2272282587 +1305647.7892130956 +1322130.0580124026 +1321848.797831431 +1315568.2452674047 +1302194.758725201 +1321706.0957274404 +1312169.0598774212 +1295975.2448896768 +1310423.7303722263 +1306658.394037457 +1284625.575859106 +1305628.7182256135 +1319137.1927973446 +1291104.5696189695 +1310708.3811357468 +1309007.7066571563 +1298246.901423961 +1291038.4297346 +1292701.7906781216 +1309761.2381976522 +1278441.0844981566 +1316751.8220348873 +1320169.2573020938 +1297018.3911617177 +1299400.225891108 +1319766.1991671075 +1317594.6205519214 +1278454.5131783434 +1309200.7605930488 +1301901.5064749185 +1294596.813334447 +1296397.451170405 +1311867.2115356238 +1296485.3909140767 +1295984.3188937765 +1294449.341398696 +1296397.916559147 +1302969.7027343994 +1311858.4226685155 +1321843.641343222 +1315876.5415368043 +1302983.5539385919 +1296354.755560312 +1302843.3641659766 +1297920.4666347324 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..288b10e --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,145 @@ +1348034.89957 +1347961.22928 +1347457.36011 +1332789.08482 +1340865.15456 +1330653.77046 +1351559.77053 +1324152.32214 +1347444.97425 +1347669.9059 +1343536.35627 +1353909.66772 +1346328.94328 +1335811.56023 +1341708.01794 +1337915.21263 +1324069.15658 +1332789.60357 +1360054.33782 +1359556.57962 +1341951.52202 +1332869.78438 +1354969.70869 +1356963.85059 +1341950.36603 +1360265.71365 +1342962.29029 +1326147.91313 +1341952.61381 +1347646.87308 +1346126.73148 +1344577.97264 +1341707.79775 +1337511.8825 +1345617.56384 +1324059.02672 +1348111.60097 +1356233.3314 +1341708.92874 +1332441.39344 +1320449.22024 +1347591.0365 +1323514.67709 +1308360.37118 +1341709.10353 +1347592.51976 +1354971.42798 +1330893.85027 +1341707.96579 +1326148.04398 +1346055.94963 +1337599.2584 +1342774.06251 +1340937.35494 +1360423.10875 +1357024.53662 +1355016.38991 +1316486.84434 +1354945.17697 +1336407.45261 +1341704.05832 +1347988.79001 +1347450.76701 +1355471.32933 +1344177.41343 +1321953.99545 +1347406.68346 +1336785.2613 +1322643.68037 +1348605.42169 +1346380.061 +1323933.8771 +1352868.63369 +1332505.0506 +1352382.02797 +1343968.73893 +1360420.04918 +1359038.59648 +1346788.41998 +1316476.55056 +1348110.61119 +1316580.1936 +1351560.11319 +1360088.06148 +1323872.58902 +1348414.97754 +1355391.77687 +1323663.21874 +1337511.58678 +1360629.14391 +1332870.1344 +1322327.27248 +1324061.2329 +1321954.03179 +1347540.98475 +1340926.69681 +1342423.07201 +1347344.22808 +1326147.95579 +1346182.93897 +1341953.34495 +1360712.20699 +1360083.92701 +1352396.39856 +1335116.29405 +1360040.14844 +1346201.47111 +1324489.28167 +1348398.89051 +1343531.16779 +1321058.05623 +1341708.17914 +1358532.63275 +1318675.56949 +1346491.8883 +1344771.5665 +1324063.85764 +1318732.65444 +1320401.89462 +1343282.14886 +1312805.99627 +1353114.30211 +1359024.18458 +1323747.98154 +1332432.46078 +1358993.88861 +1356235.23736 +1312940.47202 +1346735.51484 +1344500.23825 +1321884.51965 +1325291.68131 +1346219.14343 +1325378.23173 +1324434.16834 +1321141.41213 +1325383.60205 +1337855.9232 +1347593.30327 +1360264.15241 +1353867.42191 +1337918.04372 +1323512.59544 +1337598.95022 +1324111.66362 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..3f8e431 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,145 @@ +18 +28 +29 +32 +34 +34 +36 +38 +39 +39 +39 +44 +46 +47 +47 +49 +52 +52 +53 +54 +55 +56 +56 +58 +59 +61 +63 +64 +65 +67 +70 +70 +72 +75 +76 +78 +78 +79 +80 +80 +82 +84 +84 +88 +90 +92 +94 +98 +101 +108 +108 +111 +113 +114 +118 +120 +43 +35 +130 +133 +45 +135 +137 +138 +136 +44 +144 +145 +156 +152 +50 +153 +153 +54 +156 +156 +159 +64 +96 +31 +168 +38 +61 +51 +65 +94 +65 +84 +77 +184 +54 +62 +61 +67 +30 +44 +193 +193 +82 +55 +66 +201 +76 +210 +210 +26 +43 +224 +141 +81 +31 +51 +245 +61 +34 +246 +249 +165 +56 +52 +29 +252 +58 +163 +59 +265 +45 +24 +163 +82 +55 +109 +191 +158 +188 +53 +61 +130 +100 +80 +62 +139 +100 +131 +315 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt new file mode 100644 index 0000000..37dad6b --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPopt.txt @@ -0,0 +1,128 @@ +1409863.9131496556 +1388337.1786893134 +1410350.9246905264 +1375747.0375830722 +1416280.4054812521 +1416658.7855007292 +1355061.920738095 +1368502.443056428 +1405481.4260442485 +1374722.1056013505 +1390080.0431212892 +1408633.6266692113 +1411990.3756938553 +1376229.3252011966 +1377931.2494974737 +1410361.3348590136 +1391617.0424469016 +1415283.5225534232 +1398097.7645919584 +1416071.865530771 +1415249.6147199513 +1372443.6342467156 +1403434.648291782 +1415016.6400948502 +1397867.5894873824 +1386049.1980978008 +1415776.4508156364 +1410110.023998349 +1415747.4712207925 +1410362.2097515925 +1415037.1033344676 +1377935.6239413323 +1377931.5551788642 +1417439.4876242485 +1415703.899269185 +1412127.118393274 +1378606.5426244244 +1415703.8326056162 +1415283.8668314554 +1415664.7720158359 +1413316.7534290776 +1412474.6113351712 +1413900.2502541 +1413317.1240363892 +1392475.6558990115 +1391861.5914640178 +1372656.912155319 +1412579.7824642637 +1387744.2500054822 +1416664.8677973072 +1392333.2537752804 +1415655.2501665708 +1416644.0391303203 +1413924.1075019094 +1375210.6713662392 +1414112.9040439425 +1392649.0114528153 +1403434.5934665748 +1413506.3600650982 +1408323.8232874158 +1386162.8258407803 +1414155.7195324993 +1391146.4466560853 +1413205.9648773838 +1377339.7042514894 +1416222.2980561275 +1416279.6705737696 +1375207.2501192677 +1370357.91409432 +1388843.684264978 +1384405.4399983156 +1385689.6973836538 +1397050.467951394 +1377806.9984252425 +1388870.1428149175 +1413939.6412310721 +1414155.7195879146 +1413298.3499530135 +1410730.7866475924 +1388828.5040499908 +1413939.715822517 +1368154.0482501097 +1413885.2856304897 +1384405.4384087329 +1415302.7765847216 +1392649.0702973667 +1385561.3728955225 +1414194.1858720232 +1413939.681815158 +1372676.8359264259 +1396369.6228253774 +1385673.8536681635 +1370508.0570050837 +1377343.1390031814 +1406511.992355033 +1415044.9606997548 +1414988.4859167791 +1377317.4629336286 +1391861.571317638 +1391808.6222055112 +1416356.2321516988 +1385369.4661780233 +1396380.8605381174 +1392478.32702922 +1370437.0117096528 +1415285.3170392106 +1392955.307883314 +1413309.2405985359 +1370437.2846918807 +1386686.0078985826 +1416284.682101985 +1377339.704923517 +1410362.1923188546 +1413317.107226112 +1415651.068519934 +1376786.498044068 +1415037.1922881058 +1391861.6116462327 +1413511.969290024 +1408555.7562482934 +1389070.7507251508 +1410110.8551001693 +1377935.6205482578 +1396380.8606687023 +1379907.4359740966 +1415740.4450353319 +1415585.1814775942 +1408106.260005491 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt new file mode 100644 index 0000000..fbe55a5 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/AEPtrue.txt @@ -0,0 +1,128 @@ +1467306.36592 +1433555.22671 +1467997.88861 +1419767.38567 +1473656.6637 +1474659.63653 +1402071.83387 +1406407.29202 +1460697.41191 +1416847.98422 +1439310.39528 +1462541.28672 +1470254.18269 +1416134.08932 +1419945.83655 +1468073.90443 +1441607.14664 +1472869.33682 +1450340.31793 +1472336.66468 +1472768.66476 +1414007.73694 +1463738.84467 +1473367.395 +1459773.93665 +1430173.43224 +1474032.97677 +1467871.25697 +1473252.15221 +1468068.14418 +1473312.00069 +1419691.39724 +1419910.49421 +1473661.54548 +1473315.65312 +1471462.22248 +1420722.51544 +1473316.47145 +1472873.2352 +1474646.8935 +1471588.4119 +1469400.96157 +1471439.60816 +1471590.15919 +1442536.69656 +1436594.90564 +1413352.91227 +1472048.45193 +1435786.45478 +1473260.80496 +1442192.43445 +1473570.35852 +1473204.73246 +1471324.60524 +1416476.34488 +1471919.0473 +1438072.18153 +1463738.86654 +1472019.73055 +1462459.32434 +1431071.09473 +1471580.8433 +1438440.02713 +1471950.94934 +1419337.1184 +1472442.68884 +1473924.96623 +1416554.30748 +1408012.80174 +1435142.83214 +1431052.81853 +1430982.5664 +1447077.76863 +1419580.58678 +1442928.82494 +1471213.93655 +1471580.71599 +1471909.07853 +1464889.16527 +1435270.08206 +1471219.71085 +1406152.2621 +1472725.57531 +1431051.93642 +1471695.78121 +1438065.24694 +1430629.30814 +1472222.83627 +1471220.23627 +1413555.412 +1446661.55993 +1431389.9775 +1408123.73311 +1419392.44579 +1461008.84807 +1473884.78113 +1473110.52934 +1419502.76857 +1436599.50537 +1441591.63975 +1474604.92257 +1429587.17656 +1446661.85536 +1442520.34831 +1408347.95164 +1472885.62317 +1438421.3601 +1470822.09544 +1408363.22724 +1431005.22983 +1473727.19711 +1419334.30723 +1468070.05831 +1471594.05073 +1472854.37655 +1417822.06831 +1473310.82724 +1436597.68109 +1471259.02484 +1463369.95305 +1435514.00183 +1467851.81919 +1419693.28906 +1446662.01751 +1423291.53719 +1474391.05512 +1474199.99537 +1465387.20481 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt new file mode 100644 index 0000000..2e1df2a --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_ukiahRose/funcCalls.txt @@ -0,0 +1,128 @@ +24 +32 +34 +34 +37 +37 +38 +40 +57 +45 +45 +47 +48 +49 +50 +50 +51 +54 +56 +56 +57 +57 +58 +61 +62 +64 +65 +67 +69 +69 +69 +70 +72 +72 +76 +77 +77 +79 +79 +81 +83 +92 +93 +97 +113 +116 +117 +124 +123 +126 +127 +128 +47 +131 +134 +134 +139 +44 +145 +143 +144 +146 +147 +150 +151 +160 +55 +162 +67 +168 +49 +50 +173 +179 +49 +73 +182 +52 +183 +90 +102 +44 +187 +66 +58 +196 +203 +102 +111 +119 +53 +129 +64 +125 +115 +40 +174 +130 +241 +141 +79 +125 +248 +254 +143 +136 +47 +150 +46 +104 +42 +105 +53 +91 +204 +296 +58 +70 +158 +211 +305 +44 +76 +127 +210 +98 +150 +39 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt new file mode 100644 index 0000000..1ca6e8e --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPopt.txt @@ -0,0 +1,108 @@ +1485871.7580895342 +1487370.8976715978 +1497379.8025684557 +1485972.0104565169 +1469259.483333686 +1493313.1468177268 +1480069.717508436 +1468461.8170913572 +1468461.6106221299 +1485727.798366767 +1495768.4460471703 +1497851.0585714146 +1492092.0416066202 +1492866.0587894272 +1498082.258298188 +1465855.2718731654 +1495553.9343427853 +1468645.390610795 +1465855.2710406461 +1481966.7227391822 +1495440.8736738407 +1497067.07782094 +1491548.291522581 +1498899.2947109619 +1487970.5528588388 +1495095.4252448385 +1492812.0381152604 +1495553.9350488854 +1471673.2761244792 +1468318.139967611 +1465934.4979556587 +1496246.1467061008 +1477332.347177573 +1481427.823525103 +1466144.1667310772 +1468453.9152630218 +1478724.8157106736 +1471344.3360892972 +1466676.2562446527 +1496677.5595267115 +1474807.5811536214 +1468450.9626607252 +1492640.6591443531 +1496515.0767122451 +1488122.8178558815 +1487645.01012405 +1468318.417724322 +1491310.9700267664 +1466608.7912140377 +1475742.7967310338 +1468318.8919049227 +1474807.7102764738 +1492090.8768907744 +1465855.2727174542 +1468295.7004880728 +1471430.1472974534 +1471430.147319075 +1489571.2501800214 +1468716.5883387672 +1486425.2683436421 +1468461.7694762577 +1465780.1371362288 +1474807.8106113079 +1470893.5423505148 +1488688.9883547837 +1474627.647932513 +1486409.17692717 +1488080.6103838158 +1479628.3373776725 +1474249.2386590103 +1485064.5053878715 +1479628.6553303525 +1484063.2652118565 +1471392.2994079078 +1489745.1447873118 +1481430.774585079 +1491602.102370359 +1468461.819651171 +1471182.01149405 +1498899.2925417188 +1468205.0039766405 +1468194.5100227518 +1494016.251647594 +1471344.3355389491 +1491479.843665744 +1498899.2727564715 +1474623.9490897327 +1476039.10081572 +1488060.926649917 +1465845.092904751 +1471344.3362023865 +1489629.2667206996 +1487791.5454061937 +1498898.9489753356 +1465855.2728963555 +1488022.7252869825 +1489747.0772315601 +1494079.374854169 +1496320.1927625854 +1488404.3341795478 +1495553.9133073613 +1488127.5823513074 +1488193.8218188493 +1487824.0337018308 +1488060.7475104376 +1477653.3460885799 +1496277.0398481162 +1484877.3807312076 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt new file mode 100644 index 0000000..6680239 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/AEPtrue.txt @@ -0,0 +1,108 @@ +1548663.28839 +1550533.57771 +1563985.97919 +1548860.29422 +1525276.99345 +1560769.08929 +1540937.32725 +1522160.89357 +1522170.03152 +1547943.58454 +1562129.883 +1563633.12951 +1558426.651 +1560558.4614 +1562322.77681 +1518904.83054 +1561820.18943 +1523991.62873 +1518904.84698 +1544169.37398 +1561529.00727 +1563527.47883 +1558208.90647 +1562935.87518 +1549565.85497 +1561553.74719 +1560278.89229 +1561821.54366 +1532602.80871 +1522834.83888 +1518903.64712 +1562835.59765 +1539579.68652 +1539843.5027 +1519252.16933 +1523073.14032 +1542665.90124 +1525856.67155 +1520577.20649 +1564138.02158 +1531968.24412 +1523092.94053 +1558286.43354 +1563327.64901 +1549557.93322 +1548858.43231 +1522842.46271 +1559396.08922 +1520499.759 +1533967.33062 +1522622.21585 +1531968.41285 +1558460.83649 +1518904.49219 +1522074.57282 +1526195.99122 +1526195.73319 +1545885.71006 +1524069.02107 +1543141.4294 +1522162.16768 +1521184.86849 +1531968.54451 +1525928.41028 +1553948.95091 +1532850.92024 +1543271.77044 +1549333.0955 +1543817.15322 +1533119.04567 +1541094.45276 +1543802.29446 +1542774.92492 +1526279.88903 +1545449.66747 +1539820.17615 +1561700.60278 +1522160.19723 +1533506.92496 +1562936.46015 +1521186.19487 +1520980.86933 +1560378.64108 +1525857.14186 +1558006.98753 +1562936.40854 +1532834.81421 +1534670.09093 +1549195.94686 +1518936.33904 +1525856.6925 +1544716.24118 +1549610.43283 +1562945.15474 +1518904.58231 +1546620.22317 +1545418.64839 +1560515.96016 +1561395.33991 +1554954.89156 +1561825.01785 +1549481.24568 +1549526.37479 +1549072.07227 +1549193.10063 +1541584.37026 +1562643.2564 +1547337.50583 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt new file mode 100644 index 0000000..080142f --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_4.0_victorvilleRose/funcCalls.txt @@ -0,0 +1,108 @@ +24 +28 +29 +37 +37 +41 +43 +44 +44 +45 +53 +53 +56 +57 +58 +59 +60 +62 +63 +63 +72 +73 +46 +82 +87 +88 +92 +100 +112 +115 +121 +124 +127 +127 +129 +133 +40 +135 +135 +136 +138 +139 +144 +50 +148 +148 +149 +44 +155 +154 +158 +158 +82 +49 +165 +170 +170 +178 +74 +182 +182 +186 +102 +192 +105 +198 +207 +210 +76 +215 +219 +18 +83 +227 +132 +229 +127 +47 +239 +45 +70 +70 +139 +39 +132 +259 +258 +188 +266 +143 +79 +275 +104 +125 +59 +92 +285 +288 +187 +291 +292 +160 +129 +159 +119 +39 +172 +104 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..2784009 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPopt.txt @@ -0,0 +1,216 @@ +1438066.6154642846 +1435336.7820191982 +1423519.6843713422 +1439719.9463182664 +1439467.4428366749 +1435164.1164964407 +1428087.2979984735 +1440338.4504968703 +1439317.4930025453 +1446241.479769181 +1427831.1280170938 +1420318.4593037774 +1429458.6892251535 +1446658.1250180271 +1434257.4368542696 +1415456.7692177612 +1427833.8589781588 +1433231.0166527862 +1440651.4889983807 +1446304.9558507656 +1433738.341595135 +1438532.7037940691 +1427239.7682677524 +1437391.7602395555 +1440298.4386645393 +1447893.613673995 +1428740.749678513 +1426381.209808996 +1425443.2296103882 +1435363.8711371366 +1441164.4404963139 +1423224.8897132818 +1437083.5885232682 +1446181.2576879554 +1426315.4016530914 +1444167.5528071849 +1439023.636327138 +1433760.428307435 +1427050.5458858742 +1437379.5923802862 +1428850.5955524114 +1422896.1331823724 +1433038.9651571605 +1427722.1632800284 +1425149.936253211 +1426524.3527882393 +1442734.1719184902 +1426238.1599405427 +1446658.7596192176 +1440056.5900812983 +1439122.3149856543 +1434456.7955735112 +1439240.5916877086 +1446638.7410461316 +1429606.3098321268 +1430012.8108413015 +1440380.6542825145 +1447662.353458021 +1428844.315904211 +1428854.8803509225 +1447584.782959934 +1418599.1347112968 +1428762.6442171715 +1428669.4084375096 +1434075.5760688006 +1428704.0244820134 +1446416.4933812418 +1424823.659293259 +1435136.2274077304 +1437748.3817377228 +1425495.2035762037 +1439649.5843651947 +1446638.9301546575 +1446396.2338018133 +1427700.5024469972 +1437319.1809118392 +1437395.5720922572 +1447282.7857265465 +1429994.2661099853 +1447706.5533239369 +1437707.4935464407 +1439248.5313245638 +1440181.2531381475 +1442384.7706630623 +1436829.9208254055 +1428739.1532623034 +1426515.6202681065 +1426835.9624076693 +1439182.5043871228 +1437417.4350360134 +1436998.7939748657 +1447939.702717834 +1441086.817794954 +1426333.7425112417 +1431985.6822413974 +1440186.6087686464 +1423488.9664835988 +1435109.112196242 +1437383.6909209217 +1429848.5200671998 +1435884.2695753223 +1434409.3335476632 +1439152.6946682082 +1434856.7129420976 +1440952.325355818 +1446144.2776234485 +1426409.9047727268 +1447725.662063764 +1447468.6763026991 +1428704.5920488057 +1440726.035505261 +1438958.9616470702 +1426625.8138918714 +1437318.2440552474 +1423480.7608405293 +1445805.9632132677 +1417766.1258731366 +1429192.545460369 +1439003.784692442 +1443016.8363139979 +1425493.3051011376 +1436089.6069732662 +1437807.263609016 +1428670.4657056457 +1435137.997202877 +1447940.8880463727 +1446569.6655012073 +1437290.2510621648 +1441734.8110408515 +1425136.308595417 +1431330.1836339089 +1442384.3200267828 +1435284.3122363747 +1439493.1181775236 +1436112.1448990772 +1424911.9295055869 +1429246.7813616209 +1426538.8637368393 +1428761.22683127 +1440288.034330594 +1447282.2962897725 +1434915.7434097864 +1446865.4513984967 +1426149.2380145013 +1445886.343297216 +1432295.870091512 +1425196.404715374 +1437290.2309934376 +1428678.6965195534 +1445828.4357483226 +1437484.854010071 +1433758.377168376 +1447282.1196989154 +1425662.7569643308 +1423551.907499748 +1447055.2395629727 +1426737.935941749 +1428208.3621581178 +1446640.044614877 +1433038.7478642506 +1418122.955898482 +1445788.5992466197 +1446649.063980858 +1448211.6825713024 +1446147.9847285778 +1424587.36599626 +1419644.5279561712 +1429032.6235754138 +1433759.5329877152 +1431985.7104246074 +1445234.7413814666 +1431776.5542774703 +1419943.9731439154 +1431927.083831776 +1446572.1330382593 +1439323.0838757597 +1434206.1758976246 +1447904.1725480356 +1441811.3599783846 +1428670.1300268283 +1439897.905794222 +1443264.0842967688 +1439159.4308758166 +1442592.642897306 +1439491.7530879618 +1436977.4638571306 +1439822.9837913697 +1421026.5072057822 +1439286.0225391875 +1429026.969439579 +1429876.9401384206 +1427412.5521020573 +1437246.5682411368 +1441615.3186900984 +1428704.5325912663 +1446658.9306226822 +1442734.2696341772 +1426738.0008960182 +1440977.2720364742 +1446571.631897763 +1435141.3771609005 +1447219.3003948315 +1445745.461323892 +1428703.9796963662 +1440963.3506078308 +1435670.4738141156 +1447189.7241396238 +1434020.3318238077 +1432675.7439695175 +1429198.0119917537 +1440290.2102408193 +1444071.0516015259 +1429792.8506214123 +1439197.155361252 +1425877.2158901969 +1415620.3037014245 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..c84204f --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,216 @@ +1466661.4433 +1463981.15529 +1450878.16839 +1467962.58337 +1467011.66878 +1463398.28019 +1456705.74908 +1467906.07169 +1465840.07714 +1473250.29254 +1452977.61945 +1445488.12844 +1455608.09314 +1474278.17659 +1460900.13866 +1440669.08816 +1453098.35476 +1460082.57934 +1467594.89118 +1475289.49887 +1461836.78869 +1466072.9096 +1453061.07941 +1465401.12886 +1468572.38092 +1475519.11985 +1456840.84223 +1455458.93404 +1451419.06717 +1463959.40921 +1470102.00102 +1448834.49332 +1465257.13305 +1472803.50863 +1455078.60699 +1471618.07484 +1466124.69177 +1462198.65925 +1453770.41226 +1465321.68377 +1454689.46921 +1449296.42194 +1461487.42876 +1452448.94624 +1452698.09547 +1453033.25394 +1470006.4861 +1453216.71347 +1474272.03928 +1466487.07811 +1465895.59279 +1463458.41944 +1467112.11491 +1474164.45528 +1455406.55633 +1455976.3341 +1467473.46788 +1474462.55684 +1454837.20108 +1454588.97816 +1474649.8653 +1443518.32984 +1454899.08177 +1454346.03227 +1462211.48742 +1454462.80562 +1474080.93814 +1451013.41293 +1463578.01703 +1465198.7877 +1452829.46423 +1466396.5453 +1473716.35448 +1473138.60199 +1454072.35022 +1465374.72064 +1465113.73062 +1474275.92124 +1456060.95286 +1475450.11816 +1464577.68681 +1466870.30579 +1468241.36664 +1468969.98508 +1465328.51163 +1453711.82589 +1452611.84951 +1453371.87125 +1469273.56441 +1465395.16491 +1465218.26266 +1475491.96177 +1467825.33147 +1454742.89909 +1460430.33384 +1467046.75177 +1448971.09702 +1463911.27637 +1465317.70006 +1455475.40676 +1464549.02454 +1463411.37898 +1467147.64449 +1463734.74095 +1467720.32306 +1473500.38111 +1451319.48929 +1474554.82208 +1474401.3192 +1454468.51389 +1468062.90969 +1468800.79754 +1453152.90692 +1465392.27676 +1448845.0337 +1474459.86906 +1443671.54726 +1455324.29615 +1466811.56077 +1470437.08561 +1452789.79589 +1463908.38258 +1465362.04523 +1456972.20322 +1463576.57759 +1475497.39885 +1473753.21952 +1465040.77489 +1469119.03801 +1451653.45399 +1459887.0728 +1468974.93048 +1463495.68448 +1466307.6263 +1463824.77253 +1449670.10796 +1456866.86646 +1452645.62596 +1454488.37881 +1468246.82523 +1474272.73858 +1463752.13001 +1474324.50231 +1453854.43263 +1474027.28748 +1461900.71829 +1452497.42729 +1465579.86608 +1453858.66311 +1473057.55769 +1465420.75042 +1462188.44603 +1474260.67925 +1452360.04861 +1451073.85559 +1473736.70414 +1454566.46767 +1453497.49539 +1474045.19925 +1461475.56221 +1444342.36663 +1473656.41512 +1474061.54417 +1475240.24182 +1473197.95053 +1453444.77766 +1448719.8363 +1455505.34893 +1462202.63228 +1460427.7357 +1473004.02634 +1461098.94551 +1448817.961 +1461797.28569 +1473740.03431 +1467059.8826 +1462178.25484 +1475466.23629 +1468944.37607 +1454371.53879 +1467653.41976 +1472599.67388 +1467266.07325 +1469844.21819 +1466324.8065 +1464971.82096 +1468479.88469 +1445388.08262 +1466942.43856 +1455535.04579 +1458477.49563 +1454193.88524 +1465009.02665 +1469484.61299 +1454467.71375 +1474281.37334 +1470013.78325 +1454569.12632 +1467634.82678 +1473743.78612 +1463584.74167 +1474359.71557 +1474701.85296 +1454462.52733 +1468153.44534 +1464751.45586 +1474082.37057 +1462834.07733 +1460996.84658 +1456711.44787 +1467821.29946 +1471501.68055 +1455452.57295 +1466989.59126 +1453904.29097 +1440663.71514 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..e42a7df --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_6.0_northIslandRose/funcCalls.txt @@ -0,0 +1,216 @@ +14 +18 +18 +19 +20 +21 +23 +23 +27 +29 +26 +30 +35 +35 +36 +37 +38 +39 +39 +40 +40 +41 +44 +45 +46 +46 +48 +49 +50 +51 +51 +52 +53 +55 +55 +55 +58 +58 +58 +58 +62 +62 +62 +63 +64 +65 +65 +68 +68 +69 +69 +68 +70 +70 +72 +73 +73 +77 +77 +77 +77 +80 +81 +82 +86 +88 +88 +93 +93 +93 +95 +102 +106 +109 +109 +108 +109 +110 +49 +115 +115 +30 +46 +74 +30 +124 +55 +49 +27 +43 +31 +32 +33 +58 +40 +56 +140 +143 +30 +36 +33 +29 +41 +42 +56 +153 +64 +45 +52 +86 +55 +39 +46 +91 +162 +26 +162 +96 +60 +65 +45 +52 +61 +104 +31 +47 +37 +66 +64 +58 +89 +74 +37 +50 +66 +57 +46 +99 +99 +71 +78 +38 +73 +80 +77 +39 +75 +22 +49 +137 +23 +54 +38 +59 +52 +55 +125 +49 +61 +52 +105 +75 +229 +37 +112 +150 +22 +44 +41 +96 +47 +44 +45 +151 +42 +44 +98 +64 +83 +48 +24 +28 +55 +115 +53 +267 +40 +55 +59 +158 +32 +58 +54 +280 +61 +94 +51 +79 +70 +32 +83 +122 +48 +79 +73 +35 +94 +35 +63 +84 +26 +57 +48 +44 +50 +39 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..c0bf1b8 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPopt.txt @@ -0,0 +1,283 @@ +1493177.7015159833 +1498335.9002587784 +1482930.6916914827 +1494294.5973610294 +1489389.6530351536 +1497664.9667578642 +1487925.0837133364 +1482001.6802894087 +1493360.0790387646 +1485379.42403259 +1499361.176513183 +1506651.7825755035 +1484030.976122997 +1495459.9915797259 +1486314.7539031904 +1491782.0339442529 +1498967.2570296163 +1497103.374663175 +1506630.244769005 +1488610.6896037685 +1497345.324823592 +1488481.0536835839 +1480302.7411041136 +1495673.9570735833 +1494544.31052356 +1502060.150157965 +1496608.1638352128 +1489551.9210886706 +1482536.8628349171 +1498688.421392781 +1486813.192295795 +1484060.55841591 +1498431.0280997516 +1496661.8945148194 +1489151.4218043815 +1493314.9295159199 +1495217.4903332447 +1495006.65017125 +1495530.890031431 +1501485.7554489356 +1506833.071098384 +1488827.199898604 +1497736.491315346 +1487982.4767138176 +1489360.8158599166 +1490921.951117178 +1494746.1023492012 +1492920.8741533165 +1505830.3478960467 +1498567.0958349884 +1501486.086736023 +1491562.1287481198 +1506760.7300091733 +1484413.0580178173 +1486158.916306258 +1504997.490263335 +1499626.4358632008 +1505593.5130699323 +1493806.3344102178 +1505830.7991805691 +1488990.082091265 +1492425.1378020027 +1495987.4531613474 +1506364.5358095649 +1500251.64248874 +1502623.7418039783 +1489509.3490418212 +1490976.7236399406 +1492920.946872803 +1491649.6827389812 +1498594.3109702442 +1500769.516418427 +1499695.5396554025 +1490607.6038440336 +1505347.3555019682 +1507076.2508215704 +1506155.4565899994 +1483856.6669429361 +1498654.0691765104 +1506157.8849037774 +1490941.3666065158 +1506537.6624301977 +1506305.4171788604 +1498525.915469084 +1505360.1437721704 +1499487.3063541607 +1506142.9543377592 +1486734.4391920785 +1501850.4914175328 +1502439.4636052055 +1499366.9388896287 +1490403.6663103267 +1498540.6790687281 +1500139.201032597 +1496361.6557050878 +1490932.199896328 +1500661.5400909795 +1486625.6445326544 +1491478.0893830506 +1484067.6947817705 +1490853.0501333221 +1490118.680058748 +1482568.6343842628 +1496166.5004218013 +1497353.2432703439 +1491967.391316233 +1494416.4424560997 +1488962.3332998464 +1496212.36195768 +1495304.746533854 +1500102.1838641774 +1491287.416917533 +1490623.8914300431 +1506833.182282739 +1503090.9709595947 +1505550.9893834884 +1499776.3328173002 +1484197.0775114722 +1505101.861881745 +1487483.438435734 +1499515.485352328 +1491273.5056311456 +1501638.6724635093 +1487144.543411533 +1496145.1190169416 +1482679.1506148144 +1505912.4993623046 +1486161.6196112402 +1501469.3535080587 +1486845.8610075172 +1486756.9310841486 +1488717.5848886091 +1496181.0026368005 +1488797.2176816086 +1494060.805268314 +1486238.3830747379 +1487053.3352604317 +1498929.9041905296 +1499173.8585800903 +1484379.328066809 +1499516.0702265678 +1500033.7204761978 +1493259.0231747222 +1504877.0487026311 +1500582.3769672066 +1486659.209980644 +1486170.7491343636 +1493160.408218862 +1494962.3835224733 +1505809.8891006697 +1494468.6778272926 +1484445.4549686313 +1486207.1126049403 +1486655.6079822588 +1499676.696908386 +1505452.882524737 +1506143.562773461 +1502428.509049578 +1490147.9470913706 +1486250.9659170555 +1486318.9350214817 +1489866.1381326003 +1499586.9420598622 +1504662.3887739142 +1488962.703702528 +1498609.6837807703 +1488774.7027282529 +1505773.173049149 +1506337.7970410753 +1494773.032525936 +1506371.7824764745 +1505047.8972781627 +1491325.517845753 +1499672.2505544955 +1503311.8101180522 +1494053.5198839738 +1502403.8803692334 +1490106.9078493572 +1502860.7025270897 +1489353.968359348 +1499390.4300066368 +1505666.7385763803 +1497583.780126706 +1493687.9433843475 +1498659.5820881487 +1485080.5990415008 +1498599.0640896298 +1497934.5285344135 +1506290.4927723694 +1488989.7655745903 +1507084.4308789745 +1506120.7336726238 +1503981.489480612 +1494075.1758767678 +1506974.0698552586 +1497979.933728912 +1492497.8304225786 +1496419.6840660244 +1488590.8340847425 +1498498.1372227448 +1495603.4240629468 +1499247.3995643747 +1488942.4473405392 +1490289.5553074037 +1490185.191347437 +1493676.262774717 +1494128.697707567 +1494981.273518938 +1491326.884055996 +1500753.008723349 +1499481.438952238 +1491125.052191887 +1483778.2755935048 +1504291.1484936252 +1498710.7344852646 +1494751.7643223559 +1492294.5556906217 +1493023.99105922 +1494624.9083865616 +1491255.358487576 +1498437.476648291 +1500576.575168631 +1495197.9622728506 +1491043.3228298677 +1483878.933756729 +1483490.8893300688 +1487436.247201088 +1493862.214191934 +1486642.6113026945 +1505490.3226025244 +1506342.3056526787 +1495731.0517095977 +1491782.569473688 +1504869.8483369078 +1505276.882935368 +1501711.4534854167 +1491692.0985791434 +1504469.866862411 +1507102.362118805 +1481952.6210031016 +1488855.2844325681 +1494239.8536457943 +1498648.6789781787 +1482862.159809072 +1477635.9642719463 +1501687.1170774298 +1495471.5021145963 +1478718.3348676534 +1501564.0619987908 +1499382.326067631 +1505051.0688091544 +1498525.9243569344 +1497261.6144294364 +1491323.371219192 +1483993.4348672759 +1489411.5118933883 +1500322.6774002728 +1505064.3778607782 +1495278.7079664788 +1498656.6995955822 +1506113.152676446 +1495108.717160222 +1507193.8442543126 +1506844.3873729191 +1506964.7217501453 +1496115.4856513343 +1489137.6958688856 +1490477.1161646317 +1498023.9105262356 +1505544.8740218529 +1489430.8240319854 +1488990.4103441492 +1493743.9303654872 +1498634.3389664365 +1479846.0630832196 +1490717.543620994 +1493958.4434047884 +1491066.4356001175 +1483527.696666684 +1489148.622457852 +1506563.7581200318 +1496013.9671904428 +1496375.9095621663 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..64b8c63 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,283 @@ +1513586.11863 +1517787.97989 +1503614.10512 +1513460.67689 +1509255.08295 +1518153.28169 +1509671.37352 +1502627.4095 +1511449.08232 +1504148.91238 +1517824.80252 +1523915.45298 +1504581.24919 +1515712.92494 +1506936.71755 +1512542.0432 +1517754.6137 +1516306.97313 +1524311.50938 +1508190.52428 +1518137.41616 +1508014.37428 +1500547.17791 +1514985.72348 +1514456.99165 +1522076.73824 +1516235.45163 +1509582.93262 +1503929.03849 +1520208.0233 +1508396.68562 +1503735.19572 +1519148.99491 +1516340.85241 +1508608.03898 +1513328.80971 +1515135.07674 +1514581.33557 +1515436.57045 +1519167.25893 +1524358.24114 +1508416.96629 +1517242.70988 +1509547.56224 +1508743.0713 +1509463.73047 +1514356.91717 +1510975.02744 +1522894.98279 +1517832.14986 +1519170.1733 +1509895.2007 +1524274.49629 +1504651.57661 +1507097.4156 +1522896.96438 +1518098.87776 +1523350.65972 +1522886.92811 +1513937.45746 +1508690.26383 +1510628.96031 +1515307.42769 +1523422.93351 +1518288.74873 +1522732.60901 +1508956.72306 +1508858.24816 +1510974.76399 +1509868.22968 +1517382.39519 +1519397.36499 +1517377.43285 +1509349.94192 +1523324.85995 +1523995.82856 +1523599.08057 +1503440.12775 +1516894.78052 +1522571.25256 +1509337.75162 +1523982.47949 +1523585.77091 +1516818.08826 +1523329.89803 +1517066.56776 +1523296.07654 +1507008.68401 +1520455.59376 +1520414.21683 +1517937.21253 +1508585.12987 +1517735.14892 +1519023.46515 +1516318.97596 +1509326.49636 +1519001.16454 +1507164.2884 +1509587.46498 +1503050.45138 +1511275.27413 +1511470.89491 +1503733.25988 +1517273.23946 +1517980.76632 +1511758.34434 +1514704.91431 +1508693.05587 +1515418.53244 +1514009.13788 +1519641.03013 +1509667.09817 +1508900.34396 +1523705.94769 +1521357.17655 +1522954.18285 +1519176.94492 +1505035.56685 +1523273.67781 +1509126.5463 +1517470.89071 +1509795.55267 +1520651.3881 +1508451.86052 +1515644.28138 +1503252.13659 +1523739.81175 +1508500.51476 +1519811.14791 +1506459.47568 +1508067.38544 +1508630.05561 +1515041.11657 +1508274.17911 +1512820.19449 +1505442.10463 +1507476.18088 +1517455.6214 +1520100.30994 +1502957.69476 +1518051.37353 +1518231.22499 +1513106.92154 +1522524.8468 +1519427.57661 +1507440.85202 +1505724.52452 +1514109.64946 +1515435.48513 +1523479.23452 +1513252.85319 +1504550.37228 +1507727.7039 +1507540.14231 +1518187.72166 +1523068.73814 +1523290.36425 +1520140.87558 +1509668.65682 +1506120.85535 +1505719.99425 +1508995.43411 +1517584.62162 +1523840.92615 +1507763.91483 +1516986.96986 +1510456.99678 +1523236.06607 +1523513.12627 +1515286.7093 +1523459.30736 +1523389.82954 +1510229.53411 +1519307.04623 +1522232.74264 +1513338.64392 +1519793.6685 +1508895.9216 +1520683.18093 +1509058.79653 +1517429.55786 +1523665.92272 +1516917.91949 +1512836.98596 +1517849.43473 +1503809.83905 +1519030.01606 +1517388.33945 +1523307.99906 +1508690.82798 +1523959.07136 +1522497.67585 +1522493.71773 +1514486.88433 +1524343.44972 +1516801.20215 +1511067.66837 +1515232.6541 +1509899.60217 +1517683.98933 +1513726.47454 +1519517.17029 +1508520.24613 +1511103.33688 +1509712.68646 +1515004.86555 +1513928.27923 +1514952.52984 +1509496.18822 +1519348.00643 +1517680.40282 +1511359.25264 +1503327.66954 +1522161.00379 +1517150.12405 +1514336.69914 +1510900.62249 +1513486.80976 +1514236.6347 +1509588.41943 +1517311.48014 +1519455.85649 +1515574.44589 +1510046.02967 +1503414.05069 +1503749.56744 +1505694.24628 +1514136.55198 +1506857.25364 +1523079.6304 +1523500.46378 +1515945.87246 +1509994.44528 +1522940.20447 +1522817.71775 +1519830.02481 +1509900.4074 +1521441.37553 +1524017.78669 +1502315.98749 +1509251.52009 +1514433.21904 +1516687.2058 +1501999.54598 +1498184.43509 +1520016.10872 +1516013.97112 +1498892.54079 +1519631.42789 +1517416.06545 +1523922.09429 +1516818.71468 +1516575.709 +1513634.67771 +1502210.86149 +1507725.87348 +1522417.70422 +1523957.08632 +1514850.99204 +1516916.82629 +1523560.80132 +1515954.45242 +1524068.05747 +1524353.70633 +1524283.10105 +1515587.42653 +1510041.72083 +1511311.59403 +1517034.04027 +1522970.03078 +1509911.26516 +1508689.33841 +1513315.63543 +1517951.69259 +1499320.50547 +1509879.34933 +1514349.37873 +1509092.18575 +1503373.98555 +1510063.27108 +1523634.17326 +1514950.83433 +1516176.22887 diff --git a/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..58d0288 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/amalia_8.0_northIslandRose/funcCalls.txt @@ -0,0 +1,283 @@ +13 +14 +15 +15 +15 +16 +17 +17 +17 +17 +20 +21 +23 +23 +24 +24 +24 +24 +24 +25 +26 +26 +27 +27 +27 +27 +27 +27 +27 +28 +28 +28 +28 +29 +29 +29 +30 +31 +32 +33 +33 +33 +35 +35 +36 +38 +38 +39 +39 +41 +41 +41 +44 +44 +46 +46 +49 +50 +50 +50 +51 +53 +53 +53 +54 +55 +55 +55 +57 +58 +61 +62 +63 +64 +65 +65 +65 +70 +71 +73 +73 +74 +74 +75 +79 +80 +84 +84 +18 +89 +12 +18 +20 +27 +26 +98 +23 +32 +35 +23 +11 +27 +28 +21 +29 +37 +48 +47 +31 +39 +36 +26 +19 +120 +43 +38 +37 +33 +56 +44 +28 +44 +47 +24 +52 +52 +56 +28 +28 +28 +50 +56 +39 +56 +30 +60 +25 +52 +139 +28 +27 +41 +65 +54 +37 +26 +24 +22 +19 +62 +57 +22 +9 +153 +30 +31 +91 +70 +18 +63 +34 +27 +102 +20 +32 +37 +20 +70 +59 +80 +100 +43 +63 +31 +15 +27 +35 +37 +186 +84 +39 +70 +18 +22 +22 +22 +21 +44 +31 +54 +52 +41 +14 +40 +42 +23 +31 +42 +52 +23 +30 +25 +28 +25 +42 +27 +38 +121 +42 +40 +25 +27 +148 +22 +24 +84 +12 +32 +134 +50 +27 +12 +69 +121 +155 +27 +29 +31 +53 +21 +55 +46 +71 +83 +36 +63 +45 +74 +69 +39 +96 +95 +195 +40 +26 +18 +20 +30 +209 +51 +35 +56 +24 +18 +73 +96 +15 +38 +91 +26 +58 +21 +84 +51 +58 +33 +50 +13 +30 +95 +26 +100 +41 +22 +25 +31 +59 +311 +11 +54 +93 +142 +21 diff --git a/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..5616640 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,178 @@ +1310211.0587212215 +1298121.3855190175 +1309908.2284135749 +1310185.585932474 +1309897.420760492 +1321373.4257267897 +1310259.9559883783 +1316594.3562896405 +1304889.8241031794 +1311598.9678539273 +1307303.3739057346 +1321172.336089144 +1310931.4515545429 +1311010.4664850188 +1307311.4172794218 +1298119.3462744635 +1302910.6559697143 +1311652.204489413 +1311322.2724492145 +1321423.5713745388 +1302968.5852112088 +1301091.6048377631 +1321178.1978271978 +1297094.0370025006 +1318305.2196724555 +1321178.4273876604 +1298238.9411698445 +1302899.3330830352 +1300772.466548711 +1302909.974494415 +1304890.390046914 +1301256.967850871 +1320589.5871414894 +1311653.0680125093 +1311298.252720231 +1321187.4322193924 +1316587.9870704848 +1311295.2440330063 +1311323.186928451 +1301099.3053505674 +1302914.0148773487 +1318644.5070603942 +1305261.4406365682 +1305078.4419510309 +1321423.57182612 +1321429.8945051455 +1296840.1210163268 +1315943.9731663815 +1311648.3080768897 +1302922.1147917653 +1301257.7003458017 +1310267.3012970646 +1301009.9626288544 +1305261.6267895617 +1305261.626483563 +1311487.3735309378 +1302891.5172024306 +1310267.3436349174 +1307320.5729849243 +1311601.3192958308 +1301083.302395062 +1321424.006625763 +1298156.0344158001 +1321178.4376039295 +1309933.124350011 +1321423.2603285227 +1311293.0271978204 +1310267.343847722 +1318665.987331813 +1311655.9328185557 +1297094.319176069 +1310162.5353367967 +1321183.4367306768 +1321178.3540527595 +1301257.6866429558 +1301087.769185089 +1321187.0533162635 +1321188.5590370195 +1321423.5713253776 +1305184.7548775445 +1302962.0770366392 +1311319.2166209333 +1321429.88593513 +1296941.3075827672 +1311499.6817409727 +1307320.3590241224 +1316587.9864905362 +1321429.191698846 +1311655.963072849 +1318660.376862458 +1316578.2999541208 +1309908.3934235268 +1302975.3037171464 +1311498.9269169376 +1311035.0361316341 +1302864.9710018616 +1298162.099786903 +1318704.815105939 +1311031.3650878195 +1318643.4398992816 +1311478.1626711877 +1318291.965329017 +1318911.530360575 +1310267.3411036872 +1311491.0652278126 +1316584.5821302393 +1311035.559539997 +1316594.184839037 +1303508.2579757068 +1301257.7001582 +1301083.4932077762 +1307315.1554987163 +1301088.3566289104 +1310267.0879519642 +1305261.6270343862 +1318660.378110228 +1316582.816392318 +1311022.0622715284 +1318657.863889257 +1316584.5842971778 +1311651.8810329286 +1307317.4689265904 +1310942.9274093849 +1320582.0183875556 +1307320.5305313836 +1307307.2461644823 +1318704.8139046119 +1311622.79694913 +1310947.4696426988 +1307311.3049382712 +1321430.2492925515 +1296862.225179483 +1297061.5361394335 +1302917.3457619143 +1321176.9460988413 +1321424.0198926444 +1321178.4303877004 +1296837.7655224267 +1296840.0037618699 +1302971.6982833857 +1302964.4085627913 +1297224.980474452 +1298037.2665337666 +1311641.411517427 +1321423.5468713725 +1318275.4111678952 +1301096.5903128134 +1305055.269788471 +1321178.4040060418 +1318701.8640986688 +1298233.151379607 +1301097.0092424664 +1305263.663904166 +1309887.2826498784 +1296478.837501369 +1318838.1287922934 +1318704.8151120923 +1296891.371329898 +1307092.8430621845 +1305263.6612556202 +1310234.2821795736 +1300835.4328129797 +1318262.9187715221 +1298124.8349312157 +1307077.4766412524 +1311478.504390801 +1298161.2289627688 +1306954.0761166483 +1296840.1514868697 +1305261.8186900986 +1305261.6270247514 +1311655.0538314357 +1310267.3459172412 +1297092.9409053246 +1318669.6877858397 +1316588.57473235 +1311445.992540792 +1311656.1944816287 diff --git a/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..60415c4 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,178 @@ +1347620.43951 +1328776.15111 +1348107.9825 +1347703.49595 +1348117.68485 +1360955.2908 +1347726.93405 +1354458.56589 +1338231.73492 +1347684.83524 +1344211.14912 +1360647.10926 +1347962.58923 +1348052.58418 +1344202.50964 +1328959.13983 +1338378.24264 +1347669.6941 +1347870.80436 +1360845.5583 +1337854.93686 +1333315.17078 +1360627.46168 +1326216.18851 +1357393.4888 +1360627.46217 +1329483.40199 +1338544.38605 +1335098.02845 +1338538.34557 +1338190.47593 +1333163.53573 +1360790.50077 +1347673.01621 +1347867.12166 +1360728.97441 +1354527.9245 +1347946.70725 +1347881.06016 +1333244.48466 +1338564.63876 +1357461.15158 +1338287.17176 +1338393.30929 +1360845.51042 +1360812.44797 +1326239.63982 +1354448.09096 +1347717.91683 +1338640.48035 +1333169.91336 +1347721.72287 +1333277.54924 +1338291.67676 +1338291.28515 +1348216.31284 +1338499.92413 +1347722.06181 +1344209.31407 +1347633.16245 +1333346.92052 +1360836.3184 +1328904.63943 +1360626.61051 +1348069.09159 +1360853.55234 +1347883.89871 +1347721.85241 +1357436.41492 +1347721.37873 +1326218.1465 +1347695.74615 +1360727.48507 +1360624.45592 +1333168.96283 +1333392.32656 +1360749.85898 +1360729.26358 +1360845.62124 +1338712.56304 +1338065.6661 +1347839.10638 +1360814.61525 +1326302.74622 +1348110.92805 +1344210.44828 +1354527.81127 +1360820.37673 +1347709.20664 +1357502.26551 +1354500.8664 +1348105.48141 +1337877.51058 +1348138.11196 +1348089.58989 +1338652.43278 +1328947.29386 +1357898.72856 +1347910.8497 +1357474.26462 +1347522.67247 +1357588.48273 +1357747.81804 +1347720.37783 +1348185.18016 +1354444.96672 +1348092.466 +1354454.62734 +1339130.4665 +1333169.72535 +1333336.2488 +1344196.96915 +1333413.98055 +1347727.19296 +1338291.63868 +1357501.75018 +1354431.30639 +1348075.96715 +1357366.84761 +1354445.32741 +1347657.14596 +1344191.1613 +1348028.41626 +1360782.72036 +1344212.32273 +1344185.73529 +1357898.45937 +1347681.37972 +1348028.28835 +1344191.55637 +1360824.13791 +1326168.18018 +1335490.92827 +1338348.76357 +1360635.14156 +1360838.83453 +1360626.99087 +1326224.59171 +1326238.96743 +1338689.1769 +1338000.18824 +1335692.56741 +1328553.17184 +1347650.03718 +1360845.49633 +1357465.39422 +1333236.34202 +1338620.82106 +1360625.91098 +1357896.54298 +1329208.39601 +1333237.29057 +1338323.12668 +1347980.30513 +1329921.5343 +1357634.06454 +1357898.70716 +1326356.4959 +1344664.26126 +1338321.72656 +1347705.42816 +1332984.41961 +1359435.81327 +1328220.33152 +1344650.85287 +1347550.038 +1328947.61271 +1344307.91375 +1326243.42647 +1338314.97987 +1338291.48205 +1347707.44138 +1347720.77403 +1326219.99906 +1357379.45091 +1354486.83758 +1348106.89511 +1347715.03215 diff --git a/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..c621353 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/circle_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,178 @@ +22 +25 +28 +31 +40 +42 +42 +43 +44 +44 +45 +48 +51 +51 +53 +54 +54 +55 +55 +55 +57 +57 +57 +57 +58 +59 +59 +59 +60 +63 +63 +63 +64 +64 +64 +65 +67 +65 +66 +71 +71 +71 +73 +75 +75 +78 +78 +80 +79 +83 +86 +89 +92 +94 +99 +100 +100 +105 +108 +109 +112 +112 +115 +119 +120 +121 +122 +122 +127 +130 +132 +133 +134 +135 +40 +49 +141 +141 +142 +144 +52 +55 +148 +148 +57 +76 +48 +152 +153 +153 +44 +155 +164 +45 +165 +28 +164 +164 +49 +36 +50 +62 +169 +48 +79 +97 +70 +60 +180 +69 +53 +80 +112 +84 +91 +194 +45 +94 +95 +201 +83 +50 +94 +73 +108 +94 +216 +92 +107 +106 +142 +119 +50 +69 +125 +235 +62 +57 +55 +89 +68 +69 +58 +132 +246 +57 +54 +79 +86 +63 +58 +24 +103 +33 +52 +150 +159 +53 +48 +81 +75 +43 +174 +120 +60 +76 +43 +44 +85 +44 +55 +201 +137 +53 +99 +105 +43 +182 diff --git a/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt b/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt new file mode 100644 index 0000000..1d2fdcc --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPopt.txt @@ -0,0 +1,179 @@ +1328050.8097200685 +1315883.9910106487 +1321469.204159989 +1311860.4564526314 +1315275.246540353 +1321246.3539270607 +1321523.1693518085 +1305694.9153287492 +1311872.8023071622 +1309564.5730049198 +1310119.1778614768 +1310312.20432437 +1310387.0962398648 +1307254.5698456918 +1322997.9369343014 +1308258.1314606834 +1310878.342051207 +1322644.6437445185 +1308258.1163841358 +1310387.3760045234 +1307254.3379988882 +1310383.673508084 +1329372.7604448313 +1307346.969510353 +1306284.506430931 +1329247.1840916867 +1301939.4253367 +1313991.8931437442 +1323072.8494580921 +1329258.7264849984 +1328835.9177130915 +1306860.5246460112 +1321417.490634089 +1308250.4000562576 +1327722.400298598 +1328835.9631374013 +1328138.243215218 +1315894.5474234754 +1331333.0339552658 +1310900.6265514074 +1331340.6592818862 +1314461.5925071323 +1325133.4756210945 +1312102.3455142747 +1328145.9453263155 +1314324.3866091098 +1310950.0815478002 +1317922.0844395254 +1328408.799857137 +1329290.2580739423 +1306892.560419264 +1306790.0197077887 +1310277.8908582956 +1328860.7758509761 +1328520.0646095653 +1325809.6081946192 +1312377.4440770869 +1322608.0212997145 +1328010.4103208221 +1312693.473473936 +1306797.4139606678 +1310979.2621551976 +1310142.682737947 +1298571.1932924846 +1312693.4734047123 +1310562.114655372 +1308315.4372243672 +1311302.6502949807 +1310609.1824874913 +1320609.7203727134 +1325824.6777105792 +1316790.7724075522 +1328088.5733150777 +1327321.6648694796 +1310038.2353222559 +1306292.9043285311 +1325414.647228247 +1308315.4405109545 +1311407.6915092466 +1310383.8544937107 +1310611.648992474 +1308589.346693814 +1308018.2588251724 +1309967.5413229596 +1306292.9033644143 +1310540.3907666095 +1328999.662261653 +1329852.5399463756 +1306795.1138631122 +1320627.1478603003 +1309653.859035321 +1299876.603340266 +1328143.246474063 +1309700.727866703 +1321876.987131478 +1306985.6752753523 +1306030.9907153659 +1328408.7988021697 +1321928.9935197316 +1331340.662503046 +1312102.345973973 +1311868.933695354 +1312120.9814295403 +1308273.1312107493 +1310539.9346365079 +1301939.138715428 +1313990.118968736 +1308573.1926095332 +1329343.1647045277 +1298094.7108768125 +1309580.9099841714 +1316852.0770577553 +1315285.4933833878 +1315275.8214495117 +1329258.7214528846 +1311355.3123026548 +1327758.5004522118 +1331337.7917801428 +1320368.5106791093 +1321877.056429796 +1322605.0713250819 +1308487.8073064857 +1315326.6054934424 +1306292.7697357032 +1306331.7191606334 +1327732.8191505866 +1329255.1367522662 +1313834.6099736698 +1314129.8926408545 +1310387.110223911 +1306797.6735238233 +1321954.1792834534 +1328861.1862714353 +1308320.7759544838 +1305393.2151429676 +1319534.9178827608 +1307744.8077689137 +1309943.7256667847 +1307819.364512756 +1329852.5447620277 +1310611.649003524 +1307080.7414100876 +1307216.3364916726 +1328408.8000747033 +1310397.9476243814 +1321251.104140496 +1307306.540272036 +1315894.2974721065 +1306797.401862974 +1331340.6594739384 +1298333.1107938853 +1321469.4092926611 +1322359.0594752568 +1308487.7887065122 +1310979.2116580845 +1310139.3205296113 +1306292.7866817433 +1328408.7992425025 +1312102.346764534 +1321399.2101203713 +1313823.1207281142 +1327958.1926324584 +1306964.8347920906 +1313158.5385265187 +1316791.3059890608 +1309578.283070418 +1329341.1770896453 +1321959.2393025474 +1310245.765154371 +1328408.7900669936 +1314268.20663606 +1319326.1359440603 +1313991.871614735 +1328784.0489868687 +1310950.039513519 +1311407.7194082923 +1312817.4757464565 +1308315.4479250838 +1325824.9289926896 diff --git a/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt b/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt new file mode 100644 index 0000000..e0b82ff --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/AEPtrue.txt @@ -0,0 +1,179 @@ +1369430.5632 +1352202.43382 +1356978.35565 +1347599.64381 +1352369.84906 +1357442.79106 +1357477.54283 +1333680.98452 +1347667.45732 +1340224.91058 +1341094.87272 +1340960.18555 +1341204.44879 +1336335.77833 +1359622.34407 +1336880.93162 +1343772.89948 +1359330.52346 +1336880.98794 +1341200.37445 +1336329.64672 +1341203.66837 +1369599.45516 +1338035.85838 +1333728.71893 +1369657.72411 +1328116.38015 +1348153.754 +1359840.10589 +1369571.65735 +1366580.55402 +1335942.1503 +1363534.94803 +1336900.51535 +1368358.96901 +1366576.14514 +1368326.99861 +1352202.03287 +1370108.53573 +1343966.33722 +1370144.71767 +1351803.16563 +1363159.88329 +1347485.54824 +1369352.48183 +1350341.05682 +1344605.24622 +1356148.79796 +1366319.99552 +1367225.67583 +1336693.98018 +1333450.30018 +1340715.48526 +1366658.08701 +1369523.65012 +1363742.8048 +1346667.14881 +1359660.11827 +1368852.77751 +1348531.3035 +1333515.59959 +1343339.35998 +1344880.48359 +1323229.21606 +1348531.30781 +1340439.88722 +1336220.83247 +1343487.9966 +1347055.608 +1356801.64691 +1363697.84404 +1351349.54007 +1367646.71103 +1368840.25684 +1340852.72032 +1333752.33924 +1366976.13895 +1336221.73631 +1342239.03767 +1343273.97485 +1346918.24994 +1337069.38697 +1339702.0053 +1346386.28879 +1333751.7136 +1346816.85562 +1367380.75869 +1367449.49031 +1333479.9411 +1355561.76898 +1340666.41091 +1326805.99222 +1369364.45735 +1341532.58118 +1357658.59475 +1337100.0667 +1335546.65794 +1366318.94997 +1357058.23688 +1370147.21542 +1347484.44424 +1347654.11366 +1347552.28845 +1336404.14256 +1346808.59183 +1328106.16981 +1348171.9026 +1337019.99044 +1368064.97977 +1334604.87255 +1340324.35255 +1352028.33539 +1351387.19664 +1352363.31484 +1369571.68678 +1344340.75773 +1368312.84281 +1370170.85883 +1355624.47126 +1357636.60088 +1359659.47711 +1337112.76908 +1352125.78254 +1333758.40408 +1336193.85528 +1365534.6108 +1369595.77665 +1347577.5766 +1351148.51708 +1341203.71354 +1333510.40731 +1357132.62191 +1366700.63884 +1347622.2526 +1345966.08762 +1354492.61112 +1339406.41759 +1341321.75156 +1337922.16281 +1367448.39863 +1346918.23052 +1336112.24416 +1336882.2674 +1366319.69905 +1340858.75381 +1356524.15907 +1336209.85087 +1352205.59167 +1333513.27463 +1370144.27652 +1334377.75625 +1356983.13436 +1357616.7255 +1337111.85953 +1343337.76065 +1346756.71451 +1333749.80259 +1366319.4735 +1347484.8218 +1356588.17036 +1347674.67479 +1367713.97418 +1337436.70123 +1349818.10526 +1351322.08256 +1340277.67101 +1368063.45307 +1357118.92856 +1345205.50636 +1366319.27469 +1348936.78775 +1354159.87742 +1348155.287 +1366832.12285 +1344605.28419 +1342238.38972 +1346838.72618 +1336221.5773 +1363705.61619 diff --git a/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt b/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt new file mode 100644 index 0000000..2941f47 --- /dev/null +++ b/code/plots/revised_data/opt-results-revision/param/square_4.0_northIslandRose/funcCalls.txt @@ -0,0 +1,179 @@ +17 +25 +30 +32 +37 +37 +38 +39 +39 +40 +41 +42 +42 +43 +44 +44 +44 +45 +46 +47 +47 +48 +49 +51 +53 +56 +58 +59 +59 +60 +60 +62 +64 +66 +68 +66 +70 +71 +71 +71 +71 +74 +76 +79 +79 +80 +80 +81 +81 +81 +82 +83 +84 +88 +92 +99 +99 +100 +100 +104 +105 +107 +108 +110 +111 +115 +116 +117 +120 +70 +122 +123 +48 +30 +136 +140 +141 +142 +50 +144 +147 +148 +149 +150 +63 +152 +45 +56 +25 +67 +157 +159 +49 +33 +51 +165 +165 +168 +31 +76 +53 +178 +183 +92 +182 +186 +57 +82 +194 +20 +101 +199 +206 +55 +87 +79 +45 +39 +45 +80 +85 +214 +68 +219 +65 +109 +54 +112 +59 +72 +79 +106 +102 +29 +33 +41 +108 +137 +32 +80 +241 +123 +52 +138 +245 +126 +63 +47 +50 +65 +29 +51 +103 +173 +175 +95 +103 +56 +67 +75 +189 +85 +124 +43 +167 +227 +67 +55 +181 +88 +203 +209 +37 +46 +73 +123 +51 +76 +196 diff --git a/code/reduction_aep_calc.py b/code/reduction_aep_calc.py new file mode 100644 index 0000000..4437e9e --- /dev/null +++ b/code/reduction_aep_calc.py @@ -0,0 +1,247 @@ +import numpy as np +import gaus +import gaus_gradients +import sys +import fast_calc_aep +sys.dont_write_bytecode = True + + +def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed pattern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-points-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y + + + +def WindDirectionPower(wtVelocity,rated_ws=False,rated_power=False,cut_in_speed=False,cut_out_speed=False): + """calculate power from a given wind direction""" + nTurbines = len(wtVelocity) + + if rated_ws == False: + rated_ws = 11.4 + if rated_power == False: + rated_power = 5. + if cut_in_speed == False: + cut_in_speed = 3. + if cut_out_speed == False: + cut_out_speed = 25. + + wtPower = np.zeros(nTurbines) + buffer = 0.1 + for turb in range(nTurbines): + # If we're below cut-in + if wtVelocity[turb] < (cut_in_speed-buffer): + wtPower[turb] = 0. + # If we're at the spline of cut-in + if ((wtVelocity[turb] > (cut_in_speed-buffer)) and (wtVelocity[turb] < (cut_in_speed+buffer))): + x0 = cut_in_speed-buffer + x1 = cut_in_speed+buffer + y0 = 0. + y1 = rated_power*((cut_in_speed+buffer)/rated_ws)**3 + dy0 = 0. + dy1 = 3.*rated_power*(cut_in_speed+buffer)**2/(rated_ws**3) + wtPower[turb] = fast_calc_aep.hermite_spline(wtVelocity[turb], x0, x1, y0, dy0, y1, dy1) + # If we're between cut-in and rated + if ((wtVelocity[turb] > (cut_in_speed+buffer)) and (wtVelocity[turb] < (rated_ws-buffer))): + wtPower[turb] = rated_power*(wtVelocity[turb]/rated_ws)**3 + # If we're at the spline of rated + if ((wtVelocity[turb] > (rated_ws-buffer)) and (wtVelocity[turb] < (rated_ws+buffer))): + x0 = rated_ws-buffer + x1 = rated_ws+buffer + y0 = rated_power*((rated_ws-buffer)/rated_ws)**3 + y1 = rated_power + dy0 = 3.*rated_power*(rated_ws-buffer)**2/(rated_ws**3) + dy1 = 0. + wtPower[turb] = fast_calc_aep.hermite_spline(wtVelocity[turb], x0, x1, y0, dy0, y1, dy1) + # If we're between rated and cut-out + if ((wtVelocity[turb] > (rated_ws+buffer)) and (wtVelocity[turb] < (cut_out_speed-buffer))): + wtPower[turb] = rated_power + # If we're at the spline of cut-out + if ((wtVelocity[turb] > (cut_out_speed-buffer)) and (wtVelocity[turb] < (cut_out_speed+buffer))): + x0 = cut_out_speed-buffer + x1 = cut_out_speed+buffer + y0 = rated_power + y1 = 0. + dy0 = 0. + dy1 = 0. + wtPower[turb] = fast_calc_aep.hermite_spline(wtVelocity[turb], x0, x1, y0, dy0, y1, dy1) + # If we're above cut-out + if wtVelocity[turb] > (cut_out_speed+buffer): + wtPower[turb] = 0. + + # calculate total power for this direction + dir_power = np.sum(wtPower) + + # pass out results + return wtPower, dir_power + + +def calcAEP(turbineX,turbineY,windDirections,windSpeeds,windFrequencies,TI=0.11,relaxationFactor=1.0): + + nTurbines = len(turbineX) + turbineZ = np.ones(nTurbines)*90. + yaw = np.zeros(nTurbines) + rotorDiameter = np.ones(nTurbines)*126.4 + ky = 0.022 + kz = 0.022 + alpha = 2.32 + beta = 0.154 + z_ref = 50. + z_0 = 0. + # RotorPointsY = np.array([0.]) + # RotorPointsZ = np.array([0.]) + nRotorPoints = 20 + RotorPointsY, RotorPointsZ = sunflower_points(nRotorPoints) + + sorted_x_idx = np.argsort(turbineX) + + use_ct_curve = True + interp_type = 1. + Ct = np.ones(nTurbines)*8./9. + + ct_curve_ct = np.array([0.000000000000000000e+00,1.926046656751827513e-01,2.304704215057909733e-01,2.625801650211371241e-01,2.897988824025847787e-01,3.128715534101859097e-01,3.325197358991970331e-01,3.493848361140217129e-01, + 3.640088009445398010e-01,3.768126783817991599e-01,3.876023690081823458e-01,3.972631433719887584e-01,4.056700381028983671e-01,4.130674880647284830e-01,4.196235247518781408e-01,4.254417392565709721e-01, + 4.305404786433919551e-01,4.352952842627632046e-01,4.392221404869978141e-01,4.429120876801027618e-01,4.462733349122694482e-01,4.489563239069855882e-01,4.514849682878421255e-01,4.538698830206908674e-01, + 4.556616377445937838e-01,4.571609267936883603e-01,4.585773528364238683e-01,4.599161818549730718e-01,4.609826078311411446e-01,4.615522686688521281e-01,4.620913641318648013e-01,4.626017054828027719e-01, + 4.630849686797392506e-01,4.635427067073090157e-01,4.637089016217447179e-01,4.635678487000876591e-01,4.634341695706203357e-01,4.633074665079051635e-01,4.631873685982802469e-01,4.631607703567138801e-01, + 4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567138801e-01, + 4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01, + 4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.629944322154941894e-01,4.628064174063633018e-01,4.619912099228598024e-01,4.609688430800724657e-01, + 4.599702722417739476e-01,4.589946761727181079e-01,4.580412709972682683e-01,4.602779942453900097e-01,4.601593442651156773e-01,4.522311128900888266e-01,4.444394795294665523e-01,4.367820906927074032e-01, + 4.292566334383077220e-01,4.218608346751668847e-01,4.145924604759902432e-01,4.074493154025272679e-01,4.004292418424294508e-01,3.935301193575363454e-01,3.867498640433883472e-01,3.800864278997781454e-01, + 3.735377982121443341e-01,3.671019969436217778e-01,3.607770801375717595e-01,3.545611373304012326e-01,3.484522909744995345e-01,3.424486958711209228e-01,3.365485386130337986e-01,3.307500370367759124e-01, + 3.250514396843435794e-01,3.194510252741598055e-01,3.139471021811547913e-01,3.085380079258019381e-01,3.032221086719636416e-01,2.979977987333838341e-01,2.928635000886827267e-01,2.878176619047133067e-01, + 2.828587600681249370e-01,2.779852967249981099e-01,2.731957998284155198e-01,2.684888226938225708e-01,2.638629435620525876e-01,2.593167651698772835e-01,2.548489143279616398e-01,2.504580415060849163e-01, + 2.461428204255101670e-01,2.419019476583784412e-01,2.377341422340028820e-01,2.336381452519474267e-01,2.296127195017700351e-01,2.256566490893210097e-01,2.217687390694769445e-01,2.179478150852021401e-01, + 2.141927230128318482e-01,2.105023286134643790e-01,2.068755171903588486e-01,2.033111932522393972e-01,1.998082801823969634e-01,1.963657199134924980e-01,1.929824726079658326e-01,1.896575163439477851e-01, + 1.863898468065857128e-01,1.831784769846854788e-01,1.800224368725827362e-01,1.769207731771487158e-01,1.738725490298434206e-01,1.708768437037334609e-01,1.679327523353813245e-01,1.650393856515293134e-01, + 1.621958697004900751e-01,1.594013455881682639e-01,1.566549692186263998e-01,1.539559110391245933e-01,1.513033557895500647e-01,1.486965022561654304e-01,1.461345630295985409e-01,1.436167642670038713e-01, + 1.411423454583196901e-01,1.387105591965529239e-01,1.363206709520234095e-01,1.339719588504956205e-01,1.316637134551348065e-01,1.293952375522178233e-01,1.271658459405384245e-01,1.249748652244396241e-01, + 1.228216336104114015e-01,1.207055007071945740e-01,1.186258273293273463e-01,1.165819853040765686e-01,1.145733572816970275e-01,1.125993365489582620e-01,1.106593268458838930e-01,1.087527421856505916e-01, + 1.068790066775877345e-01,1.050375543532279521e-01,1.032278289953537237e-01,1.014492839699910887e-01,9.970138206129613989e-02,9.798359530928681116e-02,9.629540485037166309e-02,9.463630076062452823e-02, + 9.300578190176048143e-02,9.140335576976474363e-02,8.982853834613112320e-02,8.828085395166129778e-02,8.675983510278516275e-02,8.526502237035533949e-02,8.379596424087515372e-02,8.235221698011675751e-02, + 8.093334449909067585e-02,7.953891822232299347e-02,7.816851695840211500e-02,7.682172677275747597e-02,7.549814086262850166e-02,7.419735943418842572e-02,7.291898958178492929e-02,7.166264516926239281e-02, + 7.042794671332706924e-02,6.921452126892356504e-02,6.802200231658521445e-02,6.685002965172548439e-02,6.569824927583710339e-02,6.456631328956505267e-02,6.345387978762324910e-02,6.236061275551976757e-02, + 6.128618196806329826e-02,6.023026288961717128e-02,5.919253657607215918e-02,5.817268957850805361e-02,5.717041384851592745e-02,5.618540664515054434e-02,5.521737044348627721e-02,5.426601284474912718e-02, + 5.333104648799626146e-02,5.241218896331780591e-02,5.150916272653360134e-02,5.062169501536060989e-02,4.974951776702336154e-02,4.889236753728529172e-02,4.804998542087406121e-02,4.722211697327857727e-02, + 4.640851213389269453e-02,4.640294355792866365e-02]) + + ct_curve_wind_speed = np.array([2.990000000000000213e+00,3.000000000000000000e+00,3.130846633912168553e+00,3.261693267824336662e+00,3.392539901736505215e+00,3.523386535648673323e+00,3.654233169560841876e+00,3.785079803473010429e+00, + 3.915926437385178538e+00,4.046773071297346647e+00,4.177619705209515644e+00,4.308466339121683752e+00,4.439312973033851861e+00,4.570159606946020858e+00,4.701006240858188967e+00,4.831852874770357076e+00, + 4.962699508682526073e+00,5.093546142594694182e+00,5.224392776506862290e+00,5.355239410419031287e+00,5.486086044331199396e+00,5.616932678243367505e+00,5.747779312155536502e+00,5.878625946067704611e+00, + 6.009472579979872719e+00,6.140319213892041716e+00,6.271165847804209825e+00,6.402012481716377934e+00,6.532859115628546931e+00,6.663705749540715040e+00,6.794552383452883149e+00,6.925399017365052146e+00, + 7.056245651277220254e+00,7.187092285189388363e+00,7.317938919101556472e+00,7.448785553013725469e+00,7.579632186925893578e+00,7.710478820838061687e+00,7.841325454750230683e+00,7.972172088662398792e+00, + 8.103018722574567789e+00,8.233865356486735010e+00,8.364711990398904007e+00,8.495558624311073004e+00,8.626405258223240224e+00,8.757251892135409221e+00,8.888098526047578218e+00,9.018945159959745439e+00, + 9.149791793871914436e+00,9.280638427784083433e+00,9.411485061696250654e+00,9.542331695608419651e+00,9.673178329520588647e+00,9.804024963432755868e+00,9.934871597344924865e+00,1.006571823125709386e+01, + 1.019656486516926108e+01,1.032741149908143008e+01,1.045825813299359908e+01,1.058910476690576630e+01,1.071995140081793352e+01,1.085079803473010429e+01,1.098164466864227151e+01,1.111249130255444051e+01, + 1.124333793646660773e+01,1.137418457037877673e+01,1.150503120429094572e+01,1.163587783820311294e+01,1.163687783820311239e+01,1.170448773987094526e+01,1.177249045298416696e+01,1.184088825976518677e+01, + 1.190968345569603315e+01,1.197887834959541564e+01,1.204847526369622734e+01,1.211847653372344524e+01,1.218888450897254216e+01,1.225970155238831971e+01,1.233093004064423148e+01,1.240257236422211662e+01, + 1.247463092749243785e+01,1.254710814879499381e+01,1.262000646052004527e+01,1.269332830918996713e+01,1.276707615554136943e+01,1.284125247460764818e+01,1.291585975580207624e+01,1.299090050300133115e+01, + 1.306637723462955591e+01,1.314229248374284609e+01,1.321864879811426619e+01,1.329544874031939194e+01,1.337269488782226112e+01,1.345038983306189451e+01,1.352853618353932852e+01,1.360713656190508125e+01, + 1.368619360604718338e+01,1.376570996917974021e+01,1.384568831993192539e+01,1.392613134243757322e+01,1.400704173642524530e+01,1.408842221730886735e+01,1.417027551627881010e+01,1.425260438039358135e+01, + 1.433541157267203126e+01,1.441869987218604443e+01,1.450247207415383777e+01,1.458673099003374496e+01,1.467147944761861744e+01,1.475672029113066763e+01,1.484245638131695166e+01,1.492869059554540279e+01, + 1.501542582790134972e+01,1.510266498928466561e+01,1.519041100750748896e+01,1.527866682739243132e+01,1.536743541087143328e+01,1.545671973708519076e+01,1.554652280248309282e+01,1.563684762092381852e+01, + 1.572769722377645785e+01,1.581907466002229157e+01,1.591098299635705970e+01,1.600342531729391382e+01,1.609640472526695731e+01,1.618992434073530617e+01,1.628398730228786917e+01,1.637859676674863962e+01, + 1.647375590928269418e+01,1.656946792350268183e+01,1.666573602157608036e+01,1.676256343433293594e+01,1.685995341137432391e+01,1.695790922118139576e+01,1.705643415122510120e+01,1.715553150807646787e+01, + 1.725520461751760237e+01,1.735545682465332717e+01,1.745629149402339664e+01,1.755771200971544843e+01,1.765972177547854471e+01,1.776232421483745938e+01,1.786552277120751953e+01,1.796932090801018234e+01, + 1.807372210878929764e+01,1.817872987732797796e+01,1.828434773776621114e+01,1.839057923471915146e+01,1.849742793339603253e+01,1.860489741971984046e+01,1.871299130044769754e+01,1.882171320329183928e+01, + 1.893106677704140850e+01,1.904105569168489609e+01,1.915168363853333844e+01,1.926295433034414017e+01,1.937487150144572112e+01,1.948743890786286315e+01,1.960066032744270004e+01,1.971453955998155294e+01, + 1.982908042735243725e+01,1.994428677363336178e+01,2.006016246523626378e+01,2.017671139103686073e+01,2.029393746250508812e+01,2.041184461383640780e+01,2.053043680208382682e+01,2.064971800729074403e+01, + 2.076969223262445041e+01,2.089036350451051405e+01,2.101173587276795374e+01,2.113381341074506992e+01,2.125660021545620282e+01,2.138010040771921538e+01,2.150431813229382527e+01,2.162925755802062611e+01, + 2.175492287796109636e+01,2.188131830953824419e+01,2.200844809467817598e+01,2.213631649995246775e+01,2.226492781672132537e+01,2.239428636127766836e+01,2.252439647499188879e+01,2.265526252445766175e+01, + 2.278688890163840242e+01,2.291928002401470010e+01,2.305244033473256593e+01,2.318637430275259348e+01,2.332108642299984780e+01,2.345658121651478467e+01,2.359286323060499768e+01,2.372993703899775753e+01, + 2.386780724199356385e+01,2.400647846662051066e+01,2.414595536678961807e+01,2.428624262345093143e+01,2.442734494475072893e+01,2.456926706618942902e+01,2.471201375078058504e+01,2.485558978921068274e+01, + 2.500000000000000711e+01,2.500100000000000122e+01]) + + + wake_model_version=2016 + sm_smoothing=700. + calc_k_star=True + ti_calculation_method=2 + wake_combination_method=1 + print_ti = False + + shear_exp=0. + TI=0.11 + + nDirections = len(windDirections) + + dir_powers = np.zeros(nDirections) + + for i in range(nDirections): + + turbineXw, turbineYw = fast_calc_aep.windframe(windDirections[i], turbineX, turbineY) + wtVelocity = gaus.porteagel_analyze(turbineX,sorted_x_idx,turbineY, + turbineZ,rotorDiameter,Ct,windSpeeds[i],yaw,ky,kz,alpha,beta, + TI,RotorPointsY,RotorPointsZ,z_ref,z_0,shear_exp,wake_combination_method, + ti_calculation_method,calc_k_star,relaxationFactor,print_ti,wake_model_version, + interp_type,use_ct_curve,ct_curve_wind_speed,ct_curve_ct,sm_smoothing) + + _,dir_powers[i] = WindDirectionPower(wtVelocity) + + AEP = np.sum(dir_powers*windFrequencies*3600.*24.*365.) + + return AEP + + +if __name__=="__main__": + + + windDirections = np.array([270.]) + windSpeeds = np.array([8.]) + windFrequencies = np.array([1.]) + loc = np.linspace(-500.,500.,1000) + AEP300 = np.zeros_like(loc) + AEP500 = np.zeros_like(loc) + AEP800 = np.zeros_like(loc) + + import time + import matplotlib.pyplot as plt + s = time.time() + + turbineX = np.array([0.,300]) + AEP1 = calcAEP(turbineX,np.array([0.,loc[0]]),windDirections,windSpeeds,windFrequencies) + + for i in range(1000): + AEP300[i] = calcAEP(turbineX,np.array([0.,loc[i]]),windDirections,windSpeeds,windFrequencies)-AEP1/2. + + turbineX = np.array([0.,500]) + for i in range(1000): + AEP500[i] = calcAEP(turbineX,np.array([0.,loc[i]]),windDirections,windSpeeds,windFrequencies)-AEP1/2. + + turbineX = np.array([0.,800]) + for i in range(1000): + AEP800[i] = calcAEP(turbineX,np.array([0.,loc[i]]),windDirections,windSpeeds,windFrequencies)-AEP1/2. + + print (time.time()-s)/3000. + plt.ylim(0.,6.E7) + plt.plot(loc,AEP300) + plt.plot(loc,AEP500) + plt.plot(loc,AEP800) + plt.show() diff --git a/code/setup.py b/code/setupRevision.py similarity index 90% rename from code/setup.py rename to code/setupRevision.py index 2cd36e3..b38bd39 100644 --- a/code/setup.py +++ b/code/setupRevision.py @@ -3,7 +3,7 @@ from numpy.distutils.core import setup, Extension -module1 = Extension('gaus_aep', sources=['aep_gaus.f90', +module1 = Extension('full_aep', sources=['full_aep.f90', 'adStack.c', 'adBuffer.f'], extra_compile_args=['-O2', '-c']) @@ -25,7 +25,7 @@ setup( version='0.0.1', - description='Simple gaussian wake model with gradients', + description='parameterization paper code', ext_modules=[module1,module2,module3,module4], license='Apache License, Version 2.0', ) diff --git a/code/test/test_aep_gradients.py b/code/test/test_aep_gradients.py new file mode 100644 index 0000000..f559903 --- /dev/null +++ b/code/test/test_aep_gradients.py @@ -0,0 +1,259 @@ +import numpy as np +# import gaus_gradients +import full_aep +import sys +sys.path.insert(0, '/fslhome/pjstanle/compute/reduction') +from windRoses import * + +def sunflower_points(n, alpha=1.0): + # this function generates n points within a circle in a sunflower seed pattern + # the code is based on the example found at + # https://stackoverflow.com/questions/28567166/uniformly-distribute-x-points-inside-a-circle + + def radius(k, n, b): + if (k + 1) > n - b: + r = 1. # put on the boundary + else: + r = np.sqrt((k + 1.) - 1. / 2.) / np.sqrt(n - (b + 1.) / 2.) # apply squareroot + + return r + + x = np.zeros(n) + y = np.zeros(n) + + b = np.round(alpha * np.sqrt(n)) # number of boundary points + + phi = (np.sqrt(5.) + 1.) / 2. # golden ratio + + for k in np.arange(0, n): + + r = radius(k, n, b) + + theta = 2. * np.pi * (k+1) / phi**2 + + x[k] = r * np.cos(theta) + y[k] = r * np.sin(theta) + + return x, y + +TI=0.11 +relaxationFactor=1.0 + +# turbineX = np.array([-989.15375368, 894.74221693, -903.54431613, -651.87697118, +# 993.27201087, 358.13248155, -862.21018041, -717.73802889, +# 971.63296171, 47.94540108, -1060.88699677, -366.83942243, +# -1011.59641665, -636.4499553 , -153.16472496, 61.02029503, +# 1166.50742982, -258.99829016, 547.81824583, 940.06905288, +# -451.70688075, -1111.26986472, -584.10994123, 346.8207002 , +# 766.01343827]) +# turbineY = np.array([ -720.31061321, -972.1420524 , -555.67440013, -569.80353516, +# -419.57700162, 855.92543884, -24.82631949, -1137.04838654, +# 701.88441272, -198.89888378, -102.08982895, -149.74348519, +# 743.69706922, 134.7762775 , -1009.58648916, -482.19347721, +# -664.96508094, 599.66869118, -330.53352802, 851.5234445 , +# -651.18926568, 1161.07731098, 947.12434335, -379.35985373, +# -1038.67320466]) +# +# sorted_x_idx = np.argsort(turbineX) +# print sorted_x_idx + +turbineX = np.array([-338.253343681, 968.628106756, -949.430495476, + -1015.99362647, 975.474054701, 84.9434622485, -1110.74608216, + -274.827029486, 978.590542646, -726.891724024, -1173.0990966, + -664.959054275, -977.293679105, -885.302790049, -49.1513960402, + 152.814384451, 1173.37729087, -754.942347187, 1097.188171, 352.301400021, + -112.577710215, -204.158584106, 21.6010014939, 1118.63478309, 14.2749462634]) +turbineY = np.array([-798.251832178, -142.308949352, -163.776165876, -429.312935542, + 186.558660922, 921.149429473, 378.654238798, -1050.39683548, 647.685449449, + -298.22502307, -31.215399162, 111.117853392, 649.640636326, 249.134657097, + -921.282512224, -544.841149781, 17.9339026121, 514.882018071, 416.309991482, + 799.863270353, -669.137508961, 1044.34803637, 1173.31551099, -354.671839363, + -1173.42750841]) + + + +turbineX = np.random.rand(10)*126.4*4*4. +turbineY = np.random.rand(10)*126.4*4*4. + +# turbineX = np.array([0.,200.,400.,600.,800.]) +# turbineY = np.array([0.,0.,0.,0.,0.]) +# turbineX = np.array([0.,1000.,2000.,1000.]) +# turbineY = np.array([0.,0.,0.,500.]) +nTurbines = len(turbineX) +turbineZ = np.ones(nTurbines)*90. +yaw = np.zeros(nTurbines) +rotorDiameter = np.ones(nTurbines)*126.4 +ky = 0.022 +kz = 0.022 +alpha = 2.32 +beta = 0.154 +z_ref = 50. +z_0 = 0. +# RotorPointsY = np.array([0.]) +# RotorPointsZ = np.array([0.]) +nRotorPoints = 20 +RotorPointsY, RotorPointsZ = sunflower_points(nRotorPoints) + +use_ct_curve = False +interp_type = 1 +Ct = np.ones(nTurbines)*8./9. + +ct_curve_ct = np.array([0.000000000000000001e+00,1.926046656751827513e-01,2.304704215057909733e-01,2.625801650211371241e-01,2.897988824025847787e-01,3.128715534101859097e-01,3.325197358991970331e-01,3.493848361140217129e-01, + 3.640088009445398010e-01,3.768126783817991599e-01,3.876023690081823458e-01,3.972631433719887584e-01,4.056700381028983671e-01,4.130674880647284830e-01,4.196235247518781408e-01,4.254417392565709721e-01, + 4.305404786433919551e-01,4.352952842627632046e-01,4.392221404869978141e-01,4.429120876801027618e-01,4.462733349122694482e-01,4.489563239069855882e-01,4.514849682878421255e-01,4.538698830206908674e-01, + 4.556616377445937838e-01,4.571609267936883603e-01,4.585773528364238683e-01,4.599161818549730718e-01,4.609826078311411446e-01,4.615522686688521281e-01,4.620913641318648013e-01,4.626017054828027719e-01, + 4.630849686797392506e-01,4.635427067073090157e-01,4.637089016217447179e-01,4.635678487000876591e-01,4.634341695706203357e-01,4.633074665079051635e-01,4.631873685982802469e-01,4.631607703567138801e-01, + 4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567138801e-01, + 4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567137690e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01, + 4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.631607703567138801e-01,4.629944322154941894e-01,4.628064174063633018e-01,4.619912099228598024e-01,4.609688430800724657e-01, + 4.599702722417739476e-01,4.589946761727181079e-01,4.580412709972682683e-01,4.602779942453900097e-01,4.601593442651156773e-01,4.522311128900888266e-01,4.444394795294665523e-01,4.367820906927074032e-01, + 4.292566334383077220e-01,4.218608346751668847e-01,4.145924604759902432e-01,4.074493154025272679e-01,4.004292418424294508e-01,3.935301193575363454e-01,3.867498640433883472e-01,3.800864278997781454e-01, + 3.735377982121443341e-01,3.671019969436217778e-01,3.607770801375717595e-01,3.545611373304012326e-01,3.484522909744995345e-01,3.424486958711209228e-01,3.365485386130337986e-01,3.307500370367759124e-01, + 3.250514396843435794e-01,3.194510252741598055e-01,3.139471021811547913e-01,3.085380079258019381e-01,3.032221086719636416e-01,2.979977987333838341e-01,2.928635000886827267e-01,2.878176619047133067e-01, + 2.828587600681249370e-01,2.779852967249981099e-01,2.731957998284155198e-01,2.684888226938225708e-01,2.638629435620525876e-01,2.593167651698772835e-01,2.548489143279616398e-01,2.504580415060849163e-01, + 2.461428204255101670e-01,2.419019476583784412e-01,2.377341422340028820e-01,2.336381452519474267e-01,2.296127195017700351e-01,2.256566490893210097e-01,2.217687390694769445e-01,2.179478150852021401e-01, + 2.141927230128318482e-01,2.105023286134643790e-01,2.068755171903588486e-01,2.033111932522393972e-01,1.998082801823969634e-01,1.963657199134924980e-01,1.929824726079658326e-01,1.896575163439477851e-01, + 1.863898468065857128e-01,1.831784769846854788e-01,1.800224368725827362e-01,1.769207731771487158e-01,1.738725490298434206e-01,1.708768437037334609e-01,1.679327523353813245e-01,1.650393856515293134e-01, + 1.621958697004900751e-01,1.594013455881682639e-01,1.566549692186263998e-01,1.539559110391245933e-01,1.513033557895500647e-01,1.486965022561654304e-01,1.461345630295985409e-01,1.436167642670038713e-01, + 1.411423454583196901e-01,1.387105591965529239e-01,1.363206709520234095e-01,1.339719588504956205e-01,1.316637134551348065e-01,1.293952375522178233e-01,1.271658459405384245e-01,1.249748652244396241e-01, + 1.228216336104114015e-01,1.207055007071945740e-01,1.186258273293273463e-01,1.165819853040765686e-01,1.145733572816970275e-01,1.125993365489582620e-01,1.106593268458838930e-01,1.087527421856505916e-01, + 1.068790066775877345e-01,1.050375543532279521e-01,1.032278289953537237e-01,1.014492839699910887e-01,9.970138206129613989e-02,9.798359530928681116e-02,9.629540485037166309e-02,9.463630076062452823e-02, + 9.300578190176048143e-02,9.140335576976474363e-02,8.982853834613112320e-02,8.828085395166129778e-02,8.675983510278516275e-02,8.526502237035533949e-02,8.379596424087515372e-02,8.235221698011675751e-02, + 8.093334449909067585e-02,7.953891822232299347e-02,7.816851695840211500e-02,7.682172677275747597e-02,7.549814086262850166e-02,7.419735943418842572e-02,7.291898958178492929e-02,7.166264516926239281e-02, + 7.042794671332706924e-02,6.921452126892356504e-02,6.802200231658521445e-02,6.685002965172548439e-02,6.569824927583710339e-02,6.456631328956505267e-02,6.345387978762324910e-02,6.236061275551976757e-02, + 6.128618196806329826e-02,6.023026288961717128e-02,5.919253657607215918e-02,5.817268957850805361e-02,5.717041384851592745e-02,5.618540664515054434e-02,5.521737044348627721e-02,5.426601284474912718e-02, + 5.333104648799626146e-02,5.241218896331780591e-02,5.150916272653360134e-02,5.062169501536060989e-02,4.974951776702336154e-02,4.889236753728529172e-02,4.804998542087406121e-02,4.722211697327857727e-02, + 4.640851213389269453e-02,4.640294355792866365e-02]) + +ct_curve_wind_speed = np.array([2.990000000000000213e+00,3.000000000000000000e+00,3.130846633912168553e+00,3.261693267824336662e+00,3.392539901736505215e+00,3.523386535648673323e+00,3.654233169560841876e+00,3.785079803473010429e+00, + 3.915926437385178538e+00,4.046773071297346647e+00,4.177619705209515644e+00,4.308466339121683752e+00,4.439312973033851861e+00,4.570159606946020858e+00,4.701006240858188967e+00,4.831852874770357076e+00, + 4.962699508682526073e+00,5.093546142594694182e+00,5.224392776506862290e+00,5.355239410419031287e+00,5.486086044331199396e+00,5.616932678243367505e+00,5.747779312155536502e+00,5.878625946067704611e+00, + 6.009472579979872719e+00,6.140319213892041716e+00,6.271165847804209825e+00,6.402012481716377934e+00,6.532859115628546931e+00,6.663705749540715040e+00,6.794552383452883149e+00,6.925399017365052146e+00, + 7.056245651277220254e+00,7.187092285189388363e+00,7.317938919101556472e+00,7.448785553013725469e+00,7.579632186925893578e+00,7.710478820838061687e+00,7.841325454750230683e+00,7.972172088662398792e+00, + 8.103018722574567789e+00,8.233865356486735010e+00,8.364711990398904007e+00,8.495558624311073004e+00,8.626405258223240224e+00,8.757251892135409221e+00,8.888098526047578218e+00,9.018945159959745439e+00, + 9.149791793871914436e+00,9.280638427784083433e+00,9.411485061696250654e+00,9.542331695608419651e+00,9.673178329520588647e+00,9.804024963432755868e+00,9.934871597344924865e+00,1.006571823125709386e+01, + 1.019656486516926108e+01,1.032741149908143008e+01,1.045825813299359908e+01,1.058910476690576630e+01,1.071995140081793352e+01,1.085079803473010429e+01,1.098164466864227151e+01,1.111249130255444051e+01, + 1.124333793646660773e+01,1.137418457037877673e+01,1.150503120429094572e+01,1.163587783820311294e+01,1.163687783820311239e+01,1.170448773987094526e+01,1.177249045298416696e+01,1.184088825976518677e+01, + 1.190968345569603315e+01,1.197887834959541564e+01,1.204847526369622734e+01,1.211847653372344524e+01,1.218888450897254216e+01,1.225970155238831971e+01,1.233093004064423148e+01,1.240257236422211662e+01, + 1.247463092749243785e+01,1.254710814879499381e+01,1.262000646052004527e+01,1.269332830918996713e+01,1.276707615554136943e+01,1.284125247460764818e+01,1.291585975580207624e+01,1.299090050300133115e+01, + 1.306637723462955591e+01,1.314229248374284609e+01,1.321864879811426619e+01,1.329544874031939194e+01,1.337269488782226112e+01,1.345038983306189451e+01,1.352853618353932852e+01,1.360713656190508125e+01, + 1.368619360604718338e+01,1.376570996917974021e+01,1.384568831993192539e+01,1.392613134243757322e+01,1.400704173642524530e+01,1.408842221730886735e+01,1.417027551627881010e+01,1.425260438039358135e+01, + 1.433541157267203126e+01,1.441869987218604443e+01,1.450247207415383777e+01,1.458673099003374496e+01,1.467147944761861744e+01,1.475672029113066763e+01,1.484245638131695166e+01,1.492869059554540279e+01, + 1.501542582790134972e+01,1.510266498928466561e+01,1.519041100750748896e+01,1.527866682739243132e+01,1.536743541087143328e+01,1.545671973708519076e+01,1.554652280248309282e+01,1.563684762092381852e+01, + 1.572769722377645785e+01,1.581907466002229157e+01,1.591098299635705970e+01,1.600342531729391382e+01,1.609640472526695731e+01,1.618992434073530617e+01,1.628398730228786917e+01,1.637859676674863962e+01, + 1.647375590928269418e+01,1.656946792350268183e+01,1.666573602157608036e+01,1.676256343433293594e+01,1.685995341137432391e+01,1.695790922118139576e+01,1.705643415122510120e+01,1.715553150807646787e+01, + 1.725520461751760237e+01,1.735545682465332717e+01,1.745629149402339664e+01,1.755771200971544843e+01,1.765972177547854471e+01,1.776232421483745938e+01,1.786552277120751953e+01,1.796932090801018234e+01, + 1.807372210878929764e+01,1.817872987732797796e+01,1.828434773776621114e+01,1.839057923471915146e+01,1.849742793339603253e+01,1.860489741971984046e+01,1.871299130044769754e+01,1.882171320329183928e+01, + 1.893106677704140850e+01,1.904105569168489609e+01,1.915168363853333844e+01,1.926295433034414017e+01,1.937487150144572112e+01,1.948743890786286315e+01,1.960066032744270004e+01,1.971453955998155294e+01, + 1.982908042735243725e+01,1.994428677363336178e+01,2.006016246523626378e+01,2.017671139103686073e+01,2.029393746250508812e+01,2.041184461383640780e+01,2.053043680208382682e+01,2.064971800729074403e+01, + 2.076969223262445041e+01,2.089036350451051405e+01,2.101173587276795374e+01,2.113381341074506992e+01,2.125660021545620282e+01,2.138010040771921538e+01,2.150431813229382527e+01,2.162925755802062611e+01, + 2.175492287796109636e+01,2.188131830953824419e+01,2.200844809467817598e+01,2.213631649995246775e+01,2.226492781672132537e+01,2.239428636127766836e+01,2.252439647499188879e+01,2.265526252445766175e+01, + 2.278688890163840242e+01,2.291928002401470010e+01,2.305244033473256593e+01,2.318637430275259348e+01,2.332108642299984780e+01,2.345658121651478467e+01,2.359286323060499768e+01,2.372993703899775753e+01, + 2.386780724199356385e+01,2.400647846662051066e+01,2.414595536678961807e+01,2.428624262345093143e+01,2.442734494475072893e+01,2.456926706618942902e+01,2.471201375078058504e+01,2.485558978921068274e+01, + 2.500000000000000711e+01,2.500100000000000122e+01]) + + +wake_model_version=2016 +sm_smoothing=700. +calc_k_star=True +ti_calculation_method=2 +wake_combination_method=1 +print_ti = False + +shear_exp=0. + +windDirections, windFrequencies, windSpeeds = northIslandRose(50) +wind_angle = windDirections[np.argmax(windFrequencies*windSpeeds**3)] +windDirections, windFrequencies, windSpeeds = northIslandRose(30,nSpeeds=5) +windDirections -= wind_angle + +# windDirections = np.ones_like(windDirections)*270. +# windSpeeds = windSpeeds*0.3 + +rated_ws = 11.4 +rated_power = 3.35 +cut_in_speed = 3. +cut_out_speed = 25. + +wake_model_version=2016 +sm_smoothing=700. +calc_k_star=True +ti_calculation_method=2 +wake_combination_method=1 +print_ti = False + +ky = 0.022 +kz = 0.022 +alpha = 2.32 +beta = 0.154 +zref = 50. +z0 = 0. +# RotorPointsY = np.array([0.]) +# RotorPointsZ = np.array([0.]) +nRotorPoints = 4 +RotorPointsY, RotorPointsZ = sunflower_points(nRotorPoints) +print 'RotorPointsY: ', RotorPointsY +print 'RotorPointsZ: ', RotorPointsZ + +import time +s = time.time() +turbineXd = np.zeros((nTurbines,nTurbines)) +turbineYd = np.zeros((nTurbines,nTurbines)) +turbineXd = np.eye(nTurbines) +aep,daep_dx = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + + +turbineXd = np.zeros((nTurbines,nTurbines)) +turbineYd = np.zeros((nTurbines,nTurbines)) +turbineYd = np.eye(nTurbines) +aep,daep_dy = full_aep.calcaep_dv(turbineX,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) +print time.time()-s + + +fdx = np.zeros(nTurbines) +fdy = np.zeros(nTurbines) + +d = 0.0001 +turbineXd = np.zeros((nTurbines,nTurbines)) +turbineYd = np.zeros((nTurbines,nTurbines)) + +for i in range(nTurbines): + D = np.zeros(nTurbines) + D[i] = d + aep_fd,_ = full_aep.calcaep_dv(turbineX+D,turbineXd,turbineY,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + fdx[i] = (aep_fd-aep)/d + + aep_fd,_ = full_aep.calcaep_dv(turbineX,turbineXd,turbineY+D,turbineYd,turbineZ,rotorDiameter,Ct,yaw,windDirections, + windSpeeds,windFrequencies,shear_exp,rated_ws,rated_power, + cut_in_speed,cut_out_speed,zref,z0,ky,kz,alpha,beta,TI, + relaxationFactor,RotorPointsY, RotorPointsZ,ct_curve_wind_speed,ct_curve_ct, + sm_smoothing,wake_combination_method,ti_calculation_method,wake_model_version, + interp_type,calc_k_star,print_ti,use_ct_curve) + fdy[i] = (aep_fd-aep)/d + + +print 'daep_dx: ', daep_dx +print 'fdx: ', fdx + +print 'daep_dy: ', daep_dy +print 'fdy: ', fdy + +print np.max(daep_dx-fdx) +print np.max(daep_dy-fdy) + +print aep diff --git a/code/test/test_constraint_gradients.py b/code/test/test_constraint_gradients.py index d2f6bb0..b2a397e 100644 --- a/code/test/test_constraint_gradients.py +++ b/code/test/test_constraint_gradients.py @@ -4,8 +4,7 @@ sys.dont_write_bytecode = True import time import sys -sys.path.insert(0, '/home/flowlab/PJ/reduction') -sys.path.insert(0, '/home/flowlab/PJ/reduction/exact-gradients') +sys.path.insert(0, '/fslhome/pjstanle/compute/reduction') from position_constraints import * nTurbines = 5 diff --git a/code/test/test_gradients.py b/code/test/test_gradients.py index 931c4b7..8298f15 100644 --- a/code/test/test_gradients.py +++ b/code/test/test_gradients.py @@ -1,7 +1,7 @@ import numpy as np import sys sys.dont_write_bytecode = True -sys.path.insert(1, '/home/flowlab/PJ/reduction/exact-gradients') +sys.path.insert(1, '/fslhome/pjstanle/compute/reduction') from aep_calc import * import time diff --git a/code/test/test_grid_gradients.py b/code/test/test_grid_gradients.py index 250ebfe..b1ff497 100644 --- a/code/test/test_grid_gradients.py +++ b/code/test/test_grid_gradients.py @@ -4,15 +4,14 @@ sys.dont_write_bytecode = True import time import sys -sys.path.insert(1, '/home/flowlab/PJ/reduction') +sys.path.insert(1, '/fslhome/pjstanle/compute/reduction') from position_constraints import * -sys.path.insert(0, '/home/flowlab/PJ/reduction/exact-gradients') from var_reduction_exact import * import grid_param_fortran nTurbines = 15 -locations = np.loadtxt('/home/flowlab/PJ/reduction/layout_amalia.txt') +locations = np.loadtxt('/fslhome/pjstanle/compute/reduction/layout_amalia.txt') boundaryVertices, boundaryNormals = calculate_boundary(locations) bx = boundaryVertices[:,0] diff --git a/code/test/test_param.py b/code/test/test_param.py index 60d2705..ed09ecb 100644 --- a/code/test/test_param.py +++ b/code/test/test_param.py @@ -5,9 +5,8 @@ import time import sys import param_fortran -sys.path.insert(1, '/home/flowlab/PJ/reduction') +sys.path.insert(1, '/fslhome/pjstanle/compute/reduction') from position_constraints import * -sys.path.insert(0, '/home/flowlab/PJ/reduction/exact-gradients') from var_reduction_exact import * import matplotlib.pyplot as plt diff --git a/code/var_reduction_exact.py b/code/var_reduction_exact.py index 342e651..26f7073 100644 --- a/code/var_reduction_exact.py +++ b/code/var_reduction_exact.py @@ -7,7 +7,7 @@ warnings.simplefilter('ignore', np.RankWarning) import sys import grid_param_fortran -sys.path.insert(0, '/Users/ningrsrch/Dropbox/Projects/reduction/') +sys.path.insert(0, '/home/flowlab/PJ/reduction') from position_constraints import * sys.dont_write_bytecode = True @@ -67,15 +67,12 @@ def startGrid(nTurbines,boundaryVertices,boundaryNormals,rotate=0.,my=1.): converged = False step = 0.25 - # print 'setting up base grid' # print nTurbines while converged == False: while num_inside < nTurbines: - num_inside num_inside,d = startLoop(N,d,my,step,-1.,rotate,turbs_per_row,x_start,y0,boundaryVertices,boundaryNormals,t) while num_inside >= nTurbines: - num_inside num_inside,d = startLoop(N,d,my,step,1.,rotate,turbs_per_row,x_start,y0,boundaryVertices,boundaryNormals,t) if step < 1.E-8: diff --git a/code/windRoses.py b/code/windRoses.py index 3455785..806ae63 100644 --- a/code/windRoses.py +++ b/code/windRoses.py @@ -2,6 +2,7 @@ from akima import Akima, akima_interp from math import radians import sys +import scipy.special as spec sys.dont_write_bytecode = True @@ -464,7 +465,7 @@ def Weibull(x,L): dirs = np.zeros(nDirections*nSpeeds) freqs = np.zeros(nDirections*nSpeeds) speeds = np.zeros(nDirections*nSpeeds) - + print np.shape(speeds) #direction loops for i in range(nDirections): for j in range(nSpeeds): @@ -479,7 +480,11 @@ def Weibull(x,L): num_int = 1000 for j in range(nSpeeds): speed_int = np.linspace(speed_dist[j]-dspeed/2.,speed_dist[j]+dspeed/2.,num_int) - freq_int = Weibull(speed_int,avg_speed) + + k = 2.0 + scale = avg_speed/(spec.gamma(1.0+1./k)) + + freq_int = Weibull(speed_int,scale) speed_freq = np.trapz(freq_int,speed_int) speeds[i*nSpeeds+j] = speed_dist[j] freqs[i*nSpeeds+j] = speed_freq*windFrequencies[i] @@ -499,7 +504,7 @@ def process_rose_data(windSpeeds,windDirections,windFrequencies,nDirections,nSpe frequencies = np.zeros(num) speeds = np.zeros(num) - num_int = 1000 + num_int = 100 dir_int1 = np.linspace(dirs[0],dirs[0]+ddir/2.,num_int/2) freq_int1 = np.zeros(num_int/2) @@ -758,4 +763,4 @@ def process_rose_data(windSpeeds,windDirections,windFrequencies,nDirections,nSpe # # # - plt.show() + # plt.show()