stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'savecomputingtime' into 'master' 

Fix bug with oo_.time

See merge request Dynare/preprocessor!33
issue#70
Sébastien Villemot 2021-02-04 16:01:00 +00:00
parent 702cf62ee3 f7cd6dbf0a
commit 1865f6536b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ModFile.cc
View File

@ -1075,6 +1075,11 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global,
static_model.writeAuxVarInitval(mOutputFile, ExprNodeOutputType::matlabOutsideModel);
}
if (!notime)
mOutputFile << endl << endl
<< "oo_.time = toc(tic0);" << endl
<< "disp(['Total computing time : ' dynsec2hms(oo_.time) ]);" << endl;
mOutputFile << "save('" << basename << "_results.mat', 'oo_', 'M_', 'options_');" << endl
<< "if exist('estim_params_', 'var') == 1" << endl
<< " save('" << basename << "_results.mat', 'estim_params_', '-append');" << endl << "end" << endl
@ -1091,11 +1096,6 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global,
config_file.writeEndParallel(mOutputFile);
if (!notime)
mOutputFile << endl << endl
<< "oo_.time = toc(tic0);" << endl
<< "disp(['Total computing time : ' dynsec2hms(oo_.time) ]);" << endl;
if (!no_warn)
{
if (warnings.countWarnings() > 0)