From ea7d11132363919f1fc15a5909575f7b40aa7580 Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Thu, 20 Aug 2026 22:34:30 -0700 Subject: [PATCH 1/4] fix(scalar_3D_to_faces): rm redundant label --- src/formal/scalar_3D_s.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/formal/scalar_3D_s.F90 b/src/formal/scalar_3D_s.F90 index 7835ffb..fc45e6f 100644 --- a/src/formal/scalar_3D_s.F90 +++ b/src/formal/scalar_3D_s.F90 @@ -305,10 +305,10 @@ allocate(scalars(self%cells_(x_dir)+2, self%cells_(y_dir)+2, self%cells_(z_dir)+1)) - interpolate_centers_to_y_faces: & + interpolate_centers_to_z_faces: & do concurrent(integer :: i = 1:size(self%points_(1,1,1,1)%values_,x_dir), j = 1:size(self%points_(1,1,1,1)%values_,z_dir)) scalars(i,j,:) = interpolator(z_dir)%face_values(self%points_(1,1,1,1)%values_(i,j,:)) - end do interpolate_centers_to_y_faces + end do interpolate_centers_to_z_faces case default error stop "scalar_3D_to_faces in scalar_3D_s: invalid direction" From 3e1a06f1c467a1f4c5fcad8b37412aa320c3a071 Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Thu, 20 Aug 2026 23:01:02 -0700 Subject: [PATCH 2/4] chore: rm unused variables --- example/2D-advection-diffusion.F90 | 1 - example/2D-sink.F90 | 5 ++--- src/formal/divergence_2D_s.F90 | 1 - src/formal/divergence_3D_s.F90 | 1 - src/formal/scalar_2D_s.F90 | 3 --- src/formal/scalar_3D_s.F90 | 4 ---- src/formal/vector_2D_s.F90 | 5 ++--- src/formal/vector_3D_s.F90 | 1 - 8 files changed, 4 insertions(+), 17 deletions(-) diff --git a/example/2D-advection-diffusion.F90 b/example/2D-advection-diffusion.F90 index d128eb1..6a3581d 100644 --- a/example/2D-advection-diffusion.F90 +++ b/example/2D-advection-diffusion.F90 @@ -33,7 +33,6 @@ pure function taylor_green_velocity(x,y) result(velocity) program advection_diffusion_2D !! Solve the advection-diffusion equation for a passive scalar moving through a !! static velocity field define by 2D Taylor-Green vortices. - use julienne_m, only : file_t use fields_m, only : scalar_field, taylor_green_velocity use formal_m, only : scalar_2D_t, vector_2D_t, scalar_2D_initializer_i, vector_2D_initializer_i implicit none diff --git a/example/2D-sink.F90 b/example/2D-sink.F90 index e479733..51a66fa 100644 --- a/example/2D-sink.F90 +++ b/example/2D-sink.F90 @@ -14,7 +14,7 @@ module sink_2D_functions_m pure function velocity(x,y) result(v) double precision, intent(in) :: x(:), y(:) - double precision v(size(x),size(y),space_dimension), theta + double precision v(size(x),size(y),space_dimension) double precision, parameter :: Q = 1D0 do concurrent(integer :: i=1:size(x), j=1:size(y)) associate(r => sqrt(x(i)**2 + y(j)**2)) @@ -34,8 +34,7 @@ pure function divergence(x,y) result(div_v) end module program sink_2D - use julienne_m, only : file_t - use sink_2D_functions_m, only : velocity, divergence, pi + use sink_2D_functions_m, only : velocity, divergence use formal_m, only : vector_2D_t, divergence_2D_t, divergence_2D_initializer_i, vector_2D_initializer_i implicit none diff --git a/src/formal/divergence_2D_s.F90 b/src/formal/divergence_2D_s.F90 index e54a77f..ee9abe0 100644 --- a/src/formal/divergence_2D_s.F90 +++ b/src/formal/divergence_2D_s.F90 @@ -127,7 +127,6 @@ module procedure divergence_2D_to_file type(string_t), allocatable :: lines(:) integer i, j, l - double precision, allocatable :: x(:), y(:) call_julienne_assert(self%consistent()) diff --git a/src/formal/divergence_3D_s.F90 b/src/formal/divergence_3D_s.F90 index c8c489e..24d57fc 100644 --- a/src/formal/divergence_3D_s.F90 +++ b/src/formal/divergence_3D_s.F90 @@ -132,7 +132,6 @@ module procedure divergence_3D_to_file type(string_t), allocatable :: lines(:) integer i, j, k, l - double precision, allocatable :: x(:), y(:) call_julienne_assert(self%consistent()) diff --git a/src/formal/scalar_2D_s.F90 b/src/formal/scalar_2D_s.F90 index 84ce5d0..d23227e 100644 --- a/src/formal/scalar_2D_s.F90 +++ b/src/formal/scalar_2D_s.F90 @@ -151,8 +151,6 @@ module procedure scalar_2D_gradient - integer c, i, j - call_julienne_assert(self%consistent()) gradient_2D%x_min_ = self%x_min_ @@ -221,7 +219,6 @@ module procedure scalar_2D_to_file type(string_t), allocatable :: lines(:) integer i, j, l, m, n, p, q - double precision, allocatable :: x(:), y(:) call_julienne_assert(self%consistent()) diff --git a/src/formal/scalar_3D_s.F90 b/src/formal/scalar_3D_s.F90 index fc45e6f..33aa8db 100644 --- a/src/formal/scalar_3D_s.F90 +++ b/src/formal/scalar_3D_s.F90 @@ -152,8 +152,6 @@ module procedure scalar_3D_gradient - integer c, i, j - call_julienne_assert(self%consistent()) gradient_3D%x_min_ = self%x_min_ @@ -184,7 +182,6 @@ gradient_3D%points_(z_dir,1,1,1)%values_(i,j,:) = self%gradient_operator_1D_(z_dir) .x. self%points_(1,1,1,1)%values_(i,j,:) end do gradient_z_component - associate(dx => (self%x_max_ - self%x_min_)/self%cells_) gradient_3D%divergence_operator_1D_ = divergence_operator_1D_t(self%order_, dx, self%cells_) @@ -235,7 +232,6 @@ module procedure scalar_3D_to_file type(string_t), allocatable :: lines(:) integer i, j, k, l, m, n, p, q - double precision, allocatable :: x(:), y(:) call_julienne_assert(self%consistent()) diff --git a/src/formal/vector_2D_s.F90 b/src/formal/vector_2D_s.F90 index b1e5101..81fe2fd 100644 --- a/src/formal/vector_2D_s.F90 +++ b/src/formal/vector_2D_s.F90 @@ -16,8 +16,8 @@ ,operator(.isAtLeast.) & ,operator(.within.) & ,string_t - use tensors_1D_m, only : cell_centers_extended_1D, faces_1D, vector_1D_t - use interpolator_1D_m, only : centers_to_faces_1D_t, faces_to_centers_1D_t + use tensors_1D_m, only : cell_centers_extended_1D, faces_1D + use interpolator_1D_m, only : faces_to_centers_1D_t implicit none @@ -235,7 +235,6 @@ pure function description(coordinate, component) result(point_cloud) module procedure vector_2D_to_file type(string_t), allocatable :: lines(:) integer i, j, l - double precision, allocatable :: x(:), y(:) call_julienne_assert(self%consistent()) diff --git a/src/formal/vector_3D_s.F90 b/src/formal/vector_3D_s.F90 index 3f47f77..b590207 100644 --- a/src/formal/vector_3D_s.F90 +++ b/src/formal/vector_3D_s.F90 @@ -255,7 +255,6 @@ pure function description(coordinate, component) result(point_cloud) module procedure vector_3D_to_file type(string_t), allocatable :: lines(:) integer i, j, k, l - double precision, allocatable :: x(:), y(:) call_julienne_assert(self%consistent()) From 02a38515fb595af763f3e2afd033cf00ba1cce79 Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Thu, 20 Aug 2026 23:16:52 -0700 Subject: [PATCH 3/4] chore(example): tighten variable scope --- example/print-assembled-1D-operators.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/example/print-assembled-1D-operators.F90 b/example/print-assembled-1D-operators.F90 index 29b1831..9126269 100644 --- a/example/print-assembled-1D-operators.F90 +++ b/example/print-assembled-1D-operators.F90 @@ -11,7 +11,6 @@ program print_assembled_1D_operators implicit none type(command_line_t) command_line - integer row command_line_settings: & associate( & @@ -47,6 +46,7 @@ program print_assembled_1D_operators subroutine print_gradient_operator(k, dx, m) integer, intent(in) :: k, m double precision, intent(in) :: dx + integer row print *, new_line(""), "Gradient operator: order = ", k, " | cells = ", m, " | dx = ", dx @@ -65,6 +65,7 @@ subroutine print_gradient_operator(k, dx, m) subroutine print_divergence_operator(k, dx, m) integer, intent(in) :: k, m double precision, intent(in) :: dx + integer row print *, new_line(""), "Divergence operator: order = ", k, " | cells = ", m, " | dx = ", dx From 64a1ffd649d152db761d930fb129342621d0f45e Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Thu, 20 Aug 2026 23:19:42 -0700 Subject: [PATCH 4/4] chore: rm unused entities --- example/2D-stagnation-point.F90 | 1 - src/formal/scalar_1D_s.F90 | 4 +--- src/formal/tensor_2D_s.F90 | 3 +-- src/formal/tensor_3D_s.F90 | 3 +-- src/formal/tensors_1D_m.F90 | 1 - src/formal/vector_3D_s.F90 | 4 ++-- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/example/2D-stagnation-point.F90 b/example/2D-stagnation-point.F90 index 6560678..d9c5836 100644 --- a/example/2D-stagnation-point.F90 +++ b/example/2D-stagnation-point.F90 @@ -27,7 +27,6 @@ pure function potential_gradient(x,y) result(grad_phi) end module program stagnation_point_2D - use julienne_m, only : file_t use velocity_potential_m, only : potential, potential_gradient use formal_m, only : scalar_2D_t, vector_2D_t, scalar_2D_initializer_i, vector_2D_initializer_i implicit none diff --git a/src/formal/scalar_1D_s.F90 b/src/formal/scalar_1D_s.F90 index 8b0f6ae..1d68f60 100644 --- a/src/formal/scalar_1D_s.F90 +++ b/src/formal/scalar_1D_s.F90 @@ -6,7 +6,6 @@ submodule(tensors_1D_m) scalar_1D_s use julienne_m, only : & call_julienne_assert_ & - ,julienne_assert & ,operator(//) & ,operator(.all.) & ,operator(.approximates.) & @@ -14,8 +13,7 @@ ,operator(.csv.) & ,operator(.isAtLeast.) & ,operator(.greaterThan.) & - ,operator(.within.) & - ,string_t + ,operator(.within.) use interpolator_1D_m, only : faces_to_centers_1d_t implicit none diff --git a/src/formal/tensor_2D_s.F90 b/src/formal/tensor_2D_s.F90 index 2404a9e..b55d9c6 100644 --- a/src/formal/tensor_2D_s.F90 +++ b/src/formal/tensor_2D_s.F90 @@ -14,8 +14,7 @@ ,operator(.isAtLeast.) & ,operator(.isAtMost.) & ,operator(.greaterThan.) & - ,operator(.within.) & - ,string_t + ,operator(.within.) implicit none contains diff --git a/src/formal/tensor_3D_s.F90 b/src/formal/tensor_3D_s.F90 index f7e6253..82e1a57 100644 --- a/src/formal/tensor_3D_s.F90 +++ b/src/formal/tensor_3D_s.F90 @@ -13,8 +13,7 @@ ,operator(.isAtLeast.) & ,operator(.isAtMost.) & ,operator(.greaterThan.) & - ,operator(.within.) & - ,string_t + ,operator(.within.) implicit none contains diff --git a/src/formal/tensors_1D_m.F90 b/src/formal/tensors_1D_m.F90 index e7fd6aa..471d1f6 100644 --- a/src/formal/tensors_1D_m.F90 +++ b/src/formal/tensors_1D_m.F90 @@ -548,7 +548,6 @@ pure function cell_centers_extended_1D(x_min, x_max, cells) result(x) double precision, intent(in) :: x_min, x_max integer, intent(in) :: cells double precision, allocatable:: x(:) - integer cell x = [x_min, cell_centers_1D(x_min, x_max, cells), x_max] end function diff --git a/src/formal/vector_3D_s.F90 b/src/formal/vector_3D_s.F90 index b590207..c0c4dc0 100644 --- a/src/formal/vector_3D_s.F90 +++ b/src/formal/vector_3D_s.F90 @@ -14,9 +14,9 @@ ,operator(.greaterThan.) & ,operator(.isAtLeast.) & ,string_t - use tensors_1D_m, only : cell_centers_extended_1D, faces_1D, vector_1D_t + use tensors_1D_m, only : cell_centers_extended_1D, faces_1D use tensors_2D_m, only : x_dir, y_dir - use interpolator_1D_m, only : centers_to_faces_1D_t, faces_to_centers_1D_t + use interpolator_1D_m, only : faces_to_centers_1D_t implicit none