From 38f91d3e2047e04a7d3abf884e474aa1682a9b4a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 13 Nov 2015 15:55:04 +0000
Subject: [PATCH] fix rnmin/max psi
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5266 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index b0992745..9218a6be 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -454,15 +454,19 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
% compute average minor or major radius (on z=zaxis normally)
nodenameeff=['\results::r_max_psi' substr_liuqe];
rmaxpsi=tdi(nodenameeff);
- if isempty(rmaxpsi.data) || isempty(rmaxpsi.dim) || any(~any(~isnan(rmaxpsi.data))) % || ischar(rmaxpsi.data) (to add?)
+ ijnan = find(isnan(rmaxpsi.data));
+ if isempty(rmaxpsi.data) || isempty(rmaxpsi.dim) || ischar(rmaxpsi.data) || ...
+ ( ~isempty(ijnan) && prod(size(ijnan))==prod(size(rmaxpsi.data)) )
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
return
end
nodenameeff2=['\results::r_min_psi' substr_liuqe];
rminpsi=tdi(nodenameeff2);
- 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
+ ijnan = find(isnan(rminpsi.data));
+ if isempty(rminpsi.data) || isempty(rminpsi.dim) || ...
+ ( ~isempty(ijnan) && prod(size(ijnan))==prod(size(rminpsi.data)) )
+ if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff2 ' for data_request= ' data_request_eff]); end
if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end
return
end
--
GitLab