diff --git a/docs/_static/images/basics/gas_turbine_fuel_composition.svg b/docs/_static/images/basics/gas_turbine_fuel_composition.svg index 71fa354b..f40d5e2c 100644 --- a/docs/_static/images/basics/gas_turbine_fuel_composition.svg +++ b/docs/_static/images/basics/gas_turbine_fuel_composition.svg @@ -1,23 +1,23 @@ - + - + - 2022-08-30T21:38:50.684785 + 2024-06-27T19:36:40.422628 image/svg+xml - Matplotlib v3.4.2, https://matplotlib.org/ + Matplotlib v3.9.0, https://matplotlib.org/ - + @@ -26,7 +26,7 @@ L 1152 576 L 1152 0 L 0 0 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> @@ -35,86 +35,30 @@ L 1132.56 511 L 1132.56 26.28 L 82.01 26.28 z -" style="fill:#ffffff;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +" style="fill: #ffffff"/> - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - +" style="stroke: #000000; stroke-width: 0.8"/> - + - + - - + +" transform="scale(0.015625)"/> - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - + - + - - + - + - + - + - + - + +" transform="scale(0.015625)"/> - - + - + - + - + - + - + +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - +" style="stroke: #000000; stroke-width: 0.8"/> - + - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - + - +" clip-path="url(#p58556a9470)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - - + + - + - - + - + - + - + +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> @@ -1031,18 +1031,18 @@ Q 893.300625 35.28 893.300625 38.88 L 893.300625 89.92125 Q 893.300625 93.52125 896.900625 93.52125 z -" style="fill:#ffffff;opacity:0.8;stroke:#cccccc;stroke-linejoin:miter;"/> +" style="fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter"/> - + - + - - + +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + diff --git a/docs/_static/images/basics/gas_turbine_fuel_composition_darkmode.svg b/docs/_static/images/basics/gas_turbine_fuel_composition_darkmode.svg index 3eed407f..b013bfc0 100644 --- a/docs/_static/images/basics/gas_turbine_fuel_composition_darkmode.svg +++ b/docs/_static/images/basics/gas_turbine_fuel_composition_darkmode.svg @@ -6,11 +6,11 @@ - 2022-09-23T14:40:19.299228 + 2024-06-27T19:34:25.974710 image/svg+xml - Matplotlib v3.5.3, https://matplotlib.org/ + Matplotlib v3.9.0, https://matplotlib.org/ @@ -37,82 +37,26 @@ L 82.01 26.28 z "/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - - + - + +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -383,7 +327,7 @@ L 1084.807727 26.28 - + +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - - + - + @@ -712,16 +656,16 @@ L -3.5 0 +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -731,16 +675,16 @@ L 1132.56 414.056 +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -750,16 +694,16 @@ L 1132.56 317.112 +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -769,16 +713,16 @@ L 1132.56 220.168 +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -788,16 +732,16 @@ L 1132.56 123.224 +" clip-path="url(#p482d049694)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -1128,7 +1128,7 @@ z - + diff --git a/docs/_static/images/basics/gas_turbine_oxygen.svg b/docs/_static/images/basics/gas_turbine_oxygen.svg index 8bf5af37..888a7829 100644 --- a/docs/_static/images/basics/gas_turbine_oxygen.svg +++ b/docs/_static/images/basics/gas_turbine_oxygen.svg @@ -1,23 +1,23 @@ - + - + - 2022-08-30T21:38:39.150003 + 2024-06-27T19:36:01.814498 image/svg+xml - Matplotlib v3.4.2, https://matplotlib.org/ + Matplotlib v3.9.0, https://matplotlib.org/ - + @@ -26,7 +26,7 @@ L 1152 576 L 1152 0 L 0 0 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> @@ -35,53 +35,86 @@ L 1132.56 511 L 1132.56 19.44 L 93.53 19.44 z -" style="fill:#ffffff;"/> - - - - - - - - - - - - - +" style="fill: #ffffff"/> - + - +" style="stroke: #000000; stroke-width: 0.8"/> - + - - + + - + + + + + + + + + + + + + + + + + + + + + +" transform="scale(0.015625)"/> - + + - - - + + + - + - + - - - + + + - +" transform="scale(0.015625)"/> - + + - - - + + + - + - + - - - + + + - +" transform="scale(0.015625)"/> - + + - - - + + + - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - +" transform="scale(0.015625)"/> - + - + - + - - - - - - - - - - - - - - - - - - - - - + + + + - + - + - - + - + - + - + - + +" transform="scale(0.015625)"/> - - + - + - + - + - + - + - + - + - + - + - + +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - +" style="stroke: #000000; stroke-width: 0.8"/> - + - - - - - - - + + + + + + - - + + - + - + - - - + + + - - - + + + - - + + - + - + - - - + + + - - - + + + - - + + - + - + - - - + + + - - - + + + - - + + - + - + - - - - - - - + + + + + + + - + - + - - + - + - + - + +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> - - + + diff --git a/docs/_static/images/basics/gas_turbine_oxygen_darkmode.svg b/docs/_static/images/basics/gas_turbine_oxygen_darkmode.svg index 2a719b25..88f54e2a 100644 --- a/docs/_static/images/basics/gas_turbine_oxygen_darkmode.svg +++ b/docs/_static/images/basics/gas_turbine_oxygen_darkmode.svg @@ -6,11 +6,11 @@ - 2022-09-23T14:40:09.282863 + 2024-06-27T19:33:35.295604 image/svg+xml - Matplotlib v3.5.3, https://matplotlib.org/ + Matplotlib v3.9.0, https://matplotlib.org/ @@ -37,49 +37,82 @@ L 93.53 19.44 z "/> - - - - - - - - - - - - - - + - - + - - + + + + + + + + + + + + + + + + + + + + + + + - + + - - - + + + - + - + - - - + + + - + + - - - + + + - + - + - - - + + + - + + - - - + + + - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - + + + + - + - + - - + + - + - - + - - - - - + + + + + - - - + + - + - + - - - + + + - + - - + + - + - + - - - + + + - + - - + + - + - + - - - + + + - + - - + + - + - + - - - - - + + + + + - + - + + + + + + + + + + + + + + diff --git a/docs/_static/images/basics/gas_turbine_parametric.svg b/docs/_static/images/basics/gas_turbine_parametric.svg index 1b5f3518..66d4dca6 100644 --- a/docs/_static/images/basics/gas_turbine_parametric.svg +++ b/docs/_static/images/basics/gas_turbine_parametric.svg @@ -1,23 +1,23 @@ - + - + - 2022-08-30T21:38:36.540618 + 2024-06-27T19:35:57.454335 image/svg+xml - Matplotlib v3.4.2, https://matplotlib.org/ + Matplotlib v3.9.0, https://matplotlib.org/ - + @@ -26,7 +26,7 @@ L 1152 576 L 1152 0 L 0 0 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> @@ -35,111 +35,83 @@ L 587.91564 253.75 L 587.91564 19.44 L 70.67 19.44 z -" style="fill:#ffffff;"/> - - - - - - - - - - - - - - - - - - +" style="fill: #ffffff"/> - +" clip-path="url(#pa65af7d2a9)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - +" style="stroke: #000000; stroke-width: 0.8"/> - + - +" clip-path="url(#pa65af7d2a9)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#pa65af7d2a9)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#pa65af7d2a9)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#pa65af7d2a9)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#pa65af7d2a9)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -147,25 +119,25 @@ L 564.404475 19.44 - + - +" style="stroke: #000000; stroke-width: 0.8"/> - + - + - - + +" transform="scale(0.015625)"/> - + - + - + - + - +" transform="scale(0.015625)"/> - + - + - + - + - +" transform="scale(0.015625)"/> - + - + - - + - + - + - + - + - + +" transform="scale(0.015625)"/> - +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> @@ -548,129 +548,114 @@ L 1132.56 253.75 L 1132.56 19.44 L 615.31436 19.44 z -" style="fill:#ffffff;"/> - - - - - - - - - - - - - - - +" style="fill: #ffffff"/> - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - +" clip-path="url(#p2abe622765)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -678,60 +663,75 @@ L 1109.048835 19.44 - + - + - + - + - + - + + + + + + + + + + + + + + + + +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> @@ -741,53 +741,25 @@ L 587.91564 511 L 587.91564 276.69 L 70.67 276.69 z -" style="fill:#ffffff;"/> - - - - - - - - - - - - - - - - - - +" style="fill: #ffffff"/> - +" clip-path="url(#pa43d553fae)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - + +" transform="scale(0.015625)"/> - - + + - +" clip-path="url(#pa43d553fae)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - - - + + + - +" clip-path="url(#pa43d553fae)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#pa43d553fae)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#pa43d553fae)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#pa43d553fae)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - + - - + - + - + - + - + - + - + - + - + - + +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - +" transform="scale(0.015625)"/> - + - + - + - + - +" transform="scale(0.015625)"/> - + - + - + - + - + - + - - + - + - + - + +" transform="scale(0.015625)"/> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> @@ -1506,70 +1506,55 @@ L 1132.56 511 L 1132.56 276.69 L 615.31436 276.69 z -" style="fill:#ffffff;"/> - - - - - - - - - - - - - - - +" style="fill: #ffffff"/> - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - +" transform="scale(0.015625)"/> - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - +" clip-path="url(#p7673461340)" style="fill: none; stroke: #b0b0b0; stroke-width: 0.8; stroke-linecap: square"/> - + - + - - - + + + - + - +" transform="scale(0.015625)"/> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-width: 0.8; stroke-linejoin: miter; stroke-linecap: square"/> - - + + - - + + - - + + - - + + diff --git a/docs/_static/images/basics/gas_turbine_parametric_darkmode.svg b/docs/_static/images/basics/gas_turbine_parametric_darkmode.svg index 5c42e5dd..04e5b258 100644 --- a/docs/_static/images/basics/gas_turbine_parametric_darkmode.svg +++ b/docs/_static/images/basics/gas_turbine_parametric_darkmode.svg @@ -6,11 +6,11 @@ - 2022-09-23T14:40:06.522079 + 2024-06-27T19:33:30.794753 image/svg+xml - Matplotlib v3.5.3, https://matplotlib.org/ + Matplotlib v3.9.0, https://matplotlib.org/ @@ -37,49 +37,21 @@ L 70.67 19.44 z "/> - - - - - - - - - - - - - - - - - - +" clip-path="url(#p198fc0f48f)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - - + @@ -87,11 +59,11 @@ L 0 3.5 +" clip-path="url(#p198fc0f48f)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -99,11 +71,11 @@ L 188.225827 19.44 +" clip-path="url(#p198fc0f48f)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -111,11 +83,11 @@ L 282.270489 19.44 +" clip-path="url(#p198fc0f48f)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -123,11 +95,11 @@ L 376.315151 19.44 +" clip-path="url(#p198fc0f48f)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -135,11 +107,11 @@ L 470.359813 19.44 +" clip-path="url(#p198fc0f48f)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -147,23 +119,23 @@ L 564.404475 19.44 - + - - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -582,11 +567,11 @@ L 638.825525 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -594,11 +579,11 @@ L 697.603439 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -606,11 +591,11 @@ L 756.381352 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -618,11 +603,11 @@ L 815.159266 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -630,11 +615,11 @@ L 873.93718 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -642,11 +627,11 @@ L 932.715093 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -654,11 +639,11 @@ L 991.493007 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -666,11 +651,11 @@ L 1050.270921 19.44 +" clip-path="url(#p3df8ea0b37)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + @@ -678,41 +663,56 @@ L 1109.048835 19.44 - + - + - + - + - + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - +" clip-path="url(#p73df833680)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#p73df833680)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#p73df833680)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -907,16 +879,16 @@ L 282.270489 276.69 +" clip-path="url(#p73df833680)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -928,16 +900,16 @@ L 376.315151 276.69 +" clip-path="url(#p73df833680)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -949,16 +921,16 @@ L 470.359813 276.69 +" clip-path="url(#p73df833680)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -968,7 +940,7 @@ L 564.404475 276.69 - + - + - + - + @@ -1261,18 +1233,18 @@ L 587.91564 489.384715 - + - + - + - + - + - + - + - + - + @@ -1371,7 +1343,7 @@ L 587.91564 314.545508 - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1627,16 +1612,16 @@ L 756.381352 276.69 +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1648,16 +1633,16 @@ L 815.159266 276.69 +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1669,16 +1654,16 @@ L 873.93718 276.69 +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1690,16 +1675,16 @@ L 932.715093 276.69 +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1711,16 +1696,16 @@ L 991.493007 276.69 +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1732,16 +1717,16 @@ L 1050.270921 276.69 +" clip-path="url(#pd6edc6de27)" style="fill: none; stroke: #ffffff; stroke-width: 0.8; stroke-linecap: square"/> - + - + @@ -1751,7 +1736,7 @@ L 1109.048835 276.69 - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + - + - + - + diff --git a/docs/whats_new/v0-7-5.rst b/docs/whats_new/v0-7-5.rst index 610a532c..21d6c22a 100644 --- a/docs/whats_new/v0-7-5.rst +++ b/docs/whats_new/v0-7-5.rst @@ -4,8 +4,10 @@ v0.7.5 - Under development Documentation ############# - The Rankine cycle example has been adopted to integrate a T-s diagram of the - process into the results. + process into the results (`PR #514 `__). +- A bug in the results plot of the gas turbine example has been fixed + (`PR #522 `__). Other Features ############## diff --git a/pyproject.toml b/pyproject.toml index 838b4225..fc4f226f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,6 +93,7 @@ addopts = """ --pyargs --ignore=docs/conf.py --ignore=docs/scripts + --ignore=docs/_build """ testpaths = [ "src/", diff --git a/src/tespy/networks/network.py b/src/tespy/networks/network.py index 0120b20c..b41c9edc 100644 --- a/src/tespy/networks/network.py +++ b/src/tespy/networks/network.py @@ -2209,7 +2209,7 @@ def iterinfo_tail(self, print_results=True): """Print tail of convergence progress.""" num_iter = self.iter + 1 clc_time = self.end_time - self.start_time - num_ips = num_iter / clc_time if clc_time > 1e-10 else np.Inf + num_ips = num_iter / clc_time if clc_time > 1e-10 else np.inf msg = '-' * 7 + '+------------' * 7 logger.progress(100, msg) msg = ( diff --git a/tutorial/basics/gas_turbine.py b/tutorial/basics/gas_turbine.py index fbb5d233..6debae55 100755 --- a/tutorial/basics/gas_turbine.py +++ b/tutorial/basics/gas_turbine.py @@ -118,7 +118,7 @@ fig, ax = plt.subplots(2, 2, figsize=(16, 8), sharex='col', sharey='row') ax = ax.flatten() -[a.grid() for a in ax] +[(a.grid(), a.set_axisbelow(True)) for a in ax] i = 0 for key in data: @@ -145,6 +145,8 @@ nw.solve('design') T3 += [c3.T.val] +T3 = T3[::-1] + # reset to base value c3.fluid.is_set.remove("O2") c3.set_attr(T=1200) @@ -153,6 +155,7 @@ ax.scatter(data * 100, T3, s=100, color="#1f567d") ax.grid() +ax.set_axisbelow(True) ax.set_ylabel('Turbine inlet temperature in °C') ax.set_xlabel('Oxygen mass fraction in flue gas in %') @@ -185,6 +188,7 @@ ax.scatter(data, CH4, s=100, color="#1f567d", label="CH4 mass fraction") ax.scatter(data, H2, s=100, color="#18a999", label="H2 mass fraction") ax.grid() +ax.set_axisbelow(True) ax.legend() ax.set_ylabel('Mass fraction of the fuel in %')