Feature VegArrays #136
Merged
Feature VegArrays #136
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
- start addressing #135 - all complete except those defined in SW_VegProd.h
- address #135 - convert vegetation variables defined in SW_VegProd.h
- 'key2veg' contains string representations of vegetation types --> use for console message output
- address #135 - convert local vegetation variables defined in SW_Flow.c and SW_Site.c - use pre-defined loop 'ForEachVegType' whenever possible - define loop 'ForEachVegTypeBottomUp' for use by, e.g., hydraulic redistribution - SW_Flow_lib: collapsed all (identical) functions * 'XXX_intercepted_water' into 'veg_intercepted_water' * 'XXX_EsT_partitioning' into 'EsT_partitioning'
- this commit exactly reproduces output as current master (plus new fix for forbs #47)
Codecov Report
@@ Coverage Diff @@
## master #136 +/- ##
==========================================
- Coverage 34.12% 32.91% -1.22%
==========================================
Files 20 20
Lines 3528 3151 -377
==========================================
- Hits 1204 1037 -167
+ Misses 2324 2114 -210
Continue to review full report at Codecov.
|
|
@CaitlinA @BrendenBe1 This is a major code change:
This will make it easier for Brendan to get the vegetation cover values for the new SWA code. |
|
I am merging master into my branch now and will make implement this change into the SWA code |
|
@dschlaep I merged master into my branch and also changed my STEPWAT branch to work with the new veg arrays. |
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.
close Convert vegetation type related variables to arrays #135
vegetation type related variables are now arrays
pre-defined macro loops for easier coding: