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

IBM+STL #730

Merged
merged 36 commits into from
Nov 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4bd75ed
Ib marker
haochey Jun 30, 2024
3896c71
Merge branch 'MFlowCode:master' into master
haochey Jul 10, 2024
bd143fe
Fix seg fault issue when fd_order is on
haochey Nov 7, 2024
4fe20ee
Merge branch 'MFlowCode:master' into master
haochey Nov 7, 2024
6b33565
Update m_global_parameters.fpp
haochey Nov 7, 2024
39c5fc1
Merge branch 'master' of https://github.com/haochey/MFChaocheyfork
haochey Nov 8, 2024
8f96e30
Ibm+stl pr (#26)
haochey Nov 13, 2024
2d65013
Merge branch 'MFlowCode:master' into master
haochey Nov 14, 2024
18febdf
Minor refactor and add tests to test suite
haochey Nov 14, 2024
eb590c0
Merge branch 'master' of https://github.com/haochey/MFChaocheyfork
haochey Nov 14, 2024
b32b229
Change example case name for test and minor fix
haochey Nov 14, 2024
fc6b707
Merge branch 'MFlowCode:master' into master
haochey Nov 15, 2024
cf3eafd
Merge branch 'MFlowCode:master' into master
haochey Nov 18, 2024
abfc4a4
Remove commented lines and m_model refactor
haochey Nov 18, 2024
8a21cfa
Merge branch 'MFlowCode:master' into master
haochey Nov 18, 2024
33c314a
Format and analytical levelset refactor
haochey Nov 18, 2024
8b68faf
Merge branch 'master' of https://github.com/haochey/MFChaocheyfork
haochey Nov 18, 2024
6dcdd5f
small IBM bug fixes
anshgupta1234 Nov 19, 2024
f2a8013
small change
anshgupta1234 Nov 19, 2024
2e4fa7d
Merge branch 'MFlowCode:master' into master
haochey Nov 19, 2024
579a578
Fix STL+IBM test suite and refactor
haochey Nov 19, 2024
291e9ac
Add analytical levelset tests
haochey Nov 19, 2024
8805ccc
Change the folder name for test suite
haochey Nov 19, 2024
2f891f6
Merge branch 'MFlowCode:master' into master
haochey Nov 20, 2024
d373ebf
Test tolerance and more examples
haochey Nov 20, 2024
27380da
Fix test suite
haochey Nov 20, 2024
5279f5c
Try fix intel compiler CI test
haochey Nov 21, 2024
54e6f2b
format
haochey Nov 21, 2024
5300f98
Use double quotes for cray compiler
haochey Nov 21, 2024
5cd2996
Fix intel compiler issue
haochey Nov 24, 2024
4089cda
Refactor to get it work on Frontier
haochey Nov 25, 2024
85ba7c3
add examples
haochey Nov 26, 2024
79f3ded
Add example
haochey Nov 26, 2024
e58437b
Add example
haochey Nov 26, 2024
f0761f0
Merge branch 'MFlowCode:master' into master
haochey Nov 26, 2024
6efcdb3
Fix another CCE bug
haochey Nov 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix intel compiler issue
  • Loading branch information
haochey committed Nov 24, 2024
commit 5cd29966defb00134815508a6ff10e96750ffa9c
23 changes: 11 additions & 12 deletions examples/2D_ibm_stl_MFCCharacter/case.py
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@

# Dynamic Viscosity
Mu1 = 0.0000184
#Mu2 = 0.01
rho1 = 1.19 #0.2199
rho1 = 1.19
gam_a = 1.4
# Patch Design
D = 0.1
@@ -22,13 +21,13 @@
'x_domain%end' : 1*D,
'y_domain%beg' : -0.3*D,
'y_domain%end' : 0.3*D,
'm' : 499,
'n' : 149,
'm' : 599,
'n' : 199,
'p' : 0,
'dt' : 1.0E-6,
'dt' : 5.0E-7,
't_step_start' : 0,
't_step_stop' : 1000,
't_step_save' : 10,
't_step_stop' : 6000,
't_step_save' : 20,
# ==========================================================================

# Simulation Algorithm Parameters ==========================================
@@ -71,25 +70,25 @@
'patch_icpp(1)%y_centroid' : 0,
'patch_icpp(1)%length_x' : 1000*D,
'patch_icpp(1)%length_y' : 1000*D,
'patch_icpp(1)%vel(1)' : 10, #527.2E+00,
'patch_icpp(1)%vel(1)' : 20,
'patch_icpp(1)%vel(2)' : 0.0E+00,
'patch_icpp(1)%pres' : 100000, #10918.2549,
'patch_icpp(1)%pres' : 100000,
'patch_icpp(1)%alpha_rho(1)' : (1.0)*rho1,
'patch_icpp(1)%alpha(1)' : 1.0,
# ==========================================================================
'patch_ib(1)%geometry' : 5,
'patch_ib(1)%model%filepath' : 'Character_IBM.stl',
'patch_ib(1)%model%translate(1)' : -0.0469828735,
'patch_ib(1)%model%translate(2)' : -0.0094892600,
'patch_ib(1)%model%spc' : 100,
'patch_ib(1)%model%threshold' : 0.95,
'patch_ib(1)%model%spc' : 200,
'patch_ib(1)%model%threshold' : 0.99,
'patch_ib(1)%slip' : 'F',
# # ========================================================================

# Fluids Physical Parameters ===============================================
'fluid_pp(1)%gamma' : 1.E+00/(gam_a-1.E+00),
'fluid_pp(1)%pi_inf' : 0,
'fluid_pp(1)%Re(1)' : 1000, #7535533.2,
'fluid_pp(1)%Re(1)' : 10000,
# ==========================================================================
}))

2 changes: 1 addition & 1 deletion examples/2D_ibm_stl_test/case.py
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
rho1 = 1.19 #0.2199
gam_a = 1.4
# Patch Design
D = 3
D = 5

# Configuring case dictionary
print(json.dumps({
86 changes: 86 additions & 0 deletions examples/3D_ibm_stl_pyramid/3DPyramid_IBM.stl
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
solid Pyramid2_IBM
facet normal 1.000000e+00 0.000000e+00 0.000000e+00
outer loop
vertex 1.000001e-01 1.000001e-01 1.000001e-01
vertex 1.000001e-01 1.005828e-07 1.000001e-01
vertex 1.000001e-01 1.000001e-01 1.005828e-07
endloop
endfacet
facet normal 1.000000e+00 0.000000e+00 0.000000e+00
outer loop
vertex 1.000001e-01 1.000001e-01 1.005828e-07
vertex 1.000001e-01 1.005828e-07 1.000001e-01
vertex 1.000001e-01 1.005828e-07 1.005828e-07
endloop
endfacet
facet normal -1.000000e+00 0.000000e+00 0.000000e+00
outer loop
vertex 9.685755e-08 4.500010e-02 5.500010e-02
vertex 9.685755e-08 5.500010e-02 5.500010e-02
vertex 9.685755e-08 4.500010e-02 4.500010e-02
endloop
endfacet
facet normal -1.000000e+00 0.000000e+00 0.000000e+00
outer loop
vertex 9.685755e-08 4.500010e-02 4.500010e-02
vertex 9.685755e-08 5.500010e-02 5.500010e-02
vertex 9.685755e-08 5.500010e-02 4.500010e-02
endloop
endfacet
facet normal -4.103647e-01 9.119215e-01 0.000000e+00
outer loop
vertex 1.000001e-01 1.000001e-01 1.005828e-07
vertex 9.685755e-08 5.500010e-02 4.500010e-02
vertex 1.000001e-01 1.000001e-01 1.000001e-01
endloop
endfacet
facet normal -4.103647e-01 9.119215e-01 0.000000e+00
outer loop
vertex 1.000001e-01 1.000001e-01 1.000001e-01
vertex 9.685755e-08 5.500010e-02 4.500010e-02
vertex 9.685755e-08 5.500010e-02 5.500010e-02
endloop
endfacet
facet normal -4.103647e-01 0.000000e+00 -9.119215e-01
outer loop
vertex 1.000001e-01 1.005828e-07 1.005828e-07
vertex 9.685755e-08 4.500010e-02 4.500010e-02
vertex 1.000001e-01 1.000001e-01 1.005828e-07
endloop
endfacet
facet normal -4.103647e-01 0.000000e+00 -9.119215e-01
outer loop
vertex 1.000001e-01 1.000001e-01 1.005828e-07
vertex 9.685755e-08 4.500010e-02 4.500010e-02
vertex 9.685755e-08 5.500010e-02 4.500010e-02
endloop
endfacet
facet normal -4.103647e-01 0.000000e+00 9.119215e-01
outer loop
vertex 1.000001e-01 1.000001e-01 1.000001e-01
vertex 9.685755e-08 5.500010e-02 5.500010e-02
vertex 1.000001e-01 1.005828e-07 1.000001e-01
endloop
endfacet
facet normal -4.103647e-01 0.000000e+00 9.119215e-01
outer loop
vertex 1.000001e-01 1.005828e-07 1.000001e-01
vertex 9.685755e-08 5.500010e-02 5.500010e-02
vertex 9.685755e-08 4.500010e-02 5.500010e-02
endloop
endfacet
facet normal -4.103647e-01 -9.119215e-01 -0.000000e+00
outer loop
vertex 1.000001e-01 1.005828e-07 1.000001e-01
vertex 9.685755e-08 4.500010e-02 5.500010e-02
vertex 1.000001e-01 1.005828e-07 1.005828e-07
endloop
endfacet
facet normal -4.103647e-01 -9.119215e-01 0.000000e+00
outer loop
vertex 1.000001e-01 1.005828e-07 1.005828e-07
vertex 9.685755e-08 4.500010e-02 5.500010e-02
vertex 9.685755e-08 4.500010e-02 4.500010e-02
endloop
endfacet
endsolid Pyramid2_IBM
20 changes: 10 additions & 10 deletions examples/3D_ibm_stl_pyramid/case.py
Original file line number Diff line number Diff line change
@@ -13,22 +13,22 @@
# ==========================================================================

# Computational Domain Parameters ==========================================
'x_domain%beg' : -2*D,
'x_domain%end' : 2*D,
'x_domain%beg' : -1.5*D,
'x_domain%end' : 1.5*D,
# y direction
'y_domain%beg' : -1.5*D,
'y_domain%end' : 1.5*D,
# z direction
'z_domain%beg' : -1.5*D,
'z_domain%end' : 1.5*D,
'cyl_coord' : 'F',
'm' : 239,
'n' : 179,
'p' : 179,
'dt' : 1.0E-6,
'm' : 299,
'n' : 299,
'p' : 299,
'dt' : 5.0E-7,
't_step_start' : 0,
't_step_stop' : 1000,
't_step_save' : 10,
't_step_stop' : 1500,
't_step_save' : 30,
# ==========================================================================

# Simulation Algorithm Parameters ==========================================
@@ -90,12 +90,12 @@

# Patch: Model Immersed Boundary ===========================================
'patch_ib(1)%geometry' : 12,
'patch_ib(1)%model%filepath' : 'Pyramid_IBM.stl',
'patch_ib(1)%model%filepath' : '3DPyramid_IBM.stl',
'patch_ib(1)%model%translate(1)' : -0.0500000984,
'patch_ib(1)%model%translate(2)' : -0.0500001003,
'patch_ib(1)%model%translate(3)' : -0.0500001003,
'patch_ib(1)%model%spc' : 100,
'patch_ib(1)%model%threshold' : 0.01,
'patch_ib(1)%model%threshold' : 0.95,
'patch_ib(1)%slip' : 'F',
# ==========================================================================

22 changes: 11 additions & 11 deletions tests/1B218CF1/golden-metadata.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions tests/1B218CF1/golden.txt

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions tests/A2036630/golden-metadata.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions tests/A2036630/golden.txt

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions tests/C87A466A/golden-metadata.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading