Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids

test_results_win64.csv

@@ -60,8 +60,8 @@ Standalone Battery,Merchant Plant,-8397703,25.7208,NA,; Warning: IRR at end of a
 Standalone Battery,Leveraged Partnership Flip,-8397703,81.3387,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
 Standalone Battery,All Equity Partnership Flip,-8397703,85.2731,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
 Standalone Battery,Sale Leaseback,-8397703,86.2847,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.09395e+08. A negative NPV indicates project costs are higher than revenues.
-ETES,Single Owner,-466572064,13.3084,7.40855,; 
-PTES,Single Owner,-197595520,16.8914,10.3676,; 
+ETES,Single Owner,-467917248,13.347,7.39897,; 
+PTES,Single Owner,-198011440,16.887,10.3626,; 
 Physical Trough,Single Owner,376952608,12.1978,12.3469,; 
 Physical Trough,Merchant Plant,376952608,12.8693,NA,; 
 Physical Trough,Leveraged Partnership Flip,376952608,12.4668,12.3469,; 
@@ -153,10 +153,4 @@ Generic System,Host Developer,73469696,13.5804,13.3335,; Warning: IRR at end of
 Generic System,Single Owner,756864000,25.2973,25.9936,; 
 Generic System,Merchant Plant,756864000,27.0049,NA,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.71214e+09. A negative NPV indicates project costs are higher than revenues.
 Generic System,Leveraged Partnership Flip,840960000,24.2686,25.9936,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs.
-Generic System,All Equity Partnership Flip,756864000,29.7345,25.9936,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.92568e+08. A negative NPV indicates project costs are higher than revenues.
-Generic System,Sale Leaseback,756864000,29.4653,25.9936,; Warning: NPV is $-2.65502e+08. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-3.27398e+07. A negative NPV indicates project costs are higher than revenues.
-Generic System,LCOE Calculator,756864000,NA,NA,; 
-Generic System,None,756864000,NA,NA,; 
-PVWatts Wind Battery Hybrid,Single Owner,864068864,14.6732,10.8199,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-PVWatts Wind Battery Hybrid,Host Developer,2.13385e+06,11.7624,12.7416,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower.
-final_configuration_eof,none,NA,NA,NA,
+Generic System,All Equity Partnership Flip,756864000,29.7345,25.9936,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This ca