Merge pull request #81 from pnnl/develop

Develop

examples/analysis/dsot/code/clean.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for dir in *; do
+  if [ -d "$dir" ]; then
+    rm -rf "$dir"
+  fi
+done

examples/analysis/sgip1/clean.sh

@@ -11,5 +11,5 @@ rm -f SGIP1*.yaml
 rm -f *.xml
 rm -f weather.dat
 rm -f output/*
-rmdir output
+rmdir output 2> /dev/null
 rm -f *.bnd

examples/capabilities/dsostub/clean.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for dir in *; do
+  if [ -d "$dir" ]; then
+    [ "$dir" = "data" ] && continue
+    rm -rf "$dir"
+  fi
+done

examples/capabilities/dsostubf/clean.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+for dir in *; do
+  if [ -d "$dir" ]; then
+    [ "$dir" = "data" ] && continue
+    rm -rf "$dir"
+  fi
+done

examples/capabilities/energyplus/clean.sh

@@ -6,7 +6,7 @@ rm -f *.xml
 rm -f *.png
 rm -f *metrics.json
 rm -f out*/*
-rmdir out*
+rmdir out* 2> /dev/null
 rm -f Winter*.idf
 rm -f Summer*.idf
 rm -f ems*.idf

examples/capabilities/loadshed-HELICS3-EPlus/Makefile

@@ -0,0 +1,68 @@
+INSTALL_PATH := ${INSTDIR}
+
+##############################################################################
+# Application-specific variables
+# Specifically, extracting all the ns-3 libraries to link against later,
+# such that I do not have to speciffy each of them.
+##############################################################################
+LIBDIRS = $(wildcard $(INSTALL_PATH)/lib*)
+$(info <<<<<<<<<< lib directory >>>>>>>>>>)
+$(info $(LIBDIRS))
+NS3_LIBFILES = $(patsubst $(LIBDIRS)/libns3%.so,-lns3%,$(wildcard $(LIBDIRS)/libns3*))
+$(info <<<<<<<<<< ns-3 lib files >>>>>>>>>>)
+$(info $(NS3_LIBFILES))
+HELICS_LIBFILES = $(patsubst $(LIBDIRS)/libhelics%.so,-lhelics%,$(wildcard $(LIBDIRS)/libhelics*))
+$(info <<<<<<<<<< HELICS lib files >>>>>>>>>>)
+$(info $(HELICS_LIBFILES))
+
+##############################################################################
+# Compiler specifications
+# These match the variable names given in /usr/share/lib/make/make.rules
+# so that make's generic rules work to compile our files.
+# gmake prefers CXX and CXXFLAGS for c++ programs
+##############################################################################
+CXX = g++
+CC = $(CXX)
+
+CXXFLAGS =
+CXXFLAGS += -std=c++17
+SRC = $(wildcard *.cc)
+OBJ = $(SRC:.cc=.o)
+BIN = $(OBJ:.o=) # my binary
+
+##############################################################################
+# What flags should be passed to the C pre-processor
+#   In other words, where should we look for files to include - note,
+#   you should never need to include compiler specific directories here
+#   because each compiler already knows where to look for its system
+#   files (unless you want to override the defaults)
+##############################################################################
+CPPFLAGS =
+CPPFLAGS += -I$(INSTALL_PATH)/include
+CPPFLAGS += -I$(wildcard $(INSTALL_PATH)/include/ns3*)
+$(info <<<<<<<<<< CPPFLAGS >>>>>>>>>>)
+$(info $(CPPFLAGS))
+
+##############################################################################
+# What flags should be passed to the linker
+#   In other words, where should we look for libraries to link with - note,
+#   you should never need to include compiler specific directories here
+#   because each compiler already knows where to look for its system files.
+##############################################################################
+LDFLAGS = -L. \
+          -L$(INSTALL_PATH)/lib
+# What libraries should be linked with.
+LDLIBS =
+LDLIBS += $(NS3_LIBFILES)
+LDLIBS += -lhelicscpp
+LDLIBS += -lhelicscpp-apps
+$(info <<<<<<<<<< LDLIBS >>>>>>>>>>)
+$(info $(LDLIBS))
+
+$(BIN): $(OBJ)
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+
+.PHONY: clean
+clean:
+	rm -f *.o
+	rm -f $(BIN)

examples/capabilities/loadshed-HELICS3-EPlus/helics_eplus.json

@@ -0,0 +1,172 @@
+{
+  "name" : "energyPlus",
+  "period" : 300.0,
+  "publications" : [ 
+    {
+      "global" : false,
+      "key" : "EMS Cooling Controlled Load",
+      "type" : "double",
+      "units" : "kWh"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Heating Controlled Load",
+      "type" : "double",
+      "units" : "kWh"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Cooling Schedule Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Heating Schedule Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Cooling Setpoint Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Heating Setpoint Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Cooling Current Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Heating Current Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Cooling Power State",
+      "type" : "string"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Heating Power State",
+      "type" : "string"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Cooling Volume",
+      "type" : "double",
+      "units" : "stere"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Heating Volume",
+      "type" : "double",
+      "units" : "stere"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Occupant Count",
+      "type" : "int",
+      "units" : "count"
+    },
+    {
+      "global" : false,
+      "key" : "EMS Indoor Air Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "WHOLE BUILDING Facility Total Electric Demand Power",
+      "type" : "double",
+      "units" : "W"
+    },
+    {
+      "global" : false,
+      "key" : "WHOLE BUILDING Facility Total HVAC Electric Demand Power",
+      "type" : "double",
+      "units" : "W"
+    },
+    {
+      "global" : false,
+      "key" : "FACILITY Facility Thermal Comfort ASHRAE 55 Simple Model Summer or Winter Clothes Not Comfortable Time",
+      "type" : "double",
+      "units" : "hour"
+    },
+    {
+      "global" : false,
+      "key" : "Environment Site Outdoor Air Drybulb Temperature",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS HEATING SETPOINT",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS HEATING CURRENT",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS COOLING SETPOINT",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "EMS COOLING CURRENT",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "H2_NOM SCHEDULE VALUE",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "H1_NOM SCHEDULE VALUE",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "C2_NOM SCHEDULE VALUE",
+      "type" : "double",
+      "units" : "degC"
+    },
+    {
+      "global" : false,
+      "key" : "C1_NOM SCHEDULE VALUE",
+      "type" : "double",
+      "units" : "degC"
+    }
+  ],
+  "subscriptions" : [
+    {
+      "key" : "eplus_agent/cooling_setpoint_delta", 
+      "type" : "double",
+      "required" : true
+    },
+    {
+      "key" : "eplus_agent/heating_setpoint_delta", 
+      "type" : "double",
+      "required" : true
+    }
+  ]
+}