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

Release 2.30 #2568

Merged
merged 6 commits into from
Feb 19, 2020
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2020-02-17 - 2.29.0 - #2565 Issue databases
2020-02-17 - 2.29.0 - #2557 I2553 restructure database
2020-02-13 - 2.29.0 - #2562 2551 many files optimization
2020-02-13 - 2.29.0 - #2559 Update how-are-schedules-defined.rst
2020-02-11 - 2.29.0 - #2556 `Annual Cost` and `Annual Emissions` plots x-axis are sorted by cost
2020-02-10 - 2.29.0 - #2554 2536 technology editor
2020-02-10 - 2.29.0 - #2550 I2534 opt technologies, merging but sending a new PR with more tests in case functionality is broken (not likely) according to extensive testing.
2020-02-06 - 2.29.0 - #2546 Glossary.csv - synchronized with newest schemas.yml
2020-02-03 - 2.29.0 - #2544 update schemas.yml file to conform to changes in PR 2532
2020-02-03 - 2.29.0 - #2545 Fixed typo in a variable name @martin-mosteiro good catch
2020-01-23 - 2.29.0 - #2542 Release 2.29
2020-01-23 - 2.28.1 - #2526 Fix COOLROOM bug in thermal networks
2020-01-23 - 2.28.1 - #2530 updated schemas.yml with trace-inputlocator output
2020-01-23 - 2.28.1 - #2532 fixed workflow and also bug in supply_systems.xls
Expand Down
36 changes: 36 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,42 @@ The CEA team
Starting from version 2.9.1 the credits are structured alphabetically (surname) and split into the categories of developers,
scrum master, project owner, project sponsor and collaborators.

- Version 2.30.0 - January 2020

Developers:
* [Amr Elesawy](http://www.systems.arch.ethz.ch/about-us/team/team-zurich/amr-elesawy.html)
* [Jimeno A. Fonseca](http://www.systems.arch.ethz.ch/about-us/team/team-singapore/jimeno-fonseca.html)
* [Gabriel Happle](http://www.systems.arch.ethz.ch/about-us/team/team-singapore/gabriel-happle.html)
* [Shanshan Hsieh](http://www.systems.arch.ethz.ch/about-us/team/team-singapore/shanshan-hsieh.html)
* [Reynold Mok](http://https://cityenergyanalyst.com/community)
* [Martín Mosteiro Romero](http://www.systems.arch.ethz.ch/about-us/team/team-zurich/martin-mosteiro-romero.html)
* [Zhongming Shi](http://www.systems.arch.ethz.ch/about-us/team/team-singapore/zhongming-shi.html)
* [Bhargava Krishna Sreepathi ](http://www.systems.arch.ethz.ch/about-us/team/team-singapore/sreepathi-bhargava-krishna.html)
* [Daren Thomas](http://www.systems.arch.ethz.ch/about-us/team/team-zurich/daren-thomas.html)

Scrum master:
* [Daren Thomas](http://www.systems.arch.ethz.ch/about-us/team/team-zurich/daren-thomas.html)

Project owner:
* [Jimeno A. Fonseca](http://www.systems.arch.ethz.ch/about-us/team/team-singapore/jimeno-fonseca.html)

Project sponsor:
* [Arno Schlueter](http://www.systems.arch.ethz.ch/about-us/team/arno-schlueter.html)

Collaborators:
* Sebastian Troiztsch
* Jose Bello
* Kian Wee Chen
* Jack Hawthorne
* Fazel Khayatian
* Victor Marty
* Paul Neitzel
* Thuy-An Nguyen
* Bo Lie Ong
* Lennart Rogenhofer
* Toivo Säwén
* Tim Vollrath

- Version 2.29.0 - January 2020

Developers:
Expand Down
24 changes: 9 additions & 15 deletions bin/ceatestall.bat
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
rem script used to test the cea by the jenkins
rem creates a conda environment (deleting the old one first)

rem removing conda environment creation temporarily
rem call conda env remove -y -q --name ceatestall
rem call conda env create -q --name ceatestall

rem call activate ceatestall
call activate cea

pip.exe install -e .

rem where cea

REM script used to test the cea by the jenkins
SET CEA=%USERPROFILE%\Documents\CityEnergyAnalyst
SET PATH=%CEA%\Dependencies\Python;%CEA%\Dependencies\Python\Scripts;%CEA%\Dependencies\Daysim;%PATH%
SET PYTHONHOME=%CEA%\Dependencies\Python
SET PYTHONHOME=%CEA%\Dependencies\Python
SET GDAL_DATA=%CEA%\Dependencies\Python\Library\share\gdal
SET PROJ_LIB=%CEA%\Dependencies\Python\Library\share
SET RAYPATH=%CEA%\Dependencies\Daysim
"%CEA%\Dependencies\Python\python.exe" -u -m pip install -e .
cea test --reference-cases open --tasks all --verbosity 1
if %errorlevel% neq 0 exit /b %errorlevel%

call deactivate


2 changes: 1 addition & 1 deletion cea/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.29.0"
__version__ = "2.30.0"


class ConfigError(Exception):
Expand Down
10 changes: 5 additions & 5 deletions cea/interfaces/dashboard/api/inputs.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def get(self):
store['geojsons']['dh'], store['connected_buildings']['dh'], store['crs']['dh'] = get_network(
config, 'dh', trigger_abort=False)
store['colors'] = COLORS
store['SCHEDULES'] = {}
store['schedules'] = {}

return store
def put(self):
Expand All @@ -136,7 +136,7 @@ def put(self):
tables = form['tables']
geojsons = form['geojsons']
crs = form['crs']
SCHEDULES = form['SCHEDULES']
schedules = form['schedules']

out = {'tables': {}, 'geojsons': {}}

Expand Down Expand Up @@ -178,9 +178,9 @@ def put(self):
if db_info['type'] == 'shp':
out['geojsons'][db] = {}

if SCHEDULES:
for building in SCHEDULES:
schedule_dict_to_file(SCHEDULES[building], locator.get_building_weekly_schedules(building))
if schedules:
for building in schedules:
schedule_dict_to_file(schedules[building], locator.get_building_weekly_schedules(building))

return out

Expand Down
6 changes: 3 additions & 3 deletions docs/modules/cea.analysis.costs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ cea.analysis.costs package
Submodules
----------

cea.analysis.costs.operation\_costs module
------------------------------------------
cea.analysis.costs.system\_costs module
---------------------------------------

.. automodule:: cea.analysis.costs.operation_costs
.. automodule:: cea.analysis.costs.system_costs
:members:
:undoc-members:
:show-inheritance:
Expand Down
36 changes: 0 additions & 36 deletions docs/modules/cea.plots.life_cycle.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/modules/cea.plots.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Subpackages

cea.plots.comparisons
cea.plots.demand
cea.plots.life_cycle
cea.plots.optimization
cea.plots.solar_potential
cea.plots.supply_system
Expand Down