Refactor void fraction out of solver #1392
Open
+1,704
−1,566
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
blaisb
force-pushed
the
refactor_void_fraction_out_of_solver
branch
from
e3db630
to
2ea7c62
Compare
voferreira
reviewed
Dec 3, 2024
blaisb
force-pushed
the
refactor_void_fraction_out_of_solver
branch
from
e8745f9
to
d7e3e42
Compare
Co-authored-by: Amishga Alphonius <[email protected]>
AmishgaAlphonius
approved these changes
Dec 4, 2024
include/fem-dem/void_fraction.h
Outdated
| public: | ||
| VoidFractionBase( | ||
| parallel::DistributedTriangulationBase<dim> *triangulation, | ||
| std::shared_ptr<Parameters::VoidFractionParameters<dim>> input_parameters, | ||
| const Parameters::LinearSolver &linear_solver_parameters, | ||
| Particles::ParticleHandler<dim> *particle_handler, | ||
| const unsigned int fe_degree, | ||
| const bool simplex, | ||
| const ConditionalOStream &pcout) | ||
| : PhysicsLinearSubequationsSolver(pcout) | ||
| , dof_handler(*triangulation) | ||
| , triangulation(triangulation) | ||
| , void_fraction_parameters(input_parameters) | ||
| , linear_solver_parameters(linear_solver_parameters) | ||
| // BB TODO verify if the particle handler can be remade const | ||
| , particle_handler(particle_handler) |
There was a problem hiding this comment.
Still missing the brief for the constructor
source/fem-dem/void_fraction.cc
Outdated
Comment on lines
26
to
56
| const MPI_Comm mpi_communicator = dof_handler.get_communicator(); | ||
|
|
||
| dof_handler.distribute_dofs(*fe); | ||
| locally_owned_dofs = dof_handler.locally_owned_dofs(); | ||
|
|
||
| locally_relevant_dofs = DoFTools::extract_locally_relevant_dofs(dof_handler); | ||
|
|
||
| void_fraction_constraints.clear(); | ||
| void_fraction_constraints.reinit(locally_relevant_dofs); | ||
| DoFTools::make_hanging_node_constraints(dof_handler, | ||
| void_fraction_constraints); | ||
|
|
||
| /// TODO ADD Periodic constraints | ||
| void_fraction_constraints.close(); | ||
|
|
||
| void_fraction_locally_relevant.reinit(locally_owned_dofs, | ||
| locally_relevant_dofs, | ||
| mpi_communicator); | ||
|
|
||
| this->previous_void_fraction.resize(maximum_number_of_previous_solutions()); | ||
|
|
||
| // Initialize vector of previous solutions for the void fraction | ||
| for (auto &solution : this->previous_void_fraction) | ||
| { | ||
| solution.reinit(this->locally_owned_dofs, | ||
| this->locally_relevant_dofs, | ||
| this->triangulation->get_communicator()); | ||
| } | ||
|
|
||
| void_fraction_locally_owned.reinit(locally_owned_dofs, | ||
| this->triangulation->get_communicator()); |
There was a problem hiding this comment.
In that case, why is the local copy not used everywhere here?
Co-authored-by: Amishga Alphonius <[email protected]>
|
Thanks for the nice thorough review @AmishgaAlphonius and @voferreira . Really helped a lot. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The facilities required to calculate the void fraction were all contained within the unresolved CFD-DEM solver and the VANS solver. This is very problematic, because it makes it difficult to develop new void fraction schemes, but also prevents the development of new VANS schemes (e.g. matrix free). Consequently, I Have used the new interface developed by @AmishgaAlphonius to refactor the void fraction calculation completely out of the VANS and unresolved CFD-DEM solver. The result is very lightweight.
I also took the opportunity to deprecate the bounding of the void fraction. This feature was never used and was actually dangerous for convergence. Consequently, it has now been fully deprecated and the documentation has been adapted.
Testing
None of the tests results were changed, this is great since nothing should have changed.
Documentation
I have removed the documentation related to the bounding of the void fraction and all of its mention within the examples.
Miscellaneous (will be removed when merged)
Checklist (will be removed when merged)
See this page for more information about the pull request process.
Code related list:
Pull request related list: