Skip to content

Commit 9f5c11d

Browse files
Swapped out the mpi abort statments for prohibits
1 parent f1526f8 commit 9f5c11d

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/pre_process/m_check_patches.fpp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@ contains
5858
elseif (patch_icpp(i)%geometry == 5) then
5959
call s_check_ellipse_patch_geometry(i)
6060
elseif (patch_icpp(i)%geometry == 6) then
61-
call s_mpi_abort('geometry 6 (formerly "Vortex")'// &
62-
'is no longer supported for patch '//trim(iStr)// &
63-
'. Exiting.')
61+
call s_prohibit_abort("Invalid patch geometry number", "patch_icpp("//trim(iStr)//")%geometry "// &
62+
"is deprecated")
6463
elseif (patch_icpp(i)%geometry == 7) then
65-
call s_mpi_abort('geometry 7 (formerly "2D Hardcoded")'// &
66-
'is no longer supported for patch '//trim(iStr)// &
67-
'. Exiting.')
64+
call s_prohibit_abort("Invalid patch geometry number", "patch_icpp("//trim(iStr)//")%geometry "// &
65+
"is deprecated")
6866
elseif (patch_icpp(i)%geometry == 8) then
6967
call s_check_sphere_patch_geometry(i)
7068
elseif (patch_icpp(i)%geometry == 9) then
@@ -76,15 +74,13 @@ contains
7674
elseif (patch_icpp(i)%geometry == 12) then
7775
call s_check_ellipsoid_patch_geometry(i)
7876
elseif (patch_icpp(i)%geometry == 13) then
79-
call s_mpi_abort('geometry 13 (formerly "3D Hardcoded")'// &
80-
'is no longer supported for patch '//trim(iStr)// &
81-
'. Exiting.')
77+
call s_prohibit_abort("Invalid patch geometry number", "patch_icpp("//trim(iStr)//")%geometry "// &
78+
"is deprecated")
8279
elseif (patch_icpp(i)%geometry == 14) then
8380
call s_check_spherical_harmonic_patch_geometry(i)
8481
elseif (patch_icpp(i)%geometry == 15) then
85-
call s_mpi_abort('geometry 15 (formerly "1D Hardcoded")'// &
86-
'is no longer supported for patch '//trim(iStr)// &
87-
'. Exiting.')
82+
call s_prohibit_abort("Invalid patch geometry number", "patch_icpp("//trim(iStr)//")%geometry "// &
83+
"is deprecated")
8884
elseif (patch_icpp(i)%geometry == 16) then
8985
print *, '1d pressure sinusoid'
9086
elseif (patch_icpp(i)%geometry == 17) then

0 commit comments

Comments
 (0)