Skip to content

Commit

Permalink
Merge pull request #322 from NREL/os290
Browse files Browse the repository at this point in the history
OS 2.9.0
  • Loading branch information
joseph-robertson committed Oct 15, 2019
2 parents fea197d + 68e6f9a commit e3c0faf
Show file tree
Hide file tree
Showing 254 changed files with 632,167 additions and 631,943 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: nrel/openstudio:2.8.1
- image: nrel/openstudio:2.9.0
steps:
- checkout
- run:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ Add the path to the install ruby libraries top the bottom of your ``~/.bash_prof

.. code:: bash
echo "export RUBYLIB=/Applications/OpenStudio-2.8.1/Ruby" >> ~/.bash_profile
echo "export ENERGYPLUS_EXE_PATH=\"/Applications/OpenStudio-2.8.1/EnergyPlus/energyplus-9.1.0\""
echo "export RUBYLIB=/Applications/OpenStudio-2.9.0/Ruby" >> ~/.bash_profile
echo "export ENERGYPLUS_EXE_PATH=\"/Applications/OpenStudio-2.9.0/EnergyPlus/energyplus-9.1.0\""
Install bundler and the libraries that bundler installs.

Expand Down
2 changes: 1 addition & 1 deletion docs/read_the_docs/source/tutorial/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Installation
Install OpenStudio and PAT
==========================

Download the latest stable software version of OpenStudio (2.8.1) from the `OpenStudio developer website <https://www.openstudio.net/developers>`_.
Download the latest stable software version of OpenStudio (2.9.0) from the `OpenStudio developer website <https://www.openstudio.net/developers>`_.
This is necessary because the latest critical changes to run ResStock projects are only available in the latest version.
Do a default install including Parametric Analysis Tool (PAT).

Expand Down
4 changes: 2 additions & 2 deletions docs/read_the_docs/source/tutorial/run_project.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ First, you will need some AWS credentials to allow PAT to start compute instance
Cluster Settings and Starting the Cluster
-----------------------------------------

Ensure that your project's AMI selection matches "2.8.1" (this should also be the version of OpenStudio/PAT that you are using). We will leave most of the rest of the settings at their defaults, but because we're doing a small analysis here, we're going to set the number of worker nodes to zero. For guidance on cluster settings for your analysis including instance selection and worker nodes see :doc:`../aws_cluster_config`.
Ensure that your project's AMI selection matches "2.9.0" (this should also be the version of OpenStudio/PAT that you are using). We will leave most of the rest of the settings at their defaults, but because we're doing a small analysis here, we're going to set the number of worker nodes to zero. For guidance on cluster settings for your analysis including instance selection and worker nodes see :doc:`../aws_cluster_config`.

.. image:: ../images/tutorial/run_on_cloud.png

Expand Down Expand Up @@ -56,7 +56,7 @@ Sometimes you will need *all* the simulation results including timeseries result

.. code-block:: bash
$ c:/openstudio-2.8.1/bin/openstudio.exe scripts/download_datapoints.rb -p project_singlefamilydetached -s http://ec2-107-23-165-146.compute-1.amazonaws.com -a 706c3b4a-9685-4924-bb13-c6bec77aa397
$ c:/openstudio-2.9.0/bin/openstudio.exe scripts/download_datapoints.rb -p project_singlefamilydetached -s http://ec2-107-23-165-146.compute-1.amazonaws.com -a 706c3b4a-9685-4924-bb13-c6bec77aa397
Additionally, the script has an optional argument to unzip each datapoint zip file on the fly.

Expand Down
72,212 changes: 36,106 additions & 36,106 deletions test/osm_files/MF_24units_2story_UB_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm

Large diffs are not rendered by default.

36,911 changes: 18,458 additions & 18,453 deletions test/osm_files/MF_2story_UB_ASHP2_HPWH.osm

Large diffs are not rendered by default.

40,519 changes: 20,262 additions & 20,257 deletions test/osm_files/MF_2story_UB_ASHP2_HPWH_Collapsed.osm

Large diffs are not rendered by default.

26,385 changes: 13,195 additions & 13,190 deletions test/osm_files/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osm

Large diffs are not rendered by default.

28,949 changes: 14,477 additions & 14,472 deletions test/osm_files/MF_2story_UB_FuelBoiler_AC1_FuelTankWH_Collapsed.osm

Large diffs are not rendered by default.

36,793 changes: 18,399 additions & 18,394 deletions test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH.osm

Large diffs are not rendered by default.

34,977 changes: 17,491 additions & 17,486 deletions test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH_Collapsed.osm

Large diffs are not rendered by default.

7,504 changes: 3,752 additions & 3,752 deletions test/osm_files/MF_40units_4story_CS_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

6,360 changes: 3,180 additions & 3,180 deletions test/osm_files/MF_40units_4story_SL_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

28,478 changes: 14,239 additions & 14,239 deletions test/osm_files/MF_40units_4story_SL_3Beds_2Baths_Denver_Furnace_CentralAC.osm

Large diffs are not rendered by default.

7,616 changes: 3,808 additions & 3,808 deletions test/osm_files/MF_40units_4story_UB_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

1,608 changes: 804 additions & 804 deletions test/osm_files/MF_8units_1story_CS_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

1,282 changes: 641 additions & 641 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

3,408 changes: 1,704 additions & 1,704 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm

Large diffs are not rendered by default.

6,150 changes: 3,075 additions & 3,075 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_Furnace_CentralAC.osm

Large diffs are not rendered by default.

3,354 changes: 1,677 additions & 1,677 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm

Large diffs are not rendered by default.

4,066 changes: 2,033 additions & 2,033 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank.osm

Large diffs are not rendered by default.

5,392 changes: 2,696 additions & 2,696 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm

Large diffs are not rendered by default.

7,128 changes: 3,564 additions & 3,564 deletions test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank_HWFixtures.osm

Large diffs are not rendered by default.

1,174 changes: 587 additions & 587 deletions test/osm_files/MF_8units_1story_SL_Denver.osm

Large diffs are not rendered by default.

1,148 changes: 574 additions & 574 deletions test/osm_files/MF_8units_1story_SL_Denver_ExteriorCorridor.osm

Large diffs are not rendered by default.

3,162 changes: 1,581 additions & 1,581 deletions test/osm_files/MF_8units_1story_SL_Denver_Windows_Doors.osm

Large diffs are not rendered by default.

1,516 changes: 758 additions & 758 deletions test/osm_files/MF_8units_1story_SL_Inset.osm

Large diffs are not rendered by default.

1,682 changes: 841 additions & 841 deletions test/osm_files/MF_8units_1story_UB_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

5,761 changes: 2,882 additions & 2,879 deletions test/osm_files/MF_HVACSizing_Load_8units_1story_UB.osm

Large diffs are not rendered by default.

4,653 changes: 2,328 additions & 2,325 deletions test/osm_files/MF_Successful_EnergyPlus_Run_TMY_Appl_PV.osm

Large diffs are not rendered by default.

3,808 changes: 1,904 additions & 1,904 deletions test/osm_files/SFA_10units_2story_CS_UA_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

4,004 changes: 2,002 additions & 2,002 deletions test/osm_files/SFA_10units_2story_FB_UA_3Beds_2Baths_Denver.osm

Large diffs are not rendered by default.

Loading

0 comments on commit e3c0faf

Please sign in to comment.