Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ set(CPACK_RPM_PACKAGE_URL "https://www.openstudio.net")

# The actual .deb file name on disk
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENSTUDIO_LONG_VERSION}-${CMAKE_SYSTEM_NAME}")
set(CPACK_PACKAGE_CONTACT "openstudio@nrel.gov")
set(CPACK_PACKAGE_CONTACT "openstudio@nlr.gov")

Comment on lines 1387 to 1390
if(APPLE)
set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENSTUDIO_LONG_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCH}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Clone the repository, create a build directory, and launch CMake:
### Prerequisites
Install [msysGit](http://msysgit.github.io/)

Extract [SWIG](http://developer.nrel.gov/downloads/buildings/openstudio/src/swigwin-3.0.2.zip) to `C:\swig`
Extract [SWIG](http://developer.nlr.gov/downloads/buildings/openstudio/src/swigwin-3.0.2.zip) to `C:\swig`
Append `C:\swig\swigwin-3.0.2;` to the System `Path` variable
> _Latest v3.0.2 tested and working_

Expand All @@ -71,7 +71,7 @@ Install [CMake](http://www.cmake.org/files/v3.0/cmake-3.0.0-win32-x86.exe)

Install [EnergyPlus 8.1](http://apps1.eere.energy.gov/buildings/energyplus/register.cfm?goto=eplus)

Optionally extract [Ruby](http://developer.nrel.gov/downloads/buildings/openstudio/src/ruby-1.8.6-msvc-ssl.zip) to `C:\Ruby` if you want a convenient location to access the OpenStudio Ruby bindings
Optionally extract [Ruby](http://developer.nlr.gov/downloads/buildings/openstudio/src/ruby-1.8.6-msvc-ssl.zip) to `C:\Ruby` if you want a convenient location to access the OpenStudio Ruby bindings
> _v1.8.6 MSVC tested and working_
Comment on lines 63 to 75

#### For Building Documentation
Expand All @@ -82,15 +82,15 @@ Install [Graphviz](http://www.graphviz.org/pub/graphviz/stable/windows/graphviz-
> _Latest v2.38 tested and working_

#### For Using Radiance
Install [Radiance](https://openstudio.nrel.gov/accept/file/1043) using the installer
Install [Radiance](https://openstudio.nlr.gov/accept/file/1043) using the installer
> _Latest v4.2a tested and working_

#### For Building Installer Packages
Install [NSIS](http://prdownloads.sourceforge.net/nsis/nsis-2.46-setup.exe?download)
> _v2.46 tested and working_

### Windows 7/8.1, Visual Studio 2010
Extract [Boost](http://developer.nrel.gov/downloads/buildings/openstudio/src/boost_1_47.zip) to `C:\Program Files (x86)` and append `C:\Program Files (x86)\boost\boost_1_47;` to the System `Path` variable, or use the CMake option `BUILD_BOOST`
Extract [Boost](http://developer.nlr.gov/downloads/buildings/openstudio/src/boost_1_47.zip) to `C:\Program Files (x86)` and append `C:\Program Files (x86)\boost\boost_1_47;` to the System `Path` variable, or use the CMake option `BUILD_BOOST`
> _v1.47.0 MSVC tested and working_

Install [Qt](http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-opensource-windows-x86-vs2010-4.8.6.exe)
Expand Down Expand Up @@ -215,7 +215,7 @@ gem install rake
###############
# SWIG 3.0.2 #
###############
wget http://developer.nrel.gov/downloads/buildings/openstudio/src/swig-3.0.2.tar.gz
wget http://developer.nlr.gov/downloads/buildings/openstudio/src/swig-3.0.2.tar.gz
tar -xzf swig-3.0.2.tar.gz
rm swig-3.0.2.tar.gz
cd swig-3.0.2
Expand Down Expand Up @@ -289,7 +289,7 @@ Install [CMake](http://www.cmake.org/files/v3.0/cmake-3.0.0-Darwin64-universal.d
Install Xcode from the App Store:
> Download the Auxiliary Tools for Xcode - Late July 2012 from https://developer.apple.com/downloads/ then drag PackageMaker.app to `/Applications/`

Install [SWIG](http://developer.nrel.gov/downloads/buildings/openstudio/src/swig-3.0.2.tar.gz)
Install [SWIG](http://developer.nlr.gov/downloads/buildings/openstudio/src/swig-3.0.2.tar.gz)
```bash
curl -LO ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.35.tar.gz
tar -xzf pcre-8.35.tar.gz
Expand All @@ -300,7 +300,7 @@ make
sudo make install
cd ..
rm -rf pcre-8.35
curl -LO http://developer.nrel.gov/downloads/buildings/openstudio/src/swig-3.0.2.tar.gz
curl -LO http://developer.nlr.gov/downloads/buildings/openstudio/src/swig-3.0.2.tar.gz
tar -xzf swig-3.0.2.tar.gz
rm swig-3.0.2.tar.gz
cd swig-3.0.2
Expand Down
4 changes: 2 additions & 2 deletions developer/ruby/PackageOpenStudioGem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
s.name = "zerokit"
s.version = "#{$ZeroKit_MajorVersion}.#{$ZeroKit_MinorVersion}.#{patch}"
s.author = "NREL Commercial Buildings Research"
s.email = "zerokit@nrel.gov"
s.homepage = "http://cbr.nrel.gov/zerokit/"
s.email = "zerokit@nlr.gov"
s.homepage = "http://cbr.nlr.gov/zerokit/"
s.rubyforge_project = 'zerokit'
Comment on lines 38 to 42
s.summary = "Zero Energy Research and Optimiziation ToolKit"
s.platform = Gem::Platform::local
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div class="container">
<ul class="list-unstyled">
<li><a href="http://www.nrel.gov/buildings/">Buildings Research Home</a></li>
<li><a href="http://www.nlr.gov/buildings/">Buildings Research Home</a></li>
<li><a href="http://apps1.eere.energy.gov/buildings/energyplus/">DOE EnergyPlus Site</a></li>
<li><a href="http://apps1.eere.energy.gov/buildings/energyplus/openstudio_suite.cfm">DOE OpenStudio Site</a></li>
Comment on lines 10 to 13
<li><a href="http://apps1.eere.energy.gov/buildings/energyplus/openstudio.cfm">DOE Legacy OpenStudio Site</a></li>
Expand Down
2 changes: 1 addition & 1 deletion python/module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def finalize_options(self):
long_description_content_type="text/markdown",
url="https://github.com/NREL/OpenStudio",
author="Alliance for Energy Innovation, LLC, and other contributors",
author_email="openstudio@nrel.gov",
author_email="openstudio@nlr.gov",
maintainer="Julien Marrec",
maintainer_email="contact@effibem.com",
Comment on lines 95 to 99
license="BSD3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#see the URL below for information on how to write OpenStudio measures
# http://openstudio.nrel.gov/openstudio-measure-writing-guide
# http://openstudio.nlr.gov/openstudio-measure-writing-guide

#see your EnergyPlus installation or the URL below for information on EnergyPlus objects
# http://apps1.eere.energy.gov/buildings/energyplus/pdfs/inputoutputreference.pdf

#see the URL below for information on using life cycle cost objects in OpenStudio
# http://openstudio.nrel.gov/openstudio-life-cycle-examples
# http://openstudio.nlr.gov/openstudio-life-cycle-examples

#see the URL below for access to C++ documentation on workspace objects (click on "workspace" in the main window to view workspace objects)
# http://openstudio.nrel.gov/sites/openstudio.nrel.gov/files/nv_data/cpp_documentation_it/utilities/html/idf_page.html
# http://openstudio.nlr.gov/sites/openstudio.nlr.gov/files/nv_data/cpp_documentation_it/utilities/html/idf_page.html
Comment on lines 1 to +11

#start the measure
class SetEnergyPlusInfiltrationFlowRatePerFloorArea < OpenStudio::Measure::EnergyPlusMeasure
Expand Down
2 changes: 1 addition & 1 deletion resources/energyplus/HospitalBaseline/in.idf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
!
!
! Reference: Bonnema, E., D. Studer, A. Parker, S. Pless and P. Torcellini. 2010. Large Hospital 50% Energy Savings: Technical Support Document.
! NREL/TP-550-47867, National Renewable Energy Laboratory. available at http://www.nrel.gov/docs/fy10osti/47867.pdf
! NREL/TP-550-47867, National Renewable Energy Laboratory. available at http://www.nlr.gov/docs/fy10osti/47867.pdf
! This example file was originally developed using Version 5.0.0.035 and was transitioned to Version 6.0 using the transition utility
Comment on lines 7 to 9
!
! Basic file description: 130 zones, 7 story hospital with central CAV system and a 5 story medical office with a central VAV system
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#see the URL below for information on how to write OpenStudio measures
# http://openstudio.nrel.gov/openstudio-measure-writing-guide
# http://openstudio.nlr.gov/openstudio-measure-writing-guide

#see your EnergyPlus installation or the URL below for information on EnergyPlus objects
# http://apps1.eere.energy.gov/buildings/energyplus/pdfs/inputoutputreference.pdf

#see the URL below for information on using life cycle cost objects in OpenStudio
# http://openstudio.nrel.gov/openstudio-life-cycle-examples
# http://openstudio.nlr.gov/openstudio-life-cycle-examples

#see the URL below for access to C++ documentation on workspace objects (click on "workspace" in the main window to view workspace objects)
# http://openstudio.nrel.gov/sites/openstudio.nrel.gov/files/nv_data/cpp_documentation_it/utilities/html/idf_page.html
# http://openstudio.nlr.gov/sites/openstudio.nlr.gov/files/nv_data/cpp_documentation_it/utilities/html/idf_page.html
Comment on lines 1 to +11

#start the measure
class SetEnergyPlusInfiltrationFlowRatePerFloorArea < OpenStudio::Ruleset::WorkspaceUserScript
Expand Down
4 changes: 2 additions & 2 deletions resources/utilities/xml/schema/HPXMLBaseElements.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -2081,7 +2081,7 @@
<xs:annotation>
<xs:documentation>[$] The LCOE is the total cost of installing and operating a project expressed in dollars per kilowatt-hour of electricity generated by
the system over its life. Can be calculated with System Advisor Model, a similar software, or through a simplified calculation at
http://www.nrel.gov/analysis/tech_lcoe.html.</xs:documentation>
http://www.nlr.gov/analysis/tech_lcoe.html.</xs:documentation>
</xs:annotation>
Comment on lines 2082 to 2085
</xs:element>
<xs:element ref="extension" minOccurs="0"/>
Expand Down Expand Up @@ -2244,7 +2244,7 @@
<xs:annotation>
<xs:documentation>[$] The LCOE is the total cost of installing and operating a project expressed in dollars per kilowatt-hour of electricity generated by
the system over its life. Can be calculated with System Advisor Model, a similar software, or through a simplified calculation at
http://www.nrel.gov/analysis/tech_lcoe.html.</xs:documentation>
http://www.nlr.gov/analysis/tech_lcoe.html.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" ref="extension"/>
Expand Down
2 changes: 1 addition & 1 deletion src/model/mainpage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ namespace model {
* future use, or directly used in another Model. To save a Component for future use, it should be
* added to a local BCL, and/or uploaded to the online %Building %Component Library. (These
* features are currently under development. Please see the documentation for utilities/bcl and
* http://bcl.nrel.gov/.)
* http://bcl.nlr.gov/.)
*
* To use a Component (either directly, or deserialized from a building component library) in a
* Model, use the method Model::insertComponent(const Component& ). This method first looks to see
Expand Down
6 changes: 3 additions & 3 deletions src/utilities/bcl/RemoteBCL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#include <regex>

#define REMOTE_PRODUCTION_SERVER "https://bcl.nrel.gov"
#define REMOTE_DEVELOPMENT_SERVER "https://bcl2.nrel.gov"
#define REMOTE_PRODUCTION_SERVER "https://bcl.nlr.gov"
#define REMOTE_DEVELOPMENT_SERVER "https://bcl-test.nlr.gov"

using namespace utility::conversions;

Expand All @@ -36,7 +36,7 @@ pugi::xml_node RemoteQueryResponse::root() const {
// as it will allow us to change http_client_config (SSL settings etc) in only one place
web::http::client::http_client RemoteBCL::getClient(const std::string& url, unsigned timeOutSeconds) {
web::http::client::http_client_config config;
// bcl.nrel.gov can be slow to respond to client requests so bump the default of 30 seconds to 60 to account for lengthy response time.
// bcl.nlr.gov can be slow to respond to client requests so bump the default of 30 seconds to 60 to account for lengthy response time.
// this is timeout is for each send and receive operation on the client and not the entire client session.
config.set_timeout(std::chrono::seconds(timeOutSeconds));
config.set_validate_certificates(false);
Expand Down
6 changes: 3 additions & 3 deletions src/utilities/bcl/test/BCL_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TEST_F(BCLFixture, LocalBCL_AuthKey) {
EXPECT_TRUE(LocalBCL::instance().setProdAuthKey(defaultProdAuthKey));
EXPECT_EQ(defaultProdAuthKey, LocalBCL::instance().prodAuthKey());

// Don't bother testing this since bcl7.development.nrel.gov is internal only
// Don't bother testing this since bcl7.development.nlr.gov is internal only
//EXPECT_TRUE(LocalBCL::instance().setDevAuthKey(defaultDevAuthKey));
Comment on lines +22 to 23
//EXPECT_EQ(defaultDevAuthKey, LocalBCL::instance().devAuthKey());
}
Expand All @@ -32,7 +32,7 @@ TEST_F(BCLFixture, RemoteBCLTest) {
EXPECT_EQ(prodAuthKey, remoteBCL.prodAuthKey());
EXPECT_EQ(remoteBCL.prodAuthKey(), remoteBCL.authKey());

// Don't bother testing this since bcl7.development.nrel.gov is internal only
// Don't bother testing this since bcl7.development.nlr.gov is internal only
// set temporary development auth key
//remoteBCL.setDevAuthKey(devAuthKey);
//EXPECT_EQ(devAuthKey, remoteBCL.devAuthKey());
Expand Down Expand Up @@ -95,7 +95,7 @@ TEST_F(BCLFixture, RemoteBCLTest) {
/// Download an individual component by uid and extract
/// returns true if a download is started
// TJC 2020-11-19 GetComponentByUID is already testing and dowloading component.
// https://bcl.nrel.gov/ has issues download some components. Until this behavior is fixed
// https://bcl.nlr.gov/ has issues download some components. Until this behavior is fixed
// disable this download call below.
// bool success = remoteBCL.downloadComponent(responses[1].uid());
//ASSERT_TRUE(success);
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/idf/Test/IdfObject_GTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ TEST_F(IdfFixture, IdfObject_ScheduleFileWithUrl) {
std::string text = "Schedule:File, \n\
Web Schedule, !- Name \n\
, !- Schedule Type Limits Name \n\
http://bcl.development.nrel.gov/api?search='terms'@xxx.yyy, !- File Name \n\
http://bcl.development.nlr.gov/api?search='terms'@xxx.yyy, !- File Name \n\
1, !- Column Number \n\
Comment on lines 656 to 660
0, !- Rows to Skip at Top \n\
8760, !- Number of Hours of Data \n\
Expand All @@ -674,7 +674,7 @@ TEST_F(IdfFixture, IdfObject_ScheduleFileWithUrl) {
EXPECT_EQ("Web Schedule", object->getString(0).get());

ASSERT_TRUE(object->getString(2));
EXPECT_EQ("http://bcl.development.nrel.gov/api?search='terms'@xxx.yyy", object->getString(2).get());
EXPECT_EQ("http://bcl.development.nlr.gov/api?search='terms'@xxx.yyy", object->getString(2).get());

ASSERT_TRUE(object->getString(3));
EXPECT_EQ("1", object->getString(3).get());
Expand Down
Loading