Resolve merge conflicts for PR #3516 - Implement Virtual Lattice Method for Efficient Simulation of Dispersed Fuels #3566
Conversation
Updates the documentation for the geometry format to include new attributes for TRISO particle and virtual lattice handling. These attributes specify whether a cell contains a TRISO particle, whether a virtual lattice is used, and the lattice's shape if applicable.
Introduces functionality to calculate distances and locate cells within virtual lattice geometries. Refactors existing geometry handling logic to reduce code duplication and improve maintainability. Key updates include: - Addition of `distance_in_virtual_lattice` and `find_cell_in_virtual_lattice` methods for specialized handling. - Integration of virtual lattice checks in standard cell distance computations. - Refactoring of repetitive code in surface crossing handlers for improved clarity. Enhances support for TRISO particle geometries within virtual lattices, ensuring accurate material and cell identification during particle transport.
cn-skywalker
force-pushed
the
virtual_lattice_0.15.2
branch
from
74240f4 to
0a29402
Compare
cn-skywalker
force-pushed
the
virtual_lattice_0.15.2
branch
from
0a29402 to
02fe13b
Compare
|
@paulromano @gridley @amandalund Hi,When I tried to merge this code, I encountered the following errors in the GitHub automatic process : |
|
According to the CI run, this is a formatting error. Even if you did not change a specific function within a file, if that file was incorrectly formatted before your change (grandfathered in from before CPP formatting was checked), then you change something else, I believe that may be a cause of your problem. However I'm not seeing any changes to Firstly I would suggest merging against the main branch or rebasing your changes on it. Secondly, make sure you have clang-format installed (it has to be the exact same version number!) then try running that on all the files that are having an issue. Lastly, this is the type of issue chatgpt or its brethren should be able to solve well, so that would be where I recommend you take any issues next. Good luck! |
3 participants
Description
This pull request is a continuation of #3516 .
The original PR by @liangjg introduced a valuable new module, but it had merge conflicts with the latest main branch. I have resolved these conflicts in this branch.
Once this PR is merged, the original PR #3516 can be closed as its work is completed here.
Checklist