Change and use #define with PSB_ and AMG_ prefixes

This commit is contained in:
sfilippone
2025-03-17 17:52:25 +01:00
parent ac7d7373e6
commit 6fa5b04387
106 changed files with 615 additions and 613 deletions
+6 -6
View File
@@ -93,7 +93,7 @@ contains
& a1,a2,a3,b1,b2,b3,c,g,info,f,amold,vmold,partition, nrl,iv)
use psb_base_mod
use psb_util_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
!
@@ -262,7 +262,7 @@ contains
! A nifty MPI function will split the process list
npdims = 0
#if defined(SERIAL_MPI)
#if defined(PSB_SERIAL_MPI)
npdims = 1
#else
call mpi_dims_create(np,3,npdims,info)
@@ -379,7 +379,7 @@ contains
integer(psb_lpk_), allocatable :: irow(:),icol(:)
real(psb_dpk_), allocatable :: val(:)
real(psb_dpk_) :: x,y,z, zt(nb)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
nth = omp_get_num_threads()
ith = omp_get_thread_num()
#else
@@ -566,7 +566,7 @@ contains
& a1,a2,b1,b2,c,g,info,f,amold,vmold,partition, nrl,iv)
use psb_base_mod
use psb_util_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
!
@@ -725,7 +725,7 @@ contains
! A nifty MPI function will split the process list
npdims = 0
#if defined(SERIAL_MPI)
#if defined(PSB_SERIAL_MPI)
npdims = 1
#else
call mpi_dims_create(np,2,npdims,info)
@@ -836,7 +836,7 @@ contains
integer(psb_lpk_), allocatable :: irow(:),icol(:)
real(psb_dpk_), allocatable :: val(:)
real(psb_dpk_) :: x,y,z, zt(nb)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
nth = omp_get_num_threads()
ith = omp_get_thread_num()
#else
+2 -2
View File
@@ -74,7 +74,7 @@ program amg_d_pde2d
use amg_d_pde2d_box_mod
use amg_d_pde2d_gauss_mod
use amg_d_genpde_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
implicit none
@@ -212,7 +212,7 @@ program amg_d_pde2d
call psb_init(ctxt)
call psb_info(ctxt,iam,np)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
!$OMP parallel shared(nth)
!$OMP master
nth = omp_get_num_threads()
+2 -2
View File
@@ -75,7 +75,7 @@ program amg_d_pde3d
use amg_d_pde3d_box_mod
use amg_d_pde3d_gauss_mod
use amg_d_genpde_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
implicit none
@@ -213,7 +213,7 @@ program amg_d_pde3d
call psb_init(ctxt)
call psb_info(ctxt,iam,np)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
!$OMP parallel shared(nth)
!$OMP master
nth = omp_get_num_threads()
+6 -6
View File
@@ -93,7 +93,7 @@ contains
& a1,a2,a3,b1,b2,b3,c,g,info,f,amold,vmold,partition, nrl,iv)
use psb_base_mod
use psb_util_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
!
@@ -262,7 +262,7 @@ contains
! A nifty MPI function will split the process list
npdims = 0
#if defined(SERIAL_MPI)
#if defined(PSB_SERIAL_MPI)
npdims = 1
#else
call mpi_dims_create(np,3,npdims,info)
@@ -379,7 +379,7 @@ contains
integer(psb_lpk_), allocatable :: irow(:),icol(:)
real(psb_spk_), allocatable :: val(:)
real(psb_spk_) :: x,y,z, zt(nb)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
nth = omp_get_num_threads()
ith = omp_get_thread_num()
#else
@@ -566,7 +566,7 @@ contains
& a1,a2,b1,b2,c,g,info,f,amold,vmold,partition, nrl,iv)
use psb_base_mod
use psb_util_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
!
@@ -725,7 +725,7 @@ contains
! A nifty MPI function will split the process list
npdims = 0
#if defined(SERIAL_MPI)
#if defined(PSB_SERIAL_MPI)
npdims = 1
#else
call mpi_dims_create(np,2,npdims,info)
@@ -836,7 +836,7 @@ contains
integer(psb_lpk_), allocatable :: irow(:),icol(:)
real(psb_spk_), allocatable :: val(:)
real(psb_spk_) :: x,y,z, zt(nb)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
nth = omp_get_num_threads()
ith = omp_get_thread_num()
#else
+2 -2
View File
@@ -74,7 +74,7 @@ program amg_s_pde2d
use amg_s_pde2d_box_mod
use amg_s_pde2d_gauss_mod
use amg_s_genpde_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
implicit none
@@ -212,7 +212,7 @@ program amg_s_pde2d
call psb_init(ctxt)
call psb_info(ctxt,iam,np)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
!$OMP parallel shared(nth)
!$OMP master
nth = omp_get_num_threads()
+2 -2
View File
@@ -75,7 +75,7 @@ program amg_s_pde3d
use amg_s_pde3d_box_mod
use amg_s_pde3d_gauss_mod
use amg_s_genpde_mod
#if defined(OPENMP)
#if defined(PSB_OPENMP)
use omp_lib
#endif
implicit none
@@ -213,7 +213,7 @@ program amg_s_pde3d
call psb_init(ctxt)
call psb_info(ctxt,iam,np)
#if defined(OPENMP)
#if defined(PSB_OPENMP)
!$OMP parallel shared(nth)
!$OMP master
nth = omp_get_num_threads()
+1 -1
View File
@@ -1,6 +1,6 @@
%%%%%%%%%%% General arguments % Lines starting with % are ignored.
CSR ! Storage format CSR COO JAD
0050 ! IDIM; domain size. Linear system size is IDIM**3
0150 ! IDIM; domain size. Linear system size is IDIM**3
POISSON ! PDECOEFF: POISSON, EXP, BOX, GAUSS
% ! Coefficients of the PDE
CG ! Iterative method: