From 1eaa54ed2c80aab18750620ab403fcb48bb7e59c Mon Sep 17 00:00:00 2001
From: Vaggelis Papoutsis <vaggelisp@gmail.com>
Date: Mon, 10 Feb 2020 10:43:57 +0200
Subject: [PATCH] ENH: Added optional suffix to the file names
holding the sensitivity maps
---
.../sensitivitySurfaceIncompressible.C | 11 +++++++++--
.../sensitivitySurfacePointsIncompressible.C | 11 +++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
index 364c522f157..50786bf00fa 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -195,14 +195,21 @@ void sensitivitySurface::addGeometricSens()
void sensitivitySurface::setSuffixName()
{
+ word suffix(dict().getOrDefault<word>("suffix", word::null));
// Determine suffix for fields holding the sens
if (includeMeshMovement_)
{
- shapeSensitivitiesBase::setSuffix(adjointVars_.solverName() + "ESI");
+ shapeSensitivitiesBase::setSuffix
+ (
+ adjointVars_.solverName() + "ESI" + suffix
+ );
}
else
{
- shapeSensitivitiesBase::setSuffix(adjointVars_.solverName() + "SI");
+ shapeSensitivitiesBase::setSuffix
+ (
+ adjointVars_.solverName() + "SI" + suffix
+ );
}
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
index 4716b65cb17..264839e5153 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurfacePoints/sensitivitySurfacePointsIncompressible.C
@@ -306,14 +306,21 @@ void sensitivitySurfacePoints::constructGlobalPointNormalsAndAreas
void sensitivitySurfacePoints::setSuffixName()
{
+ word suffix(dict().getOrDefault<word>("suffix", word::null));
// Determine suffix for fields holding the sens
if (includeMeshMovement_)
{
- shapeSensitivitiesBase::setSuffix(adjointVars_.solverName() + "ESI");
+ shapeSensitivitiesBase::setSuffix
+ (
+ adjointVars_.solverName() + "ESI" + suffix
+ );
}
else
{
- shapeSensitivitiesBase::setSuffix(adjointVars_.solverName() + "SI");
+ shapeSensitivitiesBase::setSuffix
+ (
+ adjointVars_.solverName() + "SI" + suffix
+ );
}
}
--
GitLab