Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/identify relaxation options #14

Merged
merged 9 commits into from
May 7, 2024

Conversation

KannanMasilamani
Copy link
Contributor

This MR introduces variant options for relexation in identify table as described in #10
Additionally, the routine names for bgk, mrt and trt for fluid and fluid_incompressible schemes are renamed according to #10

…fluid_incompressible schemes. Used variant option to select the compute routine.

Default variant is set to standard. Adapted mus_assign_mrt_ptr to assign mrtPtr according to a variant. Renamed derive_force to derive_force_MRT, a routine used to tract src_force variable. derive_force for non-mrt need to be implemented.
@KannanMasilamani KannanMasilamani requested a review from haraldkl May 6, 2024 08:40
@KannanMasilamani KannanMasilamani self-assigned this May 6, 2024
@haraldkl
Copy link
Member

haraldkl commented May 6, 2024

Did you run this through the regression check already?

@KannanMasilamani
Copy link
Contributor Author

KannanMasilamani commented May 6, 2024

started at: 2024-05-06__10:34:12
by user   : checker

on machine: sp-000021l


Solver: musubi
Compiler: GFORTRAN in version 11.2.0
--------------------------------------------------------------------------------------------------------------------------------------
|   changeset    |  success  |   val_method    | result  |     time |          MLUPs | perfdiff(%) | Testcase                       |
--------------------------------------------------------------------------------------------------------------------------------------
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   1.99 s |            --- |         --- | gaussianPulse_musubi           |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  18.07 s |            --- |         --- | C2D_Simple_BGK_musubi          |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  20.11 s |            --- |         --- | C2D_Simple_rBGK_musubi         |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   4.56 s |            --- |         --- | C2D_Simple_rrBGK_musubi        |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   7.04 s |            --- |         --- | C2D_Simple_prrBGK_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   7.27 s |            --- |         --- | C2D_Simple_hrrBGK_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   5.71 s |            --- |         --- | C2D_Simple_drtBGK_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  10.37 s |            --- |         --- | C2D_BC_MfrBB_PressExpol_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  18.70 s |            --- |         --- | C2D_BC_MfrEq_PressEq_musubi    |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   9.79 s |            --- |         --- | C2D_BC_PressExpol_PressExpol_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  30.18 s |            --- |         --- | C2D_BC_VelBB_PressExpol_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  46.21 s |            --- |         --- | C2D_BC_VelBFL_PressExpol_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  19.77 s |            --- |         --- | C2D_BC_VelEq_PressEq_musubi    |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   4.86 s |            --- |         --- | C2D_BC_VelNonEqExpol_PressNonEqExpol_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  57.52 s |            --- |         --- | C3D_Sph_ML_LES_D19_DRT_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  60.70 s |            --- |         --- | C3D_Sph_ML_LES_D19_HRR_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  55.19 s |            --- |         --- | C3D_Sph_ML_LES_D19_PRR_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  56.53 s |            --- |         --- | C3D_Sph_ML_LES_D19_R_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  60.56 s |            --- |         --- | C3D_Sph_ML_LES_D19_RR_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  38.10 s |            --- |         --- | C3D_Sph_ML_LES_D27_CUM17_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  43.16 s |            --- |         --- | C3D_Sph_ML_LES_D27_DRT_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  43.70 s |            --- |         --- | C3D_Sph_ML_LES_D27_HRR_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  41.74 s |            --- |         --- | C3D_Sph_ML_LES_D27_PRR_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  42.83 s |            --- |         --- | C3D_Sph_ML_LES_D27_R_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  42.46 s |            --- |         --- | C3D_Sph_ML_LES_D27_RR_BGK_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  45.18 s |            --- |         --- | TC_SL_MuskerFP_musubi          |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  65.99 s |            --- |         --- | TC_SL_MusNewton_musubi         |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  58.92 s |            --- |         --- | TC_SL_ReichFP_musubi           |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  97.04 s |            --- |         --- | TC_SL_PowerLaw_musubi          |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   1.01 s |            --- |         --- | ABS_Pulse_Radial_musubi        |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   1.19 s |            --- |         --- | ABS_Pulse_Plane_musubi         |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   0.83 s |            --- |         --- | ABS_Pulse_Box_musubi           |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  63.93 s |            --- |         --- | ABS_Pulse_Box3D_musubi         |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  25.44 s |            --- |         --- | ABS_LineSrc2D_musubi           |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  43.68 s |            --- |         --- | ABS_cyl2D_musubi               |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  45.34 s |            --- |         --- | TO_cyl2D_musubi                |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  47.70 s |            --- |         --- | VSL_Radial_musubi              |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   1.66 s |            --- |         --- | VSL_Box2D_musubi               |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  48.09 s |            --- |         --- | VSL_Box3D_musubi               |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  22.25 s |            --- |         --- | VSL_Plane_musubi               |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   1.91 s |            --- |         --- | gaussianPulse_incomp           |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  25.78 s |            --- |         --- | TGV_Simple_Re800               |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  54.91 s |            --- |         --- | TGV_Simple_Re1600              |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  | 309.17 s |            --- |         --- | TGV_LES_WALE                   |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  26.09 s |            --- |         --- | TGV_LES_Vreman                 |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  28.43 s |            --- |         --- | TGV_LES_SmagPDF                |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  35.27 s |            --- |         --- | TGV_LES_SmagGradU              |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  23.24 s |            --- |         --- | C2D_Cyl_SL_Incomp_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  47.83 s |            --- |         --- | C2D_Cyl_ML_Incomp_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  16.23 s |            --- |         --- | C3D_Simple_Incomp_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  31.27 s |            --- |         --- | COC_CouetteFlow_Incomp_musubi  |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  | 164.09 s |            --- |         --- | COC_CouetteFlow_ML_Incomp_musubi |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  23.88 s |            --- |         --- | LDC_Simple_Incomp_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  42.95 s |            --- |         --- | PIP_Simple_Incomp_musubi       |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  59.41 s |            --- |         --- | PIP_Force_Incomp_musubi        |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  37.24 s |            --- |         --- | PIP_ML_Incomp_musubi           |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  94.11 s |            --- |         --- | PIP_LES_Incomp_musubi          |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  29.52 s |            --- |         --- | PIP_Split_Incomp_musubi        |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |  18.54 s |            --- |         --- | tut_pip_musubi                 |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   3.68 s |            --- |         --- | tut_gauss_pulse                |
|  8fe61f6b4491  |    OK     |   difference    | 0.000%  |   3.49 s |            --- |         --- | tut_channel_musubi             |
--------------------------------------------------------------------------------------------------------------------------------------

Recheck ran successfully

Copy link
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.

Thanks Kannan, I only have some minor remarks to fix up.

source/init/mus_initFluid_module.f90 Outdated Show resolved Hide resolved
source/init/mus_initFluid_module.f90 Outdated Show resolved Hide resolved
source/init/mus_initFluid_module.f90 Outdated Show resolved Hide resolved
source/init/mus_initFluid_module.f90 Outdated Show resolved Hide resolved
source/init/mus_initFluid_module.f90 Outdated Show resolved Hide resolved
source/mus_mrtRelaxation_module.fpp Outdated Show resolved Hide resolved
source/mus_relaxationParam_module.f90 Outdated Show resolved Hide resolved
source/scheme/mus_scheme_header_module.f90 Outdated Show resolved Hide resolved
source/scheme/mus_scheme_header_module.f90 Outdated Show resolved Hide resolved
source/scheme/mus_scheme_header_module.f90 Outdated Show resolved Hide resolved
Copy link
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.

…ocumentation with supported variants for relaxation schemes
@KannanMasilamani
Copy link
Contributor Author

@haraldkl could you please approve this pull request. If everything is okay.

@haraldkl
Copy link
Member

haraldkl commented May 7, 2024

@haraldkl could you please approve this pull request. If everything is okay.

@KannanMasilamani I added my approval with my last comment, however, there are still open unresolved conversations.

Copy link
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.

Thanks!

@KannanMasilamani KannanMasilamani merged commit f482be1 into main May 7, 2024
@KannanMasilamani KannanMasilamani deleted the feature/identify_relaxation_options branch May 7, 2024 15:32
@haraldkl haraldkl mentioned this pull request Jun 5, 2024
5 tasks
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.

2 participants