granular-channel-hydro, branch HEAD subglacial hydrology model for sedimentary channels d7891fc8def162760914264e371e932d01590327 2020-01-02T09:21:56Z 2020-01-02T09:21:56Z Change to ISC license Anders Damsgaard anders@adamsgaard.dk commit d7891fc8def162760914264e371e932d01590327 parent f35dfcc4086c4dbbbec93ae2e6885e8a10850707 Author: Anders Damsgaard <anders@adamsgaard.dk> Date: Thu, 2 Jan 2020 10:21:56 +0100 Change to ISC license f35dfcc4086c4dbbbec93ae2e6885e8a10850707 2017-10-17T17:40:50Z 2017-10-17T17:40:50Z update readme for clarity Anders Damsgaard andersd@riseup.net commit f35dfcc4086c4dbbbec93ae2e6885e8a10850707 parent 3c1886f85c00fc3f7f1ea8f3a885b8e273636698 Author: Anders Damsgaard <andersd@riseup.net> Date: Tue, 17 Oct 2017 13:40:50 -0400 update readme for clarity 3c1886f85c00fc3f7f1ea8f3a885b8e273636698 2017-10-17T17:21:18Z 2017-10-17T17:21:18Z remove scipy as requirement Anders Damsgaard andersd@riseup.net commit 3c1886f85c00fc3f7f1ea8f3a885b8e273636698 parent f688bb44a3b2b6996a074af41271af7e0888a4af Author: Anders Damsgaard <andersd@riseup.net> Date: Tue, 17 Oct 2017 13:21:18 -0400 remove scipy as requirement f688bb44a3b2b6996a074af41271af7e0888a4af 2017-10-17T17:20:19Z 2017-10-17T17:20:19Z update license description Anders Damsgaard andersd@riseup.net commit f688bb44a3b2b6996a074af41271af7e0888a4af parent f93ba7d18a7e1c4571d858a6281ae493558a630f Author: Anders Damsgaard <andersd@riseup.net> Date: Tue, 17 Oct 2017 13:20:19 -0400 update license description f93ba7d18a7e1c4571d858a6281ae493558a630f 2017-10-17T17:08:00Z 2017-10-17T17:08:00Z update README, add LICENSE and remove old and unused files Anders Damsgaard andersd@riseup.net commit f93ba7d18a7e1c4571d858a6281ae493558a630f parent 46dfffde617f0688622073bd949a6d64311f8368 Author: Anders Damsgaard <andersd@riseup.net> Date: Tue, 17 Oct 2017 13:08:00 -0400 update README, add LICENSE and remove old and unused files 46dfffde617f0688622073bd949a6d64311f8368 2017-08-18T11:23:24Z 2017-08-18T11:23:24Z change axis units Anders Damsgaard andersd@riseup.net commit 46dfffde617f0688622073bd949a6d64311f8368 parent 633970e66a0eb2d60b96eab40e8a9f891201ecf0 Author: Anders Damsgaard <andersd@riseup.net> Date: Fri, 18 Aug 2017 13:23:24 +0200 change axis units 633970e66a0eb2d60b96eab40e8a9f891201ecf0 2017-05-15T20:27:58Z 2017-05-15T20:27:58Z fix figure and tweak parameters Anders Damsgaard andersd@riseup.net commit 633970e66a0eb2d60b96eab40e8a9f891201ecf0 parent 6afcc6591b23c355ae2cae50953afbba1de9e0d6 Author: Anders Damsgaard <andersd@riseup.net> Date: Mon, 15 May 2017 16:27:58 -0400 fix figure and tweak parameters 6afcc6591b23c355ae2cae50953afbba1de9e0d6 2017-05-15T20:11:43Z 2017-05-15T20:11:43Z implement Meyer-Peter and Muller 1948 relationship for sediment transport Anders Damsgaard andersd@riseup.net commit 6afcc6591b23c355ae2cae50953afbba1de9e0d6 parent 4bb1e340b01ce37312e12942c05715d30529e2b0 Author: Anders Damsgaard <andersd@riseup.net> Date: Mon, 15 May 2017 16:11:43 -0400 implement Meyer-Peter and Muller 1948 relationship for sediment transport 4bb1e340b01ce37312e12942c05715d30529e2b0 2017-04-20T00:52:56Z 2017-04-20T00:52:56Z add seperate version with two-phase sediment transport model Anders Damsgaard andersd@riseup.net commit 4bb1e340b01ce37312e12942c05715d30529e2b0 parent ed3e36d656e883a7527ac866dad7e6d1ebffcf57 Author: Anders Damsgaard <andersd@riseup.net> Date: Wed, 19 Apr 2017 20:52:56 -0400 add seperate version with two-phase sediment transport model ed3e36d656e883a7527ac866dad7e6d1ebffcf57 2017-03-13T22:59:48Z 2017-03-13T22:59:48Z solve for N_c Anders Damsgaard andersd@riseup.net commit ed3e36d656e883a7527ac866dad7e6d1ebffcf57 parent 25bddd0fd670ac412295cf87cdd4ed1759875e12 Author: Anders Damsgaard <andersd@riseup.net> Date: Mon, 13 Mar 2017 15:59:48 -0700 solve for N_c 25bddd0fd670ac412295cf87cdd4ed1759875e12 2017-03-09T04:52:39Z 2017-03-09T04:52:39Z change geometry and upstream flux BC Anders Damsgaard andersd@riseup.net commit 25bddd0fd670ac412295cf87cdd4ed1759875e12 parent 63f99a6d5a5fdb264a19d29281a8b8a373358632 Author: Anders Damsgaard <andersd@riseup.net> Date: Wed, 8 Mar 2017 20:52:39 -0800 change geometry and upstream flux BC 63f99a6d5a5fdb264a19d29281a8b8a373358632 2017-03-09T03:42:12Z 2017-03-09T03:42:12Z solve for water pressure Anders Damsgaard andersd@riseup.net commit 63f99a6d5a5fdb264a19d29281a8b8a373358632 parent d0ec40ca4dde58229f1c40d4fc0d3789a3d679a2 Author: Anders Damsgaard <andersd@riseup.net> Date: Wed, 8 Mar 2017 19:42:12 -0800 solve for water pressure d0ec40ca4dde58229f1c40d4fc0d3789a3d679a2 2017-03-09T01:23:29Z 2017-03-09T01:23:29Z remove legacy sediment model, solve for N_c instead of P_c Anders Damsgaard andersd@riseup.net commit d0ec40ca4dde58229f1c40d4fc0d3789a3d679a2 parent 736f50c0a19c6d0ab65821b49e60a0fc010e0f84 Author: Anders Damsgaard <andersd@riseup.net> Date: Wed, 8 Mar 2017 17:23:29 -0800 remove legacy sediment model, solve for N_c instead of P_c 736f50c0a19c6d0ab65821b49e60a0fc010e0f84 2017-03-08T23:27:06Z 2017-03-08T23:27:06Z use momentum conservation eq from Kingslake and Ng 2013 Anders Damsgaard andersd@riseup.net commit 736f50c0a19c6d0ab65821b49e60a0fc010e0f84 parent 5b2de54976269ae0d0883f728b9a6337610505f2 Author: Anders Damsgaard <andersd@riseup.net> Date: Wed, 8 Mar 2017 15:27:06 -0800 use momentum conservation eq from Kingslake and Ng 2013 5b2de54976269ae0d0883f728b9a6337610505f2 2017-03-06T23:07:13Z 2017-03-06T23:07:13Z working example with Wilcock two-phase sediment transport Anders Damsgaard andersd@riseup.net commit 5b2de54976269ae0d0883f728b9a6337610505f2 parent 5de4d190454b1c94b1982063f442efcfc30ee649 Author: Anders Damsgaard <andersd@riseup.net> Date: Mon, 6 Mar 2017 15:07:13 -0800 working example with Wilcock two-phase sediment transport 5de4d190454b1c94b1982063f442efcfc30ee649 2017-03-03T17:45:13Z 2017-03-03T17:45:13Z fix comment style Anders Damsgaard andersd@riseup.net commit 5de4d190454b1c94b1982063f442efcfc30ee649 parent cc1ced89147308322393b4220845eabe5970e39a Author: Anders Damsgaard <andersd@riseup.net> Date: Fri, 3 Mar 2017 09:45:13 -0800 fix comment style cc1ced89147308322393b4220845eabe5970e39a 2017-03-02T04:43:10Z 2017-03-02T04:43:10Z begin implementing Wilcock's two-fraction sediment transport model Anders Damsgaard andersd@riseup.net commit cc1ced89147308322393b4220845eabe5970e39a parent 97a5cad4554cc24b354750d75d98d7e661bab5ca Author: Anders Damsgaard <andersd@riseup.net> Date: Wed, 1 Mar 2017 20:43:10 -0800 begin implementing Wilcock's two-fraction sediment transport model 97a5cad4554cc24b354750d75d98d7e661bab5ca 2017-02-14T21:16:36Z 2017-02-14T21:16:36Z use an iterative solution for channel dynamics Anders Damsgaard andersd@riseup.net commit 97a5cad4554cc24b354750d75d98d7e661bab5ca parent 709930aac7cbe7585ab6f956aed5f370b41d7166 Author: Anders Damsgaard <andersd@riseup.net> Date: Tue, 14 Feb 2017 13:16:36 -0800 use an iterative solution for channel dynamics 709930aac7cbe7585ab6f956aed5f370b41d7166 2017-02-03T05:47:16Z 2017-02-03T05:47:16Z working example Anders Damsgaard Christensen adc@geo.au.dk commit 709930aac7cbe7585ab6f956aed5f370b41d7166 parent 464ba42ad1e569c9c86c0b29e272ad9555b32feb Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Thu, 2 Feb 2017 21:47:16 -0800 working example 464ba42ad1e569c9c86c0b29e272ad9555b32feb 2017-02-03T00:46:46Z 2017-02-03T00:46:46Z experiment with different parameter values for erosion/deposition Anders Damsgaard Christensen adc@geo.au.dk commit 464ba42ad1e569c9c86c0b29e272ad9555b32feb parent 400da52ca6dea9a381f902ba653ca1c267ac286f Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Thu, 2 Feb 2017 16:46:46 -0800 experiment with different parameter values for erosion/deposition 400da52ca6dea9a381f902ba653ca1c267ac286f 2017-02-03T00:22:16Z 2017-02-03T00:22:16Z transport sediment for more than one cell Anders Damsgaard Christensen adc@geo.au.dk commit 400da52ca6dea9a381f902ba653ca1c267ac286f parent 26bc00c665916c00d8fc195170f6df2062d77332 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Thu, 2 Feb 2017 16:22:16 -0800 transport sediment for more than one cell 26bc00c665916c00d8fc195170f6df2062d77332 2017-02-02T20:31:15Z 2017-02-02T20:31:15Z try different deposition laws, d_dot > e_dot Anders Damsgaard Christensen adc@geo.au.dk commit 26bc00c665916c00d8fc195170f6df2062d77332 parent 8119c0ae2e91d175f51c319d32a10abc108ebcd3 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Thu, 2 Feb 2017 12:31:15 -0800 try different deposition laws, d_dot > e_dot 8119c0ae2e91d175f51c319d32a10abc108ebcd3 2017-02-02T04:52:27Z 2017-02-02T04:52:27Z important fix for water velocity and shear stress Anders Damsgaard Christensen adc@geo.au.dk commit 8119c0ae2e91d175f51c319d32a10abc108ebcd3 parent cdd2e02befacebb825dd8718658f44c28fe27e82 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 1 Feb 2017 20:52:27 -0800 important fix for water velocity and shear stress cdd2e02befacebb825dd8718658f44c28fe27e82 2017-02-02T00:41:32Z 2017-02-02T00:41:32Z various fixes, advection instability present Anders Damsgaard Christensen adc@geo.au.dk commit cdd2e02befacebb825dd8718658f44c28fe27e82 parent b927f7b0194424fbefffb922391b0d999459702a Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 1 Feb 2017 16:41:32 -0800 various fixes, advection instability present b927f7b0194424fbefffb922391b0d999459702a 2017-02-02T00:05:32Z 2017-02-02T00:05:32Z use upwind differences for pressure and a larger S_min Anders Damsgaard Christensen adc@geo.au.dk commit b927f7b0194424fbefffb922391b0d999459702a parent 3a8080534dbb60ccc47435d15ed6ce9fd909fc59 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 1 Feb 2017 16:05:32 -0800 use upwind differences for pressure and a larger S_min 3a8080534dbb60ccc47435d15ed6ce9fd909fc59 2017-02-01T22:22:31Z 2017-02-01T22:22:31Z improve output figures Anders Damsgaard Christensen adc@geo.au.dk commit 3a8080534dbb60ccc47435d15ed6ce9fd909fc59 parent e1e23e617f46e30a99b7ef75ff8010c3813ab1b2 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 1 Feb 2017 14:22:31 -0800 improve output figures e1e23e617f46e30a99b7ef75ff8010c3813ab1b2 2017-02-01T21:53:51Z 2017-02-01T21:53:51Z show time info to stdout Anders Damsgaard Christensen adc@geo.au.dk commit e1e23e617f46e30a99b7ef75ff8010c3813ab1b2 parent d2b05a1797b69a2d3cad693f89c9b9560e825ea2 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 1 Feb 2017 13:53:51 -0800 show time info to stdout d2b05a1797b69a2d3cad693f89c9b9560e825ea2 2017-02-01T20:29:37Z 2017-02-01T20:29:37Z do not solve flux and pressure in nested loops, fix ds Anders Damsgaard Christensen adc@geo.au.dk commit d2b05a1797b69a2d3cad693f89c9b9560e825ea2 parent 518b45d9299a64bda252848ed1d6ee2c8ba71aad Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Wed, 1 Feb 2017 12:29:37 -0800 do not solve flux and pressure in nested loops, fix ds 518b45d9299a64bda252848ed1d6ee2c8ba71aad 2017-02-01T06:14:00Z 2017-02-01T06:14:00Z water flux debugging in progress Anders Damsgaard Christensen adc@geo.au.dk commit 518b45d9299a64bda252848ed1d6ee2c8ba71aad parent 7fc6a939b43d9f7333a72bf298b6359747f1b5c7 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Tue, 31 Jan 2017 22:14:00 -0800 water flux debugging in progress 7fc6a939b43d9f7333a72bf298b6359747f1b5c7 2017-02-01T05:56:11Z 2017-02-01T05:56:11Z transition from effective channel pressure to water pressure Anders Damsgaard Christensen adc@geo.au.dk commit 7fc6a939b43d9f7333a72bf298b6359747f1b5c7 parent 9c1dfa711717600fb0bc43f6d6503294c5cddd9b Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Tue, 31 Jan 2017 21:56:11 -0800 transition from effective channel pressure to water pressure 9c1dfa711717600fb0bc43f6d6503294c5cddd9b 2017-01-31T06:36:55Z 2017-01-31T06:36:55Z add simple 1d example, WIP Anders Damsgaard Christensen adc@geo.au.dk commit 9c1dfa711717600fb0bc43f6d6503294c5cddd9b parent ea147780409ef9eacaa3e3cf29f1f10f4a8b8817 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Mon, 30 Jan 2017 22:36:55 -0800 add simple 1d example, WIP ea147780409ef9eacaa3e3cf29f1f10f4a8b8817 2017-01-17T16:12:54Z 2017-01-17T16:12:54Z do not call tight_layout() Anders Damsgaard Christensen adc@geo.au.dk commit ea147780409ef9eacaa3e3cf29f1f10f4a8b8817 parent 2d67c5273687771f252c74c50e75732c5bafe7a4 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Tue, 17 Jan 2017 08:12:54 -0800 do not call tight_layout() 2d67c5273687771f252c74c50e75732c5bafe7a4 2017-01-14T19:06:37Z 2017-01-14T19:06:37Z add documentation to plotGrid, remove old code Anders Damsgaard Christensen adc@geo.au.dk commit 2d67c5273687771f252c74c50e75732c5bafe7a4 parent 1a5a3056676e890a1bb8924f0290be3566cd1648 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Sat, 14 Jan 2017 11:06:37 -0800 add documentation to plotGrid, remove old code 1a5a3056676e890a1bb8924f0290be3566cd1648 2017-01-14T17:00:01Z 2017-01-14T17:00:01Z improve plotting Anders Damsgaard Christensen adc@geo.au.dk commit 1a5a3056676e890a1bb8924f0290be3566cd1648 parent 0d87e7f51ab71bc4832b9cb19bfcbda63990f5ad Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Sat, 14 Jan 2017 09:00:01 -0800 improve plotting 0d87e7f51ab71bc4832b9cb19bfcbda63990f5ad 2017-01-14T06:46:53Z 2017-01-14T06:46:53Z fix grid generation limits with uniform distribution Anders Damsgaard Christensen adc@geo.au.dk commit 0d87e7f51ab71bc4832b9cb19bfcbda63990f5ad parent afff4e386f601b61e0e2a0323d80d16b3074fe7b Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Fri, 13 Jan 2017 22:46:53 -0800 fix grid generation limits with uniform distribution afff4e386f601b61e0e2a0323d80d16b3074fe7b 2017-01-14T06:44:10Z 2017-01-14T06:44:10Z increase entropy in grid Anders Damsgaard Christensen adc@geo.au.dk commit afff4e386f601b61e0e2a0323d80d16b3074fe7b parent 4516a5f45c72fc1a57aa0d5da689b2225948ebbf Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Fri, 13 Jan 2017 22:44:10 -0800 increase entropy in grid 4516a5f45c72fc1a57aa0d5da689b2225948ebbf 2017-01-14T06:37:49Z 2017-01-14T06:37:49Z keep grid points within model domain Anders Damsgaard Christensen adc@geo.au.dk commit 4516a5f45c72fc1a57aa0d5da689b2225948ebbf parent 8983440e41f994aedaf6b34648e690dedb03818a Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Fri, 13 Jan 2017 22:37:49 -0800 keep grid points within model domain 8983440e41f994aedaf6b34648e690dedb03818a 2017-01-14T06:35:01Z 2017-01-14T06:35:01Z fix grid generation, increase random variability of point positioning Anders Damsgaard Christensen adc@geo.au.dk commit 8983440e41f994aedaf6b34648e690dedb03818a parent 6ce83970ccaba7dd7c4f0ad316ce4f25f1e38e30 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Fri, 13 Jan 2017 22:35:01 -0800 fix grid generation, increase random variability of point positioning 6ce83970ccaba7dd7c4f0ad316ce4f25f1e38e30 2017-01-14T05:02:16Z 2017-01-14T05:02:16Z first commit Anders Damsgaard Christensen adc@geo.au.dk commit 6ce83970ccaba7dd7c4f0ad316ce4f25f1e38e30 Author: Anders Damsgaard Christensen <adc@geo.au.dk> Date: Fri, 13 Jan 2017 21:02:16 -0800 first commit