Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue2180 main boiler plant controller #2685

Conversation

karthikeyad-pnnl
Copy link
Contributor

@mwetter : I am issuing a fresh pull request using this new branch that contains all of the necessary commits and has been re-based on issue2293_chiller_plant_seq and the latest master branch. It should add/modify 348 files after the target branch has been updated with the latest chiller plant sequence branch as well as the latest master branch. Please let me know if there are any merge conflicts I should resolve once the target branch is updated.

I will be closing the old PR and add a reference to this PR there in a comment.

Thanks,
Karthik

JayHuLBL and others added 30 commits May 13, 2021 14:56
* Updated user guide for lbl-srg#2491

* Removed wrong version number and hash code for lbl-srg#2491

This will also be fixed upstream in the Spawn repository. The used hash code is in Buildings/Resources/src/ThermalZones/EnergyPlus/install.py
* Changed solver to Radau which simulates about 3 times faster for this model

* Updated regression test
The parameter needed to be changed even if moved to the Obsolete package. This works with tests of Buildings.Examples
* Updated reference results for Dymola 2022

* Added eraseClasses to unload MSL 4.0.0

This is needed to supress Dymola 2022 from asking whether to run the conversion script, which then would fail the simulation in the script. This commit also removes the CLEAN_MAT which is confusing and not needed
* Added eraseClasses to unload MSL 4.0.0

This is needed to supress Dymola 2022 from asking whether to run the conversion script, which then would fail the simulation in the script. This commit also removes the CLEAN_MAT which is confusing and not needed.
* Changed determination of library root to allow for spaces

For lbl-srg#2505

* Set up CI test for spawn portability

* Added Windows specific function names

* Added leading and trailing quotes on Windows

This is required if there are spaces in the name, such as if Buildings is installed in Buildings 8.0.0
This commit simulates in E+ infiltration for zones not modeled using ThermalZone.mo. For lbl-srg#2492

* Suppressed compiler warnings from MSVC

* Changed call to _stat on Windows

* For MSVC, added EXTERNAL_FUNCTION_EXPORT to avoid warning in MSVC
* Corrected publication year

* Regenerated html
* Added 7.0.1 release info

* Removed version number as it is not used

* Updated binary on Windows

* Added missing quotation marks
* Improved error message for lbl-srg#2517

* Recreated Windows binaries

* Recreated Windows binaries

* Recreated binary on Windows
…rmal zone in Modelica (lbl-srg#2520)

* Improved error message for lbl-srg#2517

* Printed unit of output variables for lbl-srg#2519
mwetter and others added 6 commits October 15, 2021 17:46
This avoids a potential overflow in the analytical derivative of the splice function
* Merged IBPSA, issue1494_plugflowpipe_singleoutlet

* Merged IBPSA, issue1527_moverDocumentation

* Merged IBPSA, issue1529_leftJustified2 issue1534_signalRanker issue1533_moversValidationDocImage
* Changed icon and set min attribute of nout

For lbl-srg#2689
Updating with latest master from upstream
@JayHuLBL
Copy link
Contributor

@karthikeyad-pnnl I just merged the master branch and the latest issue2293 branch to the base branch issue2180.

@mwetter
Copy link
Member

mwetter commented Oct 26, 2021

@JayHuLBL : There is probably something wrong with the base branch. This would merge 2000+ commits in 3700 files.

@JayHuLBL
Copy link
Contributor

@mwetter It's quite strange to see that there are still so many file changes. For example, the file modelica-buildings/.gitattributes, in both the base branch lbl-srg:issue2180_BoilerPlant_MainController and the merging branch karthikeyad-pnnl:issue2180_MainBoilerPlantController, is same. But it is listed as a new file. Not sure what causes it.

@JayHuLBL
Copy link
Contributor

@karthikeyad-pnnl Do you think we can close this PR? Please check if the changes have been covered by the PR #2700.

@karthikeyad-pnnl
Copy link
Contributor Author

@JayHuLBL We can close this PR. All the required changes are covered by #2700.

@JayHuLBL
Copy link
Contributor

Close this PR as the changes have been covered by #2700.

@JayHuLBL JayHuLBL closed this Jan 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants