Merge pull request #88 from pnnl/develop

Updates to auto testing and minors bug fixes. Version changes for HELICS 3.3, GridLABD 5.0.

README.md

@@ -15,11 +15,12 @@ TESP runs natively on Linux and can be installed by following a simple process [
 
 Change log:
 
-- v0.1.2  Patch for tape shield / concentric neutral 
-          cables with separate neutral conductor.
-- v0.3.0  Refactored agent classes for DSO+T study
-- v0.9.5  HELICS, MATPOWER/MOST, ERCOT and E+ 9.3 examples
-- v1.0.0  Tested on Ubuntu 18.04 LTS and 20.04 LTS
-- v1.0.1  Updates to consensus mechanism, HELICS 2.6.1
-- v1.0.2  ns-3 has optimized build with logging enabled
-- v1.1    Updated installation method and documentation
+- v0.1.2  Patch for tape shield / concentric neutral cables with separate neutral conductor.
+- v0.3.0  Refactored agent classes for DSO+T study.
+- v0.9.5  HELICS, MATPOWER/MOST, ERCOT and E+ 9.3 examples.
+- v1.0.0  There are examples of the double-auction real-time market in real-time and day-ahead modes, and a transactive consensus mechanism for large buildings. The intended use case for TESP is to focus on the development and testing of transactive control agents, without having to build up a large system simulation infrastructure. There are sample agents provided in Python 3.6+, Java 11+, and C/C++.
+- Version 1.1.1  Updated installation method and documentation. Patches for SGIP1, consensus mechanism, standalone house generator. Updated examples from Helic2.8 to Helics3.0. Added DSO Stub case for agent testing.
+- Version 1.1.3  Updated some documentation and build patches.
+- Version 1.1.4  Updates to auto testing and minors bug fixes for Comm cases using HELICS3.0.
+- Version 1.1.5  Updates to auto testing and minors bug fixes for install and a better loadshed example.
+- Version 1.2.0  Updates to auto testing and minors bug fixes. Version changes for HELICS 3.3, GridLABD 5.0. Reorganize enviroment and updated documentation. Add more loadshed N3 examples.

data/comm/commshed.py

@@ -22,14 +22,14 @@ def helics_loop(tmax, market_period, thresh_kW, max_offset_kW):
 
     for i in range(pubCount):
         pub = helics.helicsFederateGetPublicationByIndex(hFed, i)
-        key = helics.helicsPublicationGetKey(pub)
+        key = helics.helicsPublicationGetName(pub)
         print('HELICS publication key', i, key)
         if 'offer' in key:
             pub_offer = pub
     for i in range(subCount):
         sub = helics.helicsFederateGetInputByIndex(hFed, i)
-        key = helics.helicsInputGetKey(sub)
-        target = helics.helicsSubscriptionGetKey(sub)
+        key = helics.helicsInputGetName(sub)
+        target = helics.helicsSubscriptionGetTarget(sub)
         print('HELICS subscription key', i, key, 'target', target)
         if 'distribution_load' in target:
             sub_load = sub

data/comm/commshedConfig.json

@@ -13,7 +13,7 @@
   ],
   "subscriptions" : [
     {
-      "key" : "gld1/distribution_load",
+      "key" : "gld_1/distribution_load",
       "type" : "complex",
       "required" : false
     }

data/comm/eplots.py

@@ -1,19 +1,20 @@
 # Copyright (C) 2021-2022 Battelle Memorial Institute
 # file: eplots.py
+# usage 'python3 eplots.py metrics_root my_title my_png'
 
-import tesp_support.process_eplus as ep
 import sys
 
-root='eplus'
-title=None
-pngfile=None
+import tesp_support.process_eplus as ep
+
+root = 'eplus'
+title = None
+pngfile = None
 
 if len(sys.argv) > 1:
-  root = sys.argv[1]
+    root = sys.argv[1]
 if len(sys.argv) > 2:
-  title = sys.argv[2]
+    title = sys.argv[2]
 if len(sys.argv) > 3:
-  pngfile = sys.argv[3]
-
-ep.process_eplus (root, title=title, save_file=pngfile)
+    pngfile = sys.argv[3]
 
+ep.process_eplus(root, title=title, save_file=pngfile)