Move the location of static and dynamic files on the filesystem

- M and MEX files are now under +${MODELNAME}/
- bytecode and C source now under ${MODELNAME}/model/

configure.ac

@@ -67,6 +67,8 @@ fi
 
 # We need 1.36 because of unordered_{set,hash} used by Dynare++
 AX_BOOST_BASE([1.36], [], [AC_MSG_ERROR([Can't find Boost >= 1.36])])
+AX_BOOST_SYSTEM
+AX_BOOST_FILESYSTEM
 
 CPPFLAGS_SAVED="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"

license.txt

@@ -17,8 +17,13 @@ Copyright: 1996-2018 Dynare Team
 License: GPL-3+
 
 Files: m4/ax_boost_base.m4
-Copyright: 2008 Thomas Porschberg <thomas@randspringer.de>
+       m4/ax_boost_system.m4
+       m4/ax_boost_filesystem.m4
+Copyright: 2008-2009 Thomas Porschberg <thomas@randspringer.de>
            2009 Peter Adolphs
+           2008-2009 Michael Tindal
+           2008 Daniel Casimiro <dan.casimiro@gmail.com>
+           2009 Roman Rybalko <libtorrent@romanr.info>
 License: permissive-autoconf
 
 Files: m4/ax_cxx_compile_stdcxx.m4

m4/ax_boost_filesystem.m4

+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_FILESYSTEM
+#
+# DESCRIPTION
+#
+#   Test for Filesystem library from the Boost C++ libraries. The macro
+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
+#   available at <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_FILESYSTEM_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_FILESYSTEM
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2009 Michael Tindal
+#   Copyright (c) 2009 Roman Rybalko <libtorrent@romanr.info>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 26
+
+AC_DEFUN([AX_BOOST_FILESYSTEM],
+[
+	AC_ARG_WITH([boost-filesystem],
+	AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
+                   [use the Filesystem library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_filesystem_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_filesystem_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+		LIBS_SAVED=$LIBS
+		LIBS="$LIBS $BOOST_SYSTEM_LIB"
+		export LIBS
+
+        AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
+					   ax_cv_boost_filesystem,
+        [AC_LANG_PUSH([C++])
+         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
+                                   [[using namespace boost::filesystem;
+                                   path my_path( "foo/bar/data.txt" );
+                                   return 0;]])],
+					       ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_filesystem" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            if test "x$ax_boost_user_filesystem_lib" = "x"; then
+                for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                 [link_filesystem="no"])
+				done
+                if test "x$link_filesystem" != "xyes"; then
+                for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                 [link_filesystem="no"])
+				done
+		    fi
+            else
+               for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
+				      AC_CHECK_LIB($ax_lib, exit,
+                                   [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                   [link_filesystem="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_filesystem" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+		LDFLAGS="$LDFLAGS_SAVED"
+		LIBS="$LIBS_SAVED"
+	fi
+])

m4/ax_boost_system.m4

+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_boost_system.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_SYSTEM
+#
+# DESCRIPTION
+#
+#   Test for System library from the Boost C++ libraries. The macro requires
+#   a preceding call to AX_BOOST_BASE. Further documentation is available at
+#   <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_SYSTEM_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_SYSTEM
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 18
+
+AC_DEFUN([AX_BOOST_SYSTEM],
+[
+	AC_ARG_WITH([boost-system],
+	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
+                   [use the System library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-system=boost_system-gcc-mt ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_system_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_system_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+        AC_REQUIRE([AC_CANONICAL_BUILD])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::System library is available,
+					   ax_cv_boost_system,
+        [AC_LANG_PUSH([C++])
+			 CXXFLAGS_SAVE=$CXXFLAGS
+			 CXXFLAGS=
+
+			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
+				    [[boost::system::error_category *a = 0;]])],
+                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
+			 CXXFLAGS=$CXXFLAGS_SAVE
+             AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_system" = "xyes"; then
+			AC_SUBST(BOOST_CPPFLAGS)
+
+			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+
+			LDFLAGS_SAVE=$LDFLAGS
+            if test "x$ax_boost_user_system_lib" = "x"; then
+                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                 [link_system="no"])
+				done
+                if test "x$link_system" != "xyes"; then
+                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                 [link_system="no"])
+				done
+                fi
+
+            else
+               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
+				      AC_CHECK_LIB($ax_lib, exit,
+                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                   [link_system="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_system" = "xno"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])

src/ComputingTasks.cc

@@ -2274,7 +2274,7 @@ PlannerObjectiveStatement::computingPass()
 void
 PlannerObjectiveStatement::writeOutput(ostream &output, const string &basename, bool minimal_workspace) const
 {
-  model_tree->writeStaticFile(basename + "_objective", false, false, false, false);
+  model_tree->writeStaticFile(basename + ".objective", false, false, false, false);
 }
 
 void

src/DataTree.cc

@@ -20,6 +20,9 @@
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
+#include <regex>
+
+#include <boost/filesystem.hpp>
 
 #include "DataTree.hh"
 
@@ -776,3 +779,12 @@ DataTree::writeNormcdf(ostream &output) const
            << "#endif" << endl;
 #endif
 }
+
+string
+DataTree::packageDir(const string &package)
+{
+  regex pat{"\\."};
+  string dirname = "+" + regex_replace(package, pat, "/+");
+  boost::filesystem::create_directories(dirname);
+  return dirname;
+}

src/DataTree.hh

@@ -109,6 +109,14 @@ protected:
 
   //! Internal implementation of ParamUsedWithLeadLag()
   bool ParamUsedWithLeadLagInternal() const;
+
+  /*! Takes a MATLAB/Octave package name (possibly with several levels nested using dots),
+    and returns the name of the corresponding filesystem directory (which
+    is created by the function if it does not exist).
+    In practice the package nesting is used for the planner_objective (stored
+    inside +objective subdir). */
+  static string packageDir(const string &package);
+
 private:
   using node_list_t = list<expr_t>;
   //! The list of nodes

src/DynamicModel.hh

@@ -96,27 +96,27 @@ private:
   first_chain_rule_derivatives_t first_chain_rule_derivatives;
 
   //! Writes dynamic model file (Matlab version)
-  void writeDynamicMFile(const string &dynamic_basename) const;
+  void writeDynamicMFile(const string &basename) const;
   //! Writes dynamic model file (Julia version)
   void writeDynamicJuliaFile(const string &dynamic_basename) const;
   //! Write Var Expectation calls
   void writeVarExpectationCalls(ostream &output) const;
   //! Writes dynamic model file (C version)
   /*! \todo add third derivatives handling */
-  void writeDynamicCFile(const string &dynamic_basename, const int order) const;
+  void writeDynamicCFile(const string &basename, const int order) const;
   //! Writes dynamic model file when SparseDLL option is on
-  void writeSparseDynamicMFile(const string &dynamic_basename, const string &basename) const;
+  void writeSparseDynamicMFile(const string &basename) const;
   //! Writes the dynamic model equations and its derivatives
   /*! \todo add third derivatives handling in C output */
   void writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia) const;
-  void writeDynamicModel(const string &dynamic_basename, bool use_dll, bool julia) const;
-  void writeDynamicModel(const string &dynamic_basename, ostream &DynamicOutput, bool use_dll, bool julia) const;
+  void writeDynamicModel(const string &basename, bool use_dll, bool julia) const;
+  void writeDynamicModel(const string &basename, ostream &DynamicOutput, bool use_dll, bool julia) const;
   //! Writes the Block reordred structure of the model in M output
-  void writeModelEquationsOrdered_M(const string &dynamic_basename) const;
+  void writeModelEquationsOrdered_M(const string &basename) const;
   //! Writes the code of the Block reordred structure of the model in virtual machine bytecode
-  void writeModelEquationsCode_Block(string &file_name, const string &bin_basename, const map_idx_t &map_idx) const;
+  void writeModelEquationsCode_Block(const string &basename, const map_idx_t &map_idx) const;
   //! Writes the code of the model in virtual machine bytecode
-  void writeModelEquationsCode(string &file_name, const string &bin_basename, const map_idx_t &map_idx) const;
+  void writeModelEquationsCode(const string &basename, const map_idx_t &map_idx) const;
 
   void writeSetAuxiliaryVariables(const string &basename, const bool julia) const;
   void writeAuxVarRecursiveDefinitions(ostream &output, ExprNodeOutputType output_type) const;
@@ -235,7 +235,8 @@ private:
   vector<pair<int, int>> endo_max_leadlag_block, other_endo_max_leadlag_block, exo_max_leadlag_block, exo_det_max_leadlag_block, max_leadlag_block;
 
   void writeWrapperFunctions(const string &name, const string &ending) const;
-  void writeDynamicModelHelper(const string &name, const string &retvalname,
+  void writeDynamicModelHelper(const string &basename,
+                               const string &name, const string &retvalname,
                                const string &name_tt, size_t ttlen,
                                const string &previous_tt_name,
                                const ostringstream &init_s,
@@ -243,7 +244,7 @@ private:
                                const ostringstream &s, const ostringstream &s_tt) const;
 
   //! Create a legacy *_dynamic.m file for Matlab/Octave not yet using the temporary terms array interface
-  void writeDynamicMatlabCompatLayer(const string &name) const;
+  void writeDynamicMatlabCompatLayer(const string &basename) const;
 
   void getEquationNumbersFromTags(vector<int> &eqnumber, set<string> &eqtags) const;
 
@@ -335,7 +336,7 @@ public:
   void substitutePacExpectation();
 
   //! Adds informations for simulation in a binary file
-  void Write_Inf_To_Bin_File_Block(const string &dynamic_basename, const string &bin_basename,
+  void Write_Inf_To_Bin_File_Block(const string &basename,
                                    const int &num, int &u_count_int, bool &file_open, bool is_two_boundaries) const;
   //! Writes dynamic model file
   void writeDynamicFile(const string &basename, bool block, bool bytecode, bool use_dll, int order, bool julia) const;

src/Makefile.am

@@ -64,7 +64,7 @@ EXTRA_DIST = \
 # The -I. is for <FlexLexer.h>
 dynare_m_CPPFLAGS = $(BOOST_CPPFLAGS) -I.
 dynare_m_LDFLAGS = $(BOOST_LDFLAGS)
-dynare_m_LDADD = macro/libmacro.a
+dynare_m_LDADD = macro/libmacro.a $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB)
 
 DynareFlex.cc FlexLexer.h: DynareFlex.ll
 	$(LEX) -o DynareFlex.cc DynareFlex.ll

src/ModFile.cc

@@ -22,9 +22,8 @@
 #include <fstream>
 #include <typeinfo>
 #include <cassert>
-#ifndef _WIN32
-# include <unistd.h>
-#endif
+
+#include <boost/filesystem.hpp>
 
 #include "ModFile.hh"
 #include "ConfigFile.hh"
@@ -746,12 +745,23 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo
                           , const bool nopreprocessoroutput
                           ) const
 {
+  bool hasModelChanged = !dynamic_model.isChecksumMatching(basename);
+  if (!check_model_changes)
+    hasModelChanged = true;
+
+  if (hasModelChanged)
+    {
+      // Erase possible remnants of previous runs
+      boost::filesystem::remove_all("+" + basename);
+      boost::filesystem::remove_all(basename + "/model");
+    }
+
   ofstream mOutputFile;
 
   if (basename.size())
     {
-      string fname(basename);
-      fname += ".m";
+      boost::filesystem::create_directory("+" + basename);
+      string fname = "+" + basename + "/driver.m";
       mOutputFile.open(fname.c_str(), ios::out | ios::binary);
       if (!mOutputFile.is_open())
         {
@@ -879,42 +889,6 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo
                 << "  error('DYNARE: Can''t find bytecode DLL. Please compile it or remove the ''bytecode'' option.')" << endl
                 << "end" << endl;
 
-  bool hasModelChanged = !dynamic_model.isChecksumMatching(basename);
-  if (!check_model_changes)
-    hasModelChanged = true;
-
-  if (hasModelChanged)
-    {
-      // Erase possible remnants of previous runs
-      unlink((basename + "_dynamic.m").c_str());
-      unlink((basename + "_dynamic.cod").c_str());
-      unlink((basename + "_dynamic.bin").c_str());
-
-      unlink((basename + "_static.m").c_str());
-      unlink((basename + "_static.cod").c_str());
-      unlink((basename + "_static.bin").c_str());
-
-      unlink((basename + "_steadystate2.m").c_str());
-      unlink((basename + "_set_auxiliary_variables.m").c_str());
-
-      // Clean generated files for temporary terms array interface
-      for (auto s1 : { "dynamic", "static" })
-        {
-          for (auto s2 : { "resid", "g1", "g2", "g3" })
-            for (auto s3 : { "", "_tt" })
-              unlink((basename + "_" + s1 + "_" + s2 + s3 + ".m").c_str());
-
-          for (auto s2 : { "resid_g1", "resid_g1_g2", "resid_g1_g2_g3" })
-            unlink((basename + "_" + s1 + "_" + s2 + ".m").c_str());
-        }
-    }
-
-  if (!use_dll)
-    {
-      mOutputFile << "erase_compiled_function('" + basename + "_static');" << endl;
-      mOutputFile << "erase_compiled_function('" + basename + "_dynamic');" << endl;
-    }
-
 #if defined(_WIN32) || defined(__CYGWIN32__)
 # if (defined(_MSC_VER) && _MSC_VER < 1700)
   // If using USE_DLL with MSVC 10.0 or earlier, check that the user didn't use a function not supported by the compiler (because MSVC <= 10.0 doesn't comply with C99 standard)
@@ -965,14 +939,10 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo
 #endif
     }
 
-  // Add path for block option with M-files
-  if (block && !byte_code)
-    mOutputFile << "addpath " << basename << ";" << endl;
-
   mOutputFile << "M_.orig_eq_nbr = " << mod_file_struct.orig_eq_nbr << ";" << endl
               << "M_.eq_nbr = " << dynamic_model.equation_number() << ";" << endl
               << "M_.ramsey_eq_nbr = " << mod_file_struct.ramsey_eq_nbr << ";" << endl
-              << "M_.set_auxiliary_variables = exist(['./' M_.fname '_set_auxiliary_variables.m'], 'file') == 2;" << endl;
+              << "M_.set_auxiliary_variables = exist(['./+' M_.fname '/set_auxiliary_variables.m'], 'file') == 2;" << endl;
 
   if (dynamic_model.equation_number() > 0)
     {
@@ -1018,10 +988,6 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo
         vms->createVarModelMFunction(mOutputFile, dynamic_model.getVarExpectationFunctionsToWrite());
     }
 
-  // Remove path for block option with M-files
-  if (block && !byte_code)
-    mOutputFile << "rmpath " << basename << ";" << endl;
-
   mOutputFile << "save('" << basename << "_results.mat', 'oo_', 'M_', 'options_');" << endl
               << "if exist('estim_params_', 'var') == 1" << endl
               << "  save('" << basename << "_results.mat', 'estim_params_', '-append');" << endl << "end" << endl

src/ModelTree.cc

@@ -1603,19 +1603,18 @@ ModelTree::compileModelEquations(ostream &code_file, unsigned int &instruction_n
 }
 
 void
-ModelTree::Write_Inf_To_Bin_File(const string &basename,
+ModelTree::Write_Inf_To_Bin_File(const string &filename,
                                  int &u_count_int, bool &file_open, bool is_two_boundaries, int block_mfs) const
 {
   int j;
   std::ofstream SaveCode;
-  const string bin_basename = basename + ".bin";
   if (file_open)
-    SaveCode.open(bin_basename.c_str(), ios::out | ios::in | ios::binary | ios::ate);
+    SaveCode.open(filename, ios::out | ios::in | ios::binary | ios::ate);
   else
-    SaveCode.open(bin_basename.c_str(), ios::out | ios::binary);
+    SaveCode.open(filename, ios::out | ios::binary);
   if (!SaveCode.is_open())
     {
-      cerr << "Error : Can't open file \"" << bin_basename << "\" for writing" << endl;
+      cerr << "Error : Can't open file \"" << filename << "\" for writing" << endl;
       exit(EXIT_FAILURE);
     }
   u_count_int = 0;

src/ModelTree.hh

@@ -192,7 +192,7 @@ protected:
   //! Compiles temporary terms
   void compileTemporaryTerms(ostream &code_file, unsigned int &instruction_number, const temporary_terms_t &tt, map_idx_t map_idx, bool dynamic, bool steady_dynamic) const;
   //! Adds informations for simulation in a binary file
-  void Write_Inf_To_Bin_File(const string &basename, int &u_count_int, bool &file_open, bool is_two_boundaries, int block_mfs) const;
+  void Write_Inf_To_Bin_File(const string &filename, int &u_count_int, bool &file_open, bool is_two_boundaries, int block_mfs) const;
   //! Fixes output when there are more than 32 nested parens, Issue #1201
   void fixNestedParenthesis(ostringstream &output, map<string, string> &tmp_paren_vars, bool &message_printed) const;
   //! Tests if string contains more than 32 nested parens, Issue #1201

src/StaticModel.hh

@@ -42,10 +42,10 @@ private:
   first_chain_rule_derivatives_t first_chain_rule_derivatives;
 
   //! Writes static model file (standard Matlab version)
-  void writeStaticMFile(const string &static_basename) const;
+  void writeStaticMFile(const string &basename) const;
 
   //! Writes static model file (C version)
-  void writeStaticCFile(const string &func_name) const;
+  void writeStaticCFile(const string &basename) const;
 
   //! Writes static model file (Julia version)
   void writeStaticJuliaFile(const string &basename) const;
@@ -57,13 +57,13 @@ private:
   void writeStaticBlockMFSFile(const string &basename) const;
 
   //! Writes the Block reordred structure of the model in M output
-  void writeModelEquationsOrdered_M(const string &dynamic_basename) const;
+  void writeModelEquationsOrdered_M(const string &basename) const;
 
   //! Writes the code of the Block reordred structure of the model in virtual machine bytecode
-  void writeModelEquationsCode_Block(const string file_name, const string bin_basename, map_idx_t map_idx, vector<map_idx_t> map_idx2) const;
+  void writeModelEquationsCode_Block(const string &basename, map_idx_t map_idx, vector<map_idx_t> map_idx2) const;
 
   //! Writes the code of the model in virtual machine bytecode
-  void writeModelEquationsCode(const string file_name, const string bin_basename, map_idx_t map_idx) const;
+  void writeModelEquationsCode(const string &basename, map_idx_t map_idx) const;
 
   //! Computes jacobian and prepares for equation normalization
   /*! Using values from initval/endval blocks and parameter initializations:
@@ -146,7 +146,8 @@ protected:
   vector<pair<int, int>> endo_max_leadlag_block, other_endo_max_leadlag_block, exo_max_leadlag_block, exo_det_max_leadlag_block, max_leadlag_block;
 
   //! Helper functions for writeStaticModel
-  void writeStaticModelHelper(const string &name, const string &retvalname,
+  void writeStaticModelHelper(const string &basename,
+                              const string &name, const string &retvalname,
                               const string &name_tt, size_t ttlen,
                               const string &previous_tt_name,
                               const ostringstream &init_s, const ostringstream &end_s,
@@ -174,7 +175,7 @@ public:
   void computingPass(const eval_context_t &eval_context, bool no_tmp_terms, bool hessian, bool thirdDerivatices, int paramsDerivsOrder, bool block, bool bytecode, const bool nopreprocessoroutput);
 
   //! Adds informations for simulation in a binary file for a block decomposed model
-  void Write_Inf_To_Bin_File_Block(const string &static_basename, const string &bin_basename, const int &num,
+  void Write_Inf_To_Bin_File_Block(const string &basename, const int &num,
                                    int &u_count_int, bool &file_open) const;
 
   //! Writes static model file

src/SteadyStateModel.cc

@@ -159,7 +159,7 @@ SteadyStateModel::writeSteadyStateFile(const string &basename, bool ramsey_model
   if (def_table.size() == 0)
     return;
 
-  string filename = julia ? basename + "SteadyState2.jl" : basename + "_steadystate2.m";
+  string filename = julia ? basename + "SteadyState2.jl" : packageDir(basename) + "/steadystate.m";
   ofstream output;
   output.open(filename.c_str(), ios::out | ios::binary);
   if (!output.is_open())
@@ -171,7 +171,7 @@ SteadyStateModel::writeSteadyStateFile(const string &basename, bool ramsey_model
   ExprNodeOutputType output_type = (julia ? oJuliaSteadyStateFile : oSteadyStateFile);
 
   if (!julia)
-    output << "function [ys_, params, info] = " << basename << "_steadystate2("
+    output << "function [ys_, params, info] = steadystate("
            << "ys_, exo_, params)" << endl
            << "% Steady state generated by Dynare preprocessor" << endl
            << "    info = 0;" << endl;