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

Correctly handle lake_option=3 / no DA case #808

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Correctly handle lake_option=3 / no DA case #808

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: 7 additions & 3 deletions src/OrchestratorLayer/config.F90
View file
Open in desktop
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
Loading