stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made room for user written steady state file.

time-shift
Stéphane Adjemian (Hermes) 2016-05-19 14:44:49 +02:00
parent 96d538469c
commit bcd39ef2f7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
julia/DynareModel.jl
View File

@ -110,6 +110,7 @@ type Model
lead_lag_incidence::Matrix{Int}
nnzderivatives::Vector{Int}
analytical_steady_state::Bool
user_written_analytical_steady_state::Bool
static_and_dynamic_models_differ::Bool
equation_tags::Vector{UTF8String}
exo_names_orig_ord::Vector{Int}
@ -158,6 +159,7 @@ function dynare_model()
Array(Int, 3, 0), # lead_lag_incidence
zeros(Int, 3), # nnzderivatives
false, # analytical_steady_state
false, # user_written_analytical_steady_state
false, # static_and_dynamic_models_differ
Array(ASCIIString,0), # equation_tags
Array(Int64,1), # exo_names_orig_ord

6
preprocessor/ModFile.cc
View File

@ -1111,6 +1111,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
<< "using Utils" << endl
<< "using " << basename << "Static" << endl
<< "using " << basename << "Dynamic" << endl
<< "if isfile(\"" << basename << "SteadyState.jl" "\")" << endl
<< " using " << basename << "SteadyState" << endl
<< "end" << endl
<< "if isfile(\"" << basename << "SteadyState2.jl" "\")" << endl
<< " using " << basename << "SteadyState2" << endl
<< "end" << endl << endl
@ -1173,6 +1176,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
jlOutputFile << "model.static = " << basename << "Static.static!" << 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
<< " model.analytical_steady_state = true" << endl
<< " model.steady_state = " << basename << "SteadyState2.steady_state!" << endl