scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-10-31 18:18:00 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Take explicitly set out_voa value into account in power calculation

Browse Source 
As mentioned in GitHub issue #409, an out_voa value for an EDFA
explicitly set in the topology file is not taken into account by
auto-design when calculating target power and gain. I think it is
more logical if the target power resulting from the optimization
algorithm represents the desired power into the fiber. This is also
more consistent with the behaviour for an automatically set out_voa
value when out_voa_auto is set to true.

Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
Change-Id: I7e58b61d0bf30728c39d36404619dbe370c12f2b
This commit is contained in:
Jonas Mårtensson
2021-06-11 08:32:00 +02:00
parent e33144f8cc
commit ce51a4d160
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnpy/core/network.py
View File

@@ -269,7 +269,7 @@ def set_egress_amplifier(network, this_node, equipment, pref_ch_db, pref_total_d
node_loss = span_loss(network, prev_node) node_loss = span_loss(network, prev_node)
voa = node.out_voa if node.out_voa else 0 voa = node.out_voa if node.out_voa else 0
if node.delta_p is None: if node.delta_p is None:
dp = target_power(network, next_node, equipment) dp = target_power(network, next_node, equipment) + voa
else: else:
dp = node.delta_p dp = node.delta_p
if node.effective_gain is None or power_mode: if node.effective_gain is None or power_mode: