Feature/merge gru #116
Merged
Feature/merge gru #116
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
Corrected previous erroneous GRU commit
Conflicts: build/Makefile build/source/dshare/var_lookup.f90 build/source/engine/allocspace.f90 build/source/engine/coupled_em.f90 build/source/engine/mDecisions.f90 build/source/engine/read_attrb.f90 build/source/engine/read_force.f90 build/source/engine/read_param.f90 build/source/engine/time_utils.f90 Merged new GRU dimension addition into develop branch Fixed errors in eariler GRU dimension attempt
| USE allocspace_module,only:allocLocal ! module to allocate space for data structures | ||
| USE allocspace_module,only:allocate_gru_struc ! read/allocate space for gru-hru mask structures | ||
| USE allocspace_module,only:allocGlobal ! module to allocate space for global data structures | ||
| USE allocspace_module,only:allocLocal ! module to allocate space for local data structures |
There was a problem hiding this comment.
There seems to be a difference between the underscore and camelBack notation in these three allocate routines. Perhaps choose one syntax convention.
There was a problem hiding this comment.
Yes, this will be useful, though it should not hold up the merging of this PR. I've opened an issue so this can be addressed.
| upArea(iGRU)%hru(iHRU) = 0._dp | ||
| do jHRU=1,nHRU | ||
| ! check if jHRU flows into iHRU | ||
| if(typeStruct%gru(iGRU)%hru(jHRU)%var(iLookTYPE%downHRUindex) == typeStruct%gru(iGRU)%hru(iHRU)%var(iLookTYPE%hruIndex))then |
There was a problem hiding this comment.
fix whitespace around ==
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.
Merge the extensions to the GRU dimension, as implemented by Andy Newman. Includes upgrades to new data structures.
Code was run for all test cases and matches output from branch feature/refactorNumerix to within machine precision.