From 396267260ac15375a0949a149f09f4613c74731c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 15 Jun 2023 15:49:17 +0200
Subject: [PATCH] Block solvers: improvement to error messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
– Do not mention internal options_ structure
– Remain agnostic about whether we are in a steady state or a deterministic simulation
[skip ci]
---
matlab/solve_one_boundary.m | 8 ++++----
matlab/solve_two_boundaries.m | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/matlab/solve_one_boundary.m b/matlab/solve_one_boundary.m
index 2c265e109f..0d49b58f5c 100644
--- a/matlab/solve_one_boundary.m
+++ b/matlab/solve_one_boundary.m
@@ -152,9 +152,9 @@ for it_=start:incr:finish
else
if verbose
if cutoff==0
- fprintf('Error in simul: Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "options_.simul.maxit".\n',Block_Num, it_, iter);
+ fprintf('Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "maxit".\n',Block_Num, it_, iter);
else
- fprintf('Error in simul: Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "options_.simul.maxit" or set "cutoff=0" in model options.\n',Block_Num, it_, iter);
+ fprintf('Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "maxit" or set "cutoff=0" in model options.\n',Block_Num, it_, iter);
end
end
success = false;
@@ -273,9 +273,9 @@ for it_=start:incr:finish
if ~cvg
if verbose
if cutoff == 0
- fprintf('Error in simul: Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "options_.simul.maxit\".\n',Block_Num, it_,iter);
+ fprintf('Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "maxit".\n',Block_Num, it_,iter);
else
- fprintf('Error in simul: Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "options_.simul.maxit" or set "cutoff=0" in model options.\n',Block_Num, it_,iter);
+ fprintf('Convergence not achieved in block %d, at time %d, after %d iterations.\n Increase "maxit" or set "cutoff=0" in model options.\n',Block_Num, it_,iter);
end
end
success = false;
diff --git a/matlab/solve_two_boundaries.m b/matlab/solve_two_boundaries.m
index 248b87d875..416d6fbb7b 100644
--- a/matlab/solve_two_boundaries.m
+++ b/matlab/solve_two_boundaries.m
@@ -147,9 +147,9 @@ while ~(cvg || iter>maxit_)
else
if verbose
if cutoff==0
- fprintf('Error in simul: Convergence not achieved in block %d, after %d iterations.\n Increase "options_.simul.maxit".\n',Block_Num, iter);
+ fprintf('Convergence not achieved in block %d, after %d iterations.\n Increase "maxit".\n',Block_Num, iter);
else
- fprintf('Error in simul: Convergence not achieved in block %d, after %d iterations.\n Increase "options_.simul.maxit" or set "cutoff=0" in model options.\n',Block_Num, iter);
+ fprintf('Convergence not achieved in block %d, after %d iterations.\n Increase "maxit" or set "cutoff=0" in model options.\n',Block_Num, iter);
end
end
success = false;
--
GitLab