Merge pull request #33 from LBNL-ETA/update-eprad

Update eprad

frads/eprad.py

@@ -106,10 +106,10 @@ def floors(self):
         return floors
 
     @property
-    def lighting_zones(self):
+    def lights(self):
         """
         Example:
-            >>> model.lighting_zones
+            >>> model.lights
         """
         if "Lights" in self.epjs:
             return list(self.epjs["Lights"].keys())
@@ -763,7 +763,6 @@ def run(
         output_directory: Optional[str] = "./",
         output_prefix: Optional[str] = "eplus",
         output_suffix: Optional[str] = "L",
-        weather_file: Optional[str] = None,
         silent: bool = False,
         annual: bool = False,
         design_day: bool = False,
@@ -787,8 +786,8 @@ def run(
         """
         opt = ["-d", output_directory, "-p", output_prefix, "-s", output_suffix]
 
-        if weather_file is not None:
-            opt.extend(["-w", weather_file])
+        if self.epw is not None:
+            opt.extend(["-w", self.epw])
         elif design_day:
             if "SizingPeriod:DesignDay" in self.epjs:
                 opt.append("-D")
@@ -804,7 +803,7 @@ def run(
             )
 
         if annual:
-            if weather_file is not None:
+            if self.epw is not None:
                 opt.append("-a")
             else:
                 raise ValueError(

test/test_eprad.py

@@ -17,7 +17,7 @@ def test_energyplusmodel():
     assert isinstance(epmodel.zones, list)
     assert isinstance(epmodel.window_walls, list)
     assert isinstance(epmodel.windows, list)
-    assert isinstance(epmodel.lighting_zones, list)
+    assert isinstance(epmodel.lights, list)
     assert isinstance(epmodel.complex_fenestration_states, list)