diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 10b42a97ca4fedc73804934d2b36f0c2f5dfd335..8d2a41815e44652499da09925ca09937383cc3da 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -112,6 +112,7 @@ std::unique_ptr<MeshLib::Mesh> readSingleMesh(
{
std::string const mesh_file = BaseLib::copyPathToFileName(
mesh_config_parameter.getValue<std::string>(), project_directory);
+ DBUG("Reading mesh file \'%s\'.", mesh_file.c_str());
auto mesh = std::unique_ptr<MeshLib::Mesh>(
MeshLib::IO::readMeshFromFile(mesh_file));
@@ -121,6 +122,11 @@ std::unique_ptr<MeshLib::Mesh> readSingleMesh(
mesh_file.c_str());
}
+#ifdef DOXYGEN_DOCU_ONLY
+ //! \ogs_file_attr{prj__meshes__mesh__axially_symmetric}
+ mesh_config_parameter.getConfigAttributeOptional<bool>("axially_symmetric");
+#endif // DOXYGEN_DOCU_ONLY
+
if (auto const axially_symmetric =
//! \ogs_file_attr{prj__mesh__axially_symmetric}
mesh_config_parameter.getConfigAttributeOptional<bool>(
@@ -137,26 +143,45 @@ std::vector<std::unique_ptr<MeshLib::Mesh>> readMeshes(
{
std::vector<std::unique_ptr<MeshLib::Mesh>> meshes;
- meshes.push_back(
+ //! \ogs_file_param{prj__meshes}
+ auto optional_meshes = config.getConfigSubtreeOptional("meshes");
+ if (optional_meshes)
+ {
+ DBUG("Reading multiple meshes.");
+ for (auto mesh_config :
+ //! \ogs_file_param{prj__meshes__mesh}
+ optional_meshes->getConfigParameterList("mesh"))
+ {
+ meshes.push_back(readSingleMesh(mesh_config, project_directory));
+ }
+ }
+ else
+ { // Read single mesh with geometry.
+ WARN(
+ "Consider switching from mesh and geometry input to multiple "
+ "meshes input. See "
+ "https://www.opengeosys.org/docs/tools/model-preparation/"
+ "constructmeshesfromgeometry/ tool for conversion.");
//! \ogs_file_param{prj__mesh}
- readSingleMesh(config.getConfigParameter("mesh"), project_directory));
-
- std::string const geometry_file = BaseLib::copyPathToFileName(
- //! \ogs_file_param{prj__geometry}
- config.getConfigParameter<std::string>("geometry"),
- project_directory);
- GeoLib::GEOObjects geoObjects;
- readGeometry(geometry_file, geoObjects);
-
- std::unique_ptr<MeshGeoToolsLib::SearchLength> search_length_algorithm =
- MeshGeoToolsLib::createSearchLengthAlgorithm(config, *meshes[0]);
- auto additional_meshes =
- MeshGeoToolsLib::constructAdditionalMeshesFromGeoObjects(
- geoObjects, *meshes[0], std::move(search_length_algorithm));
-
- std::move(begin(additional_meshes), end(additional_meshes),
- std::back_inserter(meshes));
-
+ meshes.push_back(readSingleMesh(config.getConfigParameter("mesh"),
+ project_directory));
+
+ std::string const geometry_file = BaseLib::copyPathToFileName(
+ //! \ogs_file_param{prj__geometry}
+ config.getConfigParameter<std::string>("geometry"),
+ project_directory);
+ GeoLib::GEOObjects geoObjects;
+ readGeometry(geometry_file, geoObjects);
+
+ std::unique_ptr<MeshGeoToolsLib::SearchLength> search_length_algorithm =
+ MeshGeoToolsLib::createSearchLengthAlgorithm(config, *meshes[0]);
+ auto additional_meshes =
+ MeshGeoToolsLib::constructAdditionalMeshesFromGeoObjects(
+ geoObjects, *meshes[0], std::move(search_length_algorithm));
+
+ std::move(begin(additional_meshes), end(additional_meshes),
+ std::back_inserter(meshes));
+ }
return meshes;
}
} // namespace
@@ -215,20 +240,26 @@ void ProjectData::parseProcessVariables(
{
DBUG("Parse process variables:");
- if (_mesh_vec.empty() || _mesh_vec[0] == nullptr)
- {
- ERR("A mesh is required to define process variables.");
- return;
- }
-
std::set<std::string> names;
for (auto var_config
//! \ogs_file_param{prj__process_variables__process_variable}
: process_variables_config.getConfigSubtreeList("process_variable"))
{
- auto pv =
- ProcessLib::ProcessVariable{var_config, _mesh_vec, _parameters};
+ // Either the mesh name is given, or the first mesh's name will be
+ // taken. Taking the first mesh's value is deprecated.
+ auto const mesh_name =
+ //! \ogs_file_param{prj__process_variables__process_variable__mesh}
+ var_config.getConfigParameter<std::string>("mesh",
+ _mesh_vec[0]->getName());
+
+ auto& mesh = *BaseLib::findElementOrError(
+ begin(_mesh_vec), end(_mesh_vec),
+ [&mesh_name](auto const& m) { return m->getName() == mesh_name; },
+ "Expected to find a mesh named " + mesh_name + ".");
+
+ auto pv = ProcessLib::ProcessVariable{var_config, mesh, _mesh_vec,
+ _parameters};
if (!names.insert(pv.getName()).second)
OGS_FATAL("A process variable with name `%s' already exists.",
pv.getName().c_str());
diff --git a/Applications/FileIO/XmlIO/OpenGeoSysProject.xsd b/Applications/FileIO/XmlIO/OpenGeoSysProject.xsd
index 0eefb0c17c0d931351d8999e0f85e4353f6623e0..131eaa850a965c5a757bc95a14e1d2d011b97ab6 100644
--- a/Applications/FileIO/XmlIO/OpenGeoSysProject.xsd
+++ b/Applications/FileIO/XmlIO/OpenGeoSysProject.xsd
@@ -15,6 +15,16 @@
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="meshType">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="axially_symmetric" type="xs:boolean"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:complexType>
+
<xs:complexType name="parameterType">
<xs:sequence>
<xs:element ref="name" minOccurs="1" maxOccurs="1" />
@@ -29,8 +39,8 @@
<xs:element name="geometrical_set" type="xs:string" minOccurs="0" />
<xs:element name="geometry" type="xs:string" minOccurs="0" />
<xs:element name="type" type="xs:string" />
- <xs:element name="field_name" type="xs:string" minOccurs="0" />
<xs:element name="mesh" type="xs:string" minOccurs="0" />
+ <xs:element name="field_name" type="xs:string" minOccurs="0" />
<xs:element name="parameter" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -50,6 +60,7 @@
<xs:complexType name="pvariableType">
<xs:sequence>
<xs:element ref="name"/>
+ <xs:element name="mesh" type="xs:string" minOccurs="0"/>
<xs:element name="components" minOccurs="1" maxOccurs="1">
<xs:simpleType>
<xs:restriction base="xs:nonNegativeInteger">
@@ -76,16 +87,15 @@
<xs:element name="OpenGeoSysProject">
<xs:complexType>
<xs:sequence>
- <xs:element name="mesh" minOccurs="0">
+ <xs:element name="mesh" type="meshType" minOccurs="0"/>
+ <xs:element name="geometry" type="xs:string" minOccurs="0"/>
+ <xs:element name="meshes" minOccurs="0" maxOccurs="1">
<xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="axially_symmetric" type="xs:boolean"/>
- </xs:extension>
- </xs:simpleContent>
+ <xs:sequence>
+ <xs:element name="mesh" type="meshType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="geometry" type="xs:string" minOccurs="0"/>
<xs:element name="processes" minOccurs="0"/> <!--ignore-->
<xs:element name="time_loop" minOccurs="0"/> <!--ignore-->
<xs:element name="parameters" minOccurs="0">
diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
index 9a2b1a7118a3cf27b99676597256912ef162d07f..9b313402a2ca0ca9f2739fe229a9db75b80a69a3 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
@@ -63,6 +63,15 @@ int XmlPrjInterface::readFile(const QString& fileName)
return 0;
}
+ auto read_single_mesh = [&](QString const& mesh_str) {
+ std::unique_ptr<MeshLib::Mesh> mesh{
+ MeshLib::IO::readMeshFromFile(mesh_str.toStdString())};
+ if (mesh != nullptr)
+ {
+ _project.addMesh(std::move(mesh));
+ }
+ };
+
QDomNodeList fileList = docElement.childNodes();
for (int i = 0; i < fileList.count(); i++)
@@ -93,11 +102,41 @@ int XmlPrjInterface::readFile(const QString& fileName)
}
else if (node_name == "mesh")
{
- QString const mesh_str(path + file_name);
- std::unique_ptr<MeshLib::Mesh> mesh(
- MeshLib::IO::readMeshFromFile(mesh_str.toStdString()));
- if (mesh)
- _project.addMesh(std::move(mesh));
+ read_single_mesh(path + file_name);
+ }
+ else if (node_name == "meshes")
+ {
+ for (QDomNode meshes_node = node.firstChild();
+ meshes_node != QDomNode();
+ meshes_node = meshes_node.nextSibling())
+ {
+ if (!meshes_node.isElement())
+ {
+ ERR("Expected an XML element node.")
+ return 0;
+ }
+ if (meshes_node.nodeName() != "mesh")
+ {
+ ERR("Expected an XML element node named 'mesh' got '%s'.",
+ meshes_node.nodeName().data())
+ return 0;
+ }
+ if (meshes_node.childNodes().count() != 1)
+ {
+ ERR("Expected an XML element node named 'mesh' to contain "
+ "exactly one child node but it has %d children.",
+ meshes_node.childNodes().count());
+ return 0;
+ }
+ QDomNode node_text = meshes_node.firstChild();
+ if (!node_text.isText())
+ {
+ ERR("Expected an XML element node named 'mesh' to contain "
+ "text.")
+ return 0;
+ }
+ read_single_mesh(path + node_text.toText().data().trimmed());
+ }
}
else if (node_name == "parameters")
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index 1ef560f624e48b53840e796bf524a89b2b81680f..a3f5e1673f488dd786a052c18a7d289439dcb0e8 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -2023,7 +2023,7 @@ INCLUDE_FILE_PATTERNS =
# recursively expanded use the := operator instead of the = operator.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-PREDEFINED =
+PREDEFINED = DOXYGEN_DOCU_ONLY
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
# tag can be used to specify a list of macro names that should be expanded. The
diff --git a/Documentation/ProjectFile/prj/mesh/a_axially_symmetric.md b/Documentation/ProjectFile/prj/mesh/a_axially_symmetric.md
index 576add64edccf5d980a0ff86143dc43a7109a788..78adddb265cd686ed51b2f262c1443127d34f28c 100644
--- a/Documentation/ProjectFile/prj/mesh/a_axially_symmetric.md
+++ b/Documentation/ProjectFile/prj/mesh/a_axially_symmetric.md
@@ -1 +1,4 @@
-\ogs_missing_documentation
+Axial symmetry can be used to reduce complexity of a problem by reducing the
+geometrical dimension by one. The symmetry axis is y-axis in 1D and 2D cases.
+
+Only applicable to 1D and 2D meshes.
diff --git a/Documentation/ProjectFile/prj/meshes/i_meshes.md b/Documentation/ProjectFile/prj/meshes/i_meshes.md
new file mode 100644
index 0000000000000000000000000000000000000000..83466e46826b8815c9a4ba50fcc668ee572af827
--- /dev/null
+++ b/Documentation/ProjectFile/prj/meshes/i_meshes.md
@@ -0,0 +1 @@
+External mesh file names for the process variables and the boundary conditions.
diff --git a/Documentation/ProjectFile/prj/meshes/mesh/a_axially_symmetric.md b/Documentation/ProjectFile/prj/meshes/mesh/a_axially_symmetric.md
new file mode 100644
index 0000000000000000000000000000000000000000..78adddb265cd686ed51b2f262c1443127d34f28c
--- /dev/null
+++ b/Documentation/ProjectFile/prj/meshes/mesh/a_axially_symmetric.md
@@ -0,0 +1,4 @@
+Axial symmetry can be used to reduce complexity of a problem by reducing the
+geometrical dimension by one. The symmetry axis is y-axis in 1D and 2D cases.
+
+Only applicable to 1D and 2D meshes.
diff --git a/Documentation/ProjectFile/prj/meshes/mesh/i_mesh.md b/Documentation/ProjectFile/prj/meshes/mesh/i_mesh.md
new file mode 100644
index 0000000000000000000000000000000000000000..11ed78b9ec0b7e61c6f2e191a45b0cd5a8cb48f5
--- /dev/null
+++ b/Documentation/ProjectFile/prj/meshes/mesh/i_mesh.md
@@ -0,0 +1 @@
+Information about input mesh.
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/NonuniformDirichlet/t_mesh.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/NonuniformDirichlet/t_mesh.md
deleted file mode 100644
index b448b3494b3b8e6e94b50a58ec0e10733171e06e..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/NonuniformDirichlet/t_mesh.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Path to the surface mesh vtu file.
-
-The surface mesh must contain a nodal integer-valued field (unsigned 64bit)
-named \c OriginalSubsurfaceNodeIDs. That field establishes the mapping between
-the nodes of the surface mesh to some notes in the bulk mesh.
-\warning It is not checked if the surface mesh and the bulk mesh correspond to each
-other; in particular it is not checked if surface and bulk nodes coincide and if
-surface elements coincide with the faces of bulk elements.
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/NonuniformNeumann/t_mesh.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/NonuniformNeumann/t_mesh.md
deleted file mode 100644
index b448b3494b3b8e6e94b50a58ec0e10733171e06e..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/NonuniformNeumann/t_mesh.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Path to the surface mesh vtu file.
-
-The surface mesh must contain a nodal integer-valued field (unsigned 64bit)
-named \c OriginalSubsurfaceNodeIDs. That field establishes the mapping between
-the nodes of the surface mesh to some notes in the bulk mesh.
-\warning It is not checked if the surface mesh and the bulk mesh correspond to each
-other; in particular it is not checked if surface and bulk nodes coincide and if
-surface elements coincide with the faces of bulk elements.
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_mesh.md b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_mesh.md
new file mode 100644
index 0000000000000000000000000000000000000000..4a4b6835fe9820798cb7e1ad0185f45bbc4bc4dd
--- /dev/null
+++ b/Documentation/ProjectFile/prj/process_variables/process_variable/boundary_conditions/boundary_condition/t_mesh.md
@@ -0,0 +1,10 @@
+Name of the surface mesh where the boundary condition will be defined.
+
+The surface mesh must contain a nodal integer-valued field (unsigned 64bit)
+named \c bulk_node_ids, and a cell field named \c bulk_element_ids. These fields
+establish the mapping between the nodes of the surface mesh to the nodes in the
+bulk mesh.
+
+\warning It is not checked if the surface mesh and the bulk mesh
+correspond to each other; in particular it is not checked if surface and bulk
+nodes coincide and if surface elements coincide with the faces of bulk elements.
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/source_terms/source_term/t_mesh.md b/Documentation/ProjectFile/prj/process_variables/process_variable/source_terms/source_term/t_mesh.md
new file mode 100644
index 0000000000000000000000000000000000000000..e43f1eb6a0a6b37d38c5d44e3540fcc0faea4e75
--- /dev/null
+++ b/Documentation/ProjectFile/prj/process_variables/process_variable/source_terms/source_term/t_mesh.md
@@ -0,0 +1,10 @@
+Name of the mesh where the source term will be applied.
+
+The surface mesh must contain a nodal integer-valued field (unsigned 64bit)
+named \c bulk_node_ids, and a cell field named \c bulk_element_ids. These fields
+establish the mapping between the nodes of the surface mesh to the nodes in the
+bulk mesh.
+
+\warning It is not checked if the surface mesh and the bulk mesh
+correspond to each other; in particular it is not checked if surface and bulk
+nodes coincide and if surface elements coincide with the faces of bulk elements.
diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/t_mesh.md b/Documentation/ProjectFile/prj/process_variables/process_variable/t_mesh.md
new file mode 100644
index 0000000000000000000000000000000000000000..591ede39bca8e13c56ad8dc36995b4dcb888eb90
--- /dev/null
+++ b/Documentation/ProjectFile/prj/process_variables/process_variable/t_mesh.md
@@ -0,0 +1 @@
+A mesh name for the process variable's domain of definition.
diff --git a/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp b/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp
index 96b2a4e609acef7ed24e860cd13d21b0b1c75ebf..d4fbaa3b04c0757311ee2622abf3b73f374f5ef7 100644
--- a/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp
+++ b/MeshGeoToolsLib/ConstructMeshesFromGeometries.cpp
@@ -20,6 +20,12 @@
namespace MeshGeoToolsLib
{
+std::string meshNameFromGeometry(std::string const& geometrical_set_name,
+ std::string const& geometry_name)
+{
+ return geometrical_set_name + "_" + geometry_name;
+}
+
template <typename GeometryVec>
std::vector<std::unique_ptr<MeshLib::Mesh>>
constructAdditionalMeshesFromGeometries(
@@ -55,7 +61,7 @@ constructAdditionalMeshesFromGeometries(
geometry_name.c_str());
additional_meshes.emplace_back(createMeshFromElementSelection(
- vec_name + "_" + geometry_name,
+ meshNameFromGeometry(vec_name, geometry_name),
MeshLib::cloneElements(
boundary_element_searcher.getBoundaryElements(geometry))));
}
diff --git a/MeshGeoToolsLib/ConstructMeshesFromGeometries.h b/MeshGeoToolsLib/ConstructMeshesFromGeometries.h
index c7aeb7113549e5b2ac65e8e3168a5aa1474a179d..3efbf3d7ed9d8e2e715e3c0445f38653af5d5681 100644
--- a/MeshGeoToolsLib/ConstructMeshesFromGeometries.h
+++ b/MeshGeoToolsLib/ConstructMeshesFromGeometries.h
@@ -31,4 +31,7 @@ constructAdditionalMeshesFromGeoObjects(GeoLib::GEOObjects const& geo_objects,
MeshLib::Mesh const& mesh,
std::unique_ptr<SearchLength>
search_length_algorithm);
+
+std::string meshNameFromGeometry(std::string const& geometrical_set_name,
+ std::string const& geometry_name);
} // namespace MeshGeoToolsLib
diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
index aa49b458c07b5500d2d0c2be68676ba9355db3db..e47d071ed3b55ab02fe7f9373e76bee06987f43d 100644
--- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
+++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp
@@ -563,13 +563,9 @@ MeshLib::NodePartitionedMesh* NodePartitionedMeshReader::newMesh(
MeshLib::Properties const& properties) const
{
return new MeshLib::NodePartitionedMesh(
- mesh_name + std::to_string(_mpi_comm_size),
- mesh_nodes, glb_node_ids, mesh_elems,
- properties,
- _mesh_info.global_base_nodes,
- _mesh_info.global_nodes,
- _mesh_info.base_nodes,
- _mesh_info.active_base_nodes,
+ mesh_name, mesh_nodes, glb_node_ids, mesh_elems, properties,
+ _mesh_info.global_base_nodes, _mesh_info.global_nodes,
+ _mesh_info.base_nodes, _mesh_info.active_base_nodes,
_mesh_info.active_nodes);
}
diff --git a/MeshLib/Node.cpp b/MeshLib/Node.cpp
index e147769af02dd5fb10eb1f0a881b4148710545e6..a212f11539b0f91ff3dd6c0bab2e594c11253790 100644
--- a/MeshLib/Node.cpp
+++ b/MeshLib/Node.cpp
@@ -49,5 +49,18 @@ void Node::updateCoordinates(double x, double y, double z)
_elements[i]->computeVolume();
}
+bool isBaseNode(Node const& node)
+{
+ // Check if node is connected.
+ if (node.getNumberOfElements() == 0)
+ return true;
+
+ // In a mesh a node always belongs to at least one element.
+ auto const e = node.getElement(0);
+
+ auto const n_base_nodes = e->getNumberOfBaseNodes();
+ auto const local_index = e->getNodeIDinElement(&node);
+ return local_index < n_base_nodes;
+}
}
diff --git a/MeshLib/Node.h b/MeshLib/Node.h
index dc105a3a24b0d61647f92120e3b174395e5bffe5..558561ef257baaa5281998c1819203051a7fd086 100644
--- a/MeshLib/Node.h
+++ b/MeshLib/Node.h
@@ -102,4 +102,8 @@ protected:
std::vector<Element*> _elements;
}; /* class */
+/// Returns true if the given node is a base node of a (first) element, or if it
+/// is not connected to any element i.e. an unconnected node.
+bool isBaseNode(Node const& node);
+
} /* namespace */
diff --git a/NumLib/DOF/LocalToGlobalIndexMap.h b/NumLib/DOF/LocalToGlobalIndexMap.h
index 8100ac00c155e200f072c91b1115e18e3051eede..fc59e6b57c787e4b109d77c35932c8413ce89b80 100644
--- a/NumLib/DOF/LocalToGlobalIndexMap.h
+++ b/NumLib/DOF/LocalToGlobalIndexMap.h
@@ -96,7 +96,7 @@ public:
LocalToGlobalIndexMap* deriveBoundaryConstrainedMap(
int const variable_id,
std::vector<int> const& component_ids,
- MeshLib::MeshSubset&& mesh_subset) const;
+ MeshLib::MeshSubset&& new_mesh_subset) const;
/// Derive a LocalToGlobalIndexMap constrained to the mesh subset and mesh
/// subset's elements. A new mesh component map will be constructed using
diff --git a/NumLib/DOF/MeshComponentMap.cpp b/NumLib/DOF/MeshComponentMap.cpp
index 00b17de4a953ef12f1a9c4dad69590f341480c48..97bb45d67b22ed6cd8495a07c54598417f2d8c4e 100644
--- a/NumLib/DOF/MeshComponentMap.cpp
+++ b/NumLib/DOF/MeshComponentMap.cpp
@@ -159,6 +159,7 @@ MeshComponentMap MeshComponentMap::getSubset(
for (auto* const node : new_mesh_subset.getNodes())
{
auto const node_id = node->getID();
+ bool const is_base_node = isBaseNode(*node);
MeshLib::Location const new_location{
new_mesh_id, MeshLib::MeshItemType::Node, node_id};
@@ -174,18 +175,22 @@ MeshComponentMap MeshComponentMap::getSubset(
getGlobalIndex(bulk_location, component_id);
if (global_index == nop)
{
- OGS_FATAL(
- "Could not find a global index for global component %d for "
- "the mesh '%s', node %d, in the corresponding bulk mesh "
- "'%s' and node %d. This happens because the boundary mesh "
- "is larger then the definition region of the bulk "
- "component, usually because the geometry for the boundary "
- "condition is too large.",
- component_id,
- new_mesh_subset.getMesh().getName().c_str(),
- node_id,
- bulk_mesh_subsets.front().getMesh().getName().c_str(),
- bulk_node_ids_map[node_id]);
+ if (is_base_node)
+ {
+ OGS_FATAL(
+ "Could not find a global index for global component %d "
+ "for the mesh '%s', node %d, in the corresponding bulk "
+ "mesh '%s' and node %d. This happens because the "
+ "boundary mesh is larger then the definition region of "
+ "the bulk component, usually because the geometry for "
+ "the boundary condition is too large.",
+ component_id,
+ new_mesh_subset.getMesh().getName().c_str(),
+ node_id,
+ bulk_mesh_subsets.front().getMesh().getName().c_str(),
+ bulk_node_ids_map[node_id]);
+ }
+ continue;
}
subset_dict.insert({new_location, component_id, global_index});
}
diff --git a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp
index 33567c6e25e44812d3e77c65358d1685b02d91c2..21c3d379715133401441cba1c517c54b1c9c1f96 100644
--- a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryCondition.cpp
@@ -312,6 +312,20 @@ createConstraintDirichletBoundaryCondition(
auto& param = findParameter<double>(param_name, parameters, 1);
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (bc_mesh.getDimension() == 0 && bc_mesh.getNumberOfNodes() == 0 &&
+ bc_mesh.getNumberOfElements() == 0)
+ {
+ return nullptr;
+ }
+#endif // USE_PETSC
+
return std::make_unique<ConstraintDirichletBoundaryCondition>(
param, dof_table_bulk, variable_id, component_id, bc_mesh,
integration_order, constraining_process.getMesh(), constraint_threshold,
diff --git a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
index 9f743852da775e4e9ab93339547fdcd237fdfb29..0430a775bdd808b6ca765cd2cc8069ccc71390ab 100644
--- a/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/ConstraintDirichletBoundaryConditionLocalAssembler.h
@@ -96,7 +96,7 @@ public:
FemType fe(*static_cast<const typename ShapeFunction::MeshElement*>(
&_surface_element));
- std::size_t const n_integration_points =
+ auto const n_integration_points =
_integration_method.getNumberOfPoints();
auto const bulk_face_id = bulk_ids[_surface_element.getID()].second;
@@ -106,7 +106,7 @@ public:
shape_matrices;
shape_matrices.reserve(n_integration_points);
_ip_data.reserve(n_integration_points);
- for (std::size_t ip = 0; ip < n_integration_points; ++ip)
+ for (unsigned ip = 0; ip < n_integration_points; ++ip)
{
shape_matrices.emplace_back(ShapeFunction::DIM, GlobalDim,
ShapeFunction::NPOINTS);
@@ -141,7 +141,7 @@ public:
// integrated_value +=
// int_{\Gamma_e} \alpha \cdot flux \cdot normal \d \Gamma
double integrated_value = 0;
- for (unsigned ip(0); ip < n_integration_points; ip++)
+ for (unsigned ip = 0; ip < n_integration_points; ip++)
{
auto const bulk_flux = getFlux(
_bulk_element_id, _ip_data[ip].bulk_element_point, t, x);
diff --git a/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp
index fb9d8e9f091c66ae932fe6f7d2cb82623507bd01..2dc1cdb9c47d23a391b61656ad556cce5446d8d4 100644
--- a/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp
@@ -33,42 +33,52 @@ std::unique_ptr<BoundaryCondition> createBoundaryCondition(
const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& parameters,
const Process& process)
{
+ // Surface mesh and bulk mesh must have equal axial symmetry flags!
+ if (config.boundary_mesh.isAxiallySymmetric() !=
+ bulk_mesh.isAxiallySymmetric())
+ {
+ OGS_FATAL(
+ "The boundary mesh %s axially symmetric but the bulk mesh %s. Both "
+ "must have an equal axial symmetry property.",
+ config.boundary_mesh.isAxiallySymmetric() ? "is" : "is not",
+ bulk_mesh.isAxiallySymmetric() ? "is" : "is not");
+ }
+
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
auto const type = config.config.peekConfigParameter<std::string>("type");
if (type == "Dirichlet")
{
return ProcessLib::createDirichletBoundaryCondition(
- config.config, config.boundary_mesh, dof_table, bulk_mesh.getID(),
- variable_id, *config.component_id, parameters);
+ config.config, config.boundary_mesh, dof_table, variable_id,
+ *config.component_id, parameters);
}
if (type == "Neumann")
{
return ProcessLib::createNeumannBoundaryCondition(
config.config, config.boundary_mesh, dof_table, variable_id,
- *config.component_id, bulk_mesh.isAxiallySymmetric(),
- integration_order, shapefunction_order, bulk_mesh.getDimension(),
- parameters);
+ *config.component_id, integration_order, shapefunction_order,
+ bulk_mesh.getDimension(), parameters);
}
if (type == "Robin")
{
return ProcessLib::createRobinBoundaryCondition(
config.config, config.boundary_mesh, dof_table, variable_id,
- *config.component_id, bulk_mesh.isAxiallySymmetric(),
- integration_order, shapefunction_order, bulk_mesh.getDimension(),
- parameters);
+ *config.component_id, integration_order, shapefunction_order,
+ bulk_mesh.getDimension(), parameters);
}
if (type == "NonuniformDirichlet")
{
return ProcessLib::createNonuniformDirichletBoundaryCondition(
- config.config, dof_table, variable_id, *config.component_id,
- bulk_mesh);
+ config.config, config.boundary_mesh, dof_table, variable_id,
+ *config.component_id, bulk_mesh);
}
if (type == "NonuniformNeumann")
{
return ProcessLib::createNonuniformNeumannBoundaryCondition(
- config.config, dof_table, variable_id, *config.component_id,
- integration_order, shapefunction_order, bulk_mesh);
+ config.config, config.boundary_mesh, dof_table, variable_id,
+ *config.component_id, integration_order, shapefunction_order,
+ bulk_mesh);
}
if (type == "Python")
{
@@ -96,8 +106,8 @@ std::unique_ptr<BoundaryCondition> createBoundaryCondition(
return ProcessLib::NormalTractionBoundaryCondition::
createNormalTractionBoundaryCondition(
config.config, config.boundary_mesh, dof_table, variable_id,
- bulk_mesh.isAxiallySymmetric(), integration_order,
- shapefunction_order, bulk_mesh.getDimension(), parameters);
+ integration_order, shapefunction_order,
+ bulk_mesh.getDimension(), parameters);
}
if (type == "PhaseFieldIrreversibleDamageOracleBoundaryCondition")
{
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
index 38a7e6d08c23e77390792e9855f37e2348c72aac..980ba2471d57a38aecc255230e5338b284f32805 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.cpp
@@ -22,10 +22,6 @@ void DirichletBoundaryCondition::getEssentialBCValues(
{
SpatialPosition pos;
- auto const& bulk_node_ids_map =
- *_bc_mesh.getProperties().getPropertyVector<std::size_t>(
- "bulk_node_ids");
-
bc_values.ids.clear();
bc_values.values.clear();
@@ -35,23 +31,24 @@ void DirichletBoundaryCondition::getEssentialBCValues(
_bc_mesh.getNumberOfNodes());
for (auto const* const node : _bc_mesh.getNodes())
{
- auto const id = bulk_node_ids_map[node->getID()];
- pos.setNodeID(id);
- MeshLib::Location l(_bulk_mesh_id, MeshLib::MeshItemType::Node, id);
+ auto const id = node->getID();
+ pos.setNodeID(node->getID());
// TODO: that might be slow, but only done once
- const auto g_idx =
- _dof_table.getGlobalIndex(l, _variable_id, _component_id);
- if (g_idx == NumLib::MeshComponentMap::nop)
+ auto const global_index = _dof_table_boundary->getGlobalIndex(
+ {_bc_mesh.getID(), MeshLib::MeshItemType::Node, id}, _variable_id,
+ _component_id);
+ if (global_index == NumLib::MeshComponentMap::nop)
continue;
// For the DDC approach (e.g. with PETSc option), the negative
- // index of g_idx means that the entry by that index is a ghost one,
- // which should be dropped. Especially for PETSc routines MatZeroRows
- // and MatZeroRowsColumns, which are called to apply the Dirichlet BC,
- // the negative index is not accepted like other matrix or vector
- // PETSc routines. Therefore, the following if-condition is applied.
- if (g_idx >= 0)
+ // index of global_index means that the entry by that index is a ghost
+ // one, which should be dropped. Especially for PETSc routines
+ // MatZeroRows and MatZeroRowsColumns, which are called to apply the
+ // Dirichlet BC, the negative index is not accepted like other matrix or
+ // vector PETSc routines. Therefore, the following if-condition is
+ // applied.
+ if (global_index >= 0)
{
- bc_values.ids.emplace_back(g_idx);
+ bc_values.ids.emplace_back(global_index);
bc_values.values.emplace_back(_parameter(t, pos).front());
}
}
@@ -59,8 +56,7 @@ void DirichletBoundaryCondition::getEssentialBCValues(
std::unique_ptr<DirichletBoundaryCondition> createDirichletBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
- NumLib::LocalToGlobalIndexMap const& dof_table,
- std::size_t const bulk_mesh_id, int const variable_id,
+ NumLib::LocalToGlobalIndexMap const& dof_table_bulk, int const variable_id,
int const component_id,
const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& parameters)
{
@@ -74,8 +70,22 @@ std::unique_ptr<DirichletBoundaryCondition> createDirichletBoundaryCondition(
auto& param = findParameter<double>(param_name, parameters, 1);
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (bc_mesh.getDimension() == 0 && bc_mesh.getNumberOfNodes() == 0 &&
+ bc_mesh.getNumberOfElements() == 0)
+ {
+ return nullptr;
+ }
+#endif // USE_PETSC
+
return std::make_unique<DirichletBoundaryCondition>(
- param, bc_mesh, dof_table, bulk_mesh_id, variable_id, component_id);
+ param, bc_mesh, dof_table_bulk, variable_id, component_id);
}
} // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.h b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.h
index f00681518cfe05cd57d18b8f6ed1f3e1c7c6ec41..0d6ce172b6f1dfdff237730875ba030739880014 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryCondition.h
@@ -24,28 +24,26 @@ namespace ProcessLib
class DirichletBoundaryCondition final : public BoundaryCondition
{
public:
- DirichletBoundaryCondition(Parameter<double> const& parameter,
- MeshLib::Mesh const& bc_mesh,
- NumLib::LocalToGlobalIndexMap const& dof_table,
- std::size_t const bulk_mesh_id,
- int const variable_id, int const component_id)
+ DirichletBoundaryCondition(
+ Parameter<double> const& parameter, MeshLib::Mesh const& bc_mesh,
+ NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
+ int const variable_id, int const component_id)
: _parameter(parameter),
_bc_mesh(bc_mesh),
- _dof_table(dof_table),
- _bulk_mesh_id(bulk_mesh_id),
_variable_id(variable_id),
_component_id(component_id)
{
- if (variable_id >= static_cast<int>(dof_table.getNumberOfVariables()) ||
+ if (variable_id >=
+ static_cast<int>(dof_table_bulk.getNumberOfVariables()) ||
component_id >=
- dof_table.getNumberOfVariableComponents(variable_id))
+ dof_table_bulk.getNumberOfVariableComponents(variable_id))
{
OGS_FATAL(
"Variable id or component id too high. Actual values: (%d, "
- "%d), "
- "maximum values: (%d, %d).",
- variable_id, component_id, dof_table.getNumberOfVariables(),
- dof_table.getNumberOfVariableComponents(variable_id));
+ "%d), maximum values: (%d, %d).",
+ variable_id, component_id,
+ dof_table_bulk.getNumberOfVariables(),
+ dof_table_bulk.getNumberOfVariableComponents(variable_id));
}
if (!_bc_mesh.getProperties().existsPropertyVector<std::size_t>(
@@ -55,6 +53,20 @@ public:
"The required bulk node ids map does not exist in the boundary "
"mesh '%s'.", _bc_mesh.getName().c_str());
}
+
+ std::vector<MeshLib::Node*> const& bc_nodes = _bc_mesh.getNodes();
+ DBUG(
+ "Found %d nodes for Dirichlet BCs for the variable %d and "
+ "component "
+ "%d",
+ bc_nodes.size(), variable_id, component_id);
+
+ MeshLib::MeshSubset bc_mesh_subset(_bc_mesh, bc_nodes);
+
+ // Create local DOF table from the BC mesh subset for the given variable
+ // and component id.
+ _dof_table_boundary.reset(dof_table_bulk.deriveBoundaryConstrainedMap(
+ variable_id, {component_id}, std::move(bc_mesh_subset)));
}
void getEssentialBCValues(
@@ -65,16 +77,15 @@ private:
Parameter<double> const& _parameter;
MeshLib::Mesh const& _bc_mesh;
- NumLib::LocalToGlobalIndexMap const& _dof_table;
- std::size_t const _bulk_mesh_id;
+ std::unique_ptr<NumLib::LocalToGlobalIndexMap const> _dof_table_boundary;
int const _variable_id;
int const _component_id;
};
std::unique_ptr<DirichletBoundaryCondition> createDirichletBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
- NumLib::LocalToGlobalIndexMap const& dof_table, std::size_t const mesh_id,
- int const variable_id, int const component_id,
+ NumLib::LocalToGlobalIndexMap const& dof_table_bulk, int const variable_id,
+ int const component_id,
const std::vector<std::unique_ptr<ProcessLib::ParameterBase>>& parameters);
} // namespace ProcessLib
diff --git a/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h b/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
index 4da13051714b8404c9380b8f25c46baf3e280c4c..98784d5b51fcd625e5c43340e4581669397f425a 100644
--- a/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
+++ b/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition-impl.h
@@ -7,9 +7,8 @@
*
*/
-#include "GenericNaturalBoundaryCondition.h"
-#include "ProcessLib/Utils/CreateLocalAssemblers.h"
#include "GenericNaturalBoundaryConditionLocalAssembler.h"
+#include "ProcessLib/Utils/CreateLocalAssemblers.h"
namespace ProcessLib
{
@@ -20,18 +19,16 @@ template <typename Data>
GenericNaturalBoundaryCondition<BoundaryConditionData,
LocalAssemblerImplementation>::
GenericNaturalBoundaryCondition(
- typename std::enable_if<
- std::is_same<typename std::decay<BoundaryConditionData>::type,
- typename std::decay<Data>::type>::value,
- bool>::type is_axially_symmetric,
unsigned const integration_order, unsigned const shapefunction_order,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, int const component_id,
unsigned const global_dim, MeshLib::Mesh const& bc_mesh, Data&& data)
- : _data(std::forward<Data>(data)),
- _bc_mesh(bc_mesh),
- _integration_order(integration_order)
+ : _data(std::forward<Data>(data)), _bc_mesh(bc_mesh)
{
+ static_assert(std::is_same<typename std::decay<BoundaryConditionData>::type,
+ typename std::decay<Data>::type>::value,
+ "Type mismatch between declared and passed BC data.");
+
// check basic data consistency
if (variable_id >=
static_cast<int>(dof_table_bulk.getNumberOfVariables()) ||
@@ -45,21 +42,38 @@ GenericNaturalBoundaryCondition<BoundaryConditionData,
dof_table_bulk.getNumberOfVariableComponents(variable_id));
}
+ if (_bc_mesh.getDimension() + 1 != global_dim)
+ {
+ OGS_FATAL(
+ "The dimension of the given boundary mesh (%d) is not by one lower "
+ "than the bulk dimension (%d).",
+ _bc_mesh.getDimension(), global_dim);
+ }
+
+ if (!_bc_mesh.getProperties().template existsPropertyVector<std::size_t>(
+ "bulk_node_ids"))
+ {
+ OGS_FATAL(
+ "The required bulk node ids map does not exist in the boundary "
+ "mesh '%s'.",
+ _bc_mesh.getName().c_str());
+ }
+
std::vector<MeshLib::Node*> const& bc_nodes = _bc_mesh.getNodes();
DBUG("Found %d nodes for Natural BCs for the variable %d and component %d",
bc_nodes.size(), variable_id, component_id);
MeshLib::MeshSubset bc_mesh_subset(_bc_mesh, bc_nodes);
- // Create local DOF table from the bc mesh subset for the given variable and
+ // Create local DOF table from the BC mesh subset for the given variable and
// component id.
_dof_table_boundary.reset(dof_table_bulk.deriveBoundaryConstrainedMap(
variable_id, {component_id}, std::move(bc_mesh_subset)));
createLocalAssemblers<LocalAssemblerImplementation>(
global_dim, _bc_mesh.getElements(), *_dof_table_boundary,
- shapefunction_order, _local_assemblers, is_axially_symmetric,
- _integration_order, _data);
+ shapefunction_order, _local_assemblers, _bc_mesh.isAxiallySymmetric(),
+ integration_order, _data);
}
template <typename BoundaryConditionData,
diff --git a/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition.h b/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition.h
index 90b0d164f9ade9ccea7a830c2359d6803c5dbf62..8b9dd3c31ccd7974484e374ce503e92ac32cbb39 100644
--- a/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/GenericNaturalBoundaryCondition.h
@@ -27,10 +27,6 @@ public:
/// A local DOF-table, a subset of the given one, is constructed.
template <typename Data>
GenericNaturalBoundaryCondition(
- typename std::enable_if<
- std::is_same<typename std::decay<BoundaryConditionData>::type,
- typename std::decay<Data>::type>::value,
- bool>::type is_axially_symmetric,
unsigned const integration_order, unsigned const shapefunction_order,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, int const component_id,
@@ -52,9 +48,6 @@ private:
/// participating number of _elements of the boundary condition.
std::unique_ptr<NumLib::LocalToGlobalIndexMap> _dof_table_boundary;
- /// Integration order for integration over the lower-dimensional elements
- unsigned const _integration_order;
-
/// Local assemblers for each element of number of _elements.
std::vector<
std::unique_ptr<GenericNaturalBoundaryConditionLocalAssemblerInterface>>
diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h
index bf3e122f78bd1fa56384a69dc6b8e4ddf8d6a45a..8427623d8fd35d8a68247fb6c6e2809ff8c33d19 100644
--- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h
+++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition-impl.h
@@ -7,9 +7,7 @@
*
*/
-#include "GenericNonuniformNaturalBoundaryCondition.h"
#include "GenericNonuniformNaturalBoundaryConditionLocalAssembler.h"
-#include "MeshLib/MeshSearch/NodeSearch.h"
#include "ProcessLib/Utils/CreateLocalAssemblers.h"
namespace ProcessLib
@@ -22,63 +20,51 @@ GenericNonuniformNaturalBoundaryCondition<BoundaryConditionData,
LocalAssemblerImplementation>::
GenericNonuniformNaturalBoundaryCondition(
unsigned const integration_order, unsigned const shapefunction_order,
- unsigned const global_dim,
- std::unique_ptr<MeshLib::Mesh>&& boundary_mesh, Data&& data)
- : _data(std::forward<Data>(data)), _boundary_mesh(std::move(boundary_mesh))
+ NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
+ int const variable_id, int const component_id,
+ unsigned const global_dim, MeshLib::Mesh const& bc_mesh, Data&& data)
+ : _data(std::forward<Data>(data)), _bc_mesh(bc_mesh)
{
static_assert(std::is_same<typename std::decay<BoundaryConditionData>::type,
typename std::decay<Data>::type>::value,
"Type mismatch between declared and passed BC data.");
// check basic data consistency
- if (_data.variable_id_bulk >=
- static_cast<int>(_data.dof_table_bulk.getNumberOfVariables()) ||
- _data.component_id_bulk >=
- _data.dof_table_bulk.getNumberOfVariableComponents(
- _data.variable_id_bulk))
+ if (variable_id >=
+ static_cast<int>(dof_table_bulk.getNumberOfVariables()) ||
+ component_id >=
+ dof_table_bulk.getNumberOfVariableComponents(variable_id))
{
OGS_FATAL(
"Variable id or component id too high. Actual values: (%d, %d), "
"maximum values: (%d, %d).",
- _data.variable_id_bulk, _data.component_id_bulk,
- _data.dof_table_bulk.getNumberOfVariables(),
- _data.dof_table_bulk.getNumberOfVariableComponents(
- _data.variable_id_bulk));
+ variable_id, component_id, dof_table_bulk.getNumberOfVariables(),
+ dof_table_bulk.getNumberOfVariableComponents(variable_id));
}
- if (_boundary_mesh->getDimension() + 1 != global_dim)
+ if (_bc_mesh.getDimension() + 1 != global_dim)
{
OGS_FATAL(
"The dimension of the given boundary mesh (%d) is not by one lower "
"than the bulk dimension (%d).",
- _boundary_mesh->getDimension(), global_dim);
+ _bc_mesh.getDimension(), global_dim);
}
- constructDofTable();
+ std::vector<MeshLib::Node*> const& bc_nodes = _bc_mesh.getNodes();
+ DBUG("Found %d nodes for Natural BCs for the variable %d and component %d",
+ bc_nodes.size(), variable_id, component_id);
- createLocalAssemblers<LocalAssemblerImplementation>(
- global_dim, _boundary_mesh->getElements(), *_dof_table_boundary,
- shapefunction_order, _local_assemblers,
- _boundary_mesh->isAxiallySymmetric(), integration_order, _data);
-}
-
-template <typename BoundaryConditionData,
- template <typename, typename, unsigned>
- class LocalAssemblerImplementation>
-void GenericNonuniformNaturalBoundaryCondition<
- BoundaryConditionData, LocalAssemblerImplementation>::constructDofTable()
-{
- // construct one-component DOF-table for the surface mesh
- _mesh_subset_all_nodes.reset(
- new MeshLib::MeshSubset(*_boundary_mesh, _boundary_mesh->getNodes()));
+ MeshLib::MeshSubset bc_mesh_subset(_bc_mesh, bc_nodes);
- std::vector<MeshLib::MeshSubset> all_mesh_subsets{*_mesh_subset_all_nodes};
+ // Create local DOF table from the BC mesh subset for the given variable and
+ // component id.
+ _dof_table_boundary.reset(dof_table_bulk.deriveBoundaryConstrainedMap(
+ variable_id, {component_id}, std::move(bc_mesh_subset)));
- std::vector<int> vec_var_n_components{1};
-
- _dof_table_boundary = std::make_unique<NumLib::LocalToGlobalIndexMap>(
- std::move(all_mesh_subsets), vec_var_n_components,
- NumLib::ComponentOrder::BY_LOCATION);
+ createLocalAssemblers<LocalAssemblerImplementation>(
+ global_dim, _bc_mesh.getElements(), *_dof_table_boundary,
+ shapefunction_order, _local_assemblers, _bc_mesh.isAxiallySymmetric(),
+ integration_order, _data);
}
template <typename BoundaryConditionData,
diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h
index 37249a52c5a904032091b7f21a64d75602997445..ff26462b75349e876bd37caba753868fc2412b5a 100644
--- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryCondition.h
@@ -28,8 +28,9 @@ public:
template <typename Data>
GenericNonuniformNaturalBoundaryCondition(
unsigned const integration_order, unsigned const shapefunction_order,
- unsigned const global_dim,
- std::unique_ptr<MeshLib::Mesh>&& boundary_mesh, Data&& data);
+ NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
+ int const variable_id, int const component_id,
+ unsigned const global_dim, MeshLib::Mesh const& bc_mesh, Data&& data);
/// Calls local assemblers which calculate their contributions to the global
/// matrix and the right-hand-side.
@@ -37,16 +38,14 @@ public:
GlobalVector& b, GlobalMatrix* Jac) override;
private:
- void constructDofTable();
-
/// Data used in the assembly of the specific boundary condition.
BoundaryConditionData _data;
- std::unique_ptr<MeshLib::Mesh> _boundary_mesh;
-
- std::unique_ptr<MeshLib::MeshSubset const> _mesh_subset_all_nodes;
+ /// A lower-dimensional mesh on which the boundary condition is defined.
+ MeshLib::Mesh const& _bc_mesh;
- /// DOF-table (one single-component variable) of the boundary mesh.
+ /// Local dof table, a subset of the global one restricted to the
+ /// participating number of _elements of the boundary condition.
std::unique_ptr<NumLib::LocalToGlobalIndexMap> _dof_table_boundary;
/// Local assemblers for each element of the boundary mesh.
diff --git a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h
index 3cf49814d088bfa59c0da7b0b6c4665d72293ddf..ab0c7d05a033d47c601dc8e4c24a9ae18fbcaee8 100644
--- a/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/GenericNonuniformNaturalBoundaryConditionLocalAssembler.h
@@ -79,12 +79,16 @@ public:
GenericNonuniformNaturalBoundaryConditionLocalAssembler(
MeshLib::Element const& e, bool is_axially_symmetric,
unsigned const integration_order)
- : _ns_and_weights(
+ : _integration_method(integration_order),
+ _element(e),
+ _ns_and_weights(
initNsAndWeights(e, is_axially_symmetric, integration_order))
{
}
protected:
+ IntegrationMethod const _integration_method;
+ MeshLib::Element const& _element;
std::vector<NAndWeight, Eigen::aligned_allocator<NAndWeight>> const
_ns_and_weights;
};
diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
index 1a9eba42a30bb21fc70acce1898b53f53bc0d015..97b5686fa6de0fa8114dcae4115f80f74fca4ae1 100644
--- a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.cpp
@@ -15,9 +15,8 @@ namespace ProcessLib
std::unique_ptr<NeumannBoundaryCondition> createNeumannBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
- int const component_id, bool is_axially_symmetric,
- unsigned const integration_order, unsigned const shapefunction_order,
- unsigned const global_dim,
+ int const component_id, unsigned const integration_order,
+ unsigned const shapefunction_order, unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters)
{
DBUG("Constructing Neumann BC from config.");
@@ -30,9 +29,23 @@ std::unique_ptr<NeumannBoundaryCondition> createNeumannBoundaryCondition(
auto const& param = findParameter<double>(param_name, parameters, 1);
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (bc_mesh.getDimension() == 0 && bc_mesh.getNumberOfNodes() == 0 &&
+ bc_mesh.getNumberOfElements() == 0)
+ {
+ return nullptr;
+ }
+#endif // USE_PETSC
+
return std::make_unique<NeumannBoundaryCondition>(
- is_axially_symmetric, integration_order, shapefunction_order, dof_table,
- variable_id, component_id, global_dim, bc_mesh, param);
+ integration_order, shapefunction_order, dof_table, variable_id,
+ component_id, global_dim, bc_mesh, param);
}
} // ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h
index 87e64680a6d2497b1098694f5a22be40d0899ee7..82fbfbecc3f216dd3ae2f3b4d8d3a43a437aad65 100644
--- a/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NeumannBoundaryCondition.h
@@ -21,9 +21,8 @@ using NeumannBoundaryCondition = GenericNaturalBoundaryCondition<
std::unique_ptr<NeumannBoundaryCondition> createNeumannBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
- int const component_id, bool is_axially_symmetric,
- unsigned const integration_order, unsigned const shapefunction_order,
- unsigned const global_dim,
+ int const component_id, unsigned const integration_order,
+ unsigned const shapefunction_order, unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters);
} // ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp
index 462e77ea7db5ec7ba83782011b3c2dd90272933a..e05bc789f2c223362a6595271338a9315f7d0618 100644
--- a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.cpp
@@ -18,7 +18,7 @@ namespace ProcessLib
{
std::unique_ptr<NonuniformDirichletBoundaryCondition>
createNonuniformDirichletBoundaryCondition(
- BaseLib::ConfigTree const& config,
+ BaseLib::ConfigTree const& config, MeshLib::Mesh const& boundary_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
int const component_id, MeshLib::Mesh const& bulk_mesh)
{
@@ -26,36 +26,18 @@ createNonuniformDirichletBoundaryCondition(
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
config.checkConfigParameter("type", "NonuniformDirichlet");
- // TODO handle paths correctly
- //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__NonuniformDirichlet__mesh}
- auto const mesh_file = config.getConfigParameter<std::string>("mesh");
-
- std::unique_ptr<MeshLib::Mesh> boundary_mesh(
- MeshLib::IO::readMeshFromFile(mesh_file));
-
- if (!boundary_mesh)
- {
- OGS_FATAL("Error reading mesh `%s'", mesh_file.c_str());
- }
-
- // The axial symmetry is not used in the Dirichlet BC but kept here for
- // consistency.
- //
- // Surface mesh and bulk mesh must have equal axial symmetry flags!
- boundary_mesh->setAxiallySymmetric(bulk_mesh.isAxiallySymmetric());
-
// TODO finally use ProcessLib::Parameter here
auto const field_name =
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__NonuniformDirichlet__field_name}
config.getConfigParameter<std::string>("field_name");
auto const* const property =
- boundary_mesh->getProperties().getPropertyVector<double>(field_name);
+ boundary_mesh.getProperties().getPropertyVector<double>(field_name);
if (!property)
{
OGS_FATAL("A property with name `%s' does not exist in `%s'.",
- field_name.c_str(), mesh_file.c_str());
+ field_name.c_str(), boundary_mesh.getName().c_str());
}
if (property->getMeshItemType() != MeshLib::MeshItemType::Node)
@@ -71,24 +53,23 @@ createNonuniformDirichletBoundaryCondition(
OGS_FATAL("`%s' is not a one-component field.", field_name.c_str());
}
- std::string const mapping_to_bulk_nodes_property =
- "OriginalSubsurfaceNodeIDs";
- auto const* const mapping_to_bulk_nodes =
- boundary_mesh->getProperties().getPropertyVector<std::size_t>(
- mapping_to_bulk_nodes_property);
-
- if (!(mapping_to_bulk_nodes && mapping_to_bulk_nodes->getMeshItemType() ==
- MeshLib::MeshItemType::Node) &&
- mapping_to_bulk_nodes->getNumberOfComponents() == 1)
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (boundary_mesh.getDimension() == 0 &&
+ boundary_mesh.getNumberOfNodes() == 0 &&
+ boundary_mesh.getNumberOfElements() == 0)
{
- OGS_FATAL("Field `%s' is not set up properly.",
- mapping_to_bulk_nodes_property.c_str());
+ return nullptr;
}
+#endif // USE_PETSC
return std::make_unique<NonuniformDirichletBoundaryCondition>(
- // bulk_mesh.getDimension(),
- std::move(boundary_mesh), *property, bulk_mesh.getID(),
- *mapping_to_bulk_nodes, dof_table, variable_id, component_id);
+ boundary_mesh, *property, dof_table, variable_id, component_id);
}
} // ProcessLib
diff --git a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h
index 49ae3aacf7ee8206f61547129c18eece09e785ab..424f6df3de1c5c225a3f809a42080e987d9ac0aa 100644
--- a/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NonuniformDirichletBoundaryCondition.h
@@ -27,36 +27,51 @@ class NonuniformDirichletBoundaryCondition final : public BoundaryCondition
public:
NonuniformDirichletBoundaryCondition(
// int const bulk_mesh_dimension,
- std::unique_ptr<MeshLib::Mesh>
- boundary_mesh,
+ MeshLib::Mesh const& boundary_mesh,
MeshLib::PropertyVector<double> const& values,
- std::size_t const bulk_mesh_id,
- MeshLib::PropertyVector<std::size_t> const& mapping_to_bulk_nodes,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
- int const variable_id_bulk,
- int const component_id_bulk)
- : _bulk_mesh_id(bulk_mesh_id),
- _values(values),
- _boundary_mesh(std::move(boundary_mesh)),
- _mapping_to_bulk_nodes(mapping_to_bulk_nodes),
- _dof_table_bulk(dof_table_bulk),
- _variable_id_bulk(variable_id_bulk),
- _component_id_bulk(component_id_bulk)
+ int const variable_id,
+ int const component_id)
+ : _values(values),
+ _boundary_mesh(boundary_mesh),
+ _variable_id(variable_id),
+ _component_id(component_id)
{
- if (_variable_id_bulk >=
- static_cast<int>(_dof_table_bulk.getNumberOfVariables()) ||
- _component_id_bulk >= _dof_table_bulk.getNumberOfVariableComponents(
- _variable_id_bulk))
+ if (_variable_id >=
+ static_cast<int>(dof_table_bulk.getNumberOfVariables()) ||
+ _component_id >=
+ dof_table_bulk.getNumberOfVariableComponents(_variable_id))
{
OGS_FATAL(
"Variable id or component id too high. Actual values: (%d, "
"%d), "
"maximum values: (%d, %d).",
- _variable_id_bulk, _component_id_bulk,
- _dof_table_bulk.getNumberOfVariables(),
- _dof_table_bulk.getNumberOfVariableComponents(
- _variable_id_bulk));
+ _variable_id, _component_id,
+ dof_table_bulk.getNumberOfVariables(),
+ dof_table_bulk.getNumberOfVariableComponents(_variable_id));
}
+
+ if (!_boundary_mesh.getProperties().existsPropertyVector<std::size_t>(
+ "bulk_node_ids"))
+ {
+ OGS_FATAL(
+ "The required bulk node ids map does not exist in the boundary "
+ "mesh '%s'.",
+ _boundary_mesh.getName().c_str());
+ }
+
+ std::vector<MeshLib::Node*> const& bc_nodes = _boundary_mesh.getNodes();
+ DBUG(
+ "Found %d nodes for Natural BCs for the variable %d and component "
+ "%d",
+ bc_nodes.size(), variable_id, component_id);
+
+ MeshLib::MeshSubset boundary_mesh_subset(_boundary_mesh, bc_nodes);
+
+ // Create local DOF table from the BC mesh subset for the given variable
+ // and component id.
+ _dof_table_boundary.reset(dof_table_bulk.deriveBoundaryConstrainedMap(
+ variable_id, {component_id}, std::move(boundary_mesh_subset)));
}
void getEssentialBCValues(
@@ -72,35 +87,42 @@ public:
// Map boundary dof indices to bulk dof indices and the corresponding
// values.
- for (std::size_t i = 0; i < _boundary_mesh->getNumberOfNodes(); ++i)
+ for (auto const* const node : _boundary_mesh.getNodes())
{
- auto const bulk_node_id = _mapping_to_bulk_nodes.getComponent(i, 0);
-
- MeshLib::Location const l{
- _bulk_mesh_id, MeshLib::MeshItemType::Node, bulk_node_id};
-
- auto const global_index = _dof_table_bulk.getGlobalIndex(
- l, _variable_id_bulk, _component_id_bulk);
- assert(global_index != NumLib::MeshComponentMap::nop);
-
- bc_values.ids.push_back(global_index);
- bc_values.values.push_back(_values.getComponent(i, 0));
+ auto const node_id = node->getID();
+ auto const global_index = _dof_table_boundary->getGlobalIndex(
+ {_boundary_mesh.getID(), MeshLib::MeshItemType::Node, node_id},
+ _variable_id, _component_id);
+ if (global_index == NumLib::MeshComponentMap::nop)
+ continue;
+ // For the DDC approach (e.g. with PETSc option), the negative index
+ // of global_index means that the entry by that index is a ghost
+ // one, which should be dropped. Especially for PETSc routines
+ // MatZeroRows and MatZeroRowsColumns, which are called to apply the
+ // Dirichlet BC, the negative index is not accepted like other
+ // matrix or vector PETSc routines. Therefore, the following
+ // if-condition is applied.
+ if (global_index >= 0)
+ {
+ bc_values.ids.emplace_back(global_index);
+ bc_values.values.push_back(_values[node_id]);
+ DBUG("global index %d, value %g", global_index,
+ _values[node_id]);
+ }
}
}
private:
- std::size_t _bulk_mesh_id;
MeshLib::PropertyVector<double> const& _values;
- std::unique_ptr<MeshLib::Mesh> _boundary_mesh;
- MeshLib::PropertyVector<std::size_t> const& _mapping_to_bulk_nodes;
- NumLib::LocalToGlobalIndexMap const& _dof_table_bulk;
- int const _variable_id_bulk;
- int const _component_id_bulk;
+ MeshLib::Mesh const& _boundary_mesh;
+ std::unique_ptr<NumLib::LocalToGlobalIndexMap const> _dof_table_boundary;
+ int const _variable_id;
+ int const _component_id;
};
std::unique_ptr<NonuniformDirichletBoundaryCondition>
createNonuniformDirichletBoundaryCondition(
- BaseLib::ConfigTree const& config,
+ BaseLib::ConfigTree const& config, MeshLib::Mesh const& boundary_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
int const component_id, const MeshLib::Mesh& bulk_mesh);
diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp
index 0fcaeb63d1f4f514d2843c50fbb2d099709a465e..6aad8fd1a3494c393baeb01998e69f1b08c75cae 100644
--- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.cpp
@@ -16,7 +16,7 @@ namespace ProcessLib
{
std::unique_ptr<NonuniformNeumannBoundaryCondition>
createNonuniformNeumannBoundaryCondition(
- BaseLib::ConfigTree const& config,
+ BaseLib::ConfigTree const& config, MeshLib::Mesh const& boundary_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
int const component_id, unsigned const integration_order,
unsigned const shapefunction_order, MeshLib::Mesh const& bulk_mesh)
@@ -25,33 +25,18 @@ createNonuniformNeumannBoundaryCondition(
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__type}
config.checkConfigParameter("type", "NonuniformNeumann");
- // TODO handle paths correctly
- //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__NonuniformNeumann__mesh}
- auto const mesh_file = config.getConfigParameter<std::string>("mesh");
-
- std::unique_ptr<MeshLib::Mesh> boundary_mesh(
- MeshLib::IO::readMeshFromFile(mesh_file));
-
- if (!boundary_mesh)
- {
- OGS_FATAL("Error reading mesh `%s'", mesh_file.c_str());
- }
-
- // Surface mesh and bulk mesh must have equal axial symmetry flags!
- boundary_mesh->setAxiallySymmetric(bulk_mesh.isAxiallySymmetric());
-
// TODO finally use ProcessLib::Parameter here
auto const field_name =
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__NonuniformNeumann__field_name}
config.getConfigParameter<std::string>("field_name");
auto const* const property =
- boundary_mesh->getProperties().getPropertyVector<double>(field_name);
+ boundary_mesh.getProperties().getPropertyVector<double>(field_name);
if (!property)
{
OGS_FATAL("A property with name `%s' does not exist in `%s'.",
- field_name.c_str(), mesh_file.c_str());
+ field_name.c_str(), boundary_mesh.getName().c_str());
}
if (property->getMeshItemType() != MeshLib::MeshItemType::Node)
@@ -67,23 +52,37 @@ createNonuniformNeumannBoundaryCondition(
OGS_FATAL("`%s' is not a one-component field.", field_name.c_str());
}
- std::string const mapping_to_bulk_nodes_property = "OriginalSubsurfaceNodeIDs";
+ std::string const mapping_to_bulk_nodes_property = "bulk_node_ids";
auto const* const mapping_to_bulk_nodes =
- boundary_mesh->getProperties().getPropertyVector<std::size_t>(
+ boundary_mesh.getProperties().getPropertyVector<std::size_t>(
mapping_to_bulk_nodes_property);
- if (!(mapping_to_bulk_nodes &&
- mapping_to_bulk_nodes->getMeshItemType() ==
- MeshLib::MeshItemType::Node) &&
+ if (!(mapping_to_bulk_nodes && mapping_to_bulk_nodes->getMeshItemType() ==
+ MeshLib::MeshItemType::Node) &&
mapping_to_bulk_nodes->getNumberOfComponents() == 1)
{
OGS_FATAL("Field `%s' is not set up properly.",
mapping_to_bulk_nodes_property.c_str());
}
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (boundary_mesh.getDimension() == 0 &&
+ boundary_mesh.getNumberOfNodes() == 0 &&
+ boundary_mesh.getNumberOfElements() == 0)
+ {
+ return nullptr;
+ }
+#endif // USE_PETSC
+
return std::make_unique<NonuniformNeumannBoundaryCondition>(
- integration_order, shapefunction_order, bulk_mesh.getDimension(),
- std::move(boundary_mesh),
+ integration_order, shapefunction_order, dof_table, variable_id,
+ component_id, bulk_mesh.getDimension(), boundary_mesh,
NonuniformNeumannBoundaryConditionData{
*property, bulk_mesh.getID(), *mapping_to_bulk_nodes, dof_table,
variable_id, component_id});
diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h
index 05b1adee0aaa43149e1000e60ac1a0cbad3e0549..4e06ecff3fe64ecde9ffa41db71e5ff2b0a1fc1e 100644
--- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryCondition.h
@@ -22,7 +22,7 @@ using NonuniformNeumannBoundaryCondition =
std::unique_ptr<NonuniformNeumannBoundaryCondition>
createNonuniformNeumannBoundaryCondition(
- BaseLib::ConfigTree const& config,
+ BaseLib::ConfigTree const& config, MeshLib::Mesh const& boundary_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
int const component_id, unsigned const integration_order,
unsigned const shapefunction_order, const MeshLib::Mesh& bulk_mesh);
diff --git a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h
index 3666afdcd39006e608152b6ecf6d9d5bcfbfadc7..2fb62faa76c3c4d34fc7bfd31197e22fcc586424 100644
--- a/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/NonuniformNeumannBoundaryConditionLocalAssembler.h
@@ -12,6 +12,7 @@
#include "MeshLib/PropertyVector.h"
#include "NumLib/DOF/DOFTableUtil.h"
#include "NumLib/Function/Interpolation.h"
+#include "ProcessLib/Parameter/MeshNodeParameter.h"
#include "GenericNonuniformNaturalBoundaryConditionLocalAssembler.h"
@@ -38,6 +39,7 @@ class NonuniformNeumannBoundaryConditionLocalAssembler final
{
using Base = GenericNonuniformNaturalBoundaryConditionLocalAssembler<
ShapeFunction, IntegrationMethod, GlobalDim>;
+ using NodalVectorType = typename Base::NodalVectorType;
public:
/// The neumann_bc_value factor is directly integrated into the local
@@ -45,7 +47,7 @@ public:
NonuniformNeumannBoundaryConditionLocalAssembler(
MeshLib::Element const& e,
std::size_t const local_matrix_size,
- bool is_axially_symmetric,
+ bool const is_axially_symmetric,
unsigned const integration_order,
NonuniformNeumannBoundaryConditionData const& data)
: Base(e, is_axially_symmetric, integration_order),
@@ -56,53 +58,35 @@ public:
void assemble(std::size_t const id,
NumLib::LocalToGlobalIndexMap const& dof_table_boundary,
- double const /*t*/, const GlobalVector& /*x*/,
+ double const t, const GlobalVector& /*x*/,
GlobalMatrix& /*K*/, GlobalVector& b,
GlobalMatrix* /*Jac*/) override
{
_local_rhs.setZero();
- auto indices = NumLib::getIndices(id, dof_table_boundary);
+ MeshNodeParameter<double> neumann_values{"NeumannValues", _data.values};
+ // Get element nodes for the interpolation from nodes to
+ // integration point.
+ NodalVectorType parameter_node_values =
+ neumann_values.getNodalValuesOnElement(Base::_element, t);
- // TODO lots of heap allocations.
- std::vector<double> neumann_param_nodal_values_local;
- neumann_param_nodal_values_local.reserve(indices.size());
- for (auto i : indices)
- {
- neumann_param_nodal_values_local.push_back(
- _data.values.getComponent(i, 0));
- }
-
- auto const n_integration_points = Base::_ns_and_weights.size();
+ unsigned const n_integration_points =
+ Base::_integration_method.getNumberOfPoints();
for (unsigned ip = 0; ip < n_integration_points; ip++)
{
auto const& n_and_weight = Base::_ns_and_weights[ip];
- double flux;
- NumLib::shapeFunctionInterpolate(neumann_param_nodal_values_local,
- n_and_weight.N, flux);
- _local_rhs.noalias() +=
- n_and_weight.N * (n_and_weight.weight * flux);
+ auto const& N = n_and_weight.N;
+ auto const& w = n_and_weight.weight;
+ _local_rhs.noalias() += N * parameter_node_values.dot(N) * w;
}
- // map boundary dof indices to bulk dof indices
- for (auto& i : indices)
- {
- auto const bulk_node_id =
- _data.mapping_to_bulk_nodes.getComponent(i, 0);
-
- MeshLib::Location const l{
- _data.bulk_mesh_id, MeshLib::MeshItemType::Node, bulk_node_id};
-
- i = _data.dof_table_bulk.getGlobalIndex(l, _data.variable_id_bulk,
- _data.component_id_bulk);
- assert(i != NumLib::MeshComponentMap::nop);
- }
+ auto const indices = NumLib::getIndices(id, dof_table_boundary);
b.add(indices, _local_rhs);
}
private:
NonuniformNeumannBoundaryConditionData const& _data;
- typename Base::NodalVectorType _local_rhs;
+ NodalVectorType _local_rhs;
public:
EIGEN_MAKE_ALIGNED_OPERATOR_NEW;
diff --git a/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition-impl.h b/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition-impl.h
index ab5fad4556ba652be1e860f72df549005efaac1f..00f100646b557926ef418d44f32cf9482308d4f7 100644
--- a/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition-impl.h
+++ b/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition-impl.h
@@ -26,8 +26,7 @@ template <template <typename, typename, unsigned>
class LocalAssemblerImplementation>
NormalTractionBoundaryCondition<LocalAssemblerImplementation>::
NormalTractionBoundaryCondition(
- bool const is_axially_symmetric, unsigned const integration_order,
- unsigned const shapefunction_order,
+ unsigned const integration_order, unsigned const shapefunction_order,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, unsigned const global_dim,
MeshLib::Mesh const& bc_mesh, Parameter<double> const& pressure)
@@ -48,14 +47,14 @@ NormalTractionBoundaryCondition<LocalAssemblerImplementation>::
MeshLib::MeshSubset bc_mesh_subset(_bc_mesh, bc_nodes);
- // Create local DOF table from the bc mesh subset for the given variable and
+ // Create local DOF table from the BC mesh subset for the given variable and
// component ids.
_dof_table_boundary.reset(dof_table_bulk.deriveBoundaryConstrainedMap(
variable_id, component_ids, std::move(bc_mesh_subset)));
createLocalAssemblers<LocalAssemblerImplementation>(
global_dim, _bc_mesh.getElements(), *_dof_table_boundary,
- shapefunction_order, _local_assemblers, is_axially_symmetric,
+ shapefunction_order, _local_assemblers, _bc_mesh.isAxiallySymmetric(),
_integration_order, _pressure);
}
@@ -78,8 +77,8 @@ std::unique_ptr<NormalTractionBoundaryCondition<
createNormalTractionBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
- bool is_axially_symmetric, unsigned const integration_order,
- unsigned const shapefunction_order, unsigned const global_dim,
+ unsigned const integration_order, unsigned const shapefunction_order,
+ unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters)
{
DBUG("Constructing NormalTractionBoundaryCondition from config.");
@@ -94,8 +93,8 @@ createNormalTractionBoundaryCondition(
auto const& pressure = findParameter<double>(parameter_name, parameters, 1);
return std::make_unique<NormalTractionBoundaryCondition<
NormalTractionBoundaryConditionLocalAssembler>>(
- is_axially_symmetric, integration_order, shapefunction_order, dof_table,
- variable_id, global_dim, bc_mesh, pressure);
+ integration_order, shapefunction_order, dof_table, variable_id,
+ global_dim, bc_mesh, pressure);
}
} // namespace NormalTractionBoundaryCondition
diff --git a/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition.h b/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition.h
index 14cb196809e7b29dd583e604364f9b1655f1213d..5e7bda249a31694b01113333cee5381995d1f87f 100644
--- a/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/NormalTractionBoundaryCondition.h
@@ -36,8 +36,7 @@ public:
/// DOF-table, and a mesh subset for a given variable and its component.
/// A local DOF-table, a subset of the given one, is constructed.
NormalTractionBoundaryCondition(
- bool const is_axially_symmetric, unsigned const integration_order,
- unsigned const shapefunction_order,
+ unsigned const integration_order, unsigned const shapefunction_order,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, unsigned const global_dim,
MeshLib::Mesh const& bc_mesh, Parameter<double> const& pressure);
@@ -76,8 +75,8 @@ std::unique_ptr<NormalTractionBoundaryCondition<
createNormalTractionBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
- bool is_axially_symmetric, unsigned const integration_order,
- unsigned const shapefunction_order, unsigned const global_dim,
+ unsigned const integration_order, unsigned const shapefunction_order,
+ unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters);
} // namespace NormalTractionBoundaryCondition
diff --git a/ProcessLib/BoundaryCondition/NormalTractionBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/NormalTractionBoundaryConditionLocalAssembler.h
index cfe97bbc449dd8988a1fdf16e79ab8efae58ae1f..50230c6bd3463afc521289d08bea50f81222d652 100644
--- a/ProcessLib/BoundaryCondition/NormalTractionBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/NormalTractionBoundaryConditionLocalAssembler.h
@@ -65,7 +65,7 @@ public:
NormalTractionBoundaryConditionLocalAssembler(
MeshLib::Element const& e,
std::size_t const local_matrix_size,
- bool is_axially_symmetric,
+ bool const is_axially_symmetric,
unsigned const integration_order,
Parameter<double> const& pressure)
: _integration_method(integration_order), _pressure(pressure)
diff --git a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
index 90989956d84d7191530db60a334e0eeaa48a4158..b7e640956248ee3a06ffc426d4aeec1e031c99fe 100644
--- a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
@@ -228,6 +228,20 @@ std::unique_ptr<PythonBoundaryCondition> createPythonBoundaryCondition(
dof_table.getNumberOfVariableComponents(variable_id));
}
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (bc_mesh.getDimension() == 0 && bc_mesh.getNumberOfNodes() == 0 &&
+ bc_mesh.getNumberOfElements() == 0)
+ {
+ return nullptr;
+ }
+#endif // USE_PETSC
+
return std::make_unique<PythonBoundaryCondition>(
PythonBoundaryConditionData{
bc, dof_table, bulk_mesh_id,
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
index 2d2eff1e39855dd99cfa66d5128561d9cf24d8ba..d0f45aa31b94ebf7884effa276da424d46803a36 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.cpp
@@ -15,9 +15,8 @@ namespace ProcessLib
std::unique_ptr<RobinBoundaryCondition> createRobinBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
- int const component_id, bool is_axially_symmetric,
- unsigned const integration_order, unsigned const shapefunction_order,
- unsigned const global_dim,
+ int const component_id, unsigned const integration_order,
+ unsigned const shapefunction_order, unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters)
{
DBUG("Constructing RobinBcConfig from config.");
@@ -32,9 +31,23 @@ std::unique_ptr<RobinBoundaryCondition> createRobinBoundaryCondition(
auto const& alpha = findParameter<double>(alpha_name, parameters, 1);
auto const& u_0 = findParameter<double>(u_0_name, parameters, 1);
+ // In case of partitioned mesh the boundary could be empty, i.e. there is no
+ // boundary condition.
+#ifdef USE_PETSC
+ // This can be extracted to createBoundaryCondition() but then the config
+ // parameters are not read and will cause an error.
+ // TODO (naumov): Add a function to ConfigTree for skipping the tags of the
+ // subtree and move the code up in createBoundaryCondition().
+ if (bc_mesh.getDimension() == 0 && bc_mesh.getNumberOfNodes() == 0 &&
+ bc_mesh.getNumberOfElements() == 0)
+ {
+ return nullptr;
+ }
+#endif // USE_PETSC
+
return std::make_unique<RobinBoundaryCondition>(
- is_axially_symmetric, integration_order, shapefunction_order, dof_table,
- variable_id, component_id, global_dim, bc_mesh,
+ integration_order, shapefunction_order, dof_table, variable_id,
+ component_id, global_dim, bc_mesh,
RobinBoundaryConditionData{alpha, u_0});
}
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h
index 9486ea62b770e4615643b4fea88b2586f8b952d5..fc32c939556a057b93d52f22103f4923d2a81179 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryCondition.h
@@ -32,9 +32,8 @@ using RobinBoundaryCondition = GenericNaturalBoundaryCondition<
std::unique_ptr<RobinBoundaryCondition> createRobinBoundaryCondition(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table, int const variable_id,
- int const component_id, bool is_axially_symmetric,
- unsigned const integration_order, unsigned const shapefunction_order,
- unsigned const global_dim,
+ int const component_id, unsigned const integration_order,
+ unsigned const shapefunction_order, unsigned const global_dim,
std::vector<std::unique_ptr<ParameterBase>> const& parameters);
} // ProcessLib
diff --git a/ProcessLib/GroundwaterFlow/Tests.cmake b/ProcessLib/GroundwaterFlow/Tests.cmake
index 1fe6320d2050430a132ef9f4266997577c78f97d..1851aa743f8e5d7cdae0d7084d3559f2d09eabd9 100644
--- a/ProcessLib/GroundwaterFlow/Tests.cmake
+++ b/ProcessLib/GroundwaterFlow/Tests.cmake
@@ -403,6 +403,21 @@ AddTest(
cube_1e3_neumann_pcs_0_ts_1_t_1_000000_2.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_2.vtu D1_left_front_N1_right pressure 1e-2 1e-2
)
+AddTest(
+ NAME ParallelFEM_GroundWaterFlow2D_NeumannBC
+ PATH EllipticPETSc
+ EXECUTABLE_ARGS square_1e1_neumann.prj
+ WRAPPER mpirun
+ WRAPPER_ARGS -np 2
+ TESTER vtkdiff
+ REQUIREMENTS OGS_USE_MPI
+ DIFF_DATA
+ square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_bottom_N1_right pressure 1e-2 0
+ square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu D1_left_bottom_N1_right pressure 1e-2 0
+ square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure 1e-14 0
+ square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure 1e-14 0
+)
+
# Single core
# CUBE 1x1x1 GROUNDWATER FLOW TESTS
foreach(mesh_size 1e0 1e1 1e2 1e3)
@@ -539,25 +554,37 @@ foreach(mesh_size 1e1)
endforeach()
AddTest(
- NAME GroundWaterFlowProcess_Neumann_nonuniform
+ NAME GroundWaterFlowProcess_Inhomogeneous_permeability
+ PATH Elliptic/nonuniform_bc_Groundwaterflow
+ EXECUTABLE ogs
+ EXECUTABLE_ARGS inhomogeneous_permeability.prj
+ TESTER vtkdiff
+ REQUIREMENTS NOT OGS_USE_MPI
+ DIFF_DATA
+ inhomogeneous_permeability.vtu inhomogeneous_permeability_pcs_0_ts_1_t_1.000000.vtu mass_flux_ref mass_flux 4e-2 1e-16
+)
+
+AddTest(
+ NAME GroundWaterFlowProcess_Neumann_nonuniform_cosY
PATH Elliptic/nonuniform_bc_Groundwaterflow
EXECUTABLE ogs
EXECUTABLE_ARGS neumann_nonuniform.prj
TESTER vtkdiff
REQUIREMENTS NOT OGS_USE_MPI
DIFF_DATA
- inhomogeneous_permeability.vtu neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu mass_flux_ref mass_flux 4e-2 1e-16
+ expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-14 0
+ expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu darcy_velocity darcy_velocity 1e-12 0
)
AddTest(
- NAME GroundWaterFlowProcess_Dirichlet_nonuniform
+ NAME GroundWaterFlowProcess_Dirichlet_nonuniform_linearY
PATH Elliptic/nonuniform_bc_Groundwaterflow
EXECUTABLE ogs
EXECUTABLE_ARGS dirichlet_nonuniform.prj
TESTER vtkdiff
REQUIREMENTS NOT OGS_USE_MPI
DIFF_DATA
- expected_dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-14 1e-16
+ expected_dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu dirichlet_nonuniform_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-14 0
)
# tests for nodal source term implementation
@@ -651,7 +678,7 @@ AddTest(
TESTER vtkdiff
REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
DIFF_DATA
- square_1x1_quad_1e6_nodal_sources_expected.vtu square_1e6__with_nodal_sources_pcs_0_ts_1_t_1.000000.vtu analytical_solution pressure 1.41 1e-16
+ square_1x1_quad_1e6_nodal_sources_expected.vtu square_1e6_with_nodal_sources_pcs_0_ts_1_t_1.000000.vtu analytical_solution pressure 1.41 1e-16
VIS square_1e6__nodal_sources_expected_pcs_0_ts_1_t_1.000000.vtu
)
diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index aa90c417044dce0ed01edacc7944d9b76db03764..71c7508872933e17a9f65ff69d922e6c6fcd12de 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -12,6 +12,8 @@
#include <utility>
#include <logog/include/logog.hpp>
+#include "BaseLib/Algorithm.h"
+#include "MeshGeoToolsLib/ConstructMeshesFromGeometries.h"
#include "MeshLib/Mesh.h"
#include "ProcessLib/BoundaryCondition/BoundaryCondition.h"
#include "ProcessLib/BoundaryCondition/CreateBoundaryCondition.h"
@@ -19,16 +21,78 @@
#include "ProcessLib/SourceTerms/NodalSourceTerm.h"
#include "ProcessLib/Utils/ProcessUtils.h"
+namespace
+{
+MeshLib::Mesh const& findMeshInConfig(
+ BaseLib::ConfigTree const& config,
+ std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes)
+{
+ //
+ // Get the mesh name from the config.
+ //
+ std::string mesh_name; // Either given directly in <mesh> or constructed
+ // from <geometrical_set>_<geometry>.
+
+#ifdef DOXYGEN_DOCU_ONLY
+ //! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term__mesh}
+ config.getConfigParameterOptional<std::string>("mesh");
+#endif // DOXYGEN_DOCU_ONLY
+
+ auto optional_mesh_name =
+ //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__mesh}
+ config.getConfigParameterOptional<std::string>("mesh");
+ if (optional_mesh_name)
+ {
+ mesh_name = *optional_mesh_name;
+ }
+ else
+ {
+ // Looking for the mesh created before for the given geometry.
+
+#ifdef DOXYGEN_DOCU_ONLY
+ //! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term__geometrical_set}
+ config.getConfigParameterOptional<std::string>("geometrical_set");
+ //! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term__geometry}
+ config.getConfigParameter<std::string>("geometry");
+#endif // DOXYGEN_DOCU_ONLY
+
+ auto const geometrical_set_name =
+ //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometrical_set}
+ config.getConfigParameter<std::string>("geometrical_set");
+ auto const geometry_name =
+ //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometry}
+ config.getConfigParameter<std::string>("geometry");
+
+ mesh_name = MeshGeoToolsLib::meshNameFromGeometry(geometrical_set_name,
+ geometry_name);
+ }
+
+ //
+ // Find and extract mesh from the list of meshes.
+ //
+ auto const& mesh = *BaseLib::findElementOrError(
+ begin(meshes), end(meshes),
+ [&mesh_name](auto const& mesh) {
+ assert(mesh != nullptr);
+ return mesh->getName() == mesh_name;
+ },
+ "Required mesh with name '" + mesh_name + "' not found.");
+ DBUG("Found mesh '%s' with id %d.", mesh.getName().c_str(), mesh.getID());
+
+ return mesh;
+}
+} // namespace
+
namespace ProcessLib
{
ProcessVariable::ProcessVariable(
BaseLib::ConfigTree const& config,
+ MeshLib::Mesh& mesh,
std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes,
std::vector<std::unique_ptr<ParameterBase>> const& parameters)
: //! \ogs_file_param{prj__process_variables__process_variable__name}
_name(config.getConfigParameter<std::string>("name")),
- _mesh(*meshes[0]), // Using the first mesh as the main mesh.
- // TODO (naumov) potentially extend to named meshes.
+ _mesh(mesh),
//! \ogs_file_param{prj__process_variables__process_variable__components}
_n_components(config.getConfigParameter<int>("components")),
//! \ogs_file_param{prj__process_variables__process_variable__order}
@@ -51,31 +115,7 @@ ProcessVariable::ProcessVariable(
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition}
bcs_config->getConfigSubtreeList("boundary_condition"))
{
- auto const geometrical_set_name =
- //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometrical_set}
- bc_config.getConfigParameter<std::string>("geometrical_set");
- auto const geometry_name =
- //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__geometry}
- bc_config.getConfigParameter<std::string>("geometry");
-
- auto const full_geometry_name =
- geometrical_set_name + "_" + geometry_name;
- auto const mesh_it =
- std::find_if(begin(meshes), end(meshes),
- [&full_geometry_name](auto const& mesh) {
- assert(mesh != nullptr);
- return mesh->getName() == full_geometry_name;
- });
- if (mesh_it == end(meshes))
- {
- OGS_FATAL("Required mesh with name '%s' not found.",
- full_geometry_name.c_str());
- }
- MeshLib::Mesh const& bc_mesh = **mesh_it;
-
- DBUG("Found mesh '%s' with id %d.", bc_mesh.getName().c_str(),
- bc_mesh.getID());
-
+ auto const& mesh = findMeshInConfig(bc_config, meshes);
auto component_id =
//! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__component}
bc_config.getConfigParameterOptional<int>("component");
@@ -84,8 +124,7 @@ ProcessVariable::ProcessVariable(
// default value for single component vars.
component_id = 0;
- _bc_configs.emplace_back(std::move(bc_config), bc_mesh,
- component_id);
+ _bc_configs.emplace_back(std::move(bc_config), mesh, component_id);
}
} else {
INFO("No boundary conditions found.");
@@ -99,32 +138,7 @@ ProcessVariable::ProcessVariable(
//! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term}
sts_config->getConfigSubtreeList("source_term"))
{
- // TODO (naumov) Remove code duplication with the bc_config parsing.
- auto const geometrical_set_name =
- //! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term__geometrical_set}
- st_config.getConfigParameter<std::string>("geometrical_set");
- auto const geometry_name =
- //! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term__geometry}
- st_config.getConfigParameter<std::string>("geometry");
-
- auto const full_geometry_name =
- geometrical_set_name + "_" + geometry_name;
- auto const mesh_it =
- std::find_if(begin(meshes), end(meshes),
- [&full_geometry_name](auto const& mesh) {
- assert(mesh != nullptr);
- return mesh->getName() == full_geometry_name;
- });
- if (mesh_it == end(meshes))
- {
- OGS_FATAL("Required mesh with name '%s' not found.",
- full_geometry_name.c_str());
- }
- MeshLib::Mesh const& bc_mesh = **mesh_it;
-
- DBUG("Found mesh '%s' with id %d.", bc_mesh.getName().c_str(),
- bc_mesh.getID());
-
+ MeshLib::Mesh const& mesh = findMeshInConfig(st_config, meshes);
auto component_id =
//! \ogs_file_param{prj__process_variables__process_variable__source_terms__source_term__component}
st_config.getConfigParameterOptional<int>("component");
@@ -133,7 +147,7 @@ ProcessVariable::ProcessVariable(
// default value for single component vars.
component_id = 0;
- _source_term_configs.emplace_back(std::move(st_config), bc_mesh,
+ _source_term_configs.emplace_back(std::move(st_config), mesh,
component_id);
}
} else {
@@ -185,6 +199,12 @@ ProcessVariable::createBoundaryConditions(
integration_order,
_shapefunction_order, parameters,
process);
+#ifdef USE_PETSC
+ if (bc == nullptr)
+ {
+ continue;
+ }
+#endif // USE_PETSC
bcs.push_back(std::move(bc));
}
diff --git a/ProcessLib/ProcessVariable.h b/ProcessLib/ProcessVariable.h
index 5950074521c7757e044fa52ddb204d1fdbddd5c4..24101fb58d235baa106d477b0c7a1033baa35350 100644
--- a/ProcessLib/ProcessVariable.h
+++ b/ProcessLib/ProcessVariable.h
@@ -39,6 +39,7 @@ class ProcessVariable
public:
ProcessVariable(
BaseLib::ConfigTree const& config,
+ MeshLib::Mesh& mesh,
std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes,
std::vector<std::unique_ptr<ParameterBase>> const& parameters);
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj
index 12fdf592dd01260a190ad58e0276197f2a2e5243..ef90b48512160b76c0e3291cf6b26b96d09cdb69 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.prj
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
- <mesh>dirichlet_nonuniform.vtu</mesh>
- <geometry>square_1x1.gml</geometry>
+ <meshes>
+ <mesh>square_1x1_quad_1e3.vtu</mesh>
+ <mesh>square_1x1_left.vtu</mesh>
+ <mesh>square_1x1_right.vtu</mesh>
+ </meshes>
<processes>
<process>
<name>GW23</name>
@@ -62,22 +65,18 @@
<process_variables>
<process_variable>
<name>pressure</name>
+ <mesh>square_1x1_quad_1e3</mesh>
<components>1</components>
<order>1</order>
<initial_condition>p0</initial_condition>
<boundary_conditions>
<boundary_condition>
- <!-- dummy values -->
- <geometrical_set>square_1x1_geometry</geometrical_set>
- <geometry>left</geometry>
- <!-- end dummy values -->
<type>NonuniformDirichlet</type>
- <mesh>dirichlet_nonuniform_left_1e3.vtu</mesh>
- <field_name>value</field_name>
+ <mesh>square_1x1_left</mesh>
+ <field_name>linearY</field_name>
</boundary_condition>
<boundary_condition>
- <geometrical_set>square_1x1_geometry</geometrical_set>
- <geometry>right</geometry>
+ <mesh>square_1x1_right</mesh>
<type>Dirichlet</type>
<parameter>p_Dirichlet_right</parameter>
</boundary_condition>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform_left_1e3.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform_left_1e3.vtu
deleted file mode 100644
index 57150b1c7ee7d76d2ed23e4486b8cc428d17ea5c..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform_left_1e3.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e9b5a867cb85422e323eb3f8d38c230e2464a499c71a96980cad1d3ceeea642
-size 2061
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..8f08cc4d30d909639633c8dfc791c057ec5a52d1
--- /dev/null
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/expected_neumann_nonuniform_pcs_0_ts_1_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4501531f6c090c5e749223e6c57e87a3bea98b6aef4a64b9b7b28f278136d266
+size 37063
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
new file mode 100644
index 0000000000000000000000000000000000000000..04e79dfbbf0435a1673cfd388c0497cf6c2e6182
--- /dev/null
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability.prj
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<OpenGeoSysProject>
+ <meshes>
+ <mesh axially_symmetric="true">inhomogeneous_permeability.vtu</mesh>
+ <mesh axially_symmetric="true">inhomogeneous_permeability_top.vtu</mesh>
+ <mesh axially_symmetric="true">inhomogeneous_permeability_bottom.vtu</mesh>
+ </meshes>
+ <processes>
+ <process>
+ <name>GW23</name>
+ <type>GROUNDWATER_FLOW</type>
+ <integration_order>2</integration_order>
+ <hydraulic_conductivity>K_rho_over_mu__eff</hydraulic_conductivity>
+ <process_variables>
+ <process_variable>pressure</process_variable>
+ </process_variables>
+ <secondary_variables>
+ <secondary_variable type="static" internal_name="darcy_velocity" output_name="mass_flux"/>
+ </secondary_variables>
+ </process>
+ </processes>
+ <time_loop>
+ <processes>
+ <process ref="GW23">
+ <nonlinear_solver>basic_picard</nonlinear_solver>
+ <convergence_criterion>
+ <type>DeltaX</type>
+ <norm_type>NORM2</norm_type>
+ <abstol>1.e-6</abstol>
+ </convergence_criterion>
+ <time_discretization>
+ <type>BackwardEuler</type>
+ </time_discretization>
+ <output>
+ <variables>
+ <variable> pressure </variable>
+ <variable> mass_flux </variable>
+ </variables>
+ </output>
+ <time_stepping>
+ <type>SingleStep</type>
+ </time_stepping>
+ </process>
+ </processes>
+ <output>
+ <type>VTK</type>
+ <prefix>inhomogeneous_permeability</prefix>
+ </output>
+ </time_loop>
+ <parameters>
+ <parameter>
+ <name>K_rho_over_mu__eff</name>
+ <type>MeshElement</type>
+ <field_name>K_rho_over_mu__eff</field_name>
+ </parameter>
+ <parameter>
+ <name>p_initial</name>
+ <type>Constant</type>
+ <value>0</value>
+ </parameter>
+ <parameter>
+ <name>p_outlet</name>
+ <type>Constant</type>
+ <value>0</value>
+ </parameter>
+ </parameters>
+ <process_variables>
+ <process_variable>
+ <name>pressure</name>
+ <mesh>inhomogeneous_permeability</mesh>
+ <components>1</components>
+ <order>1</order>
+ <initial_condition>p_initial</initial_condition>
+ <boundary_conditions>
+ <boundary_condition>
+ <mesh>inhomogeneous_permeability_top</mesh>
+ <type>NonuniformNeumann</type>
+ <field_name>mass_flux</field_name>
+ </boundary_condition>
+ <boundary_condition>
+ <mesh>inhomogeneous_permeability_bottom</mesh>
+ <type>Dirichlet</type>
+ <parameter>p_outlet</parameter>
+ </boundary_condition>
+ </boundary_conditions>
+ </process_variable>
+ </process_variables>
+ <nonlinear_solvers>
+ <nonlinear_solver>
+ <name>basic_picard</name>
+ <type>Picard</type>
+ <max_iter>10</max_iter>
+ <linear_solver>general_linear_solver</linear_solver>
+ </nonlinear_solver>
+ </nonlinear_solvers>
+ <linear_solvers>
+ <linear_solver>
+ <name>general_linear_solver</name>
+ <lis>-i cg -p jacobi -tol 1e-16 -maxiter 10000</lis>
+ <eigen>
+ <solver_type>CG</solver_type>
+ <precon_type>DIAGONAL</precon_type>
+ <max_iteration_step>10000</max_iteration_step>
+ <error_tolerance>1e-16</error_tolerance>
+ </eigen>
+ <petsc>
+ <prefix>gw</prefix>
+ <parameters>-gw_ksp_type cg -gw_pc_type bjacobi -gw_ksp_rtol 1e-16 -gw_ksp_max_it 10000</parameters>
+ </petsc>
+ </linear_solver>
+ </linear_solvers>
+</OpenGeoSysProject>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_bottom.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_bottom.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..606226937dda317208c598998989f71a9620b116
--- /dev/null
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_bottom.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:823cb86a9e81ef2dbfc4375992851ca12e7ab919799ff1025916716d72105d02
+size 4700
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_top.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_top.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..5cd28e7a067802e6780e8bae40916f768fe7e53f
--- /dev/null
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/inhomogeneous_permeability_top.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfd58a1ab229148d34850aa90ec608a2e9272f7708dd1261e03c8274d90c2184
+size 5518
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
index 55ed460a2460ac3383ac0315a07e45d2f01a9253..945eae1676e40eb8f5c06acbb4487a0030b9bd4c 100644
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
- <mesh axially_symmetric="true"> inhomogeneous_permeability.vtu </mesh>
- <geometry>inhomogeneous_permeability.gml</geometry>
+ <meshes>
+ <mesh>square_1x1_quad_1e3.vtu</mesh>
+ <mesh>square_1x1_left.vtu</mesh>
+ <mesh>square_1x1_right.vtu</mesh>
+ </meshes>
<processes>
<process>
<name>GW23</name>
<type>GROUNDWATER_FLOW</type>
<integration_order>2</integration_order>
- <hydraulic_conductivity>K_rho_over_mu__eff</hydraulic_conductivity>
+ <hydraulic_conductivity>K</hydraulic_conductivity>
<process_variables>
<process_variable>pressure</process_variable>
</process_variables>
<secondary_variables>
- <secondary_variable type="static" internal_name="darcy_velocity" output_name="mass_flux"/>
+ <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
</secondary_variables>
</process>
</processes>
@@ -23,15 +26,15 @@
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
- <abstol>1.e-6</abstol>
+ <abstol>1e-15</abstol>
</convergence_criterion>
<time_discretization>
<type>BackwardEuler</type>
</time_discretization>
<output>
<variables>
- <variable> pressure </variable>
- <variable> mass_flux </variable>
+ <variable> pressure </variable>
+ <variable> darcy_velocity </variable>
</variables>
</output>
<time_stepping>
@@ -46,44 +49,38 @@
</time_loop>
<parameters>
<parameter>
- <name>K_rho_over_mu__eff</name>
- <type>MeshElement</type>
- <field_name>K_rho_over_mu__eff</field_name>
+ <name>K</name>
+ <type>Constant</type>
+ <value>1</value>
</parameter>
<parameter>
- <name>p_initial</name>
+ <name>p0</name>
<type>Constant</type>
<value>0</value>
</parameter>
<parameter>
- <name>p_outlet</name>
+ <name>p_Dirichlet_right</name>
<type>Constant</type>
- <value>0</value>
+ <value>-1</value>
</parameter>
</parameters>
<process_variables>
<process_variable>
<name>pressure</name>
+ <mesh>square_1x1_quad_1e3</mesh>
<components>1</components>
<order>1</order>
- <initial_condition>p_initial</initial_condition>
+ <initial_condition>p0</initial_condition>
<boundary_conditions>
<boundary_condition>
- <!-- dummy values -->
- <geometrical_set>square_1x1_geometry</geometrical_set>
- <geometry>left</geometry>
- <!-- end dummy values -->
-
<type>NonuniformNeumann</type>
- <field_name>mass_flux</field_name>
- <mesh>inhomogeneous_mass_flux.vtu</mesh>
+ <mesh>square_1x1_left</mesh>
+ <field_name>cosY</field_name>
</boundary_condition>
-
<boundary_condition>
- <geometrical_set>square_1x1_geometry</geometrical_set>
- <geometry>bottom</geometry>
<type>Dirichlet</type>
- <parameter>p_outlet</parameter>
+ <mesh>square_1x1_right</mesh>
+ <parameter>p_Dirichlet_right</parameter>
</boundary_condition>
</boundary_conditions>
</process_variable>
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1.gml b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1.gml
deleted file mode 100644
index bf8563395b993b70f8ddf273c8c52261db22b6b4..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3887f04905f231e957c74111daca69b0f2aa855cc6250cf2b4fec33debf73b72
-size 1018
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_left.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_left.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..05cd36dfcfa02fd63791bdeba7ff9d9de170c2fe
--- /dev/null
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_left.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9112c83e759182f1b899167d24a57db352ab86a1e674327fd64e2780584a5f8d
+size 2847
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_quad_1e3.vtu
similarity index 100%
rename from Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/dirichlet_nonuniform.vtu
rename to Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_quad_1e3.vtu
diff --git a/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_right.vtu b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_right.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..b64752e83bacc5ca315d43f5f768ce67276c2c92
--- /dev/null
+++ b/Tests/Data/Elliptic/nonuniform_bc_Groundwaterflow/square_1x1_right.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1970f4f475e343831edcf65e8920230c7314dec208698a2897e6e426925fc022
+size 4020
diff --git a/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj b/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj
index e806ad968f50c261ec87d03ea0dbaf8e79a2bf42..b7a826764e2db504b626ef8f960fb64857a6460a 100644
--- a/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj
+++ b/Tests/Data/EllipticPETSc/cube_1e3_neumann.prj
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
- <mesh>cube_1x1x1_hex_1e3.vtu</mesh>
- <geometry>cube_1x1x1.gml</geometry>
+ <meshes>
+ <mesh>cube_1x1x1_hex_1e3.vtu</mesh>
+ <mesh>cube_1x1x1_hex_1e3_back.vtu</mesh>
+ <mesh>cube_1x1x1_hex_1e3_bottom.vtu</mesh>
+ <mesh>cube_1x1x1_hex_1e3_front.vtu</mesh>
+ <mesh>cube_1x1x1_hex_1e3_left.vtu</mesh>
+ <mesh>cube_1x1x1_hex_1e3_right.vtu</mesh>
+ <mesh>cube_1x1x1_hex_1e3_top.vtu</mesh>
+ </meshes>
<processes>
<process>
<name>GW23</name>
@@ -69,25 +76,23 @@
<process_variables>
<process_variable>
<name>pressure</name>
+ <mesh>cube_1x1x1_hex_1e3</mesh>
<components>1</components>
<order>1</order>
<initial_condition>p0</initial_condition>
<boundary_conditions>
<boundary_condition>
- <geometrical_set>cube_1x1x1_geometry</geometrical_set>
- <geometry>left</geometry>
+ <mesh>cube_1x1x1_hex_1e3_left</mesh>
<type>Dirichlet</type>
<parameter>p_Dirichlet</parameter>
</boundary_condition>
<boundary_condition>
- <geometrical_set>cube_1x1x1_geometry</geometrical_set>
- <geometry>front</geometry>
+ <mesh>cube_1x1x1_hex_1e3_front</mesh>
<type>Dirichlet</type>
<parameter>p_Dirichlet</parameter>
</boundary_condition>
<boundary_condition>
- <geometrical_set>cube_1x1x1_geometry</geometrical_set>
- <geometry>right</geometry>
+ <mesh>cube_1x1x1_hex_1e3_right</mesh>
<type>Neumann</type>
<parameter>p_neumann</parameter>
</boundary_condition>
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_cell_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_cell_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ae3d6fc8cf3b4b96080c29e4d21d6f5cec1f1026
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_cell_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8eb7b1e895e3e2dc52c008c844a17f4def81cf007c29bc318ba99a6d16178754
+size 106
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_cell_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_cell_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..775b683ad8b6006b70f43074115c20a651af1d28
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_cell_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b7228a3dc0b59b5ef72fc9175b995c235d87170a08830de12c60f3870e659d1
+size 936
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dfd58ffbdea28097f5ce6a379d76b6964749fc2d
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:461fe568af5f34312555e712c3282d26879acff857dfc38bb5d5550b2c0b38ad
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..cac537fe96a8d2c267b86865fb4fe54da216cd52
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2802411e840907f7123e53ffbfbf8c8f6ea9945b01178c7a66b5f2228cd80ca
+size 5376
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..97d1600de95f665f9dedeaca42e172433b5c300c
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1d56fe51dd3a2767d8cf0e8a229ef53a880eba85fa321c42253a481c4c1abc1
+size 2112
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c55a046bfe935254246e6b5f04d5b100c7b5dbf6
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:764221811692747dc7819416ce625e56d73240f592f089503efb5aa41e723d5e
+size 5088
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_node_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_node_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c66f919863922ca5f4b1e4dfa31308655cf737fe
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_node_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06f5b45e2836125da094a791f868dd515dc3e7a112e82cdaf768a948e8ee80fa
+size 103
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_node_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_node_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5a66c78b6c44f295494d4755a169e43cd8a2d353
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_back_partitioned_node_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53fafc4f6ba8c5fc8cecb6b622c1115bb3e1c4de48b2523f7899352c46cf0f38
+size 1272
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_cell_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_cell_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dd6b94a7778f11959b37bf0289ed500e7b2b2332
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_cell_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:234e6ee96b847b46104ae342f56e1a6fe6768b6d932c5f8653c50dbe737f30ac
+size 106
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_cell_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_cell_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c28c107f172471bed3bbd1b1596deb61a9d624b4
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_cell_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:923c946610d1cc58bdffc3c126c31ff3be30efe8662bf0968b8b2d3e05644525
+size 904
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5de0e2320b5de3eb6454bb35f67390bd747face8
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9875c8f323614d84f34b49958cec31669792766250008b32379aa95eae1b5ad
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e5ef78b042db04fb2d96f7a027e1eebae77dfe7b
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6675e7c8a0ee722167065e8de8f5e3abe539658a1e9322a15345803eae39e6b
+size 5568
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..42b43dd3970a58aadb215ba6b30997e1ee9ffb8d
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfff300699a9d40bf404121033370e7370f3a1e12ab922abf3a914cec3c8959f
+size 1664
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7c590773aa3c86baf493ab41d80261709f716b33
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd88f4f7635ce691b28b5500ef69d735fc1d6b5430a261802d8d6b2a96b4aaf1
+size 4768
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_node_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_node_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a4ba90be60ddcaa6870c2052b3b5f5ad60145990
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_node_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:902beded57311a3fc1365fceb4ffcd22e3ea90bb41d912d77e0916ce8d8d36d8
+size 103
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_node_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_node_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6fd09ac1848412c9131d1ac498a96854ef09ce78
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_bottom_partitioned_node_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:640edd8ef8708ca7df91c2ca219bba645999e5ecee652909ace40c94e5f3e287
+size 1192
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_cell_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_cell_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fe45cb5994d72b7c97806c1cca00656dc6095e3e
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_cell_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c9a6e77df237a170add824ee22d56c276f4517aea502301497a7a4a7b588974
+size 106
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_cell_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_cell_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d9acda4ebe24a84f60b815e9f26e6e1b8e9481e7
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_cell_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a1d995a534fcfb766b4f3bbb2b35c768e384b7b5904ad6050e00495143b220d
+size 936
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8608c15888e1a2ddf36c8bba8605565a814f2e06
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7527e9aef02cec72d8361d645e4c511bbd432f282bed5459c8795876bf9c873c
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..05de40bcaf367dab3290cf6ca0d81a4c9d5d6640
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4015359f402c243ee1dfb0816e538be5675e71b76e63b82b4c7fb9884a675d30
+size 5376
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a9fb6052c0c59f9a4c1923930be84855ab8a3c4a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0aa4ad048a2685da0eb76687ca4088322e8f4dfc032aeaabaca4ffa4afdbde13
+size 2112
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ad8137a7113c471ae461436432164ea905e6c5c7
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c280c54ec5ed94d62108a60a2ae990e3d93356e86ed1a230172f65de487d56c6
+size 5088
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_node_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_node_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..82646cbac2e0dab0ca5a74208ecf5af0b9be43d0
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_node_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd0894e8b259aed123f9006cc81bb98ed2fa6092986209678ad4b89f7b955f6e
+size 103
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_node_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_node_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e6ac9d10342440aab570e44c13910058f864cad2
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_front_partitioned_node_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ca4ead0e7c2274988acc476ec5069a32dcb2fae7c2e0061caf329dc024fe71a
+size 1272
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..15f583658cb2bd0fe244db1a8edc6c49ee16b02a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a4bf4469d7c047bd5e16bdb9da13a1e79f914cdb6cb4daeeaaaea800ad03435
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..617b815b7af9bc8cd6914050be0e38e8a26d1585
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20c2023c334bc894bc018303429c00effc427e39fe602a4913ca34534d23ee9b
+size 75264
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dc5ef9713883ef5c6bb88572659e57b670ae9a43
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d21ba795f4559011878fa628f1d0ea16edf1621e751712cc7ad785408f61cb7
+size 43104
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3ddca9f989056bf55cea03b752b0712f59107c92
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_hex_1e3_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3ae26cb7e6c24294624a3d1e9e280cb94c6cab3e0329120fdc1caa8c46642c2
+size 60640
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_cell_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_cell_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..69cee832ac94c03542bdbfdc6dbc84855b57a8d7
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_cell_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31952507b1768dcc00fd30eaf1f23bb05a5f777485fc231340a4cba50e91a2b1
+size 106
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_cell_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_cell_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8309bf28e231a39c22b95d5fa3c0196977e8a35a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_cell_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f8e4cd2eb9f5487eec7dd93e930ee074eb6f65d3e88fcfcb6e9cba320947208
+size 888
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..94a00ce061ed459d5a56a851aa73a77a29692903
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efe3120c0a084701f77f6a90dc0f4cfc504cf7a87c45dfc2002dc55fdb22e4bc
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..67268e4b1f7397940379a5efdfdf47aa13e6d934
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ede2b034cc0ef35985f10e6c1ed2a3f613486c481313abb73c4e81b85555898
+size 5696
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e615556847102ec19f4568769e72790f924535ab
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfbac4ffc1089ae5613467548b5c81c357faaad9ac052a12174a8e06a29fb276
+size 1408
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..72a3ea45610ab4a1f6e3228c59f4f30f31250bbc
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ed30fcff773909f38c6ac4399884faaf00824234059306dc1ee6b2f202f5116
+size 4640
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_node_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_node_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..77bde14d2748f0fa22bd4f7f1710a6baff938df1
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_node_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:912626d1e0e339857e2800155ea2ab8d24d29219de29e1325789261ad9484dd6
+size 103
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_node_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_node_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1b64d4d485994e1713e9d72c67b746c7bffaed6f
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_left_partitioned_node_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4220d9dd7a9491f255085525459169d71c844e983cab9b9957306457f252b46b
+size 1160
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_cell_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_cell_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..35a8ed28e9f6c961f7d611f84bd56ae9c66a986b
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_cell_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9d8f12efa6f2d6befdd3c2f17998289bccff3e3a080d7225e20a6e86451731d
+size 106
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_cell_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_cell_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..daa489134f1a4406d020437f66a2266024eac3ae
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_cell_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ad2e3bba96ee653446a220bddc0236a2fd48fcc868be182aa775292f6ba8516
+size 880
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a6b81e9f2329110c766db7d2eee603ce4f708cf3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82c6cac76eb2b8cb82e5beccd33f339231e445dd72d0cd8269ed396dcdaa587c
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..3397c23c318021916fab8b2442fbbcc78759a8d4
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ececc38aed2ce16708f4027e03b3ce9833703b22dbc36693c80dbb65f73b4fb
+size 5760
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..27267ce7c3c8ee0d647bb3f3fd159c91c4b7f7f8
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:090cd9028dcdc7930f2eb821a714918fd9cba5d92d99fb13d0c4d68990cf2e7a
+size 1280
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..eca33059d618145429b648f4f3a56c10d6b177d4
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:176b780f4217ec21a760a7500607c0c7fe89827db83eccde6aafa3bea32a73ea
+size 4576
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_node_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_node_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8004ecc62d36d037c9e0995949a86498454f8a0d
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_node_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0f4b64a830e7b5bd4e4793005a6029e1a68acd5bb4149a3817e5c67157caf92
+size 103
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_node_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_node_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fa6a0eae781d6047c888b652bd81759463af3fcf
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_right_partitioned_node_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9970bb1431f6bf6e176c9fec17663e928c2c5385d522a7c38417af10ad23f3f3
+size 1144
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_cell_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_cell_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..23b6caf36393ec876d1fa0dd51af16bbcccf96ec
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_cell_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97547a6a7adde5eb62911c36f84b01412eb3f4f7aaad56ee4ddfa86f3b4aeaeb
+size 106
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_cell_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_cell_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1dd6bc898245da3e6f1ad4cea2306c54fe0d32db
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_cell_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99568d4dcc200a5a2c01571eaf0b1481aa906b11a2f0e85d098756439c6a2759
+size 880
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a430d97668212fa702c78aaee7e889c569abe38b
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8d711e9b024644bf9dda15df84a2bba9363b987a67df49a1db1fe43b3b5074e
+size 336
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_ele3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_ele3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a5715d18cdab6b5f8b309c2e60dd651cf3b56a94
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_ele3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9929b5459ff652f7cb0142216f49a036c024e295aa8e9febfa3b83ec78e283d2
+size 5760
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_ele_g3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_ele_g3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..037d334490c4f52fc8387e1acd8bf2ead6ef502b
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_ele_g3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:385717c39d586fef70a4f8b4c32a89b86efa71b8b622eee2963ba4481fa0fd06
+size 1280
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_nod3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_nod3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ab61bedceda869416ab3549d6f5161b92deea6f5
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_msh_nod3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1fa4c41ec77cd3aa77b0c06b9479c9fe411b055bc821665edc7cd531890709c
+size 4576
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_node_properties_cfg3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_node_properties_cfg3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..67d74aefb3c605a43fa6a6a2ac80bbe5bf0ab547
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_node_properties_cfg3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7defd2e4be6062d4b1f262788cf222e089df494c06d7f5cee7aa277699d081d2
+size 103
diff --git a/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_node_properties_val3.bin b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_node_properties_val3.bin
new file mode 100644
index 0000000000000000000000000000000000000000..55d66ba7c2a2df9d98c8fe273d16573fc6ddfe26
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/cube_1x1x1_hex_1e3_top_partitioned_node_properties_val3.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8011e3c82e6619afa488154c22506909ae67a34da3ae56505d195dc698c9027a
+size 1144
diff --git a/Tests/Data/EllipticPETSc/square_1e1_neumann.prj b/Tests/Data/EllipticPETSc/square_1e1_neumann.prj
new file mode 100644
index 0000000000000000000000000000000000000000..14959d27e63af9f2f8528fc71670eda64b88a843
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1e1_neumann.prj
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<OpenGeoSysProject>
+ <meshes>
+ <mesh>square_1x1_quad_1e1.vtu</mesh>
+ <mesh>square_1x1_bottom.vtu</mesh>
+ <mesh>square_1x1_left.vtu</mesh>
+ <mesh>square_1x1_right.vtu</mesh>
+ <mesh>square_1x1_top.vtu</mesh>
+ </meshes>
+ <processes>
+ <process>
+ <name>GW23</name>
+ <type>GROUNDWATER_FLOW</type>
+ <integration_order>2</integration_order>
+ <hydraulic_conductivity>K</hydraulic_conductivity>
+ <process_variables>
+ <process_variable>pressure</process_variable>
+ </process_variables>
+ <secondary_variables>
+ <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
+ </secondary_variables>
+ </process>
+ </processes>
+ <time_loop>
+ <processes>
+ <process ref="GW23">
+ <nonlinear_solver>basic_picard</nonlinear_solver>
+ <convergence_criterion>
+ <type>DeltaX</type>
+ <norm_type>NORM2</norm_type>
+ <abstol>1.e-6</abstol>
+ </convergence_criterion>
+ <time_discretization>
+ <type>BackwardEuler</type>
+ </time_discretization>
+ <output>
+ <variables>
+ <variable> pressure </variable>
+ <variable> v </variable>
+ </variables>
+ </output>
+ <time_stepping>
+ <type>SingleStep</type>
+ </time_stepping>
+ </process>
+ </processes>
+ <output>
+ <type>VTK</type>
+ <prefix>square_1e1_neumann</prefix>
+ </output>
+ </time_loop>
+ <parameters>
+ <parameter>
+ <name>K</name>
+ <type>Constant</type>
+ <value>1</value>
+ </parameter>
+ <parameter>
+ <name>p0</name>
+ <type>Constant</type>
+ <value>0</value>
+ </parameter>
+ <parameter>
+ <name>p_neumann</name>
+ <type>Constant</type>
+ <value>1</value>
+ </parameter>
+ <parameter>
+ <name>p_Dirichlet</name>
+ <type>Constant</type>
+ <value>1</value>
+ </parameter>
+ </parameters>
+ <process_variables>
+ <process_variable>
+ <name>pressure</name>
+ <components>1</components>
+ <order>1</order>
+ <initial_condition>p0</initial_condition>
+ <boundary_conditions>
+ <boundary_condition>
+ <mesh>square_1x1_left</mesh>
+ <type>Dirichlet</type>
+ <parameter>p_Dirichlet</parameter>
+ </boundary_condition>
+ <boundary_condition>
+ <mesh>square_1x1_bottom</mesh>
+ <type>Dirichlet</type>
+ <parameter>p_Dirichlet</parameter>
+ </boundary_condition>
+ <boundary_condition>
+ <mesh>square_1x1_right</mesh>
+ <type>Neumann</type>
+ <parameter>p_neumann</parameter>
+ </boundary_condition>
+ </boundary_conditions>
+ </process_variable>
+ </process_variables>
+ <nonlinear_solvers>
+ <nonlinear_solver>
+ <name>basic_picard</name>
+ <type>Picard</type>
+ <max_iter>10</max_iter>
+ <linear_solver>general_linear_solver</linear_solver>
+ </nonlinear_solver>
+ </nonlinear_solvers>
+ <linear_solvers>
+ <linear_solver>
+ <name>general_linear_solver</name>
+ <lis>-i cg -p jacobi -tol 1e-16 -maxiter 10000</lis>
+ <eigen>
+ <solver_type>CG</solver_type>
+ <precon_type>DIAGONAL</precon_type>
+ <max_iteration_step>10000</max_iteration_step>
+ <error_tolerance>1e-16</error_tolerance>
+ </eigen>
+ <petsc>
+ <prefix>gw</prefix>
+ <parameters>-gw_ksp_type cg -gw_pc_type bjacobi -gw_ksp_rtol 1e-16 -gw_ksp_max_it 10000</parameters>
+ </petsc>
+ </linear_solver>
+ </linear_solvers>
+</OpenGeoSysProject>
diff --git a/Tests/Data/EllipticPETSc/square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu b/Tests/Data/EllipticPETSc/square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..4cc4bc8275fd018b6d5309e6a2a31edbd94d5132
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1e1_neumann_pcs_0_ts_1_t_1_000000_0.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba74277b0b85ea38855f76a2ea68bbca2680d711e4ee8aed868eaedcfac76fdf
+size 2764
diff --git a/Tests/Data/EllipticPETSc/square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu b/Tests/Data/EllipticPETSc/square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..178050c3f2cce6f089c7165f9a198893363e808d
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1e1_neumann_pcs_0_ts_1_t_1_000000_1.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a22afd52b400cde481f5cb6ad0f18d139aa7d7692a3618374dbb2a755e23e47e
+size 2864
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom.vtu b/Tests/Data/EllipticPETSc/square_1x1_bottom.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..dd30b2c8b9f2d68233347b39f55ea830ee03d480
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c61045e55d4dfb306ea03d752006e3bb80e178865ffa17b5172ba8f2e4ddd74f
+size 1489
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_cell_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_cell_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..865c3a5cd345dc29f5c71d7b5a0a94c97ecf5fe3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_cell_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c57341ddd31d788c26273c7a1be2de985c05b3e6b841e469d6d6f1b207fcf1e
+size 90
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_cell_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_cell_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..758d4c3fc7f3162b65176b4d2e4a322dd00d7aff
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_cell_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab25350e3e65efebe24584461683ecda68725576e825e550038b90e7b1479946
+size 24
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1214fe4b6f0f6c18e9657c17bb2054a26244318d
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1976e35a9533c7ab964b004d9d7729f889345234e7ab9ee6ee0850ac62025c1
+size 224
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_ele2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_ele2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..35bb9a835ecc7265f006901ec80ced43e7b8519b
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_ele2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bbbd910af9bfde493d9af065f50b55be9a99532264526184ae50d5bbc1775c6
+size 144
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_ele_g2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_ele_g2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_nod2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_nod2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..81780412404e700857fcf560877c9b36fecfb218
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_msh_nod2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9205fe7308ce3b09faaac85b1649f40d638812ba1eb905890378f77c2c88a3c9
+size 128
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_node_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_node_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..edaf705a91a1752a07ae62db141b1b212f6df0a3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_node_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddc1f64d337768555b80e89c75adf0dfb4ebb2218c9bf7761a719bceb377367e
+size 87
diff --git a/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_node_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_node_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b8792f077cf2fddd85fdb6e5ec4648f87bcb0fc2
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_bottom_partitioned_node_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e12414338bdb3184808636b59b3a3d9396c9c42204715b055a3f2569b8adb15e
+size 32
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left.vtu b/Tests/Data/EllipticPETSc/square_1x1_left.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..0dd2ef433f20b3674cbb085ebec74541db1f1b91
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f9b4c0e4a9a12388f8ea1969d69d20a3b6d10d27a020fd5e75f889e94bce5fd
+size 1490
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_cell_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_cell_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..35736b9d25e720974598c8152221e496f83189f3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_cell_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:620da3431950584541c077878ba48dc7eb8c2f3aadd72752e10e37b2e269239b
+size 90
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_cell_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_cell_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..32f69b1aa18dd005df007242770f2cf92c085fa4
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_cell_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:892dfb69a863803bebd33a046fe9019dbcc347c1663a6c9c98908711d798fcd8
+size 32
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..77171a9bd9aeea4f0389d0f6cabb275d897a50b3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ae53b252fe5abc201c9ec3657700766dd8f6aba754200673a5bcc5a6ff20dc0
+size 224
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_ele2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_ele2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..58e7b8d9246423b3dba435b81c258ae8e2509d87
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_ele2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:377167aece5abad2046c825ac369a0f302aaeaece345c3e19d5db28260de013c
+size 96
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_ele_g2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_ele_g2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e76a75ecdd4cedb749914d57c4f5ffb2bf749dd8
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_ele_g2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3b67862013104605fc80126df882f2d29f4d9fac3629d0449774d8785721e49
+size 96
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_nod2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_nod2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..95d84ba4bbe29b48af3d2455749b47cd494154b5
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_msh_nod2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b494df35eb7c462f1e2e50c2699033ba4f2271e01223a883198dd1d2e5562bbf
+size 192
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_node_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_node_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0fcd9c4b42f51aa4644cd22b13d62ea073f5c19a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_node_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fee21bf94da903007d0b1d4cf0d18c70cbe3cd9f74d0539f8303974c3b377dcc
+size 87
diff --git a/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_node_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_node_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9b239fe429a0fb3ca60741b540611ad7a523971a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_left_partitioned_node_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:700b251d8daa0a3feb0265c55c2c908a1a58ebb0622a1d8efc17d2d1dcc682ec
+size 48
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1.vtu b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..830ecc4b5589b969669e6eb03a1cc93221c47918
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16b826f3e01dafe34f447332b39a2a01cfa9e330c9ff7706190d0f420570c364
+size 2276
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_cell_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_cell_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2cfde3fb33a20ba337eb87099c16af8bd64846a5
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_cell_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c945488d6302d401d21858a5062390313e97d2afadef404ba25f7855f106a5ca
+size 85
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_cell_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_cell_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..684e9c1a10d5befdcdbf103f849c4d9eb8d1c57d
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_cell_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17b0761f87b081d5cf10757ccc89f12be355c70e2e29df288b65b30710dcbcd1
+size 48
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..40bff3f385226c3719f8e8860607c579bfa95b53
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:950fea3aecde9d050486cb4874218e322806028c8d03732be5c097ae824bce86
+size 224
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_ele2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_ele2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..bb12360dff5517b20140b396e1364b8d0b223ad0
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_ele2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:953af7d8cda3e11f507851703c70dc8709e3d69517d47a3916f6bfd671be2614
+size 384
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_ele_g2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_ele_g2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4baa008abbda8ace94de21febb0036bc1310fbaf
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_ele_g2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6fe22ed5d2d94a8237458e7f13916778081aecb832c814870676dfb844eafad
+size 384
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_nod2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_nod2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0406ed68509d54f73513b1252e1e36cf39984c97
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_msh_nod2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4deb9c6b6dcf4fb1fbc21afc735ede1cc233a4d3331f0e7feee090f96c2506b4
+size 768
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_node_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_node_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7e00c1b00d54b98ce86a1e47446b87e76721b734
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_node_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a8dfd078696584544c1afa9252100b6d0989eeda52227ebf1b89ad0a531b93f
+size 149
diff --git a/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_node_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_node_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..cc0cdfb5a2d18ea6d27a17fa410807f319fd31c6
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_quad_1e1_partitioned_node_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f777ca5be4428797085e90792defd903526f67d57dfbb4803ca2a11c39c3edc0
+size 384
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right.vtu b/Tests/Data/EllipticPETSc/square_1x1_right.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..7cd17a0851fa83da4a668b25b1332c7c1a20dca4
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bfc3130bb23ecb1b9bf79fbe8c9bac31610a29b82a1b9d04f99951ec058341b
+size 1501
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_cell_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_cell_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..35736b9d25e720974598c8152221e496f83189f3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_cell_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:620da3431950584541c077878ba48dc7eb8c2f3aadd72752e10e37b2e269239b
+size 90
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_cell_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_cell_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b977be6ae41ecec753c408669ed4ac4bc0bd1e3a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_cell_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7cd78182cdd441eca6518ae462833d3ef0a3d70e7fdfe33cd06a8330196371e
+size 32
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..77171a9bd9aeea4f0389d0f6cabb275d897a50b3
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ae53b252fe5abc201c9ec3657700766dd8f6aba754200673a5bcc5a6ff20dc0
+size 224
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_ele2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_ele2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..58e7b8d9246423b3dba435b81c258ae8e2509d87
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_ele2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:377167aece5abad2046c825ac369a0f302aaeaece345c3e19d5db28260de013c
+size 96
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_ele_g2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_ele_g2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e76a75ecdd4cedb749914d57c4f5ffb2bf749dd8
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_ele_g2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3b67862013104605fc80126df882f2d29f4d9fac3629d0449774d8785721e49
+size 96
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_nod2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_nod2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..b6bd734c61ed0ef0c3f3dfa9ce7202bf41a944fd
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_msh_nod2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7e502afe495eae2f0731d753f8a6471e07c1cb788b656db17bc00ca7be73998
+size 192
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_node_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_node_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0fcd9c4b42f51aa4644cd22b13d62ea073f5c19a
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_node_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fee21bf94da903007d0b1d4cf0d18c70cbe3cd9f74d0539f8303974c3b377dcc
+size 87
diff --git a/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_node_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_node_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..fd5438fc95c6f5fad8de86797a46a185d1b09235
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_right_partitioned_node_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b5243506c0e5a1079048ff826c781b7d66fab9b8cbe54c484294101015d87788
+size 48
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top.vtu b/Tests/Data/EllipticPETSc/square_1x1_top.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..aa01906d55ffe0d27a7a41ab027715fb7c756040
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40d28d44c22f122277ad3abf6df97582a60b1eb7711809577f23c78faa380b61
+size 1502
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_cell_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_cell_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..81e4b0ad3d298ff1e4ef9a3bf9fb6e179a0cfada
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_cell_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e38d5bfa49d8e97f030bc84d18b6fcbc0612f5d85dc5637bed25595418f111cc
+size 90
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_cell_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_cell_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9ac6a389633db1a302ae1d996dbbc9e69f60fb2e
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_cell_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:239b893ce036f83d5a9748f44e0f37d4a75766433ca2715e5454b6842961efd6
+size 24
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2eb6a78400e20a933f3d616d7fbe57b7207acbd9
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddc8d64ca9c6f67f0ab5f48bdb056b4bcb0a38241aa876125f51b2a3751cce39
+size 224
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_ele2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_ele2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..35bb9a835ecc7265f006901ec80ced43e7b8519b
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_ele2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bbbd910af9bfde493d9af065f50b55be9a99532264526184ae50d5bbc1775c6
+size 144
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_ele_g2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_ele_g2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_nod2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_nod2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c3bcd555b3ddfac6361ad00e80c4b53941a501cb
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_msh_nod2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1458cc54516eb41794c2ec1b839f83271618d1a4abe0229d3a5b6cd33fb2c420
+size 128
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_node_properties_cfg2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_node_properties_cfg2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7bbf0ba262c56cb192caee2abd2d252548e83c74
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_node_properties_cfg2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cf257dd1e4abbe1dd52c3521c2531a59d488874b43362b9c94e65a836cd52a6
+size 87
diff --git a/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_node_properties_val2.bin b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_node_properties_val2.bin
new file mode 100644
index 0000000000000000000000000000000000000000..217db2c1412b07af5fabd13c861c3eb778dbc064
--- /dev/null
+++ b/Tests/Data/EllipticPETSc/square_1x1_top_partitioned_node_properties_val2.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:55453ab99ffcf7688acbdbc6c2ed9e213428d42162a51f5eac51253667bf4556
+size 32
diff --git a/Tests/Data/LIE/HydroMechanics/TaskB.gml b/Tests/Data/LIE/HydroMechanics/TaskB.gml
index 7aaccd45a9d266209ef78f1305feabefeb88c517..5837853da3c9f073257335127485907a9201cc64 100644
--- a/Tests/Data/LIE/HydroMechanics/TaskB.gml
+++ b/Tests/Data/LIE/HydroMechanics/TaskB.gml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2e88d2f7900b57dbd72b6a4c25f5132a50019f9221b0ac9c8be08ad4bc9f321c
-size 789
+oid sha256:239165698d26084a7ecd7a7c96b2326d15025a0c99fdbbc81e5d278bd9cfc463
+size 1009
diff --git a/Tests/Data/LIE/HydroMechanics/TaskB.prj b/Tests/Data/LIE/HydroMechanics/TaskB.prj
index 87c52920e5477a34f60765308421268aa6be9660..484902b6c3ca2730a0ca5c347dff5369a8b5b745 100644
--- a/Tests/Data/LIE/HydroMechanics/TaskB.prj
+++ b/Tests/Data/LIE/HydroMechanics/TaskB.prj
@@ -238,14 +238,14 @@
</boundary_condition>
<boundary_condition>
<geometrical_set>TaskB</geometrical_set>
- <geometry>PLY_TOP</geometry>
+ <geometry>FRACTURE_TOP</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p0</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>TaskB</geometrical_set>
- <geometry>PLY_BOTTOM</geometry>
+ <geometry>FRACTURE_BOTTOM</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p0</parameter>
@@ -296,14 +296,14 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>TaskB</geometrical_set>
- <geometry>PLY_TOP</geometry>
+ <geometry>FRACTURE_TOP</geometry>
<type>Dirichlet</type>
<component>1</component>
<parameter>zero_u</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>TaskB</geometrical_set>
- <geometry>PLY_BOTTOM</geometry>
+ <geometry>FRACTURE_BOTTOM</geometry>
<type>Dirichlet</type>
<component>1</component>
<parameter>zero_u</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture.prj b/Tests/Data/LIE/HydroMechanics/single_fracture.prj
index 8ed7e8954c01bf252ef6bb3479c8f95908a57e97..0835d191ccc8181b765d30bfac9a05dc0f409b4f 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture.prj
@@ -273,14 +273,14 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_EAST</geometry>
+ <geometry>POINT5</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>zero_u</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_WEST</geometry>
+ <geometry>POINT4</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>zero_u</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml
index 64fd8ae52ff4b724e9f6ec948511656a90f00718..ac4b5afc313c4eb5ed872c4a4525f1b0a606af55 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:71f608917a6cb2be7a4ec9ebdb59d12ee31f5fbb0457a1d1f230a47f441e3b4c
-size 1808
+oid sha256:b6977227ed10a23e8c3e5a1e3c551a41a6f6ed022f433c1fb95ded45256d0e0b
+size 2045
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj
index 9c2c60e719e44520a50ce04df716f939082468d2..7ccab7ce328d3084c581c5c8f10caf7b499d3f37 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj
@@ -287,28 +287,28 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>single_fracture_3D</geometrical_set>
- <geometry>left</geometry>
+ <geometry>inlet</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>zero_u</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture_3D</geometrical_set>
- <geometry>right</geometry>
+ <geometry>outlet</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>zero_u</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture_3D</geometrical_set>
- <geometry>front</geometry>
+ <geometry>fracture_front</geometry>
<type>Dirichlet</type>
<component>2</component>
<parameter>zero_u</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture_3D</geometrical_set>
- <geometry>back</geometry>
+ <geometry>fracture_back</geometry>
<type>Dirichlet</type>
<component>2</component>
<parameter>zero_u</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj
index 0d2a3aeb7f872f7f0f28c0fd24a5d127298dcdb1..cc795746308d0cb4ce65d9a2bcd2853f684f2848 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj
@@ -229,14 +229,14 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_EAST</geometry>
+ <geometry>InjectionPoint</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p_in</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_WEST</geometry>
+ <geometry>OutletPoint</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p_out</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj
index bc16e137228a401e138fa66fdc450efa01484238..72a0f022bd086679ccd0aa1ed0a436b276c5b0f2 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj
@@ -229,14 +229,14 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_EAST</geometry>
+ <geometry>InjectionPoint</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p_in</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_WEST</geometry>
+ <geometry>OutletPoint</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p_out</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj
index 4bfb8a209596052f0cd9dbfaab9fd005e4b56c04..4a56fa6ef3ffd12ac6b97813c2c41aa0eb879891 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj
@@ -229,14 +229,14 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_EAST</geometry>
+ <geometry>InjectionPoint</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p_in</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_fracture</geometrical_set>
- <geometry>PLY_WEST</geometry>
+ <geometry>OutletPoint</geometry>
<type>Dirichlet</type>
<component>0</component>
<parameter>p_out</parameter>
diff --git a/Tests/Data/LIE/Mechanics/single_joint_3D.gml b/Tests/Data/LIE/Mechanics/single_joint_3D.gml
index 5b6b71068208a2962e24c4978b9f282e2c4ef768..7ec3aa7003f03473960cf67429fcfee585885855 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_3D.gml
+++ b/Tests/Data/LIE/Mechanics/single_joint_3D.gml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fc9fec86c4fbeca01455ae69618ef5ac4b26689de3e760af212391dfe6eb33ac
-size 2233
+oid sha256:5ab90f0d7576d825d88ab06454af74416a46b5b5b4a55f4df3b71739ab1115ee
+size 2820
diff --git a/Tests/Data/LIE/Mechanics/single_joint_3D.prj b/Tests/Data/LIE/Mechanics/single_joint_3D.prj
index 932abc275f58fab2d4fcfb648d1db9001d73b21a..ed01f50d456c0b6cc90040bcb5a3cf3b8e9d01fd 100644
--- a/Tests/Data/LIE/Mechanics/single_joint_3D.prj
+++ b/Tests/Data/LIE/Mechanics/single_joint_3D.prj
@@ -2,6 +2,11 @@
<OpenGeoSysProject>
<mesh>single_joint_beta50_3D.vtu</mesh>
<geometry>single_joint_3D.gml</geometry>
+ <search_length_algorithm>
+ <type>fixed</type>
+ <value>1e-8</value>
+ </search_length_algorithm>
+
<processes>
<process>
<name>SD</name>
@@ -199,14 +204,14 @@
<boundary_conditions>
<boundary_condition>
<geometrical_set>single_joint_3D</geometrical_set>
- <geometry>front</geometry>
+ <geometry>fracture_front</geometry>
<type>Dirichlet</type>
<component>2</component>
<parameter>zero_u</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>single_joint_3D</geometrical_set>
- <geometry>back</geometry>
+ <geometry>fracture_back</geometry>
<type>Dirichlet</type>
<component>2</component>
<parameter>zero_u</parameter>
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu
index cb58ad04d05614ccf2d1d2746181084a5ebe3aac..b476dedcf6a2ef9ce43366cda6a38f6d7c73bb86 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:76ce4169e50f13f895941306ae82bee084c9791ba3059c91d0fb03fb770b92b6
-size 163986
+oid sha256:c8d929cddd300fa9a7d985615f901398263b7ef473397ffc690b77d0a4daf52f
+size 150751
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu
index ab17c6615c4713f70e62978f1933892d681d2474..e25de61496b289cf785bbe544783efb0fb6e0388 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9a789a4ddf8c143059d5874d6b71bd20d5f693af372e709a66a69e03813bee99
-size 163982
+oid sha256:f231aeec27287974a13e1ff06354614c88d27583d9e43cd25233501366fa82f8
+size 150747
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.gml b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.gml
deleted file mode 100644
index 269d0c1e57509fed9a69077d603d4f844462a42b..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e16564c61437cb2b2ed0f60607881672de426db04632ddeed2cedbc62b946134
-size 1309
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
index 5aae44402a6b2afa5afb5c8ffc7584a59f576664..c21ab1fd638f84d3fd6cbac8fc346356437375af 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
- <mesh>3D_HGW_1.vtu</mesh>
- <geometry>ogs5_H_3d.gml</geometry>
+ <meshes>
+ <mesh>3D_HGW_1.vtu</mesh>
+ <mesh>3D_HGW_1_l.vtu</mesh>
+ <mesh>3D_HGW_1_r.vtu</mesh>
+ </meshes>
<processes>
<process>
<name>hc</name>
@@ -174,14 +177,12 @@
<initial_condition>c0</initial_condition>
<boundary_conditions>
<boundary_condition>
- <geometrical_set>geometry</geometrical_set>
- <geometry>left</geometry>
+ <mesh>3D_HGW_1_l</mesh>
<type>Dirichlet</type>
<parameter>c1</parameter>
</boundary_condition>
<boundary_condition>
- <geometrical_set>geometry</geometrical_set>
- <geometry>right</geometry>
+ <mesh>3D_HGW_1_r</mesh>
<type>Dirichlet</type>
<parameter>c0</parameter>
</boundary_condition>
@@ -194,17 +195,13 @@
<initial_condition>p_ini</initial_condition>
<boundary_conditions>
<boundary_condition>
- <geometrical_set>geometry</geometrical_set>
- <geometry>left</geometry>
<type>NonuniformDirichlet</type>
- <mesh>3D_HGW_1_l.vtu</mesh>
+ <mesh>3D_HGW_1_l</mesh>
<field_name>p_bc</field_name>
</boundary_condition>
<boundary_condition>
- <geometrical_set>geometry</geometrical_set>
- <geometry>right</geometry>
<type>NonuniformDirichlet</type>
- <mesh>3D_HGW_1_r.vtu</mesh>
+ <mesh>3D_HGW_1_r</mesh>
<field_name>p_bc</field_name>
</boundary_condition>
</boundary_conditions>
diff --git a/Tests/FileIO_Qt/TestQtPrjInterface.cpp b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
index 08acbb4985e59717a8e96fabc7c827c1e0545da5..f9598467642a988f378efeea9c9014a69fb1f949 100644
--- a/Tests/FileIO_Qt/TestQtPrjInterface.cpp
+++ b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
@@ -35,17 +35,16 @@ TEST(TestQtPrjInterface, QtXmlPrjReader)
std::string name =
BaseLib::BuildInfo::data_path +
"/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj";
- test_files.push_back({name, 1, 1, 2, 0});
+ test_files.push_back({name, 0, 3, 2, 0});
name = BaseLib::BuildInfo::data_path +
"/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj";
- test_files.push_back({name, 1, 1, 2, 0});
+ test_files.push_back({name, 0, 3, 2, 0});
for (std::size_t i = 0; i < test_files.size(); ++i)
{
DataHolderLib::Project project;
FileIO::XmlPrjInterface xml(project);
- int result =
- xml.readFile(QString::fromStdString(test_files[i].file_name));
+ int result = xml.readFile(test_files[i].file_name);
EXPECT_EQ(1, result);
std::vector<std::string> geo_names;
diff --git a/web/static/images/xsd/OpenGeoSysProject.xsd b/web/static/images/xsd/OpenGeoSysProject.xsd
index 0eefb0c17c0d931351d8999e0f85e4353f6623e0..a4f99e83eadfa90c5fba755b6bc082acd76e4879 100644
--- a/web/static/images/xsd/OpenGeoSysProject.xsd
+++ b/web/static/images/xsd/OpenGeoSysProject.xsd
@@ -86,6 +86,21 @@
</xs:complexType>
</xs:element>
<xs:element name="geometry" type="xs:string" minOccurs="0"/>
+ <xs:element name="meshes" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="mesh" minOccurs="0">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="axially_symmetric" type="xs:boolean"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="processes" minOccurs="0"/> <!--ignore-->
<xs:element name="time_loop" minOccurs="0"/> <!--ignore-->
<xs:element name="parameters" minOccurs="0">