get bifacialityfactor from scene in call to calculateResultsGencumsky…

…1axis reduce CompiledResults savefile to 3 digits
NREL · Sep 3, 2024 · 2caeb8a · 2caeb8a
1 parent e1ac5a3
commit 2caeb8a
Show file tree

Hide file tree

Showing 4 changed files with 602 additions and 84 deletions.
diff --git a/bifacial_radiance/main.py b/bifacial_radiance/main.py
@@ -2529,7 +2529,8 @@ def makeScene1axis(self, trackerdict=None, module=None, sceneDict=None,
         module : str or ModuleObj
             Name or ModuleObj created with makeModule()
         sceneDict : 
-            Dictionary with keys:`tilt`, `hub_height`, `pitch`, `azimuth`
+            Dictionary with keys:`tilt`, `hub_height`, `pitch` (or GCR), `azimuth`,
+            optional: 'originx', 'originy'
         cumulativesky : bool
             Defines if sky will be generated with cumulativesky or gendaylit.
         customtext : str
@@ -3065,8 +3066,6 @@ def _printRow(analysisobj, key):
 
                     meteo_data = _trackerMeteo(trackerdict[key])
 
-
-
 
                     try:
                         for analysis in trackerdict[key]['AnalysisObj']: # loop over multiple row & module in trackerDict['AnalysisObj']
@@ -3100,12 +3099,16 @@ def _printRow(analysisobj, key):
                     except KeyError:
                         pass
 
-
+                if module is None:
+                    module_local = trackerdict[keys_all[0]]['scenes'][analysis.sceneNum].module
+                else:
+                    module_local = module
                 self.CompiledResults = performance.calculateResultsGencumsky1axis(results=self.CompiledResults,
-                                           bifacialityfactor=1.0,
+                                           bifacialityfactor=module_local.bifi,
                                            fillcleanedSensors=True, agriPV=False)
 
-                self.CompiledResults.to_csv(os.path.join('results', 'Cumulative_Results.csv'))
+                self.CompiledResults.to_csv(os.path.join('results', 'Cumulative_Results.csv'),
+                                            float_format='%0.3f')
 
             self.trackerdict = trackerdict    
             return self.CompiledResults
@@ -5263,7 +5266,7 @@ def _checkPath(rowpath):  # create the file structure if it doesn't exist
         savefile = 'compiledRow_{}.csv'.format(rowWanted)
 
         df_row.to_csv(os.path.join(rowpath, savefile), sep = ',',
-                           index = False)
+                           index=False, float_format='%0.3f')
 
 
         return df_row
@@ -5321,7 +5324,7 @@ def analyzeField(self, octfile, scene, name=None,
         savefile = 'compiledField_{}.csv'.format(name)
 
         result.to_csv(os.path.join(fieldpath, savefile), sep = ',',
-                           index = False)
+                           index=False, float_format='%0.3f')
 
 
         return result

diff --git a/bifacial_radiance/module.py b/bifacial_radiance/module.py
@@ -694,7 +694,7 @@ def _makeModuleFromDict(self,  x=None, y=None, z=None, xgap=None, ygap=None,
         return text
     #End of makeModuleFromDict()
 
-    def addCEC(self, CECMod, glassglass=False, bifi=None):
+    def addCEC(self, CECMod, glassglass=None, bifi=None):
         """
         
 
@@ -708,8 +708,8 @@ def addCEC(self, CECMod, glassglass=False, bifi=None):
         """
         keys = ['alpha_sc', 'a_ref', 'I_L_ref', 'I_o_ref',  'R_sh_ref', 'R_s', 'Adjust']
 
-
-        self.glassglass = glassglass
+        if glassglass is not None:
+            self.glassglass = glassglass
         if bifi:
             self.bifi = bifi