Skip to content

Adding (some) pure functions and subroutines #840

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.

Sign up for GitHub

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

Merged
merged 28 commits into from
Jun 2, 2025
Merged

Adding (some) pure functions and subroutines #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
895e3d7
Made easily changed functions to pure and elemental
prathi-wind May 14, 2025
a1b2f61
Added pure subrountines
prathi-wind May 15, 2025
1c9d815
Refactoring functions to not use globals
prathi-wind May 19, 2025
2090b48
Made bubble functions pure
prathi-wind May 20, 2025
51ffb68
Merge remote-tracking branch 'upstream/master'
prathi-wind May 21, 2025
a1bec66
Fixed the rebase
prathi-wind May 21, 2025
5f36838
Added parameter docs
prathi-wind May 21, 2025
15cbf9e
Ran formatter
prathi-wind May 21, 2025
9ac36aa
Revert "Refactoring functions to not use globals"
prathi-wind May 22, 2025
40ac592
Revert "Made bubble functions pure"
prathi-wind May 22, 2025
6eddb7a
Removed passing into global parameters
prathi-wind May 22, 2025
6c57dcf
More work into marking subroutines as pure or impure
prathi-wind May 22, 2025
3c5c5c2
Continuing to mark subroutines as pure or impure
prathi-wind May 23, 2025
883d78e
Continuing to mark subroutines as pure or impure
prathi-wind May 23, 2025
f0f3653
Finished first pass through pure subroutines
prathi-wind May 23, 2025
1d7b449
Updated some functions due to elemental keyword
prathi-wind May 23, 2025
cef0f44
Marked some subroutines as pure and ran formatter
prathi-wind May 23, 2025
e7a5964
Marked some silo_proxy as impure and ran formatter
prathi-wind May 23, 2025
347a06e
Merge branch 'master' into master
prathi-wind May 23, 2025
24d2b65
Merge branch 'master' into master
sbryngelson May 26, 2025
0cdc1e1
Going through second pass of marking subroutines
prathi-wind May 28, 2025
6ed4357
More pure subroutines and removed some module variables
prathi-wind May 28, 2025
a31d9d5
Ran formatter
prathi-wind May 28, 2025
980fb49
Merge branch 'master' into master
sbryngelson May 29, 2025
e9e651c
Merge branch 'master' into master
prathi-wind May 30, 2025
1122923
Fix merge and remove unnecessary zeroing out tensors
prathi-wind May 30, 2025
3356325
Ran formatted
prathi-wind May 30, 2025
c41a530
Merge branch 'master' into master
sbryngelson Jun 1, 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
26 changes: 13 additions & 13 deletions misc/m_silo_proxy.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module m_silo_proxy

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

integer :: DBCREATE
Expand All @@ -66,7 +66,7 @@ end function DBCREATE

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

integer :: DBGET2DSTRLEN

Expand All @@ -79,7 +79,7 @@ end function DBGET2DSTRLEN

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

integer :: DBSET2DSTRLEN
integer, intent(IN) :: len
Expand All @@ -93,7 +93,7 @@ end function DBSET2DSTRLEN

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

integer :: DBMKOPTLIST
integer, intent(IN) :: maxopts
Expand All @@ -107,7 +107,7 @@ end function DBMKOPTLIST

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

integer :: DBADDIOPT
integer, intent(IN) :: optlist_id
Expand All @@ -123,7 +123,7 @@ end function DBADDIOPT

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

integer :: DBADDDOPT
integer, intent(IN) :: optlist_id
Expand All @@ -139,7 +139,7 @@ end function DBADDDOPT

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

integer :: DBPUTMMESH
Expand All @@ -162,7 +162,7 @@ end function DBPUTMMESH

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

integer :: DBFREEOPTLIST
integer, intent(IN) :: optlist_id
Expand All @@ -175,7 +175,7 @@ end function DBFREEOPTLIST

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

Expand Down Expand Up @@ -208,7 +208,7 @@ end function DBPUTQM

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

integer :: DBPUTCURVE
Expand All @@ -231,7 +231,7 @@ end function DBPUTCURVE

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

integer :: DBPUTMVAR
Expand All @@ -254,7 +254,7 @@ end function DBPUTMVAR

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

Expand Down Expand Up @@ -283,7 +283,7 @@ end function DBPUTQV1

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

integer :: DBCLOSE
integer, intent(IN) :: dbid
Expand Down
32 changes: 16 additions & 16 deletions src/common/m_boundary_common.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

contains

subroutine s_initialize_boundary_common_module()
impure subroutine s_initialize_boundary_common_module()

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

Expand Down Expand Up @@ -71,7 +71,7 @@
!> The purpose of this procedure is to populate the buffers
!! of the primitive variables, depending on the selected
!! boundary conditions.
subroutine s_populate_variables_buffers(q_prim_vf, pb, mv, bc_type)
impure subroutine s_populate_variables_buffers(q_prim_vf, pb, mv, bc_type)

type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf
real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv
Expand Down Expand Up @@ -237,7 +237,7 @@

end subroutine s_populate_variables_buffers

subroutine s_ghost_cell_extrapolation(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_ghost_cell_extrapolation(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_ghost_cell_extrapolation
#else
Expand Down Expand Up @@ -306,7 +306,7 @@

end subroutine s_ghost_cell_extrapolation

subroutine s_symmetry(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_symmetry(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_symmetry
#else
Expand Down Expand Up @@ -570,7 +570,7 @@

end subroutine s_symmetry

subroutine s_periodic(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_periodic(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_periodic
#else
Expand Down Expand Up @@ -713,7 +713,7 @@

end subroutine s_periodic

subroutine s_axis(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_axis(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)

Check warning on line 716 in src/common/m_boundary_common.fpp

View check run for this annotation

Codecov / codecov/patch

src/common/m_boundary_common.fpp#L716 

Added line #L716 was not covered by tests
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_axis
#else
Expand Down Expand Up @@ -777,7 +777,7 @@

end subroutine s_axis

subroutine s_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_slip_wall
#else
Expand Down Expand Up @@ -876,7 +876,7 @@

end subroutine s_slip_wall

subroutine s_no_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_no_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_no_slip_wall
#else
Expand Down Expand Up @@ -1011,7 +1011,7 @@

end subroutine s_no_slip_wall

subroutine s_dirichlet(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_dirichlet(q_prim_vf, pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_dirichlet
#else
Expand Down Expand Up @@ -1080,7 +1080,7 @@

end subroutine s_dirichlet

subroutine s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
pure subroutine s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_qbmm_extrapolation
#else
Expand Down Expand Up @@ -1156,7 +1156,7 @@

end subroutine s_qbmm_extrapolation

subroutine s_populate_capillary_buffers(c_divs, bc_type)
impure subroutine s_populate_capillary_buffers(c_divs, bc_type)

type(scalar_field), dimension(num_dims + 1), intent(inout) :: c_divs
type(integer_field), dimension(1:num_dims, -1:1), intent(in) :: bc_type
Expand Down Expand Up @@ -1279,7 +1279,7 @@
end if
end subroutine s_populate_capillary_buffers

subroutine s_color_function_periodic(c_divs, bc_dir, bc_loc, k, l)
pure subroutine s_color_function_periodic(c_divs, bc_dir, bc_loc, k, l)

Check warning on line 1282 in src/common/m_boundary_common.fpp

View check run for this annotation

Codecov / codecov/patch

src/common/m_boundary_common.fpp#L1282 

Added line #L1282 was not covered by tests
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_color_function_periodic
#else
Expand Down Expand Up @@ -1337,7 +1337,7 @@

end subroutine s_color_function_periodic

subroutine s_color_function_reflective(c_divs, bc_dir, bc_loc, k, l)
pure subroutine s_color_function_reflective(c_divs, bc_dir, bc_loc, k, l)

Check warning on line 1340 in src/common/m_boundary_common.fpp

View check run for this annotation

Codecov / codecov/patch

src/common/m_boundary_common.fpp#L1340 

Added line #L1340 was not covered by tests
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_color_function_reflective
#else
Expand Down Expand Up @@ -1419,7 +1419,7 @@

end subroutine s_color_function_reflective

subroutine s_color_function_ghost_cell_extrapolation(c_divs, bc_dir, bc_loc, k, l)
pure subroutine s_color_function_ghost_cell_extrapolation(c_divs, bc_dir, bc_loc, k, l)
#ifdef _CRAYFTN
!DIR$ INLINEALWAYS s_color_function_ghost_cell_extrapolation
#else
Expand Down Expand Up @@ -1477,7 +1477,7 @@

end subroutine s_color_function_ghost_cell_extrapolation

subroutine s_create_mpi_types(bc_type)
impure subroutine s_create_mpi_types(bc_type)

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

Expand Down Expand Up @@ -1510,7 +1510,7 @@
#endif
end subroutine s_create_mpi_types

subroutine s_finalize_boundary_common_module()
impure subroutine s_finalize_boundary_common_module()

#ifndef MFC_POST_PROCESS
if (bc_io) then
Expand Down
Loading
Loading