small simplifications for working data

Author: jalvesz

example/linalg/example_solve_custom.f90

@@ -39,12 +39,13 @@ subroutine solve_pccg_custom(A,b,x,di,tol,maxiter,restart,workspace)
         end if
 
         if(present(workspace)) then
-            if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,4) )
             workspace_ => workspace
         else
             allocate( workspace_ )
-            allocate( workspace_%tmp(n,4) , source = 0._dp )
         end if
+        if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,4) , source = 0.d0 )
+        !-------------------------
+        ! Jacobi preconditionner factorization
         call diag(A,diagonal)
         where(abs(diagonal)>epsilon(0.d0)) diagonal = 1._dp/diagonal
         !-------------------------
@@ -53,17 +54,14 @@ subroutine solve_pccg_custom(A,b,x,di,tol,maxiter,restart,workspace)
 
         !-------------------------
         ! internal memory cleanup
-        if(present(di))then
-            di_ => null()
-        else 
-            deallocate(di_)
-        end if
-        if(present(workspace)) then
-            workspace_ => null()
-        else
+        if(.not.present(di)) deallocate(di_)
+        di_ => null()
+        
+        if(.not.present(workspace)) then
             deallocate( workspace_%tmp )
             deallocate( workspace_ )
         end if
+        workspace_ => null()
         contains
 
         subroutine my_matvec(x,y)

src/stdlib_linalg_iterative_solvers_cg.fypp

@@ -108,29 +108,25 @@ contains
         end if
 
         if(present(workspace)) then
-            if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,3) )
             workspace_ => workspace
         else
             allocate( workspace_ )
-            allocate( workspace_%tmp(n,3), source = zero_${s}$ )
         end if
+        if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,3), source = zero_${s}$ )
         !-------------------------
         ! main call to the solver
         call solve_cg_generic(op,b,x,di_,tol_,maxiter_,restart_,workspace_)
 
         !-------------------------
         ! internal memory cleanup
-        if(present(di))then
-            di_ => null()
-        else 
-            deallocate(di_)
-        end if
-        if(present(workspace)) then
-            workspace_ => null()
-        else
+        if(.not.present(di)) deallocate(di_)
+        di_ => null()
+        
+        if(.not.present(workspace)) then
             deallocate( workspace_%tmp )
             deallocate( workspace_ )
         end if
+        workspace_ => null()
         contains
 
         subroutine default_matvec(x,y)

src/stdlib_linalg_iterative_solvers_pccg.fypp

@@ -119,29 +119,25 @@ contains
         end if
 
         if(present(workspace)) then
-            if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,4) )
             workspace_ => workspace
         else
             allocate( workspace_ )
-            allocate( workspace_%tmp(n,4) , source = zero_${s}$ )
         end if
+        if(.not.allocated(workspace_%tmp)) allocate( workspace_%tmp(n,4) , source = zero_${s}$ )
         !-------------------------
         ! main call to the solver
         call solve_pccg_generic(op,b,x,di_,tol_,maxiter_,restart_,workspace_)
 
         !-------------------------
         ! internal memory cleanup
-        if(present(di))then
-            di_ => null()
-        else 
-            deallocate(di_)
-        end if
-        if(present(workspace)) then
-            workspace_ => null()
-        else
+        if(.not.present(di)) deallocate(di_)
+        di_ => null()
+        
+        if(.not.present(workspace)) then
             deallocate( workspace_%tmp )
             deallocate( workspace_ )
         end if
+        workspace_ => null()
         contains
 
         subroutine default_matvec(x,y)