From 3d539304331d14ab0d3f1bb6e3e0f2763fe272ec Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Fri, 8 Mar 2024 08:52:57 +0100 Subject: [PATCH] do not add tcv_eq if in expresion --- matlab/TCV/gdat_tcv.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m index b3f2a162..40a7ebd5 100644 --- a/matlab/TCV/gdat_tcv.m +++ b/matlab/TCV/gdat_tcv.m @@ -337,8 +337,9 @@ 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 ) - % requires FBTE + ~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) liuqe_version_eff = -1; begstr = 'tcv_eq( "'; substr_liuqe = '", "FBTE" )'; -- GitLab