Merge commits from ipudk/tespy #502

fwitte · 2024-04-15T22:33:50Z

I tried working with git-filter-repo to separate the core code from the application specific new parts to split the changes into two repositories, which was unsuccessful. There seems to be something really strange in the history of the ipudk fork, which is why I ended up cherry picking the commits and adding a commit on top of that deleting the respective files, which would not be part of the core.

(cherry picked from commit c06cdeb)

(cherry picked from commit 56eb349)

(cherry picked from commit 81c4fe2)

(cherry picked from commit a22f267)

… way to access TminPsat internally (cherry picked from commit 1a64bd6)

(cherry picked from commit cc22938)

(cherry picked from commit 1a766a1)

(cherry picked from commit d97dcd7)

…Psat - removing use of PropsSI (cherry picked from commit 4d2458e)

(cherry picked from commit d615ba6)

(cherry picked from commit 1f0a2b3)

…rWithPressureLoss example (cherry picked from commit b5206a8)

(cherry picked from commit 6d8a34f)

(cherry picked from commit ecb718c)

(cherry picked from commit 9143f09)

(cherry picked from commit acb41ef)

(cherry picked from commit c8415d6)

(cherry picked from commit 537c7f5)

…odels are not very useful for tespy I believe (cherry picked from commit bed22e1)

(cherry picked from commit f762746)

(cherry picked from commit 33c76cc)

(cherry picked from commit 68eadb0)

…a separator. And I think we should also not use sum to 1 concentration, only when one fluid is remaining in some connector..

…spy. (the solver obs out on systems with very small mass flow...). Quick and dirty handleling by adding normalized increments to the residual norm

…nside sourcea nad sink

pep8speaks · 2024-04-15T22:34:03Z

Hello @fwitte! Thanks for opening this PR. We checked the lines you've touched for PEP 8 issues, and found:

In the file src/tespy/components/__init__.py:

Line 35:1: W391 blank line at end of file

In the file src/tespy/components/component.py:

Line 221:80: E501 line too long (99 > 79 characters)
Line 221:90: E251 unexpected spaces around keyword / parameter equals
Line 221:92: E251 unexpected spaces around keyword / parameter equals

In the file src/tespy/components/nodes/base.py:

Line 174:25: E261 at least two spaces before inline comment
Line 175:23: W291 trailing whitespace
Line 206:25: E261 at least two spaces before inline comment

In the file src/tespy/connections/connection.py:

Line 504:36: W291 trailing whitespace
Line 505:46: E231 missing whitespace after ':'
Line 614:38: E231 missing whitespace after ','
Line 614:61: E231 missing whitespace after ','
Line 631:80: E501 line too long (115 > 79 characters)
Line 634:80: E501 line too long (85 > 79 characters)
Line 676:80: E501 line too long (123 > 79 characters)
Line 680:80: E501 line too long (81 > 79 characters)
Line 681:80: E501 line too long (114 > 79 characters)
Line 685:80: E501 line too long (105 > 79 characters)
Line 690:80: E501 line too long (89 > 79 characters)
Line 691:80: E501 line too long (105 > 79 characters)
Line 764:80: E501 line too long (125 > 79 characters)
Line 772:80: E501 line too long (136 > 79 characters)
Line 776:80: E501 line too long (136 > 79 characters)
Line 780:80: E501 line too long (116 > 79 characters)
Line 816:80: E501 line too long (129 > 79 characters)
Line 860:80: E501 line too long (110 > 79 characters)
Line 866:80: E501 line too long (116 > 79 characters)
Line 870:80: E501 line too long (121 > 79 characters)
Line 911:80: E501 line too long (136 > 79 characters)
Line 928:34: E713 test for membership should be 'not in'
Line 928:80: E501 line too long (195 > 79 characters)
Line 929:80: E501 line too long (126 > 79 characters)
Line 999:71: E231 missing whitespace after ','
Line 999:80: E501 line too long (99 > 79 characters)
Line 1017:80: E501 line too long (105 > 79 characters)
Line 1050:17: E225 missing whitespace around operator
Line 1051:17: E225 missing whitespace around operator
Line 1063:80: E501 line too long (109 > 79 characters)
Line 1064:80: E501 line too long (109 > 79 characters)

In the file src/tespy/networks/network.py:

Line 756:14: E231 missing whitespace after ','
Line 758:21: E231 missing whitespace after ','
Line 758:50: E231 missing whitespace after ','
Line 759:17: E265 block comment should start with '# '
Line 759:80: E501 line too long (83 > 79 characters)
Line 776:80: E501 line too long (86 > 79 characters)
Line 786:14: E231 missing whitespace after ','
Line 788:21: E231 missing whitespace after ','
Line 788:50: E231 missing whitespace after ','
Line 789:17: E265 block comment should start with '# '
Line 789:80: E501 line too long (83 > 79 characters)
Line 811:46: E231 missing whitespace after ','
Line 972:65: W291 trailing whitespace
Line 1128:80: E501 line too long (81 > 79 characters)
Line 1130:80: E501 line too long (80 > 79 characters)
Line 1290:41: E231 missing whitespace after ','
Line 1293:80: E501 line too long (97 > 79 characters)
Line 1294:80: E501 line too long (126 > 79 characters)
Line 1743:21: E265 block comment should start with '# '
Line 1744:21: E265 block comment should start with '# '
Line 1745:26: E231 missing whitespace after ','
Line 1861:80: E501 line too long (124 > 79 characters)
Line 1868:80: E501 line too long (135 > 79 characters)
Line 1873:5: E303 too many blank lines (2)
Line 2115:80: E501 line too long (80 > 79 characters)
Line 2253:26: E221 multiple spaces before operator
Line 2253:80: E501 line too long (108 > 79 characters)
Line 2253:86: E261 at least two spaces before inline comment
Line 2254:26: E221 multiple spaces before operator
Line 2254:59: E261 at least two spaces before inline comment
Line 2255:26: E221 multiple spaces before operator
Line 2255:59: E261 at least two spaces before inline comment
Line 2255:80: E501 line too long (80 > 79 characters)
Line 2256:23: E221 multiple spaces before operator
Line 2256:80: E501 line too long (109 > 79 characters)
Line 2256:87: E261 at least two spaces before inline comment
Line 2263:22: E221 multiple spaces before operator
Line 2265:53: E231 missing whitespace after ','
Line 2265:80: E501 line too long (138 > 79 characters)
Line 2339:31: E231 missing whitespace after ','
Line 2339:38: E231 missing whitespace after ','
Line 2339:45: E231 missing whitespace after ','
Line 2339:49: E231 missing whitespace after ','
Line 2346:80: E501 line too long (85 > 79 characters)
Line 2355:80: E501 line too long (85 > 79 characters)
Line 2373:9: E265 block comment should start with '# '
Line 2380:80: E501 line too long (138 > 79 characters)
Line 2380:92: E231 missing whitespace after ','
Line 2380:111: E231 missing whitespace after ','
Line 2380:128: E231 missing whitespace after ','
Line 2381:17: E265 block comment should start with '# '
Line 2385:80: E501 line too long (138 > 79 characters)
Line 2385:92: E231 missing whitespace after ','
Line 2385:111: E231 missing whitespace after ','
Line 2385:128: E231 missing whitespace after ','
Line 2386:17: E265 block comment should start with '# '
Line 2393:80: E501 line too long (126 > 79 characters)
Line 2394:17: E265 block comment should start with '# '
Line 2400:80: E501 line too long (103 > 79 characters)
Line 2400:87: E231 missing whitespace after ','
Line 2400:89: E231 missing whitespace after ','
Line 2400:93: E231 missing whitespace after ','
Line 2402:17: E265 block comment should start with '# '
Line 2413:80: E501 line too long (126 > 79 characters)
Line 2413:92: E231 missing whitespace after ','
Line 2413:112: E231 missing whitespace after ','
Line 2413:116: E231 missing whitespace after ','
Line 2415:17: E265 block comment should start with '# '
Line 2415:80: E501 line too long (83 > 79 characters)
Line 2418:17: E265 block comment should start with '# '
Line 2418:17: E303 too many blank lines (2)
Line 2423:17: E303 too many blank lines (4)
Line 2498:14: E261 at least two spaces before inline comment
Line 2498:15: E262 inline comment should start with '# '
Line 2636:42: E231 missing whitespace after ','
Line 2637:80: E501 line too long (93 > 79 characters)
Line 2638:73: E261 at least two spaces before inline comment
Line 2638:80: E501 line too long (120 > 79 characters)
Line 2639:80: E501 line too long (127 > 79 characters)

In the file src/tespy/networks/network_reader.py:

Line 87:18: E203 whitespace before ':'
Line 87:19: E231 missing whitespace after ':'
Line 88:33: E203 whitespace before ':'
Line 89:39: E203 whitespace before ':'
Line 90:45: E203 whitespace before ':'
Line 90:80: E501 line too long (86 > 79 characters)
Line 91:39: E203 whitespace before ':'
Line 92:42: E203 whitespace before ':'
Line 92:80: E501 line too long (80 > 79 characters)
Line 93:32: E203 whitespace before ':'
Line 94:37: E203 whitespace before ':'
Line 95:64: E203 whitespace before ':'
Line 95:80: E501 line too long (124 > 79 characters)
Line 351:80: E501 line too long (85 > 79 characters)
Line 354:80: E501 line too long (84 > 79 characters)

In the file src/tespy/tools/data_containers.py:

Line 328:80: E501 line too long (82 > 79 characters)
Line 595:1: E302 expected 2 blank lines, found 1

In the file src/tespy/tools/fluid_properties/functions.py:

Line 96:80: E501 line too long (85 > 79 characters)
Line 97:73: E251 unexpected spaces around keyword / parameter equals
Line 97:75: E251 unexpected spaces around keyword / parameter equals
Line 98:73: E251 unexpected spaces around keyword / parameter equals
Line 98:75: E251 unexpected spaces around keyword / parameter equals
Line 99:21: E225 missing whitespace around operator
Line 99:30: E225 missing whitespace around operator
Line 104:62: E203 whitespace before ':'
Line 106:53: W291 trailing whitespace
Line 111:80: E501 line too long (99 > 79 characters)
Line 112:80: E501 line too long (102 > 79 characters)
Line 118:80: E501 line too long (99 > 79 characters)
Line 119:80: E501 line too long (102 > 79 characters)
Line 123:80: E501 line too long (91 > 79 characters)
Line 126:80: E501 line too long (95 > 79 characters)
Line 128:80: E501 line too long (98 > 79 characters)
Line 133:61: E251 unexpected spaces around keyword / parameter equals
Line 133:63: E251 unexpected spaces around keyword / parameter equals
Line 139:80: E501 line too long (86 > 79 characters)
Line 150:76: E251 unexpected spaces around keyword / parameter equals
Line 150:78: E251 unexpected spaces around keyword / parameter equals
Line 150:80: E501 line too long (82 > 79 characters)
Line 151:76: E251 unexpected spaces around keyword / parameter equals
Line 151:78: E251 unexpected spaces around keyword / parameter equals
Line 151:80: E501 line too long (82 > 79 characters)
Line 153:80: E501 line too long (93 > 79 characters)
Line 171:76: E251 unexpected spaces around keyword / parameter equals
Line 171:78: E251 unexpected spaces around keyword / parameter equals
Line 171:80: E501 line too long (82 > 79 characters)
Line 172:76: E251 unexpected spaces around keyword / parameter equals
Line 172:78: E251 unexpected spaces around keyword / parameter equals
Line 172:80: E501 line too long (82 > 79 characters)
Line 173:21: E225 missing whitespace around operator
Line 175:23: E225 missing whitespace around operator
Line 183:80: E501 line too long (93 > 79 characters)
Line 184:30: W291 trailing whitespace
Line 194:80: E501 line too long (93 > 79 characters)
Line 195:30: W291 trailing whitespace
Line 206:80: E501 line too long (93 > 79 characters)
Line 207:30: W291 trailing whitespace
Line 225:76: E251 unexpected spaces around keyword / parameter equals
Line 225:78: E251 unexpected spaces around keyword / parameter equals
Line 225:80: E501 line too long (82 > 79 characters)
Line 226:76: E251 unexpected spaces around keyword / parameter equals
Line 226:78: E251 unexpected spaces around keyword / parameter equals
Line 226:80: E501 line too long (82 > 79 characters)
Line 227:21: E225 missing whitespace around operator
Line 227:30: E225 missing whitespace around operator
Line 228:39: W291 trailing whitespace
Line 229:80: E251 unexpected spaces around keyword / parameter equals
Line 229:80: E501 line too long (86 > 79 characters)
Line 229:82: E251 unexpected spaces around keyword / parameter equals
Line 230:80: E251 unexpected spaces around keyword / parameter equals
Line 230:80: E501 line too long (86 > 79 characters)
Line 230:82: E251 unexpected spaces around keyword / parameter equals
Line 232:26: E203 whitespace before ','
Line 232:80: E501 line too long (81 > 79 characters)
Line 242:80: E501 line too long (86 > 79 characters)
Line 253:62: E203 whitespace before ':'
Line 266:76: E251 unexpected spaces around keyword / parameter equals
Line 266:78: E251 unexpected spaces around keyword / parameter equals
Line 266:80: E501 line too long (82 > 79 characters)
Line 267:76: E251 unexpected spaces around keyword / parameter equals
Line 267:78: E251 unexpected spaces around keyword / parameter equals
Line 267:80: E501 line too long (82 > 79 characters)
Line 268:21: E225 missing whitespace around operator
Line 268:30: E225 missing whitespace around operator
Line 269:39: W291 trailing whitespace
Line 270:80: E251 unexpected spaces around keyword / parameter equals
Line 270:80: E501 line too long (86 > 79 characters)
Line 270:82: E251 unexpected spaces around keyword / parameter equals
Line 271:80: E251 unexpected spaces around keyword / parameter equals
Line 271:80: E501 line too long (86 > 79 characters)
Line 271:82: E251 unexpected spaces around keyword / parameter equals
Line 273:26: E203 whitespace before ','
Line 273:80: E501 line too long (81 > 79 characters)
Line 297:80: E501 line too long (86 > 79 characters)
Line 315:80: E501 line too long (94 > 79 characters)

In the file src/tespy/tools/fluid_properties/helpers.py:

Line 67:80: E501 line too long (112 > 79 characters)
Line 72:20: E231 missing whitespace after ','
Line 72:31: E231 missing whitespace after ','

In the file src/tespy/tools/fluid_properties/mixtures.py:

Line 84:1: W293 blank line contains whitespace
Line 174:80: E501 line too long (81 > 79 characters)
Line 230:80: E501 line too long (93 > 79 characters)

In the file src/tespy/tools/fluid_properties/wrappers.py:

Line 193:34: E231 missing whitespace after ','
Line 193:36: E231 missing whitespace after ','
Line 193:38: E231 missing whitespace after ','
Line 200:32: W291 trailing whitespace
Line 203:17: E722 do not use bare 'except'
Line 204:21: E265 block comment should start with '# '
Line 204:80: E501 line too long (86 > 79 characters)
Line 209:41: E231 missing whitespace after ','
Line 209:80: E501 line too long (91 > 79 characters)
Line 209:92: W291 trailing whitespace
Line 211:36: W291 trailing whitespace
Line 214:21: E722 do not use bare 'except'
Line 215:25: E265 block comment should start with '# '
Line 215:80: E501 line too long (90 > 79 characters)
Line 217:42: E231 missing whitespace after ','
Line 217:80: E501 line too long (91 > 79 characters)
Line 217:92: W291 trailing whitespace
Line 219:36: W291 trailing whitespace
Line 222:21: E722 do not use bare 'except'
Line 223:25: E265 block comment should start with '# '
Line 223:80: E501 line too long (86 > 79 characters)
Line 226:51: W291 trailing whitespace
Line 229:36: E231 missing whitespace after ','
Line 229:38: E231 missing whitespace after ','
Line 262:36: E231 missing whitespace after ','
Line 274:36: E231 missing whitespace after ','
Line 282:36: E231 missing whitespace after ','

In the file src/tespy/tools/global_vars.py:

Line 23:23: E203 whitespace before ','
Line 23:80: E501 line too long (81 > 79 characters)
Line 24:80: E501 line too long (83 > 79 characters)
Line 25:80: E501 line too long (83 > 79 characters)
Line 26:80: E501 line too long (83 > 79 characters)
Line 27:80: E501 line too long (84 > 79 characters)
Line 28:28: E203 whitespace before ','
Line 28:80: E501 line too long (93 > 79 characters)
Line 29:80: E501 line too long (93 > 79 characters)
Line 30:80: E501 line too long (93 > 79 characters)
Line 31:80: E501 line too long (94 > 79 characters)
Line 32:80: E501 line too long (94 > 79 characters)
Line 34:9: E265 block comment should start with '# '
Line 35:9: E265 block comment should start with '# '
Line 41:80: E501 line too long (84 > 79 characters)
Line 44:9: E131 continuation line unaligned for hanging indent
Line 44:9: E265 block comment should start with '# '
Line 45:9: E265 block comment should start with '# '
Line 50:24: E203 whitespace before ','
Line 51:27: E203 whitespace before ','
Line 52:27: E203 whitespace before ','
Line 53:27: E203 whitespace before ','
Line 54:28: E203 whitespace before ','
Line 56:29: E203 whitespace before ','
Line 57:30: E203 whitespace before ','
Line 58:30: E203 whitespace before ','
Line 59:31: E203 whitespace before ','
Line 60:31: E203 whitespace before ','
Line 62:9: E265 block comment should start with '# '
Line 63:9: E265 block comment should start with '# '
Line 70:80: E501 line too long (94 > 79 characters)
Line 72:9: E265 block comment should start with '# '
Line 73:9: E265 block comment should start with '# '
Line 87:80: E501 line too long (94 > 79 characters)
Line 88:80: E501 line too long (94 > 79 characters)

In the file src/tespy/tools/helpers.py:

Line 22:80: E501 line too long (80 > 79 characters)
Line 113:1: E302 expected 2 blank lines, found 1
Line 119:1: E302 expected 2 blank lines, found 1

fwitte · 2024-04-15T22:36:32Z

There is many things to process here, so it might take quite a bit of time to complete the PR.

mrk added 30 commits April 15, 2024 23:55

regiter coolrop

0cf8a03

Cherry picked EEMAP/dev to avoid rewritten history

a0c6361

register nested root for coolprop

0a52301

(cherry picked from commit c06cdeb)

updating examples

929a9ee

(cherry picked from commit 56eb349)

successfully runing examples 1,4,8,9

5a69098

(cherry picked from commit 81c4fe2)

testing heat exchangers

1dc1b10

(cherry picked from commit a22f267)

fsolving P > Psat for incompressible "water" :: I believe there is no…

13e0145

… way to access TminPsat internally (cherry picked from commit 1a64bd6)

updating SimpleHeatExchangerDeltaP with new jacobian structure

09f4875

(cherry picked from commit cc22938)

heat exchanger with loss updated with new jacobian structure

73b14ad

(cherry picked from commit 1a766a1)

Finally happy with all combinations of LF, Q_loss an Q_total working

6a1fd93

(cherry picked from commit d97dcd7)

solving P > Psat more elegantly :: INCOMP pressure is now limited by …

2da06de

…Psat - removing use of PropsSI (cherry picked from commit 4d2458e)

updating some errors in jacobian derrivatives

171c940

(cherry picked from commit d615ba6)

updating heat exchanger and merge tests

5cbbd38

(cherry picked from commit 1f0a2b3)

constraints are now inherited and deleted if necessary. Added Splitte…

2ae1851

…rWithPressureLoss example (cherry picked from commit b5206a8)

Flow splitter working and added flow splitter with pressure drop

5432a8d

(cherry picked from commit 6d8a34f)

reorganizing splitters

c5231d0

(cherry picked from commit ecb718c)

working on SFS

ed31e26

(cherry picked from commit 9143f09)

fixing tespy separator model (is_var on the jacobian outlets )

5f42e74

(cherry picked from commit acb41ef)

cleaning test files for not using Food properties

b5233fe

(cherry picked from commit c8415d6)

And the BUS is running

d29249c

(cherry picked from commit 537c7f5)

splitting energySupplyComponents from newComponents.. Energy Supply m…

dd85c7e

…odels are not very useful for tespy I believe (cherry picked from commit bed22e1)

working energy models and examples

230c7a7

(cherry picked from commit f762746)

renaming example files

0ec3f77

(cherry picked from commit 33c76cc)

deleting old energy supply models, updating names and examples

2fc7a4e

(cherry picked from commit 68eadb0)

new folder names

cc69ce1

I think we should always include and fluid composition equations for …

c9d910a

…a separator. And I think we should also not use sum to 1 concentration, only when one fluid is remaining in some connector..

I think we should always include and fluid composition equations for …

4c3f339

…a separator. And I think we should also not use sum to 1 concentration, only when one fluid is remaining in some connector..

let's syncronize the way fluids are specified, also for the split_fluid

e7156aa

let's keep backward compatibility

edb1a0d

need force_state, limit_increments and RobustRelax

9af1ca9

Vily-ipu and others added 25 commits April 15, 2024 23:59

fix newComponents file name

30d5334

3 different results tables

e4df9a2

thandling units in components - the quick way ..

90767c3

deleting deprecated model

d479cbd

adding more variables for component units

65058e2

more units for components

5037025

goofy unit

aa9cbfe

units

17f2625

equal To of SFS model

f330529

add to export debugging class list

f47f768

Huge issue on scaling residuals and jacobians, which is missing in te…

bf92602

…spy. (the solver obs out on systems with very small mass flow...). Quick and dirty handleling by adding normalized increments to the residual norm

safe delete object

6418176

unit

2cbeb8a

adding new features for energy supply, e.g. mass flow specification i…

fafc390

…nside sourcea nad sink

Fix unit conversion (switched MWh and GWh)

db1a26f

boiler, compressor, ref unit and heat pump with usefull ratios

91b2a07

adding functionality for energy supply

eb82fd9

flow energy node

896aa8d

Changing SI unit of KPI

c509c11

fixing basic heatpump and refunit in energy supply

f0aaeb9

working on custom fluid wrapper

82280db

working mix of custom fluid wrapper and coolprop

5cd9c06

change folder

141193b

mixtures with custem wrapper and coolprop working

56a3ab7

Delete application specific files

Loading
Loading status checks…

0ac907c

fwitte mentioned this pull request Apr 16, 2024

Addition of some features implemented by ipudk #504

Open

fwitte closed this Apr 16, 2024

fwitte deleted the features/merge-ipu branch October 27, 2024 20:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge commits from ipudk/tespy #502

Merge commits from ipudk/tespy #502

fwitte commented Apr 15, 2024

pep8speaks commented Apr 15, 2024

fwitte commented Apr 15, 2024

Merge commits from ipudk/tespy #502

Merge commits from ipudk/tespy #502

Conversation

fwitte commented Apr 15, 2024

pep8speaks commented Apr 15, 2024

fwitte commented Apr 15, 2024