diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 44e6e36d9..e8d81a649 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -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::" diff --git a/.github/workflows/export_standards_data.yml b/.github/workflows/export_standards_data.yml index cd5a1809c..3e1e0e4a8 100644 --- a/.github/workflows/export_standards_data.yml +++ b/.github/workflows/export_standards_data.yml @@ -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=}'") @@ -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 diff --git a/AGENTS.md b/AGENTS.md index 0f442fb74..cdd3d9f07 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -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 diff --git a/BUILDING.md b/BUILDING.md index ca476c508..31d226ded 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index d536578e6..c27c3f024 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/FindOpenStudioSDK.cmake b/FindOpenStudioSDK.cmake index 8110aa3de..a838253a9 100644 --- a/FindOpenStudioSDK.cmake +++ b/FindOpenStudioSDK.cmake @@ -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) diff --git a/Jenkinsfile_linux b/Jenkinsfile_linux deleted file mode 100644 index fc9a69e94..000000000 --- a/Jenkinsfile_linux +++ /dev/null @@ -1,14 +0,0 @@ -//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs - -// To test you can target a branch in cbci_shared_libs. -// e.g. @Library('cbci_shared_libs@develop') _ - - -@Library('cbci_shared_libs@updateLibs') _ - -// Build for PR to develop branch only. -if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { - - openstudio_app_incr_linux() - -} diff --git a/Jenkinsfile_osx b/Jenkinsfile_osx deleted file mode 100644 index 67f9de6dc..000000000 --- a/Jenkinsfile_osx +++ /dev/null @@ -1,10 +0,0 @@ -//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs - -@Library('cbci_shared_libs') _ - -// Build for PR to develop branch only. -if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { - - openstudio_app_incr_osx() - -} diff --git a/Jenkinsfile_windows b/Jenkinsfile_windows deleted file mode 100644 index 2e8dd7489..000000000 --- a/Jenkinsfile_windows +++ /dev/null @@ -1,10 +0,0 @@ -//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs - -@Library('cbci_shared_libs') _ - -// Build for PR to develop branch only. -if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { - - openstudio_app_incr_windows() - -} diff --git a/README.md b/README.md index b8b6bdfde..333614b17 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ 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 @@ -21,8 +21,8 @@ The **OpenStudio Application** can be downloaded for Mac, Linux, and Windows by ## 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. diff --git a/developer/doc/AddingHVACComponentsToGUI.md b/developer/doc/AddingHVACComponentsToGUI.md index 038f211d9..0c2354f6a 100644 --- a/developer/doc/AddingHVACComponentsToGUI.md +++ b/developer/doc/AddingHVACComponentsToGUI.md @@ -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: diff --git a/docker/configure.sh b/docker/configure.sh index 7b5987986..b41654cec 100644 --- a/docker/configure.sh +++ b/docker/configure.sh @@ -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}" diff --git a/src/openstudio_app/OpenStudioApp.cpp b/src/openstudio_app/OpenStudioApp.cpp index 6d4c54d4e..2c583a0d5 100644 --- a/src/openstudio_app/OpenStudioApp.cpp +++ b/src/openstudio_app/OpenStudioApp.cpp @@ -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"; } @@ -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; diff --git a/src/openstudio_lib/ApplyMeasureNowDialog.cpp b/src/openstudio_lib/ApplyMeasureNowDialog.cpp index 0f9f9fb12..37ba8b541 100644 --- a/src/openstudio_lib/ApplyMeasureNowDialog.cpp +++ b/src/openstudio_lib/ApplyMeasureNowDialog.cpp @@ -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 @@ -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()); diff --git a/src/openstudio_lib/HVACSystemsView.cpp b/src/openstudio_lib/HVACSystemsView.cpp index 2ff14535f..9e34854f1 100644 --- a/src/openstudio_lib/HVACSystemsView.cpp +++ b/src/openstudio_lib/HVACSystemsView.cpp @@ -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"); diff --git a/src/openstudio_lib/RunTabView.cpp b/src/openstudio_lib/RunTabView.cpp index 584268add..bdb060b35 100644 --- a/src/openstudio_lib/RunTabView.cpp +++ b/src/openstudio_lib/RunTabView.cpp @@ -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(); diff --git a/src/openstudio_lib/ScheduleDayView.cpp b/src/openstudio_lib/ScheduleDayView.cpp index 94702e9bc..6d594e595 100644 --- a/src/openstudio_lib/ScheduleDayView.cpp +++ b/src/openstudio_lib/ScheduleDayView.cpp @@ -1653,7 +1653,7 @@ void DaySchedulePlotArea::keyPressEvent(QKeyEvent* event) { if (m_currentHoverItem) { if (auto* calendarItem = dynamic_cast(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); diff --git a/src/openstudio_lib/ScheduleFileInspectorView.cpp b/src/openstudio_lib/ScheduleFileInspectorView.cpp index 746d5d236..1cf162b38 100644 --- a/src/openstudio_lib/ScheduleFileInspectorView.cpp +++ b/src/openstudio_lib/ScheduleFileInspectorView.cpp @@ -322,8 +322,10 @@ void ScheduleFileInspectorView::attach(openstudio::model::ScheduleFile& sch) { m_columnSeparator->bind( *m_sch, static_cast(&openstudio::toString), - // ScheduleFile::columnSeparatorValues does not exist: https://github.com/NREL/OpenStudio/issues/5246 - []() { return std::vector{"Comma", "Tab", "Space", "Semicolon"}; }, + // ScheduleFile::columnSeparatorValues does not exist: https://github.com/NatLabRockies/OpenStudio/issues/5246 + []() { + return std::vector{"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); diff --git a/src/openstudio_lib/library/geometry_editor_start.html b/src/openstudio_lib/library/geometry_editor_start.html index f6a87aef4..360e77d1f 100644 --- a/src/openstudio_lib/library/geometry_editor_start.html +++ b/src/openstudio_lib/library/geometry_editor_start.html @@ -13,7 +13,7 @@

Overview

FloorspaceJS

-FloorspaceJS 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. +FloorspaceJS 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.

gbXML

diff --git a/src/shared_gui_components/NetworkProxyDialog.cpp b/src/shared_gui_components/NetworkProxyDialog.cpp index 716ab5f00..f0dac48dc 100644 --- a/src/shared_gui_components/NetworkProxyDialog.cpp +++ b/src/shared_gui_components/NetworkProxyDialog.cpp @@ -128,8 +128,8 @@ std::pair 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.")); }