Merge pull request #87 from rl-institut/release_v4.3

Release v4.3
rl-institut · Jul 2, 2020 · 7b0e9db · 7b0e9db
2 parents 4f2b91d + 91a7e5b
commit 7b0e9db
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,8 +16,14 @@ Here is a template for new release sections
 ### Removed
 -
 ```
-## [Offgridders V4.2] - 2020-06-30
 
+## [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
 - `total_excess_annual_kWh` to list of output parameters. Calculation: `total_excess_annual_kWh = total_excess_ac_annual_kWh + total_excess_dc_annual` (#73)
@@ -42,7 +48,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)

diff --git 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
     )
 
@@ -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
 ):
 

diff --git 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