From 5a5712b4f079c242c5ae3938deb5826dc54ac388 Mon Sep 17 00:00:00 2001 From: sfilippone Date: Sun, 16 Apr 2023 12:02:54 +0200 Subject: [PATCH] Rely on CRITICAL inside G2L_INS implementation --- base/tools/psb_cspins.F90 | 6 ------ base/tools/psb_dspins.F90 | 6 ------ base/tools/psb_sspins.F90 | 6 ------ base/tools/psb_zspins.F90 | 6 ------ test/omp/psb_tomp.F90 | 2 +- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/base/tools/psb_cspins.F90 b/base/tools/psb_cspins.F90 index cfa88c55..66e03ed9 100644 --- a/base/tools/psb_cspins.F90 +++ b/base/tools/psb_cspins.F90 @@ -144,14 +144,8 @@ subroutine psb_cspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !$omp parallel private(ila,jla,nrow,ncol) #endif call desc_a%indxmap%g2l(ia(1:nz),ila(1:nz),info,owned=.true.) -#if defined(OPENMP) - !$omp critical(cspins) -#endif if (info == 0) call desc_a%indxmap%g2l_ins(ja(1:nz),jla(1:nz),info,& & mask=(ila(1:nz)>0)) -#if defined(OPENMP) - !$omp end critical(cspins) -#endif if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_ai_,name,& diff --git a/base/tools/psb_dspins.F90 b/base/tools/psb_dspins.F90 index 0ba71096..2e11c511 100644 --- a/base/tools/psb_dspins.F90 +++ b/base/tools/psb_dspins.F90 @@ -144,14 +144,8 @@ subroutine psb_dspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !$omp parallel private(ila,jla,nrow,ncol) #endif call desc_a%indxmap%g2l(ia(1:nz),ila(1:nz),info,owned=.true.) -#if defined(OPENMP) - !$omp critical(dspins) -#endif if (info == 0) call desc_a%indxmap%g2l_ins(ja(1:nz),jla(1:nz),info,& & mask=(ila(1:nz)>0)) -#if defined(OPENMP) - !$omp end critical(dspins) -#endif if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_ai_,name,& diff --git a/base/tools/psb_sspins.F90 b/base/tools/psb_sspins.F90 index 71cd293a..90fa9e2d 100644 --- a/base/tools/psb_sspins.F90 +++ b/base/tools/psb_sspins.F90 @@ -144,14 +144,8 @@ subroutine psb_sspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !$omp parallel private(ila,jla,nrow,ncol) #endif call desc_a%indxmap%g2l(ia(1:nz),ila(1:nz),info,owned=.true.) -#if defined(OPENMP) - !$omp critical(sspins) -#endif if (info == 0) call desc_a%indxmap%g2l_ins(ja(1:nz),jla(1:nz),info,& & mask=(ila(1:nz)>0)) -#if defined(OPENMP) - !$omp end critical(sspins) -#endif if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_ai_,name,& diff --git a/base/tools/psb_zspins.F90 b/base/tools/psb_zspins.F90 index be24a047..74e2d5dc 100644 --- a/base/tools/psb_zspins.F90 +++ b/base/tools/psb_zspins.F90 @@ -144,14 +144,8 @@ subroutine psb_zspins(nz,ia,ja,val,a,desc_a,info,rebuild,local) !$omp parallel private(ila,jla,nrow,ncol) #endif call desc_a%indxmap%g2l(ia(1:nz),ila(1:nz),info,owned=.true.) -#if defined(OPENMP) - !$omp critical(zspins) -#endif if (info == 0) call desc_a%indxmap%g2l_ins(ja(1:nz),jla(1:nz),info,& & mask=(ila(1:nz)>0)) -#if defined(OPENMP) - !$omp end critical(zspins) -#endif if (info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_ai_,name,& diff --git a/test/omp/psb_tomp.F90 b/test/omp/psb_tomp.F90 index 0a13a41b..468eeb5a 100644 --- a/test/omp/psb_tomp.F90 +++ b/test/omp/psb_tomp.F90 @@ -731,7 +731,7 @@ program psb_d_pde3d if(psb_errstatus_fatal()) goto 9999 name='pde3d90' call psb_set_errverbosity(itwo) - call psb_cd_set_large_threshold(2000_psb_ipk_) + call psb_cd_set_large_threshold(125000_psb_ipk_) ! ! Hello world !