merge

LBNL-ETA · Aug 30, 2023 · 6fdb86b · 6fdb86b
2 parents aac54b0 + 65326bb
commit 6fdb86b
Show file tree

Hide file tree

Showing 14 changed files with 4,940 additions and 226 deletions.
diff --git a/frads/__init__.py b/frads/__init__.py
@@ -50,9 +50,9 @@
 
 import logging
 
-from .epjson2rad import epjson2rad
+from .epjson2rad import epjson_to_rad
 
-from .eprad import EPModel, EnergyPlusSetup, ep_datetime_parser
+from .eprad import EnergyPlusModel, EnergyPlusSetup, ep_datetime_parser
 
 from .matrix import (
     load_matrix,
@@ -92,16 +92,16 @@
 __all__ = [
     "AIR",
     "ARGON",
-    "EPModel",
+    "EnergyPlusModel",
     "EnergyPlusSetup",
     "FivePhaseMethod",
     "GlazingSystem",
     "KRYPTON",
     "Matrix",
     "SensorSender",
     "SkyReceiver",
-    "SunReceiver",
     "SunMatrix",
+    "SunReceiver",
     "SurfaceReceiver",
     "SurfaceSender",
     "ThreePhaseMethod",
@@ -113,11 +113,12 @@
     "XENON",
     "ep_datetime_parser",
     "epjson2rad",
+    "epjson_to_rad",
     "gen_grid",
     "gen_perez_sky",
     "genskymtx",
-    "load_matrix",
     "load_binary_matrix",
+    "load_matrix",
     "matrix_multiply_rgb",
     "parse_epw",
     "parse_wea",

diff --git a/frads/epjson2rad.py b/frads/epjson2rad.py
@@ -587,7 +587,7 @@ def parse_epjson(epjs: dict) -> tuple:
     return site, zones, constructions, materials, matrices
 
 
-def epjson2rad(epmodel, epw=None) -> dict:
+def epjson_to_rad(epmodel, epw=None) -> dict:
     """Command-line program to convert a energyplus model into a Radiance model.
 
     Args: