Merge pull request #30 from LBNL-ETA/api-renaming

Api renaming
LBNL-ETA · Aug 30, 2023 · 65326bb · 65326bb
2 parents 5a05892 + 8adc6b2
commit 65326bb
Show file tree

Hide file tree

Showing 14 changed files with 4,946 additions and 236 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,
@@ -88,31 +88,31 @@
 __all__ = [
     "AIR",
     "ARGON",
-    "EPModel",
+    "EnergyPlusModel",
     "EnergyPlusSetup",
+    "ep_datetime_parser",
+    "epjson_to_rad",
     "FivePhaseMethod",
+    "gen_grid",
+    "gen_perez_sky",
+    "genskymtx",
     "GlazingSystem",
     "KRYPTON",
+    "load_matrix",
+    "matrix_multiply_rgb",
+    "parse_epw",
+    "parse_wea",
     "SensorSender",
     "SkyReceiver",
     "SunReceiver",
     "SurfaceReceiver",
     "SurfaceSender",
     "ThreePhaseMethod",
     "TwoPhaseMethod",
+    "unpack_primitives",
     "ViewSender",
     "WeaData",
     "WeaMetaData",
     "WorkflowConfig",
     "XENON",
-    "ep_datetime_parser",
-    "epjson2rad",
-    "gen_grid",
-    "gen_perez_sky",
-    "genskymtx",
-    "load_matrix",
-    "matrix_multiply_rgb",
-    "parse_epw",
-    "parse_wea",
-    "unpack_primitives",
 ]
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."""
     site, zones, constructions, materials, matrices = parse_epjson(epmodel.epjs)
     # building_name = epjs["Building"].popitem()[0].replace(" ", "_")