Skip to content
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

Jump to bottom

Fix/error on missing file #1601

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Fix/error on missing file #1601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7fc72d
Inquire about the file and stop if the file is not there.
timfelle Nov 13, 2024
c4cdd18
remove unused variables and formatting
timfelle Nov 13, 2024
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
40 changes: 22 additions & 18 deletions src/case.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,17 @@ subroutine case_init_from_file(this, case_file)
character(len=*), intent(in) :: case_file
integer :: ierr, integer_val
character(len=:), allocatable :: json_buffer
logical :: exist

! Check if the file exists
inquire(file = trim(case_file), exist = exist)
if (.not. exist) then
call neko_error('The case file '//trim(case_file)//' does not exist.')
end if

call neko_log%section('Case')
call neko_log%message('Reading case file ' // trim(case_file), &
NEKO_LOG_QUIET)
NEKO_LOG_QUIET)

if (pe_rank .eq. 0) then
call this%params%load_file(filename = trim(case_file))
Expand Down Expand Up @@ -138,8 +145,6 @@ subroutine case_init_common(this)
integer :: integer_val
real(kind=rp) :: real_val
character(len = :), allocatable :: string_val
real(kind=rp) :: stats_start_time, stats_output_val
integer :: stats_sampling_interval
integer :: output_dir_len
integer :: precision

Expand All @@ -150,7 +155,7 @@ subroutine case_init_common(this)
'no mesh')
if (trim(string_val) .eq. 'no mesh') then
call neko_error('The mesh_file keyword could not be found in the .' // &
'case file. Often caused by incorrectly formatted json.')
'case file. Often caused by incorrectly formatted json.')
end if
msh_file = file_t(string_val)

Expand All @@ -160,7 +165,7 @@ subroutine case_init_common(this)
! Load Balancing
!
call json_get_or_default(this%params, 'case.load_balancing', logical_val,&
.false.)
.false.)

if (pe_size .gt. 1 .and. logical_val) then
call neko_log%section('Load Balancing')
Expand Down Expand Up @@ -214,7 +219,7 @@ subroutine case_init_common(this)
this%fluid%chkp%dtlag => this%dtlag
call this%fluid%init(this%msh, lx, this%params, this%usr, this%ext_bdf)
select type (f => this%fluid)
type is (fluid_pnpn_t)
type is (fluid_pnpn_t)
f%chkp%abx1 => f%abx1
f%chkp%abx2 => f%abx2
f%chkp%aby1 => f%aby1
Expand All @@ -235,7 +240,7 @@ subroutine case_init_common(this)
! @todo no scalar factory for now, probably not needed
if (this%params%valid_path('case.scalar')) then
call json_get_or_default(this%params, 'case.scalar.enabled', scalar,&
.true.)
.true.)
end if

if (scalar) then
Expand All @@ -258,7 +263,7 @@ subroutine case_init_common(this)
!
if (this%params%valid_path('case.fluid.inflow_condition')) then
call json_get(this%params, 'case.fluid.inflow_condition.type',&
string_val)
string_val)
if (trim(string_val) .eq. 'user') then
call this%fluid%set_usr_inflow(this%usr%fluid_user_if)
end if
Expand All @@ -273,8 +278,7 @@ subroutine case_init_common(this)
! Setup initial conditions
!
call json_get(this%params, 'case.fluid.initial_condition.type',&
string_val)

string_val)

call neko_log%section("Fluid initial condition ")

Expand All @@ -300,11 +304,11 @@ subroutine case_init_common(this)

if (trim(string_val) .ne. 'user') then
call set_scalar_ic(this%scalar%s, &
this%scalar%c_Xh, this%scalar%gs_Xh, string_val, this%params)
this%scalar%c_Xh, this%scalar%gs_Xh, string_val, this%params)
else
call set_scalar_ic(this%scalar%s, &
this%scalar%c_Xh, this%scalar%gs_Xh, this%usr%scalar_user_ic, &
this%params)
this%scalar%c_Xh, this%scalar%gs_Xh, this%usr%scalar_user_ic, &
this%params)
end if

call neko_log%end_section()
Expand All @@ -313,7 +317,7 @@ subroutine case_init_common(this)

! Add initial conditions to BDF scheme (if present)
select type (f => this%fluid)
type is (fluid_pnpn_t)
type is (fluid_pnpn_t)
call f%ulag%set(f%u)
call f%vlag%set(f%v)
call f%wlag%set(f%w)
Expand All @@ -333,7 +337,7 @@ subroutine case_init_common(this)
! Get and process output directory
!
call json_get_or_default(this%params, 'case.output_directory',&
this%output_directory, '')
this%output_directory, '')

output_dir_len = len(trim(this%output_directory))
if (output_dir_len .gt. 0) then
Expand All @@ -349,7 +353,7 @@ subroutine case_init_common(this)
! Save boundary markings for fluid (if requested)
!
call json_get_or_default(this%params, 'case.output_boundary',&
logical_val, .false.)
logical_val, .false.)
if (logical_val) then
bdry_file = file_t(trim(this%output_directory)//'bdry.fld')
call bdry_file%write(this%fluid%bdry)
Expand All @@ -359,7 +363,7 @@ subroutine case_init_common(this)
! Save mesh partitions (if requested)
!
call json_get_or_default(this%params, 'case.output_partitions',&
logical_val, .false.)
logical_val, .false.)
if (logical_val) then
call mesh_field_init(msh_part, this%msh, 'MPI_Rank')
msh_part%data = pe_rank
Expand Down Expand Up @@ -413,7 +417,7 @@ subroutine case_init_common(this)
! Save checkpoints (if nothing specified, default to saving at end of sim)
!
call json_get_or_default(this%params, 'case.output_checkpoints',&
logical_val, .true.)
logical_val, .true.)
if (logical_val) then
call json_get_or_default(this%params, 'case.checkpoint_format', &
string_val, "chkp")
Expand Down
Loading