arras-energy · dchassin · Jun 29, 2023 · Jul 3, 2023 · Jul 9, 2023 · Jul 10, 2023
diff --git a/Makefile.am b/Makefile.am
@@ -10,6 +10,8 @@
 # Authors:
 #   DP Chassin (dchassin@slac.stanford.edu)
 
+.SILENT:
+
 $(info Current target is $(shell $(top_srcdir)/build-aux/version.sh --name))
 
 # !!! must match version specified in configure.ac
@@ -50,13 +52,15 @@ AM_LDFLAGS += -module
 AM_LDFLAGS += -avoid-version
 AM_LDFLAGS += -export-dynamic
 AM_LDFLAGS += $(GLD_LDFLAGS) -lpython$(PYVER)
+AM_LIBTOOLFLAGS = --quiet
 
 # makefile fragments populate these variables
 BUILT_SOURCES = 
 CLEANFILES =
 EXTRA_DIST =
 dist_pkgdata_DATA = requirements.txt
 pkgdata_DATA =
+pkginclude_HEADERS =
 noinst_LTLIBRARIES =
 pkglib_LTLIBRARIES =
 bin_PROGRAMS =
@@ -291,11 +295,18 @@ $(PREFIX)/docker.img: docker/Dockerfile Makefile
 	@mkdir -p $(prefix)
 	docker save $(PACKAGE)/$(PACKAGE_VERSION)-$(PACKAGE_BRANCH):latest -o $(prefix)/docker.img
 
-system: python-install install
+system: python-install install $(prefix)/src
 	@echo "Setting $$($(top_srcdir)/build-aux/version.sh --install) to the current system version"
 	@$(prefix)/bin/gridlabd version set
 	@test "$$(gridlabd --version=install)" = "$$($(top_srcdir)/build-aux/version.sh --install)" || echo 'WARNING : build and install versions differ; use build `--clean` option to fix this problem'
 
+$(prefix)/src:
+	@echo Copying source files to $@...
+	@mkdir -p $(prefix)/src/source $(prefix)/src/python
+	@cp $(top_srcdir)/source/*.cpp $(prefix)/src/source
+	@cp $(top_srcdir)/python/*.cpp $(prefix)/src/python
+	@chmod -R 555 $(prefix)/src
+
 index: weather library template
 
 html-local: module-html developer-html troubleshooting-html

diff --git a/README.md b/README.md
@@ -30,13 +30,13 @@ The preferred method for running HiPAS GridLAB-D is to download the master image
 Once you have installed docker, you may issue the following commands to run GridLAB-D at the command line:
 
 ~~~
-docker run -it -v $PWD:/model arras-energy/gridlabd:latest gridlabd -W /model [LOADOPTIONS] [FILENAME.EXT] [RUNOPTIONS] 
+docker run -it -v $PWD:/model lfenergy/arras:latest gridlabd -W /model [LOADOPTIONS] [FILENAME.EXT] [RUNOPTIONS] 
 ~~~ 
 
 On many systems, an alias can be used to make this a simple command that resembles the command you would normally issue to run a host-based installation:
 
 ~~~
-alias gridlabd='docker run -it -v $PWD:/tmp arras-energy/gridlabd:latest gridlabd'
+alias gridlabd='docker run -it -v $PWD:/tmp lfenergy/arras:latest gridlabd'
 ~~~
 
 Note that this alias will interfere with any host-based installation. You may use the `gridlabd docker` command to manage the use of docker images concurrently with host-based installations.

diff --git a/build.sh b/build.sh
@@ -126,7 +126,7 @@ test -f $HOME/.gridlabd/bin/activate || error "$HOME/.gridlabd is not found. Run
 test ! -z "$VIRTUAL_ENV" || . $HOME/.gridlabd/bin/activate 1>$STDOUT 2>$STDERR
 test ! -z "$VIRTUAL_ENV" || error "unable to activate gridlabd venv"
 test -f ./configure || autoreconf -isf 1>$STDOUT 2>$STDERR || error "autoconf failed"
-test -f Makefile || ./configure $CONFIGURE 1>$STDOUT 2>$STDERR || error "./configure failed"
+test -f Makefile || ./configure --enable-silent-rules $CONFIGURE 1>$STDOUT 2>$STDERR || error "./configure failed"
 make $MAKEFLAGS $TARGET 1>$STDOUT 2>$STDERR || error "unable to make build"
 if [ ! -z "$VERIFY" ]; then
 	$(build-aux/version.sh --install)/bin/gridlabd $VERIFY 1>$STDOUT 2>$STDERR || error "unable to verify install"

diff --git a/cloud/websites/docs.gridlabd.us/index.html b/cloud/websites/docs.gridlabd.us/index.html
@@ -1,15 +1,9 @@
 <!DOCTYPE HTML />
 <HTML>
-<SCRIPT LANGUAGE="Javascript" SRC="_defaults.js"></SCRIPT>
-<SCRIPT LANGUAGE="JavaScript">
-	document.writeln('<FRAMESET ROWS="' + (top_panel_height+20) + ',*" BORDER=2>');
-    console.info(window.location.search)
-    document.writeln('<FRAME SRC="_topbar.html" NORESIZE="noresize"></FRAME>');
-    document.writeln('<FRAMESET COLS="320,*" BORDER=3>');
-    document.writeln('<FRAME NAME="contents" SRC="_contents.html' + window.location.search + '"></FRAME>');
-	document.writeln('<FRAME NAME="page" SRC="_page.html' + window.location.search + '"></FRAME>');
-    document.writeln('</FRAMESET>');
-    document.writeln('</FRAMESET>');
-</SCRIPT>
-
+<HEAD>
+<META HTTP-EQUIV="refresh" CONTENT="0,url=http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd" />
+</HEAD>
+<BODY>
+Redirecting to <A HREF="http://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd">http://docs.arras-energy.org/index.html?owner=arras-energy&project=gridlabd</A>...
+</BODY>
 </HTML>
diff --git a/configure.ac b/configure.ac
@@ -54,6 +54,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 ###############################################################################
 
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])
+AM_SILENT_RULES([yes])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 ###############################################################################

diff --git a/docs/Module/Python.md b/docs/Module/Python.md
@@ -2,7 +2,15 @@
 
 # Synopsis
 
-Python 3.6 or greater:
+GridLAB-D Python venv:
+~~~
+gridlabd shell
+python$PYTHON_VER -m venv myenv
+. myenv/bin/activate
+python3 -m pip install $GLD_ETC/*.whl
+~~~
+
+Python 3:
 ~~~
   >>> import gridlabd
   >>> gridlabd.title()
@@ -256,6 +264,7 @@ Saves the full model to the file.  The currently supported formats are `.glm`, `
 The following model is `test.glm`:
 ~~~
   module test;
+  #set suppress_repeat_messages=FALSE
   clock {
   	starttime '2018-01-01 00:00:00';
   	stoptime '2018-01-01 01:00:00';
@@ -308,7 +317,7 @@ bash$ python3
   2018-01-01 00:50:00 UTC,0.251099
   2018-01-01 00:55:00 UTC,2.778129
   2018-01-01 01:00:00 UTC,0.603100
-  4362511024
+  0
   >>> quit()
 ~~~
 The following example records all house temperature when the model commit if performed:
@@ -391,4 +400,6 @@ The first few lines of output are in `house.csv`:
 
 # See also
 
-* [[/Python subcommand]]
+* [[/Module/Python]]
+* [[/Subcommand/Shell]]
+
diff --git a/docs/Subcommand/Geodata.md b/docs/Subcommand/Geodata.md
@@ -167,7 +167,7 @@ You must subscribe to the TrafficView service to use this dataset.
 The following command obtains the distance between two locations:
 
 ~~~
-% gridlabd geodata -d -D distance location 37.4150,-122.2056 37.3880,-122.2884
+% gridlabd geodata merge -d -D distance location 37.4150,-122.2056 37.3880,-122.2884
 latitude,longitude,distance
 37.415,-122.2056,0.0
 37.388,-122.2884,7906.193731232153
@@ -176,7 +176,7 @@ latitude,longitude,distance
 The following command obtains the coordinates for the points between two locations at 1 km resolution:
 
 ~~~
-% gridlabd geodata -d -D distance location 37.4150,-122.2056 37.3880,-122.2884 -r 1000
+% gridlabd geodata merge -d -D distance location 37.4150,-122.2056 37.3880,-122.2884 -r 1000
 latitude,longitude,distance
 37.415,-122.2056,0.0
 37.41158495593229,-122.21607280180764,1000.0

diff --git a/docs/Subcommand/Shell.md b/docs/Subcommand/Shell.md
@@ -0,0 +1,51 @@
+[[/Subcommand/Shell]] -- Open GridLAB-D shell environment
+
+# Synopsis
+
+Shell:
+
+~~~
+sh$ gridlabd shell [OPTIONS ...]
+~~~
+
+# Description
+
+The `shell` subcommand opens a shell in the GridLAB-D environment. The shell used is the one currently running as specified by the `SHELL` environment variable. This can be used to run Python with the active python `venv` used for GridLAB-D, or to create a new Python virtual environment in which gridlabd can be run. The options are the same as for the shell current being used.
+
+The following environment variables are set in the shell environment:
+
+- `CCFLAGS`: C-compiler flags
+- `CFLAGS`: C-compiler flags
+- `CPPFLAGS`: C++ compiler flags
+- `CXXFLAGS`: C++ compiler flags
+- `GLD_BIN`: binary folder
+- `GLD_ETC`: shared files folder
+- `GLD_INC`: include files folder
+- `GLD_LIB`: library folder
+- `GLD_VER`: version folder
+- `GLPATH`: GridLAB-D file search path
+- `INCLUDE`: C-compiler include flags
+- `LDFLAGS`: linker flags
+- `LIB`: linker library path
+- `PYCCFLAGS`: python C-compiler flags
+- `PYLDFLAGS`: Python linker flags
+- `PYTHON_CONFIG` python config executable name
+- `PYTHON_VER`: python version number (major.minor)
+- `PYTHONPATH`: Python search path
+- `VIRTUAL_ENV`: Python virtual environment path
+- `VIRTUAL_ENV_PROMPT`: Python virtual environment prompt
+
+# Example
+
+The following commands open a GridLAB-D shell environment and create a Python virtual environment in which GridLAB-D is installed
+
+~~~
+gridlabd shell
+python$PYTHON_VER -m venv myenv
+. myenv/bin/activate
+python3 -m pip install $GLD_ETC/*.whl
+~~~
+
+# See also
+
+* [[/Subcommand/Python]]
diff --git a/geodata/geodata_powerline.py b/geodata/geodata_powerline.py
@@ -196,7 +196,7 @@ def TODO(value=float('nan')):
 }
 
 default_config = {
-    "cabletype_file" : f"{GLD_ETC}/gridlabd/geodata_powerline_cabletypes.csv",
+    "cabletype_file" : f"{GLD_ETC}/geodata_powerline_cabletypes.csv",
 }
 
 OPTIONS = default_options