Skip to content
Snippets Groups Projects
Commit bcd39ef2 authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Made room for user written steady state file.

parent 96d53846
No related branches found
No related tags found
No related merge requests found
...@@ -110,6 +110,7 @@ type Model ...@@ -110,6 +110,7 @@ type Model
lead_lag_incidence::Matrix{Int} lead_lag_incidence::Matrix{Int}
nnzderivatives::Vector{Int} nnzderivatives::Vector{Int}
analytical_steady_state::Bool analytical_steady_state::Bool
user_written_analytical_steady_state::Bool
static_and_dynamic_models_differ::Bool static_and_dynamic_models_differ::Bool
equation_tags::Vector{UTF8String} equation_tags::Vector{UTF8String}
exo_names_orig_ord::Vector{Int} exo_names_orig_ord::Vector{Int}
...@@ -158,6 +159,7 @@ function dynare_model() ...@@ -158,6 +159,7 @@ function dynare_model()
Array(Int, 3, 0), # lead_lag_incidence Array(Int, 3, 0), # lead_lag_incidence
zeros(Int, 3), # nnzderivatives zeros(Int, 3), # nnzderivatives
false, # analytical_steady_state false, # analytical_steady_state
false, # user_written_analytical_steady_state
false, # static_and_dynamic_models_differ false, # static_and_dynamic_models_differ
Array(ASCIIString,0), # equation_tags Array(ASCIIString,0), # equation_tags
Array(Int64,1), # exo_names_orig_ord Array(Int64,1), # exo_names_orig_ord
......
...@@ -1111,6 +1111,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output) ...@@ -1111,6 +1111,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
<< "using Utils" << endl << "using Utils" << endl
<< "using " << basename << "Static" << endl << "using " << basename << "Static" << endl
<< "using " << basename << "Dynamic" << endl << "using " << basename << "Dynamic" << endl
<< "if isfile(\"" << basename << "SteadyState.jl" "\")" << endl
<< " using " << basename << "SteadyState" << endl
<< "end" << endl
<< "if isfile(\"" << basename << "SteadyState2.jl" "\")" << endl << "if isfile(\"" << basename << "SteadyState2.jl" "\")" << endl
<< " using " << basename << "SteadyState2" << endl << " using " << basename << "SteadyState2" << endl
<< "end" << endl << endl << "end" << endl << endl
...@@ -1173,6 +1176,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output) ...@@ -1173,6 +1176,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
jlOutputFile << "model.static = " << basename << "Static.static!" << endl jlOutputFile << "model.static = " << basename << "Static.static!" << endl
<< "model.dynamic = " << basename << "Dynamic.dynamic!" << endl << "model.dynamic = " << basename << "Dynamic.dynamic!" << endl
<< "if isfile(\"" << basename << "SteadyState.jl" "\")" << endl
<< " model.user_written_analytical_steady_state = true" << endl
<< "end" << endl
<< "if isfile(\"" << basename << "SteadyState2.jl" "\")" << endl << "if isfile(\"" << basename << "SteadyState2.jl" "\")" << endl
<< " model.analytical_steady_state = true" << endl << " model.analytical_steady_state = true" << endl
<< " model.steady_state = " << basename << "SteadyState2.steady_state!" << endl << " model.steady_state = " << basename << "SteadyState2.steady_state!" << endl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment