Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CA with production #8

Merged
merged 15 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .entangled/build/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

# This Makefile is generated by Entangled. Modifications will be overwritten.

.RECIPEPREFIX = >
.PHONY = all

all: docs/src/fig/b13-fig3.png docs/src/fig/b13-long-term.png data/ca-prod-slope.h5 docs/src/fig/b13-crosssection.png docs/src/fig/b13-capsosc-crosssection.png

docs/src/fig/b13-fig3.png: examples/ca/burgess-2013.jl
> julia --project=. --startup-file=no -e 'using DaemonMode; runargs()' examples/ca/burgess-2013.jl

docs/src/fig/b13-long-term.png: examples/ca/long-term.jl
> julia --project=. --startup-file=no -e 'using DaemonMode; runargs()' examples/ca/long-term.jl

data/ca-prod-slope.h5: examples/cap-slope.jl
> julia --project=. --startup-file=no -e 'using DaemonMode; runargs()' examples/cap-slope.jl

docs/src/fig/b13-crosssection.png: examples/plot-cap-slope.jl data/ca-prod-slope.h5
> julia --project=. --startup-file=no -e 'using DaemonMode; runargs()' examples/plot-cap-slope.jl

docs/src/fig/b13-capsosc-crosssection.png: examples/plot-caps-osc.jl data/caps-osc.h5
> julia --project=. --startup-file=no -e 'using DaemonMode; runargs()' examples/plot-caps-osc.jl
198 changes: 128 additions & 70 deletions .entangled/filedb.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,30 @@
{
"version": "2.0.0b3",
"version": "2.0.0b4",
"files": [
{
"path": "src/Stencil.jl",
"deps": [
"docs/src/stencils.md"
],
"modified": "2023-08-29T13:12:36.899671",
"hexdigest": "1709f203aa758a0383beb1d5d020fa05b8a04a41d398040a69f94b58c50366cb"
"modified": "2023-09-23T12:43:44.264279",
"hexdigest": "28c4df483d74e690d71de3fe65696da6646843394b27ec2f6faf0f28656fb35b"
},
{
"path": "src/Burgess2013.jl",
"deps": [
"docs/src/carbocat-cpt.md",
"docs/src/carbocat.md",
"docs/src/carbocat-transport.md"
],
"modified": "2023-08-29T13:12:36.900671",
"hexdigest": "83265fdcf582328e29fcf69fc32528b2bffb928955530f03facdc50a147219c0"
},
{
"path": "src/examples/game-of-life.jl",
"deps": [
"docs/src/stencils.md"
],
"modified": "2023-08-29T15:11:50.987826",
"hexdigest": "d378124f2bbe29d42da234deddd9a7572679085163d400a125bd57103969cddc"
},
{
"path": "src/examples/convolution.jl",
"deps": [
"docs/src/stencils.md"
"docs/src/carbocat.md"
],
"modified": "2023-08-29T15:11:32.917681",
"hexdigest": "169719c18341e7ef4fb5fa7351408b24f11a2c83d2fc44ce5ce93c6ac49167f7"
"modified": "2023-09-26T17:08:18.700257",
"hexdigest": "e0ef5d570daaa253347a188b7f3e4739e461cf86f19ea943590daf5eef6743be"
},
{
"path": "src/Burgess2013/Production.jl",
"deps": [
"docs/src/bosscher-1992.md",
"docs/src/carbocat.md"
],
"modified": "2023-08-29T13:12:36.900671",
"hexdigest": "e6e86dea89740e3ed8219afe5380c1f1dac2546c9d57440286c5e69a6f222f66"
"modified": "2023-09-21T14:46:07.061696",
"hexdigest": "a8a68a613cab71d93658bce1f772eb468193f68bb2d66e3dfcebf81c326d89f7"
},
{
"path": "src/BS92/fig8-sealevel.jl",
Expand Down Expand Up @@ -73,24 +55,16 @@
"deps": [
"docs/src/carbocat-ca.md"
],
"modified": "2023-08-29T15:13:12.707484",
"hexdigest": "b2b99f2a6218de036366667ddcbed727d6315bf69316517af704724fa74984c9"
"modified": "2023-09-21T14:46:07.061696",
"hexdigest": "0640cd71d6c509421530fe9e2074e0415cd2e6c471f85e46bb0cc0741bc7acb3"
},
{
"path": "src/Burgess2013/Config.jl",
"deps": [
"docs/src/carbocat.md"
],
"modified": "2023-08-29T13:12:36.901671",
"hexdigest": "3f41801c47dacf0a1990b59b11455a45d796993214d28d86491801e60c27c62f"
},
{
"path": "src/examples/eca.jl",
"deps": [
"docs/src/stencils.md"
],
"modified": "2023-09-18T12:06:28.502239",
"hexdigest": "dc95e7134c3653136f6122f2c6c14b29dc38d22865fd7c5ce618b37fbf5f1cfc"
"modified": "2023-09-21T14:46:07.061696",
"hexdigest": "737fa732bc412e538eadeeaca81ef4c98170bcb600415a1387a723e55adabf1b"
},
{
"path": "src/figures/plot-tanh.gnuplot",
Expand Down Expand Up @@ -119,20 +93,14 @@
{
"path": "docs/src/bosscher-1992.md",
"deps": null,
"modified": "2023-09-14T11:16:21.454131",
"hexdigest": "1d99ef509ad40c6b6a8a7dd21507854cd36190f9b30d6c715929642699f1f340"
"modified": "2023-09-27T15:24:20.138264",
"hexdigest": "ee46fe50e4343fa96bbd3aaadc4017a8a0afbb5c9570e35a42584a9165967746"
},
{
"path": "docs/src/carbocat-ca.md",
"deps": null,
"modified": "2023-09-18T13:49:08.806617",
"hexdigest": "97c0dc835ad97687b8bb518f735536d06cf631cf29828c7c1eb5534af226b215"
},
{
"path": "docs/src/carbocat-cpt.md",
"deps": null,
"modified": "2023-08-02T16:14:17.873762",
"hexdigest": "ba20abb2536af9114f91dc2ffd7e6fc2c0351fbeb85fe5ff3186e351d51b43ea"
"modified": "2023-09-26T22:56:31.936988",
"hexdigest": "032aa4b0b189ae0b7f1c41e56355c44ae6d1acdcd6cb05c3af53108a4ee2771b"
},
{
"path": "docs/src/carbocat-transport.md",
Expand All @@ -143,14 +111,14 @@
{
"path": "docs/src/carbocat.md",
"deps": null,
"modified": "2023-08-29T15:53:12.470753",
"hexdigest": "033c6a5685fe26a62e34411dad3008b338668f5dd76bbf116609fb0e6275b2a2"
"modified": "2023-09-26T20:23:17.219092",
"hexdigest": "0eaad0c9dbc3f9ee76ca5806f2fb0e15f9c440c11d0cecf4b7faebe906d0095f"
},
{
"path": "docs/src/stencils.md",
"deps": null,
"modified": "2023-09-18T12:06:28.532240",
"hexdigest": "2d808f8be9a20287b8a0046c192098184f04b2fbf1f7d1f2d7b0dab565328d3d"
"modified": "2023-09-23T17:12:49.121904",
"hexdigest": "1add42b5aaf27027505482565444f681f7f69eb6ce936d067e67edab516c1872"
},
{
"path": "docs/src/utility.md",
Expand All @@ -161,8 +129,8 @@
{
"path": "docs/src/index.md",
"deps": null,
"modified": "2023-08-29T15:06:53.972437",
"hexdigest": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b"
"modified": "2023-09-27T15:22:52.658683",
"hexdigest": "1465d4fedf192b9eda848e1b2776f93582c87b3381b150ceb676a0a1b78b3a4d"
},
{
"path": "docs/src/bs92-w-erosion.md",
Expand All @@ -187,32 +155,122 @@
"hexdigest": "8ee1cafbbc9cc83699031014346d5492934e402048701e9f8b6e7754f31653cb"
},
{
"path": "examples/burgess-2013-ca.jl",
"path": "docs/src/ca-with-production.md",
"deps": null,
"modified": "2023-09-27T23:54:27.744672",
"hexdigest": "d35e7caddb4c79d2a0771f775c40dfe4f7091315e77400932b5be693b864627d"
},
{
"path": "src/CaProd.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-23T12:42:35.628805",
"hexdigest": "8e4c5ff071add55a0b8c4ffebc9746fe43e3a7152382ea7c5630dcd8467c00dd"
},
{
"path": "examples/ca-with-prod.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-21T21:14:55.298171",
"hexdigest": "e51aeae06a417fbbb644a8202776432d3f38c604645cc455abee2e024f7d8b8c"
},
{
"path": "examples/cap-slope.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-27T15:09:42.025088",
"hexdigest": "82c974093997dff9bcc33ea179c239c21a065df1daa458bdd43dee69a24f4948"
},
{
"path": "examples/caps-osc.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-22T14:07:24.685794",
"hexdigest": "55605939fdbef866ec2487f5a998ec3546f4a2696e0bf29c42b1a175546efec9"
},
{
"path": "README.md",
"deps": null,
"modified": "2023-09-23T17:28:56.768370",
"hexdigest": "ab3418a0b8d69179b00bde19984b0c4812de6dcc5a70d005d8613d9a6fbc6f16"
},
{
"path": "examples/ca/burgess-2013.jl",
"deps": [
"docs/src/carbocat-ca.md"
],
"modified": "2023-09-18T13:49:08.788617",
"hexdigest": "8db8b8432753257c0ce90cff4fad9614aed1952031216c4dd1c41da88f2e5d73"
"modified": "2023-09-26T21:25:53.119518",
"hexdigest": "39022026e7409ae70224343554585043c659e4a9716a64064f5ae128457f18c6"
},
{
"path": "examples/ca/parameter-scan.jl",
"deps": [
"docs/src/carbocat-ca.md"
],
"modified": "2023-09-26T22:56:31.910988",
"hexdigest": "fcf51392b98b16ce6926b3003ec039dcdc4f281a2330f53931d43690e333b5a4"
},
{
"path": "examples/ca/long-term.jl",
"deps": [
"docs/src/carbocat-ca.md"
],
"modified": "2023-09-26T21:25:53.120518",
"hexdigest": "fda2912aecf8783c9804b03cac2ecf65b2a8c3be532c03d180182321addecf9a"
},
{
"path": "src/Visualization.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-27T23:50:02.823684",
"hexdigest": "01ec959008e05f5f1b711c1eca17ed61de7922208276e0d30118251bdcec40f9"
},
{
"path": "examples/plot-cap-slope.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-27T23:07:24.741368",
"hexdigest": "1c14b562b1a59824aa606facd009d5c64fd22fc654aee74da157a31705360820"
},
{
"path": "examples/plot-caps-osc.jl",
"deps": [
"docs/src/ca-with-production.md"
],
"modified": "2023-09-27T23:54:47.898999",
"hexdigest": "4c75bc5ce28ee5d4a3f3ec41d45a4a5935db0f9438d22cfd4bb5021a016b27aa"
}
],
"source": [],
"target": [
"src/examples/eca.jl",
"src/Burgess2013/Config.jl",
"src/Erosion.jl",
"src/BS92.jl",
"src/BS92/fig8-sealevel.jl",
"src/Utility.jl",
"src/examples/convolution.jl",
"examples/plot-caps-osc.jl",
"src/figures/burgess2013-fig2.gnuplot",
"src/Burgess2013/Transport.jl",
"src/Burgess2013/CA.jl",
"src/CaProd.jl",
"examples/ca/burgess-2013.jl",
"examples/ca-with-prod.jl",
"src/Burgess2013/Production.jl",
"src/Visualization.jl",
"src/BS92/fig8-sealevel.jl",
"src/Erosion.jl",
"src/figures/plot-tanh.gnuplot",
"src/Burgess2013.jl",
"examples/caps-osc.jl",
"examples/ca/long-term.jl",
"examples/bosscher-schlager-1992.jl",
"examples/plot-cap-slope.jl",
"src/Burgess2013/Config.jl",
"src/Burgess2013.jl",
"src/Utility.jl",
"src/Stencil.jl",
"src/Burgess2013/CA.jl",
"src/Burgess2013/Production.jl",
"examples/burgess-2013-ca.jl",
"src/examples/game-of-life.jl"
"examples/ca/parameter-scan.jl",
"src/BS92.jl",
"examples/cap-slope.jl",
"src/Burgess2013/Transport.jl"
]
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
docs/build
data/*.h5
.vscode

11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.PHONY: run-daemon figures serve-docs

figures:
make -f .entangled/build/Makefile

run-daemon:
julia --project=. --startup-file=no -e 'using Revise; using DaemonMode; serve()'

serve-docs:
julia --project=docs -e 'using LiveServer; servedocs()'

Loading