diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C index 96465d521afff9a2bbd79587cac5696a05bd76c4..bb9600eb583096535a877b367abb094c5f39be5a 100644 --- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C +++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.C @@ -50,6 +50,8 @@ void SIBase::read() surfaceSensitivity_.read(); includeObjective_ = dict().getOrDefault<bool>("includeObjectiveContribution", true); + writeSensitivityMap_ = + dict().getOrDefault<bool>("writeSensitivityMap", false); // If includeObjective is set to true both here and in the surface // sensitivities, set the one in the latter to false to avoid double @@ -105,7 +107,8 @@ SIBase::SIBase objectiveManager, fvOptionsAdjoint ), - includeObjective_(true) + includeObjective_(true), + writeSensitivityMap_(true) { read(); } @@ -152,6 +155,22 @@ void SIBase::clearSensitivities() } +const sensitivitySurface& SIBase::getSurfaceSensitivities() const +{ + return surfaceSensitivity_; +} + + +void SIBase::write(const word& baseName) +{ + shapeSensitivities::write(baseName); + if (writeSensitivityMap_) + { + surfaceSensitivity_.write(baseName); + } +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace incompressible diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H index ee97adac0556784848a0e37714391180c0649c3a..cc3342d05bf2165da77c0457df31b7e991469feb 100644 --- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H +++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/SIBase/SIBaseIncompressible.H @@ -72,6 +72,9 @@ protected: // them bool includeObjective_; + //- Write sensitivity map upon write + bool writeSensitivityMap_; + // Protected Member Functions @@ -127,6 +130,12 @@ public: //- Zero sensitivity fields and their constituents virtual void clearSensitivities(); + + //- Return reference to underlaying surface sensitivities + const sensitivitySurface& getSurfaceSensitivities() const; + + //- Write sensitivity map + virtual void write(const word& baseName = word::null); }; diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C index 0f3235759245d5e98a961c24cf1add717ae48ec2..af41e4fab2f986b77d67a25201f89f4826e1f7ac 100644 --- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C +++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityBezier/sensitivityBezierIncompressible.C @@ -203,6 +203,9 @@ void sensitivityBezier::clearSensitivities() void sensitivityBezier::write(const word& baseName) { Info<< "Writing control point sensitivities to file" << endl; + // Write sensitivity map + SIBase::write(baseName); + // Write control point sensitivities if (Pstream::master()) { OFstream derivFile diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C index 66fb1553638fc33c40ab183bd49e3dd94a3314db..29946a2c035d0c6289c193c4e9137f28c1aa772b 100644 --- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C +++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivityVolBSplines/sensitivityVolBSplinesIncompressible.C @@ -268,6 +268,9 @@ void sensitivityVolBSplines::clearSensitivities() void sensitivityVolBSplines::write(const word& baseName) { Info<< "Writing control point sensitivities to file" << endl; + // Write sensitivity map + SIBase::write(baseName); + // Write control point sensitivities if (Pstream::master()) { OFstream derivFile