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

Julia: move all generated files to the <basename>/model/julia/ subdirectory

master
Sébastien Villemot 2022-11-02 15:47:15 +01:00
parent 6af8a57f9f
commit 6aca84bfbb
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DynamicModel.cc
View File

@ -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

2
src/DynamicModel.hh
View File

@ -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())
{

2
src/ModelEquationBlock.cc
View File

@ -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

2
src/StaticModel.cc
View File

@ -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

2
src/StaticModel.hh
View File

@ -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())
{