Skip to content

Case checking moved to Python! #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Nov 30, 2025
Merged

Case checking moved to Python! #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8fa7b73
validate
sbryngelson Nov 28, 2025
1d72c84
case validator!
sbryngelson Nov 28, 2025
201bec0
test
sbryngelson Nov 28, 2025
d4dc77b
linter
sbryngelson Nov 28, 2025
0516fa0
all good?
sbryngelson Nov 28, 2025
be9a614
minor fix
sbryngelson Nov 29, 2025
4c98690
fixups!
sbryngelson Nov 29, 2025
224a79b
fixups
sbryngelson Nov 29, 2025
bc7050c
lint
sbryngelson Nov 29, 2025
f3e62bf
linter update
sbryngelson Nov 29, 2025
79f64c6
fixup
sbryngelson Nov 29, 2025
26e1248
Merge branch 'master' into permissible-cases
sbryngelson Nov 29, 2025
43307e8
minor nitpick
sbryngelson Nov 29, 2025
9961e6e
Merge branch 'permissible-cases' of https://github.com/sbryngelson/MF…
sbryngelson Nov 29, 2025
10036ef
fix
sbryngelson Nov 29, 2025
48b100b
fix some small issues
sbryngelson Nov 29, 2025
0cb5202
more fixes
sbryngelson Nov 29, 2025
37565ae
fix broken check
sbryngelson Nov 29, 2025
abe7de4
Merge upstream/master: resolve conflict in sched.py
sbryngelson Nov 29, 2025
0f9725a
fix something that was probably wrong
sbryngelson Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/lint-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ jobs:
- uses: actions/checkout@v4

- name: MFC Python setup
uses: actions/setup-python@v5
with:
python-version: '3.14'

- name: Initialize MFC
run: ./mfc.sh init

- name: Lint the toolchain
Expand Down
370 changes: 0 additions & 370 deletions src/common/m_checker_common.fpp
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 0 additions & 126 deletions src/post_process/m_checker.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,150 +26,24 @@ contains
impure subroutine s_check_inputs

call s_check_inputs_output_format
call s_check_inputs_partial_domain
call s_check_inputs_partial_density
call s_check_inputs_velocity
call s_check_inputs_flux_limiter
call s_check_inputs_volume_fraction
call s_check_inputs_vorticity
call s_check_inputs_qm
call s_check_inputs_liutex
call s_check_inputs_schlieren
call s_check_inputs_surface_tension
call s_check_inputs_no_flow_variables

end subroutine s_check_inputs

!> Checks constraints on output format parameters
impure subroutine s_check_inputs_output_format
@:PROHIBIT(format /= 1 .and. format /= 2)
@:PROHIBIT(precision /= 1 .and. precision /= 2)
@:PROHIBIT(precision == 2 .and. wp == sp)
end subroutine s_check_inputs_output_format

!> Checks constraints on partial domain parameters
impure subroutine s_check_inputs_partial_domain
@:PROHIBIT(output_partial_domain .and. format == 1)
@:PROHIBIT(output_partial_domain .and. precision == 1)
@:PROHIBIT(output_partial_domain .and. any([flux_wrt, heat_ratio_wrt, pres_inf_wrt, c_wrt, schlieren_wrt, qm_wrt, liutex_wrt, ib, any(omega_wrt)]))
@:PROHIBIT(output_partial_domain .and. (f_is_default(x_output%beg) .or. f_is_default(x_output%end)))
@:PROHIBIT(output_partial_domain .and. n /= 0 .and. (f_is_default(y_output%beg) .or. f_is_default(y_output%end)))
@:PROHIBIT(output_partial_domain .and. p /= 0 .and. (f_is_default(z_output%beg) .or. f_is_default(z_output%end)))

#:for X in ['x', 'y', 'z']
@:PROHIBIT(${X}$_output%beg > ${X}$_output%end)
#:endfor
end subroutine s_check_inputs_partial_domain

!> Checks constraints on partial density parameters
impure subroutine s_check_inputs_partial_density
character(len=5) :: iStr
integer :: i

do i = 1, num_fluids
call s_int_to_str(i, iStr)
@:PROHIBIT(alpha_rho_wrt(i) .and. model_eqns == 1, "alpha_rho_wrt("//trim(iStr)//") is not supported for model_eqns = 1")
@:PROHIBIT(alpha_rho_wrt(i) .and. i > num_fluids, "Index of alpha_rho_wrt("//trim(iStr)//") exceeds the total number of fluids")
end do
end subroutine s_check_inputs_partial_density

!> Checks constraints on momentum parameters
impure subroutine s_check_inputs_momentum
@:PROHIBIT(n == 0 .and. mom_wrt(2))
@:PROHIBIT(p == 0 .and. mom_wrt(3))
end subroutine s_check_inputs_momentum

!> Checks constraints on velocity parameters
impure subroutine s_check_inputs_velocity
@:PROHIBIT(n == 0 .and. vel_wrt(2))
@:PROHIBIT(p == 0 .and. vel_wrt(3))
end subroutine s_check_inputs_velocity

!> Checks constraints on flux limiter parameters
impure subroutine s_check_inputs_flux_limiter
@:PROHIBIT(n == 0 .and. flux_wrt(2))
@:PROHIBIT(p == 0 .and. flux_wrt(3))
@:PROHIBIT(all(flux_lim /= (/dflt_int, 1, 2, 3, 4, 5, 6, 7/)), "flux_lim must be between 1 and 7")
end subroutine s_check_inputs_flux_limiter

!> Checks constraints on volume fraction parameters
impure subroutine s_check_inputs_volume_fraction
character(len=5) :: iStr
integer :: i

do i = 1, num_fluids
call s_int_to_str(i, iStr)
@:PROHIBIT(alpha_wrt(i) .and. model_eqns == 1, "alpha_wrt("//trim(iStr)//") is not supported for model_eqns = 1")
@:PROHIBIT(alpha_wrt(i) .and. i > num_fluids, "Index of alpha_wrt("//trim(iStr)//") exceeds the total number of fluids")
end do
end subroutine s_check_inputs_volume_fraction

!> Checks constraints on vorticity parameters
impure subroutine s_check_inputs_vorticity
@:PROHIBIT(n == 0 .and. any(omega_wrt))
@:PROHIBIT(p == 0 .and. (omega_wrt(1) .or. omega_wrt(2)))
@:PROHIBIT(any(omega_wrt) .and. fd_order == dflt_int, "fd_order must be set for omega_wrt")
end subroutine s_check_inputs_vorticity

!> Checks constraints on fft_wrt
impure subroutine s_check_inputs_fft
integer :: num_procs_y, num_procs_z

@:PROHIBIT(fft_wrt .and. (n == 0 .or. p == 0), "FFT WRT only in 3D")
@:PROHIBIT(fft_wrt .and. cyl_coord, "FFT WRT incompatible with cylindrical coordinates")
@:PROHIBIT(fft_wrt .and. (MOD(m_glb+1,2) == 1 .or. MOD(n_glb+1,2) == 1 .or. MOD(p_glb+1,2) == 1), "FFT WRT requires global dimensions divisible by 2")
@:PROHIBIT(fft_wrt .and. MOD(n_glb+1,n+1) /= 0, "FFT WRT requires n_glb to be divisible by num_procs_y")
@:PROHIBIT(fft_wrt .and. MOD(p_glb+1,p+1) /= 0, "FFT WRT requires p_glb to be divisible by num_procs_z")
num_procs_y = (n_glb + 1)/(n + 1)
num_procs_z = (p_glb + 1)/(p + 1)
@:PROHIBIT(fft_wrt .and. MOD(m_glb+1,num_procs_y) /= 0, "FFT WRT requires m_glb to be divisible by num_procs_y")
@:PROHIBIT(fft_wrt .and. MOD(n_glb+1,num_procs_z) /= 0, "FFT WRT requires n_glb to be divisible by num_procs_z")
@:PROHIBIT(fft_wrt .and. (bc_x%beg < -1 .or. bc_y%beg < -1 .or. bc_z%beg < -1 .or. bc_x%end < -1 .or. bc_y%end < -1 .or. bc_z%end < -1), "FFT WRT requires periodic BCs")
end subroutine s_check_inputs_fft

!> Checks constraints on Q-criterion parameters
impure subroutine s_check_inputs_qm
@:PROHIBIT(n == 0 .and. qm_wrt)
end subroutine s_check_inputs_qm

!> Checks constraints on liutex parameters
impure subroutine s_check_inputs_liutex
@:PROHIBIT(n == 0 .and. liutex_wrt)
end subroutine s_check_inputs_liutex

!> Checks constraints on numerical Schlieren parameters
!! (schlieren_wrt and schlieren_alpha)
impure subroutine s_check_inputs_schlieren
character(len=5) :: iStr
integer :: i

@:PROHIBIT(n == 0 .and. schlieren_wrt)
@:PROHIBIT(schlieren_wrt .and. fd_order == dflt_int, "fd_order must be set for schlieren_wrt")

do i = 1, num_fluids
call s_int_to_str(i, iStr)
@:PROHIBIT(.not. f_is_default(schlieren_alpha(i)) .and. schlieren_alpha(i) <= 0._wp, &
"schlieren_alpha("//trim(iStr)//") must be greater than zero")
@:PROHIBIT(.not. f_is_default(schlieren_alpha(i)) .and. i > num_fluids, &
"Index of schlieren_alpha("//trim(iStr)//") exceeds the total number of fluids")
@:PROHIBIT(.not. f_is_default(schlieren_alpha(i)) .and. (.not. schlieren_wrt), &
"schlieren_alpha("//trim(iStr)//") should be set only with schlieren_wrt enabled")
end do
end subroutine s_check_inputs_schlieren

!> Checks constraints on surface tension parameters (cf_wrt and sigma)
impure subroutine s_check_inputs_surface_tension
@:PROHIBIT(cf_wrt .and. .not. surface_tension, &
"cf_wrt can only be enabled if the surface coefficient is set")
end subroutine s_check_inputs_surface_tension

!> Checks constraints on the absence of flow variables
impure subroutine s_check_inputs_no_flow_variables
@:PROHIBIT(.not. any([ &
(/rho_wrt, E_wrt, pres_wrt, gamma_wrt, heat_ratio_wrt, pi_inf_wrt, &
pres_inf_wrt, cons_vars_wrt, prim_vars_wrt, c_wrt, schlieren_wrt/), &
alpha_rho_wrt, mom_wrt, vel_wrt, flux_wrt, alpha_wrt, omega_wrt]), &
"None of the flow variables have been selected for post-process. Exiting.")
end subroutine s_check_inputs_no_flow_variables

end module m_checker
Loading
Loading