From f0ae6760b2fe84be5bfc38907e6f94a440f69fdd Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 1 Mar 2019 10:58:35 +0100
Subject: [PATCH] [GL] StationBorehole: Rm unused addStratigraphy.
---
GeoLib/StationBorehole.cpp | 35 -----------------------------------
GeoLib/StationBorehole.h | 3 ---
2 files changed, 38 deletions(-)
diff --git a/GeoLib/StationBorehole.cpp b/GeoLib/StationBorehole.cpp
index 961fe6ed6be..38e0c80f801 100644
--- a/GeoLib/StationBorehole.cpp
+++ b/GeoLib/StationBorehole.cpp
@@ -77,41 +77,6 @@ int StationBorehole::readStratigraphyFile(const std::string &path,
return 1;
}
-int StationBorehole::addStratigraphy(const std::string &path, StationBorehole* borehole)
-{
- std::vector<std::list<std::string> > data;
- if (readStratigraphyFile(path, data))
- {
- std::size_t size = data.size();
- for (std::size_t i = 0; i < size; i++)
- {
- addLayer(data[i], borehole);
- }
-
- // check if a layer is missing
- // size = borehole->_soilName.size();
- INFO("StationBorehole::addStratigraphy ToDo");
- // for (std::size_t i=0; i<size; i++)
- // {
- // if ((borehole->_soilLayerThickness[i] == -1) ||(borehole->_soilName[i].compare("") == 0))
- // {
- // borehole->_soilLayerThickness.clear();
- // borehole->_soilName.clear();
- //
- // WARN("StationBorehole::addStratigraphy() - Profile incomplete (Borehole %s, Layer %d missing)", borehole->_name.c_str(), i+1);
- //
- // return 0;
- // }
- // }
- }
- else
- {
- borehole->addSoilLayer(borehole->getDepth(), "depth");
- }
-
- return 1;
-}
-
int StationBorehole::addLayer(std::list<std::string> fields, StationBorehole* borehole)
{
if (fields.size() >= 4) /* check if there are enough fields to create a borehole object */
diff --git a/GeoLib/StationBorehole.h b/GeoLib/StationBorehole.h
index b47e2d5bd55..436d27358dd 100644
--- a/GeoLib/StationBorehole.h
+++ b/GeoLib/StationBorehole.h
@@ -52,9 +52,6 @@ public:
/// Adds a stratigraphy to a borehole given a vector of points of length "n" and a vector of soil names of length "n-1".
int addStratigraphy(const std::vector<Point*> &profile, const std::vector<std::string> &soil_names);
- /// Reads the stratigraphy for a specified station from a file
- static int addStratigraphy(const std::string &path, StationBorehole* borehole);
-
// Returns the depth of the borehole
double getDepth() const { return _depth; }
--
GitLab