Skip to content

Documentation: match laplacian function comments to AI4Dev paper #180

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
rouson merged 2 commits into from
Jun 27, 2025
Merged

Documentation: match laplacian function comments to AI4Dev paper #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0cba38
fix(include): calculcate GCC_VERSION
rouson Jun 27, 2025
f39eda1
doc(laplacian): match comments to AI4Dev paper
rouson Jun 27, 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
11 changes: 11 additions & 0 deletions include/language-support.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
! Copyright (c), The Regents of the University of California
! Terms of use are as specified in LICENSE.txt

#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)

#ifndef HAVE_PROCEDURE_ACTUAL_FOR_POINTER_DUMMY
! Define whether the compiler supports associating a procedure pointer dummy argument with an
! actual argument that is a valid target for the pointer dummy in a procedure assignment, a
Expand All @@ -12,6 +14,15 @@
# endif
#endif

#ifndef HAVE_2018_LOCALITY_SPECIFIERS
! Define whether the compiler supports locality specifiers in `do concurrent`
# if defined(_CRAYFTN) || defined(__INTEL_COMPILER) || defined(NAGFOR) || defined(__flang__) || (GCC_VERSION > 150000)
# define HAVE_2018_LOCALITY_SPECIFIERS 1
# else
# define HAVE_2018_LOCALITY_SPECIFIERS 0
# endif
#endif

#ifndef HAVE_CRITICAL
! Define whether the compiler supports the `critical` and `end critical` statements
# if defined(_CRAYFTN) || defined(__INTEL_COMPILER) || defined(NAGFOR) || defined(__GFORTRAN__)
Expand Down
44 changes: 22 additions & 22 deletions src/matcha/subdomain_s.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
submodule(subdomain_m) subdomain_s
use assert_m
use julienne_m, only : bin_t
use intrinsic_array_m, only : intrinsic_array_t
implicit none

real, allocatable :: halo_x(:,:,:)[:]
Expand Down Expand Up @@ -37,7 +36,7 @@
dy_ = dx_
dz_ = dx_

call_assert_diagnose(num_subdomains <= nx-nx_boundaries, "subdomain_t%define: num_subdomains <= nx-nx_boundaries", intrinsic_array_t([nx, num_subdomains]))
call_assert(num_subdomains <= nx-nx_boundaries)

me = this_image()
num_subdomains = num_images()
Expand Down Expand Up @@ -82,34 +81,34 @@
end procedure

module procedure laplacian
integer i, j, k;
integer i, j, k
real, allocatable :: halo_west(:,:), halo_east(:,:)

call_assert(allocated(rhs%s_))
call_assert(allocated(halo_x))

allocate(laplacian_rhs%s_(my_nx, ny, nz))
halo_west = merge(halo_x(west,:,:), rhs%s_(1,:,:), me/=1)
halo_west = merge(halo_x(west,:,:), rhs%s_(1,:,:), me/=1) ! conditionally use halo value
i = my_internal_west
call_assert_describe(i+1<=my_nx, "laplacian: westernmost subdomain too small")

! Compute Laplacians throughout the low-x boundary subdomain using non-allocatable associations:
associate( laplacian_phi => laplacian_rhs%s_, inbox => halo_west, phi=>rhs%s_)
#if HAVE_2018_LOCALITY_SPECIFIERS
do concurrent(j=2:ny-1, k=2:nz-1) &
default(none) shared(laplacian_phi, inbox, phi, dx_, dy_, dz_, i)
default(none) shared(laplacian_phi, inbox, phi, dx_, dy_, dz_, i) !Fortran 2018 loacality specifiers
#else
do concurrent(j=2:ny-1, k=2:nz-1)
do concurrent(j=2:ny-1, k=2:nz-1)
#endif
laplacian_phi(i,j,k) = (inbox(j,k ) - 2*phi(i,j,k) + phi(i+1,j ,k ))/dx_**2 + &
(phi(i,j-1,k ) - 2*phi(i,j,k) + phi(i ,j+1,k ))/dy_**2 + &
(phi(i,j ,k-1) - 2*phi(i,j,k) + phi(i ,j ,k+1))/dz_**2
end do
end associate

associate(laplacian_phi => laplacian_rhs%s_, phi=>rhs%s_)
! Compute Laplacians throughout non-boundary subdomains with non-allocatable associations:
associate(laplacian_phi => laplacian_rhs%s_, phi=>rhs%s_)
#if HAVE_2018_LOCALITY_SPECIFIERS
do concurrent(i=my_internal_west+1:my_internal_east-1, j=2:ny-1, k=2:nz-1) &
default(none) shared(laplacian_phi, phi, dx_, dy_, dz_)
default(none) shared(laplacian_phi, phi, dx_, dy_, dz_) ! Fortran 2018 locality specifiers
#else
do concurrent(i=my_internal_west+1:my_internal_east-1, j=2:ny-1, k=2:nz-1)
#endif
Expand All @@ -119,29 +118,30 @@
end do
end associate

halo_east = merge(halo_x(east,:,:), rhs%s_(my_nx,:,:), me/=num_subdomains)
halo_east = merge(halo_x(east,:,:), rhs%s_(my_nx,:,:), me/=num_subdomains) !conditionally use halo value
i = my_internal_east
call_assert_describe(i-1>0, "laplacian: easternmost subdomain too small")

! Compute Laplacians throughout the high-x boundary subdomain using non-allocatable associations:
associate(laplacian_phi => laplacian_rhs%s_, inbox => halo_east, phi=>rhs%s_)
#if HAVE_2018_LOCALITY_SPECIFIERS
do concurrent(j=2:ny-1, k=2:nz-1) &
default(none) shared(laplacian_phi, inbox, phi, dx_, dy_, dz_, i)
do concurrent(j=2:ny-1, k=2:nz-1) & ! compute Laplacian in low-x boundary subdomain
default(none) shared(laplacian_phi, inbox, phi, dx_, dy_, dz_, i) ! Fortran 2018 locality specifiers
#else
do concurrent(j=2:ny-1, k=2:nz-1)
do concurrent(j=2:ny-1, k=2:nz-1) ! compute Laplacian in low-x boundary subdomain
#endif
laplacian_phi(i,j,k) = (phi(i-1,j ,k ) - 2*phi(i,j,k) + inbox( j ,k ))/dx_**2 + &
(phi(i ,j-1,k ) - 2*phi(i,j,k) + phi(i ,j+1,k ))/dy_**2 + &
(phi(i ,j ,k-1) - 2*phi(i,j,k) + phi(i ,j ,k+1))/dz_**2
end do
end associate

laplacian_rhs%s_(:, 1,:) = 0. ! y-direction low boundary
laplacian_rhs%s_(:,ny,:) = 0. ! y-direction high boundary
laplacian_rhs%s_(:,:, 1) = 0. ! z-direction low boundary
laplacian_rhs%s_(:,:,nz) = 0. ! z-direction high boundary
if (me==1) laplacian_rhs%s_(1,:,:) = 0. ! x-direction low boundary
if (me==num_subdomains) laplacian_rhs%s_(my_nx,:,:) = 0. ! x-direction high boundary
laplacian_rhs%s_(:, 1,:) = 0. ! low-y boundary
laplacian_rhs%s_(:,ny,:) = 0. ! high-y boundary
laplacian_rhs%s_(:,:, 1) = 0. ! low-z boundary
laplacian_rhs%s_(:,:,nz) = 0. ! high-z boundary

if (me==1) laplacian_rhs%s_(1,:,:) = 0. ! low-x boundary
if (me==num_subdomains) laplacian_rhs%s_(my_nx,:,:) = 0. ! high-x boundary
end procedure

module procedure multiply
Expand Down Expand Up @@ -246,4 +246,4 @@ subroutine exchange_halo(s)

end procedure

end submodule subdomain_s
end submodule subdomain_s
Loading