From 61e6e80b5a92a0802c7049fb20e18dafc6be5730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= Date: Tue, 22 Mar 2016 16:04:33 +0100 Subject: [PATCH] Allow irf_shocks in DSGE-VAR models. --- doc/dynare.texi | 3 +-- preprocessor/ComputingTasks.cc | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/doc/dynare.texi b/doc/dynare.texi index bfdeb6be6..94278ba68 100644 --- a/doc/dynare.texi +++ b/doc/dynare.texi @@ -5624,8 +5624,7 @@ using a standard Kalman filter. @xref{irf}. Only used if @ref{bayesian_irf} is passed. @item irf_shocks = ( @var{VARIABLE_NAME} [[,] @var{VARIABLE_NAME} @dots{}] ) -@xref{irf_shocks}. Only used if @ref{bayesian_irf} is passed. Cannot be used -with @ref{dsge_var}. +@xref{irf_shocks}. Only used if @ref{bayesian_irf} is passed. @item irf_plot_threshold = @var{DOUBLE} @xref{irf_plot_threshold}. Only used if @ref{bayesian_irf} is passed. diff --git a/preprocessor/ComputingTasks.cc b/preprocessor/ComputingTasks.cc index c84e3b6b3..9fd1e816b 100644 --- a/preprocessor/ComputingTasks.cc +++ b/preprocessor/ComputingTasks.cc @@ -559,13 +559,6 @@ EstimationStatement::checkPass(ModFileStructure &mod_file_struct, WarningConsoli it = options_list.num_options.find("dsge_var"); if (it != options_list.num_options.end()) - // Ensure that irf_shocks & dsge_var have not both been passed - if (options_list.symbol_list_options.find("irf_shocks") != options_list.symbol_list_options.end()) - { - cerr << "The irf_shocks and dsge_var options may not both be passed to estimation." << endl; - exit(EXIT_FAILURE); - } - else // Fill in mod_file_struct.dsge_var_calibrated mod_file_struct.dsge_var_calibrated = it->second;