Skip to content

fix(timeseries): ensure METHOD/METHODS specified in ATTRIBUTES block #993

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
christianlangevin merged 1 commit into from
Jul 21, 2022
Merged

fix(timeseries): ensure METHOD/METHODS specified in ATTRIBUTES block #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions doc/ReleaseNotes/ReleaseNotes.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@ \section{Changes Introduced in this Release}
\begin{itemize}
\item Corrected programming error in XT3D functionality that could occur when running coupled flow models or transport models. The XT3D code would result in a memory access error when a child model with a much larger level of refinement was coupled to a coarser parent model. The XT3D code was generalized to handle this situation.
\item Corrected a programming error in which the final message would be written twice to the screen and twice to mfsim.lst when the simulation terminated prematurely.
% \item xxx
\item Terminate with error if METHOD or METHODS not specified in time series input files. Prior to this change, the program would continue without an interpolated value for one or more time series records.
\end{itemize}

%\underline{INTERNAL FLOW PACKAGES}
%\begin{itemize}
% \item xxx
\underline{INTERNAL FLOW PACKAGES}
\begin{itemize}
\item Corrected programming error in the Time-Variable Hydraulic Conductivity (TVK) Package in which the vertical hydraulic conductivity was not reset properly if the K33OVERK option was invoked in the Node Property Flow (NPF) Package.
% \item xxx
% \item xxx
%\end{itemize}
\end{itemize}

\underline{STRESS PACKAGES}
\begin{itemize}
Expand Down
11 changes: 11 additions & 0 deletions src/Utilities/TimeSeries/TimeSeries.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,7 @@ subroutine Initializetsfile(this, filename, iout, autoDeallocate)
integer(I4B) :: ierr, inunit
logical :: autoDeallocateLocal = .true.
logical :: continueread, found, endOfBlock
logical :: methodWasSet
real(DP) :: sfaclocal
character(len=40) :: keyword, keyvalue
character(len=:), allocatable :: line
Expand All @@ -1252,6 +1253,7 @@ subroutine Initializetsfile(this, filename, iout, autoDeallocate)
! -- Initialize some variables
if (present(autoDeallocate)) autoDeallocateLocal = autoDeallocate
iMethod = UNDEFINED
methodWasSet = .false.
!
! -- Assign members
this%iout = iout
Expand Down Expand Up @@ -1318,6 +1320,7 @@ subroutine Initializetsfile(this, filename, iout, autoDeallocate)
autoDeallocateLocal)
end do
case ('METHOD')
methodWasSet = .true.
if (this%nTimeSeries == 0) then
errmsg = 'Error: NAME attribute not provided before METHOD in file: ' &
//trim(filename)
Expand All @@ -1339,6 +1342,7 @@ subroutine Initializetsfile(this, filename, iout, autoDeallocate)
this%timeSeries(j)%iMethod = iMethod
end do
case ('METHODS')
methodWasSet = .true.
if (this%nTimeSeries == 0) then
errmsg = 'Error: NAME attribute not provided before METHODS in file: ' &
//trim(filename)
Expand Down Expand Up @@ -1417,6 +1421,13 @@ subroutine Initializetsfile(this, filename, iout, autoDeallocate)
call store_error(errmsg)
end if
!
! -- Ensure method was set
if (.not. methodWasSet) then
errmsg = 'Interpolation method was not set. METHOD or METHODS &
&must be specified in the ATTRIBUTES block for this time series file.'
call store_error(errmsg)
end if
!
! -- Clean up and return
if (allocated(words)) deallocate (words)
!
Expand Down