Skip to content
Snippets Groups Projects
Commit 90e3c5d8 authored by Cristian Galperti's avatar Cristian Galperti
Browse files

first matlab -> MDS -> matlab round trip ok on scdds shot 2

parent f93d17b7
No related branches found
No related tags found
No related merge requests found
...@@ -13,15 +13,15 @@ obj=obj.addfpinitfcn('algo_template_loadfp','algo_template_fp'); ...@@ -13,15 +13,15 @@ obj=obj.addfpinitfcn('algo_template_loadfp','algo_template_fp');
obj=obj.addtunparamstruct('algo_template_tp', @()algo_template_loadtp(), false); obj=obj.addtunparamstruct('algo_template_tp', @()algo_template_loadtp(), false);
%% Tunable parameters %% Tunable parameters
parshot=-1; parshot=2;
mdsserver='scd.epfl.ch'; mdsserver='scd.epfl.ch';
mdstree ='scdds'; mdstree ='scdds';
obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kb1','enable' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot)); obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.enable' ,'enable' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.ks1','gain' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot)); obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.gain' ,'gain' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.ks2','refmodel.gain' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot)); obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.refmodel.gain' ,'refmodel.gain' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kv1','rowvect' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot)); obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.rowvect' ,'rowvect' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kv2','colvect' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot)); obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.colvect' ,'colvect' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.km1','matrix' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot)); obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.matrix' ,'matrix' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
%% 2nd tunable parameters structure/parameters %% 2nd tunable parameters structure/parameters
% obj=obj.addtunparamstruct('algo_template_tp2', @()algo_template_loadtp(), false); % obj=obj.addtunparamstruct('algo_template_tp2', @()algo_template_loadtp(), false);
......
...@@ -805,6 +805,24 @@ classdef SCDclass_algo ...@@ -805,6 +805,24 @@ classdef SCDclass_algo
function load(obj) function load(obj)
load_system(obj.modelname); load_system(obj.modelname);
end end
function updatemds(obj, shot)
%if shot~=-1
% error('SCDclass_expcode:updatemds','update permitted only on the model shot');
%end
% % first update algorithm tunparams default locally
% for ii=1:numel(obj.algonamelist)
% if strcmp(algo, obj.algonamelist{ii})
% obj.algos{ii}.updatetemplatetp();
% end
% end
% % then update mds
obj.mdscontainer.modeltogenerate=obj.modelname;
obj.mdscontainer.autopopulateMDSparams(shot);
obj.mdscontainer.autopopulateMDSwavegens(shot);
end
end end
methods(Static,Hidden=true) methods(Static,Hidden=true)
......
...@@ -357,22 +357,27 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous ...@@ -357,22 +357,27 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
retval=mdsput(node, writeval, 'x'); retval=mdsput(node, writeval, 'x');
if isnumeric(retval) if isnumeric(retval)
if ~rem(retval,2) if ~rem(retval,2)
warning('SCDclass_mdspar:MDSerror','Error writing node build_param.'); warning('SCDclass_mdspar:MDSerror','Error writing node build_param. %s',mdsdata('GetMsg($1)',retval));
end end
else else
warning('SCDclass_mdspar:MDSerror','Error writing node build_param.'); warning('SCDclass_mdspar:MDSerror','Error writing node build_param. %s',retval);
end end
retval=mdsput(nodecom, obj.mdshelpstr); retval=mdsput(nodecom, obj.mdshelpstr);
if isnumeric(retval) if isnumeric(retval)
if ~rem(retval,2) if ~rem(retval,2)
warning('SCDclass_mdspar:MDSerror','Error writing node comment.'); warning('SCDclass_mdspar:MDSerror','Error writing node comment. %s',mdsdata('GetMsg($1)',retval));
end end
else else
warning('SCDclass_mdspar:MDSerror','Error writing node comment.'); warning('SCDclass_mdspar:MDSerror','Error writing node comment. %s',retval);
end end
writeval=obj.casttomds(val); writeval=obj.casttomds(val);
% logical type conversion
if islogical(writeval), writeval=uint8(writeval); end
mdsput(nodeval, writeval); mdsput(nodeval, writeval);
checkval=mdsvalueraw(nodeval); checkval=mdsvalueraw(nodeval);
if ~any(writeval==checkval) if ~any(writeval==checkval)
......
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