Merge pull request #46 from urbanopt/rnm-results

Rnm results

CHANGELOG.md

@@ -1,5 +1,10 @@
 # URBANopt DiTTo Reader CHANGELOG
 
+# Version 0.5.1
+Date Range 11/28/2022 - 12/15/2022
+- Update dependency management for DiTTo
+- Generate Model.json results file for RNM to OpenDSS workflow
+
 # Version 0.5.0
 Date Range 04/13/2022 - 11/28/2022
 - Fix typo in extended catalog

setup.py

@@ -42,14 +42,14 @@
 
 from setuptools import setup, find_packages
 
-requirements = ["ditto.py~=0.2.3", "opendssdirect.py~=0.6.1"]
+requirements = ["ditto.py[opendss]~=0.2.3", "opendssdirect.py~=0.6.1"]
 
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 setup(
     name="urbanopt-ditto-reader",
-    version="0.5.0",
+    version="0.5.1",
     author="Tarek Elgindy",
     author_email="[email protected]",
     description="Enhancement of URBANopt GeoJSON that can be consumed by DiTTo reader",

urbanopt_ditto_reader/urbanopt_ditto_reader.py

@@ -564,12 +564,18 @@ def run_rnm_opendss(self):
         model = Store()
         master_file = os.path.join(self.rnm_results, 'dss_files', 'Master.dss')
         buscoordinates_file = os.path.join(self.rnm_results, 'dss_files', 'BusCoord.dss')
+        print(f"!!! masterFILE: {master_file}, buscoords: {buscoordinates_file}")
         reader = OpenDSSReader(
             master_file=master_file,
             buscoordinates_file=buscoordinates_file
         )
         reader.parse(model)
 
+        dss_json_path = os.path.join(self.dss_analysis, 'json_files')
+        os.makedirs(dss_json_path, exist_ok=True)
+        json_writer = JSONWriter(output_path=dss_json_path)
+        json_writer.write(model)
+
         # run the model through OpenDSS
         self.run(master_file)