From fbb371dda4c70cf9976ff0521c640d93f757d8ee Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 13 Feb 2020 12:37:18 +0100 Subject: [PATCH] STYLE: avoid extraneous c_str() for OFstream construct --- .../optimisation/updateMethod/updateMethod/updateMethod.C | 4 ++-- .../NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C | 5 +++-- .../NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C index b16626c638..62e350c437 100644 --- a/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C +++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C @@ -355,8 +355,8 @@ void Foam::updateMethod::writeCorrection() correctionFolder_/"cumulativeCorrection" + mesh_.time().timeName() ); - OFstream corFile(correctionFile.c_str()); - OFstream cumulCorFile(cumulativeCorrectionFile.c_str()); + OFstream corFile(correctionFile); + OFstream cumulCorFile(cumulativeCorrectionFile); forAll(correction_, cI) { corFile diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C index 9189d995af..75b5985120 100644 --- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C +++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C @@ -1831,7 +1831,7 @@ Foam::label Foam::NURBS3DVolume::nWSymmetry() const } -void Foam::NURBS3DVolume::writeCps(const string fileName) const +void Foam::NURBS3DVolume::writeCps(const fileName& baseName) const { const label nCPsU = basisU_.nCPs(); const label nCPsV = basisV_.nCPs(); @@ -1846,12 +1846,13 @@ void Foam::NURBS3DVolume::writeCps(const string fileName) const if (Pstream::master()) { - OFstream cpsFile(("optimisation"/cpsFolder_/name_ + fileName + ".csv").c_str()); + OFstream cpsFile("optimisation"/cpsFolder_/name_ + baseName + ".csv"); // Write header cpsFile << "\"Points : 0\", \"Points : 1\", \"Points : 2\"," << "\"u\", \"v\", \"w\"," << "\"active : 0\", \"active : 1\", \"active : 2\"" << endl; + forAll(cpsInCartesian, cpI) { const label iCPw = cpI/label(nCPsU*nCPsV); diff --git a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H index 2a59d834e7..d48effabfc 100644 --- a/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H +++ b/src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.H @@ -468,7 +468,7 @@ public: //- Write control points on a cartesian coordinates system for //- visualization - void writeCps(const string="cpsFile") const; + void writeCps(const fileName& baseName="cpsFile") const; //- Write control points on the local coordinate system. // For continuation