Merge pull request #132 from pnnl/develop

Stamping 1.3.3

README.md

@@ -26,5 +26,6 @@ Change log:
 - v1.2.0  Updates to auto testing and minors bug fixes. Version changes for HELICS 3.3, GridLAB-D 5.0. Reorganize environment and updated documentation. Add more loadshed N3 examples.
 - v1.2.1  Fixed python shell files, fixed complex python to use helics complex.
 - v1.2.2  Fixed the installation for Ubuntu 22.04.
-- v1.3.0  Refactor the TESP PyPI api. Upgrade all models(GridLAB-D, EnergyPlus, NS3) to work with HELICS 3.4. Add modifier.py for GridLAB-D models
-- v1.3.2  Updated model and modifier for GridLAB-D models, added readme for GLM modifier and Store examples
+- v1.3.0  Refactor the TESP PyPI api. Upgrade all models(GridLAB-D, EnergyPlus, NS3) to work with HELICS 3.4. Add modifier.py for GridLAB-D models.
+- v1.3.2  Updated model and modifier for GridLAB-D models, added readme for GLM modifier and Store examples.
+- v1.3.3  Add tesp_component download in tesp_support pypi, change directory structure. Add dockerfile for each module getting ready for dockerize COSU Simulations

doc/references/tesp_support.api.rst

@@ -81,18 +81,18 @@ tesp\_support.api.metrics\_collector module
    :undoc-members:
    :show-inheritance:
 
-tesp\_support.api.model module
-------------------------------
+tesp\_support.api.model\_GLM module
+-----------------------------------
 
-.. automodule:: tesp_support.api.model
+.. automodule:: tesp_support.api.model_GLM
    :members:
    :undoc-members:
    :show-inheritance:
 
-tesp\_support.api.modifier module
----------------------------------
+tesp\_support.api.modify\_GLM module
+------------------------------------
 
-.. automodule:: tesp_support.api.modifier
+.. automodule:: tesp_support.api.modify_GLM
    :members:
    :undoc-members:
    :show-inheritance:

examples/autotest.py

@@ -188,6 +188,8 @@ def combine_feeders_test():
         if sys.argv[1] == "FNCS":
             b_helics = False
 
+    # tr.run_test = tr.run_docker_test
+
     tr.init_tests()
     tesp_path = os.path.expandvars('$TESPDIR/examples')
     os.chdir(tesp_path)

install/Docker/TESP-Docker-Inputs/runFNCS-TESP-Container-Mac.sh

@@ -1,7 +1,7 @@
+#!/bin/bash
 # Copyright (c) 2021-2023 Battelle Memorial Institute
 # file: runFNCS-TESP-Container-Mac.sh
 
-#!/bin/bash
 clear
 # 
 TESP_REP="laurmarinovici/tesp"
@@ -60,7 +60,7 @@ echo "===== Setting up GridLAB-D paths and folders."
 docker container exec ${TESP_CONT} /bin/bash -c 'if test -e ${GLD_INSTALL}/bin/outputFiles; then rmdir ${GLD_INSTALL}/bin/outputFiles; mkdir ${GLD_INSTALL}/bin/outputFiles; else mkdir ${GLD_INSTALL}/bin/outputFiles; fi'
 
 # =================== Energy Plus settings =========================================================
-echo "===== Settting up Energy Plus paths and folders."
+echo "===== Setting up Energy Plus paths and folders."
 docker container exec ${TESP_CONT} /bin/bash -c 'if test -e ${EPLUS_INSTALL}/outputFiles; then rmdir ${EPLUS_INSTALL}/outputFiles; mkdir ${EPLUS_INSTALL}/outputFiles; else mkdir ${EPLUS_INSTALL}/outputFiles; fi'
 
 # =================== Energy Plus JSON settings =========================================================

scripts/build/stamp.sh

@@ -4,7 +4,7 @@ if [[ -z ${INSTDIR} ]]; then
   . "${HOME}/tespEnv"
 fi
 
-ver="1.3.2"
+ver="1.3.3"
 
 echo
 echo "Stamping TESP $ver, if you want to change the version, edit this file."