From d4382f757b983f2c108e271e5bc2d6c4788929bb Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 7 Feb 2019 15:04:02 +0100
Subject: [PATCH] [PL] Rename DeactivateSubd.::zero_parameter_name.
---
Applications/ApplicationsLib/ProjectData.cpp | 2 +-
ProcessLib/DeactivatedSubdomain.cpp | 2 +-
ProcessLib/DeactivatedSubdomain.h | 2 +-
ProcessLib/ProcessVariable.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index ce542f45ea2..28e1e84b684 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -307,7 +307,7 @@ void ProjectData::parseParameters(BaseLib::ConfigTree const& parameters_config)
_parameters.push_back(
std::make_unique<ProcessLib::ConstantParameter<double>>(
- ProcessLib::DeactivatedSubdomain::name_of_paramater_of_zero, 0.0));
+ ProcessLib::DeactivatedSubdomain::zero_parameter_name, 0.0));
for (auto& parameter : _parameters)
parameter->initialize(_parameters);
diff --git a/ProcessLib/DeactivatedSubdomain.cpp b/ProcessLib/DeactivatedSubdomain.cpp
index 34fe292767c..82a71560966 100644
--- a/ProcessLib/DeactivatedSubdomain.cpp
+++ b/ProcessLib/DeactivatedSubdomain.cpp
@@ -24,7 +24,7 @@
namespace ProcessLib
{
-const std::string DeactivatedSubdomain::name_of_paramater_of_zero =
+const std::string DeactivatedSubdomain::zero_parameter_name =
"zero_for_element_deactivation_approach";
DeactivetedSubdomainMesh::DeactivetedSubdomainMesh(
diff --git a/ProcessLib/DeactivatedSubdomain.h b/ProcessLib/DeactivatedSubdomain.h
index 637ab592851..dbfac39dee8 100644
--- a/ProcessLib/DeactivatedSubdomain.h
+++ b/ProcessLib/DeactivatedSubdomain.h
@@ -63,7 +63,7 @@ struct DeactivatedSubdomain
std::vector<std::unique_ptr<DeactivetedSubdomainMesh>> const
deactivated_subdomain_meshes;
- static const std::string name_of_paramater_of_zero;
+ static const std::string zero_parameter_name;
};
std::vector<std::unique_ptr<DeactivatedSubdomain const>>
diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index d85f0c06c46..7ae6e0ae026 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -231,7 +231,7 @@ void ProcessVariable::createBoundaryConditionsForDeactivatedSubDomains(
std::vector<std::unique_ptr<BoundaryCondition>>& bcs)
{
auto& parameter = findParameter<double>(
- DeactivatedSubdomain::name_of_paramater_of_zero, parameters, 1);
+ DeactivatedSubdomain::zero_parameter_name, parameters, 1);
for (auto const& deactivated_subdomain : _deactivated_subdomains)
{
--
GitLab