From 5ccd5f2613c6c3a63908c9683e39e633453f7748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 16 Jun 2022 18:05:14 +0200
Subject: [PATCH] Revert "More explicit message when the Dulmage-Mendelsohn
decomposition returns a non-square block"
This reverts commit fa71d4712d4d5a61c3d56efa1017dba7825ba7bf.
Ref. #1851
---
matlab/dynare_solve.m | 3 ---
mex/sources/block_trust_region/mexFunction.f08 | 4 +---
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/matlab/dynare_solve.m b/matlab/dynare_solve.m
index efac88c3a4..adc7f02e42 100644
--- a/matlab/dynare_solve.m
+++ b/matlab/dynare_solve.m
@@ -229,9 +229,6 @@ elseif ismember(options.solve_algo, [2, 12, 4])
fre = false;
for i=length(r)-1:-1:1
blocklength = r(i+1)-r(i);
- if s(i+1)-s(i) ~= blocklength
- error('DYNARE_SOLVE (solve_algo=2|4|12): the Dulmage-Mendelsohn decomposition returned a non-square block. This means that the Jacobian is singular. You may want to try another value for solve_algo.')
- end
if options.debug
dprintf('DYNARE_SOLVE (solve_algo=2|4|12): solving block %u of size %u.', i, blocklength);
end
diff --git a/mex/sources/block_trust_region/mexFunction.f08 b/mex/sources/block_trust_region/mexFunction.f08
index 512865c6e7..1092d42333 100644
--- a/mex/sources/block_trust_region/mexFunction.f08
+++ b/mex/sources/block_trust_region/mexFunction.f08
@@ -207,9 +207,7 @@ subroutine mexFunction(nlhs, plhs, nrhs, prhs) bind(c, name='mexFunction')
f_indices => blocks(i)%row_indices
x_all => x
if (size(x_indices) /= size(f_indices)) then
- call mexErrMsgTxt("DYNARE_SOLVE (solve_algo=13|14): the Dulmage-Mendelsohn &
- &decomposition returned a non-square block. This means that the &
- &Jacobian is singular. You may want to try another value for solve_algo.")
+ call mexErrMsgTxt("Non-square block")
end if
x_block = x(x_indices)
call trust_region_solve(x_block, matlab_fcn, info, tolx, tolf, maxiter, factor)
--
GitLab