Skip to content

Commit 67f2b31

Browse files
committed
updated dependencies for fftw
1 parent 0f75a2e commit 67f2b31

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

examples/3D_lungwave/case.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,13 @@
7373
interface_amp = 0.03
7474

7575
# time stepping requirements
76-
time_end = 50
76+
#time_end = 50
77+
time_end = 0.5
7778
cfl = 0.01
7879

7980
dt = cfl * dx / c_l_n
8081
Nt = int(time_end / dt)
81-
Nframes = 500
82+
Nframes = 50
8283
tstart = 0
8384
tstop = Nt
8485
tsave = int(Nt / Nframes)
@@ -124,14 +125,16 @@
124125
"riemann_solver": 2,
125126
"wave_speeds": 1,
126127
"avg_state": 2,
127-
"bc_x%beg": -6,
128-
"bc_x%end": -6,
128+
"bc_x%beg": -3,
129+
"bc_x%end": -3,
129130
"bc_y%beg": -1,
130131
"bc_y%end": -1,
131132
"bc_z%beg": -1,
132133
"bc_z%end": -1,
133-
#'hypoelasticity' : 'T',
134-
"hyperelasticity": "F",
134+
#"hypoelasticity" : 'T',
135+
"hyperelasticity": "T",
136+
"hyper_model": 1,
137+
"fd_order":4,
135138
# Formatted Database Files Structure Parameters
136139
"format": 1,
137140
"precision": 2,

toolchain/dependencies/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,13 @@ if (MFC_FFTW)
3737
CMAKE_ARGS -DBUILD_TESTS=OFF
3838
-DBUILD_SHARED_LIBS=OFF
3939
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
40-
PATCH_COMMAND ${CMAKE_COMMAND} -E echo "Patching FFTW for CMake 4.0 compatibility" &&
41-
sed -i 's/cmake_minimum_required(VERSION 2.8.3)/cmake_minimum_required(VERSION 3.5...4.0)\\ncmake_policy(VERSION 3.5)/' CMakeLists.txt
40+
PATCH_COMMAND ${CMAKE_COMMAND} -E echo "Patching FFTW for CMake 4.0 compatibility" &&
41+
${CMAKE_COMMAND} -E copy CMakeLists.txt CMakeLists.txt.bak &&
42+
${CMAKE_COMMAND} -E echo "cmake_minimum_required(VERSION 3.5...4.0)" > tmpfile &&
43+
${CMAKE_COMMAND} -E echo "cmake_policy(VERSION 3.5)" >> tmpfile &&
44+
${CMAKE_COMMAND} -E cat CMakeLists.txt.bak >> tmpfile &&
45+
${CMAKE_COMMAND} -E copy tmpfile CMakeLists.txt &&
46+
${CMAKE_COMMAND} -E remove CMakeLists.txt.bak tmpfile
4247
)
4348
else()
4449
message(WARNING "The Fortran compiler vendor is Cray so FFTW3 will not be built. We will use cray-fftw instead.")

0 commit comments

Comments
 (0)