Skip to content
Open
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
6 changes: 3 additions & 3 deletions .github/workflows/app_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -780,9 +780,9 @@ jobs:
begin_group "Running a simulation with python"
./test_install/EnergyPlus/energyplus --help
cur_v=$(python -c "import sys; sys.path.insert(0, './test_install/EnergyPlus'); from pyenergyplus.func import EnergyPlusVersion; v = EnergyPlusVersion(); print(f'{v.ep_version_major}.{v.ep_version_minor}.{v.ep_version_patch}')")
aria2c https://raw.githubusercontent.com/NREL/EnergyPlus/v${cur_v}/testfiles/PythonPluginCustomSchedule.py
aria2c https://raw.githubusercontent.com/NREL/EnergyPlus/v${cur_v}/testfiles/PythonPluginCustomSchedule.idf
aria2c https://raw.githubusercontent.com/NREL/EnergyPlus/v${cur_v}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
aria2c https://raw.githubusercontent.com/NatLabRockies/EnergyPlus/v${cur_v}/testfiles/PythonPluginCustomSchedule.py
aria2c https://raw.githubusercontent.com/NatLabRockies/EnergyPlus/v${cur_v}/testfiles/PythonPluginCustomSchedule.idf
aria2c https://raw.githubusercontent.com/NatLabRockies/EnergyPlus/v${cur_v}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
./test_install/EnergyPlus/energyplus -w USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw -d out PythonPluginCustomSchedule.idf
echo "::endgroup::"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/export_standards_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:

else:
print("Unable to find OPENSTUDIO_BASELINK_RELEASE")
OS_SDK_BASELINK = f"https://github.com/NREL/OpenStudio/releases/download/v{sdk_version}{OS_SDK_VERSION_SHA.split('+')[0]}"
OS_SDK_BASELINK = f"https://github.com/NatLabRockies/OpenStudio/releases/download/v{sdk_version}{OS_SDK_VERSION_SHA.split('+')[0]}"
with open(os.environ['GITHUB_ENV'], 'a') as f:
f.write(f"\nOS_SDK_BASELINK={OS_SDK_BASELINK}")
print(f"Defaulted baselink '{OS_SDK_BASELINK=}'")
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
echo -e "${Yellow}Not found at baselink. Trying with alternate link: $installer_link${Color_Off}"
if ! wget -q "$installer_link"; then
echo -e "${Yellow}Cannot find the OS SDK installer. Defaulting to latest release (pre-release included)${Color_Off}"
installer_link=$(curl -s https://api.github.com/repos/NREL/OpenStudio/releases | jq -r '. [0] | .assets | .[] | select(.name | contains("Linux")) | select(.name | contains("deb")) | .browser_download_url')
installer_link=$(curl -s https://api.github.com/repos/NatLabRockies/OpenStudio/releases | jq -r '. [0] | .assets | .[] | select(.name | contains("Linux")) | select(.name | contains("deb")) | .browser_download_url')
if [ -z "$installer_link" ]; then
echo -e "${Red}Could not locate the latest OpenStudio deb from the release page.${Color_Off}"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Project Overview

Cross-platform (Windows, Mac, Linux) graphical interface for OpenStudio energy models. Built on the [OpenStudio SDK](https://github.com/NREL/OpenStudio) using Qt 6.11.0 and C++20.
Cross-platform (Windows, Mac, Linux) graphical interface for OpenStudio energy models. Built on the [OpenStudio SDK](https://github.com/NatLabRockies/OpenStudio) using Qt 6.11.0 and C++20.

## Quick Start

Expand Down
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ call deactivate_conanbuild.bat
# Full Example

```
git clone git@github.com/NREL/OpenStudio.git
git clone git@github.com/NatLabRockies/OpenStudio.git
cd OpenStudio
conan install . --output-folder=../OSApp-build-release --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=Release
cmake --preset conan-release
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ if(UNIX)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual -ftemplate-depth=1024")

# TODO: remove when bumping Boost to 1.81+, cf https://github.com/NREL/OpenStudio/issues/4978
# TODO: remove when bumping Boost to 1.81+, cf https://github.com/NatLabRockies/OpenStudio/issues/4978
add_definitions(-DBOOST_NO_CXX98_FUNCTION_BASE)
add_definitions(-D_HAS_AUTO_PTR_ETC=0)
else()
Expand Down
2 changes: 1 addition & 1 deletion FindOpenStudioSDK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ else()
# Not found: no problem, we download it
# base link for release builds
set(OPENSTUDIO_BASELINK_RELEASE
"https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_PRERELEASE}/"
"https://github.com/NatLabRockies/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}${OPENSTUDIO_VERSION_PRERELEASE}/"
CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)

if (WIN32)
Expand Down
14 changes: 0 additions & 14 deletions Jenkinsfile_linux

This file was deleted.

10 changes: 0 additions & 10 deletions Jenkinsfile_osx

This file was deleted.

10 changes: 0 additions & 10 deletions Jenkinsfile_windows

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ For more information about the OpenStudio Coalition, including tutorials and doc

# OpenStudio Application

The **OpenStudio Application** is a fully featured graphical interface to OpenStudio models including envelope, loads, schedules, geometry, HVAC, and OpenStudio Measures. The **OpenStudio Application** is open source software and is free to use. The **OpenStudio Application** is built on top of the **[OpenStudio SDK](https://github.com/NREL/OpenStudio)**.
The **OpenStudio Application** is a fully featured graphical interface to OpenStudio models including envelope, loads, schedules, geometry, HVAC, and OpenStudio Measures. The **OpenStudio Application** is open source software and is free to use. The **OpenStudio Application** is built on top of the **[OpenStudio SDK](https://github.com/NatLabRockies/OpenStudio)**.

## Downloading the OpenStudio Application

The **OpenStudio Application** can be downloaded for Mac, Linux, and Windows by logging in at https://openstudiocoalition.org/app/

## What is the OpenStudio Software Development Kit (SDK)?

The **[OpenStudio SDK](https://github.com/NREL/OpenStudio)** is a cross-platform (Windows, Mac, and Linux) collection of software tools to support whole building energy modeling
using [EnergyPlus](https://github.com/NREL/EnergyPlus) and advanced daylight analysis using [Radiance](https://github.com/NREL/Radiance/).
The **[OpenStudio SDK](https://github.com/NatLabRockies/OpenStudio)** is a cross-platform (Windows, Mac, and Linux) collection of software tools to support whole building energy modeling
using [EnergyPlus](https://github.com/NatLabRockies/EnergyPlus) and advanced daylight analysis using [Radiance](https://github.com/NatLabRockies/Radiance/).
The **OpenStudio SDK** is an open source project to facilitate community development, extension, and private sector adoption. The **OpenStudio SDK** allows building researchers and software developers to quickly get started through its multiple entry levels, including access through C++, Ruby, and C#.

More information and documentation is available at the [OpenStudio](https://www.openstudio.net) website.
2 changes: 1 addition & 1 deletion developer/doc/AddingHVACComponentsToGUI.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This documents the process for adding HVAC components to the GUI.

This assumes that the model object(s) already exist NREL/OpenStudio (core SDK)
This assumes that the model object(s) already exist in the OpenStudio SDK

## Add icon:

Expand Down
2 changes: 1 addition & 1 deletion docker/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ SDK_PLATFORM="Ubuntu-22.04-x86_64" # matches FindOpenStudioSDK.cmake: ${LSB_RE
SDK_BASENAME="OpenStudio-${SDK_VERSION}${SDK_SHA}-${SDK_PLATFORM}"
SDK_DIR="build/OpenStudio-${SDK_VERSION}" # created in workspace
SDK_DEST="${SDK_DIR}/${SDK_BASENAME}" # where CMake looks
SDK_URL="https://github.com/NREL/OpenStudio/releases/download/v${SDK_VERSION}/${SDK_BASENAME}.tar.gz"
SDK_URL="https://github.com/NatLabRockies/OpenStudio/releases/download/v${SDK_VERSION}/${SDK_BASENAME}.tar.gz"

echo " SDK_DEST: ${SDK_DEST}"
echo " SDK_URL: ${SDK_URL}"
Expand Down
6 changes: 4 additions & 2 deletions src/openstudio_app/OpenStudioApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,9 @@ void OpenStudioApp::readSettings() {
setLastPath(settings.value("lastPath", QDir::homePath()).toString());
setDviewPath(openstudio::toPath(settings.value("dviewPath", "").toString()));
m_currLang = settings.value("language", "en").toString();
LOG_FREE(Debug, "OpenStudioApp", "\n\n\nm_currLang=[" << m_currLang.toStdString() << "]" << "\n\n\n");
LOG_FREE(Debug, "OpenStudioApp",
"\n\n\nm_currLang=[" << m_currLang.toStdString() << "]"
<< "\n\n\n");
if (m_currLang.isEmpty()) {
m_currLang = "en";
}
Expand Down Expand Up @@ -1327,7 +1329,7 @@ void OpenStudioApp::startMeasureManagerProcess() {
const QString program = toQString(openstudioCLIPath());
QStringList arguments;

// MeasureManager does not work in classic CLI https://github.com/NREL/OpenStudio/issues/5212
// MeasureManager does not work in classic CLI https://github.com/NatLabRockies/OpenStudio/issues/5212
arguments << "measure";
arguments << "-s";
arguments << portString;
Expand Down
6 changes: 4 additions & 2 deletions src/openstudio_lib/ApplyMeasureNowDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ ApplyMeasureNowDialog::ApplyMeasureNowDialog(QWidget* parent)
}

// The openstudio-workflow gem will prepend the "generated_files" directory to the workflowJSON.filePaths, so match that
// cf: https://github.com/NREL/OpenStudio-workflow-gem/blob/e569f910be364d33c3ddb1a655570c85f1b24bfa/lib/openstudio/workflow/jobs/run_initialization.rb#L99
// cf: https://github.com/NatLabRockies/OpenStudio-workflow-gem/blob/e569f910be364d33c3ddb1a655570c85f1b24bfa/lib/openstudio/workflow/jobs/run_initialization.rb#L99
// in requestReload, this directory gets copied over to the first filePath of m_modelWorkflowJSON, which is typically the files/ directory
m_workingFilesDir = m_workingDir / openstudio::toPath("generated_files");
// add the WorkingFiles directory as files files path, measures writing output files should be written here
Expand Down Expand Up @@ -380,7 +380,9 @@ void ApplyMeasureNowDialog::runMeasure() {
if (OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI()) {
arguments << "classic";
}
arguments << "run" << "-m" << "-w" << toQString(*tempWorkflowJSONPath);
arguments << "run"
<< "-m"
<< "-w" << toQString(*tempWorkflowJSONPath);
LOG(Debug, "openstudioExePath='" << toString(openstudioExePath) << "'");
LOG(Debug, "run arguments" << arguments.join(";").toStdString());

Expand Down
2 changes: 1 addition & 1 deletion src/openstudio_lib/HVACSystemsView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ MechanicalVentilationView::MechanicalVentilationView() {
ventilationCalcMethodComboBox->addItem("Standard 62.1 Ventilation Rate Procedure", "Standard62.1VentilationRateProcedure");
ventilationCalcMethodComboBox->addItem("Standard 62.1 Ventilation Rate Procedure With Limit", "Standard62.1VentilationRateProcedureWithLimit");
ventilationCalcMethodComboBox->addItem("Indoor Air Quality Procedure", "IndoorAirQualityProcedure");
// TODO: OS 3.7.0 is missing some choices that E+ 23.2.0 has, pending https://github.com/NREL/OpenStudio/issues/5060
// TODO: OS 3.7.0 is missing some choices that E+ 23.2.0 has, pending https://github.com/NatLabRockies/OpenStudio/issues/5060
// ventilationCalcMethodComboBox->addItem("Indoor Air Quality Procedure Generic Contaminant", "IndoorAirQualityProcedureGenericContaminant");
// ventilationCalcMethodComboBox->addItem("Indoor Air Quality Procedure Combined", "IndoorAirQualityProcedureCombined");
ventilationCalcMethodComboBox->addItem("Proportional Control Bseed On Design Occupancy", "ProportionalControlBasedOnDesignOccupancy");
Expand Down
4 changes: 2 additions & 2 deletions src/openstudio_lib/RunTabView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,12 @@ void RunView::playButtonClicked(bool t_checked) {
if (m_verboseOutputBox->isChecked()) {
arguments << "--verbose";
} else if (!m_useClassicCLIBox->isChecked()) {
// https://github.com/NREL/OpenStudio/issues/5069
// https://github.com/NatLabRockies/OpenStudio/issues/5069
arguments << "--verbose";
}

arguments << "run";
// C++ CLI doesn't have working socket connection yet: https://github.com/NREL/OpenStudio/issues/5073
// C++ CLI doesn't have working socket connection yet: https://github.com/NatLabRockies/OpenStudio/issues/5073
m_hasSocketConnection = false;
if (m_useClassicCLIBox->isChecked()) {
const unsigned port = m_runTcpServer->serverPort();
Expand Down
2 changes: 1 addition & 1 deletion src/openstudio_lib/ScheduleDayView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ void DaySchedulePlotArea::keyPressEvent(QKeyEvent* event) {
if (m_currentHoverItem) {
if (auto* calendarItem = dynamic_cast<CalendarSegmentItem*>(m_currentHoverItem)) {
// Only allow entering numbers if you're not already dragging with the mouse...
// Fix for https://github.com/NREL/OpenStudio/issues/2357
// Fix for https://github.com/NatLabRockies/OpenStudio/issues/2357
if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) && !calendarItem->isMouseDown()) {
bool ok = false;
double value = m_keyboardInputValue.toDouble(&ok);
Expand Down
6 changes: 4 additions & 2 deletions src/openstudio_lib/ScheduleFileInspectorView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,10 @@ void ScheduleFileInspectorView::attach(openstudio::model::ScheduleFile& sch) {

m_columnSeparator->bind<std::string>(
*m_sch, static_cast<std::string (*)(const std::string&)>(&openstudio::toString),
// ScheduleFile::columnSeparatorValues does not exist: https://github.com/NREL/OpenStudio/issues/5246
[]() { return std::vector<std::string>{"Comma", "Tab", "Space", "Semicolon"}; },
// ScheduleFile::columnSeparatorValues does not exist: https://github.com/NatLabRockies/OpenStudio/issues/5246
[]() {
return std::vector<std::string>{"Comma", "Tab", "Space", "Semicolon"};
},
std::bind(&model::ScheduleFile::columnSeparator, m_sch.get_ptr()),
[this](const std::string& value) -> bool {
bool result = m_sch->setColumnSeparator(value);
Expand Down
2 changes: 1 addition & 1 deletion src/openstudio_lib/library/geometry_editor_start.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2>Overview</h2>
<div id="floorspace"></div>
<h2>FloorspaceJS</h2>

<a href="https://github.com/NREL/floorspace.js">FloorspaceJS</a> is an open source software module that developers can leverage to produce building energy modeling UIs which include geometry creation. FloorspaceJS is meant to cover simple building geometry use cases only. More complex building geometry is best developed in a full featured CAD tool and exported to gbXML or other formats for building energy modeling. FloorspaceJS is implemented in JavaScript with minimal dependencies, allowing it to be integrated into a wide range of applications, including the OpenStudio Application.
<a href="https://github.com/NatLabRockies/floorspace.js">FloorspaceJS</a> is an open source software module that developers can leverage to produce building energy modeling UIs which include geometry creation. FloorspaceJS is meant to cover simple building geometry use cases only. More complex building geometry is best developed in a full featured CAD tool and exported to gbXML or other formats for building energy modeling. FloorspaceJS is implemented in JavaScript with minimal dependencies, allowing it to be integrated into a wide range of applications, including the OpenStudio Application.

<div id="gbxml"></div>
<h2>gbXML</h2>
Expand Down
2 changes: 1 addition & 1 deletion src/shared_gui_components/NetworkProxyDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ std::pair<QNetworkReply::NetworkError, QString> NetworkProxyDialog::testProxyCon

QNetworkAccessManager nam;
nam.setProxy(t_proxy);
QNetworkReply* head = nam.head(QNetworkRequest(QUrl("https://bcl.nrel.gov/")));

QNetworkReply* head = nam.head(QNetworkRequest(QUrl("https://bcl.nlr.gov/")));
if (!head) {
return std::make_pair(QNetworkReply::UnknownNetworkError, QString("Unknown error creating connection to proxy."));
}
Expand Down
Loading