Develop #9
Open
Develop #9
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
…able at the moment.
…velop * 'develop' of https://github.com/ashleymedin/prms: git ignore
…ro out snowpack into firn or not on glacierettes (zeroed in Copper application, thinking don't want to now).
…uch snowcov for same snowmelt.
* commit 'bf4da2c757e0abe034f36eced427899a3965561c': (509 commits) Update readme for PRMS6 build steps Remove prms5-related files and directories move test cases out of source development tree added exclusions Start of parameter override work Change output to uncompressed 64BIT_OFFSET added extensions to control variables add dimension information to parameters update basin_sroff computation fix bugs plus minor changes change procedure APIs Added dynamic parameter support moved hru_storage_ante and gwres_stor_ante from water balance module change statvar_file to stat_var_file change statvar_file to stat_var_file misc updates minor update Minor changes Remove hru_storage_ante updated definition of basin_changeover in declvar ... # Conflicts: # .gitignore # Makefile # makelist # mmf/Makefile # mmf/defs.h # mmf/read_control.c # mmf/umalloc_etc.c # prms/Makefile # prms/basin.f90 # prms/basin_sum.f90 # prms/call_modules.f90 # prms/climate_hru.f90 # prms/climateflow.f90 # prms/dynamic_param_read.f90 # prms/ide_dist.f # prms/intcp.f90 # prms/muskingum.f90 # prms/muskingum_lake.f90 # prms/precip_1sta_laps.f90 # prms/prms_summary.f90 # prms/routing.f90 # prms/snowcomp.f90 # prms/soilzone.f90 # prms/soltab.f90 # prms/srunoff.f90 # prms/stream_temp.f90 # prms/temp_1sta_laps.f90 # prms/temp_dist2.f90 # prms/water_balance.f90 # prms/xyz_dist.f
* commit '8c41fdb12fe275f5ec851fe22bd05a45bcbc2a47': copied over Ashley's develop branch initial merge of glacier versions
* commit '3529586400018df4529297f1325a92e3d973a0d1': Regan's changes Upstream connections now being determined correctly. Compiles and runs not finished. Working on stream temp slow down bug # Conflicts: # prms/call_modules.f90 # prms/stream_temp.f90
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.
This is my final version