From e9113054e580d4a48ef7c6af6ebf2262a3553ac0 Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Sun, 9 May 2021 19:39:12 +0200
Subject: [PATCH] [PL/RCT] remove files associated with porous media
properties.
---
.../CreatePorousMediaProperties.cpp | 64 -------------------
.../CreatePorousMediaProperties.h | 28 --------
.../PorousMediaProperties.cpp | 33 ----------
.../PorousMediaProperties.h | 64 -------------------
4 files changed, 189 deletions(-)
delete mode 100644 ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
delete mode 100644 ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.h
delete mode 100644 ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp
delete mode 100644 ProcessLib/RichardsComponentTransport/PorousMediaProperties.h
diff --git a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp b/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
deleted file mode 100644
index 4a8b0155acf..00000000000
--- a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.cpp
+++ /dev/null
@@ -1,64 +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 "CreatePorousMediaProperties.h"
-
-#include "BaseLib/Algorithm.h"
-#include "MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.h"
-#include "MeshLib/Mesh.h"
-
-namespace ProcessLib
-{
-namespace RichardsComponentTransport
-{
-PorousMediaProperties createPorousMediaProperties(
- MeshLib::Mesh& mesh, BaseLib::ConfigTree const& porous_medium_configs)
-{
- DBUG("Create PorousMediaProperties.");
-
- std::vector<
- std::unique_ptr<MaterialLib::PorousMedium::CapillaryPressureSaturation>>
- capillary_pressure_models;
-
- std::vector<int> mat_ids;
- for (
- auto const& porous_medium_config :
- //! \ogs_file_param{prj__processes__process__RichardsComponentTransport__porous_medium__porous_medium}
- porous_medium_configs.getConfigSubtreeList("porous_medium"))
- {
- //! \ogs_file_attr{prj__processes__process__RichardsComponentTransport__porous_medium__porous_medium__id}
- auto const id = porous_medium_config.getConfigAttribute<int>("id");
- mat_ids.push_back(id);
-
- auto const& capillary_pressure_config =
- //! \ogs_file_param{prj__processes__process__RichardsComponentTransport__porous_medium__porous_medium__capillary_pressure}
- porous_medium_config.getConfigSubtree("capillary_pressure");
- auto capillary_pressure =
- MaterialLib::PorousMedium::createCapillaryPressureModel(
- capillary_pressure_config);
- capillary_pressure_models.emplace_back(std::move(capillary_pressure));
- }
-
- std::vector<int> material_ids(mesh.getNumberOfElements());
- if (mesh.getProperties().existsPropertyVector<int>("MaterialIDs"))
- {
- auto const& mesh_material_ids =
- mesh.getProperties().getPropertyVector<int>("MaterialIDs");
- material_ids.reserve(mesh_material_ids->size());
- std::copy(mesh_material_ids->cbegin(), mesh_material_ids->cend(),
- material_ids.begin());
- }
-
- return PorousMediaProperties{std::move(capillary_pressure_models),
- std::move(material_ids)};
-}
-
-} // namespace RichardsComponentTransport
-} // namespace ProcessLib
diff --git a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.h b/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.h
deleted file mode 100644
index f56fd14a0d7..00000000000
--- a/ProcessLib/RichardsComponentTransport/CreatePorousMediaProperties.h
+++ /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
- */
-
-#pragma once
-
-#include "BaseLib/ConfigTree.h"
-#include "PorousMediaProperties.h"
-
-namespace MeshLib
-{
-class Mesh;
-}
-
-namespace ProcessLib
-{
-namespace RichardsComponentTransport
-{
-PorousMediaProperties createPorousMediaProperties(
- MeshLib::Mesh& mesh, BaseLib::ConfigTree const& porous_medium_configs);
-}
-}
diff --git a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp b/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp
deleted file mode 100644
index bc9d029a7ad..00000000000
--- a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.cpp
+++ /dev/null
@@ -1,33 +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 "PorousMediaProperties.h"
-
-#include "ParameterLib/SpatialPosition.h"
-
-namespace ProcessLib
-{
-namespace RichardsComponentTransport
-{
-int PorousMediaProperties::getMaterialID(
- ParameterLib::SpatialPosition const& pos) const
-{
- int const element_id = pos.getElementID().value();
- return _material_ids[element_id];
-}
-
-MaterialLib::PorousMedium::CapillaryPressureSaturation const&
-PorousMediaProperties::getCapillaryPressureSaturationModel(
- double /*t*/, ParameterLib::SpatialPosition const& pos) const
-{
- return *_capillary_pressure_saturation_models[getMaterialID(pos)];
-}
-} // namespace RichardsComponentTransport
-} // namespace ProcessLib
diff --git a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h b/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h
deleted file mode 100644
index 32cac790d0a..00000000000
--- a/ProcessLib/RichardsComponentTransport/PorousMediaProperties.h
+++ /dev/null
@@ -1,64 +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
- */
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include "MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CapillaryPressureSaturation.h"
-
-namespace ParameterLib
-{
-class SpatialPosition;
-}
-
-namespace ProcessLib
-{
-namespace RichardsComponentTransport
-{
-
-class PorousMediaProperties
-{
-public:
- PorousMediaProperties(
- std::vector<std::unique_ptr<
- MaterialLib::PorousMedium::CapillaryPressureSaturation>>&&
- capillary_pressure_saturation_models,
- std::vector<int>&& material_ids)
- : _capillary_pressure_saturation_models(
- std::move(capillary_pressure_saturation_models)),
- _material_ids(std::move(material_ids))
- {
- }
-
- PorousMediaProperties(PorousMediaProperties&& other)
- : _capillary_pressure_saturation_models(
- std::move(other._capillary_pressure_saturation_models)),
- _material_ids(other._material_ids)
- {
- }
-
- MaterialLib::PorousMedium::CapillaryPressureSaturation const&
- getCapillaryPressureSaturationModel(
- double t, ParameterLib::SpatialPosition const& pos) const;
-
-private:
- int getMaterialID(ParameterLib::SpatialPosition const& pos) const;
-
-private:
- std::vector<
- std::unique_ptr<MaterialLib::PorousMedium::CapillaryPressureSaturation>>
- _capillary_pressure_saturation_models;
- std::vector<int> _material_ids;
-};
-
-} // namespace RichardsComponentTransport
-} // namespace ProcessLib
--
GitLab