From bcfd5b184eaf3d8331a26bc5738eacf11e6ddbcf Mon Sep 17 00:00:00 2001 From: acrovato <a.crovato@uliege.be> Date: Wed, 22 Jun 2022 12:03:54 +0200 Subject: [PATCH] Add case name in output files --- dart/api/internal/polar.py | 2 +- dart/api/internal/trim.py | 2 +- dart/src/wAdjoint.cpp | 2 +- dart/src/wSolver.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dart/api/internal/polar.py b/dart/api/internal/polar.py index bc3d3bf..f4355f3 100644 --- a/dart/api/internal/polar.py +++ b/dart/api/internal/polar.py @@ -101,7 +101,7 @@ class Polar: # extract Cp if self.dim == 2: Cp = dU.extract(self.bnd.groups[0].tag.elems, self.sol.Cp) - tU.write(Cp, f'Cp_airfoil{acs}.dat', '%1.5e', ', ', 'alpha = '+str(alpha*180/math.pi)+' deg\nx, y, z, Cp', '') + tU.write(Cp, f'Cp_{self.msh.name}_airfoil{acs}.dat', '%1.5e', ', ', 'alpha = '+str(alpha*180/math.pi)+' deg\nx, y, z, Cp', '') elif self.dim == 3 and self.format == 'vtk' and self.slice: dU.writeSlices(self.msh.name, self.slice, self.tag, acs) # extract force coefficients diff --git a/dart/api/internal/trim.py b/dart/api/internal/trim.py index 1fb871c..b277d9f 100644 --- a/dart/api/internal/trim.py +++ b/dart/api/internal/trim.py @@ -113,7 +113,7 @@ class Trim: # extract Cp if self.dim == 2: Cp = dU.extract(self.bnd.groups[0].tag.elems, self.sol.Cp) - tU.write(Cp, "Cp_airfoil.dat", "%1.5e", ", ", "x, y, z, Cp", "") + tU.write(Cp, f'Cp_{self.msh.name}_airfoil.dat', '%1.5e', ', ', 'x, y, z, Cp', '') elif self.dim == 3 and self.format == 'vtk' and self.slice: dU.writeSlices(self.msh.name, self.slice, self.tag) diff --git a/dart/src/wAdjoint.cpp b/dart/src/wAdjoint.cpp index ac6acba..791ed09 100644 --- a/dart/src/wAdjoint.cpp +++ b/dart/src/wAdjoint.cpp @@ -742,7 +742,7 @@ void Adjoint::save(MshExport *mshWriter, std::string const &suffix) // save (whole mesh and bodies) mshWriter->save(sol->pbl->msh->name + "_adjoint" + suffix, results); for (auto bnd : sol->pbl->bodies) - bnd->save(bnd->groups[0]->tag->name + "_adjoint" + suffix, results); + bnd->save(sol->pbl->msh->name + '_' + bnd->groups[0]->tag->name + "_adjoint" + suffix, results); } void Adjoint::write(std::ostream &out) const diff --git a/dart/src/wSolver.cpp b/dart/src/wSolver.cpp index 5ad807f..32e8c70 100644 --- a/dart/src/wSolver.cpp +++ b/dart/src/wSolver.cpp @@ -182,7 +182,7 @@ void Solver::save(MshExport *mshWriter, std::string const &suffix) // save (whole mesh and bodies) mshWriter->save(pbl->msh->name + suffix, results); for (auto bnd : pbl->bodies) - bnd->save(bnd->groups[0]->tag->name + suffix, results); + bnd->save(pbl->msh->name + '_' + bnd->groups[0]->tag->name + suffix, results); } /** -- GitLab