Reinforce the pattern of destructing at the start of a constructor

william-dawson · Apr 7, 2023 · bc28f5d · bc28f5d
1 parent 72f621f
commit bc28f5d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/Source/Fortran/DMatrixModule.F90 b/Source/Fortran/DMatrixModule.F90
@@ -101,7 +101,6 @@ PURE SUBROUTINE ConstructEmptyMatrixSup_ldr(this, rows, columns)
     !> Columns of the matrix
     INTEGER, INTENT(IN) :: columns
 
-    CALL DestructMatrix(this)
 #include "dense_includes/ConstructEmptyMatrix.f90"
   END SUBROUTINE ConstructEmptyMatrixSup_ldr
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -385,7 +384,6 @@ PURE SUBROUTINE ConstructEmptyMatrixSup_ldc(this, rows, columns)
     !> The number of columns o the matrix.
     INTEGER, INTENT(IN) :: columns
 
-    CALL DestructMatrix(this)
 #include "dense_includes/ConstructEmptyMatrix.f90"
   END SUBROUTINE ConstructEmptyMatrixSup_ldc
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --git a/Source/Fortran/SMatrixModule.F90 b/Source/Fortran/SMatrixModule.F90
@@ -135,7 +135,6 @@ PURE SUBROUTINE ConstructEmptyMatrixSub_lsr(this, rows, columns, zero_in)
     !> Whether to set the matrix to zero.
     LOGICAL, INTENT(IN), OPTIONAL :: zero_in
 
-    CALL DestructMatrix(this)
 #include "sparse_includes/ConstructEmptyMatrix.f90"
 
   END SUBROUTINE ConstructEmptyMatrixSub_lsr
@@ -151,7 +150,6 @@ PURE SUBROUTINE ConstructEmptyMatrixSub_lsc(this, rows, columns, zero_in)
     !> Whether to set the matrix to zero.
     LOGICAL, INTENT(IN), OPTIONAL :: zero_in
 
-    CALL DestructMatrix(this)
 #include "sparse_includes/ConstructEmptyMatrix.f90"
 
   END SUBROUTINE ConstructEmptyMatrixSub_lsc

diff --git a/Source/Fortran/dense_includes/ConstructEmptyMatrix.f90 b/Source/Fortran/dense_includes/ConstructEmptyMatrix.f90
@@ -1,3 +1,5 @@
+  CALL DestructMatrix(this)
+
   this%rows = rows
   this%columns = columns
 

diff --git a/Source/Fortran/sparse_includes/ConstructEmptyMatrix.f90 b/Source/Fortran/sparse_includes/ConstructEmptyMatrix.f90
@@ -1,3 +1,5 @@
+  CALL DestructMatrix(this)
+
   this%rows = rows
   this%columns = columns
   ALLOCATE(this%outer_index(this%columns+1))

diff --git a/Source/Fortran/sparse_includes/ConstructMatrixFromTripletList.f90 b/Source/Fortran/sparse_includes/ConstructMatrixFromTripletList.f90
@@ -2,6 +2,8 @@
   INTEGER :: outer_array_ptr
   INTEGER :: values_counter
 
+  CALL DestructMatrix(this)
+
   this%rows = rows
   this%columns = columns