Skip to content

Add collision and boundary schemes for PS#25

Merged
haraldkl merged 5 commits intomainfrom
new_ps
Aug 20, 2024
Merged

Add collision and boundary schemes for PS#25
haraldkl merged 5 commits intomainfrom
new_ps

Conversation

@MikeW097
Copy link
Copy Markdown
Member

@MikeW097 MikeW097 commented Jul 4, 2024

The modifications are rebased on the current repository.

@haraldkl
Copy link
Copy Markdown
Member

haraldkl commented Jul 8, 2024

Is this a replacement for #12 then? Does this mean we should close #12?

Copy link
Copy Markdown
Member

@haraldkl haraldkl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me. Thanks a lot. Could we add the added testcases to the recheck?

@haraldkl
Copy link
Copy Markdown
Member

I've added the cylinder2d setup to the recheck, and all tests pass:

Solver: musubi
Compiler: GFORTRAN in version 11.2.0
--------------------------------------------------------------------------------------------------------------------------------------
|   changeset    |  success  |   val_method    | result  |     time |          MLUPs | perfdiff(%) | Testcase                       |
--------------------------------------------------------------------------------------------------------------------------------------
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   1.92 s |            --- |         --- | gaussianPulse_musubi           |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  18.10 s |            --- |         --- | C2D_Simple_BGK_musubi          |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  20.22 s |            --- |         --- | C2D_Simple_rBGK_musubi         |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   4.55 s |            --- |         --- | C2D_Simple_rrBGK_musubi        |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   7.16 s |            --- |         --- | C2D_Simple_prrBGK_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   7.25 s |            --- |         --- | C2D_Simple_hrrBGK_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   5.81 s |            --- |         --- | C2D_Simple_drtBGK_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  10.54 s |            --- |         --- | C2D_BC_MfrBB_PressExpol_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  19.83 s |            --- |         --- | C2D_BC_MfrEq_PressEq_musubi    |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   9.91 s |            --- |         --- | C2D_BC_PressExpol_PressExpol_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  27.19 s |            --- |         --- | C2D_BC_VelBB_PressExpol_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  47.13 s |            --- |         --- | C2D_BC_VelBFL_PressExpol_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  19.77 s |            --- |         --- | C2D_BC_VelEq_PressEq_musubi    |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   4.92 s |            --- |         --- | C2D_BC_VelNonEqExpol_PressNonEqExpol_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  57.33 s |            --- |         --- | C3D_Sph_ML_LES_D19_DRT_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  59.14 s |            --- |         --- | C3D_Sph_ML_LES_D19_HRR_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  53.92 s |            --- |         --- | C3D_Sph_ML_LES_D19_PRR_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  55.25 s |            --- |         --- | C3D_Sph_ML_LES_D19_R_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  57.91 s |            --- |         --- | C3D_Sph_ML_LES_D19_RR_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  36.78 s |            --- |         --- | C3D_Sph_ML_LES_D27_CUM17_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  42.16 s |            --- |         --- | C3D_Sph_ML_LES_D27_DRT_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  41.91 s |            --- |         --- | C3D_Sph_ML_LES_D27_HRR_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  41.36 s |            --- |         --- | C3D_Sph_ML_LES_D27_PRR_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  41.24 s |            --- |         --- | C3D_Sph_ML_LES_D27_R_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  42.64 s |            --- |         --- | C3D_Sph_ML_LES_D27_RR_BGK_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  46.17 s |            --- |         --- | TC_SL_MuskerFP_musubi          |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  65.81 s |            --- |         --- | TC_SL_MusNewton_musubi         |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  59.83 s |            --- |         --- | TC_SL_ReichFP_musubi           |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  89.92 s |            --- |         --- | TC_SL_PowerLaw_musubi          |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   0.98 s |            --- |         --- | ABS_Pulse_Radial_musubi        |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   1.17 s |            --- |         --- | ABS_Pulse_Plane_musubi         |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   0.79 s |            --- |         --- | ABS_Pulse_Box_musubi           |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  64.25 s |            --- |         --- | ABS_Pulse_Box3D_musubi         |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  25.57 s |            --- |         --- | ABS_LineSrc2D_musubi           |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  44.72 s |            --- |         --- | ABS_cyl2D_musubi               |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  45.61 s |            --- |         --- | TO_cyl2D_musubi                |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  45.11 s |            --- |         --- | VSL_Radial_musubi              |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   1.65 s |            --- |         --- | VSL_Box2D_musubi               |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  48.09 s |            --- |         --- | VSL_Box3D_musubi               |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  21.84 s |            --- |         --- | VSL_Plane_musubi               |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   1.94 s |            --- |         --- | gaussianPulse_incomp           |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  26.25 s |            --- |         --- | TGV_Simple_Re800               |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  55.11 s |            --- |         --- | TGV_Simple_Re1600              |
|  2a225a631e22  |    OK     |   difference    | 0.000%  | 310.07 s |            --- |         --- | TGV_LES_WALE                   |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  30.42 s |            --- |         --- | TGV_LES_Vreman                 |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  28.69 s |            --- |         --- | TGV_LES_SmagPDF                |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  35.90 s |            --- |         --- | TGV_LES_SmagGradU              |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  23.38 s |            --- |         --- | C2D_Cyl_SL_Incomp_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  46.90 s |            --- |         --- | C2D_Cyl_ML_Incomp_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  15.86 s |            --- |         --- | C3D_Simple_Incomp_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  31.31 s |            --- |         --- | COC_CouetteFlow_Incomp_musubi  |
|  2a225a631e22  |    OK     |   difference    | 0.000%  | 159.40 s |            --- |         --- | COC_CouetteFlow_ML_Incomp_musubi |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  22.38 s |            --- |         --- | LDC_Simple_Incomp_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  42.17 s |            --- |         --- | PIP_Simple_Incomp_musubi       |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  58.90 s |            --- |         --- | PIP_Force_Incomp_musubi        |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  36.36 s |            --- |         --- | PIP_ML_Incomp_musubi           |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  95.86 s |            --- |         --- | PIP_LES_Incomp_musubi          |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  29.70 s |            --- |         --- | PIP_Split_Incomp_musubi        |
|  2a225a631e22  |    OK     |   difference    | 0.000%  | 103.56 s |            --- |         --- | ps_cyl2d_musubi                |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |  18.48 s |            --- |         --- | tut_pip_musubi                 |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   3.68 s |            --- |         --- | tut_gauss_pulse                |
|  2a225a631e22  |    OK     |   difference    | 0.000%  |   3.87 s |            --- |         --- | tut_channel_musubi             |
--------------------------------------------------------------------------------------------------------------------------------------

Unfortunately the gaussian2d setup does not work for me. I always end up with NaN there.

@haraldkl haraldkl self-requested a review July 10, 2024 11:27
Copy link
Copy Markdown
Member

@haraldkl haraldkl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gaussian2d leads to NaN in the Musubi simulation. Note that it is possible to use environment variables in Lua, I've changed the args_given.lua to illustrate how. But in general generated files should not be part of the repository.

@haraldkl haraldkl self-requested a review July 10, 2024 11:49
haraldkl
haraldkl previously approved these changes Jul 10, 2024
Copy link
Copy Markdown
Member

@haraldkl haraldkl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've adapted the kernel name now, if it is generic for stencil layouts the _l should still be there, just not followed by a specific layout. That leaves the gaussian2d setup as an open issue. Other than that it's fine for me to merge this.

@MikeW097
Copy link
Copy Markdown
Member Author

Is this a replacement for #12 then? Does this mean we should close #12?

Yes, it's now based on the newest version. We can close the previous one.

@MikeW097
Copy link
Copy Markdown
Member Author

I've adapted the kernel name now, if it is generic for stencil layouts the _l should still be there, just not followed by a specific layout. That leaves the gaussian2d setup as an open issue. Other than that it's fine for me to merge this.

Thanks for the change.

The gaussian2d case runs with no problem on my PC. What command did you use to run the case?

@haraldkl
Copy link
Copy Markdown
Member

haraldkl commented Aug 5, 2024

The gaussian2d case runs with no problem on my PC. What command did you use to run the case?

Sorry for the late reply. I tried to reproduce my problem by running the default args_given.lua parameters, but that works for me now. I unfortunately can not remember what I did before my vacation, which might have resulted in the failure I saw.

Should we add the default parameters settings there to the recheck?

Comment thread examples/passive_scalar/benchmark/cylinder2d/args.template
Comment thread examples/passive_scalar/benchmark/cylinder2d/timing.res Outdated
Comment thread examples/passive_scalar/benchmark/gaussian2d/compare_trt.sh Outdated
Comment thread examples/passive_scalar/benchmark/gaussian2d/index.md Outdated
Comment thread source/bc/mus_bc_passiveScalar_module.fpp
Comment thread source/compute/mus_compute_bgk_module.fpp Outdated
Copy link
Copy Markdown
Contributor

@KannanMasilamani KannanMasilamani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your changes. Everything looks fine.
Just a minor comment, please use just two indent spaces in lua files. Some files have four spaces. It is not a big issue but it would be nice to have a consistent spacing.

@haraldkl haraldkl merged commit c742b9c into main Aug 20, 2024
@haraldkl haraldkl deleted the new_ps branch August 20, 2024 11:17
@haraldkl
Copy link
Copy Markdown
Member

@MikeW097 Thanks a lot. It's merged and available in the parent musubi repository with commit 530eeec9.

@MikeW097
Copy link
Copy Markdown
Member Author

Thank you for your changes. Everything looks fine. Just a minor comment, please use just two indent spaces in lua files. Some files have four spaces. It is not a big issue but it would be nice to have a consistent spacing.

Thanks for the review and pointing out the issue. I will take more care of the spacing.

@MikeW097
Copy link
Copy Markdown
Member Author

@MikeW097 Thanks a lot. It's merged and available in the parent musubi repository with commit 530eeec9.

Thanks a lot, Harald!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants