fixed mtx files

LBNL-ETA · Jan 11, 2024 · 77337c3 · 77337c3
1 parent 68cb45a
commit 77337c3
Show file tree

Hide file tree

Showing 34 changed files with 37 additions and 35 deletions.
diff --git a/afc/radiance/forecast.py b/afc/radiance/forecast.py
@@ -74,7 +74,7 @@ class Forecast():
     """Radiance forecaster class for the AFC."""
 
     def __init__(self, cfg_path, regenerate=None, facade_type='ec', wpi_plot=False,
-                 wpi_loc='occupant', location=None, filestruct=None,
+                 wpi_loc='23back', location=None, filestruct=None,
                  _test_difference=False, dimensions=None):
         self.root = os.path.dirname(os.path.abspath(__file__))
         self.parse_config(cfg_path)
@@ -630,3 +630,4 @@ def compute2(self, weather_df, weather_cutoff=75):
     #    print(k, v)
     print(res)
     print(res['wpi_0_6'])
+    res.to_csv('radiance-forecast_original.csv')
diff --git a/afc/radiance/forecast2.py b/afc/radiance/forecast2.py
@@ -50,7 +50,7 @@ def __init__(
         regenerate=None,
         facade_type="ec",
         wpi_plot=False,
-        wpi_loc="occupant",
+        wpi_loc="23back",
         location=None,
         filestruct=None,
         _test_difference=False,
@@ -609,7 +609,7 @@ def compute2(self, weather_df, weather_cutoff=75):
         facade_type=facade_type,
         regenerate=False,
         filestruct=filestruct,
-        wpi_plot=True,
+        wpi_plot=False,
         wpi_loc="23back",
     )
 
@@ -643,3 +643,4 @@ def compute2(self, weather_df, weather_cutoff=75):
     #    print(k, v)
     print(res)
     print(res['wpi_0_6'])
+    res.to_csv('radiance-forecast_new.csv')
diff --git a/afc/resources/radiance/BSDF_blinds0.4/shgc/0Double_Low-e_Venetian_Blind_90_0_SHGC.mtx b/afc/resources/radiance/BSDF_blinds0.4/shgc/0Double_Low-e_Venetian_Blind_90_0_SHGC.mtx
@@ -4,4 +4,4 @@ NROWS=1
 NCOLS=145
 FORMAT=ascii
 
-0.004275	0.004275	0.004275	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.003880	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003840	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	
+0.004275	0.004275	0.004275	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.004165	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.00388	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.004129	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.00384	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.003691	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002948	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.002603	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918	0.000918
diff --git a/afc/resources/radiance/BSDF_blinds0.4/shgc/Double_Low-e_Venetian_Blind_-15_0_SHGC.mtx b/afc/resources/radiance/BSDF_blinds0.4/shgc/Double_Low-e_Venetian_Blind_-15_0_SHGC.mtx
@@ -4,4 +4,4 @@ NROWS=1
 NCOLS=145
 FORMAT=ascii
 
-0.009024	0.009024	0.009024	0.008781	0.008781	0.008781	0.008485	0.008485	0.008485	0.008364	0.008364	0.008364	0.008485	0.008485	0.008485	0.008781	0.008781	0.008781	0.009078	0.009078	0.009078	0.009202	0.009202	0.009202	0.009078	0.009078	0.009078	0.008157	0.008157	0.008157	0.007858	0.007858	0.007858	0.007594	0.007594	0.007594	0.007425	0.007425	0.007425	0.007362	0.007362	0.007362	0.007420	0.007420	0.007420	0.007594	0.007594	0.007594	0.007845	0.007845	0.007845	0.008157	0.008157	0.008157	0.008458	0.008458	0.008458	0.008728	0.008728	0.008728	0.008634	0.008634	0.008634	0.008583	0.008583	0.008583	0.008630	0.008630	0.008630	0.008728	0.008728	0.008728	0.008471	0.008471	0.008471	0.008656	0.008656	0.008656	0.008242	0.008242	0.008242	0.007871	0.007871	0.007871	0.007578	0.007578	0.007578	0.007390	0.007390	0.007390	0.007326	0.007326	0.007326	0.007390	0.007390	0.007390	0.007578	0.007578	0.007578	0.007871	0.007871	0.007871	0.008242	0.008242	0.008242	0.008656	0.008656	0.008656	0.009073	0.009073	0.009073	0.009152	0.009152	0.009152	0.008917	0.008917	0.008917	0.008768	0.008768	0.008768	0.008716	0.008716	0.008716	0.008768	0.008768	0.008768	0.008917	0.008917	0.008917	0.009152	0.009152	0.009152	0.009073	0.009073	0.009073	0.008021	0.008021	0.008021	0.007556	0.007556	0.007556	0.007126	0.007126	0.007126	0.006759	0.006759	0.006759	0.006478	0.006478	0.006478	0.006371	0.006371	0.006371	0.006357	0.006357	0.006357	0.006371	0.006371	0.006371	0.006478	0.006478	0.006478	0.006759	0.006759	0.006759	0.007126	0.007126	0.007126	0.007556	0.007556	0.007556	0.008021	0.008021	0.008021	0.008491	0.008491	0.008491	0.008343	0.008343	0.008343	0.008051	0.008051	0.008051	0.007828	0.007828	0.007828	0.007688	0.007688	0.007688	0.007641	0.007641	0.007641	0.007688	0.007688	0.007688	0.007828	0.007828	0.007828	0.008051	0.008051	0.008051	0.008343	0.008343	0.008343	0.008491	0.008491	0.008491	0.007663	0.007663	0.007663	0.007037	0.007037	0.007037	0.006459	0.006459	0.006459	0.006080	0.006080	0.006080	0.005991	0.005991	0.005991	0.005960	0.005960	0.005960	0.005950	0.005950	0.005950	0.005960	0.005960	0.005960	0.005991	0.005991	0.005991	0.006080	0.006080	0.006080	0.006459	0.006459	0.006459	0.007037	0.007037	0.007037	0.007663	0.007663	0.007663	0.008148	0.008148	0.008148	0.007687	0.007687	0.007687	0.007296	0.007296	0.007296	0.006998	0.006998	0.006998	0.006812	0.006812	0.006812	0.006749	0.006749	0.006749	0.006812	0.006812	0.006812	0.006998	0.006998	0.006998	0.007296	0.007296	0.007296	0.007687	0.007687	0.007687	0.008148	0.008148	0.008148	0.006031	0.006031	0.006031	0.005326	0.005326	0.005326	0.004793	0.004793	0.004793	0.004695	0.004695	0.004695	0.004645	0.004645	0.004645	0.004630	0.004630	0.004630	0.004624	0.004624	0.004624	0.004630	0.004630	0.004630	0.004645	0.004645	0.004645	0.004695	0.004695	0.004695	0.004793	0.004793	0.004793	0.005326	0.005326	0.005326	0.006031	0.006031	0.006031	0.006233	0.006233	0.006233	0.005717	0.005717	0.005717	0.005281	0.005281	0.005281	0.005121	0.005121	0.005121	0.005079	0.005079	0.005079	0.005068	0.005068	0.005068	0.005079	0.005079	0.005079	0.005121	0.005121	0.005121	0.005281	0.005281	0.005281	0.005717	0.005717	0.005717	0.006233	0.006233	0.006233	0.005153	0.005153	0.005153	0.004079	0.004079	0.004079	0.003974	0.003974	0.003974	0.003941	0.003941	0.003941	0.003936	0.003936	0.003936	0.003941	0.003941	0.003941	0.003974	0.003974	0.003974	0.004072	0.004072	0.004072	0.005153	0.005153	0.005153	0.004727	0.004727	0.004727	0.004321	0.004321	0.004321	0.004271	0.004271	0.004271	0.004254	0.004254	0.004254	0.004269	0.004269	0.004269	0.004321	0.004321	0.004321	0.004683	0.004683	0.004683	0.001626	0.001626	0.001626	0.001283	0.001283	0.001283	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001283	0.001283	0.001283	0.001626	0.001626	0.001626	0.001366	0.001366	0.001366	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001366	0.001366	0.001366	
+0.009024	0.009024	0.009024	0.008781	0.008781	0.008781	0.008485	0.008485	0.008485	0.008364	0.008364	0.008364	0.008485	0.008485	0.008485	0.008781	0.008781	0.008781	0.009078	0.009078	0.009078	0.009202	0.009202	0.009202	0.009078	0.009078	0.009078	0.008157	0.008157	0.008157	0.007858	0.007858	0.007858	0.007594	0.007594	0.007594	0.007425	0.007425	0.007425	0.007362	0.007362	0.007362	0.00742	0.00742	0.00742	0.007594	0.007594	0.007594	0.007845	0.007845	0.007845	0.008157	0.008157	0.008157	0.008458	0.008458	0.008458	0.008728	0.008728	0.008728	0.008634	0.008634	0.008634	0.008583	0.008583	0.008583	0.00863	0.00863	0.00863	0.008728	0.008728	0.008728	0.008471	0.008471	0.008471	0.008656	0.008656	0.008656	0.008242	0.008242	0.008242	0.007871	0.007871	0.007871	0.007578	0.007578	0.007578	0.00739	0.00739	0.00739	0.007326	0.007326	0.007326	0.00739	0.00739	0.00739	0.007578	0.007578	0.007578	0.007871	0.007871	0.007871	0.008242	0.008242	0.008242	0.008656	0.008656	0.008656	0.009073	0.009073	0.009073	0.009152	0.009152	0.009152	0.008917	0.008917	0.008917	0.008768	0.008768	0.008768	0.008716	0.008716	0.008716	0.008768	0.008768	0.008768	0.008917	0.008917	0.008917	0.009152	0.009152	0.009152	0.009073	0.009073	0.009073	0.008021	0.008021	0.008021	0.007556	0.007556	0.007556	0.007126	0.007126	0.007126	0.006759	0.006759	0.006759	0.006478	0.006478	0.006478	0.006371	0.006371	0.006371	0.006357	0.006357	0.006357	0.006371	0.006371	0.006371	0.006478	0.006478	0.006478	0.006759	0.006759	0.006759	0.007126	0.007126	0.007126	0.007556	0.007556	0.007556	0.008021	0.008021	0.008021	0.008491	0.008491	0.008491	0.008343	0.008343	0.008343	0.008051	0.008051	0.008051	0.007828	0.007828	0.007828	0.007688	0.007688	0.007688	0.007641	0.007641	0.007641	0.007688	0.007688	0.007688	0.007828	0.007828	0.007828	0.008051	0.008051	0.008051	0.008343	0.008343	0.008343	0.008491	0.008491	0.008491	0.007663	0.007663	0.007663	0.007037	0.007037	0.007037	0.006459	0.006459	0.006459	0.00608	0.00608	0.00608	0.005991	0.005991	0.005991	0.00596	0.00596	0.00596	0.00595	0.00595	0.00595	0.00596	0.00596	0.00596	0.005991	0.005991	0.005991	0.00608	0.00608	0.00608	0.006459	0.006459	0.006459	0.007037	0.007037	0.007037	0.007663	0.007663	0.007663	0.008148	0.008148	0.008148	0.007687	0.007687	0.007687	0.007296	0.007296	0.007296	0.006998	0.006998	0.006998	0.006812	0.006812	0.006812	0.006749	0.006749	0.006749	0.006812	0.006812	0.006812	0.006998	0.006998	0.006998	0.007296	0.007296	0.007296	0.007687	0.007687	0.007687	0.008148	0.008148	0.008148	0.006031	0.006031	0.006031	0.005326	0.005326	0.005326	0.004793	0.004793	0.004793	0.004695	0.004695	0.004695	0.004645	0.004645	0.004645	0.00463	0.00463	0.00463	0.004624	0.004624	0.004624	0.00463	0.00463	0.00463	0.004645	0.004645	0.004645	0.004695	0.004695	0.004695	0.004793	0.004793	0.004793	0.005326	0.005326	0.005326	0.006031	0.006031	0.006031	0.006233	0.006233	0.006233	0.005717	0.005717	0.005717	0.005281	0.005281	0.005281	0.005121	0.005121	0.005121	0.005079	0.005079	0.005079	0.005068	0.005068	0.005068	0.005079	0.005079	0.005079	0.005121	0.005121	0.005121	0.005281	0.005281	0.005281	0.005717	0.005717	0.005717	0.006233	0.006233	0.006233	0.005153	0.005153	0.005153	0.004079	0.004079	0.004079	0.003974	0.003974	0.003974	0.003941	0.003941	0.003941	0.003936	0.003936	0.003936	0.003941	0.003941	0.003941	0.003974	0.003974	0.003974	0.004072	0.004072	0.004072	0.005153	0.005153	0.005153	0.004727	0.004727	0.004727	0.004321	0.004321	0.004321	0.004271	0.004271	0.004271	0.004254	0.004254	0.004254	0.004269	0.004269	0.004269	0.004321	0.004321	0.004321	0.004683	0.004683	0.004683	0.001626	0.001626	0.001626	0.001283	0.001283	0.001283	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001276	0.001283	0.001283	0.001283	0.001626	0.001626	0.001626	0.001366	0.001366	0.001366	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001353	0.001366	0.001366	0.001366