From 9013a5cb1b27c446a1925a18d1db43ad4ed3e446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 17 Jan 2023 18:36:24 +0100
Subject: [PATCH] No longer create +<basename>/+block/ folder (now empty)
---
src/ComputingTasks.cc | 2 +-
src/DynamicModel.cc | 4 +---
src/DynamicModel.hh | 2 +-
src/ModFile.cc | 8 ++++----
src/StaticModel.cc | 4 +---
src/StaticModel.hh | 2 +-
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/ComputingTasks.cc b/src/ComputingTasks.cc
index f7107855..e3969e30 100644
--- a/src/ComputingTasks.cc
+++ b/src/ComputingTasks.cc
@@ -2458,7 +2458,7 @@ PlannerObjectiveStatement::writeOutput(ostream &output, const string &basename,
for (const auto &temporary_terms_derivative : model_tree.getTemporaryTermsDerivatives())
output << temporary_terms_derivative.size() << "; ";
output << "];" << endl;
- model_tree.writeStaticFile(basename + ".objective", false, false, "", {}, {}, false);
+ model_tree.writeStaticFile(basename + ".objective", false, "", {}, {}, false);
}
void
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index b4437e8e..6fe3301d 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -2455,7 +2455,7 @@ DynamicModel::computeBlockDynJacobianCols()
}
void
-DynamicModel::writeDynamicFile(const string &basename, bool block, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const
+DynamicModel::writeDynamicFile(const string &basename, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const
{
filesystem::path model_dir{basename};
model_dir /= "model";
@@ -2474,8 +2474,6 @@ DynamicModel::writeDynamicFile(const string &basename, bool block, bool use_dll,
ModFile::writeMOutput(), because of planner_objective which needs its
+objective subdirectory */
create_directories(plusfolder);
- if (block && !use_dll)
- create_directories(plusfolder / "+block");
auto sparsefolder {plusfolder / "+sparse"};
create_directories(sparsefolder);
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 7ea02100..7c47f0c7 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -365,7 +365,7 @@ public:
void updateVarAndTrendModel() const;
//! Writes dynamic model file (+ bytecode)
- void writeDynamicFile(const string &basename, bool block, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const;
+ void writeDynamicFile(const string &basename, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const;
//! Writes file containing parameters derivatives
template<bool julia>
diff --git a/src/ModFile.cc b/src/ModFile.cc
index 39212e7f..66bd8ba3 100644
--- a/src/ModFile.cc
+++ b/src/ModFile.cc
@@ -1043,11 +1043,11 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global,
{
if (!no_static)
{
- static_model.writeStaticFile(basename, block, use_dll, mexext, matlabroot, dynareroot, false);
+ static_model.writeStaticFile(basename, use_dll, mexext, matlabroot, dynareroot, false);
static_model.writeParamsDerivativesFile<false>(basename);
}
- dynamic_model.writeDynamicFile(basename, block, use_dll, mexext, matlabroot, dynareroot, false);
+ dynamic_model.writeDynamicFile(basename, use_dll, mexext, matlabroot, dynareroot, false);
dynamic_model.writeParamsDerivativesFile<false>(basename);
@@ -1071,10 +1071,10 @@ ModFile::writeJuliaOutput(const string &basename) const
{
if (!no_static)
{
- static_model.writeStaticFile(basename, false, false, "", {}, {}, true);
+ static_model.writeStaticFile(basename, false, "", {}, {}, true);
static_model.writeParamsDerivativesFile<true>(basename);
}
- dynamic_model.writeDynamicFile(basename, block, use_dll, "", {}, {}, true);
+ dynamic_model.writeDynamicFile(basename, use_dll, "", {}, {}, true);
dynamic_model.writeParamsDerivativesFile<true>(basename);
}
steady_state_model.writeSteadyStateFile(basename, true);
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index 244a48f5..0ac6aaf1 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -456,7 +456,7 @@ StaticModel::writeStaticMCompatFile(const string &basename) const
}
void
-StaticModel::writeStaticFile(const string &basename, bool block, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const
+StaticModel::writeStaticFile(const string &basename, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const
{
filesystem::path model_dir{basename};
model_dir /= "model";
@@ -475,8 +475,6 @@ StaticModel::writeStaticFile(const string &basename, bool block, bool use_dll, c
ModFile::writeMOutput(), because of planner_objective which needs its
+objective subdirectory */
create_directories(plusfolder);
- if (block && !use_dll)
- create_directories(plusfolder / "+block");
auto sparsefolder {plusfolder / "+sparse"};
create_directories(sparsefolder);
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index 50c73b8e..a6f2b666 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -124,7 +124,7 @@ public:
void computingPass(int derivsOrder, int paramsDerivsOrder, const eval_context_t &eval_context, bool no_tmp_terms, bool block);
//! Writes static model file (+ bytecode)
- void writeStaticFile(const string &basename, bool block, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const;
+ void writeStaticFile(const string &basename, bool use_dll, const string &mexext, const filesystem::path &matlabroot, const filesystem::path &dynareroot, bool julia) const;
//! Write JSON Output (used by PlannerObjectiveStatement)
void writeJsonOutput(ostream &output) const;
--
GitLab