Skip to content

Commit 7b594b0

Browse files
malamalcamalamalca
committed
Dopolnjen prikaz sNES
1 parent e21813f commit 7b594b0

File tree

11 files changed

+213
-16
lines changed

11 files changed

+213
-16
lines changed

‎src/Calc/TSS/OgrevalniSistemi/ToplovodniOgrevalniSistem.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ protected function parseConfig($config)
4444
* Inicializacija parametrov sistema
4545
*
4646
* @param \stdClass $cona Podatki cone
47+
* @param \stdClass $okolje Podatki okolja
4748
* @return void
4849
*/
49-
public function init($cona)
50+
public function init($cona, $okolje)
5051
{
5152
$this->standardnaMoc = ($cona->specTransmisijskeIzgube + $cona->specVentilacijskeIzgube) *
52-
($cona->notranjaTOgrevanje - $cona->zunanjaT) / 1000;
53+
($cona->notranjaTOgrevanje - $okolje->projektnaZunanjaT) / 1000;
5354

5455
foreach (array_keys(Calc::MESECI) as $mesec) {
5556
$stDni = cal_days_in_month(CAL_GREGORIAN, $mesec + 1, 2023);
@@ -151,7 +152,7 @@ public function analizaOgrevanja($cona, $okolje)
151152

152153
CalcCone::izracunFaktorjaIzkoristka($cona, $okolje);
153154
CalcCone::izracunEnergijeOgrevanjeHlajanje($cona, $okolje);
154-
$this->init($cona);
155+
$this->init($cona, $okolje);
155156
}
156157
$this->ogrevanje->potrebnaEnergija = $cona->energijaOgrevanje;
157158
$this->ogrevanje->potrebnaElektricnaEnergija = [];
@@ -248,7 +249,7 @@ public function analizaOgrevanja($cona, $okolje)
248249
*/
249250
public function analiza($cona, $okolje)
250251
{
251-
$this->init($cona);
252+
$this->init($cona, $okolje);
252253

253254
$this->energijaPoEnergentih = [];
254255
$this->potrebnaEnergija = [];

‎src/Command/IzracunOkolja.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public function run($projectId = null)
7272
$okolje = CalcOkolje::notranjeOkolje(['zunanjaT' => $zunanjaTemp, 'zunanjaVlaga' => $zunanjaVlaga]);
7373

7474
$okolje->povprecnaLetnaTemp = $splosniPodatkiOut->YXTemp->letnaT;
75+
$okolje->projektnaZunanjaT = $splosniPodatkiOut->YXTemp->projT;
76+
$okolje->temperaturniPrimanjkljaj = $splosniPodatkiOut->YXTemp->tempPrim;
77+
$okolje->energijaSoncnegaObsevanja = $splosniPodatkiOut->YXTemp->sevanje;
7578

7679
// izračun sončnega obsevanja
7780
// ARSO in Pures3 naredita to zelo čudno - ne na podlagi koordinat ampak primerja letno sevanje

‎src/Controller/ProjektiController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function view($projectId = null)
3232

3333
App::set('projectId', $projectId);
3434
App::set('splosniPodatki', App::loadProjectData($projectId, 'splosniPodatki'));
35+
App::set('okolje', App::loadProjectCalculation($projectId, 'okolje'));
3536
App::set('stavba', App::loadProjectCalculation($projectId, 'stavba'));
3637
App::set('cone', App::loadProjectCalculation($projectId, 'cone'));
3738

‎src/Lib/CalcOvojNetransparenten.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public static function analiza($cona, $okolje, $konstrukcije)
3737

3838
// temperaturni korekcijski faktor
3939
$elementOvoja->b = empty($kons->ogrRazvodT) ? 1 :
40-
($kons->ogrRazvodT - $cona->zunanjaT) / ($cona->notranjaTOgrevanje - $cona->zunanjaT);
40+
($kons->ogrRazvodT - $okolje->projektnaZunanjaT) /
41+
($cona->notranjaTOgrevanje - $okolje->projektnaZunanjaT);
4142

4243
$elementOvoja->faktorSencenja = $elementOvoja->faktorSencenja ?? array_map(fn($m) => 1, Calc::MESECI);
4344

‎src/Lib/CalcStavba.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public static function analizaTSS($stavba, $sistemi)
200200
$stavba->korigiranaSpecificnaPrimarnaEnergija =
201201
$stavba->specificnaPrimarnaEnergija * $stavba->Y_Hnd * $stavba->Y_ROVE;
202202

203+
$stavba->dovoljenaSpecificnaPrimarnaEnergija = 75;
203204
$stavba->dovoljenaKorigiranaSpecificnaPrimarnaEnergija = 75 * $stavba->X_p * $stavba->X_s;
204205

205206
return $stavba;

‎templates/Projekti/snes.php‎

Lines changed: 135 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,141 @@
1212
<td colspan="4"><h2>Kazalniki energijske učinkovitosti stavbe</h2></td>
1313
</tr>
1414
<tr>
15-
<td>Neutežena dovedena energija za delovanje TSS </td>
15+
<td colspan="2"></td>
16+
<td class="center">Količina (kWh/an)</td>
17+
</tr>
18+
<tr>
19+
<td>Neutežena dovedena energija za delovanje TSS</td>
1620
<td>E<sub>del,an</sub></td>
17-
<td>kWh/an</td>
21+
<td class="center"><?= $this->numFormat($stavba->neutezenaDovedenaEnergija, 0) ?></td>
22+
</tr>
23+
<tr>
24+
<td>Utežena dovedena energija za delovanje TSS</td>
25+
<td>E<sub>w,del,an</sub></td>
26+
<td class="center"><?= $this->numFormat($stavba->utezenaDovedenaEnergija, 0) ?></td>
27+
</tr>
28+
<tr>
29+
<td>Obnovljiva primarna energija dovedene energije</td>
30+
<td>E<sub>Pren,an</sub></td>
31+
<td class="center"><?= $this->numFormat($stavba->obnovljivaPrimarnaEnergija, 0) ?></td>
32+
</tr>
33+
<tr>
34+
<td>Neobnovljiva primarna energija dovedene energije</td>
35+
<td>E<sub>Pnren,an</sub></td>
36+
<td class="center"><?= $this->numFormat($stavba->neobnovljivaPrimarnaEnergija, 0) ?></td>
37+
</tr>
38+
<tr>
39+
<td>Skupna primarna energija</td>
40+
<td>E<sub>Ptot,an</sub></td>
41+
<td class="center"><?= $this->numFormat($stavba->skupnaPrimarnaEnergija, 0) ?></td>
42+
</tr>
43+
44+
<tr><td colspan="3"></td></tr>
45+
46+
<tr>
47+
<td colspan="2"></td>
48+
<td class="center">Vrednost (%)</td>
49+
</tr>
50+
<tr>
51+
<td>Razmernik obnovljivih virov energije ROVE</td>
52+
<td></td>
53+
<td class="center"><?= $this->numFormat($stavba->ROVE, 0) ?></td>
54+
</tr>
55+
<tr>
56+
<td>Minimalni zahtevani razmernik ROVE<sub>min</sub></td>
57+
<td></td>
58+
<td class="center"><?= $this->numFormat($stavba->minROVE, 0) ?></td>
59+
</tr>
60+
<tr>
61+
<td>Ustreza minimalni zahtevi </td>
62+
<td></td>
63+
<td class="center">
64+
<b class="<?= $stavba->ROVE > $stavba->minROVE ? 'green' : 'red' ?>">
65+
<?= $stavba->ROVE > $stavba->minROVE ? 'DA' : 'NE' ?>
66+
</b>
67+
</td>
68+
</tr>
69+
70+
71+
<tr>
72+
<td colspan="2"></td>
73+
<td class="center">Vrednost (-)</td>
74+
</tr>
75+
<tr>
76+
<td>Korekcijski faktor razmernika ROVE X<sub>OVE</sub></td>
77+
<td></td>
78+
<td class="center"><?= $this->numFormat($stavba->X_OVE, 0) ?></td>
79+
</tr>
80+
<tr>
81+
<td>Kompenzacijski faktor razmernika ROVE Y<sub>ROVE</sub></td>
82+
<td></td>
83+
<td class="center"><?= $this->numFormat($stavba->Y_ROVE, 0) ?></td>
84+
</tr>
85+
86+
<tr><td colspan="3"></td></tr>
87+
88+
<tr>
89+
<td>Korekcijski faktor dovoljene skupne primarne energije glede na vrsto stavbe X<sub>s</sub></td>
90+
<td></td>
91+
<td class="center"><?= $this->numFormat($stavba->X_s, 1) ?></td>
92+
</tr>
93+
<tr>
94+
<td>Korekcijski faktor dovoljene skupne primarne energije glede na leto uveljavitve X<sub>p</sub></td>
95+
<td></td>
96+
<td class="center"><?= $this->numFormat($stavba->X_p, 1) ?></td>
97+
</tr>
98+
<tr>
99+
<td>Kompenzacijski faktor potrebne toplote za ogrevanje Y<sub>H,nd</sub></td>
100+
<td></td>
101+
<td class="center"><?= $this->numFormat($stavba->Y_Hnd, 1) ?></td>
102+
</tr>
103+
104+
<tr><td colspan="3"></td></tr>
105+
106+
<tr>
107+
<td colspan="2"></td>
108+
<td class="center">Količina (kWh/an)</td>
109+
</tr>
110+
<tr>
111+
<td>Specifična potrebna skupna primarna energija</td>
112+
<td>E'<sub>Ptot,an</sub></td>
113+
<td class="center"><?= $this->numFormat($stavba->specificnaPrimarnaEnergija, 0) ?></td>
114+
</tr>
115+
<tr>
116+
<td>Korigirana specifična potrebna primarna energija</td>
117+
<td>E'<sub>Ptot,kor,an</sub></td>
118+
<td class="center"><?= $this->numFormat($stavba->korigiranaSpecificnaPrimarnaEnergija, 0) ?></td>
119+
</tr>
120+
<tr>
121+
<td>Dovoljena specifična potrebna skupna primarna energija</td>
122+
<td>E'<sub>Ptot,kor,an</sub></td>
123+
<td class="center"><?= $this->numFormat($stavba->dovoljenaSpecificnaPrimarnaEnergija, 0) ?></td>
124+
</tr>
125+
<tr>
126+
<td>Korigirana dovoljena specifična potrebna skupna primarna energija</td>
127+
<td>E'<sub>Ptot,kor,dov,an</sub></td>
128+
<td class="center"><?= $this->numFormat($stavba->dovoljenaKorigiranaSpecificnaPrimarnaEnergija, 0) ?></td>
129+
</tr>
130+
<tr>
131+
<td>Ustreza minimalni zahtevi </td>
132+
<td></td>
133+
<td class="center">
134+
<b class="<?= $stavba->dovoljenaKorigiranaSpecificnaPrimarnaEnergija > $stavba->korigiranaSpecificnaPrimarnaEnergija ? 'green' : 'red' ?>">
135+
<?= $stavba->dovoljenaKorigiranaSpecificnaPrimarnaEnergija > $stavba->korigiranaSpecificnaPrimarnaEnergija ? 'DA' : 'NE' ?>
136+
</b>
137+
</td>
138+
</tr>
139+
140+
141+
<tr><td colspan="3"></td></tr>
142+
143+
<tr>
144+
<td colspan="2"></td>
145+
<td class="center">Vrednost (kg/an)</td>
146+
</tr>
147+
<tr>
148+
<td>Izpusti ogljikovega dioksida</td>
149+
<td>M<sub>CO2,an</sub></td>
150+
<td class="center"><?= $this->numFormat($stavba->izpustCO2, 0) ?></td>
18151
</tr>
19152
</table>

‎templates/Projekti/view.php‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
?>
55
<h1>Podatki o projektu "<?= h($splosniPodatki->stavba->naziv) ?>"</h1>
66

7-
<p>
7+
<p class="actions">
88
<a class="button" href="<?= App::url('/projekti/analiza/' . $projectId) ?>">Analiza GF</a>
99
<a class="button" href="<?= App::url('/izkazi/podrocjeGf/' . $projectId) ?>">Izkaz GF</a>
1010
<a class="button" href="<?= App::url('/projekti/snes/' . $projectId) ?>">Analiza SNES</a>
1111
<a class="button" href="<?= App::url('/izkazi/podrocjeSNES/' . $projectId) ?>">Izkaz sNES</a>
1212
</p>
13-
<p>
13+
<p class="actions">
1414
<?php
1515
foreach ($cone as $cona) {
1616
?>
@@ -21,7 +21,7 @@
2121
}
2222
?>
2323
</p>
24-
<p>
24+
<p class="actions">
2525
<?php
2626
$vrsteTSS = ['ogrevanje' => $ogrevanje, 'prezracevanje' => $prezracevanje, 'razsvetljava' => $razsvetljava];
2727
foreach ($vrsteTSS as $vrstaTSS => $sistemi) {
@@ -64,4 +64,55 @@
6464
<td></td>
6565
</tr>
6666
<tr><td colspan="4"></tr>
67+
68+
<tr>
69+
<td colspan="2">Klasifikacija</td>
70+
<td colspan="2" class="left"><?= h($splosniPodatki->stavba->klasifikacija) ?></td>
71+
</tr>
72+
<tr>
73+
<td colspan="2">Opredelitev stavbe</td>
74+
<td colspan="2" class="left"><?= h($splosniPodatki->stavba->vrsta) ?></td>
75+
</tr>
76+
<tr>
77+
<td colspan="2">Vrsta gradnje</td>
78+
<td colspan="2" class="left"><?= h($splosniPodatki->stavba->tip) ?></td>
79+
</tr>
80+
<tr>
81+
<td colspan="2">Javna stavba</td>
82+
<td colspan="2" class="left"><?= h($splosniPodatki->stavba->javna ? "DA" : "NE") ?></td>
83+
</tr>
84+
<tr><td colspan="4"></tr>
85+
86+
<tr>
87+
<td colspan="2">Povprečna letna T (°C)</td>
88+
<td colspan="2" class="left"><?= $this->numFormat($okolje->povprecnaLetnaTemp, 1) ?></td>
89+
</tr>
90+
<tr>
91+
<td colspan="2">Projektna zimska T (°C)</td>
92+
<td colspan="2" class="left"><?= $this->numFormat($okolje->projektnaZunanjaT, 1) ?></td>
93+
</tr>
94+
<tr>
95+
<td colspan="2">Energija sončnega obsevanja (kWh/m2)</td>
96+
<td colspan="2" class="left"><?= $this->numFormat($okolje->energijaSoncnegaObsevanja, 1) ?></td>
97+
</tr>
98+
</table>
99+
<br />
100+
<table border="1">
101+
<thead>
102+
<tr>
103+
<td></td>
104+
<td></td>
105+
<?= implode(PHP_EOL, array_map(fn($mes) => '<td class="center">' . $mes . '</td>', Calc::MESECI)) ?>
106+
</tr>
107+
</thead>
108+
<tr>
109+
<td>Temperatura (°C)</td>
110+
<td>θ<sub>e,m</sub></td>
111+
<?= implode(PHP_EOL, array_map(fn($mesecnaVrednost) => '<td class="center">' . $this->numFormat($mesecnaVrednost, 0) . '</td>', $okolje->zunanjaT)) ?>
112+
</tr>
113+
<tr>
114+
<td>Rel. vlažnost (%)</td>
115+
<td>&#934;<sub>e,m</sub></td>
116+
<?= implode(PHP_EOL, array_map(fn($mesecnaVrednost) => '<td class="center">' . $this->numFormat($mesecnaVrednost, 0) . '</td>', $okolje->zunanjaVlaga)) ?>
117+
</tr>
67118
</table>

‎tests/TSS/OgrevalniSistemi/ToplovodniOgrevalniSistemSamoOgrevanjeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public function testToplotneIzgube(): void
1111
$cona = new \stdClass();
1212
$cona->id = "Cona1";
1313
$cona->notranjaTOgrevanje = 20;
14-
$cona->zunanjaT = -13;
1514
$cona->energijaTSV = [114.253972, 103.197136, 114.253972, 110.56836, 114.253972, 110.56836,114.253972, 114.253972, 110.56836, 114.253972, 110.56836, 114.25392];
1615
$cona->energijaOgrevanje = [1206.7067763529, 746.3679541588, 390.1171250327, 135.7338005150, 19.2204599611, 0, 0, 0, 17.9030263837, 179.4962090259, 761.6441705740, 1208.7845887780];
1716
$cona->specVentilacijskeIzgube = 8.184;
@@ -22,6 +21,7 @@ public function testToplotneIzgube(): void
2221
$cona->etaznaVisina = 3;
2322

2423
$okolje = new \stdClass();
24+
$okolje->projektnaZunanjaT = -13;
2525
$okolje->zunanjaT = [-1, 1, 5, 9, 14, 17, 19, 19, 15, 10, 4, 0];
2626

2727
$config = <<<EOT

‎tests/TSS/OgrevalniSistemi/ToplovodniOgrevalniSistemSamoTSV.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public function testToplotneIzgube(): void
1111
$cona = new \stdClass();
1212
$cona->id = "Cona1";
1313
$cona->notranjaTOgrevanje = 20;
14-
$cona->zunanjaT = -13;
1514
$cona->energijaTSV = [114.253972, 103.197136, 114.253972, 110.56836, 114.253972, 110.56836,114.253972, 114.253972, 110.56836, 114.253972, 110.56836, 114.25392];
1615
$cona->energijaOgrevanje = [1206.6498424364968, 746.3227400063487, 390.0830744323009, 135.71842830225137, 19.217650278634665, 0, 0, 0, 17.900038879386443, 179.47284892375217, 761.5928197350089, 1208.7268259786833];
1716
$cona->specVentilacijskeIzgube = 8.184;
@@ -22,6 +21,7 @@ public function testToplotneIzgube(): void
2221
$cona->etaznaVisina = 3;
2322

2423
$okolje = new \stdClass();
24+
$okolje->projektnaZunanjaT = -13;
2525

2626
$config = <<<EOT
2727
{

‎tests/TSS/Razvodi/DvocevniRazvodTest.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,12 @@ public function testToplotneIzgube(): void
150150
$cona->steviloEtaz = 3;
151151
$cona->etaznaVisina = 3;
152152
$cona->notranjaTOgrevanje = 20;
153-
$cona->zunanjaT = -13;
154153
$cona->energijaOgrevanje = [1206.707, 746.368, 390.117, 135.734, 19.220, 0.000, 0.000, 0.000, 17.903, 179.496, 761.644, 1208.785];
155154
$cona->specTransmisijskeIzgube = 143.8765034039049;
156155
$cona->specVentilacijskeIzgube = 8.184;
157156

157+
$okolje = new \stdClass();
158+
$okolje->projektnaZunanjaT = -13;
158159

159160
$configSistem = <<<EOT
160161
{
@@ -163,7 +164,7 @@ public function testToplotneIzgube(): void
163164
}
164165
EOT;
165166
$sistem = new ToplovodniOgrevalniSistem($configSistem);
166-
$sistem->init($cona);
167+
$sistem->init($cona, $okolje);
167168

168169
$configPrenosnika = <<<EOT
169170
{
@@ -219,11 +220,12 @@ public function testPotrebnaElektricnaEnergija(): void
219220
$cona->steviloEtaz = 3;
220221
$cona->etaznaVisina = 3;
221222
$cona->notranjaTOgrevanje = 20;
222-
$cona->zunanjaT = -13;
223223
$cona->energijaOgrevanje = [1206.707, 746.368, 390.117, 135.734, 19.220, 0.000, 0.000, 0.000, 17.903, 179.496, 761.644, 1208.785];
224224
$cona->specTransmisijskeIzgube = 143.8765034039049;
225225
$cona->specVentilacijskeIzgube = 8.184;
226226

227+
$okolje = new \stdClass();
228+
$okolje->projektnaZunanjaT = -13;
227229

228230
$configSistem = <<<EOT
229231
{
@@ -233,7 +235,7 @@ public function testPotrebnaElektricnaEnergija(): void
233235
}
234236
EOT;
235237
$sistem = new ToplovodniOgrevalniSistem($configSistem);
236-
$sistem->init($cona);
238+
$sistem->init($cona, $okolje);
237239

238240
$configPrenosnika = <<<EOT
239241
{

0 commit comments

Comments
 (0)