From 69de8ba33eed303ece4afaff4a61863fc6251b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20R=C3=A4tz?= Date: Wed, 16 Jun 2021 17:41:11 +0200 Subject: [PATCH] Merge dev to master to follow AixLib update (#689) * #543 changed shading g total to 1 for the use for the sunblind shading factor, added shading_max_irr and shading_g_total to record export, attention hardcode * #543 changed sunblind parameters to be usecondition parameters * boundary conditions are not needed any longer * just black * untested proposal for shading gvalue * fix calculation of shading * #635 should revise the setters * Update doc strings and mark todos * Add value for max power of ideal cooler * Typo in doc string * Improvements excel import * Update air density typo * added info to doc string conv_rad * Improvements excel import * revert part of a commit that accidently had these changes * run black on exvel import * add info * delete blank line * restart ci * Revert "restart ci" This reverts commit 6253f746af2670b68f6ae2e3d2410771f22e684a. * add document suggestions made by @martinraetz * defaults to 1.0 if now windows * More doc strings extensions * More doc strings extensions 2 * WithProfile commit * schedules is private attribute (doc string) * Format * Correct and reformulate withProfile docstrings * Correct and reformulate withProfile docstrings * correct "nan-dealing" and update pandas df.at to df.loc and typing error * update pandas df.at to df.loc * update parameter names based on MBL * add moisture and nports to RC models * add 0 time step to internal gains * set columns in gains file to 4 * set humidification to false if central_ahu * change shading default * remove hacked moisure and nports * Adds UseCondition for classrooms * update aixlib model to CO2 multizone * propagate use_c_flow and set medium with c * make example import use co2 and moisture balance * update thermal zone name * delete probable clutter * E261 at least two spaces before inline comment * update for aixlib PR1052 * update buildings version * Issue566weatherfile (#664) * first changes * weird things happening in git * Revert "weird things happening in git" This reverts commit 923747b1791a8b6665d5f5fa58df04b97f0b50d0. * implement working version of weather file export * delete trial results * convert everything to: saving weather file at "project" level and not at building level * Revert "Merge branch 'issue566weatherfile' into development" This reverts commit 9e772fbff69fbce8711cf3629f0aec4eea0363c3. * Revert "Revert "Merge branch 'issue566weatherfile' into development"" This reverts commit e376eec01d89c17719307fa436372acc82ab2f6e. * blank lines (ci) * run Black on project.py * update unitTest.json -> previous weatherfile is outdated (doesnt work for AixLib Version) -> set to None(null) to use default weatherfile of Teaser * naming * naming * Weather file line is to long resulting in error * First try of IBPSA Weather file export * fixing * blank line end of file * #566 fixed tab stop at end of file * 566 raised aixlib version number to actual dev number Co-authored-by: MichaMans * Add annotation For #669 * Write test scripts For #669 * Add script to run unit tests For #669 * Option to export reference results For #669 * Remove test line For #669 * Use runUnitTests from IBPSA For #669 * Replace very old version For #669 * Adjust model path in test script For #669 * Add missing comma For #669 * Add missing tolerance For #669 * Fix decoding errors For #669 * Deactivate pedantic mode For #669 * Adjust annotation For #669 * Change script location * Delete stray bracket * Add missing quotes * Increase count * revised project name of e3, revised and reformatted runUnitTests.py, added pytest simulaiton export * revised formatting of aixlib_ouput.py * added reference results for e2 and added them to the ref path of that example * Add missing file to setup For #669 * Adjusted the profiles to a uniform 24h-Format * solve export problem * #688 raised version number for master merge * #688 raise AixLib version number + sort import section following pep8 Co-authored-by: MichaMans Co-authored-by: Peter Remmen Co-authored-by: Peter Remmen Co-authored-by: Nicholas Long <1907354+nllong@users.noreply.github.com> Co-authored-by: Nicholas Long Co-authored-by: Nicholas Long Co-authored-by: Martin Kremer Co-authored-by: Michael Mans Co-authored-by: Martin Kremer <48821826+KremerMartin@users.noreply.github.com> Co-authored-by: Marcus Fuchs Co-authored-by: Wackerbauer Co-authored-by: David Wackerbauer Co-authored-by: David Co-authored-by: David Jansen --- teaser/logic/buildingobjects/useconditions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/teaser/logic/buildingobjects/useconditions.py b/teaser/logic/buildingobjects/useconditions.py index 4de76079a..7f0459e53 100644 --- a/teaser/logic/buildingobjects/useconditions.py +++ b/teaser/logic/buildingobjects/useconditions.py @@ -212,6 +212,8 @@ class UseConditions(object): cooling_set_back: float [K] Set back temperature offset for cooling profile. Positive (+) values increase the profile, negative (-) decrease. + Note: python attribute, not customizable by user (derived from Json) + """