Skip to content

Commit

Permalink
Correctly handle lake_option=3 / no DA case
Browse files Browse the repository at this point in the history
  • Loading branch information
rcabell committed Jan 24, 2025
1 parent d0ebe6d commit dc7ea21
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/OrchestratorLayer/config.F90
Original file line number Diff line number Diff line change
Expand Up @@ -761,9 +761,13 @@ subroutine init_namelist_rt_field(did)
nlst(did)%SOLVEG_INITSWC = SOLVEG_INITSWC
nlst(did)%reservoir_obs_dir = "testDirectory"

if ((lake_option == 3) .and. (reservoir_persistence_usgs .or. reservoir_persistence_usace .or. reservoir_rfc_forecasts)) then
reservoir_type_specified = .TRUE.
lake_option = 1
if (lake_option == 3) then
if (reservoir_persistence_usgs .or. reservoir_persistence_usace .or. reservoir_rfc_forecasts) then
reservoir_type_specified = .TRUE.
else
print *, "WARNING: lake_option = 3 (Reservoir DA), but no specific DA option was enabled. Setting lake_option to 1."
end if
lake_option = 1 ! set to 1 either way
end if

if (lake_option == -99) then
Expand Down

0 comments on commit dc7ea21

Please sign in to comment.