-
Notifications
You must be signed in to change notification settings - Fork 240
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
Adds an updated version of the Jupyter notebook tutorial for the onse… #5533
Conversation
Can you please remove all the checkpoint files you accidentally added? |
@tjhei Thanks for the catch on the hidden files. Hopefully this is clean now. |
You'll have to merge the two commits (squash or fix-up) to ensure these large files are not in one commit and then removed in the next, leaving them as large (but unnecessary) additions to the repository. |
|
||
## Running on your desktop | ||
|
||
If you run in your local JupyetrLab environment, note the following dependencies: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you run in your local JupyetrLab environment, note the following dependencies: | |
If you run in your local JupyterLab environment, note the following dependencies: |
@@ -0,0 +1,161 @@ | |||
# A description of convection in a 2d box. See the manual for more information. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Out of curiosity, why leave old stuff around? Documentation should document the current state of a code base; it is not helpful to anyone to document a previous version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Always a good question. The reason to keep this around is that there is not a new docker container with the most recent code.
16c4239
to
d77075c
Compare
@bangerth. Both of your comments have been addressed and this should be ready to be merged. Once merged, I will remove the old prm files and update the README to be consistent. ty. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Lorraine, thank you for putting this together. This is great to have as a resource. I think we need to discuss a couple of things first, though.
|
||
The current version is verified to run within the ASPECT Jupyter Notebooks tool which can be launched from the CIG website: | ||
|
||
https://geodynamics.org/resources/aspectnotebook |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is not documented here or on the page linked here: It seems that you have to add $ASPECT_DIR to the path manually before you can start "aspect". @gassmoeller is that true or am I missing something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this is in the default path for the notebook container.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tjhei: Lorraine is correct, $ASPECT_DIR is already set inside the tool. No need for the user to set it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I click on https://geodynamics.org/resources/aspectnotebook, then 'launch tool', "new terminal" I get:
timoheister@geodynamics_1099_6:~$ aspect
bash: aspect: command not found
while $ASPECT_DIR/bin/aspect
works.
A. Install Docker | ||
|
||
B. Download the docker image | ||
> docker pull tjhei/aspect-jupyter |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we maybe update this image first instead of trying to be compatible with it? This image is from 2017 and contains ASPECT 2.0.0-pre. If we don't update it, we should remove these instructions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The plan is to remove these files and clean-up the README.md file after this pull request is merged. This way we have a record of it somewhere in the commit history if needed.
# A description of convection in a 2d box. See the manual for more information. | ||
|
||
|
||
# At the top, we define the number of space dimensions we would like to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This and many other files are in a folder .ipynb_checkpoints/
. I think this temporary folder should not be part of your PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh drats, you did find more. Do you mind if i clean this up when i get rid of the "old" files?
@@ -0,0 +1,111 @@ | |||
{ | |||
"cells": [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this file not in the notebooks folder?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True. The philosophy here is to put the "obvious" starting point at the top level. Agnostic about this. what do others think?
|
||
# Introduction to ASPECT | ||
|
||
This notebook is based on tutorials by J. Dannberg that provide a basic introduction to ASPECT. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we have a better place to put notebooks/tutorials? It seems weird to me to hide them inside the convection-box folder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was part of a broader discussion to keep notebooks as close as possible to the related prm's such that they stay current.
I removed the checkpoint files. |
It fails the indentation check with these diffs:
|
The other failures seem to come from the fact that the root of the branch is at a point in time where we had the GMG failures. |
…vious incompatible version
a84e412
to
3f0edc7
Compare
f2d0c13
to
88b3995
Compare
I indented, rebased and fixed a number of remaining typos, this should be good to go @ljhwang. |
Back at the 2017 hack in Georgia, the original onset of convection tutorials were converted to Jupyter notebooks.
This adds an updated version of the notebook to the cookbook directory that the tutorial is related to.
Updates include:
The updated version is designed to work using the ASPECT Jupyterlab environment on geodynamics.org: https://geodynamics.org/resources/aspectnotebook
The instructions to run in the old Docker container and the old parameter files are retained. This could be removed if a new docker container is made or this is confusing.