From 92a38cfa2bc96ffcc7154fb79cf88b3da24e9e52 Mon Sep 17 00:00:00 2001
From: Marco Ratto <marco.ratto@jrc.ec.europa.eu>
Date: Wed, 17 Jan 2018 19:32:29 +0100
Subject: [PATCH] bug fixes: wrong name of field fig_name and properly using
 user defined fig_name

(cherry picked from commit b3bcd2c8b08148a4cb0a0acd1477e2648a047d06)

Fixed conflicts in matlab/initial_condition_decomposition.m.
---
 matlab/initial_condition_decomposition.m | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/matlab/initial_condition_decomposition.m b/matlab/initial_condition_decomposition.m
index f768c5fab..bfbe4791f 100644
--- a/matlab/initial_condition_decomposition.m
+++ b/matlab/initial_condition_decomposition.m
@@ -128,6 +128,11 @@ M_.exo_nbr = M_.endo_nbr;
 options_.plot_shock_decomp.realtime=0;
 options_.plot_shock_decomp.screen_shocks=1;
 options_.plot_shock_decomp.use_shock_groups = '';
-options_.plot_shock_decomp.fig_names='initval';
+fig_name = options_.plot_shock_decomp.fig_name;
+if ~isempty(fig_name)
+    options_.plot_shock_decomp.fig_name=[fig_name '_initval'];
+else
+options_.plot_shock_decomp.fig_name='initval';
+end   
 plot_shock_decomposition(M_,oo,options_,varlist);
 % end
\ No newline at end of file
-- 
GitLab