Skip to content

Commit c35a6bf

Browse files
sbryngelsonclaude
sbryngelson
and
claude
committed
Format branch for ruff compatibility
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 5436a68 commit c35a6bf

16 files changed

Lines changed: 10696 additions & 10696 deletions

‎src/common/m_derived_types.fpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,14 @@ module m_derived_types
376376
real(wp) :: qv !< reference energy per unit mass for SGEOS, q (see Le Metayer (2004))
377377
real(wp) :: qvp !< reference entropy per unit mass for SGEOS, q' (see Le Metayer (2004))
378378
real(wp) :: G
379-
logical :: non_newtonian !< Non-Newtonian fluid flag
380-
real(wp) :: tau0 !< Yield stress (Herschel-Bulkley model)
381-
real(wp) :: K !< Consistency index (Herschel-Bulkley model)
382-
real(wp) :: nn !< Flow behavior index (Herschel-Bulkley model)
383-
real(wp) :: mu_max !< Maximum viscosity limit (shear)
384-
real(wp) :: mu_min !< Minimum viscosity limit (shear)
385-
real(wp) :: mu_bulk !< Bulk viscosity for non-Newtonian fluids
386-
real(wp) :: hb_m !< Papanastasiou regularization parameter
379+
logical :: non_newtonian !< Non-Newtonian fluid flag
380+
real(wp) :: tau0 !< Yield stress (Herschel-Bulkley model)
381+
real(wp) :: K !< Consistency index (Herschel-Bulkley model)
382+
real(wp) :: nn !< Flow behavior index (Herschel-Bulkley model)
383+
real(wp) :: mu_max !< Maximum viscosity limit (shear)
384+
real(wp) :: mu_min !< Minimum viscosity limit (shear)
385+
real(wp) :: mu_bulk !< Bulk viscosity for non-Newtonian fluids
386+
real(wp) :: hb_m !< Papanastasiou regularization parameter
387387
end type physical_parameters
388388
389389
!> Derived type annexing the physical parameters required for sub-grid bubble models

‎src/post_process/m_global_parameters.fpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -435,14 +435,14 @@ contains
435435
fluid_pp(i)%qv = 0._wp
436436
fluid_pp(i)%qvp = 0._wp
437437
fluid_pp(i)%G = dflt_real
438-
fluid_pp(i)%non_newtonian = .false.
439-
fluid_pp(i)%tau0 = 0._wp
440-
fluid_pp(i)%K = 0._wp
441-
fluid_pp(i)%nn = 1._wp
442-
fluid_pp(i)%mu_max = dflt_real
443-
fluid_pp(i)%mu_min = 0._wp
444-
fluid_pp(i)%mu_bulk = 0._wp
445-
fluid_pp(i)%hb_m = 1000._wp
438+
fluid_pp(i)%non_newtonian = .false.
439+
fluid_pp(i)%tau0 = 0._wp
440+
fluid_pp(i)%K = 0._wp
441+
fluid_pp(i)%nn = 1._wp
442+
fluid_pp(i)%mu_max = dflt_real
443+
fluid_pp(i)%mu_min = 0._wp
444+
fluid_pp(i)%mu_bulk = 0._wp
445+
fluid_pp(i)%hb_m = 1000._wp
446446
end do
447447

448448
! Subgrid bubble parameters

‎src/post_process/m_mpi_proxy.fpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ contains
130130
call MPI_BCAST(fluid_pp(i)%qv, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
131131
call MPI_BCAST(fluid_pp(i)%qvp, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
132132
call MPI_BCAST(fluid_pp(i)%G, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
133-
call MPI_BCAST(fluid_pp(i)%non_newtonian, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
134-
#:for VAR in ['tau0', 'K', 'nn', 'mu_max', 'mu_min', 'mu_bulk', 'hb_m']
135-
call MPI_BCAST(fluid_pp(i)%${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
136-
#:endfor
133+
call MPI_BCAST(fluid_pp(i)%non_newtonian, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
134+
#:for VAR in ['tau0', 'K', 'nn', 'mu_max', 'mu_min', 'mu_bulk', 'hb_m']
135+
call MPI_BCAST(fluid_pp(i)%${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
136+
#:endfor
137137
end do
138138

139139
! Subgrid bubble parameters

‎src/pre_process/m_global_parameters.fpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -598,14 +598,14 @@ contains
598598
fluid_pp(i)%qv = 0._wp
599599
fluid_pp(i)%qvp = 0._wp
600600
fluid_pp(i)%G = 0._wp
601-
fluid_pp(i)%non_newtonian = .false.
602-
fluid_pp(i)%tau0 = 0._wp
603-
fluid_pp(i)%K = 0._wp
604-
fluid_pp(i)%nn = 1._wp
605-
fluid_pp(i)%mu_max = dflt_real
606-
fluid_pp(i)%mu_min = 0._wp
607-
fluid_pp(i)%mu_bulk = 0._wp
608-
fluid_pp(i)%hb_m = 1000._wp
601+
fluid_pp(i)%non_newtonian = .false.
602+
fluid_pp(i)%tau0 = 0._wp
603+
fluid_pp(i)%K = 0._wp
604+
fluid_pp(i)%nn = 1._wp
605+
fluid_pp(i)%mu_max = dflt_real
606+
fluid_pp(i)%mu_min = 0._wp
607+
fluid_pp(i)%mu_bulk = 0._wp
608+
fluid_pp(i)%hb_m = 1000._wp
609609
end do
610610

611611
Bx0 = dflt_real

‎src/pre_process/m_mpi_proxy.fpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ contains
149149
call MPI_BCAST(fluid_pp(i)%${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
150150
#:endfor
151151

152-
call MPI_BCAST(fluid_pp(i)%non_newtonian, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
153-
#:for VAR in ['tau0', 'K', 'nn', 'mu_max', 'mu_min', 'mu_bulk', 'hb_m']
154-
call MPI_BCAST(fluid_pp(i)%${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
155-
#:endfor
156-
152+
call MPI_BCAST(fluid_pp(i)%non_newtonian, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
153+
#:for VAR in ['tau0', 'K', 'nn', 'mu_max', 'mu_min', 'mu_bulk', 'hb_m']
154+
call MPI_BCAST(fluid_pp(i)%${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
155+
#:endfor
156+
157157
call MPI_BCAST(simplex_params%perturb_dens(i), 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
158158
call MPI_BCAST(simplex_params%perturb_dens_freq(i), 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
159159
call MPI_BCAST(simplex_params%perturb_dens_scale(i), 1, mpi_p, 0, MPI_COMM_WORLD, ierr)

‎src/simulation/m_checker.fpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ contains
3939
end if
4040

4141
call s_check_inputs_time_stepping
42-
call s_check_inputs_non_newtonian
42+
call s_check_inputs_non_newtonian
4343

4444
@:PROHIBIT(ib_state_wrt .and. .not. ib, "ib_state_wrt requires ib to be enabled")
4545

@@ -94,30 +94,30 @@ contains
9494
#endif
9595
end subroutine s_check_inputs_nvidia_uvm
9696

97-
!> Checks constraints on non-Newtonian fluid parameters
98-
impure subroutine s_check_inputs_non_newtonian
99-
integer :: i
100-
101-
do i = 1, num_fluids
102-
if (fluid_pp(i)%non_newtonian) then
103-
@:PROHIBIT(.not. viscous, &
104-
"Non-Newtonian fluid requires viscosity to be enabled")
105-
@:PROHIBIT(fluid_pp(i)%K <= 0._wp, &
106-
"Non-Newtonian fluid consistency index K must be > 0")
107-
@:PROHIBIT(fluid_pp(i)%nn <= 0._wp, &
108-
"Non-Newtonian fluid flow behavior index nn must be > 0")
109-
@:PROHIBIT(fluid_pp(i)%tau0 < 0._wp, &
110-
"Non-Newtonian fluid yield stress tau0 must be >= 0")
111-
@:PROHIBIT(fluid_pp(i)%mu_min < 0._wp, &
112-
"Non-Newtonian fluid mu_min must be >= 0")
113-
@:PROHIBIT(fluid_pp(i)%mu_max < dflt_real .and. &
114-
fluid_pp(i)%mu_max <= fluid_pp(i)%mu_min, &
115-
"Non-Newtonian fluid mu_max must be > mu_min when set")
116-
@:PROHIBIT(fluid_pp(i)%hb_m <= 0._wp, &
117-
"Non-Newtonian Papanastasiou parameter hb_m must be > 0")
118-
end if
119-
end do
120-
121-
end subroutine s_check_inputs_non_newtonian
122-
97+
!> Checks constraints on non-Newtonian fluid parameters
98+
impure subroutine s_check_inputs_non_newtonian
99+
integer :: i
100+
101+
do i = 1, num_fluids
102+
if (fluid_pp(i)%non_newtonian) then
103+
@:PROHIBIT(.not. viscous, &
104+
"Non-Newtonian fluid requires viscosity to be enabled")
105+
@:PROHIBIT(fluid_pp(i)%K <= 0._wp, &
106+
"Non-Newtonian fluid consistency index K must be > 0")
107+
@:PROHIBIT(fluid_pp(i)%nn <= 0._wp, &
108+
"Non-Newtonian fluid flow behavior index nn must be > 0")
109+
@:PROHIBIT(fluid_pp(i)%tau0 < 0._wp, &
110+
"Non-Newtonian fluid yield stress tau0 must be >= 0")
111+
@:PROHIBIT(fluid_pp(i)%mu_min < 0._wp, &
112+
"Non-Newtonian fluid mu_min must be >= 0")
113+
@:PROHIBIT(fluid_pp(i)%mu_max < dflt_real .and. &
114+
fluid_pp(i)%mu_max <= fluid_pp(i)%mu_min, &
115+
"Non-Newtonian fluid mu_max must be > mu_min when set")
116+
@:PROHIBIT(fluid_pp(i)%hb_m <= 0._wp, &
117+
"Non-Newtonian Papanastasiou parameter hb_m must be > 0")
118+
end if
119+
end do
120+
121+
end subroutine s_check_inputs_non_newtonian
122+
123123
end module m_checker

0 commit comments

Comments
 (0)