From cd270cd16d0641d332eda18bdd6b443cd8927e1c Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Tue, 13 Aug 2024 15:03:44 +0200 Subject: [PATCH 1/2] Clarify the results of cross border flow functions in the docstring --- etrago/tools/calc_results.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/etrago/tools/calc_results.py b/etrago/tools/calc_results.py index e23d3524..cdf598f7 100755 --- a/etrago/tools/calc_results.py +++ b/etrago/tools/calc_results.py @@ -504,12 +504,12 @@ def system_costs_germany(self): def ac_export(self): - """Calculate electricity exports and imports over AC lines + """Calculate the balance of electricity exports and imports over AC lines Returns ------- float - Electricity export (if negative: import) from Germany + Balance of electricity export in MWh (if negative: import from Germany) """ de_buses = self.network.buses[self.network.buses.country == "DE"] @@ -536,12 +536,13 @@ def ac_export(self): def ac_export_per_country(self): - """Calculate electricity exports and imports over AC lines per country + """Calculate the balance of electricity exports and imports over AC lines + per country Returns ------- float - Electricity export (if negative: import) from Germany in TWh + Balance of electricity exchange in TWh (if > 0: export from Germany) """ de_buses = self.network.buses[self.network.buses.country == "DE"] @@ -583,12 +584,12 @@ def ac_export_per_country(self): def dc_export(self): - """Calculate electricity exports and imports over DC lines + """"Calculate the balance of electricity exports and imports over DC lines Returns ------- float - Electricity export (if negative: import) from Germany + Balance of electricity exchange in MWh (if > 0: export from Germany) """ de_buses = self.network.buses[self.network.buses.country == "DE"] @@ -616,12 +617,13 @@ def dc_export(self): def dc_export_per_country(self): - """Calculate electricity exports and imports over DC lines per country + """Calculate the balance of electricity exports and imports over DC lines + per country Returns ------- float - Electricity export (if negative: import) from Germany in TWh + Balance of electricity exchange in TWh (if > 0: export from Germany) """ de_buses = self.network.buses[self.network.buses.country == "DE"] From 36c4d5a8c7370fa821a422a1eb03c0e0b203fb68 Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Tue, 13 Aug 2024 15:06:20 +0200 Subject: [PATCH 2/2] Remove typo --- etrago/tools/calc_results.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etrago/tools/calc_results.py b/etrago/tools/calc_results.py index cdf598f7..cd54fc38 100755 --- a/etrago/tools/calc_results.py +++ b/etrago/tools/calc_results.py @@ -584,7 +584,7 @@ def ac_export_per_country(self): def dc_export(self): - """"Calculate the balance of electricity exports and imports over DC lines + """Calculate the balance of electricity exports and imports over DC lines Returns -------