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

Don't include add_drop_osnr when there is no ROADM in path

Browse Source 
The parameter add_drop_osnr is specified in the Roadm section of
eqpt_config.json and represents noise added by amplifiers within the
add/drop block of ROADMs. Currently this noise is added to the signal
whether the propagation path includes any ROADMs or not, which does not
make sense to me. This patch proposes to only add the add_drop_osnr when
a path actually includes ROADMs.

See GitHub issue #274.

Change-Id: I58961772c049578eff8879dfb2e53265866d12c4
Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
This commit is contained in:
Jonas Mårtensson
2020-06-22 10:06:04 +02:00
parent d3eaa4d7ba
commit 0b965d931c
3 changed files with 98 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gnpy/topology/request.py
View File

@@ -336,7 +336,10 @@ def propagate(path, req, equipment):
for el in path:
si = el(si)
path[0].update_snr(req.tx_osnr)
path[-1].update_snr(req.tx_osnr, equipment['Roadm']['default'].add_drop_osnr)
if any(isinstance(el, Roadm) for el in path):
path[-1].update_snr(req.tx_osnr, equipment['Roadm']['default'].add_drop_osnr)
else:
path[-1].update_snr(req.tx_osnr)
return path
@@ -350,7 +353,10 @@ def propagate2(path, req, equipment):
after_si = si = el(si)
infos[el] = before_si, after_si
path[0].update_snr(req.tx_osnr)
path[-1].update_snr(req.tx_osnr, equipment['Roadm']['default'].add_drop_osnr)
if any(isinstance(el, Roadm) for el in path):
path[-1].update_snr(req.tx_osnr, equipment['Roadm']['default'].add_drop_osnr)
else:
path[-1].update_snr(req.tx_osnr)
return infos
@@ -382,7 +388,10 @@ def propagate_and_optimize_mode(path, req, equipment):
for this_mode in modes_to_explore:
if path[-1].snr is not None:
path[0].update_snr(this_mode['tx_osnr'])
path[-1].update_snr(this_mode['tx_osnr'], equipment['Roadm']['default'].add_drop_osnr)
if any(isinstance(el, Roadm) for el in path):
path[-1].update_snr(this_mode['tx_osnr'], equipment['Roadm']['default'].add_drop_osnr)
else:
path[-1].update_snr(this_mode['tx_osnr'])
if round(min(path[-1].snr + lin2db(this_br / (12.5e9))), 2) > this_mode['OSNR']:
return path, this_mode
else:

10
tests/invocation/transmission_main_example
View File

@@ -36,15 +36,15 @@ Edfa Edfa1
effective pch (dBm): -2.0
output VOA (dB): 0.00
Transceiver Site_B
OSNR ASE (0.1nm, dB): 32.03
OSNR ASE (signal bw, dB): 27.95
SNR total (signal bw, dB): 26.27
SNR total (0.1nm, dB): 30.35
OSNR ASE (0.1nm, dB): 33.30
OSNR ASE (signal bw, dB): 29.21
SNR total (signal bw, dB): 27.09
SNR total (0.1nm, dB): 31.17
CD (ps/nm): 1336.00
PMD (ps): 0.36
Transmission result for input power = 0.00 dBm:
Final SNR total (0.1 nm): 30.35 dB
Final SNR total (0.1 nm): 31.17 dB
(No source node specified: picked Site_A)

162
tests/invocation/transmission_main_example__raman
View File

@@ -36,94 +36,94 @@ Edfa Edfa1
effective pch (dBm): -2.0
output VOA (dB): 0.00
Transceiver Site_B
OSNR ASE (0.1nm, dB): 32.65
OSNR ASE (signal bw, dB): 28.57
SNR total (signal bw, dB): 26.48
SNR total (0.1nm, dB): 30.56
OSNR ASE (0.1nm, dB): 34.18
OSNR ASE (signal bw, dB): 30.10
SNR total (signal bw, dB): 27.35
SNR total (0.1nm, dB): 31.43
CD (ps/nm): 1336.00
PMD (ps): 0.36
Transmission result for input power = 0.00 dBm:
Final SNR total (0.1 nm): 30.56 dB
Final SNR total (0.1 nm): 31.43 dB
The total SNR per channel at the end of the line is:
Ch. # Channel frequency (THz) Channel power (dBm) OSNR ASE (signal bw, dB) SNR NLI (signal bw, dB) SNR total (signal bw, dB)
1 191.35 0.21 29.57 31.47 27.41
2 191.40 0.17 29.56 31.38 27.36
3 191.45 0.14 29.54 31.30 27.32
4 191.50 0.10 29.53 31.22 27.28
5 191.55 0.04 29.51 31.14 27.24
6 191.60 -0.02 29.49 31.06 27.19
7 191.65 -0.08 29.47 30.98 27.15
8 191.70 -0.14 29.45 30.90 27.11
9 191.75 -0.20 29.43 30.83 27.06
10 191.80 -0.26 29.41 30.75 27.02
11 191.85 -0.33 29.39 30.68 26.97
12 191.90 -0.39 29.36 30.61 26.93
13 191.95 -0.46 29.34 30.54 26.89
14 192.00 -0.52 29.32 30.47 26.84
15 192.05 -0.59 29.30 30.40 26.80
16 192.10 -0.66 29.27 30.33 26.76
17 192.15 -0.72 29.25 30.26 26.72
18 192.20 -0.79 29.22 30.20 26.67
19 192.25 -0.86 29.20 30.21 26.66
20 192.30 -0.94 29.17 30.21 26.65
21 192.35 -1.01 29.14 30.22 26.64
22 192.40 -1.09 29.11 30.23 26.62
23 192.45 -1.16 29.08 30.23 26.61
24 192.50 -1.24 29.05 30.24 26.60
25 192.55 -1.31 29.03 30.25 26.58
26 192.60 -1.38 29.00 30.25 26.57
27 192.65 -1.45 28.97 30.26 26.56
28 192.70 -1.52 28.94 30.27 26.55
29 192.75 -1.59 28.91 30.28 26.53
30 192.80 -1.66 28.89 30.28 26.52
31 192.85 -1.73 28.86 30.29 26.50
32 192.90 -1.80 28.83 30.30 26.49
33 192.95 -1.87 28.80 30.30 26.48
34 193.00 -1.94 28.77 30.31 26.46
35 193.05 -2.01 28.74 30.32 26.45
36 193.10 -2.08 28.71 30.33 26.43
37 193.15 -2.15 28.68 30.33 26.42
38 193.20 -2.22 28.65 30.35 26.41
39 193.25 -2.29 28.62 30.37 26.40
40 193.30 -2.36 28.59 30.39 26.38
41 193.35 -2.43 28.56 30.40 26.37
42 193.40 -2.49 28.53 30.42 26.36
43 193.45 -2.56 28.49 30.44 26.35
44 193.50 -2.63 28.46 30.46 26.34
45 193.55 -2.70 28.43 30.47 26.32
46 193.60 -2.78 28.40 30.49 26.31
47 193.65 -2.85 28.36 30.51 26.29
48 193.70 -2.92 28.33 30.53 26.28
49 193.75 -2.99 28.29 30.54 26.26
50 193.80 -3.06 28.26 30.56 26.25
51 193.85 -3.14 28.22 30.58 26.23
52 193.90 -3.21 28.19 30.60 26.22
53 193.95 -3.28 28.15 30.62 26.20
54 194.00 -3.35 28.12 30.64 26.19
55 194.05 -3.42 28.08 30.65 26.17
56 194.10 -3.50 28.04 30.67 26.15
57 194.15 -3.57 28.01 30.73 26.15
58 194.20 -3.64 27.97 30.79 26.14
59 194.25 -3.72 27.93 30.85 26.14
60 194.30 -3.79 27.89 30.91 26.13
61 194.35 -3.86 27.86 30.97 26.13
62 194.40 -3.93 27.82 31.03 26.12
63 194.45 -4.01 27.78 31.09 26.12
64 194.50 -4.08 27.74 31.15 26.11
65 194.55 -4.14 27.71 31.22 26.11
66 194.60 -4.21 27.67 31.28 26.10
67 194.65 -4.28 27.63 31.35 26.09
68 194.70 -4.34 27.60 31.41 26.09
69 194.75 -4.41 27.56 31.48 26.08
70 194.80 -4.47 27.52 31.55 26.08
71 194.85 -4.54 27.49 31.62 26.07
72 194.90 -4.60 27.45 31.69 26.06
73 194.95 -4.67 27.41 31.77 26.06
74 195.00 -4.73 27.38 31.84 26.05
75 195.05 -4.80 27.34 31.91 26.04
76 195.10 -4.86 27.30 31.91 26.01
1 191.35 0.21 31.56 31.47 28.50
2 191.40 0.17 31.54 31.38 28.45
3 191.45 0.14 31.52 31.30 28.40
4 191.50 0.10 31.50 31.22 28.34
5 191.55 0.04 31.47 31.14 28.29
6 191.60 -0.02 31.44 31.06 28.23
7 191.65 -0.08 31.41 30.98 28.18
8 191.70 -0.14 31.37 30.90 28.12
9 191.75 -0.20 31.34 30.83 28.07
10 191.80 -0.26 31.31 30.75 28.01
11 191.85 -0.33 31.27 30.68 27.96
12 191.90 -0.39 31.24 30.61 27.90
13 191.95 -0.46 31.20 30.54 27.85
14 192.00 -0.52 31.17 30.47 27.79
15 192.05 -0.59 31.13 30.40 27.74
16 192.10 -0.66 31.10 30.33 27.69
17 192.15 -0.72 31.06 30.26 27.63
18 192.20 -0.79 31.02 30.20 27.58
19 192.25 -0.86 30.98 30.21 27.57
20 192.30 -0.94 30.94 30.21 27.55
21 192.35 -1.01 30.90 30.22 27.54
22 192.40 -1.09 30.86 30.23 27.52
23 192.45 -1.16 30.81 30.23 27.50
24 192.50 -1.24 30.77 30.24 27.49
25 192.55 -1.31 30.73 30.25 27.47
26 192.60 -1.38 30.69 30.25 27.46
27 192.65 -1.45 30.65 30.26 27.44
28 192.70 -1.52 30.61 30.27 27.42
29 192.75 -1.59 30.56 30.28 27.41
30 192.80 -1.66 30.52 30.28 27.39
31 192.85 -1.73 30.48 30.29 27.37
32 192.90 -1.80 30.44 30.30 27.36
33 192.95 -1.87 30.39 30.30 27.34
34 193.00 -1.94 30.35 30.31 27.32
35 193.05 -2.01 30.31 30.32 27.30
36 193.10 -2.08 30.27 30.33 27.29
37 193.15 -2.15 30.22 30.33 27.27
38 193.20 -2.22 30.18 30.35 27.25
39 193.25 -2.29 30.14 30.37 27.24
40 193.30 -2.36 30.09 30.39 27.23
41 193.35 -2.43 30.05 30.40 27.21
42 193.40 -2.49 30.01 30.42 27.20
43 193.45 -2.56 29.96 30.44 27.18
44 193.50 -2.63 29.92 30.46 27.17
45 193.55 -2.70 29.87 30.47 27.15
46 193.60 -2.78 29.83 30.49 27.13
47 193.65 -2.85 29.78 30.51 27.12
48 193.70 -2.92 29.73 30.53 27.10
49 193.75 -2.99 29.68 30.54 27.08
50 193.80 -3.06 29.64 30.56 27.06
51 193.85 -3.14 29.59 30.58 27.05
52 193.90 -3.21 29.54 30.60 27.03
53 193.95 -3.28 29.49 30.62 27.01
54 194.00 -3.35 29.44 30.64 26.99
55 194.05 -3.42 29.39 30.65 26.97
56 194.10 -3.50 29.34 30.67 26.95
57 194.15 -3.57 29.29 30.73 26.94
58 194.20 -3.64 29.24 30.79 26.94
59 194.25 -3.72 29.19 30.85 26.93
60 194.30 -3.79 29.14 30.91 26.93
61 194.35 -3.86 29.09 30.97 26.92
62 194.40 -3.93 29.04 31.03 26.91
63 194.45 -4.01 28.99 31.09 26.90
64 194.50 -4.08 28.94 31.15 26.90
65 194.55 -4.14 28.89 31.22 26.89
66 194.60 -4.21 28.85 31.28 26.88
67 194.65 -4.28 28.80 31.35 26.88
68 194.70 -4.34 28.75 31.41 26.87
69 194.75 -4.41 28.70 31.48 26.86
70 194.80 -4.47 28.66 31.55 26.86
71 194.85 -4.54 28.61 31.62 26.85
72 194.90 -4.60 28.56 31.69 26.84
73 194.95 -4.67 28.51 31.77 26.83
74 195.00 -4.73 28.47 31.84 26.82
75 195.05 -4.80 28.42 31.91 26.81
76 195.10 -4.86 28.37 31.91 26.78
(No source node specified: picked Site_A)