twrite elapsed and remaining time to status file - cosmo - front and backend for Markov-Chain Monte Carlo inversion of cosmogenic nuclide concentrations
(HTM) git clone git://src.adamsgaard.dk/cosmo
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 212f61573d02611aaccda37ce4d01a3b05cdd345
(DIR) parent 978bdc113cdce6d1845e7569af19ed3d027f8b33
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 29 Sep 2015 13:45:00 +0200
write elapsed and remaining time to status file
Diffstat:
M matlab/file_scanner_mcmc_starter.m | 7 ++++---
M matlab/mcmc_inversion.m | 8 +++++---
2 files changed, 9 insertions(+), 6 deletions(-)
---
(DIR) diff --git a/matlab/file_scanner_mcmc_starter.m b/matlab/file_scanner_mcmc_starter.m
t@@ -59,8 +59,8 @@ while 1
idstring = strsplit(infile, '_');
id = idstring(2);
-
- diary(char(strcat(infolder, '/status_', id)));
+ statusfile = char(strcat(infolder, '/status_', id));
+ diary(char(strcat(infolder, '/log_', id)));
if debug
disp(infile);
t@@ -90,7 +90,8 @@ while 1
epsilon_int_min, epsilon_int_max, ...
t_degla, t_degla_uncer, ...
record, ...
- record_threshold_min, record_threshold_max);
+ record_threshold_min, record_threshold_max, ...
+ statusfile);
% generate plots
%CompareWalks2(Ss, save_file)
(DIR) diff --git a/matlab/mcmc_inversion.m b/matlab/mcmc_inversion.m
t@@ -8,7 +8,8 @@ function [Ss, save_file] = mcmc_inversion(matlab_scripts_folder, debug, ...
epsilon_int_min, epsilon_int_max, ...
t_degla, t_degla_uncer, ...
record, ...
- record_threshold_min, record_threshold_max)
+ record_threshold_min, record_threshold_max, ...
+ statusfile)
%% mcmc_inversion.m
% function is called from `file_scanner_mcmc_starter.m`
t@@ -215,7 +216,7 @@ fs.Sampling = CompleteFsSampling(fs.Sampling);
fixed_stuff = fs;
fixed_stuff.StartTime = now; %This should allow the program to predict time of finish
-% AD: consider parfor for parallel computing
+% ANDERS: consider parfor for parallel computing
for iwalk=1:fixed_stuff.Nwalkers
iwalk
fixed_stuff.iwalk = iwalk; %Helps program keep user updated on progress.
t@@ -226,7 +227,8 @@ for iwalk=1:fixed_stuff.Nwalkers
seed = fixed_stuff.WalkerSeeds(iwalk);
isBurnIn=1;
[S.msBurnIn,S.acceptsBurnIn,S.QsBurnIn,S.QdsBurnIn,S.lump_MetHas_BurnIn]=MetHasLongstep4(...
- m_starts(:,iwalk),seed,isBurnIn,fixed_stuff);
+ m_starts(:,iwalk),seed,isBurnIn,fixed_stuff, ...
+ statusfile); %%%% ADDED BY ANDERS
mStartSampling = S.msBurnIn(:,end);
%<<<<< ... End Burn in