From 34c57071f0a251a3e0f1106a145fce6e09fb1a28 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Fri, 10 Jun 2016 10:10:39 +0200
Subject: [PATCH] rename public init() to initialize()
---
Applications/ApplicationsLib/UncoupledProcessesTimeLoop.h | 2 +-
GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp | 2 +-
GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h | 2 +-
GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp | 2 +-
GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h | 2 +-
GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h | 2 +-
GeoLib/IO/Gmsh/GMSHPolygonTree.cpp | 2 +-
ProcessLib/Output.cpp | 2 +-
ProcessLib/Output.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Applications/ApplicationsLib/UncoupledProcessesTimeLoop.h b/Applications/ApplicationsLib/UncoupledProcessesTimeLoop.h
index 7122b35fa72..7a830eb2a6a 100644
--- a/Applications/ApplicationsLib/UncoupledProcessesTimeLoop.h
+++ b/Applications/ApplicationsLib/UncoupledProcessesTimeLoop.h
@@ -369,7 +369,7 @@ loop(ProjectData& project)
auto per_process_data = initInternalData(project);
auto& out_ctrl = project.getOutputControl();
- out_ctrl.init(project.processesBegin(), project.processesEnd());
+ out_ctrl.initialize(project.processesBegin(), project.processesEnd());
auto const t0 = _timestepper->getTimeStep().current(); // time of the IC
diff --git a/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
index 4010a7736c1..d58ec7f2a3d 100644
--- a/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
+++ b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.cpp
@@ -45,7 +45,7 @@ GMSHAdaptiveMeshDensity::~GMSHAdaptiveMeshDensity()
delete _quad_tree;
}
-void GMSHAdaptiveMeshDensity::init(std::vector<GeoLib::Point const*> const& pnts)
+void GMSHAdaptiveMeshDensity::initialize(std::vector<GeoLib::Point const*> const& pnts)
{
// *** QuadTree - determining bounding box
DBUG("GMSHAdaptiveMeshDensity::init(): computing axis aligned bounding box (2D) for quadtree.");
diff --git a/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
index 7eaaefe98d1..cb08be347d3 100644
--- a/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
+++ b/GeoLib/IO/Gmsh/GMSHAdaptiveMeshDensity.h
@@ -34,7 +34,7 @@ public:
double station_density,
std::size_t max_pnts_per_leaf);
virtual ~GMSHAdaptiveMeshDensity();
- void init(std::vector<GeoLib::Point const*> const& pnts);
+ void initialize(std::vector<GeoLib::Point const*> const& pnts);
double getMeshDensityAtPoint(GeoLib::Point const* const pnt) const;
void addPoints(std::vector<GeoLib::Point const*> const& pnts);
double getMeshDensityAtStation(GeoLib::Point const* const) const;
diff --git a/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
index 8aba83bb2b2..3147260bc69 100644
--- a/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
+++ b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.cpp
@@ -22,7 +22,7 @@ GMSHFixedMeshDensity::GMSHFixedMeshDensity(double mesh_density) :
{
}
-void GMSHFixedMeshDensity::init(std::vector<GeoLib::Point const*> const& vec)
+void GMSHFixedMeshDensity::initialize(std::vector<GeoLib::Point const*> const& vec)
{
// to avoid a warning here:
(void)(vec);
diff --git a/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
index ce083a102cd..ad97c9d190d 100644
--- a/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
+++ b/GeoLib/IO/Gmsh/GMSHFixedMeshDensity.h
@@ -24,7 +24,7 @@ class GMSHFixedMeshDensity : public GMSHMeshDensityStrategy
{
public:
GMSHFixedMeshDensity(double mesh_density);
- void init(std::vector<GeoLib::Point const*> const& vec);
+ void initialize(std::vector<GeoLib::Point const*> const& vec);
double getMeshDensityAtPoint(GeoLib::Point const*const) const;
double getMeshDensityAtStation(GeoLib::Point const*const) const;
virtual ~GMSHFixedMeshDensity() {}
diff --git a/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h b/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
index 943eaa1d7af..cbd7c1ff5a4 100644
--- a/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
+++ b/GeoLib/IO/Gmsh/GMSHMeshDensityStrategy.h
@@ -28,7 +28,7 @@ class GMSHMeshDensityStrategy
{
public:
virtual ~GMSHMeshDensityStrategy() {}
- virtual void init(std::vector<GeoLib::Point const*> const&) = 0;
+ virtual void initialize(std::vector<GeoLib::Point const*> const&) = 0;
virtual double getMeshDensityAtPoint(GeoLib::Point const*const) const = 0;
virtual double getMeshDensityAtStation(GeoLib::Point const*const) const = 0;
};
diff --git a/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp b/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
index 319d1bcd7f3..87a2edb041c 100644
--- a/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
+++ b/GeoLib/IO/Gmsh/GMSHPolygonTree.cpp
@@ -242,7 +242,7 @@ void GMSHPolygonTree::initMeshDensityStrategy()
}
// give collected points to the mesh density strategy
- _mesh_density_strategy->init(pnts);
+ _mesh_density_strategy->initialize(pnts);
// insert constraints
dynamic_cast<GMSHAdaptiveMeshDensity*>(_mesh_density_strategy)->addPoints(_stations);
std::vector<GeoLib::Point const*> stations;
diff --git a/ProcessLib/Output.cpp b/ProcessLib/Output.cpp
index c516dd0a92b..8a10358b9eb 100644
--- a/ProcessLib/Output.cpp
+++ b/ProcessLib/Output.cpp
@@ -84,7 +84,7 @@ newInstance(const BaseLib::ConfigTree &config, std::string const& output_directo
template<typename GlobalSetup>
void Output<GlobalSetup>::
-init(typename Output<GlobalSetup>::ProcessIter first,
+initialize(typename Output<GlobalSetup>::ProcessIter first,
typename Output<GlobalSetup>::ProcessIter last)
{
for (unsigned pcs_idx = 0; first != last; ++first, ++pcs_idx)
diff --git a/ProcessLib/Output.h b/ProcessLib/Output.h
index b9b18ebb87f..fcfa16edae9 100644
--- a/ProcessLib/Output.h
+++ b/ProcessLib/Output.h
@@ -34,7 +34,7 @@ public:
::const_iterator;
//! Opens a PVD file for each process.
- void init(ProcessIter first, ProcessIter last);
+ void initialize(ProcessIter first, ProcessIter last);
//! Writes output for the given \c process if it should be written in the
//! given \c timestep.
--
GitLab