From 8b44731ef0a928d346fce869514ebb38f3386985 Mon Sep 17 00:00:00 2001 From: Marco Ratto Date: Wed, 6 Apr 2011 14:24:04 +0200 Subject: [PATCH] Fixed bug in remote parallel execution introduced by previous commit b7133ebeb5fc6b65f5b043dd42ede043de702a88 --- matlab/PosteriorIRF_core1.m | 13 ++++++++++++- matlab/prior_posterior_statistics_core.m | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/matlab/PosteriorIRF_core1.m b/matlab/PosteriorIRF_core1.m index b1c15f596..ea7782ea4 100644 --- a/matlab/PosteriorIRF_core1.m +++ b/matlab/PosteriorIRF_core1.m @@ -82,7 +82,18 @@ if whoiam end -MhDirectoryName = myinputs.MhDirectoryName; +% MhDirectoryName = myinputs.MhDirectoryName; +if strcmpi(type,'posterior') + MhDirectoryName = CheckPath('metropolis'); +elseif strcmpi(type,'gsa') + if options_.opt_gsa.pprior + MhDirectoryName = CheckPath(['GSA' filesep 'prior']); + else + MhDirectoryName = CheckPath(['GSA' filesep 'mc']); + end +else + MhDirectoryName = CheckPath('prior'); +end RemoteFlag = 0; diff --git a/matlab/prior_posterior_statistics_core.m b/matlab/prior_posterior_statistics_core.m index d332da95e..8dfc1ea0d 100644 --- a/matlab/prior_posterior_statistics_core.m +++ b/matlab/prior_posterior_statistics_core.m @@ -95,7 +95,18 @@ if whoiam Parallel=myinputs.Parallel; end -DirectoryName = myinputs.DirectoryName; +% DirectoryName = myinputs.DirectoryName; +if strcmpi(type,'posterior') + DirectoryName = CheckPath('metropolis'); +elseif strcmpi(type,'gsa') + if options_.opt_gsa.pprior + DirectoryName = CheckPath(['GSA',filesep,'prior']); + else + DirectoryName = CheckPath(['GSA',filesep,'mc']); + end +elseif strcmpi(type,'prior') + DirectoryName = CheckPath('prior'); +end RemoteFlag = 0; if whoiam