From eb10bff72fedc1282ca1dafe47c199d481c11d01 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 20 Feb 2019 19:13:11 +0100
Subject: [PATCH] [PL] Add an optional mesh tag to parameters.
---
.../prj/parameters/parameter/t_mesh.md | 6 ++++++
ProcessLib/Parameter/Parameter.cpp | 19 +++++++++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
create mode 100644 Documentation/ProjectFile/prj/parameters/parameter/t_mesh.md
diff --git a/Documentation/ProjectFile/prj/parameters/parameter/t_mesh.md b/Documentation/ProjectFile/prj/parameters/parameter/t_mesh.md
new file mode 100644
index 00000000000..65e9f2aca8d
--- /dev/null
+++ b/Documentation/ProjectFile/prj/parameters/parameter/t_mesh.md
@@ -0,0 +1,6 @@
+The domain of definition of the parameter.
+
+The parameter's domain of definition is implicitly the main mesh.
+It needs to be specified explicitly for parameters defined on boundary
+or subdomain meshes. A notable exception is the Constant parameter,
+which has an arbitrary domain of definition.
diff --git a/ProcessLib/Parameter/Parameter.cpp b/ProcessLib/Parameter/Parameter.cpp
index 8d21a617f5c..2cddcff1c57 100644
--- a/ProcessLib/Parameter/Parameter.cpp
+++ b/ProcessLib/Parameter/Parameter.cpp
@@ -33,6 +33,17 @@ std::unique_ptr<ParameterBase> createParameter(
//! \ogs_file_param{prj__parameters__parameter__type}
auto const type = config.peekConfigParameter<std::string>("type");
+ // Either the mesh name is given, or the first mesh's name will be
+ // taken.
+ auto const mesh_name =
+ //! \ogs_file_param{prj__parameters__parameter__mesh}
+ config.getConfigParameter<std::string>("mesh", meshes[0]->getName());
+
+ auto const& mesh = *BaseLib::findElementOrError(
+ begin(meshes), end(meshes),
+ [&mesh_name](auto const& m) { return m->getName() == mesh_name; },
+ "Expected to find a mesh named " + mesh_name + ".");
+
// Create parameter based on the provided type.
if (type == "Constant")
{
@@ -49,25 +60,25 @@ std::unique_ptr<ParameterBase> createParameter(
if (type == "Function")
{
INFO("FunctionParameter: %s", name.c_str());
- auto param = createFunctionParameter(name, config, *meshes.front());
+ auto param = createFunctionParameter(name, config, mesh);
return param;
}
if (type == "Group")
{
INFO("GroupBasedParameter: %s", name.c_str());
- auto param = createGroupBasedParameter(name, config, *meshes.front());
+ auto param = createGroupBasedParameter(name, config, mesh);
return param;
}
if (type == "MeshElement")
{
INFO("MeshElementParameter: %s", name.c_str());
- auto param = createMeshElementParameter(name, config, *meshes.front());
+ auto param = createMeshElementParameter(name, config, mesh);
return param;
}
if (type == "MeshNode")
{
INFO("MeshNodeParameter: %s", name.c_str());
- auto param = createMeshNodeParameter(name, config, *meshes.front());
+ auto param = createMeshNodeParameter(name, config, mesh);
return param;
}
--
GitLab