Commit 325fb11
Added fixed speed pump (#526)
* Added fixed speed pump components and modified icon of variable speed pump
* Added fixed speed pump tests
* Updated changelog
* Updated changelog
* Changed unit of measurement of parameter
Co-authored-by: nyoussef <99659896+nabily-met@users.noreply.github.com>
* Fixed MetroscopiaNPP_direct_wSV which was not working (tiny fix commenting a component SV that no longer exists)
* Fixed MetroscopiaNPP_faulty which was not working (tiny fix commenting a superheater fouling that no longer exists)
* Modified all MetroscopiaNPP models replacing variable speed pumps with fixed speed pumps and tested comparing to previous versions
* Modified all MetroscopiaCCGT models replacing variable speed pumps with fixed speed pumps and tested comparing to previous versions
---------
Co-authored-by: nyoussef <99659896+nabily-met@users.noreply.github.com>1 parent 8afcb4e commit 325fb11
File tree
18 files changed
+6866
-7005
lines changed- MetroscopeModelingLibrary
- Examples
- CCGT/MetroscopiaCCGT
- Nuclear/MetroscopiaNPP
- Partial/Machines
- Tests/WaterSteam/Machines
- WaterSteam/Machines
18 files changed
+6866
-7005
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
Lines changed: 12 additions & 44 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
126 | | - | |
| 125 | + | |
| 126 | + | |
127 | 127 | | |
128 | | - | |
129 | | - | |
| 128 | + | |
| 129 | + | |
130 | 130 | | |
131 | 131 | | |
132 | 132 | | |
| |||
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
284 | | - | |
| 284 | + | |
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
| |||
308 | 308 | | |
309 | 309 | | |
310 | 310 | | |
311 | | - | |
312 | | - | |
313 | | - | |
314 | | - | |
315 | | - | |
316 | 311 | | |
317 | 312 | | |
318 | 313 | | |
| |||
482 | 477 | | |
483 | 478 | | |
484 | 479 | | |
485 | | - | |
| 480 | + | |
486 | 481 | | |
487 | 482 | | |
488 | 483 | | |
| |||
494 | 489 | | |
495 | 490 | | |
496 | 491 | | |
497 | | - | |
498 | | - | |
499 | | - | |
500 | | - | |
501 | | - | |
502 | 492 | | |
503 | 493 | | |
504 | 494 | | |
| |||
860 | 850 | | |
861 | 851 | | |
862 | 852 | | |
863 | | - | |
864 | | - | |
865 | | - | |
866 | | - | |
867 | | - | |
868 | | - | |
869 | | - | |
870 | | - | |
871 | | - | |
| 853 | + | |
872 | 854 | | |
873 | | - | |
874 | | - | |
| 855 | + | |
| 856 | + | |
875 | 857 | | |
876 | 858 | | |
877 | 859 | | |
878 | 860 | | |
879 | 861 | | |
880 | 862 | | |
881 | 863 | | |
882 | | - | |
883 | | - | |
884 | | - | |
885 | | - | |
886 | | - | |
887 | | - | |
888 | | - | |
889 | | - | |
890 | | - | |
| 864 | + | |
891 | 865 | | |
892 | | - | |
893 | | - | |
| 866 | + | |
| 867 | + | |
894 | 868 | | |
895 | 869 | | |
896 | 870 | | |
| |||
928 | 902 | | |
929 | 903 | | |
930 | 904 | | |
931 | | - | |
932 | | - | |
933 | | - | |
934 | 905 | | |
935 | 906 | | |
936 | 907 | | |
| |||
1015 | 986 | | |
1016 | 987 | | |
1017 | 988 | | |
1018 | | - | |
1019 | | - | |
1020 | | - | |
1021 | 989 | | |
1022 | 990 | | |
1023 | 991 | | |
| |||
Lines changed: 12 additions & 44 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
122 | | - | |
| 121 | + | |
| 122 | + | |
123 | 123 | | |
124 | | - | |
125 | | - | |
| 124 | + | |
| 125 | + | |
126 | 126 | | |
127 | 127 | | |
128 | 128 | | |
| |||
190 | 190 | | |
191 | 191 | | |
192 | 192 | | |
193 | | - | |
| 193 | + | |
194 | 194 | | |
195 | 195 | | |
196 | 196 | | |
| |||
203 | 203 | | |
204 | 204 | | |
205 | 205 | | |
206 | | - | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | 206 | | |
212 | 207 | | |
213 | 208 | | |
| |||
279 | 274 | | |
280 | 275 | | |
281 | 276 | | |
282 | | - | |
| 277 | + | |
283 | 278 | | |
284 | 279 | | |
285 | 280 | | |
286 | 281 | | |
287 | | - | |
288 | | - | |
289 | | - | |
290 | | - | |
291 | | - | |
292 | 282 | | |
293 | 283 | | |
294 | 284 | | |
| |||
565 | 555 | | |
566 | 556 | | |
567 | 557 | | |
568 | | - | |
569 | | - | |
570 | | - | |
571 | | - | |
572 | | - | |
573 | | - | |
574 | | - | |
575 | | - | |
576 | | - | |
| 558 | + | |
577 | 559 | | |
578 | | - | |
579 | | - | |
| 560 | + | |
| 561 | + | |
580 | 562 | | |
581 | 563 | | |
582 | 564 | | |
583 | 565 | | |
584 | 566 | | |
585 | 567 | | |
586 | 568 | | |
587 | | - | |
588 | | - | |
589 | | - | |
590 | | - | |
591 | | - | |
592 | | - | |
593 | | - | |
594 | | - | |
595 | | - | |
| 569 | + | |
596 | 570 | | |
597 | | - | |
598 | | - | |
| 571 | + | |
| 572 | + | |
599 | 573 | | |
600 | 574 | | |
601 | 575 | | |
| |||
621 | 595 | | |
622 | 596 | | |
623 | 597 | | |
624 | | - | |
625 | | - | |
626 | | - | |
627 | 598 | | |
628 | 599 | | |
629 | 600 | | |
| |||
679 | 650 | | |
680 | 651 | | |
681 | 652 | | |
682 | | - | |
683 | | - | |
684 | | - | |
685 | 653 | | |
686 | 654 | | |
687 | 655 | | |
| |||
Lines changed: 2 additions & 32 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
240 | | - | |
| 240 | + | |
241 | 241 | | |
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
245 | 245 | | |
246 | 246 | | |
247 | 247 | | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | 248 | | |
253 | 249 | | |
254 | 250 | | |
| |||
310 | 306 | | |
311 | 307 | | |
312 | 308 | | |
313 | | - | |
| 309 | + | |
314 | 310 | | |
315 | 311 | | |
316 | 312 | | |
317 | 313 | | |
318 | 314 | | |
319 | 315 | | |
320 | 316 | | |
321 | | - | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | 317 | | |
326 | 318 | | |
327 | 319 | | |
| |||
507 | 499 | | |
508 | 500 | | |
509 | 501 | | |
510 | | - | |
511 | | - | |
512 | | - | |
513 | | - | |
514 | | - | |
515 | | - | |
516 | | - | |
517 | | - | |
518 | | - | |
519 | | - | |
520 | 502 | | |
521 | 503 | | |
522 | 504 | | |
| |||
550 | 532 | | |
551 | 533 | | |
552 | 534 | | |
553 | | - | |
554 | | - | |
555 | | - | |
556 | | - | |
557 | | - | |
558 | | - | |
559 | | - | |
560 | | - | |
561 | | - | |
562 | | - | |
563 | 535 | | |
564 | 536 | | |
565 | 537 | | |
| |||
610 | 582 | | |
611 | 583 | | |
612 | 584 | | |
613 | | - | |
614 | 585 | | |
615 | 586 | | |
616 | 587 | | |
| |||
628 | 599 | | |
629 | 600 | | |
630 | 601 | | |
631 | | - | |
632 | 602 | | |
633 | 603 | | |
634 | 604 | | |
| |||
0 commit comments