Skip to content

Commit bf9ea7d

Browse files
DimAdam-01DimAdam-01
committed
Resolve merge conflict in m_patches.fpp
2 parents f5dad3c + 651ddf9 commit bf9ea7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1660
-2263
lines changed

‎.github/workflows/phoenix/bench.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ "$job_device" == "gpu" ]; then
99
fi
1010

1111
if ["$job_device" == "gpu"]; then
12-
./mfc.sh bench --mem 12 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix $device_opts -n $n_ranks
12+
./mfc.sh bench --mem 12 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix-bench $device_opts -n $n_ranks
1313
else
14-
./mfc.sh bench --mem 1 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix $device_opts -n $n_ranks
14+
./mfc.sh bench --mem 1 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix-bench $device_opts -n $n_ranks
1515
fi

‎.github/workflows/phoenix/submit.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sbatch <<EOT
4242
#SBATCH --account=gts-sbryngelson3 # charge account
4343
#SBATCH -N1 # Number of nodes required
4444
$sbatch_device_opts
45-
#SBATCH -t 02:00:00 # Duration of the job (Ex: 15 mins)
45+
#SBATCH -t 03:00:00 # Duration of the job (Ex: 15 mins)
4646
#SBATCH -q embers # QOS Name
4747
#SBATCH -o$job_slug.out # Combined output and error messages file
4848
#SBATCH -W # Do not exit until the submitted job terminates.

‎misc/m_silo_proxy.f90‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module m_silo_proxy
4444

4545
!> @brief Refer to page 28 of Silo's user guide (10/2007, v4.6) for
4646
!! information about this subroutine
47-
function DBCREATE(pathname, lpathname, mode, target, &
47+
impure function DBCREATE(pathname, lpathname, mode, target, &
4848
fileinfo, lfileinfo, filetype, status)
4949

5050
integer :: DBCREATE
@@ -66,7 +66,7 @@ end function DBCREATE
6666

6767
!> @brief Refer to page 235 of Silo's user guide (10/2007, v4.6)
6868
!! for information about this subroutine
69-
function DBGET2DSTRLEN()
69+
impure function DBGET2DSTRLEN()
7070

7171
integer :: DBGET2DSTRLEN
7272

@@ -79,7 +79,7 @@ end function DBGET2DSTRLEN
7979

8080
!> @brief Refer to page 234 of Silo's user guide (10/2007, v4.6)
8181
!! for information about this subroutine
82-
function DBSET2DSTRLEN(len)
82+
impure function DBSET2DSTRLEN(len)
8383

8484
integer :: DBSET2DSTRLEN
8585
integer, intent(IN) :: len
@@ -93,7 +93,7 @@ end function DBSET2DSTRLEN
9393

9494
!> @brief Refer to page 185 of Silo's user guide (10/2007, v4.6)
9595
!! for information about this subroutine
96-
function DBMKOPTLIST(maxopts, optlist_id)
96+
impure function DBMKOPTLIST(maxopts, optlist_id)
9797

9898
integer :: DBMKOPTLIST
9999
integer, intent(IN) :: maxopts
@@ -107,7 +107,7 @@ end function DBMKOPTLIST
107107

108108
!> @brief Refer to page 186 of Silo's user guide (10/2007, v4.6)
109109
!! for information about this subroutine
110-
function DBADDIOPT(optlist_id, option, ivalue)
110+
impure function DBADDIOPT(optlist_id, option, ivalue)
111111

112112
integer :: DBADDIOPT
113113
integer, intent(IN) :: optlist_id
@@ -123,7 +123,7 @@ end function DBADDIOPT
123123

124124
!> @brief Refer to page 186 of Silo's user guide (10/2007, v4.6)
125125
!! for information about this subroutine
126-
function DBADDDOPT(optlist_id, option, dvalue)
126+
impure function DBADDDOPT(optlist_id, option, dvalue)
127127

128128
integer :: DBADDDOPT
129129
integer, intent(IN) :: optlist_id
@@ -139,7 +139,7 @@ end function DBADDDOPT
139139

140140
!> @brief Refer to page 121 of Silo's user guide (10/2007, v4.6)
141141
!! for information about this subroutine
142-
function DBPUTMMESH(dbid, name, lname, nmesh, meshnames, &
142+
impure function DBPUTMMESH(dbid, name, lname, nmesh, meshnames, &
143143
lmeshnames, meshtypes, optlist_id, status)
144144

145145
integer :: DBPUTMMESH
@@ -162,7 +162,7 @@ end function DBPUTMMESH
162162

163163
!> @brief Refer to page 189 of Silo's user guide (10/2007, v4.6)
164164
!! for information about this subroutine
165-
function DBFREEOPTLIST(optlist_id)
165+
impure function DBFREEOPTLIST(optlist_id)
166166

167167
integer :: DBFREEOPTLIST
168168
integer, intent(IN) :: optlist_id
@@ -175,7 +175,7 @@ end function DBFREEOPTLIST
175175

176176
!> @brief Refer to page 57 of Silo's user guide (10/2007, v4.6) for
177177
!! information about this subroutine
178-
function DBPUTQM(dbid, name, lname, xname, lxname, yname, lyname, &
178+
impure function DBPUTQM(dbid, name, lname, xname, lxname, yname, lyname, &
179179
zname, lzname, x, y, z, dims, ndims, datatype, &
180180
coordtype, optlist_id, status)
181181

@@ -208,7 +208,7 @@ end function DBPUTQM
208208

209209
!> @brief Refer to page 46 of Silo's user guide (10/2007, v4.6) for
210210
!! information about this subroutine
211-
function DBPUTCURVE(dbid, curvename, lcurvename, xvals, yvals, &
211+
impure function DBPUTCURVE(dbid, curvename, lcurvename, xvals, yvals, &
212212
datatype, npoints, optlist_id, status)
213213

214214
integer :: DBPUTCURVE
@@ -231,7 +231,7 @@ end function DBPUTCURVE
231231

232232
!> @brief Refer to page 130 of Silo's user guide (10/2007, v4.6)
233233
!! for information about this subroutine
234-
function DBPUTMVAR(dbid, name, lname, nvar, varnames, lvarnames, &
234+
impure function DBPUTMVAR(dbid, name, lname, nvar, varnames, lvarnames, &
235235
vartypes, optlist_id, status)
236236

237237
integer :: DBPUTMVAR
@@ -254,7 +254,7 @@ end function DBPUTMVAR
254254

255255
!> @brief Refer to page 64 of Silo's user guide (10/2007, v4.6) for
256256
!! information about this subroutine
257-
function DBPUTQV1(dbid, name, lname, meshname, lmeshname, var, &
257+
impure function DBPUTQV1(dbid, name, lname, meshname, lmeshname, var, &
258258
dims, ndims, mixvar, mixlen, datatype, &
259259
centering, optlist_id, status)
260260

@@ -283,7 +283,7 @@ end function DBPUTQV1
283283

284284
!> @brief Refer to page 31 of Silo's user guide (10/2007, v4.6) for
285285
!! information about this subroutine
286-
function DBCLOSE(dbid)
286+
impure function DBCLOSE(dbid)
287287

288288
integer :: DBCLOSE
289289
integer, intent(IN) :: dbid

‎src/common/m_boundary_common.fpp‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module m_boundary_common
4242

4343
contains
4444

45-
subroutine s_initialize_boundary_common_module()
45+
impure subroutine s_initialize_boundary_common_module()
4646

4747
bcxb = bc_x%beg; bcxe = bc_x%end; bcyb = bc_y%beg; bcye = bc_y%end; bczb = bc_z%beg; bcze = bc_z%end
4848

@@ -71,13 +71,12 @@ contains
7171
!> The purpose of this procedure is to populate the buffers
7272
!! of the primitive variables, depending on the selected
7373
!! boundary conditions.
74-
subroutine s_populate_variables_buffers(q_prim_vf, pb, mv, bc_type)
74+
impure subroutine s_populate_variables_buffers(q_prim_vf, pb, mv, bc_type)
7575

7676
type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf
7777
real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv
7878
type(integer_field), dimension(1:num_dims, -1:1), intent(in) :: bc_type
7979

80-
integer :: bc_loc, bc_dir
8180
integer :: k, l
8281

8382
! Population of Buffers in x-direction
@@ -238,7 +237,7 @@ contains
238237

239238
end subroutine s_populate_variables_buffers
240239

241-
subroutine s_ghost_cell_extrapolation(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
240+
pure subroutine s_ghost_cell_extrapolation(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
242241
#ifdef _CRAYFTN
243242
!DIR$ INLINEALWAYS s_ghost_cell_extrapolation
244243
#else
@@ -249,7 +248,7 @@ contains
249248
integer, intent(in) :: bc_dir, bc_loc
250249
integer, intent(in) :: k, l
251250

252-
integer :: j, q, i
251+
integer :: j, i
253252

254253
if (qbmm .and. .not. polytropic) then
255254
call s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
@@ -307,7 +306,7 @@ contains
307306

308307
end subroutine s_ghost_cell_extrapolation
309308

310-
subroutine s_symmetry(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
309+
pure subroutine s_symmetry(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
311310
#ifdef _CRAYFTN
312311
!DIR$ INLINEALWAYS s_symmetry
313312
#else
@@ -571,7 +570,7 @@ contains
571570

572571
end subroutine s_symmetry
573572

574-
subroutine s_periodic(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
573+
pure subroutine s_periodic(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
575574
#ifdef _CRAYFTN
576575
!DIR$ INLINEALWAYS s_periodic
577576
#else
@@ -714,7 +713,7 @@ contains
714713

715714
end subroutine s_periodic
716715

717-
subroutine s_axis(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
716+
pure subroutine s_axis(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
718717
#ifdef _CRAYFTN
719718
!DIR$ INLINEALWAYS s_axis
720719
#else
@@ -778,7 +777,7 @@ contains
778777

779778
end subroutine s_axis
780779

781-
subroutine s_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
780+
pure subroutine s_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
782781
#ifdef _CRAYFTN
783782
!DIR$ INLINEALWAYS s_slip_wall
784783
#else
@@ -789,7 +788,7 @@ contains
789788
integer, intent(in) :: bc_dir, bc_loc
790789
integer, intent(in) :: k, l
791790

792-
integer :: j, q, i
791+
integer :: j, i
793792

794793
if (qbmm .and. .not. polytropic) then
795794
call s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
@@ -877,7 +876,7 @@ contains
877876

878877
end subroutine s_slip_wall
879878

880-
subroutine s_no_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
879+
pure subroutine s_no_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
881880
#ifdef _CRAYFTN
882881
!DIR$ INLINEALWAYS s_no_slip_wall
883882
#else
@@ -888,7 +887,7 @@ contains
888887
integer, intent(in) :: bc_dir, bc_loc
889888
integer, intent(in) :: k, l
890889

891-
integer :: j, q, i
890+
integer :: j, i
892891

893892
if (qbmm .and. .not. polytropic) then
894893
call s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
@@ -1012,7 +1011,7 @@ contains
10121011

10131012
end subroutine s_no_slip_wall
10141013

1015-
subroutine s_dirichlet(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
1014+
pure subroutine s_dirichlet(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
10161015
#ifdef _CRAYFTN
10171016
!DIR$ INLINEALWAYS s_dirichlet
10181017
#else
@@ -1023,7 +1022,7 @@ contains
10231022
integer, intent(in) :: bc_dir, bc_loc
10241023
integer, intent(in) :: k, l
10251024

1026-
integer :: j, i, q
1025+
integer :: j, i
10271026

10281027
#ifdef MFC_PRE_PROCESS
10291028
call s_ghost_cell_extrapolation(q_prim_vf, pb, mv, 1, -1, k, l)
@@ -1081,7 +1080,7 @@ contains
10811080

10821081
end subroutine s_dirichlet
10831082

1084-
subroutine s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
1083+
pure subroutine s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
10851084
#ifdef _CRAYFTN
10861085
!DIR$ INLINEALWAYS s_qbmm_extrapolation
10871086
#else
@@ -1157,12 +1156,12 @@ contains
11571156

11581157
end subroutine s_qbmm_extrapolation
11591158

1160-
subroutine s_populate_capillary_buffers(c_divs, bc_type)
1159+
impure subroutine s_populate_capillary_buffers(c_divs, bc_type)
11611160

11621161
type(scalar_field), dimension(num_dims + 1), intent(inout) :: c_divs
11631162
type(integer_field), dimension(1:num_dims, -1:1), intent(in) :: bc_type
11641163

1165-
integer :: i, j, k, l
1164+
integer :: k, l
11661165

11671166
!< x-direction
11681167
if (bcxb >= 0) then
@@ -1280,7 +1279,7 @@ contains
12801279
end if
12811280
end subroutine s_populate_capillary_buffers
12821281

1283-
subroutine s_color_function_periodic(c_divs, bc_dir, bc_loc, k, l)
1282+
pure subroutine s_color_function_periodic(c_divs, bc_dir, bc_loc, k, l)
12841283
#ifdef _CRAYFTN
12851284
!DIR$ INLINEALWAYS s_color_function_periodic
12861285
#else
@@ -1290,7 +1289,7 @@ contains
12901289
integer, intent(in) :: bc_dir, bc_loc
12911290
integer, intent(in) :: k, l
12921291

1293-
integer :: j, i, q
1292+
integer :: j, i
12941293

12951294
if (bc_dir == 1) then !< x-direction
12961295
if (bc_loc == -1) then !bc_x%beg
@@ -1338,7 +1337,7 @@ contains
13381337

13391338
end subroutine s_color_function_periodic
13401339

1341-
subroutine s_color_function_reflective(c_divs, bc_dir, bc_loc, k, l)
1340+
pure subroutine s_color_function_reflective(c_divs, bc_dir, bc_loc, k, l)
13421341
#ifdef _CRAYFTN
13431342
!DIR$ INLINEALWAYS s_color_function_reflective
13441343
#else
@@ -1348,7 +1347,7 @@ contains
13481347
integer, intent(in) :: bc_dir, bc_loc
13491348
integer, intent(in) :: k, l
13501349

1351-
integer :: j, i, q
1350+
integer :: j, i
13521351

13531352
if (bc_dir == 1) then !< x-direction
13541353
if (bc_loc == -1) then !bc_x%beg
@@ -1420,7 +1419,7 @@ contains
14201419

14211420
end subroutine s_color_function_reflective
14221421

1423-
subroutine s_color_function_ghost_cell_extrapolation(c_divs, bc_dir, bc_loc, k, l)
1422+
pure subroutine s_color_function_ghost_cell_extrapolation(c_divs, bc_dir, bc_loc, k, l)
14241423
#ifdef _CRAYFTN
14251424
!DIR$ INLINEALWAYS s_color_function_ghost_cell_extrapolation
14261425
#else
@@ -1430,7 +1429,7 @@ contains
14301429
integer, intent(in) :: bc_dir, bc_loc
14311430
integer, intent(in) :: k, l
14321431

1433-
integer :: j, i, q
1432+
integer :: j, i
14341433

14351434
if (bc_dir == 1) then !< x-direction
14361435
if (bc_loc == -1) then !bc_x%beg
@@ -1478,14 +1477,14 @@ contains
14781477

14791478
end subroutine s_color_function_ghost_cell_extrapolation
14801479

1481-
subroutine s_create_mpi_types(bc_type)
1480+
impure subroutine s_create_mpi_types(bc_type)
14821481

14831482
type(integer_field), dimension(1:num_dims, -1:1) :: bc_type
14841483

14851484
#ifdef MFC_MPI
14861485
integer :: dir, loc
14871486
integer, dimension(3) :: sf_start_idx, sf_extents_loc
1488-
integer :: ifile, ierr, data_size
1487+
integer :: ierr
14891488

14901489
do dir = 1, num_dims
14911490
do loc = -1, 1, 2
@@ -1511,7 +1510,7 @@ contains
15111510
#endif
15121511
end subroutine s_create_mpi_types
15131512

1514-
subroutine s_finalize_boundary_common_module()
1513+
impure subroutine s_finalize_boundary_common_module()
15151514

15161515
#ifndef MFC_POST_PROCESS
15171516
if (bc_io) then

0 commit comments

Comments
 (0)