diff --git a/docs/manual/source/usage/inputs.rst b/docs/manual/source/usage/inputs.rst index 93dea601..221d18b2 100644 --- a/docs/manual/source/usage/inputs.rst +++ b/docs/manual/source/usage/inputs.rst @@ -385,7 +385,8 @@ the user if there are any errors in it. # u_nom is the nominal voltage in the PDR Bus (in kV) # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = - # s_nom is the nominal apparent power of the generator unit (in MVA) + # s_nom is the nominal apparent power of all generating units (in MVA) + # This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = # q_max is the maximum reactive power of the generator unit (in MVar) q_max = diff --git a/docs/tutorial/3_preparing_inputs.md b/docs/tutorial/3_preparing_inputs.md index 640d1aed..52c915a5 100644 --- a/docs/tutorial/3_preparing_inputs.md +++ b/docs/tutorial/3_preparing_inputs.md @@ -144,7 +144,8 @@ Dynawo # u_nom is the nominal voltage in the PDR Bus (in kV) # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 - # s_nom is the nominal apparent power of the generator unit (in MVA) + # s_nom is the nominal apparent power of all generating units (in MVA) + # This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of the generator unit (in MVar) q_max = 40 @@ -663,7 +664,8 @@ p_max = # u_nom is the nominal voltage in the PDR Bus (in kV) # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = -# s_nom is the nominal apparent power of the generator unit (in MVA) +# s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = # q_max is the maximum reactive power of the generator unit (in MVar) q_max = diff --git a/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.ini b/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.ini +++ b/examples/Model/BESS/WECC/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.ini b/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.ini +++ b/examples/Model/BESS/WECC/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/BESS/WECC/ProducerCurves/Zone1/Producer.ini b/examples/Model/BESS/WECC/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/BESS/WECC/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/BESS/WECC/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/BESS/WECC/ProducerCurves/Zone3/Producer.ini b/examples/Model/BESS/WECC/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/BESS/WECC/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/BESS/WECC/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone1/Producer.ini b/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone3/Producer.ini b/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Photovoltaics/WECCCurrentSource/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone1/Producer.ini b/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone3/Producer.ini b/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Photovoltaics/WECCCurrentSource/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone1/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone3/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceA/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone1/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone3/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceA/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone1/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone3/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceB/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone1/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone3/Producer.ini b/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Photovoltaics/WECCVoltageSourceB/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2015/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/IECA2015/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/IECA2015/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/IECA2015/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2015/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/IECA2015/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/IECA2015/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/IECA2015/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2015/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/IECA2015/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/IECA2015/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/IECA2015/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2015/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/IECA2015/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/IECA2015/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/IECA2015/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/IECA2020/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/IECA2020/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/IECA2020/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/IECA2020/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/IECA2020/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/IECA2020/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/IECA2020/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/IECA2020/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/IECA2020/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/IECA2020/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/IECA2020/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/IECA2020/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/IECA2020WithProtections/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/IECA2020WithProtections/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2015/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/IECB2015/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/IECB2015/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/IECB2015/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2015/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/IECB2015/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/IECB2015/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/IECB2015/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2015/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/IECB2015/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/IECB2015/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/IECB2015/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2015/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/IECB2015/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/IECB2015/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/IECB2015/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/IECB2020/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/IECB2020/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/IECB2020/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/IECB2020/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/IECB2020/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/IECB2020/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/IECB2020/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/IECB2020/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/IECB2020/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/IECB2020/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/IECB2020/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/IECB2020/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/IECB2020WithProtections/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/IECB2020WithProtections/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCA/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/WECCA/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/WECCA/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/WECCA/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCA/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/WECCA/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/WECCA/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/WECCA/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCA/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/WECCA/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/WECCA/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/WECCA/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCA/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/WECCA/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/WECCA/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/WECCA/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCB/Dynawo/Zone1/Producer.ini b/examples/Model/Wind/WECCB/Dynawo/Zone1/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Model/Wind/WECCB/Dynawo/Zone1/Producer.ini +++ b/examples/Model/Wind/WECCB/Dynawo/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCB/Dynawo/Zone3/Producer.ini b/examples/Model/Wind/WECCB/Dynawo/Zone3/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Model/Wind/WECCB/Dynawo/Zone3/Producer.ini +++ b/examples/Model/Wind/WECCB/Dynawo/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCB/ProducerCurves/Zone1/Producer.ini b/examples/Model/Wind/WECCB/ProducerCurves/Zone1/Producer.ini index 70d48308..5629c713 100644 --- a/examples/Model/Wind/WECCB/ProducerCurves/Zone1/Producer.ini +++ b/examples/Model/Wind/WECCB/ProducerCurves/Zone1/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Model/Wind/WECCB/ProducerCurves/Zone3/Producer.ini b/examples/Model/Wind/WECCB/ProducerCurves/Zone3/Producer.ini index abd8c705..97e70d54 100644 --- a/examples/Model/Wind/WECCB/ProducerCurves/Zone3/Producer.ini +++ b/examples/Model/Wind/WECCB/ProducerCurves/Zone3/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/ProducerCurves/GeneratorSynchronous/Producer.ini b/examples/Performance/ProducerCurves/GeneratorSynchronous/Producer.ini index 99ce980f..4597b66f 100644 --- a/examples/Performance/ProducerCurves/GeneratorSynchronous/Producer.ini +++ b/examples/Performance/ProducerCurves/GeneratorSynchronous/Producer.ini @@ -4,6 +4,7 @@ p_max = 456.7 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 555 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 100 diff --git a/examples/Performance/ProducerCurves/Wind/Producer.ini b/examples/Performance/ProducerCurves/Wind/Producer.ini index d15933fe..e2cf40b3 100644 --- a/examples/Performance/ProducerCurves/Wind/Producer.ini +++ b/examples/Performance/ProducerCurves/Wind/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/Single/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini b/examples/Performance/Single/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini index fcbf8908..4ac2f2b9 100644 --- a/examples/Performance/Single/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini +++ b/examples/Performance/Single/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 456.7 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 555 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 100 diff --git a/examples/Performance/Single/IECB2015/Dynawo/Producer.ini b/examples/Performance/Single/IECB2015/Dynawo/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Performance/Single/IECB2015/Dynawo/Producer.ini +++ b/examples/Performance/Single/IECB2015/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/Single/IECB2020/Dynawo/Producer.ini b/examples/Performance/Single/IECB2020/Dynawo/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Performance/Single/IECB2020/Dynawo/Producer.ini +++ b/examples/Performance/Single/IECB2020/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/Single/WECCB/Dynawo/Producer.ini b/examples/Performance/Single/WECCB/Dynawo/Producer.ini index 4a9e1f58..66da0f98 100644 --- a/examples/Performance/Single/WECCB/Dynawo/Producer.ini +++ b/examples/Performance/Single/WECCB/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleAux/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini b/examples/Performance/SingleAux/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini index 6ec866ba..bb314855 100644 --- a/examples/Performance/SingleAux/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini +++ b/examples/Performance/SingleAux/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 456.7 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 555 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 100 diff --git a/examples/Performance/SingleAux/IECB2015/Dynawo/Producer.ini b/examples/Performance/SingleAux/IECB2015/Dynawo/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Performance/SingleAux/IECB2015/Dynawo/Producer.ini +++ b/examples/Performance/SingleAux/IECB2015/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleAux/IECB2020/Dynawo/Producer.ini b/examples/Performance/SingleAux/IECB2020/Dynawo/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Performance/SingleAux/IECB2020/Dynawo/Producer.ini +++ b/examples/Performance/SingleAux/IECB2020/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleAux/WECCB/Dynawo/Producer.ini b/examples/Performance/SingleAux/WECCB/Dynawo/Producer.ini index faf5c009..068f2226 100644 --- a/examples/Performance/SingleAux/WECCB/Dynawo/Producer.ini +++ b/examples/Performance/SingleAux/WECCB/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleAuxI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini b/examples/Performance/SingleAuxI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini index 952db208..0507bc45 100644 --- a/examples/Performance/SingleAuxI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini +++ b/examples/Performance/SingleAuxI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 456.7 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 555 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 200 diff --git a/examples/Performance/SingleAuxI/IECB2015/Dynawo/Producer.ini b/examples/Performance/SingleAuxI/IECB2015/Dynawo/Producer.ini index 68d5bc45..35863d65 100644 --- a/examples/Performance/SingleAuxI/IECB2015/Dynawo/Producer.ini +++ b/examples/Performance/SingleAuxI/IECB2015/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleAuxI/IECB2020/Dynawo/Producer.ini b/examples/Performance/SingleAuxI/IECB2020/Dynawo/Producer.ini index 68d5bc45..35863d65 100644 --- a/examples/Performance/SingleAuxI/IECB2020/Dynawo/Producer.ini +++ b/examples/Performance/SingleAuxI/IECB2020/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleAuxI/WECCB/Dynawo/Producer.ini b/examples/Performance/SingleAuxI/WECCB/Dynawo/Producer.ini index 68d5bc45..35863d65 100644 --- a/examples/Performance/SingleAuxI/WECCB/Dynawo/Producer.ini +++ b/examples/Performance/SingleAuxI/WECCB/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini b/examples/Performance/SingleI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini index 0b0aeda5..120ca162 100644 --- a/examples/Performance/SingleI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini +++ b/examples/Performance/SingleI/GeneratorSynchronousFourWindingsTGov1SexsPss2a/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 456.7 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 555 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 200 diff --git a/examples/Performance/SingleI/IECB2015/Dynawo/Producer.ini b/examples/Performance/SingleI/IECB2015/Dynawo/Producer.ini index c61c0b99..ed1841bc 100644 --- a/examples/Performance/SingleI/IECB2015/Dynawo/Producer.ini +++ b/examples/Performance/SingleI/IECB2015/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleI/IECB2020/Dynawo/Producer.ini b/examples/Performance/SingleI/IECB2020/Dynawo/Producer.ini index c61c0b99..ed1841bc 100644 --- a/examples/Performance/SingleI/IECB2020/Dynawo/Producer.ini +++ b/examples/Performance/SingleI/IECB2020/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/examples/Performance/SingleI/WECCB/Dynawo/Producer.ini b/examples/Performance/SingleI/WECCB/Dynawo/Producer.ini index c61c0b99..ed1841bc 100644 --- a/examples/Performance/SingleI/WECCB/Dynawo/Producer.ini +++ b/examples/Performance/SingleI/WECCB/Dynawo/Producer.ini @@ -4,6 +4,7 @@ p_max = 75 # Allowed values: 400, 225, 150, 90, 63 (land) and 132, 66 (offshore) u_nom = 225 # s_nom is the nominal apparent power of all generating units (in MVA) +# This is the value that will be used for the base conversion in the PDR bus active/reactive power s_nom = 100 # q_max is the maximum reactive power of all generating units (in MVar) q_max = 40 diff --git a/src/dgcv/dynawo/curves.py b/src/dgcv/dynawo/curves.py index d384a12f..9cb80335 100644 --- a/src/dgcv/dynawo/curves.py +++ b/src/dgcv/dynawo/curves.py @@ -711,6 +711,8 @@ def __execute_dynawo( self._curves_dict, working_oc_dir, jobs_output_dir, + self.get_producer().s_nom, + self._s_nref, ) if has_error and show_log_file: log_file = output_dir / jobs_output_dir / "logs/dynawo.log" @@ -880,6 +882,8 @@ def __run_time_cct( self._curves_dict, working_oc_dir_attempt, jobs_output_dir, + self.get_producer().s_nom, + self._s_nref, save_file=False, simulation_limit=self._sim_time + 10, ) diff --git a/src/dgcv/dynawo/dynawo.py b/src/dgcv/dynawo/dynawo.py index 589e9949..431ec5e7 100644 --- a/src/dgcv/dynawo/dynawo.py +++ b/src/dgcv/dynawo/dynawo.py @@ -288,24 +288,34 @@ def _get_pdr_current(df_curves: pd.DataFrame, column_size: int) -> list: return [] # The tool's sign convention is applied in the calculation of power flow. - pdr_current = _create_complex_zero_array(column_size) + pdr_current_base_snref = _create_complex_zero_array(column_size) for current_column in current_columns_list: - pdr_current = np.add( - pdr_current, + pdr_current_base_snref = np.add( + pdr_current_base_snref, list(df_curves[current_column]), ) - return pdr_current.tolist() + return pdr_current_base_snref.tolist() -def _get_pdr_active_power(pdr_voltage: list, pdr_current: list) -> list: +def _get_pdr_active_power(pdr_voltage: list, pdr_current: list, snom: float, snref: float) -> list: # Apply the tool's sign convention - return (np.real(pdr_voltage * np.conjugate(pdr_current)) * -1).tolist() + pdr_active_power_base_snref = np.real(pdr_voltage * np.conjugate(pdr_current)) * -1 + # Calculate the active power in the base SNom + pdr_active_power = pdr_active_power_base_snref * snref / snom + return pdr_active_power.tolist() -def _get_pdr_reactive_power(pdr_voltage: list, pdr_current: list) -> list: + +def _get_pdr_reactive_power( + pdr_voltage: list, pdr_current: list, snom: float, snref: float +) -> list: # Apply the tool's sign convention - return (np.imag(pdr_voltage * np.conjugate(pdr_current)) * -1).tolist() + pdr_reactive_power_base_snref = np.imag(pdr_voltage * np.conjugate(pdr_current)) * -1 + # Calculate the active power in the base SNom + pdr_reactive_power = pdr_reactive_power_base_snref * snref / snom + + return pdr_reactive_power.tolist() def _get_modulus(complex_list: list) -> list: @@ -376,7 +386,9 @@ def _translate_curves( return pd.DataFrame(curves_translation) -def _create_curves(variable_translations: dict, input_file: Path) -> pd.DataFrame: +def _create_curves( + variable_translations: dict, input_file: Path, snom: float, snref: float +) -> pd.DataFrame: """From the curve file generated by the Dynawo dynamic simulator, a new file is created where the values of the different curves are expressed in the units specified in the file and/or different curves are added to obtain the required curves. @@ -408,8 +420,8 @@ def _create_curves(variable_translations: dict, input_file: Path) -> pd.DataFram pdr_voltage = _get_pdr_voltage(df_curves) pdr_voltage_modulus = _get_modulus(pdr_voltage) pdr_current = _get_pdr_current(df_curves, column_size) - pdr_active_power = _get_pdr_active_power(pdr_voltage, pdr_current) - pdr_reactive_power = _get_pdr_reactive_power(pdr_voltage, pdr_current) + pdr_active_power = _get_pdr_active_power(pdr_voltage, pdr_current, snom, snref) + pdr_reactive_power = _get_pdr_reactive_power(pdr_voltage, pdr_current, snom, snref) # Create the new curves file curves_dict = dict() @@ -542,6 +554,8 @@ def run_base_dynawo( variable_translations: dict, inputs_path: Path, output_path: Path, + s_nom: float, + s_nref: float, save_file: bool = True, simulation_limit: float = None, ) -> tuple[bool, float, str, bool, float]: @@ -559,8 +573,14 @@ def run_base_dynawo( Directory with Dynawo inputs output_path: Path Dynawo simulation output directory + s_nom: float + Nominal apparent power + s_nref: float + System-wide S base (SnRef) save_file: bool If True save the calculated curves file + simulation_limit: float + Maximum time for the simulation Returns ------- @@ -594,6 +614,8 @@ def run_base_dynawo( curves_calculated = _create_curves( variable_translations, dynawo_output_dir / "curves/curves.csv", + s_nom, + s_nref, ) return success, log, has_error, curves_calculated, sim_time diff --git a/src/dgcv/templates/reports/model/BESS/.DummySample/report.Iz1.tex b/src/dgcv/templates/reports/model/BESS/.DummySample/report.Iz1.tex index 7b70b661..507c21ba 100644 --- a/src/dgcv/templates/reports/model/BESS/.DummySample/report.Iz1.tex +++ b/src/dgcv/templates/reports/model/BESS/.DummySample/report.Iz1.tex @@ -5,7 +5,7 @@ %% The document starts here %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \section{Model Validation - Results for PCS RTE-I (Zone)} + \section{Model Validation - Results for PCS RTE-I (BESS Zone)} \BLOCK{for subReport in subReports} {{subReport}} diff --git a/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z1/report.RTE-I16z1.tex b/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z1/report.RTE-I16z1.tex index 63223faa..d16cf11a 100644 --- a/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z1/report.RTE-I16z1.tex +++ b/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z1/report.RTE-I16z1.tex @@ -6,7 +6,7 @@ %% The document starts here %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \section{Model Validation - Results for PCS RTE-I16 (Zone 1)} + \section{Model Validation - Results for PCS RTE-I16 (BESS Zone 1)} \BLOCK{for subReport in subReports} {{subReport}} diff --git a/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z3/report.RTE-I16z3.tex b/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z3/report.RTE-I16z3.tex index 3478f844..4ce12ef2 100644 --- a/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z3/report.RTE-I16z3.tex +++ b/src/dgcv/templates/reports/model/BESS/PCS_RTE-I16z3/report.RTE-I16z3.tex @@ -7,7 +7,7 @@ %% The document starts here %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \section{Model Validation - Results for PCS RTE-I16 (Zone 3)} + \section{Model Validation - Results for PCS RTE-I16 (BESS Zone 3)} \BLOCK{for subReport in subReports} {{subReport}} diff --git a/src/dgcv/templates/reports/model/PPM/.DummySample/report.Iz1.tex b/src/dgcv/templates/reports/model/PPM/.DummySample/report.Iz1.tex index 7b70b661..3dc71ade 100644 --- a/src/dgcv/templates/reports/model/PPM/.DummySample/report.Iz1.tex +++ b/src/dgcv/templates/reports/model/PPM/.DummySample/report.Iz1.tex @@ -5,7 +5,7 @@ %% The document starts here %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \section{Model Validation - Results for PCS RTE-I (Zone)} + \section{Model Validation - Results for PCS RTE-I (Power Park Modules Zone)} \BLOCK{for subReport in subReports} {{subReport}} diff --git a/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z1/report.RTE-I16z1.tex b/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z1/report.RTE-I16z1.tex index 63223faa..3cdc7bbd 100644 --- a/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z1/report.RTE-I16z1.tex +++ b/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z1/report.RTE-I16z1.tex @@ -6,7 +6,7 @@ %% The document starts here %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \section{Model Validation - Results for PCS RTE-I16 (Zone 1)} + \section{Model Validation - Results for PCS RTE-I16 (Power Park Modules Zone 1)} \BLOCK{for subReport in subReports} {{subReport}} diff --git a/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z3/report.RTE-I16z3.tex b/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z3/report.RTE-I16z3.tex index 3478f844..000dd1c7 100644 --- a/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z3/report.RTE-I16z3.tex +++ b/src/dgcv/templates/reports/model/PPM/PCS_RTE-I16z3/report.RTE-I16z3.tex @@ -7,7 +7,7 @@ %% The document starts here %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \section{Model Validation - Results for PCS RTE-I16 (Zone 3)} + \section{Model Validation - Results for PCS RTE-I16 (Power Park Modules Zone 3)} \BLOCK{for subReport in subReports} {{subReport}} diff --git a/src/dgcv/templates/reports/performance/BESS/.DummySample/report.IPPM.tex b/src/dgcv/templates/reports/performance/BESS/.DummySample/report.IPPM.tex index 71bfb000..6ead8c97 100644 --- a/src/dgcv/templates/reports/performance/BESS/.DummySample/report.IPPM.tex +++ b/src/dgcv/templates/reports/performance/BESS/.DummySample/report.IPPM.tex @@ -1,5 +1,5 @@ \renewcommand{\DTRPcs}{IPPM} % DTR pcs definition -\renewcommand{\DTRPcsLong}{I (Power Park Modules)} +\renewcommand{\DTRPcsLong}{I (BESS)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The document starts here diff --git a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I10/report.RTE-I10PPM.tex b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I10/report.RTE-I10PPM.tex index a0401b07..67cbfabd 100644 --- a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I10/report.RTE-I10PPM.tex +++ b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I10/report.RTE-I10PPM.tex @@ -1,5 +1,5 @@ \renewcommand{\DTRPcs}{I10PPM} % DTR pcs definition -\renewcommand{\DTRPcsLong}{I10 (Power Park Modules)} +\renewcommand{\DTRPcsLong}{I10 (BESS)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The document starts here diff --git a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I2/report.RTE-I2PPM.tex b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I2/report.RTE-I2PPM.tex index 17f8fde8..53937fff 100644 --- a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I2/report.RTE-I2PPM.tex +++ b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I2/report.RTE-I2PPM.tex @@ -1,5 +1,5 @@ \renewcommand{\DTRPcs}{I2PPM} % DTR pcs definition -\renewcommand{\DTRPcsLong}{I2 (Power Park Modules)} +\renewcommand{\DTRPcsLong}{I2 (BESS)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The document starts here diff --git a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I5/report.RTE-I5PPM.tex b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I5/report.RTE-I5PPM.tex index e7f7fb55..48fdab5a 100644 --- a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I5/report.RTE-I5PPM.tex +++ b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I5/report.RTE-I5PPM.tex @@ -1,5 +1,5 @@ \renewcommand{\DTRPcs}{I5PPM} % DTR pcs definition -\renewcommand{\DTRPcsLong}{I5 (Power Park Modules)} +\renewcommand{\DTRPcsLong}{I5 (BESS)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The document starts here diff --git a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I6/report.RTE-I6PPM.tex b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I6/report.RTE-I6PPM.tex index 1a17e9f3..d8936a41 100644 --- a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I6/report.RTE-I6PPM.tex +++ b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I6/report.RTE-I6PPM.tex @@ -1,5 +1,5 @@ \renewcommand{\DTRPcs}{I6PPM} % DTR pcs definition -\renewcommand{\DTRPcsLong}{I6 (Power Park Modules)} +\renewcommand{\DTRPcsLong}{I6 (BESS)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The document starts here diff --git a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I7/report.RTE-I7PPM.tex b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I7/report.RTE-I7PPM.tex index 7e1d7791..35d0b419 100644 --- a/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I7/report.RTE-I7PPM.tex +++ b/src/dgcv/templates/reports/performance/BESS/PCS_RTE-I7/report.RTE-I7PPM.tex @@ -1,5 +1,5 @@ \renewcommand{\DTRPcs}{I7PPM} % DTR pcs definition -\renewcommand{\DTRPcsLong}{I7 (Power Park Modules)} +\renewcommand{\DTRPcsLong}{I7 (BESS)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% The document starts here