Abstract base type fitpack_fitter with shared fields and comm (#41)

Author: perazz

.claude/settings.local.json

@@ -10,7 +10,10 @@
       "Bash(git push:*)",
       "Bash(grep:*)",
       "Bash(fpm build:*)",
-      "Bash(git status:*)"
+      "Bash(git status:*)",
+      "Bash(git pull:*)",
+      "Bash(git stash:*)",
+      "Bash(git revert:*)"
     ],
     "deny": [],
     "ask": []

project/fitpack.cbp

@@ -97,7 +97,7 @@
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="../src/fitpack_curves.f90">
-			<Option weight="1" />
+			<Option weight="0" />
 		</Unit>
 		<Unit filename="../src/fitpack_curves_c.f90">
 			<Option weight="0" />
@@ -136,16 +136,16 @@
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="../test/fitpack_curve_tests.f90">
-			<Option weight="1" />
+			<Option weight="0" />
 		</Unit>
 		<Unit filename="../test/fitpack_test_data.f90">
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="../test/fitpack_tests.f90">
-			<Option weight="1" />
+			<Option weight="0" />
 		</Unit>
 		<Unit filename="../test/test.f90">
-			<Option weight="2" />
+			<Option weight="0" />
 		</Unit>
 		<Unit filename="../test/test_curve.cpp" />
 		<Extensions />

project/fitpack.fdepend

@@ -0,0 +1,45 @@
+# fdepslib dependency file v1.1
+1771258224source:/Users/federico/code/fitpack/src/fitpack.f90
+
+1704620662source:/Users/federico/code/fitpack/src/fitpack_closed_c.f90
+
+1704623491source:/Users/federico/code/fitpack/src/fitpack_constrained_c.f90
+
+1771258028source:/Users/federico/code/fitpack/src/fitpack_core.f90
+
+1766849605source:/Users/federico/code/fitpack/src/fitpack_core_c.f90
+
+1771259882source:/Users/federico/code/fitpack/src/fitpack_curves.f90
+
+1764238257source:/Users/federico/code/fitpack/src/fitpack_curves_c.f90
+
+1771259888source:/Users/federico/code/fitpack/src/fitpack_grid_surfaces.f90
+
+1771259891source:/Users/federico/code/fitpack/src/fitpack_gridded_polar.f90
+
+1771259893source:/Users/federico/code/fitpack/src/fitpack_gridded_sphere.f90
+
+1771259882source:/Users/federico/code/fitpack/src/fitpack_parametric.f90
+
+1741628651source:/Users/federico/code/fitpack/src/fitpack_parametric_c.f90
+
+1771259895source:/Users/federico/code/fitpack/src/fitpack_parametric_surfaces.f90
+
+1703948614source:/Users/federico/code/fitpack/src/fitpack_periodic_curves_c.f90
+
+1771259887source:/Users/federico/code/fitpack/src/fitpack_polar.f90
+
+1771259889source:/Users/federico/code/fitpack/src/fitpack_spheres.f90
+
+1771259882source:/Users/federico/code/fitpack/src/fitpack_surfaces.f90
+
+1704617612source:/Users/federico/code/fitpack/test/fitpack_cpp_tests.f90
+
+1771258900source:/Users/federico/code/fitpack/test/fitpack_curve_tests.f90
+
+1740771300source:/Users/federico/code/fitpack/test/fitpack_test_data.f90
+
+1765036074source:/Users/federico/code/fitpack/test/fitpack_tests.f90
+
+1771258788source:/Users/federico/code/fitpack/test/test.f90
+

src/fitpack.f90

@@ -19,6 +19,7 @@
 ! **************************************************************************************************
 module fitpack
    use fitpack_core
+   use fitpack_fitters
    use fitpack_curves
    use fitpack_surfaces
    use fitpack_grid_surfaces
@@ -38,6 +39,9 @@ module fitpack
    public :: FP_FLAG
    public :: FP_BOOL
 
+   ! Public interface: abstract base type
+   public :: fitpack_fitter
+
    ! Public interface: types
    public :: fitpack_curve
    public :: fitpack_closed_curve

src/fitpack_core.F90

@@ -181,20 +181,23 @@ end function fitpack_polar_boundary
     interface FP_COMM_SIZE
         module procedure FP_REAL_COMM_SIZE_1D
         module procedure FP_REAL_COMM_SIZE_2D
+        module procedure FP_REAL_COMM_SIZE_3D
         module procedure FP_SIZE_COMM_SIZE_1D
     end interface FP_COMM_SIZE
 
-    !> Pack allocatable 1D arrays into communication buffer
+    !> Pack allocatable arrays into communication buffer
     interface FP_COMM_PACK
         module procedure FP_REAL_COMM_PACK_1D
         module procedure FP_REAL_COMM_PACK_2D
+        module procedure FP_REAL_COMM_PACK_3D
         module procedure FP_SIZE_COMM_PACK_1D
     end interface FP_COMM_PACK
 
-    !> Expand communication buffer into allocatable 1D arrays
+    !> Expand communication buffer into allocatable arrays
     interface FP_COMM_EXPAND
         module procedure FP_REAL_COMM_EXPAND_1D
         module procedure FP_REAL_COMM_EXPAND_2D
+        module procedure FP_REAL_COMM_EXPAND_3D
         module procedure FP_SIZE_COMM_EXPAND_1D
     end interface FP_COMM_EXPAND
 
@@ -18325,6 +18328,18 @@ pure integer(FP_SIZE) function FP_REAL_COMM_SIZE_2D(array)
         end if
     end function FP_REAL_COMM_SIZE_2D
 
+    !> Calculate storage size for 3D real(FP_REAL) allocatable array
+    pure integer(FP_SIZE) function FP_REAL_COMM_SIZE_3D(array)
+        real(FP_REAL), allocatable, intent(in) :: array(:,:,:)
+        integer(FP_SIZE) :: n
+
+        FP_REAL_COMM_SIZE_3D = rank(array)  ! Header (3 dimensions)
+        if (allocated(array)) then
+            n = size(array, kind=FP_SIZE)
+            FP_REAL_COMM_SIZE_3D = FP_REAL_COMM_SIZE_3D + FP_RCOMMS_PER_BITS(n * storage_size(array))
+        end if
+    end function FP_REAL_COMM_SIZE_3D
+
     !> Calculate storage size for 1D integer(FP_SIZE) allocatable array
     pure integer(FP_SIZE) function FP_SIZE_COMM_SIZE_1D(array)
         integer(FP_SIZE), allocatable, intent(in) :: array(:)
@@ -18384,6 +18399,33 @@ pure subroutine FP_REAL_COMM_PACK_2D(array, buffer)
         end if
     end subroutine FP_REAL_COMM_PACK_2D
 
+    !> Pack 3D real(FP_REAL) allocatable array into communication buffer
+    pure subroutine FP_REAL_COMM_PACK_3D(array, buffer)
+        real(FP_REAL), allocatable, intent(in) :: array(:,:,:)
+        real(FP_COMM), intent(out) :: buffer(:)
+
+        integer(FP_SIZE) :: bnd(2, 3), ndoubles
+        integer(FP_SIZE), parameter :: header = 3
+
+        if (allocated(array)) then
+            bnd(1, 1) = lbound(array, 1, FP_SIZE)
+            bnd(2, 1) = ubound(array, 1, FP_SIZE)
+            bnd(1, 2) = lbound(array, 2, FP_SIZE)
+            bnd(2, 2) = ubound(array, 2, FP_SIZE)
+            bnd(1, 3) = lbound(array, 3, FP_SIZE)
+            bnd(2, 3) = ubound(array, 3, FP_SIZE)
+        else
+            bnd = FP_NOT_ALLOC
+        end if
+
+        buffer(1:header) = transfer(bnd, buffer(1:header), int(header))
+
+        if (all(bnd /= FP_NOT_ALLOC)) then
+            ndoubles = FP_RCOMMS_PER_BITS(size(array, kind=FP_SIZE) * storage_size(array))
+            buffer(header+1:header+ndoubles) = transfer(array, buffer(header+1:header+ndoubles), int(ndoubles))
+        end if
+    end subroutine FP_REAL_COMM_PACK_3D
+
     !> Pack 1D integer(FP_SIZE) allocatable array into communication buffer
     pure subroutine FP_SIZE_COMM_PACK_1D(array, buffer)
         integer(FP_SIZE), allocatable, intent(in) :: array(:)
@@ -18419,7 +18461,13 @@ pure subroutine FP_REAL_COMM_EXPAND_1D(array, buffer)
         if (all(bnd /= FP_NOT_ALLOC)) then
             allocate(array(bnd(1):bnd(2)))
             n = FP_RCOMMS_PER_BITS(size(array, kind=FP_SIZE) * storage_size(array))
+#if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
+            ! Intel: avoid transfer() — temporary overflows the stack for large arrays.
+            ! FP_REAL == FP_COMM (both c_double), so direct assignment is valid.
+            array(:) = buffer(header+1:header+n)
+#else
             array = transfer(buffer(header+1:header+n), array)
+#endif
         end if
     end subroutine FP_REAL_COMM_EXPAND_1D
 
@@ -18436,10 +18484,39 @@ pure subroutine FP_REAL_COMM_EXPAND_2D(array, buffer)
         if (all(bnd /= FP_NOT_ALLOC)) then
             allocate(array(bnd(1,1):bnd(2,1), bnd(1,2):bnd(2,2)))
             n = FP_RCOMMS_PER_BITS(size(array, kind=FP_SIZE) * storage_size(array))
+#if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
+            ! Intel: avoid transfer() — temporary overflows the stack for large arrays.
+            ! FP_REAL == FP_COMM (both c_double), so reshape buffer directly.
+            array(:,:) = reshape(buffer(header+1:header+n), shape(array))
+#else
             array = reshape(transfer(buffer(header+1:header+n), array, size(array)), shape(array))
+#endif
         end if
     end subroutine FP_REAL_COMM_EXPAND_2D
 
+    !> Expand communication buffer into 3D real(FP_REAL) allocatable array
+    pure subroutine FP_REAL_COMM_EXPAND_3D(array, buffer)
+        real(FP_REAL), allocatable, intent(out) :: array(:,:,:)
+        real(FP_COMM), intent(in) :: buffer(:)
+
+        integer(FP_SIZE) :: bnd(2, 3), n
+        integer(FP_SIZE), parameter :: header = 3
+
+        bnd = reshape(transfer(buffer(:header), bnd), shape(bnd))
+
+        if (all(bnd /= FP_NOT_ALLOC)) then
+            allocate(array(bnd(1,1):bnd(2,1), bnd(1,2):bnd(2,2), bnd(1,3):bnd(2,3)))
+            n = FP_RCOMMS_PER_BITS(size(array, kind=FP_SIZE) * storage_size(array))
+#if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
+            ! Intel: avoid transfer() — temporary overflows the stack for large arrays.
+            ! FP_REAL == FP_COMM (both c_double), so reshape buffer directly.
+            array(:,:,:) = reshape(buffer(header+1:header+n), shape(array))
+#else
+            array = reshape(transfer(buffer(header+1:header+n), array, size(array)), shape(array))
+#endif
+        end if
+    end subroutine FP_REAL_COMM_EXPAND_3D
+
     !> Expand communication buffer into 1D integer(FP_SIZE) allocatable array
     pure subroutine FP_SIZE_COMM_EXPAND_1D(array, buffer)
         integer(FP_SIZE), allocatable, intent(out) :: array(:)
@@ -18453,7 +18530,11 @@ pure subroutine FP_SIZE_COMM_EXPAND_1D(array, buffer)
         if (all(bnd /= FP_NOT_ALLOC)) then
             allocate(array(bnd(1):bnd(2)))
             ndoubles = FP_RCOMMS_PER_BITS(size(array, kind=FP_SIZE) * storage_size(array))
+#if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
+            array(:) = transfer(buffer(header+1:header+ndoubles), 0_FP_SIZE, size(array))
+#else
             array = transfer(buffer(header+1:header+ndoubles), array)
+#endif
         end if
     end subroutine FP_SIZE_COMM_EXPAND_1D