Skip to content

Commit 2aee0a3

Browse files
malamalcamalamalca
committed
Stan Fixes, adiabatic areas, multiple windows
1 parent b667440 commit 2aee0a3

File tree

8 files changed

+62
-14
lines changed

8 files changed

+62
-14
lines changed

‎src/Calc/GF/Cone/Cona.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ protected function parseConfig($config)
279279

280280
// če se okno vgrajuje v NT element, odštejem površino okna
281281
if (!empty($elementVgradnje)) {
282-
$elementVgradnje->povrsina -= $tKons->povrsina;
282+
$elementVgradnje->povrsina -= ($tKons->povrsina * $tKons->stevilo);
283283
}
284284
}
285285
}

‎src/Calc/GF/Cone/ElementiOvoja/NetransparentenElementOvoja.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class NetransparentenElementOvoja extends ElementOvoja
1818

1919
// lahko se overrida določilo iz TSG
2020
public ?bool $dobitekSS;
21+
public ?bool $adiabatno;
2122

2223
// velja za konstrukcije v stiku z zemljino
2324
public ?float $obseg;
@@ -66,6 +67,10 @@ protected function parseConfig($config)
6667
$this->dobitekSS = $config->dobitekSS;
6768
}
6869

70+
if (isset($config->adiabatno)) {
71+
$this->adiabatno = $config->adiabatno;
72+
}
73+
6974
if (isset($config->idKonstrukcije)) {
7075
$this->idKonstrukcije = $config->idKonstrukcije;
7176
}
@@ -195,6 +200,17 @@ public function analiza($cona, $okolje)
195200
$stDni = cal_days_in_month(CAL_GREGORIAN, $mesec + 1, 2023);
196201
if ($this->konstrukcija->TSG->tip == 'zunanja') {
197202
// konstrukcija proti zraku
203+
$adiabatno = !empty($this->konstrukcija->TSG->adiabatno);
204+
if (isset($this->adiabatno)) {
205+
$adiabatno = $this->adiabatno;
206+
}
207+
if ($adiabatno) {
208+
$this->transIzgubeOgrevanje[$mesec] = 0;
209+
$this->transIzgubeHlajenje[$mesec] = 0;
210+
$this->solarniDobitkiOgrevanje[$mesec] = 0;
211+
$this->solarniDobitkiHlajenje[$mesec] = 0;
212+
continue;
213+
}
198214
$this->transIzgubeOgrevanje[$mesec] = $this->H_ogrevanje * 24 / 1000 *
199215
$cona->deltaTOgrevanje[$mesec] * $stDni * $this->stevilo;
200216

‎src/Calc/GF/Cone/KlasifikacijeCone/VecstanovanjskaKlasifikacijaCone.php‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,28 @@ public function izracunTSVZaMesec(int $mesec, Cona $cona): float
2424
$hladnaVodaT = $this->TSV->hladnaVodaT ?? $this->hladnaVodaT;
2525

2626
if (empty($cona->TSV->steviloOseb)) {
27+
// EN 12831-3:2017 B.3
2728
if ($cona->ogrevanaPovrsina > 50) {
28-
$steviloOseb = 0.035 * $cona->ogrevanaPovrsina;
29-
if ($steviloOseb > 1.75) {
30-
$steviloOseb = 1.75 + 0.3 * (0.035 * $cona->ogrevanaPovrsina - 1.75);
31-
}
29+
$steviloOsebEq = 0.035 * $cona->ogrevanaPovrsina;
30+
} elseif ($cona->ogrevanaPovrsina < 10) {
31+
$steviloOsebEq = 1.0;
3232
} else {
33-
$steviloOseb = 1.75 - 0.01875 * (50 - $cona->ogrevanaPovrsina);
34-
if ($steviloOseb > 1.75) {
35-
$steviloOseb = 1.75 + 0.3 * (0.035 * $cona->ogrevanaPovrsina - 1.75);
36-
}
33+
$steviloOsebEq = 1.75 - 0.01875 * (50 - $cona->ogrevanaPovrsina);
3734
}
35+
if ($steviloOsebEq > 1.75) {
36+
$steviloOseb = 1.75 + 0.3 * ($steviloOsebEq - 1.75);
37+
} else {
38+
$steviloOseb = $steviloOsebEq;
39+
}
40+
41+
$cona->TSV->steviloOseb = $steviloOseb;
3842
} else {
3943
$steviloOseb = $cona->TSV->steviloOseb;
4044
}
4145

4246
if (empty($cona->TSV->dnevnaKolicina)) {
4347
$dnevnaKolicina = min(40.71, 3.26 * $cona->ogrevanaPovrsina / $steviloOseb);
48+
$cona->TSV->dnevnaKolicina = $dnevnaKolicina;
4449
} else {
4550
$dnevnaKolicina = $cona->TSV->dnevnaKolicina;
4651
}

‎src/Calc/Hrup/ZunanjiHrup/Fasada.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ protected function parseConfig($config)
116116
fn($k) => $k->id == $oknaVrataConfig->idElementaVgradnje
117117
);
118118
if ($konstrukcijaVgradnje) {
119-
$konstrukcijaVgradnje->povrsina -= $oknaVrata->povrsina * $oknaVrata->stevilo;
120-
$this->povrsina -= $oknaVrata->povrsina * $oknaVrata->stevilo;
119+
$konstrukcijaVgradnje->povrsina -= ($oknaVrata->povrsina * $oknaVrata->stevilo);
120+
$this->povrsina -= ($oknaVrata->povrsina * $oknaVrata->stevilo);
121121
}
122122
}
123123
}

‎src/Controller/AppController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public function projectImage($conaId, $projectId, $fileName)
2727
$finfo = finfo_open(FILEINFO_MIME_TYPE); // Return MIME type a la the 'mimetype' extension
2828
if ($finfo && $fullPath) {
2929
$mime = finfo_file($finfo, $fullPath);
30-
finfo_close($finfo);
3130

3231
header('Content-Type: ' . $mime);
3332
readfile($fullPath);

‎templates/Pures/Cone/analiza.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,35 @@
103103
<td class="center"><?= $this->numFormat($cona->volumenZrakaHlajenje, 1) ?></td>
104104
<td>m³/h</td>
105105
</tr>
106+
<?php
107+
if (!empty($cona->TSV)) {
108+
?>
109+
<tr>
110+
<td colspan="4">TSV: </td>
111+
</tr>
112+
<?php
113+
if (!empty($cona->TSV->steviloOseb)) {
114+
?>
115+
<tr>
116+
<td>- št. oseb: </td>
117+
<td>n<sub>P,eq</sub></td>
118+
<td class="center"><?= $this->numFormat($cona->TSV->steviloOseb, 1) ?></td>
119+
<td>-</td>
120+
</tr>
121+
<?php
122+
}
123+
if (!empty($cona->TSV->dnevnaKolicina)) {
124+
?>
125+
<tr>
126+
<td>- dnevna količina: </td>
127+
<td>V<sub>W,P,day</sub></td>
128+
<td class="center"><?= $this->numFormat($cona->TSV->dnevnaKolicina, 1) ?></td>
129+
<td>L</td>
130+
</tr>
131+
<?php
132+
}
133+
}
134+
?>
106135
</table>
107136
<h1>Analiza cone "<?= h($cona->naziv) ?>"</h1>
108137
<table border="1">

‎templates/Pures/Projekti/analiza.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<td>kWh/m²an</td>
165165
</tr>
166166
<tr class="noprint">
167-
<td colspan="<?= ($stavba->vrsta == 'zahtevna') ? 5 : 4 ?>" class="math">`Q'_(H,nd,dov,an)= 25 (kWh)/(m^2an)`</td>
167+
<td colspan="<?= ($stavba->vrsta == 'zahtevna') ? 5 : 4 ?>" class="math">`Q'_(H,nd,dov,an)= <?= $this->numFormat($stavba->X_Hnd, 1) ?> × 25 (kWh)/(m^2an) = <?= $this->numFormat($stavba->dovoljenaSpecLetnaToplota, 1) ?> (kWh)/(m^2an)`</td>
168168
</tr>
169169
<tr>
170170
<td class="right">X<sub>H,nd</sub></td>

‎webroot/index.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
if ($finfo && $fullPath) {
4040
$extension = strtolower(pathinfo($fullPath, PATHINFO_EXTENSION));
4141
$mime = finfo_file($finfo, $fullPath);
42-
finfo_close($finfo);
4342

4443
switch($extension){
4544
case 'css':

0 commit comments

Comments
 (0)