Fix repo name

.github/workflows/develop-image.yml

@@ -178,6 +178,11 @@ jobs:
     - name: Run CF invalidation
       run: aws cloudfront create-invalidation --distribution-id ${{ secrets.DEV_CF_ID }} --paths '/*'
 
+    - name: Set output
+      run: |
+        echo "VERSION=Arras Energy HiPAS GridLAB-D $(./build-aux/version.sh --version) (Developer)" >> $GITHUB_ENV
+        echo "TAGNAME=gridlabd/$(./build-aux/version.sh --version)-$(./build-aux/version.sh --number)-$(./build-aux/version.sh --branch)" >> $GITHUB_ENV
+
     - name: Install Packer
       run: |
         wget https://releases.hashicorp.com/packer/1.7.6/packer_1.7.6_linux_amd64.zip
@@ -195,6 +200,8 @@ jobs:
           -var "aws_secret_key=${{ secrets.AWS_SECRET_ACCESS_KEY }}" \
           -var "aws_region=${{ secrets.AWS_REGION }}" \
           -var "dev_s3_url=${{ secrets.DEV_S3_URL }}" \
+          -var "version=${{ env.VERSION }}" \
+          -var "tagname=${{ env.TAGNAME }}" \
           ./docker/packer/templateDevelop.pkr.hcl
 
   buildUbuntuDockerhub:

.github/workflows/master-image.yml

@@ -152,6 +152,11 @@ jobs:
     - name: Run CF invalidation
       run: aws cloudfront create-invalidation --distribution-id ${{ secrets.PROD_CF_ID }} --paths '/*'
 
+    - name: Set output
+      run: |
+        echo "VERSION=Arras Energy HiPAS GridLAB-D $(./build-aux/version.sh --version)" >> $GITHUB_ENV
+        echo "TAGNAME=gridlabd/$(./build-aux/version.sh --version)-$(./build-aux/version.sh --number)-$(./build-aux/version.sh --branch)" >> $GITHUB_ENV
+
     - name: Install Packer
       run: |
         wget https://releases.hashicorp.com/packer/1.7.6/packer_1.7.6_linux_amd64.zip
@@ -169,6 +174,8 @@ jobs:
           -var "aws_secret_key=${{ secrets.AWS_SECRET_ACCESS_KEY }}" \
           -var "aws_region=${{ secrets.AWS_REGION }}" \
           -var "prod_s3_url=${{ secrets.PROD_S3_URL }}" \
+          -var "version=${{ env.VERSION }}" \
+          -var "tagname=${{ env.TAGNAME }}" \
           ./docker/packer/prod.pkr.hcl
 
   buildUbuntuDockerhub:
@@ -184,7 +191,7 @@ jobs:
     - name: Set output
       run: |
         echo "VERSION=$(./build-aux/version.sh --version)" >> $GITHUB_ENV
-        
+
     - name: Login to DockerHub
       uses: docker/login-action@v1
       with:

README.md

@@ -8,13 +8,13 @@ This is the last release of HiPAS GridLAB-D before it is transferred to LF Energ
 
 | Repository | Build | Deploy |
 | :---: | :---: | :---: |
-| [GridLAB-D](https://github.com/slacgismo/gridlabd) | ![master](https://github.com/slacgismo/gridlabd/actions/workflows/master.yml/badge.svg?branch=master) ![develop](https://github.com/slacgismo/gridlabd/workflows/develop/badge.svg?branch=develop) | [![master-images](https://github.com/slacgismo/gridlabd/actions/workflows/master-image.yml/badge.svg)](https://github.com/slacgismo/gridlabd/actions/workflows/master-image.yml) [![develop-images](https://github.com/slacgismo/gridlabd/actions/workflows/develop-image.yml/badge.svg)](https://github.com/slacgismo/gridlabd/actions/workflows/develop-image.yml) |
-| [Templates](https://github.com/slacgismo/gridlabd-template) | [![master](https://github.com/slacgismo/gridlabd-template/actions/workflows/master.yml/badge.svg)](https://github.com/slacgismo/gridlabd-template/actions/workflows/master.yml) [![develop](https://github.com/slacgismo/gridlabd-template/actions/workflows/develop.yml/badge.svg)](https://github.com/slacgismo/gridlabd-template/actions/workflows/develop.yml)
-| [Weather](https://github.com/slacgismo/gridlabd-weather) | [![validate](https://github.com/slacgismo/gridlabd-weather/actions/workflows/validate.yml/badge.svg)](https://github.com/slacgismo/gridlabd-weather/actions/workflows/validate.yml)
-| [Library](https://github.com/slacgismo/gridlabd-library) | [![validate](https://github.com/slacgismo/gridlabd-library/actions/workflows/master.yml/badge.svg)](https://github.com/slacgismo/gridlabd-library/actions/workflows/master.yml) [![validate](https://github.com/slacgismo/gridlabd-library/actions/workflows/develop.yml/badge.svg)](https://github.com/slacgismo/gridlabd-library/actions/workflows/develop.yml)
-| [Models](https://github.com/slacgismo/gridlabd-models) | [![validate](https://github.com/slacgismo/gridlabd-models/actions/workflows/validate.yml/badge.svg)](https://github.com/slacgismo/gridlabd-models/actions/workflows/validate.yml)
-| [Benchmarks](https://github.com/slacgismo/gridlabd-benchmarks) | Manual test (see [README.md](https://github.com/slacgismo/gridlabd-benchmarks/blob/main/README.md))
-| [Examples](https://github.com/slacgismo/gridlabd-examples) | Manual test (see [README.md](https://github.com/slacgismo/gridlabd-examples/blob/master/README.md))
+| [GridLAB-D](https://github.com/arras-energy/gridlabd) | ![master](https://github.com/arras-energy/gridlabd/actions/workflows/master.yml/badge.svg?branch=master) ![develop](https://github.com/arras-energy/gridlabd/workflows/develop/badge.svg?branch=develop) | [![master-images](https://github.com/arras-energy/gridlabd/actions/workflows/master-image.yml/badge.svg)](https://github.com/arras-energy/gridlabd/actions/workflows/master-image.yml) [![develop-images](https://github.com/arras-energy/gridlabd/actions/workflows/develop-image.yml/badge.svg)](https://github.com/arras-energy/gridlabd/actions/workflows/develop-image.yml) |
+| [Templates](https://github.com/arras-energy/gridlabd-template) | [![master](https://github.com/arras-energy/gridlabd-template/actions/workflows/master.yml/badge.svg)](https://github.com/arras-energy/gridlabd-template/actions/workflows/master.yml) [![develop](https://github.com/arras-energy/gridlabd-template/actions/workflows/develop.yml/badge.svg)](https://github.com/arras-energy/gridlabd-template/actions/workflows/develop.yml)
+| [Weather](https://github.com/arras-energy/gridlabd-weather) | [![validate](https://github.com/arras-energy/gridlabd-weather/actions/workflows/validate.yml/badge.svg)](https://github.com/arras-energy/gridlabd-weather/actions/workflows/validate.yml)
+| [Library](https://github.com/arras-energy/gridlabd-library) | [![validate](https://github.com/arras-energy/gridlabd-library/actions/workflows/master.yml/badge.svg)](https://github.com/arras-energy/gridlabd-library/actions/workflows/master.yml) [![validate](https://github.com/arras-energy/gridlabd-library/actions/workflows/develop.yml/badge.svg)](https://github.com/arras-energy/gridlabd-library/actions/workflows/develop.yml)
+| [Models](https://github.com/arras-energy/gridlabd-models) | [![validate](https://github.com/arras-energy/gridlabd-models/actions/workflows/validate.yml/badge.svg)](https://github.com/arras-energy/gridlabd-models/actions/workflows/validate.yml)
+| [Benchmarks](https://github.com/arras-energy/gridlabd-benchmarks) | Manual test (see [README.md](https://github.com/arras-energy/gridlabd-benchmarks/blob/main/README.md))
+| [Examples](https://github.com/arras-energy/gridlabd-examples) | Manual test (see [README.md](https://github.com/arras-energy/gridlabd-examples/blob/master/README.md))
 
 
 The documentation for this project is located at http://docs.gridlabd.us/.
@@ -25,18 +25,18 @@ This respository contains the source code to HiPAS GridLAB-D, which is being dev
 
 # Quick start using Docker
 
-The preferred method for running HiPAS GridLAB-D is to download the master image from docker hub (see https://hub.docker.com/repository/docker/slacgismo/gridlabd).  You must install the docker daemon to use docker images.  See https://www.docker.com/get-started for details.
+The preferred method for running HiPAS GridLAB-D is to download the master image from docker hub (see https://hub.docker.com/repository/docker/arras-energy/gridlabd).  You must install the docker daemon to use docker images.  See https://www.docker.com/get-started for details.
 
 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 slacgismo/gridlabd:latest gridlabd -W /model [LOADOPTIONS] [FILENAME.EXT] [RUNOPTIONS] 
+docker run -it -v $PWD:/model arras-energy/gridlabd: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 slacgismo/gridlabd:latest gridlabd'
+alias gridlabd='docker run -it -v $PWD:/tmp arras-energy/gridlabd: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.
@@ -103,7 +103,7 @@ If you want to clone an alternate repository, use the following `git` command in
 git clone https://github.com/ORG/REPO [-b BRANCH] gridlabd
 ~~~
 
-If you do not specify the `--local` then by default the `setup.sh` source will match the `git` repository origin and branch if any. Otherwise the default source will be `slacgismo/gridlabd/master`. If you want to setup from a different origin, use the command `export GRIDLABD_ORIGIN=ORG/REPO/BRANCH` to specify an alternate source for `setup.sh`.  The `build.sh` will also match the current `git` repository.
+If you do not specify the `--local` then by default the `setup.sh` source will match the `git` repository origin and branch if any. Otherwise the default source will be `arras-energy/gridlabd/master`. If you want to setup from a different origin, use the command `export GRIDLABD_ORIGIN=ORG/REPO/BRANCH` to specify an alternate source for `setup.sh`.  The `build.sh` will also match the current `git` repository.
 
 *Do not* run the `setup.sh` and `build.sh` scripts with `sudo`, as that will usually create a broken install. If necessary, you should give yourself permission to write `/usr/local` and `brew`'s install folder. If you have not already done so, add `brew` to your path.
 

autotest/README.md

@@ -1,5 +1,5 @@
 # Autotest
 
-This folder contains the DOE taxonomy feeder tests of GridLAB-D's powerflow solver. For more information on the feeder models, see https://github.com/slacgismo/gridlabd-models.
+This folder contains the DOE taxonomy feeder tests of GridLAB-D's powerflow solver. For more information on the feeder models, see https://github.com/arras-energy/gridlabd-models.
 
 To run a validation test using this folder on, run the command `gridlabd -W autotest -T 0 --validate`.

build-aux/version.sh

@@ -18,7 +18,7 @@
 ##   --python        the python version, e.g., 3.10
 ##   --parse INSTALL parses an install name into its constituents
 ##   --docker        the docker tag name, e.g., 4.3.1-230701-master-ubuntu_22-x86_64
-##   --origin        the origin of the source code, e.g., slacgismo/gridlabd/master
+##   --origin        the origin of the source code, e.g., arras-energy/gridlabd/master
 ##
 ## This file is used by autoconf to generate the version string.
 ## It is assumed that this script is run from the top-level srcdir.

cloud/servers/version.gridlabd.us/install.sh

@@ -1,6 +1,6 @@
 # EC2 server build script
 #
-# See github:/slacgismo/gridlabd/cloud/servers/version.gridlabd.us/README.md for details
+# See github:/arras-energy/gridlabd/cloud/servers/version.gridlabd.us/README.md for details
 
 #
 # Clone gridlabd

cloud/websites/docs.gridlabd.us/index.html

@@ -1,8 +1,8 @@
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="refresh" CONTENT="0,url=http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd" />
+<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=slacgismo&project=gridlabd">http://docs.slacgismo.org/index.html?owner=slacgismo&project=gridlabd</A>...
+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>

cloud/websites/geodata.gridlabd.us/index.html

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-    <META HTTP-EQUIV="refresh" CONTENT="0;URL=https://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Geodata.md">
+    <META HTTP-EQUIV="refresh" CONTENT="0;URL=https://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Geodata.md">
 </HEAD>
 <BODY>
     Redirecting...

cloud/websites/status.gridlabd.us/active.html

@@ -96,7 +96,7 @@
 
             start = new Date(prompt("Enter report start date (yyyy-mm-dd): ",stop.getFullYear() + "-" + (stop.getMonth()+1) + "-01"));
 
-            r = run_query("/repos/slacgismo/gridlabd/issues?state=open&per_page=100&sort=updated&direction=asc&since="+start+"T00:00:00Z");
+            r = run_query("/repos/arras-energy/gridlabd/issues?state=open&per_page=100&sort=updated&direction=asc&since="+start+"T00:00:00Z");
             item_number = 1;
             if ( r.status == 200 )
             {

cloud/websites/status.gridlabd.us/issues-open.html

@@ -94,7 +94,7 @@
                 set_default("token",token);
             }
 
-            r = run_query("/repos/slacgismo/gridlabd/issues?state=open&per_page=100&sort=updated&direction=desc");
+            r = run_query("/repos/arras-energy/gridlabd/issues?state=open&per_page=100&sort=updated&direction=desc");
             if ( r.status == 200 )
             {
                 report = "GridLAB-D Open Issues as of " + stop.getFullYear() + "-" + (stop.getMonth()+1) + "-" + stop.getDate() + "\n";

cloud/websites/status.gridlabd.us/pulls-closed.html

@@ -95,7 +95,7 @@
 
             start = new Date(prompt("Enter report start date (yyyy-mm-dd): ",stop.getFullYear() + "-" + (stop.getMonth()+1) + "-01"));
 
-            r = run_query("/repos/slacgismo/gridlabd/pulls?state=closed&per_page=100&sort=updated&direction=desc");
+            r = run_query("/repos/arras-energy/gridlabd/pulls?state=closed&per_page=100&sort=updated&direction=desc");
             if ( r.status == 200 )
             {
                 report = "GridLAB-D Pull Requests Completed for period " + start.getFullYear() + "-" + (start.getMonth()+1) + "-" + start.getDate() + " - " + stop.getFullYear() + "-" + (stop.getMonth()+1) + "-" + stop.getDate() + "\n";

cloud/websites/status.gridlabd.us/pulls-open.html

@@ -94,7 +94,7 @@
                 set_default("token",token);
             }
 
-            r = run_query("/repos/slacgismo/gridlabd/pulls?state=open&per_page=100&sort=updated&direction=desc");
+            r = run_query("/repos/arras-energy/gridlabd/pulls?state=open&per_page=100&sort=updated&direction=desc");
             if ( r.status == 200 )
             {
                 report = "GridLAB-D Open Pull Requests as of " + stop.getFullYear() + "-" + (stop.getMonth()+1) + "-" + stop.getDate() + "\n";

converters/json2html.py

@@ -277,7 +277,7 @@ def get_popup(name,tag):
         label = item.title().replace("_"," ")
         try:
             module = data['classes'][value]['module']
-            value = f'<A TARGET="_blank" HREF="https://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Module/Powerflow&doc=/Module/{module.title()}/{value.title()}.md">{value}</A>'
+            value = f'<A TARGET="_blank" HREF="https://docs.gridlabd.us/index.html?owner=arras-energy&project=gridlabd&branch=master&folder=/Module/Powerflow&doc=/Module/{module.title()}/{value.title()}.md">{value}</A>'
         except:
             pass
         popup += f'<TR><TH>{label}</TH><TD>&nbsp;</TD><TD>{value}</TD></TR>\n'

docker/build.sh

@@ -14,7 +14,7 @@
 ##     			performed first
 ##
 ##   --release  Release the resulting image as the latest version of
-##    			slacgismo/gridlabd. The master branch is released
+##    			arras-energy/gridlabd. The master branch is released
 ##    			as 'latest'. Otherwise the branch name is used as the tag name.
 ## 
 error () { echo "ERROR [docker/build.sh]: $*" ; exit 1; }
@@ -54,7 +54,7 @@ if [ "$DOLATEST" = "yes" ]; then
 	if [ "$BRANCH" = "master" ]; then
 		BRANCH="latest"
 	fi
-	IMAGE="slacgismo/gridlabd-$(build-aux/version.sh --machine)"
+	IMAGE="arras-energy/gridlabd-$(build-aux/version.sh --machine)"
 	docker tag "$NAME:$TAG" "$IMAGE:$BRANCH" || error "tag latest failed"
 	if [ "$DOPUSH" = "yes" ]; then
 		docker push "$IMAGE:$BRANCH" || error "push latest failed"

docker/packer/prod.pkr.hcl

@@ -28,12 +28,22 @@ variable "prod_s3_url" {
   description = "S3 bucket URL"
 }
 
+variable "version" {
+  type        = string
+  description = "GridLAB-D Version"
+}
+
+variable "tagname" {
+  type        = string
+  description = "GridLAB-D Full Version Tag Name"
+}
+
 source "amazon-ebs" "ubuntu-22-04" {
   source_ami           = "ami-014d05e6b24240371"
   region               = var.aws_region
   instance_type        = "t2.micro"
   ssh_username         = "ubuntu"
-  ami_name             = "HiPAS Gridlabd Ubuntu 22.04 {{timestamp}}"
+  ami_name             = var.version
   ami_groups            = ["all"] // This will make the AMI publicly available
 
   launch_block_device_mappings {
@@ -44,7 +54,7 @@ source "amazon-ebs" "ubuntu-22-04" {
   }
 
   tags = {
-    Name        = "HiPAS Gridlabd Ubuntu 22.04 {{timestamp}}"
+    Name        = var.tagname
     CreatedBy   = "Packer"
     Environment = "Prod"
   }

docker/packer/templateDevelop.pkr.hcl

@@ -28,12 +28,22 @@ variable "dev_s3_url" {
   description = "S3 bucket URL"
 }
 
+variable "version" {
+  type        = string
+  description = "GridLAB-D Version"
+}
+
+variable "tagname" {
+  type        = string
+  description = "GridLAB-D Full Version Tag Name"
+}
+
 source "amazon-ebs" "ubuntu-22-04" {
   source_ami           = "ami-014d05e6b24240371"
   region               = var.aws_region
   instance_type        = "t2.micro"
   ssh_username         = "ubuntu"
-  ami_name             = "HiPAS Gridlabd Ubuntu Develop 22.04 {{timestamp}}"
+  ami_name             = var.version
 
   launch_block_device_mappings {
     device_name           = "/dev/sda1"
@@ -43,7 +53,7 @@ source "amazon-ebs" "ubuntu-22-04" {
   }
 
   tags = {
-    Name        = "HiPAS Gridlabd Ubuntu Develop 22.04 {{timestamp}}"
+    Name        = var.tagname
     CreatedBy   = "Packer"
     Environment = "Dev"
   }

docs/Cloud/GithubActions.md

@@ -13,7 +13,7 @@ jobs:
   simulate:
 
     runs-on: ubuntu-latest
-    container: slacgismo/gridlabd:master
+    container: arras-energy/gridlabd:master
 
     steps:
     - uses: actions/checkout@v3
@@ -50,7 +50,7 @@ jobs:
   simulate:
 
     runs-on: ubuntu-latest
-    container: slacgismo/gridlabd:master
+    container: arras-energy/gridlabd:master
 
     steps:
     - uses: actions/checkout@v3

docs/Getting Started.md

@@ -1,15 +1,15 @@
 The preferred method for running GridLAB-D is using [Docker](www.docker.org).  Once you have installed Docker, you can run GridLAB-D as follows.
 
 ~~~
-bash% docker run -it slacgismo/gridlabd:latest gridlabd <filename>
+bash% docker run -it arras-energy/gridlabd:latest gridlabd <filename>
 ~~~
 
 where `<filename` is the name of the model file in the container that you wish to run.
 
 If you wish to access the files in the current folder while running GridLAB-D in a container, then use the command
 
 ~~~
-bash% docker run -vit $PWD:$PWD slacgismo/gridlabd:latest gridlabd -W $PWD <filename>
+bash% docker run -vit $PWD:$PWD arras-energy/gridlabd:latest gridlabd -W $PWD <filename>
 ~~~
 
 More information on using GridLAB-D docker containers can be found at [[/Install/Docker]].