Closed shkodm closed 1 year ago
Patch and project coverage have no change.
Comparison is base (
a74ad83
) 32.52% compared to head (1cc1ec6
) 32.52%.
:mega: This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more
:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Do you have feedback about the report comment? Let us know in this issue.
I think the optimise_for_static_access
is not working right for the 2D models. the "big" flag was triggered for stencils above 27, which never happened for 2D models, and thus, this code was never generated for 2D models. Now that you generate it, it fails on compilation. I think this comes from an error (wrong assumption) in conf.R
. Try replacing (https://github.com/CFD-GO/TCLB/blob/develop/src/conf.R#L777):
tab3 = rep(TRUE,9)
with one which will take into account what are the maximal stencils in each direction:
tab3 = c(mins<0,TRUE,TRUE,TRUE,maxs>0)
I think the optimise_for_static_access is not working right for the 2D models. the "big" flag was triggered for stencils above 27, which never happened for 2D models, and thus, this code was never generated for 2D models. Now that you generate it, it fails on compilation.
I will fix the issue with 2D models, but actually big
flag was not supposed to be triggered for 2D model. Big
means no optimisation (so corresponds to optimise_static_access = FALSE
). I had it the other way around, that is why new 2D models build was triggered and was failing.
@TravisMitchell you can review now. I already tested the performance (everything is still god), will test again if the results are the same as I had before.
@llaniewski I will switch the path inside <?RT > tag once rtemplate PR is merged
@TravisMitchell would you have time to review this one soon? I validated it on capillary intrusion already, the droplet spread jobs are currently stuck in queue.
@shkodm I will do today
@TravisMitchell I tested all methods on the Washburn Law again after your refactoring, it still works. I think you can approve this PR.
@llaniewski I think it can be ready to merge. But please squash my commits when merging (there should be an option), there is no need for my 100 commits to be in the git history of the main repo.
Also I think to keep:
<?RT models/multiphase/d3q27_pf_velocity/Boundary.c.Rt ?>
as it is (not using just Boundary.c.Rt
), because this way we don't need to update rtemplate
package everywhere.
d3q27_pf_velocity
(maintainer: @TravisMitchell ) to include various variants of the wetting boundary conditions.OutputPath
(and maybe other info) to Rinside.I also splitted
Dynamics.c.Rt
in two files with all wetting boundary conditions code inBoundary.c.Rt
to make it more readable. The file is included and preprocessed using Rtemplate <?RT ?> syntax at the bottom ofDynamics.c.Rt
.The code in
Boundary.c.Rt
should be ready to review already, @TravisMitchell, would be useful if you go through. It should be quite documented. I need to go through the code inDynamics.c.Rt
andDynamics.R
again to make sure I did not remove / added something by accident when cleaning up code and fixing merge conflicts. I also want to double check the performance again just in case. This is why for now PR is DRAFT, once I verify this I will convert it into a normal PR.