From e711c53fab67b1f1e87ad933704cff97e845a9aa Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@uniroma2.it>
Date: Tue, 7 May 2024 07:07:18 -0400
Subject: [PATCH] Make sure we compile when  LPK /= IPK

---
 base/modules/desc/psb_hash_map_mod.F90 | 36 ++++++++++++++++----------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/base/modules/desc/psb_hash_map_mod.F90 b/base/modules/desc/psb_hash_map_mod.F90
index 09cde3d4..952aef30 100644
--- a/base/modules/desc/psb_hash_map_mod.F90
+++ b/base/modules/desc/psb_hash_map_mod.F90
@@ -733,10 +733,11 @@ contains
                   if (lip > 0) then
                     idx(i) = lip
                   else
-                    call psb_hash_searchinskey(ip,lip,nxt,idxmap%hash,info)
+                    call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
+                    lip = tlip 
                     if (info >=0) then 
                       if (nxt == lip) then 
-                        call psb_ensure_size(nxt,idxmap%loc_to_glob,info,&
+                        call psb_ensure_size(lip,idxmap%loc_to_glob,info,&
                              & pad=-1_psb_lpk_,addsz=laddsz)
                         if (info /= psb_success_) then
                           info=1
@@ -745,7 +746,8 @@ contains
                           isLoopValid = .false.
                         end if
                         idxmap%loc_to_glob(nxt)  = ip
-                        call idxmap%set_lc(max(ncol,nxt))
+                        ncol = max(ncol,nxt)
+                        call idxmap%set_lc(ncol)
                       endif
                       idx(i) = lip
                       info = psb_success_
@@ -794,10 +796,11 @@ contains
                 if (lip > 0) then
                   idx(i) = lip
                 else
-                  call psb_hash_searchinskey(ip,lip,nxt,idxmap%hash,info)
+                  call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
+                  lip = tlip
                   if (info >=0) then 
                     if (nxt == lip) then 
-                      call psb_ensure_size(nxt,idxmap%loc_to_glob,info,&
+                      call psb_ensure_size(lip,idxmap%loc_to_glob,info,&
                            & pad=-1_psb_lpk_,addsz=laddsz)
                       if (info /= psb_success_) then
                         info=1
@@ -806,7 +809,8 @@ contains
                         isLoopValid = .false.
                       end if
                       idxmap%loc_to_glob(nxt)  = ip
-                      call idxmap%set_lc(max(ncol,nxt))
+                      ncol = max(ncol,nxt)
+                      call idxmap%set_lc(ncol)
                     endif
                     idx(i) = lip
                     info = psb_success_
@@ -852,10 +856,11 @@ contains
                 if (lip > 0) then
                   idx(i) = lip
                 else
-                  call psb_hash_searchinskey(ip,lip,nxt,idxmap%hash,info)
+                  call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
+                  lip = tlip
                   if (info >=0) then 
                     if (nxt == lip) then 
-                      call psb_ensure_size(nxt,idxmap%loc_to_glob,info,&
+                      call psb_ensure_size(lip,idxmap%loc_to_glob,info,&
                            & pad=-1_psb_lpk_,addsz=laddsz)
                       if (info /= psb_success_) then
                         info=1
@@ -863,8 +868,9 @@ contains
                              & a_err='psb_ensure_size',i_err=(/info/))
                         isLoopValid = .false.
                       end if
-                      idxmap%loc_to_glob(nxt)  = ip
-                      call idxmap%set_lc(nxt)
+                      ncol = nxt
+                      idxmap%loc_to_glob(ncol)  = ip
+                      call idxmap%set_lc(ncol)
                     endif
                     idx(i) = lip
                     info = psb_success_
@@ -909,10 +915,11 @@ contains
               if (lip > 0) then
                 idx(i) = lip
               else
-                call psb_hash_searchinskey(ip,lip,nxt,idxmap%hash,info)
+                call psb_hash_searchinskey(ip,tlip,nxt,idxmap%hash,info)
+                lip = tlip
                 if (info >=0) then 
                   if (nxt == lip) then 
-                    call psb_ensure_size(nxt,idxmap%loc_to_glob,info,&
+                    call psb_ensure_size(lip,idxmap%loc_to_glob,info,&
                          & pad=-1_psb_lpk_,addsz=laddsz)
                     if (info /= psb_success_) then
                       info=1
@@ -920,8 +927,9 @@ contains
                            & a_err='psb_ensure_size',i_err=(/info/))
                       isLoopValid = .false.
                     end if
-                    idxmap%loc_to_glob(nxt)  = ip
-                    call idxmap%set_lc(nxt)
+                    ncol = nxt
+                    idxmap%loc_to_glob(ncol)  = ip
+                    call idxmap%set_lc(ncol)
                   endif
                   idx(i) = lip
                   info = psb_success_