Skip to content

Commit 18cf465

Browse files
authored
Merge branch 'master' into containerization
2 parents 4e5516d + 5c9d069 commit 18cf465

File tree

3 files changed

+100
-684
lines changed

3 files changed

+100
-684
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ jobs:
4848
- name: Clone
4949
uses: actions/checkout@v4
5050

51+
- name: Set up Python 3.13
52+
uses: actions/setup-python@v5
53+
with:
54+
python-version: '3.13'
55+
5156
- name: Setup MacOS
5257
if: matrix.os == 'macos'
5358
run: |

src/simulation/m_start_up.fpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,14 +1149,8 @@ contains
11491149
mytime = mytime + dt
11501150

11511151
! Total-variation-diminishing (TVD) Runge-Kutta (RK) time-steppers
1152-
if (time_stepper == 1) then
1153-
call s_1st_order_tvd_rk(t_step, time_avg)
1154-
elseif (time_stepper == 2) then
1155-
call s_2nd_order_tvd_rk(t_step, time_avg)
1156-
elseif (time_stepper == 3 .and. (.not. adap_dt)) then
1157-
call s_3rd_order_tvd_rk(t_step, time_avg)
1158-
elseif (time_stepper == 3 .and. adap_dt) then
1159-
call s_strang_splitting(t_step, time_avg)
1152+
if (any(time_stepper == (/1, 2, 3/))) then
1153+
call s_tvd_rk(t_step, time_avg, time_stepper)
11601154
end if
11611155

11621156
if (relax) call s_infinite_relaxation_k(q_cons_ts(1)%vf)

0 commit comments

Comments
 (0)