Added support for lake, blowing snow, and flexible lai/fcanopy/albedo to grid_params.py #40
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
1. optional extra columns in soil_param file 2. optional extra fcanopy in veg_lib file 3. optional blowing_snow params in veg_param file 4. optional lai, fcanopy, albedo in veg_param file 5. optional lake_param file 6. reading of veg_lib comment field 7. conditional creation of bare soil class, only if not already present
| # option values | ||
| FROM_DEFAULT = 0 | ||
| FROM_VEGLIB = 1 | ||
| FROM_VEGPARAM = 2 |
There was a problem hiding this comment.
In Python string comparison is pretty trivial (if x == 'FROM_DEFAULT'). I'd rather just compare the strings rather than alias to ints.
| veg_dict['fcanopy'] = fcan[:cell, :, :] | ||
|
|
||
| if vegparam_albedo and alb_src == FROM_VEGPARAM: | ||
| veg_dict['albedo'] = albedo[:cell, :, :] |
There was a problem hiding this comment.
see earlier comments on string comparison
|
Lot's of little comments @tbohn - Thanks for pulling this together. Give me a ping once you've had a chance to go through them. |
|
OK, pushed and built. |
|
Hold on a sec, I accidentally committed a "print" statement that I had inserted for debugging purposes. |
| lines[row] = lines[row].strip() | ||
| line = lines[row].strip('\n').split(' ') | ||
| lai[cell, vind, :] = np.array(line).astype(float) | ||
| print(line) |
There was a problem hiding this comment.
remove debugging print statement
|
Okay, let me know when its ready for review/merge. |
|
OK, this is ready for merge. I perused the Landscape code quality report for the first time - very interesting. |
jhamman
pushed a commit
that referenced
this pull request
Feb 19, 2016
…w_veghist Added support for lake, blowing snow, and flexible lai/fcanopy/albedo to grid_params.py
This was referenced Feb 20, 2016
This was referenced Mar 21, 2016
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.
Modified grid_params.py to account for:
This closes #38.
This does not completely address issues #29, #31, and #34. It addresses converting these from ascii to netcdf, but not netcdf to ascii.