Skip to content
Snippets Groups Projects
Commit c1887041 authored by wenqing's avatar wenqing Committed by Dmitri Naumov
Browse files

[partmesh] Made two local functions be visible to other files 

[partmesh] Made getNumberOfElementIntegrationPoints be visible to other files.

[partmesh] made another local function be visible to other files.
parent 2eb3a6b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Applications/Utils/ModelPreparation/PartitionMesh/CMakeLists.txt
+ 2
− 2
View file @ c1887041
if(OGS_USE_MPI)
ogs_add_executable(
binaryToPVTU BinaryToPVTU.cpp NodeWiseMeshPartitioner.cpp
binaryToPVTU BinaryToPVTU.cpp IntegrationPointDataTools.cpp NodeWiseMeshPartitioner.cpp
)
target_link_libraries(
binaryToPVTU GitInfoLib ProcessLib MeshLib tclap
......@@ -10,7 +10,7 @@ if(OGS_USE_MPI)
endif()
ogs_add_executable(
partmesh PartitionMesh.cpp Metis.cpp NodeWiseMeshPartitioner.cpp
partmesh PartitionMesh.cpp Metis.cpp IntegrationPointDataTools.cpp NodeWiseMeshPartitioner.cpp
)
target_link_libraries(partmesh GitInfoLib MeshLib tclap ProcessLib NumLib)
add_dependencies(partmesh mpmetis)
......
Applications/Utils/ModelPreparation/PartitionMesh/IntegrationPointDataTools.cpp 0 → 100644
+ 131
− 0
View file @ c1887041
/**
* \file
* \copyright
* Copyright (c) 2012-2022, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*
* Created on September 29, 2022, 3:22 PM
*/
#include "IntegrationPointDataTools.h"
#include "MeshLib/Elements/Elements.h"
#include "MeshLib/MeshEnums.h"
#include "MeshLib/Properties.h"
#include "MeshLib/PropertyVector.h"
#include "NumLib/Fem/Integration/GaussLegendreIntegrationPolicy.h"
#include "ProcessLib/Output/IntegrationPointWriter.h"
namespace ApplicationUtils
{
template <typename ElementType>
int getNumberOfElementIntegrationPointsGeneral(
ProcessLib::IntegrationPointMetaData const& ip_meta_data)
{
using IntegrationPolicy =
NumLib::GaussLegendreIntegrationPolicy<ElementType>;
using NonGenericIntegrationMethod =
typename IntegrationPolicy::IntegrationMethod;
NonGenericIntegrationMethod int_met{
(unsigned int)ip_meta_data.integration_order};
return int_met.getNumberOfPoints();
}
int getNumberOfElementIntegrationPoints(std::string const& data_name,
MeshLib::Properties const& properties,
MeshLib::Element const& e)
{
auto const ip_meta_data =
ProcessLib::getIntegrationPointMetaData(properties, data_name);
switch (e.getCellType())
{
case MeshLib::CellType::LINE2:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Line>(
ip_meta_data);
case MeshLib::CellType::LINE3:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Line3>(
ip_meta_data);
case MeshLib::CellType::TRI3:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tri>(
ip_meta_data);
case MeshLib::CellType::TRI6:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tri6>(
ip_meta_data);
case MeshLib::CellType::QUAD4:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Quad>(
ip_meta_data);
case MeshLib::CellType::QUAD8:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Quad8>(
ip_meta_data);
case MeshLib::CellType::QUAD9:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Quad9>(
ip_meta_data);
case MeshLib::CellType::TET4:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tet>(
ip_meta_data);
case MeshLib::CellType::TET10:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tet10>(
ip_meta_data);
case MeshLib::CellType::HEX8:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Hex>(
ip_meta_data);
case MeshLib::CellType::HEX20:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Hex20>(
ip_meta_data);
case MeshLib::CellType::PRISM6:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Prism>(
ip_meta_data);
case MeshLib::CellType::PRISM15:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Prism15>(
ip_meta_data);
case MeshLib::CellType::PYRAMID5:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Pyramid>(
ip_meta_data);
case MeshLib::CellType::PYRAMID13:
return getNumberOfElementIntegrationPointsGeneral<
MeshLib::Pyramid13>(ip_meta_data);
case MeshLib::CellType::PRISM18:
case MeshLib::CellType::HEX27:
OGS_FATAL("Mesh element type {:s} is not supported",
MeshLib::CellType2String(e.getCellType()));
case MeshLib::CellType::INVALID:
default:
OGS_FATAL("Invalid Element Type");
}
return 0;
}
std::vector<std::size_t> getIntegrationPointDataOffsetsOfMeshElements(
std::vector<MeshLib::Element*> const& mesh_elements,
MeshLib::PropertyVectorBase const& pv,
MeshLib::Properties const& properties)
{
if (pv.getPropertyName() == "OGS_VERSION" ||
pv.getPropertyName() == "IntegrationPointMetaData")
{
return {};
}
auto const n_components = pv.getNumberOfGlobalComponents();
std::vector<std::size_t> element_ip_data_offsets(mesh_elements.size() + 1);
std::size_t counter = 0;
for (std::size_t i = 0; i < mesh_elements.size(); i++)
{
auto const element = mesh_elements[i];
// Assuming that the order of elements in mesh_elements is not touched.
element_ip_data_offsets[i] = counter;
counter += getNumberOfElementIntegrationPoints(pv.getPropertyName(),
properties, *element) *
n_components;
}
element_ip_data_offsets[mesh_elements.size()] = counter;
return element_ip_data_offsets;
}
} // namespace ApplicationUtils
Applications/Utils/ModelPreparation/PartitionMesh/IntegrationPointDataTools.h 0 → 100644
+ 34
− 0
View file @ c1887041
/**
* \file
* \copyright
* Copyright (c) 2012-2022, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
*
* Created on September 26, 2022, 11:32 AM
*/
#pragma once
#include <string>
#include <vector>
namespace MeshLib
{
class Element;
class Properties;
class PropertyVectorBase;
} // namespace MeshLib
namespace ApplicationUtils
{
int getNumberOfElementIntegrationPoints(std::string const& data_name,
MeshLib::Properties const& properties,
MeshLib::Element const& e);
std::vector<std::size_t> getIntegrationPointDataOffsetsOfMeshElements(
std::vector<MeshLib::Element*> const& mesh_elements,
MeshLib::PropertyVectorBase const& pv,
MeshLib::Properties const& properties);
} // namespace ApplicationUtils
Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
+ 3
− 121
View file @ c1887041
......@@ -22,11 +22,10 @@
#include "BaseLib/FileTools.h"
#include "BaseLib/Logging.h"
#include "BaseLib/Stream.h"
#include "IntegrationPointDataTools.h"
#include "MeshLib/Elements/Elements.h"
#include "MeshLib/IO/VtkIO/VtuInterface.h"
#include "MeshLib/MeshEnums.h"
#include "NumLib/Fem/Integration/GaussLegendreIntegrationPolicy.h"
#include "ProcessLib/Output/IntegrationPointWriter.h"
namespace ApplicationUtils
{
......@@ -46,84 +45,6 @@ struct NodeStruct
double z;
};
template <typename ElementType>
int getNumberOfElementIntegrationPointsGeneral(
ProcessLib::IntegrationPointMetaData const& ip_meta_data)
{
using IntegrationPolicy =
NumLib::GaussLegendreIntegrationPolicy<ElementType>;
using NonGenericIntegrationMethod =
typename IntegrationPolicy::IntegrationMethod;
NonGenericIntegrationMethod int_met{
(unsigned int)ip_meta_data.integration_order};
return int_met.getNumberOfPoints();
}
int getNumberOfElementIntegrationPoints(std::string const& data_name,
MeshLib::Properties const& properties,
MeshLib::Element const& e)
{
auto const ip_meta_data =
ProcessLib::getIntegrationPointMetaData(properties, data_name);
switch (e.getCellType())
{
case MeshLib::CellType::LINE2:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Line>(
ip_meta_data);
case MeshLib::CellType::LINE3:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Line3>(
ip_meta_data);
case MeshLib::CellType::TRI3:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tri>(
ip_meta_data);
case MeshLib::CellType::TRI6:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tri6>(
ip_meta_data);
case MeshLib::CellType::QUAD4:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Quad>(
ip_meta_data);
case MeshLib::CellType::QUAD8:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Quad8>(
ip_meta_data);
case MeshLib::CellType::QUAD9:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Quad9>(
ip_meta_data);
case MeshLib::CellType::TET4:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tet>(
ip_meta_data);
case MeshLib::CellType::TET10:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Tet10>(
ip_meta_data);
case MeshLib::CellType::HEX8:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Hex>(
ip_meta_data);
case MeshLib::CellType::HEX20:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Hex20>(
ip_meta_data);
case MeshLib::CellType::PRISM6:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Prism>(
ip_meta_data);
case MeshLib::CellType::PRISM15:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Prism15>(
ip_meta_data);
case MeshLib::CellType::PYRAMID5:
return getNumberOfElementIntegrationPointsGeneral<MeshLib::Pyramid>(
ip_meta_data);
case MeshLib::CellType::PYRAMID13:
return getNumberOfElementIntegrationPointsGeneral<
MeshLib::Pyramid13>(ip_meta_data);
case MeshLib::CellType::PRISM18:
case MeshLib::CellType::HEX27:
OGS_FATAL("Mesh element type {:s} is not supported",
MeshLib::CellType2String(e.getCellType()));
case MeshLib::CellType::INVALID:
default:
OGS_FATAL("Invalid Element Type");
}
return 0;
}
std::size_t Partition::numberOfMeshItems(
MeshLib::MeshItemType const item_type) const
{
......@@ -442,42 +363,6 @@ std::size_t copyCellPropertyVectorValues(
return n_components * (n_regular + n_ghost);
}
template <typename T>
std::vector<std::size_t> getIntegrationPointDataOffsetsOfGlobalMeshElements(
std::vector<MeshLib::Element*> const& global_mesh_elements,
MeshLib::PropertyVector<T> const& pv,
MeshLib::Properties const& properties)
{
if (pv.getPropertyName() == "OGS_VERSION" ||
pv.getPropertyName() == "IntegrationPointMetaData")
{
return {};
}
auto const n_components = pv.getNumberOfGlobalComponents();
std::vector<std::size_t> element_ip_data_offsets(
global_mesh_elements.size() + 1);
std::size_t counter = 0;
for (std::size_t i = 0; i < global_mesh_elements.size(); i++)
{
auto const element = global_mesh_elements[i];
#ifdef NDEBUG
// Assuming that element->getID() is the same as the element index of
// the vector.
assert(i == element->getID());
#endif
element_ip_data_offsets[element->getID()] = counter;
counter += getNumberOfElementIntegrationPoints(pv.getPropertyName(),
properties, *element) *
n_components;
}
element_ip_data_offsets[global_mesh_elements.size()] = counter;
return element_ip_data_offsets;
}
/// Copies the data from the property vector \c pv belonging to the given
/// Partition \c p to the property vector \c partitioned_pv.
/// \c partitioned_pv is ordered by partition. Regular elements' and ghost
......@@ -601,9 +486,8 @@ bool copyPropertyVector(
partitioned_pv_size = pv->size() * partitions.size();
}
element_ip_data_offsets =
getIntegrationPointDataOffsetsOfGlobalMeshElements<T>(
global_mesh_elements, *pv, properties);
element_ip_data_offsets = getIntegrationPointDataOffsetsOfMeshElements(
global_mesh_elements, *pv, properties);
}
auto partitioned_pv = partitioned_properties.createNewPropertyVector<T>(
......@@ -681,8 +565,6 @@ MeshLib::Properties partitionProperties(
std::vector<Partition>& partitions)
{
using namespace MeshLib;
using namespace ProcessLib;
using namespace NumLib;
MeshLib::Properties const& properties = mesh->getProperties();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment