Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SURM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Operations
Operations
Metrics
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
surm
SURM
Commits
36cb388a
Commit
36cb388a
authored
Sep 01, 2020
by
Jana Fischereit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace 'prognostic' by 'diagnostic' in the source code in accordance with the paper
parent
dea6e12d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
model/calcTmrt.m
model/calcTmrt.m
+1
-1
model/se_calc_lon_morph.m
model/se_calc_lon_morph.m
+3
-3
model/se_parse_Input2.m
model/se_parse_Input2.m
+4
-4
tests/plausibility_checks.m
tests/plausibility_checks.m
+3
-3
No files found.
model/calcTmrt.m
View file @
36cb388a
...
...
@@ -62,7 +62,7 @@ function[tmrt, varargout]=calcTmrt(h, w, ori,...
% walls ('prescribed' (prescribed values for
% sun-lit wall and ground during the day and
% entire surfaces during the night) and
% '
prognostic' (pro
gnostic calculation of ts)).
% '
diagnostic' (dia
gnostic calculation of ts)).
% basis_pvf - Define basis of view factor calculation for person
% (valid are: 'Fanger',
% 'Fangerfast','Cannistraro')
...
...
model/se_calc_lon_morph.m
View file @
36cb388a
...
...
@@ -12,7 +12,7 @@ function[E_g, E_w, T_g, T_w]=se_calc_lon_morph(basis_ts,T_gi,T_wi,T_a2m,epsilon_
% walls ('prescribed' (prescribed values for
% sun-lit wall and ground during the day and
% entire surfaces during the night) and
% '
prognostic' (pro
gnostic calculation of ts)).
% '
diagnostic' (dia
gnostic calculation of ts)).
% T_gi - Temperature of ground (mean, initial, [K])
% T_wi - Temperature of wall (mean, initial, [K])
% T_a2m - Temperature in 2m [K]
...
...
@@ -31,7 +31,7 @@ function[E_g, E_w, T_g, T_w]=se_calc_lon_morph(basis_ts,T_gi,T_wi,T_a2m,epsilon_
% both, with respect to N-S canyon)
% alpha_w - Mean albedo of walls
% v_10 - wind speed in 10 m, only used if
% l_e_
pro
gnostic, to estimate wall and ground
% l_e_
dia
gnostic, to estimate wall and ground
% temperature [m/s]
% bo_g - Bowen ratio: 0.6 grass, 1.3 urban
% h - Building height [m]
...
...
@@ -68,7 +68,7 @@ function[E_g, E_w, T_g, T_w]=se_calc_lon_morph(basis_ts,T_gi,T_wi,T_a2m,epsilon_
E_w
(
1
)
=
epsilon_w
*
sigma
*
T_w
(
1
)
^
4
;
E_w
(
2
)
=
epsilon_w
*
sigma
*
T_w
(
2
)
^
4
;
E_w
(
3
)
=
epsilon_w
*
sigma
*
T_w
(
3
)
^
4
;
case
'
pro
gnostic'
case
'
dia
gnostic'
%
% iterative process of wall and ground together use Newton
% Approximation --> instantanous equilibrium, heat storage
...
...
model/se_parse_Input2.m
View file @
36cb388a
...
...
@@ -35,7 +35,7 @@ function[T_w, T_g, v_10, TLam2, bo, z_nn, ...
% walls ('prescribed' (prescribed values for
% sun-lit wall and ground during the day and
% entire surfaces during the night) and
% '
prognostic' (pro
gnostic calculation of ts)).
% '
diagnostic' (dia
gnostic calculation of ts)).
% basis_pvf - Define basis of view factor calculation for person
% (valid are: 'Fanger',
% 'Fangerfast','Cannistraro')
...
...
@@ -48,7 +48,7 @@ function[T_w, T_g, v_10, TLam2, bo, z_nn, ...
expected_diff_rad
=
{
lower
(
'MITRAS'
),
lower
(
'vdi1994'
),
lower
(
'esra'
)};
expected_dir_rad
=
{
lower
(
'MITRAS'
),
lower
(
'vdi1994'
),
lower
(
'esra'
)};
expected_lw_sky
=
{
lower
(
'MITRAS'
),
lower
(
'Idso1981'
),
lower
(
'vdi3789'
)};
expected_ts
=
{
lower
(
'prescribed'
),
lower
(
'
pro
gnostic'
)};
expected_ts
=
{
lower
(
'prescribed'
),
lower
(
'
dia
gnostic'
)};
expected_pvf
=
{
lower
(
'Fanger'
),
lower
(
'Fangerfast'
),
lower
(
'Cannistraro'
)};
% Defaults
%
...
...
@@ -104,9 +104,9 @@ function[T_w, T_g, v_10, TLam2, bo, z_nn, ...
end
%
% check consistency:
if
strcmp
(
options
.
(
lower
(
'BASIS_TS'
)),
'
pro
gnostic'
)
if
strcmp
(
options
.
(
lower
(
'BASIS_TS'
)),
'
dia
gnostic'
)
if
isnan
(
options
.
v_10
)
||
isnan
(
options
.
bo
)
error
(
'You chose
''
pro
gnostic
''
for BASIS_TS. Please provide wind speed (v_10) and Bowen ratio (bo)'
)
error
(
'You chose
''
dia
gnostic
''
for BASIS_TS. Please provide wind speed (v_10) and Bowen ratio (bo)'
)
end
else
if
isnan
(
options
.
(
lower
(
'T_w'
)))
||
isnan
(
options
.
(
lower
(
'T_g'
)))
...
...
tests/plausibility_checks.m
View file @
36cb388a
...
...
@@ -88,7 +88,7 @@ for iori = 1:length(ori)
phi
,
jd
,
hour
,
...
alpha_k
,
epsilon_p
,
pos_rel
,
...
'T_w'
,
T_w_init
,
'T_g'
,
T_g_init
,
...
'TLam2'
,
tlam2_cell
{
1
,
2
}(
month
),
'z_nn'
,
z_nn
,
'BASIS_TS'
,
'
pro
gnostic'
,
'v_10'
,
2
,
'bo'
,
0.5
);
'TLam2'
,
tlam2_cell
{
1
,
2
}(
month
),
'z_nn'
,
z_nn
,
'BASIS_TS'
,
'
dia
gnostic'
,
'v_10'
,
2
,
'bo'
,
0.5
);
end
end
test
(
1
)
=
max
(
max
(
tmrt
))
==
min
(
min
(
tmrt
));
...
...
@@ -106,7 +106,7 @@ for iori = 1:length(ori)
phi
,
jd
,
hour
(
ihour
),
...
alpha_k
,
epsilon_p
,
pos_rel
,
...
'T_w'
,
T_w_init
,
'T_g'
,
T_g_init
,
...
'TLam2'
,
tlam2_cell
{
1
,
2
}(
month
),
'z_nn'
,
z_nn
,
'BASIS_TS'
,
'
pro
gnostic'
,
'v_10'
,
2
,
'bo'
,
0.5
);
'TLam2'
,
tlam2_cell
{
1
,
2
}(
month
),
'z_nn'
,
z_nn
,
'BASIS_TS'
,
'
dia
gnostic'
,
'v_10'
,
2
,
'bo'
,
0.5
);
end
end
%% checks
...
...
@@ -145,4 +145,4 @@ if (all(test))
else
disp
(
'ATTENTION! Some test have failed.'
)
test
end
\ No newline at end of file
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment