Bug fix importing BF_BifacialIrradiances. some Py3 code changes.

bifacialvf/BF_BifacialIrradiances/calculatePVMismatch_BilinearInterpolation.py

@@ -61,7 +61,7 @@
     myfall=myfolder+'/'+myf[mainloop]
     #data, meta = loadVFresults(myfall)   
     writefiletitle=myfolder+"testtest.csv"
-    print "Working on ", myf[mainloop]
+    print (f"Working on {myf[mainloop]}")
 
     with open(myfall,'r') as csvinput:
         with open(writefiletitle, 'w') as csvoutput:
@@ -131,6 +131,6 @@
 
         #writer.writerows(all)
         toc = time.clock()
-        print "Results Ready in ", (toc-tic)/60.0 , " minutes"
+        print (f"Results Ready in {(toc-tic)/60.0} minutes")
 
 

bifacialvf/__init__.py

@@ -5,6 +5,8 @@
 from bifacialvf.vf import getSkyConfigurationFactors, trackingBFvaluescalculator, rowSpacing # helper functions
 from bifacialvf.sun import hrSolarPos, perezComp, solarPos, sunIncident # solar position and value
 from bifacialvf.loadVFresults import loadVFresults # utility for reading result files
+from bifacialvf.BF_BifacialIrradiances.LandscapeSingleHour import LandscapeSingleHour # For calculateBilInterpol
+from bifacialvf.BF_BifacialIrradiances.PortraitSingleHour import PortraitSingleHour # For calculateBilInterpol
 
 from ._version import get_versions
 __version__ = get_versions()['version']

bifacialvf/analysis.py

@@ -9,8 +9,6 @@
 import scipy.io as sio
 import sys, os
 #sys.path.insert(0, 'BF_BifacialIrradiances')
-from bifacialvf.BF_BifacialIrradiances.PortraitSingleHour import PortraitSingleHour    # For calculateBilInterpol
-from bifacialvf.BF_BifacialIrradiances.LandscapeSingleHour import LandscapeSingleHour # For calculateBilInterpol
 from pvmismatch import *  # this imports everything we need
 import bifacialvf
 import os
@@ -186,7 +184,7 @@ def calculateVFBilinearInterpolation(portraitorlandscape, sensorsy, interpolA, I
             cellCenterValFront = frontGTIrow
             cellCenterValBack = backGTIrow
 
-        [PmaxIdeal, PmaxUnmatched, PmaxAvg] = LandscapeSingleHour(cellCenterValFront, cellCenterValBack, Tamb, VWind, 6, interpolA,IVArray,beta_voc_all,m_all,bee_all)
+        [PmaxIdeal, PmaxUnmatched, PmaxAvg] = bifacialvf.LandscapeSingleHour(cellCenterValFront, cellCenterValBack, Tamb, VWind, 6, interpolA,IVArray,beta_voc_all,m_all,bee_all)
 
 
     return PmaxIdeal, PmaxUnmatched
@@ -250,10 +248,10 @@ def analyseVFResultsBilInterpol(filename, portraitorlandscape='landscape', bifif
     for i in range (0,len(frontGTI)):
         cellCenterValFront=frontGTI.iloc[i]
         cellCenterValBack=backGTI.iloc[i]
-        [PmaxIdeal, PmaxUnmatched, PmaxAvg] = LandscapeSingleHour(cellCenterValFront, cellCenterValBack, data['Tamb'][i], data['VWind'][i], 6, interpolA,IVArray,beta_voc_all,m_all,bee_all)
+        [PmaxIdeal, PmaxUnmatched, PmaxAvg] = bifacialvf.LandscapeSingleHour(cellCenterValFront, cellCenterValBack, data['Tamb'][i], data['VWind'][i], 6, interpolA,IVArray,beta_voc_all,m_all,bee_all)
         PowerAveraged_all.append(PmaxIdeal)
         PowerDetailed_all.append(PmaxUnmatched)
-        [PmaxIdeal, PmaxUnmatched, PmaxAvg] = LandscapeSingleHour(cellCenterValFront, cellCenterValBack, data['Tamb'][i], data['VWind'][i], 6, interpolA,IVArray,beta_voc_all,m_all,bee_all)
+        [PmaxIdeal, PmaxUnmatched, PmaxAvg] = bifacialvf.LandscapeSingleHour(cellCenterValFront, cellCenterValBack, data['Tamb'][i], data['VWind'][i], 6, interpolA,IVArray,beta_voc_all,m_all,bee_all)
         PowerAveraged_FrontOnly_all.append(PmaxIdeal)
         PowerDetailed_FrontOnly_all.append(PmaxUnmatched)
 

setup.py

@@ -74,8 +74,8 @@
 
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
-    #packages=find_packages(exclude=['contrib', 'docs', 'tests']) + ['data'],
-    packages = ['bifacialvf'],
+    packages=find_packages(),
+    #packages = ['bifacialvf'],
     # Alternatively, if you want to distribute just a my_module.py, uncomment
     # this:
     #py_modules=["bifacialvf"],