Code

Develop#9

Code

Open

ashleymedin wants to merge 50 commits intonhm-usgs:developnhm-usgs/prms:developfrom ashleymedin:developashleymedin/prms:developCopy head branch name to clipboard

+807-438

Commits

Commits on Jun 21, 2019

• Adding glacier code to NHM. Riparian code is made in duplicate executable at the moment.

  ashleymedin

  committed
  460e36c

Commits on Jun 22, 2019

• Rest of merge modules.

  ashleymedin

  committed
  c0f2c54

• Makefiles

  ashleymedin

  committed
  759e319

• git ignore

  ashleymedin

  committed
  1221ebe

• makelist

  ashleymedin

  committed
  9ec1487

• Merge branch 'develop' of https://github.com/ashleymedin/prms into develop

  Show description for 212e858
  ashleymedin

  committed
  212e858

• don't track makelist

  ashleymedin

  committed
  8224c27

• debugging merge

  ashleymedin

  committed
  5524a83

• makelist back in

  ashleymedin

  committed
  84b1a0f

• fix .gitignore

  ashleymedin

  committed
  995c611

• fixed makefile

  ashleymedin

  committed
  e55b0a4

Commits on Jun 24, 2019

• getting rid of some bugs

  ashleymedin

  committed
  57a9f9c

• routing bug fixes in merge

  ashleymedin

  committed
  16d8499

• fixed merged riparian bugs

  ashleymedin

  committed
  371e594

Commits on Jun 26, 2019

• fix merged streamtemp and glacr_melt errors (without glaciers in params)

  ashleymedin

  committed
  4096fd9

• fixed merged glacr_melt bugs

  ashleymedin

  committed
  cccc439

Commits on Jun 27, 2019

• fixed snow density issue when change from melting snow to glacier underneath

  ashleymedin

  committed
  c2f33da

Commits on Jun 28, 2019

• changed glacier delineation to read the way the weasel makes it

  ashleymedin

  committed
  dfff6bf

Commits on Jul 9, 2019

• Fixed some flag bugs and added logic in snowcomp wether we want to zero out snowpack into firn or not on glacierettes (zeroed in Copper application, thinking don't want to now).

  ashleymedin

  committed
  fa2aefa

Commits on Jul 10, 2019

• Looking at glacrcov_area and snowcov_area. New code doesn't lose as much snowcov for same snowmelt.

  ashleymedin

  committed
  2b4601f

Commits on Jul 12, 2019

• Now assuming seg_length includes length of sloped line not 2-D length

  ashleymedin

  committed
  72c8093

Commits on Jul 30, 2019

• Changing somethings for CFGI

  ashleymedin

  committed
  d1cf075

• clean up makefile

  ashleymedin

  committed
  2ec9cb1

• New CFGI modified for depth and energy budget

  ashleymedin

  committed
  ad3dd35

Commits on Aug 6, 2019

• Separating out riparian and permafrost into own folder.

  ashleymedin

  committed
  810f312

• separating out riparian and permafrost files for Makefile purposes

  ashleymedin

  committed
  11b6c6c

Commits on Aug 19, 2019

• Merge commit 'bf4da2c757e0abe034f36eced427899a3965561c' into develop

  Show description for 61d58fc
  ashleymedin

  committed
  61d58fc

Commits on Aug 21, 2019

• bug fixing in bank storage and riparian

  ashleymedin

  committed
  6d01ac8

• updating makefile and readme

  ashleymedin

  committed
  2036070

• fixed bug in makefile

  ashleymedin

  committed
  5e91f7e

Commits on Aug 23, 2019

• Working on stream temp slow down bug

  markstro-usgs

  committed
  c445910

• not finished.

  markstro-usgs

  committed
  213ed39

Commits on Aug 26, 2019

• Compiles and runs

  markstro-usgs

  committed
  73efd3c

• Upstream connections now being determined correctly.

  markstro-usgs

  committed
  f0e0d23

Commits on Aug 28, 2019

• makefile stuff

  ashleymedin

  committed
  240bf41

• Merge commit '8c41fdb12fe275f5ec851fe22bd05a45bcbc2a47' into develop

  Show description for ffe33ca
  ashleymedin

  committed
  ffe33ca

Commits on Sep 3, 2019

• updating readme and some parameter descriptions

  ashleymedin

  committed
  48821de

Commits on Sep 10, 2019

• Regan's changes

  markstro-usgs

  committed
  3529586

Commits on Sep 13, 2019

• fixing some options/flags

  ashleymedin

  committed
  36d2a47

• Merge commit '3529586400018df4529297f1325a92e3d973a0d1' into develop

  Show description for 379a493
  ashleymedin

  committed
  379a493

• Regan's version cut out glaciers so I put them back in

  ashleymedin

  committed
  5763d41

Commits on Sep 14, 2019

• Putting dunnian and hortonian flow in riparian areas and fixing some CFGI stuff.

  ashleymedin

  committed
  d5131f8

• Seg_slope and seg_length were in stream temp and in routing. moved to routing

  ashleymedin

  committed
  8cec633

• using depression parameters for some of the riparian

  ashleymedin

  committed
  bbd92da

• part of last commit

  ashleymedin

  committed
  ff162b3

Commits on Sep 20, 2019

• changing some inconsistencies in riparian and cfgi found when doing write up

  ashleymedin

  committed
  7dec9fc

Commits on Oct 2, 2019

• fixing some files to agree with documentation

  ashleymedin

  committed
  6a77e8f

• fixing definitions of variables and parameters

  ashleymedin

  committed
  fda486b

• fixing definitions

  ashleymedin

  committed
  a284e2c

Commits on Oct 6, 2019

• Changing files to agree with documentation, adding some variables to output

  ashleymedin

  committed
  d8df5c9