From b2819ac319d4ed056634d64ffa758bed5245ccb7 Mon Sep 17 00:00:00 2001
From: Vaggelis Papoutsis <vaggelisp@gmail.com>
Date: Sat, 27 Feb 2021 18:04:22 +0200
Subject: [PATCH] COMP: objectiveManager::write was hiding regIOobject::write
(see #2005)
---
.../objectiveManager/objectiveManager/objectiveManager.C | 8 ++++----
.../objectiveManager/objectiveManager/objectiveManager.H | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
index c9670beb9dd..5a379c1ed05 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
@@ -5,8 +5,8 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2007-2020 PCOpt/NTUA
- Copyright (C) 2013-2020 FOSS GP
+ Copyright (C) 2007-2021 PCOpt/NTUA
+ Copyright (C) 2013-2021 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@@ -252,7 +252,7 @@ scalar objectiveManager::print()
}
-bool objectiveManager::write
+bool objectiveManager::writeObjectives
(
const scalar weightedObjective,
const bool valid
@@ -289,7 +289,7 @@ void objectiveManager::updateAndWrite()
updateNormalizationFactor();
update();
scalar weightedObjective = print();
- write(weightedObjective);
+ writeObjectives(weightedObjective);
}
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
index 943b4d41fde..0aeacc6b484 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
@@ -5,8 +5,8 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2007-2020 PCOpt/NTUA
- Copyright (C) 2013-2020 FOSS GP
+ Copyright (C) 2007-2021 PCOpt/NTUA
+ Copyright (C) 2013-2021 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@@ -146,7 +146,7 @@ public:
scalar print();
//- Write objective function history
- virtual bool write
+ virtual bool writeObjectives
(
const scalar weightedObjective,
const bool valid = true
--
GitLab