Merging oneadder's changes

Author: ricor07

src/nf/nf_layer_constructors_submodule.f90

@@ -106,8 +106,6 @@ module function input3d(dim1, dim2, dim3) result(res)
     res % initialized = .true.
   end function input3d
 
-<<<<<<< HEAD
-=======
   module function locally_connected_1d(filters, kernel_size, activation) result(res)
     integer, intent(in) :: filters
     integer, intent(in) :: kernel_size
@@ -159,7 +157,6 @@ module function maxpool1d(pool_size, stride) result(res)
     )
 
   end function maxpool1d
->>>>>>> 0fbbda4 (adding locally_connected_1d to neural-fortran environment)
 
   module function maxpool2d(pool_size, stride) result(res)
     integer, intent(in) :: pool_size

src/nf/nf_layer_submodule.f90

@@ -218,22 +218,6 @@ pure module subroutine get_output_1d(self, output)
 
   end subroutine get_output_1d
 
-  pure module subroutine get_output_2d(self, output)
-    implicit none
-    class(layer), intent(in) :: self
-    real, allocatable, intent(out) :: output(:,:)
-
-    select type(this_layer => self % p)
-
-      type is(locally_connected_1d_layer)
-        allocate(output, source=this_layer % output)
-      class default
-        error stop '2d output can only be read from a locally_connected_1d layer'
-    
-    end select
-
-  end subroutine get_output_2d
-
   pure module subroutine get_output_2d(self, output)
     implicit none
     class(layer), intent(in) :: self
@@ -243,6 +227,8 @@ pure module subroutine get_output_2d(self, output)
 
       type is(input2d_layer)
         allocate(output, source=this_layer % output)
+      type is(locally_connected_1d_layer)
+        allocate(output, source=this_layer % output)
       class default
         error stop '1-d output can only be read from an input1d, dense, or flatten layer.'