From 453b75302105713c8cdbe569e854d18b04a03a93 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Tue, 29 Nov 2016 16:43:04 +0100
Subject: [PATCH] block: fix bug introduced in
e410043c244d251164638f9a0b3646e23e3d125d. #1245
---
DynamicModel.cc | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/DynamicModel.cc b/DynamicModel.cc
index 070fe0ce..5f97154d 100644
--- a/DynamicModel.cc
+++ b/DynamicModel.cc
@@ -1836,7 +1836,6 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri
bool open_par = false;
mDynamicModelFile << "function [varargout] = " << dynamic_basename << "(options_, M_, oo_, varargin)\n";
- mDynamicModelFile << " varargout{1} = NaN;\n";
mDynamicModelFile << " g2=[];g3=[];\n";
//Temporary variables declaration
OK = true;
@@ -2003,6 +2002,8 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri
mDynamicModelFile << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);\n";
mDynamicModelFile << " if any(isnan(tmp) | isinf(tmp))\n";
mDynamicModelFile << " disp(['Inf or Nan value during the evaluation of block " << block <<"']);\n";
+ mDynamicModelFile << " oo_.deterministic_simulation.error = 100;\n";
+ mDynamicModelFile << " varargout{1} = oo_;\n";
mDynamicModelFile << " return;\n";
mDynamicModelFile << " end;\n";
}
@@ -2028,6 +2029,8 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri
mDynamicModelFile << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);\n";
mDynamicModelFile << " if any(isnan(tmp) | isinf(tmp))\n";
mDynamicModelFile << " disp(['Inf or Nan value during the evaluation of block " << block <<"']);\n";
+ mDynamicModelFile << " oo_.deterministic_simulation.error = 100;\n";
+ mDynamicModelFile << " varargout{1} = oo_;\n";
mDynamicModelFile << " return;\n";
mDynamicModelFile << " end;\n";
}
@@ -2057,6 +2060,8 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri
mDynamicModelFile << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);\n";
mDynamicModelFile << " if any(isnan(tmp) | isinf(tmp))\n";
mDynamicModelFile << " disp(['Inf or Nan value during the resolution of block " << block <<"']);\n";
+ mDynamicModelFile << " oo_.deterministic_simulation.error = 100;\n";
+ mDynamicModelFile << " varargout{1} = oo_;\n";
mDynamicModelFile << " return;\n";
mDynamicModelFile << " end;\n";
}
@@ -2087,6 +2092,8 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri
mDynamicModelFile << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);\n";
mDynamicModelFile << " if any(isnan(tmp) | isinf(tmp))\n";
mDynamicModelFile << " disp(['Inf or Nan value during the resolution of block " << block <<"']);\n";
+ mDynamicModelFile << " oo_.deterministic_simulation.error = 100;\n";
+ mDynamicModelFile << " varargout{1} = oo_;\n";
mDynamicModelFile << " return;\n";
mDynamicModelFile << " end;\n";
}
@@ -2117,6 +2124,8 @@ DynamicModel::writeSparseDynamicMFile(const string &dynamic_basename, const stri
mDynamicModelFile << " tmp = y(:,M_.block_structure.block(" << block + 1 << ").variable);\n";
mDynamicModelFile << " if any(isnan(tmp) | isinf(tmp))\n";
mDynamicModelFile << " disp(['Inf or Nan value during the resolution of block " << block <<"']);\n";
+ mDynamicModelFile << " oo_.deterministic_simulation.error = 100;\n";
+ mDynamicModelFile << " varargout{1} = oo_;\n";
mDynamicModelFile << " return;\n";
mDynamicModelFile << " end;\n";
}
--
GitLab