Skip to content
Snippets Groups Projects
Commit 339586f8 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

rm some check if NaNs since should take dims into account better

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5087 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 41998a83
No related branches found
No related tags found
No related merge requests found
...@@ -455,14 +455,14 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -455,14 +455,14 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
% compute average minor or major radius (on z=zaxis normally) % compute average minor or major radius (on z=zaxis normally)
nodenameeff=['\results::r_max_psi' substr_liuqe]; nodenameeff=['\results::r_max_psi' substr_liuqe];
rmaxpsi=tdi(nodenameeff); rmaxpsi=tdi(nodenameeff);
if isempty(rmaxpsi.data) || isempty(rmaxpsi.dim) || ~any(~isnan(rmaxpsi.data)) % || ischar(rmaxpsi.data) (to add?) if isempty(rmaxpsi.data) || isempty(rmaxpsi.dim) || any(~any(~isnan(rmaxpsi.data))) % || ischar(rmaxpsi.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end
return return
end end
nodenameeff2=['\results::r_min_psi' substr_liuqe]; nodenameeff2=['\results::r_min_psi' substr_liuqe];
rminpsi=tdi(nodenameeff2); rminpsi=tdi(nodenameeff2);
if isempty(rminpsi.data) || isempty(rminpsi.dim) || ~any(~isnan(rminpsi.data)) % || ischar(rminpsi.data) (to add?) if isempty(rminpsi.data) || isempty(rminpsi.dim) || any(~any(~isnan(rminpsi.data))) % || ischar(rminpsi.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end
return return
...@@ -493,7 +493,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -493,7 +493,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
% compute average minor or major radius (on z=zaxis normally) % compute average minor or major radius (on z=zaxis normally)
nodenameeff=['\results::z_contour' substr_liuqe]; nodenameeff=['\results::z_contour' substr_liuqe];
zcontour=tdi(nodenameeff); zcontour=tdi(nodenameeff);
if isempty(zcontour.data) || isempty(zcontour.dim) || ~any(~isnan(zcontour.data)) % || ischar(zcontour.data) (to add?) if isempty(zcontour.data) || isempty(zcontour.dim) % || ischar(zcontour.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end
return return
...@@ -999,7 +999,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -999,7 +999,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
% At this stage fill just ech, later add nbi % At this stage fill just ech, later add nbi
nodenameeff='\results::toray.input:p_gyro'; nodenameeff='\results::toray.input:p_gyro';
tracetdi=tdi(nodenameeff); tracetdi=tdi(nodenameeff);
if isempty(tracetdi.data) || isempty(tracetdi.dim) || ~any(~isnan(tracetdi.data)) % || ischar(tracetdi.data) (to add?) if isempty(tracetdi.data) || isempty(tracetdi.dim) % || ischar(tracetdi.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
return return
end end
...@@ -1049,7 +1049,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -1049,7 +1049,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
nodenameeff=[begstr 'q_psi' substr_liuqe]; nodenameeff=[begstr 'q_psi' substr_liuqe];
end end
tracetdi=tdi(nodenameeff); tracetdi=tdi(nodenameeff);
if isempty(tracetdi.data) || isempty(tracetdi.dim) || ~any(~isnan(tracetdi.data)) % || ischar(tracetdi.data) (to add?) if isempty(tracetdi.data) || isempty(tracetdi.dim) % || ischar(tracetdi.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end
return return
...@@ -1097,7 +1097,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -1097,7 +1097,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
params_eff = gdat_data.gdat_params; params_eff = gdat_data.gdat_params;
params_eff.data_request='q_rho'; params_eff.data_request='q_rho';
q_rho=gdat_tcv([],params_eff); q_rho=gdat_tcv([],params_eff);
if isempty(q_rho.data) || isempty(q_rho.dim) || ~any(~isnan(q_rho.data)) % || ischar(q_rho.data) (to add?) if isempty(q_rho.data) || isempty(q_rho.dim) % || ischar(q_rho.data) (to add?)
if (gdat_params.nverbose>=1); warning(['problems loading data for q_rho for data_request= ' data_request_eff]); end if (gdat_params.nverbose>=1); warning(['problems loading data for q_rho for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end
return return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment