From 088b2dabc4952b5be547f0a238dc2389a17f2567 Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Tue, 19 Oct 2021 13:52:57 +0200
Subject: [PATCH] [CL] remove print func from struct DensityBasedSurfaceSite.
---
ChemistryLib/PhreeqcIOData/Surface.cpp | 28 --------------------------
ChemistryLib/PhreeqcIOData/Surface.h | 18 +++++------------
2 files changed, 5 insertions(+), 41 deletions(-)
delete mode 100644 ChemistryLib/PhreeqcIOData/Surface.cpp
diff --git a/ChemistryLib/PhreeqcIOData/Surface.cpp b/ChemistryLib/PhreeqcIOData/Surface.cpp
deleted file mode 100644
index 53fbafc54be..00000000000
--- a/ChemistryLib/PhreeqcIOData/Surface.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * \file
- * \copyright
- * Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
- * Distributed under a Modified BSD License.
- * See accompanying file LICENSE.txt or
- * http://www.opengeosys.org/project/license
- *
- */
-
-#include "Surface.h"
-
-#include <ostream>
-
-namespace ChemistryLib
-{
-namespace PhreeqcIOData
-{
-std::ostream& operator<<(std::ostream& os, SurfaceSite const& surface_site)
-{
- os << surface_site.name << " " << surface_site.site_density << " "
- << surface_site.specific_surface_area << " " << surface_site.mass
- << "\n";
-
- return os;
-}
-} // namespace PhreeqcIOData
-} // namespace ChemistryLib
diff --git a/ChemistryLib/PhreeqcIOData/Surface.h b/ChemistryLib/PhreeqcIOData/Surface.h
index 4edb777a0c5..41d31242b0a 100644
--- a/ChemistryLib/PhreeqcIOData/Surface.h
+++ b/ChemistryLib/PhreeqcIOData/Surface.h
@@ -10,24 +10,19 @@
#pragma once
-#include <iosfwd>
#include <string>
-namespace BaseLib
-{
-class ConfigTree;
-}
namespace ChemistryLib
{
namespace PhreeqcIOData
{
-struct SurfaceSite
+struct DensityBasedSurfaceSite
{
- SurfaceSite(std::string name_,
- double const site_density_,
- double const specific_surface_area_,
- double const mass_)
+ DensityBasedSurfaceSite(std::string name_,
+ double const site_density_,
+ double const specific_surface_area_,
+ double const mass_)
: name(std::move(name_)),
site_density(site_density_),
specific_surface_area(specific_surface_area_),
@@ -35,9 +30,6 @@ struct SurfaceSite
{
}
- friend std::ostream& operator<<(std::ostream& os,
- SurfaceSite const& surface_site);
-
std::string const name;
double const site_density;
double const specific_surface_area;
--
GitLab