From 6aca84bfbb953ead1d4ad80e6dc2e17533d202d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 2 Nov 2022 15:47:15 +0100
Subject: [PATCH] Julia: move all generated files to the
<basename>/model/julia/ subdirectory
---
src/DynamicModel.cc | 2 +-
src/DynamicModel.hh | 2 +-
src/ModelEquationBlock.cc | 2 +-
src/StaticModel.cc | 2 +-
src/StaticModel.hh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 4defadc9..816527a2 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -3547,7 +3547,7 @@ DynamicModel::writeSetAuxiliaryVariables(const string &basename, bool julia) con
output << "end" << endl;
if (julia)
- writeToFileIfModified(output, basename + "DynamicSetAuxiliarySeries.jl");
+ writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "DynamicSetAuxiliarySeries.jl");
else
{
/* Calling writeToFileIfModified() is useless here since we write inside
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 5f1bb1eb..0a961d10 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -866,7 +866,7 @@ DynamicModel::writeParamsDerivativesFile(const string &basename) const
auto [tt_output, rp_output, gp_output, rpp_output, gpp_output, hp_output, g3p_output]
{ writeParamsDerivativesFileHelper<output_type>() };
- const filesystem::path filename {julia ? filesystem::path{basename + "DynamicParamsDerivs.jl"} : packageDir(basename) / "dynamic_params_derivs.m"};
+ const filesystem::path filename {julia ? filesystem::path{basename} / "model" / "julia" / "DynamicParamsDerivs.jl" : packageDir(basename) / "dynamic_params_derivs.m"};
ofstream paramsDerivsFile { filename, ios::out | ios::binary };
if (!paramsDerivsFile.is_open())
{
diff --git a/src/ModelEquationBlock.cc b/src/ModelEquationBlock.cc
index d07fa0d0..745fb6da 100644
--- a/src/ModelEquationBlock.cc
+++ b/src/ModelEquationBlock.cc
@@ -260,7 +260,7 @@ SteadyStateModel::writeSteadyStateFile(const string &basename, bool julia) const
output << "end" << endl << "end" << endl;
if (julia)
- writeToFileIfModified(output, basename + "SteadyState2.jl");
+ writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "SteadyState2.jl");
else
{
/* Calling writeToFileIfModified() is useless here since we write inside
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index 0302d78f..a8576c8e 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -1206,7 +1206,7 @@ StaticModel::writeSetAuxiliaryVariables(const string &basename, bool julia) cons
output << "end" << endl;
if (julia)
- writeToFileIfModified(output, basename + "SetAuxiliaryVariables.jl");
+ writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "SetAuxiliaryVariables.jl");
else
{
/* Calling writeToFileIfModified() is useless here since we write inside
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index 541736e6..5ae9fdc1 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -225,7 +225,7 @@ StaticModel::writeParamsDerivativesFile(const string &basename) const
{ writeParamsDerivativesFileHelper<output_type>() };
// g3p_output is ignored
- filesystem::path filename {julia ? filesystem::path{basename + "StaticParamsDerivs.jl"} : packageDir(basename) / "static_params_derivs.m"};
+ filesystem::path filename {julia ? filesystem::path{basename} / "model" / "julia" / "StaticParamsDerivs.jl" : packageDir(basename) / "static_params_derivs.m"};
ofstream paramsDerivsFile { filename, ios::out | ios::binary };
if (!paramsDerivsFile.is_open())
{
--
GitLab