Merge branch 'master' into ecb-master+folder

time-shift
Stéphane Adjemian(Charybdis) 2018-07-11 11:08:04 +02:00
commit d7e0c5b868
1 changed files with 1 additions and 1 deletions

View File

@ -44,7 +44,7 @@ end
if original if original
jsonfil = loadjson([DynareModel.fname filesep() 'model' filesep() 'json' filesep() 'modfile-original.json']); jsonfil = loadjson([DynareModel.fname filesep() 'model' filesep() 'json' filesep() 'modfile-original.json']);
else else
jsonfil = loadjson([DynareModel.fname filesep() 'model' filesep() 'json' filesep() 'modfile.json'])); jsonfil = loadjson([DynareModel.fname filesep() 'model' filesep() 'json' filesep() 'modfile.json']);
end end
jsonmod = jsonfil.model; jsonmod = jsonfil.model;
jsoneqn = getEquationsByTags(jsonmod, 'name', eqname); jsoneqn = getEquationsByTags(jsonmod, 'name', eqname);