crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 21:55:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Renaming UnstructuredMeshBase class to UnstructuredMesh.

Browse source
This commit is contained in:
Patrick Shriwise 2020-04-08 14:13:16 -05:00
parent b1af80697c
commit 58d477c657
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/openmc/mesh.h
View file

@ -274,13 +274,13 @@ public:
int set_grid();
};
class UnstructuredMeshBase : public Mesh {
class UnstructuredMesh : public Mesh {
public:
// constructors
UnstructuredMeshBase() {};
UnstructuredMeshBase(pugi::xml_node node);
UnstructuredMeshBase(const std::string& filename);
UnstructuredMesh() {};
UnstructuredMesh(pugi::xml_node node);
UnstructuredMesh(const std::string& filename);
std::string bin_label(int bin) const override;
@ -311,7 +311,7 @@ public:
#ifdef DAGMC
class MOABUnstructuredMesh : public UnstructuredMeshBase {
class MOABUnstructuredMesh : public UnstructuredMesh {
public:
@ -480,7 +480,7 @@ private:
#endif
#ifdef LIBMESH
class LibMesh : public UnstructuredMeshBase {
class LibMesh : public UnstructuredMesh {
typedef std::vector<std::pair<double, const libMesh::Elem*>> UnstructuredMeshHits;

10
src/mesh.cpp
View file

@ -112,7 +112,7 @@ StructuredMesh::bin_label(int bin) const {
// Untructured Mesh implementation
//==============================================================================
UnstructuredMeshBase::UnstructuredMeshBase(pugi::xml_node node) : Mesh(node) {
UnstructuredMesh::UnstructuredMesh(pugi::xml_node node) : Mesh(node) {
// check the mesh type
if (check_for_node(node, "type")) {
auto temp = get_node_value(node, "type", true, true);
@ -132,12 +132,12 @@ UnstructuredMeshBase::UnstructuredMeshBase(pugi::xml_node node) : Mesh(node) {
}
std::string
UnstructuredMeshBase::bin_label(int bin) const {
UnstructuredMesh::bin_label(int bin) const {
return fmt::format("Mesh Index ({})", bin);
};
void
UnstructuredMeshBase::to_hdf5(hid_t group) const
UnstructuredMesh::to_hdf5(hid_t group) const
{
hid_t mesh_group = create_group(group, fmt::format("mesh {}", id_));
@ -1614,7 +1614,7 @@ openmc_rectilinear_mesh_set_grid(int32_t index, const double* grid_x,
#ifdef DAGMC
MOABUnstructuredMesh::MOABUnstructuredMesh(pugi::xml_node node) : UnstructuredMeshBase(node) {
MOABUnstructuredMesh::MOABUnstructuredMesh(pugi::xml_node node) : UnstructuredMesh(node) {
initialize();
}
@ -2162,7 +2162,7 @@ double UnstructuredMesh::get_volume_frac(int bin = -1) const {
#endif
#ifdef LIBMESH
LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMeshBase(node) {
LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMesh(node) {
initialize();
}

2
src/state_point.cpp
View file

@ -784,7 +784,7 @@ void write_unstructured_mesh_results() {
// check if the filter uses an unstructured mesh
auto mesh_filter = dynamic_cast<MeshFilter*>(filter.get());
auto mesh_idx = mesh_filter->mesh();
auto umesh = dynamic_cast<UnstructuredMeshBase*>(model::meshes[mesh_idx].get());
auto umesh = dynamic_cast<UnstructuredMesh*>(model::meshes[mesh_idx].get());
if (!umesh) continue;