Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
fba5d63
Added placeholders for where we will be instantiating the imersed bou…
danieljvickers Sep 12, 2025
9f846a7
Moved levelset to common so that it can be called each step for MIBM
danieljvickers Sep 12, 2025
d26caa0
Fixed build issue with post_processing
danieljvickers Sep 15, 2025
b2a546f
Updated how velocity is stored
danieljvickers Sep 15, 2025
100a9eb
Fixed the toolchain?
danieljvickers Sep 15, 2025
5164d07
Pushing from local
danieljvickers Sep 15, 2025
343fcdf
Added euler'd method to the patch location
danieljvickers Sep 16, 2025
49ece48
Fixed and x vs y issue
danieljvickers Sep 16, 2025
c103f62
Performing first test run
danieljvickers Sep 16, 2025
1c9211e
The apply_pathces subroutine did not work and needs simplification fo…
danieljvickers Sep 16, 2025
ee4fdcc
Fixed linking of common analytic values
danieljvickers Sep 17, 2025
819013b
It looks like the icpp patch definitions must be seaparated from the …
danieljvickers Sep 17, 2025
de5be7c
Initial sweep of variable changes and removing unused immersed bounda…
danieljvickers Sep 17, 2025
cbdfa1c
More renaming in the icpp_patches file
danieljvickers Sep 17, 2025
30c983b
Did updates to validate the ib cirble patch
danieljvickers Sep 18, 2025
2b4ab8d
Removed everything through cuboids
danieljvickers Sep 18, 2025
e1089fa
Finished with IB file
danieljvickers Sep 18, 2025
61febc8
More updates to the IB patch file
danieljvickers Sep 18, 2025
92a8ef8
Made it through the airfoils in icpp
danieljvickers Sep 18, 2025
7e05fd4
Finished with ICPP file
danieljvickers Sep 18, 2025
615bccb
Final commit before test run
danieljvickers Sep 18, 2025
4b81b8e
Resolved issue with building the patch filesf
danieljvickers Sep 18, 2025
58aa075
Resolved references to old patch calculations
danieljvickers Sep 18, 2025
c50453c
Fixed bad reference to levelset subroutines
danieljvickers Sep 18, 2025
8bdec61
Removed some unnecessary print statements and almost completely resol…
danieljvickers Sep 18, 2025
1371e74
This code compiles and runs
danieljvickers Sep 18, 2025
6132818
Added the logic to reset the cached IB indices
danieljvickers Sep 18, 2025
70d38cc
I think this should work
danieljvickers Sep 19, 2025
f42d9c6
Intermittent commit
danieljvickers Sep 19, 2025
0c561f7
Fixed an issue in passing mibm conditions to the toolchain
danieljvickers Sep 19, 2025
e9336b2
Tracking commit as I debug
danieljvickers Sep 22, 2025
dc1418d
I am further and ran something that looks rather successful, but it i…
danieljvickers Sep 22, 2025
0ac9261
Everything is working for a circle
danieljvickers Sep 23, 2025
3e3c275
Added logic to handle if we actually call moving immersed boundaries …
danieljvickers Sep 23, 2025
ffd34f0
Tests pass
danieljvickers Sep 23, 2025
7fd7a07
I added airfoils back to the simulation pipeline, but had to add an I…
danieljvickers Sep 23, 2025
46373b8
Ran formatting and spelling
danieljvickers Sep 23, 2025
de0cd90
Intermittent commit
danieljvickers Sep 24, 2025
db8b514
Resolved some MPI errors
danieljvickers Sep 24, 2025
90426ed
Moving IBs working with MPI
danieljvickers Sep 24, 2025
841574c
Added flags for GPUs
danieljvickers Sep 24, 2025
52f9bd3
Back to a working example
danieljvickers Sep 26, 2025
d670137
Ran format and spelling
danieljvickers Sep 26, 2025
c612854
Updating code
danieljvickers Sep 29, 2025
8139f00
Moved entry out of main and ran format again
danieljvickers Sep 29, 2025
874e7d8
Merge branch 'master' into add-moving-imersed-boundaries
danieljvickers Sep 29, 2025
2cf40cb
fixed linting errors'
danieljvickers Sep 29, 2025
8e13c6f
minor conditional simplifications based on AI reviewer
danieljvickers Sep 29, 2025
a4db575
Fix format issue
danieljvickers Sep 29, 2025
0650c27
Added some additional declares to imrpove cray compiler support
danieljvickers Sep 30, 2025
1cd7984
Extend job duration from 4h59m to 5h59m
sbryngelson Oct 4, 2025
d5ea044
Fixed spelling issues
danieljvickers Oct 4, 2025
899d33b
Added 'infp' to the ignored words in the spell checker
danieljvickers Oct 4, 2025
35fa4ad
More spelling corrections
danieljvickers Oct 4, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/frontier/submit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sbatch <<EOT
#SBATCH -A CFD154 # charge account
#SBATCH -N 1 # Number of nodes required
$sbatch_device_opts
#SBATCH -t 04:59:00 # Duration of the job (Ex: 15 mins)
#SBATCH -t 05:59:00 # Duration of the job (Ex: 15 mins)
#SBATCH -o$job_slug.out # Combined output and error messages file
#SBATCH -p extended # Extended partition for shorter queues
#SBATCH -W # Do not exit until the submitted job terminates.
Expand Down
1 change: 1 addition & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ strang = "strang"
Strang = "Strang"
TKE = "TKE"
HSA = "HSA"
infp = "infp"

[files]
extend-exclude = ["docs/documentation/references*", "tests/", "toolchain/cce_simulation_workgroup_256.sh"]
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
// Enable ONLY fortls language server
"fortran.enableLanguageServer": true,
"fortran.languageServer": "fortls",
"fortran.fortls.disabled": false,
"fortran.fortls.disabled": true,
"fortran.fortls.path": "fortls",

// Try to disable any built-in language features
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,13 @@ macro(HANDLE_SOURCES target useCommon)
"${CMAKE_BINARY_DIR}/modules/${target}/*.fpp")
if (${useCommon})
file(GLOB common_FPPs CONFIGURE_DEPENDS "${common_DIR}/*.fpp")

# If we're building post_process, exclude m_compute_levelset.fpp
if("${target}" STREQUAL "post_process")
list(FILTER common_FPPs EXCLUDE REGEX ".*/m_compute_levelset\.fpp$")
list(FILTER common_FPPs EXCLUDE REGEX ".*/m_ib_patches\.fpp$")
endif()

list(APPEND ${target}_FPPs ${common_FPPs})
endif()

Expand Down Expand Up @@ -443,7 +450,7 @@ function(MFC_SETUP_TARGET)

if (ARGS_SILO)
find_package(SILO REQUIRED)
target_link_libraries(${a_target} PRIVATE SILO::SILO)
target_link_libraries(${a_target} PRIVATE SILO::SILO stdc++)
endif()

if (ARGS_HDF5)
Expand Down
2 changes: 1 addition & 1 deletion docs/documentation/gpuParallelization.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Note: Ordering is not guaranteed or stable, so use key-value pairing when using

- Data on the GPU has a reference counter
- When data is referred to being allocated, it means that GPU memory is allocated if it is not already present in GPU memory. If a variable is already present, the reference counter is just incremented.
- When data is referred to being dellocated, it means that the reference counter is decremented. If the reference counter is zero, then the data is actually deallocated from GPU memory
- When data is referred to being deallocated, it means that the reference counter is decremented. If the reference counter is zero, then the data is actually deallocated from GPU memory
- When data is referred to being attached, it means that the device pointer attaches to target if it not already attached. If pointer is already attached, then the attachment counter is just incremented
- When data is referred to being detached, it means that the attachment counter is decremented. If attachment counter is zero, then actually detached

Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_analytical/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"patch_icpp(1)%pres": 10.3333,
"patch_icpp(1)%alpha_rho(1)": 3.957143,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of -4 < x < 5
# One analytic patch to take care of -4 < x < 5
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 0.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_old/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"patch_icpp(1)%pres": 10.3333,
"patch_icpp(1)%alpha_rho(1)": 3.957143,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of -4 < x < 5
# One analytic patch to take care of -4 < x < 5
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 0.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_teno5/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"patch_icpp(1)%pres": 10.333,
"patch_icpp(1)%alpha_rho(1)": 3.857,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of 1 < x < 10
# One analytic patch to take care of 1 < x < 10
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 5.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_teno7/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"patch_icpp(1)%pres": 10.333,
"patch_icpp(1)%alpha_rho(1)": 3.857,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of 1 < x < 10
# One analytic patch to take care of 1 < x < 10
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 5.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_wenojs5/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"patch_icpp(1)%pres": 10.333,
"patch_icpp(1)%alpha_rho(1)": 3.857,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of 1 < x < 10
# One analytic patch to take care of 1 < x < 10
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 5.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_wenom5/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"patch_icpp(1)%pres": 10.333,
"patch_icpp(1)%alpha_rho(1)": 3.857,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of 1 < x < 10
# One analytic patch to take care of 1 < x < 10
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 5.5,
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_wenoz5/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"patch_icpp(1)%pres": 10.333,
"patch_icpp(1)%alpha_rho(1)": 3.857,
"patch_icpp(1)%alpha(1)": 1.0,
# One anlytic patch to take care of 1 < x < 10
# One analytic patch to take care of 1 < x < 10
# Patch 2 Analytic
"patch_icpp(2)%geometry": 1,
"patch_icpp(2)%x_centroid": 5.5,
Expand Down
1 change: 1 addition & 0 deletions src/common/include/case.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@

! For pre-process.
#:def analytical()

#:enddef
2 changes: 1 addition & 1 deletion src/common/m_boundary_common.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
!! @brief Contains module m_boundary_conditions_common

!> @brief The purpose of the module is to apply noncharacteristic and processor
!! boundary condiitons
!! boundary conditions

#:include 'macros.fpp'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ contains
end if
end do

! TODO :: This entire if/else tree can be simplified by just calling arrays by idx index
if (idx == 1) then
levelset%sf(i, j, 0, ib_patch_id) = side_dists(1)
if (f_approx_equal(side_dists(1), 0._wp)) then
Expand Down
5 changes: 5 additions & 0 deletions src/common/m_derived_types.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,11 @@ module m_derived_types

real(wp) :: model_threshold !<
!! Threshold to turn on smoothen STL patch.

!! Patch conditions for moving imersed boundaries
integer :: moving_ibm ! 0 for no moving, 1 for moving, 2 for moving on forced path
real(wp), dimension(1:3) :: vel

end type ib_patch_parameters

!> Derived type annexing the physical parameters (PP) of the fluids. These
Expand Down
Loading
Loading