From 8aba507ce173e8ac671ca4bbbab1aacb90bcc38e Mon Sep 17 00:00:00 2001 From: smartie2076 <44204527+smartie2076@users.noreply.github.com> Date: Tue, 30 Jun 2020 16:20:06 +0200 Subject: [PATCH 1/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aee75d8d..623e18d2 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ If you have questions regarding the tool's execution or it's code pieces, please * If python3 not pre-installed: Install miniconda * Download and integrate cbc solver * Open Anaconda prompt, create environment -* Run: pip install -r requirements.txt -* Execute: python A_main_script.py ./inputs/test_input_template.xlsx +* Run: `pip install -r requirements.txt` +* Execute: `python Offgridders.py ./inputs/test_input_template.xlsx` For Details: See [github wiki](https://github.com/smartie2076/simulator_grid-connected_micro_grid/wiki/Installation) From 5929cd1c8795cabb424a34703713359dbeaab323 Mon Sep 17 00:00:00 2001 From: smartie2076 <44204527+smartie2076@users.noreply.github.com> Date: Tue, 30 Jun 2020 16:22:28 +0200 Subject: [PATCH 2/8] Update CHANGELOG.md --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6161f3c5..ea03e3bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,16 @@ Here is a template for new release sections ### Removed - ``` -## [Offgridders V4.2] - 2020-06-30 +## [Unreleased] +### Added +- +### Changed +- +### Removed +- + +## [Offgridders V4.2] - 2020-06-30 ### Added - `total_excess_annual_kWh` to list of output parameters. Calculation: `total_excess_annual_kWh = total_excess_ac_annual_kWh + total_excess_dc_annual` (#73) From 1de20149fa32e0280fce15d79a508f8a81ec7144 Mon Sep 17 00:00:00 2001 From: smartie2076 Date: Thu, 2 Jul 2020 12:36:20 +0200 Subject: [PATCH 3/8] Fix get_universal_parameters --- src/C_sensitivity_experiments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/C_sensitivity_experiments.py b/src/C_sensitivity_experiments.py index 3a8b74f5..b7cedd9a 100644 --- a/src/C_sensitivity_experiments.py +++ b/src/C_sensitivity_experiments.py @@ -247,7 +247,7 @@ def with_base_case( parameters_constant_values, project_site_s ) - universal_parameters, number_of_project_sites = get.universal_parameters( + universal_parameters, number_of_project_sites = get_universal_parameters( settings, parameters_constant_values, parameters_sensitivity, project_site_s ) From 19efaa2f34f879ae36e46ba6ede11e78c555845f Mon Sep 17 00:00:00 2001 From: smartie2076 Date: Thu, 2 Jul 2020 12:40:15 +0200 Subject: [PATCH 4/8] Fix get_combinations_around_base --- src/C_sensitivity_experiments.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/C_sensitivity_experiments.py b/src/C_sensitivity_experiments.py index b7cedd9a..22fc0362 100644 --- a/src/C_sensitivity_experiments.py +++ b/src/C_sensitivity_experiments.py @@ -259,7 +259,7 @@ def with_base_case( ( sensitivity_experiment_s, total_number_of_experiments, - ) = get.combinations_around_base( + ) = get_combinations_around_base( sensitivity_array_dict, universal_parameters, project_site_s ) @@ -444,7 +444,7 @@ def get_all_possible_combinations(sensitivity_array_dict, name_entry_dict): return sensitivity_experiment_s, total_number_of_experiments -def combinations_around_base( +def get_combinations_around_base( sensitivity_array_dict, universal_parameters, project_site_s ): From e17933bdd7db89272dfaaaf6467f1ec70f7cf8dc Mon Sep 17 00:00:00 2001 From: smartie2076 Date: Thu, 2 Jul 2020 12:41:04 +0200 Subject: [PATCH 5/8] Fix get_number_of_blackouts --- src/E_blackouts_central_grid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/E_blackouts_central_grid.py b/src/E_blackouts_central_grid.py index 15259048..ba54b28d 100644 --- a/src/E_blackouts_central_grid.py +++ b/src/E_blackouts_central_grid.py @@ -181,7 +181,7 @@ def availability( + " per month" ) - number_of_blackouts = number_of_blackouts( + number_of_blackouts = get_number_of_blackouts( settings["max_evaluated_days"], blackout_experiment_s[experiment] ) @@ -259,7 +259,7 @@ def availability( return grid_availability_df -def number_of_blackouts(evaluated_days, experiment): +def get_number_of_blackouts(evaluated_days, experiment): # Calculation of expected blackouts per analysed timeframe blackout_events_per_month = np.random.normal( loc=experiment["blackout_frequency"], # median value: blackout duration From 5db325e7f0927d3976ffa2daeea29150e767c847 Mon Sep 17 00:00:00 2001 From: smartie2076 Date: Thu, 2 Jul 2020 12:47:32 +0200 Subject: [PATCH 6/8] CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea03e3bd..12c069c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,12 @@ Here is a template for new release sections ### Removed - +### Fixed +- Faulty function calls from module structure change: 'get_universal_parameters', +'get_combinations_around_base', 'get_number_of_blackouts' (#86) + +() + ## [Offgridders V4.2] - 2020-06-30 ### Added From cf82a333b68f74bfc6a686d2c971664e5de9601d Mon Sep 17 00:00:00 2001 From: smartie2076 Date: Thu, 2 Jul 2020 13:18:09 +0200 Subject: [PATCH 7/8] CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c069c7..aa51ce21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,7 +56,7 @@ Here is a template for new release sections ### Changed - Moved Wiki to Readthedocs (#41) - Changed class structure to modules/functions (#53) -- Script A0 was refactored to Offgridders. It runs now through python Offgridders.py YOUR_INPUT_EXCEL_SHEET_PATH (#53) +- Script A0 was refactored to Offgridders. It runs now through `python Offgridders.py YOUR_INPUT_EXCEL_SHEET_PATH` (#53) ### Fixed - Compilation of readthedocs by changing advanced settings on readthedocs.io (#59) From 91a7e5b160278d3adfbb8b0fc777f4530a0995d2 Mon Sep 17 00:00:00 2001 From: smartie2076 <44204527+smartie2076@users.noreply.github.com> Date: Thu, 2 Jul 2020 13:45:28 +0200 Subject: [PATCH 8/8] Update CHANGELOG.md --- CHANGELOG.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa51ce21..d54f28be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,21 +16,13 @@ Here is a template for new release sections ### Removed - ``` -## [Unreleased] -### Added -- -### Changed -- -### Removed -- +## [Offgridders V4.3] - 2020-07-02 ### Fixed - Faulty function calls from module structure change: 'get_universal_parameters', 'get_combinations_around_base', 'get_number_of_blackouts' (#86) -() - ## [Offgridders V4.2] - 2020-06-30 ### Added