diff --git a/include/grains/FloodFiller.h b/include/grains/FloodFiller.h index 50efed836..2b07a6959 100644 --- a/include/grains/FloodFiller.h +++ b/include/grains/FloodFiller.h @@ -16,7 +16,7 @@ * vertices in that grain. */ template -class GrainSet +class Grain { public: /** @@ -111,7 +111,7 @@ class FloodFiller /** * The primary external interface. This method takes in information about the - * mesh/field and outputs a vector of GrainSet objects. + * mesh/field and outputs a vector of Grain objects. */ void calcGrainSets(dealii::FESystem &finite_element, @@ -121,7 +121,7 @@ class FloodFiller double threshold_upper, int min_id, unsigned int order_parameter_index, - std::vector> &grain_sets); + std::vector> &grain_sets); protected: /** @@ -136,21 +136,21 @@ class FloodFiller double threshold_upper, int min_id, unsigned int &grain_index, - std::vector> &grain_sets, + std::vector> &grain_sets, bool &grain_assigned); /** * The method to merge the grain sets from all the processors. */ void - createGlobalGrainSetList(std::vector> &grain_sets) const; + createGlobalGrainSetList(std::vector> &grain_sets) const; /** * Checks to see if grains found on different processors are parts of a larger * grain. If so, it merges the grain_sets entries. */ void - mergeSplitGrains(std::vector> &grain_sets) const; + mergeSplitGrains(std::vector> &grain_sets) const; /** * The quadrature used to calculate the element-wise value of the solution diff --git a/include/grains/SimplifiedGrainRepresentation.h b/include/grains/SimplifiedGrainRepresentation.h index 6965ac476..c0b9edb60 100644 --- a/include/grains/SimplifiedGrainRepresentation.h +++ b/include/grains/SimplifiedGrainRepresentation.h @@ -16,11 +16,11 @@ class SimplifiedGrainRepresentation public: /** * Constructor. Creates the simplified representation of a grain from its - * GrainSet. This sets all of the internal data members and is the only way + * Grain. This sets all of the internal data members and is the only way * to set the radius and center of the grain. The members order_parameter_id * and old_order_parameter_id are initialized to the same value. */ - SimplifiedGrainRepresentation(const GrainSet &grain_set); + SimplifiedGrainRepresentation(const Grain &grain); /** * Getter for the grain center/centroid. diff --git a/src/core/initial_conditions/initialConditions.cc b/src/core/initial_conditions/initialConditions.cc index 923e72b31..97dabc53c 100644 --- a/src/core/initial_conditions/initialConditions.cc +++ b/src/core/initial_conditions/initialConditions.cc @@ -125,12 +125,12 @@ MatrixFreePDE::applyInitialConditions() FloodFiller flood_filler(*FESet.at(scalar_field_index), quadrature2); pcout << "Locating the grains...\n"; - std::vector> grain_sets; + std::vector> grain_sets; for (unsigned int id = min_id; id < max_id + 1; id++) { pcout << "Locating grain " << id << "...\n"; - std::vector> grain_sets_single_id; + std::vector> grain_sets_single_id; flood_filler.calcGrainSets(*FESet.at(scalar_field_index), *dofHandlersSet_nonconst.at(scalar_field_index), diff --git a/src/grains/FloodFiller.cc b/src/grains/FloodFiller.cc index 32e79ac94..5ad3ea642 100644 --- a/src/grains/FloodFiller.cc +++ b/src/grains/FloodFiller.cc @@ -10,7 +10,7 @@ FloodFiller::calcGrainSets( double threshold_upper, int min_id, unsigned int order_parameter_index, - std::vector> &grain_sets) + std::vector> &grain_sets) { unsigned int grain_index = 0; @@ -23,8 +23,8 @@ FloodFiller::calcGrainSets( ++cell; } - GrainSet grain_set; - grain_sets.push_back(grain_set); + Grain grain; + grain_sets.push_back(grain); grain_sets.back().setOrderParameterIndex(order_parameter_index); // The flood fill loop @@ -49,9 +49,9 @@ FloodFiller::calcGrainSets( { // Get the grain set initialized for the next grain to be found grain_index++; - GrainSet new_grain_set; - new_grain_set.setOrderParameterIndex(order_parameter_index); - grain_sets.push_back(new_grain_set); + Grain new_grain; + new_grain.setOrderParameterIndex(order_parameter_index); + grain_sets.push_back(new_grain); } } @@ -86,7 +86,7 @@ FloodFiller::recursiveFloodFill( double threshold_upper, int min_id, unsigned int &grain_index, - std::vector> &grain_sets, + std::vector> &grain_sets, bool &grain_assigned) { if (cell == cell_end) @@ -189,7 +189,7 @@ FloodFiller::recursiveFloodFill( template void FloodFiller::createGlobalGrainSetList( - std::vector> &grain_sets) const + std::vector> &grain_sets) const { unsigned int numProcs = dealii::Utilities::MPI::n_mpi_processes(MPI_COMM_WORLD); @@ -308,12 +308,12 @@ FloodFiller::createGlobalGrainSetList( MPI_DOUBLE, MPI_COMM_WORLD); - // Put the GrainSet objects back together + // Put the Grain objects back together grain_sets.clear(); for (int g = 0; g < num_grains_global; g++) { - GrainSet new_grain_set; + Grain new_grain; for (unsigned int c = 0; c < num_elements_global.at(g); c++) { std::vector> verts; @@ -329,10 +329,10 @@ FloodFiller::createGlobalGrainSetList( dealii::Point vert(tensor_coords); verts.push_back(vert); } - new_grain_set.addVertexList(verts); + new_grain.addVertexList(verts); } - new_grain_set.setOrderParameterIndex(order_parameters_global.at(g)); - grain_sets.push_back(new_grain_set); + new_grain.setOrderParameterIndex(order_parameters_global.at(g)); + grain_sets.push_back(new_grain); } } @@ -342,7 +342,7 @@ FloodFiller::createGlobalGrainSetList( template void -FloodFiller::mergeSplitGrains(std::vector> &grain_sets) const +FloodFiller::mergeSplitGrains(std::vector> &grain_sets) const { // Loop though each vertex in the base grain "g" for (unsigned int g = 0; g < grain_sets.size(); g++) diff --git a/src/grains/SimplifiedGrainRepresentation.cc b/src/grains/SimplifiedGrainRepresentation.cc index b5e31e655..f96339d1c 100644 --- a/src/grains/SimplifiedGrainRepresentation.cc +++ b/src/grains/SimplifiedGrainRepresentation.cc @@ -5,16 +5,15 @@ // ============================================================================ template -SimplifiedGrainRepresentation::SimplifiedGrainRepresentation( - const GrainSet &grain_set) - : grain_id(grain_set.getGrainIndex()) - , order_parameter_id(grain_set.getOrderParameterIndex()) +SimplifiedGrainRepresentation::SimplifiedGrainRepresentation(const Grain &grain) + : grain_id(grain.getGrainIndex()) + , order_parameter_id(grain.getOrderParameterIndex()) , old_order_parameter_id(order_parameter_id) , distance_to_neighbor_sharing_op(0.0) { // Calculate the centroid assuming that the elements are rectangular and with // no weighting based on the actual value of the field - std::vector>> vertex_list = grain_set.getVertexList(); + std::vector>> vertex_list = grain.getVertexList(); double grain_volume = 0.0; dealii::Tensor<1, dim> centroid; diff --git a/src/grains/reassignGrains.cc b/src/grains/reassignGrains.cc index 8c09cd2a3..c5386388c 100644 --- a/src/grains/reassignGrains.cc +++ b/src/grains/reassignGrains.cc @@ -29,7 +29,7 @@ MatrixFreePDE::reassignGrains() QGaussLobatto quadrature2(degree + 1); FloodFiller flood_filler(*FESet.at(scalar_field_index), quadrature2); - std::vector> grain_sets; + std::vector> grain_sets; unsigned int op_list_index = 0; for (unsigned int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++) @@ -40,7 +40,7 @@ MatrixFreePDE::reassignGrains() { op_list_index++; - std::vector> single_OP_grain_sets; + std::vector> single_OP_grain_sets; flood_filler.calcGrainSets(*FESet.at(scalar_field_index), *dofHandlersSet_nonconst.at(scalar_field_index), solutionSet.at(fieldIndex),