Fix coo insert OpenMP. Fix Make.inc.in

Make.inc.in

@@ -71,11 +71,8 @@ CUDAD=@CUDAD@
 CUDALD=@CUDALD@
 LCUDA=@LCUDA@
 
-#SPGPUDIR=@SPGPU_DIR@
-#SPGPU_INCDIR=@SPGPU_INCDIR@
 SPGPU_LIBS=@SPGPU_LIBS@
 SPGPU_DEFINES=@SPGPU_DEFINES@
-#SPGPU_INCLUDES=@SPGPU_INCLUDES@
 
 CUDA_DIR=@CUDA_DIR@
 CUDA_DEFINES=@CUDA_DEFINES@

base/serial/impl/psb_c_coo_impl.F90

@@ -2878,14 +2878,20 @@ subroutine psb_c_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
     if (isza < (nza+nz)) then
       info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
     else
+#if defined(OPENMP)      
       nzaold = nza
       nza = nza + nz
+#endif
       call a%set_nzeros(nza)
     end if
     !$omp end critical
     if (info /= 0)  goto 9999
     call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
          & imin,imax,jmin,jmax,info)
+#if !defined(OPENMP)      
+    nza = nzaold
+    call a%set_nzeros(nza)
+#endif
     call a%set_sorted(.false.)
     
   else  if (a%is_upd()) then

base/serial/impl/psb_d_coo_impl.F90

@@ -2878,14 +2878,20 @@ subroutine psb_d_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
     if (isza < (nza+nz)) then
       info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
     else
+#if defined(OPENMP)      
       nzaold = nza
       nza = nza + nz
+#endif
       call a%set_nzeros(nza)
     end if
     !$omp end critical
     if (info /= 0)  goto 9999
     call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
          & imin,imax,jmin,jmax,info)
+#if !defined(OPENMP)      
+    nza = nzaold
+    call a%set_nzeros(nza)
+#endif
     call a%set_sorted(.false.)
     
   else  if (a%is_upd()) then

base/serial/impl/psb_s_coo_impl.F90

@@ -2878,14 +2878,20 @@ subroutine psb_s_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
     if (isza < (nza+nz)) then
       info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
     else
+#if defined(OPENMP)      
       nzaold = nza
       nza = nza + nz
+#endif
       call a%set_nzeros(nza)
     end if
     !$omp end critical
     if (info /= 0)  goto 9999
     call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
          & imin,imax,jmin,jmax,info)
+#if !defined(OPENMP)      
+    nza = nzaold
+    call a%set_nzeros(nza)
+#endif
     call a%set_sorted(.false.)
     
   else  if (a%is_upd()) then

base/serial/impl/psb_z_coo_impl.F90

@@ -2878,14 +2878,20 @@ subroutine psb_z_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
     if (isza < (nza+nz)) then
       info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
     else
+#if defined(OPENMP)      
       nzaold = nza
       nza = nza + nz
+#endif
       call a%set_nzeros(nza)
     end if
     !$omp end critical
     if (info /= 0)  goto 9999
     call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
          & imin,imax,jmin,jmax,info)
+#if !defined(OPENMP)      
+    nza = nzaold
+    call a%set_nzeros(nza)
+#endif
     call a%set_sorted(.false.)
     
   else  if (a%is_upd()) then