Skip to content

Commit

Permalink
Polja infiltracija imajo lahko string vrednost
Browse files Browse the repository at this point in the history
  • Loading branch information
@malamalca
malamalca committed Dec 16, 2023
1 parent c8862ab commit 9147136
Show file tree
Hide file tree
Showing 9 changed files with 194 additions and 62 deletions.
72 changes: 49 additions & 23 deletions projects/Pures/TestniProjekt/izracuni/TSS/ogrevanje.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,10 @@
"okolje": 3662.515176362106
},
"energijaPoEnergentihTSV": {
"elektrika": 0,
"okolje": 0
"elektrika": 0
},
"energijaPoEnergentihHlajenje": {
"elektrika": 0,
"okolje": 0
"elektrika": 0
},
"letnaUcinkovitostOgrHlaTsv": 0.5415835898803257,
"minLetnaUcinkovitostOgrHlaTsv": 0.5,
Expand Down Expand Up @@ -123,8 +121,6 @@
"prenosniki": [
{
"id": "TALNO",
"vrsta": "Ploskovna ogrevala",
"regulacijaTemperature": "S temperaturo referenčnega prostora",
"toplotneIzgube": [
93.77514300538293,
65.54354817464903,
Expand Down Expand Up @@ -153,6 +149,9 @@
0.72,
0.744
],
"obnovljivaEnergija": [],
"vracljiveIzgube": [],
"vracljiveIzgubeTSV": [],
"vracljiveIzgubeAux": [
0.744,
0.672,
Expand All @@ -167,13 +166,16 @@
0.72,
0.744
],
"porociloNizi": [],
"porociloPodatki": [],
"vrsta": "Ploskovna ogrevala",
"regulacijaTemperature": "S temperaturo referenčnega prostora",
"hidravlicnoUravnotezenje": "Statično uravnoteženje dvižnih vodov"
}
],
"razvodi": [
{
"id": "ogrevanje",
"sistem": "dvocevni",
"toplotneIzgube": [
220.89756723088223,
148.97639530812347,
Expand Down Expand Up @@ -202,6 +204,7 @@
26.081230719143537,
27.79458562661035
],
"obnovljivaEnergija": [],
"vracljiveIzgube": [
195.56863353753496,
128.73621855677013,
Expand All @@ -216,6 +219,7 @@
133.12860112972882,
196.13534309794773
],
"vracljiveIzgubeTSV": [],
"vracljiveIzgubeAux": [
6.94657088779158,
6.101496968633354,
Expand All @@ -230,6 +234,9 @@
6.520307679785884,
6.948646406652587
],
"porociloNizi": [],
"porociloPodatki": [],
"sistem": "dvocevni",
"vodi": [
{
"vrsta": "ceviHorizontaliVodi",
Expand Down Expand Up @@ -262,7 +269,7 @@
"generatorji": [
{
"id": "TC",
"potrebnaEnergija": {
"toplotneIzgube": {
"ogrevanje": [
0,
0,
Expand Down Expand Up @@ -294,26 +301,25 @@
2.3030306319509153
]
},
"vneseneIzgube": {
"obnovljivaEnergija": {
"ogrevanje": [
1379.147306513585,
887.6698977088977,
512.5369791275906,
206.27900291045944,
35.34420865310225,
865.8682641773431,
566.6155096081966,
342.78071569262676,
142.77543146538432,
25.1112696320889,
0,
0,
0,
34.89009365819562,
271.18145454131366,
915.7445595175474,
1383.4377052925347
24.690813280326445,
188.716509200916,
612.8641156549472,
893.0925476502772
]
},
"podnebje": "celinsko",
"nazivnaMoc": 6,
"elektricnaMocNaPrimarnemKrogu": 6,
"elektricnaMocNaSekundarnemKrogu": 3,
"vracljiveIzgube": [],
"vracljiveIzgubeTSV": [],
"vracljiveIzgubeAux": [],
"porociloNizi": [
{
"naziv": "E<sub>TČ<\/sub>",
Expand Down Expand Up @@ -357,7 +363,27 @@
"enota": "W",
"decimalke": 1
}
]
],
"vneseneIzgube": {
"ogrevanje": [
1379.147306513585,
887.6698977088977,
512.5369791275906,
206.27900291045944,
35.34420865310225,
0,
0,
0,
34.89009365819562,
271.18145454131366,
915.7445595175474,
1383.4377052925347
]
},
"podnebje": "celinsko",
"nazivnaMoc": 6,
"elektricnaMocNaPrimarnemKrogu": 6,
"elektricnaMocNaSekundarnemKrogu": 3
}
]
}
Expand Down
7 changes: 4 additions & 3 deletions projects/Pures/TestniProjekt/izracuni/cone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"faktorOblike": 1.012,
"infiltracija": {
"n50": 0.6,
"lega": 2,
"zavetrovanost": 2
"lega": "delnoIzpostavljena",
"zavetrovanost": "enaFasada"
},
"notranjiViri": {
"ogrevanje": 4.1,
Expand Down Expand Up @@ -6348,7 +6348,8 @@
472.32,
488.064
],
"vracljiveIzgube": [],
"vrnjeneIzgubeVOgrevanje": [],
"vrnjeneIzgubeVTSV": [],
"energijaOgrevanje": [
1253.5810103920794,
783.8800833731727,
Expand Down
79 changes: 53 additions & 26 deletions projects/Pures/TestniProjekt/izracuni/stavba.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"faktorOblike": 1.012,
"infiltracija": {
"n50": 0.6,
"lega": 2,
"zavetrovanost": 2
"lega": "delnoIzpostavljena",
"zavetrovanost": "enaFasada"
},
"notranjiViri": {
"ogrevanje": 4.1,
Expand Down Expand Up @@ -6401,7 +6401,8 @@
472.32,
488.064
],
"vracljiveIzgube": [],
"vrnjeneIzgubeVOgrevanje": [],
"vrnjeneIzgubeVTSV": [],
"energijaOgrevanje": [
1253.5810103920794,
783.8800833731727,
Expand Down Expand Up @@ -6687,12 +6688,10 @@
"okolje": 3662.515176362106
},
"energijaPoEnergentihTSV": {
"elektrika": 0,
"okolje": 0
"elektrika": 0
},
"energijaPoEnergentihHlajenje": {
"elektrika": 0,
"okolje": 0
"elektrika": 0
},
"letnaUcinkovitostOgrHlaTsv": 0.5415835898803257,
"minLetnaUcinkovitostOgrHlaTsv": 0.5,
Expand Down Expand Up @@ -6753,8 +6752,6 @@
"prenosniki": [
{
"id": "TALNO",
"vrsta": "Ploskovna ogrevala",
"regulacijaTemperature": "S temperaturo referenčnega prostora",
"toplotneIzgube": [
93.77514300538293,
65.54354817464903,
Expand Down Expand Up @@ -6783,6 +6780,9 @@
0.72,
0.744
],
"obnovljivaEnergija": [],
"vracljiveIzgube": [],
"vracljiveIzgubeTSV": [],
"vracljiveIzgubeAux": [
0.744,
0.672,
Expand All @@ -6797,13 +6797,16 @@
0.72,
0.744
],
"porociloNizi": [],
"porociloPodatki": [],
"vrsta": "Ploskovna ogrevala",
"regulacijaTemperature": "S temperaturo referenčnega prostora",
"hidravlicnoUravnotezenje": "Statično uravnoteženje dvižnih vodov"
}
],
"razvodi": [
{
"id": "ogrevanje",
"sistem": "dvocevni",
"toplotneIzgube": [
220.89756723088223,
148.97639530812347,
Expand Down Expand Up @@ -6832,6 +6835,7 @@
26.081230719143537,
27.79458562661035
],
"obnovljivaEnergija": [],
"vracljiveIzgube": [
195.56863353753496,
128.73621855677013,
Expand All @@ -6846,6 +6850,7 @@
133.12860112972882,
196.13534309794773
],
"vracljiveIzgubeTSV": [],
"vracljiveIzgubeAux": [
6.94657088779158,
6.101496968633354,
Expand All @@ -6860,6 +6865,9 @@
6.520307679785884,
6.948646406652587
],
"porociloNizi": [],
"porociloPodatki": [],
"sistem": "dvocevni",
"vodi": [
{
"vrsta": "ceviHorizontaliVodi",
Expand Down Expand Up @@ -6892,7 +6900,7 @@
"generatorji": [
{
"id": "TC",
"potrebnaEnergija": {
"toplotneIzgube": {
"ogrevanje": [
0,
0,
Expand Down Expand Up @@ -6924,26 +6932,25 @@
2.3030306319509153
]
},
"vneseneIzgube": {
"obnovljivaEnergija": {
"ogrevanje": [
1379.147306513585,
887.6698977088977,
512.5369791275906,
206.27900291045944,
35.34420865310225,
865.8682641773431,
566.6155096081966,
342.78071569262676,
142.77543146538432,
25.1112696320889,
0,
0,
0,
34.89009365819562,
271.18145454131366,
915.7445595175474,
1383.4377052925347
24.690813280326445,
188.716509200916,
612.8641156549472,
893.0925476502772
]
},
"podnebje": "celinsko",
"nazivnaMoc": 6,
"elektricnaMocNaPrimarnemKrogu": 6,
"elektricnaMocNaSekundarnemKrogu": 3,
"vracljiveIzgube": [],
"vracljiveIzgubeTSV": [],
"vracljiveIzgubeAux": [],
"porociloNizi": [
{
"naziv": "E<sub>TČ<\/sub>",
Expand Down Expand Up @@ -6987,7 +6994,27 @@
"enota": "W",
"decimalke": 1
}
]
],
"vneseneIzgube": {
"ogrevanje": [
1379.147306513585,
887.6698977088977,
512.5369791275906,
206.27900291045944,
35.34420865310225,
0,
0,
0,
34.89009365819562,
271.18145454131366,
915.7445595175474,
1383.4377052925347
]
},
"podnebje": "celinsko",
"nazivnaMoc": 6,
"elektricnaMocNaPrimarnemKrogu": 6,
"elektricnaMocNaSekundarnemKrogu": 3
}
]
},
Expand Down
Binary file modified projects/Pures/TestniProjekt/pdf/PuresElaborat.pdf
View file
Binary file not shown.
Binary file modified projects/Pures/TestniProjekt/pdf/PuresIzkaz.pdf
View file
Binary file not shown.
1 change: 0 additions & 1 deletion projects/Pures/TestniProjekt/podatki/cone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

"notranjaTOgrevanje": 20,
"notranjaTHlajenje": 26,
"zunanjaT": -13,

"infiltracija": {
"n50": 0.6,
Expand Down
Loading

0 comments on commit 9147136

Please sign in to comment.