-
Notifications
You must be signed in to change notification settings - Fork 138
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.
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
Finalized implementation of new lake shape options in the levelpool simulations #508
Open
BahramKhazaei-NOAA
wants to merge
12
commits into
NCAR:main
Choose a base branch
from
BahramKhazaei-NOAA:v5.2.0
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ro.namelist were modified accordingly.
…les from LAKEPARM file
… is not defined or defined 0
…in engineering tests
rcabell
added
the
domain change
Underlying domain files change to support this PR.
label
Sep 30, 2020
Marking this as draft, since it sounds like more is coming. |
rcabell
reviewed
Jun 16, 2021
@@ -8948,6 +8978,20 @@ subroutine read_route_lake_netcdf(route_lake_file, & | |||
call get_1d_netcdf_real(ncid, 'OrificeE', ORIFICEE, 'read_route_lake_netcdf', .TRUE.) | |||
call get_1d_netcdf_real(ncid, 'lat', lakelat, 'read_route_lake_netcdf', .TRUE.) | |||
call get_1d_netcdf_real(ncid, 'lon', lakelon, 'read_route_lake_netcdf', .TRUE.) | |||
|
|||
! read variables for lake_shape_option not equal to 0 (default Box shape) | |||
if(nlst(did)%lake_shape_option /= 0) then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably be lake_shape_option > 0
so that pass-through doesn't require these variables to be defined.
Changed if(nlst(did)%lake_shape_option /= 0) to if(nlst(did)%lake_shape_option >= 0) in Routing/module_HYDRO_io.F to make pass-through scheme work if new LAKEPARM variables are not provided (backward compatible with LAKEPARM v2.1 and before).
Changed >=0 to > 0
rcabell
force-pushed
the
master
branch
3 times, most recently
from
July 8, 2021 01:10
93ccb4d
to
385b797
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TYPE: bug fix
KEYWORDS: levelpool, lake_shape_option
SOURCE: Bahram Khazaei, NCAR
DESCRIPTION OF CHANGES:
Made changes to the code to make the levelpool simulations backward compatible. A default setting is defined for "lake_shape_option" so that it runs levelpool based on box (or vertical wall) shape if the values is not defined in the namelist file.
TESTS CONDUCTED: Different shape options were successfully tested with Croton and CONUS domains.
Checklist
Merging the PR depends on following checklist being completed. Add
X
between each of the squarebrackets if they are completed in the PR itself. If a bullet is not relevant to you, please comment
on why below the bullet.
Model tested with Croton and CONUS .
Any lake_shape_option rather than 0 requires new "LAKEPARM" and "hydro.namelist" files. Examples are below:
Working LAKPEARM file: /glade/work/bkhazaei/croton52/levelpool3_test/DOMAIN/LAKEPARM_croton_LP3_obs_depth_30m.nc
Working hydro.namelist file: /glade/work/bkhazaei/croton52/levelpool3_test/hydro.namelist
NEWS.md