From 5538bbab75d13dc303ea0a26b9a68a47dada053f Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Fri, 8 Mar 2024 16:10:08 +0100 Subject: [PATCH] need liuqe_version -1 for shot >=900000 --- matlab/TCV/gdat_tcv.m | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m index 40a7ebd5..da75ccc2 100644 --- a/matlab/TCV/gdat_tcv.m +++ b/matlab/TCV/gdat_tcv.m @@ -337,12 +337,18 @@ end % special treatment for model shot=-1 or preparation shot >=900'000 begstr = ''; if (iscell(mapping_for_tcv.expression) || isempty(strfind(mapping_for_tcv.expression,'\rtc::'))) && ... - ~isempty(shot) && (shot==-1 || (shot>=900000 && shot <= 999999 ) || liuqe_version==-1 ) && ... - isempty(findstr(mapping_for_tcv.expression,'tcv_eq')) - % requires FBTE (if tcv_eq in expression, liuqe target will be modified to FBTE below with regexprep) + ~isempty(shot) && (shot==-1 || (shot>=900000 && shot <= 999999 ) || liuqe_version==-1 ) + % requires FBTE liuqe_version_eff = -1; - begstr = 'tcv_eq( "'; - substr_liuqe = '", "FBTE" )'; + liuqe_version = -1; + if isempty(findstr(mapping_for_tcv.expression,'tcv_eq')) + % if tcv_eq in expression, liuqe target will be modified to FBTE below with regexprep + begstr = 'tcv_eq( "'; + substr_liuqe = '", "FBTE" )'; + else + begstr = ''; + substr_liuqe = ''; + end end % should replace all above by just psitbx_str... -- GitLab