Commit 36cb388a authored by Jana Fischereit's avatar Jana Fischereit

replace 'prognostic' by 'diagnostic' in the source code in accordance with the paper

parent dea6e12d
......@@ -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' (prognostic calculation of ts)).
% 'diagnostic' (diagnostic calculation of ts)).
% basis_pvf - Define basis of view factor calculation for person
% (valid are: 'Fanger',
% 'Fangerfast','Cannistraro')
......
......@@ -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' (prognostic calculation of ts)).
% 'diagnostic' (diagnostic 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_prognostic, to estimate wall and ground
% l_e_diagnostic, 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 'prognostic'
case 'diagnostic'
%
% iterative process of wall and ground together use Newton
% Approximation --> instantanous equilibrium, heat storage
......
......@@ -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' (prognostic calculation of ts)).
% 'diagnostic' (diagnostic 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('prognostic')};
expected_ts = {lower('prescribed'), lower('diagnostic')};
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')),'prognostic')
if strcmp(options.(lower('BASIS_TS')),'diagnostic')
if isnan(options.v_10) || isnan(options.bo)
error('You chose ''prognostic'' for BASIS_TS. Please provide wind speed (v_10) and Bowen ratio (bo)')
error('You chose ''diagnostic'' 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')))
......
......@@ -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','prognostic','v_10',2,'bo',0.5);
'TLam2',tlam2_cell{1,2}(month),'z_nn',z_nn,'BASIS_TS','diagnostic','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','prognostic','v_10',2,'bo',0.5);
'TLam2',tlam2_cell{1,2}(month),'z_nn',z_nn,'BASIS_TS','diagnostic','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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment