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

Add PMD and PDL in amplifiers

Browse Source 
Both PMD and PDL is set to 0 by default. Values from the OpenROADM MSA
for ILAs are included in corresponding eqpt files.

Signed-off-by: Jonas Mårtensson <jonas.martensson@ri.se>
Change-Id: I79611db3ae798e9dadc47ee39161dc1e242f2595
This commit is contained in:
Jonas Mårtensson
2021-11-25 09:03:11 +01:00
committed by Jan Kundrát
parent 14591c7a11
commit 62fa9ab0b0
6 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnpy/core/elements.py
View File

@@ -960,7 +960,9 @@ class Edfa(_Node):
pwr = pwr._replace(signal=pwr.signal * gain / att,
nli=pwr.nli * gain / att,
ase=(pwr.ase + carrier_ase) * gain / att)
yield carrier._replace(power=pwr)
pmd = sqrt(carrier.pmd**2 + self.params.pmd**2)
pdl = sqrt(carrier.pdl**2 + self.params.pdl**2)
yield carrier._replace(power=pwr, pmd=pmd, pdl=pdl)
def update_pref(self, pref):
return pref._replace(p_span0=pref.p_span0,

8
gnpy/example-data/eqpt_config_openroadm_ver4.json
View File

@@ -7,6 +7,8 @@
"gain_min": 0,
"p_max": 22,
"nf_coef": [-8.104e-4, -6.221e-2, -5.889e-1, 37.62],
"pmd": 3e-12,
"pdl": 0.7,
"allowed_for_design": true
},
{
@@ -16,6 +18,8 @@
"gain_min": 0,
"p_max": 22,
"nf_coef": [-5.952e-4, -6.250e-2, -1.071, 28.99],
"pmd": 3e-12,
"pdl": 0.7,
"allowed_for_design": true
},
{
@@ -24,6 +28,8 @@
"gain_flatmax": 27,
"gain_min": 0,
"p_max": 22,
"pmd": 0,
"pdl": 0,
"allowed_for_design": false
},
{
@@ -32,6 +38,8 @@
"gain_flatmax": 32,
"gain_min": 0,
"p_max": 22,
"pmd": 0,
"pdl": 0,
"allowed_for_design": false
}
],

10
gnpy/example-data/eqpt_config_openroadm_ver5.json
View File

@@ -7,6 +7,8 @@
"gain_min": 0,
"p_max": 22,
"nf_coef": [-8.104e-4, -6.221e-2, -5.889e-1, 37.62],
"pmd": 3e-12,
"pdl": 0.7,
"allowed_for_design": true
},
{
@@ -16,6 +18,8 @@
"gain_min": 0,
"p_max": 22,
"nf_coef": [-5.952e-4, -6.250e-2, -1.071, 28.99],
"pmd": 3e-12,
"pdl": 0.7,
"allowed_for_design": true
},
{
@@ -25,6 +29,8 @@
"gain_min": 0,
"p_max": 22,
"nf_coef": [-5.952e-4, -6.250e-2, -1.071, 28.99],
"pmd": 0,
"pdl": 0,
"allowed_for_design": false
},
{
@@ -34,6 +40,8 @@
"gain_min": 0,
"p_max": 22,
"nf_coef": [-5.952e-4, -6.250e-2, -1.071, 27.99],
"pmd": 0,
"pdl": 0,
"allowed_for_design": false
},
{
@@ -42,6 +50,8 @@
"gain_flatmax": 32,
"gain_min": 0,
"p_max": 22,
"pmd": 0,
"pdl": 0,
"allowed_for_design": false
}
],

4
gnpy/tools/json_io.py
View File

@@ -172,7 +172,9 @@ class Amp(_JsonThing):
'gain_ripple': None,
'out_voa_auto': False,
'allowed_for_design': False,
'raman': False
'raman': False,
'pmd': 0,
'pdl': 0
}
def __init__(self, **kwargs):

4
tests/invocation/openroadm-v4-Stockholm-Gothenburg
View File

@@ -230,8 +230,8 @@ Transceiver trx_Gothenburg
OSNR ASE (0.1nm, dB): 21.20
OSNR ASE (signal bw, dB): 17.18
CD (ps/nm): 8350.42
PMD (ps): 7.40
PDL (dB): 3.67
PMD (ps): 7.99
PDL (dB): 3.74
Transmission result for input power = 2.00 dBm:
Final GSNR (0.1 nm): 18.90 dB

4
tests/invocation/openroadm-v5-Stockholm-Gothenburg
View File

@@ -230,8 +230,8 @@ Transceiver trx_Gothenburg
OSNR ASE (0.1nm, dB): 21.84
OSNR ASE (signal bw, dB): 17.82
CD (ps/nm): 8350.42
PMD (ps): 7.40
PDL (dB): 3.67
PMD (ps): 7.99
PDL (dB): 3.74
Transmission result for input power = 2.00 dBm:
Final GSNR (0.1 nm): 19.27 dB