From 45a05012c6f63540d0fbaad818d1719f7a75546b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 28 May 2020 22:47:23 +0200
Subject: [PATCH] STYLE: use Time::printExecutionTime() method
- makes format of ExecutionTime = ... output configurable (#788)
and reduces code clutter.
---
.../optimisation/computeSensitivities/computeSensitivities.C | 4 +---
.../adjointEikonalSolver/adjointEikonalSolverIncompressible.C | 4 +---
.../adjointMeshMovementSolverIncompressible.C | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C b/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C
index 07f543a1288..9f955e30bc4 100644
--- a/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C
+++ b/applications/utilities/postProcessing/optimisation/computeSensitivities/computeSensitivities.C
@@ -64,9 +64,7 @@ int main(int argc, char *argv[])
}
}
- Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
- << " ClockTime = " << runTime.elapsedClockTime() << " s"
- << nl << endl;
+ runTime.printExecutionTime(Info);
Info<< "End" << endl;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
index b1ccc4875bc..48ff5ba0127 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointEikonalSolver/adjointEikonalSolverIncompressible.C
@@ -207,9 +207,7 @@ void adjointEikonalSolver::solve()
scalar residual = daEqn.solve().initialResidual();
Info<< "Max da " << gMax(mag(da_)()) << endl;
- Info<< "ExecutionTime = " << mesh_.time().elapsedCpuTime() << " s"
- << " ClockTime = " << mesh_.time().elapsedClockTime() << " s"
- << nl << endl;
+ mesh_.time().printExecutionTime(Info);
// Check convergence
if (residual < tolerance_)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
index 06e60201a82..82860f4301a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/adjointMeshMovementSolver/adjointMeshMovementSolverIncompressible.C
@@ -146,9 +146,7 @@ void adjointMeshMovementSolver::solve()
Info<< "Max ma " << gMax(mag(ma_)()) << endl;
- Info<< "ExecutionTime = " << mesh_.time().elapsedCpuTime() << " s"
- << " ClockTime = " << mesh_.time().elapsedClockTime() << " s"
- << nl << endl;
+ mesh_.time().printExecutionTime(Info);
// Check convergence
if (residual < tolerance_)
--
GitLab