diff --git a/base/comm/internals/psi_cswapdata_a.F90 b/base/comm/internals/psi_cswapdata_a.F90
index 153fa4d1..acf7f342 100644
--- a/base/comm/internals/psi_cswapdata_a.F90
+++ b/base/comm/internals/psi_cswapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_cswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_cswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_cswaptran_a.F90 b/base/comm/internals/psi_cswaptran_a.F90
index bfb192c1..0aa5d6f6 100644
--- a/base/comm/internals/psi_cswaptran_a.F90
+++ b/base/comm/internals/psi_cswaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_ctranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_ctranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_dswapdata_a.F90 b/base/comm/internals/psi_dswapdata_a.F90
index 4422597e..ff562994 100644
--- a/base/comm/internals/psi_dswapdata_a.F90
+++ b/base/comm/internals/psi_dswapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_dswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_dswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_dswaptran_a.F90 b/base/comm/internals/psi_dswaptran_a.F90
index a5b3fbfc..a0506a2b 100644
--- a/base/comm/internals/psi_dswaptran_a.F90
+++ b/base/comm/internals/psi_dswaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_dtranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_dtranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_eswapdata_a.F90 b/base/comm/internals/psi_eswapdata_a.F90
index 74a5aea8..acc6a6bf 100644
--- a/base/comm/internals/psi_eswapdata_a.F90
+++ b/base/comm/internals/psi_eswapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_eswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_eswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_eswaptran_a.F90 b/base/comm/internals/psi_eswaptran_a.F90
index e10b574c..ce12a7e7 100644
--- a/base/comm/internals/psi_eswaptran_a.F90
+++ b/base/comm/internals/psi_eswaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_etranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_etranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_epk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_i2swapdata_a.F90 b/base/comm/internals/psi_i2swapdata_a.F90
index 75e0c870..e2a8ad4e 100644
--- a/base/comm/internals/psi_i2swapdata_a.F90
+++ b/base/comm/internals/psi_i2swapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_i2swapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_i2swapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_i2swaptran_a.F90 b/base/comm/internals/psi_i2swaptran_a.F90
index 0615e2ba..36652565 100644
--- a/base/comm/internals/psi_i2swaptran_a.F90
+++ b/base/comm/internals/psi_i2swaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_i2tranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_i2tranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_i2pk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_mswapdata_a.F90 b/base/comm/internals/psi_mswapdata_a.F90
index 01277d8e..c7f1965b 100644
--- a/base/comm/internals/psi_mswapdata_a.F90
+++ b/base/comm/internals/psi_mswapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_mswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_mswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_mswaptran_a.F90 b/base/comm/internals/psi_mswaptran_a.F90
index ee8c1d21..1e9fcede 100644
--- a/base/comm/internals/psi_mswaptran_a.F90
+++ b/base/comm/internals/psi_mswaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_mtranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_mtranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   integer(psb_mpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_sswapdata_a.F90 b/base/comm/internals/psi_sswapdata_a.F90
index 47830330..c802578c 100644
--- a/base/comm/internals/psi_sswapdata_a.F90
+++ b/base/comm/internals/psi_sswapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_sswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_sswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_sswaptran_a.F90 b/base/comm/internals/psi_sswaptran_a.F90
index ae54ee21..c4290be1 100644
--- a/base/comm/internals/psi_sswaptran_a.F90
+++ b/base/comm/internals/psi_sswaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_stranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_stranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   real(psb_spk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_zswapdata_a.F90 b/base/comm/internals/psi_zswapdata_a.F90
index 49617d2d..ec21072c 100644
--- a/base/comm/internals/psi_zswapdata_a.F90
+++ b/base/comm/internals/psi_zswapdata_a.F90
@@ -191,7 +191,9 @@ subroutine psi_zswapidxm(ctxt,icomm,flag,n,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -676,7 +678,9 @@ subroutine psi_zswapidxv(ctxt,icomm,flag,beta,y,idx, &
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
diff --git a/base/comm/internals/psi_zswaptran_a.F90 b/base/comm/internals/psi_zswaptran_a.F90
index 586fa11b..c1062839 100644
--- a/base/comm/internals/psi_zswaptran_a.F90
+++ b/base/comm/internals/psi_zswaptran_a.F90
@@ -195,7 +195,9 @@ subroutine psi_ztranidxm(ctxt,icomm,flag,n,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_
@@ -688,7 +690,9 @@ subroutine psi_ztranidxv(ctxt,icomm,flag,beta,y,idx,&
   logical, parameter :: usersend=.false.
 
   complex(psb_dpk_), pointer, dimension(:) :: sndbuf, rcvbuf
-  !volatile :: sndbuf, rcvbuf
+#if !defined(FLANG)
+  volatile :: sndbuf, rcvbuf
+#endif
   character(len=20)  :: name
 
   info=psb_success_