From a17046cfdfa5091a6f0a878c3aff39d07cf30a23 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Fri, 20 Sep 2019 18:44:23 -0700
Subject: [PATCH] full merger

---
 src/math.f90 | 39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/math.f90 b/src/math.f90
index b552a3ef2..029a36533 100644
--- a/src/math.f90
+++ b/src/math.f90
@@ -532,47 +532,26 @@ end function math_invSym3333
 
 !--------------------------------------------------------------------------------------------------
 !> @brief invert quadratic matrix of arbitrary dimension
-! ToDo: replaces math_invert
 !--------------------------------------------------------------------------------------------------
 subroutine math_invert(InvA, error, A)
 
-  real(pReal), dimension(:,:), intent(in)  :: A
-  
+  real(pReal), dimension(:,:),                 intent(in)  :: A
   real(pReal), dimension(size(A,1),size(A,1)), intent(out) :: invA
-  logical, intent(out) :: error
+  logical,                                     intent(out) :: error
 
-  call math_invert2(size(A,1), A, InvA, error)
- 
-end subroutine math_invert
-
-
-!--------------------------------------------------------------------------------------------------
-!> @brief invert matrix of arbitrary dimension
-! ToDo: Wrong order of arguments and superfluous myDim argument.
-! Use math_invert2 instead
-!--------------------------------------------------------------------------------------------------
-subroutine math_invert2(myDim,A, InvA, error)
-
-  integer, intent(in)  :: myDim
-  real(pReal), dimension(myDim,myDim), intent(in)  :: A
-
-
-  integer :: ierr
-  integer,     dimension(myDim) :: ipiv
-  real(pReal), dimension(myDim) :: work
-  
-  real(pReal), dimension(myDim,myDim), intent(out) :: invA
-  logical, intent(out) :: error
+  integer,     dimension(size(A,1)) :: ipiv
+  real(pReal), dimension(size(A,1)) :: work
+  integer                           :: ierr
   external :: &
    dgetrf, &
    dgetri
-  
+
   invA = A 
-  call dgetrf(myDim,myDim,invA,myDim,ipiv,ierr)
-  call dgetri(myDim,InvA,myDim,ipiv,work,myDim,ierr)
+  call dgetrf(size(A,1),size(A,1),invA,size(A,1),ipiv,ierr)
+  call dgetri(size(A,1),InvA,size(A,1),ipiv,work,size(A,1),ierr)
   error = merge(.true.,.false., ierr /= 0)
  
-end subroutine math_invert2
+end subroutine math_invert
 
 
 !--------------------------------------------------------------------------------------------------