Merge branch 'master' of https://github.com/JiaweiZhuang/cloud_GC

geoschem · Dec 20, 2018 · 1803825 · 1803825
2 parents df636ab + fbc282f
commit 1803825
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doc/source/chapter02_beginner-tutorial/research-workflow.rst b/doc/source/chapter02_beginner-tutorial/research-workflow.rst
@@ -168,7 +168,7 @@ Try ``aws s3 ls`` to make sure AWSCLI is working. Then retrieve data by::
   s3://gcgrid/GEOSCHEM_RESTARTS/v2018-11/initial_GEOSChem_rst.2x25_standard.nc ~/ExtData/GEOSCHEM_RESTARTS/v2018-11/
   
   # fix the softlink in run directory
-  ln -s ~/ExtData/GEOSCHEM_RESTARTS/v2018-11/initial_GEOSChem_rst.2x25_standard.nc ~/GC/geosfp_2x25_standard/GEOSChem_restart.201607010000.nc
+  ln -s ~/ExtData/GEOSCHEM_RESTARTS/v2018-11/initial_GEOSChem_rst.2x25_standard.nc ~/GC/geosfp_2x25_standard/GEOSChem.Restart.20160701_0000z.nc4
 
 Now the model should run without problems.
 

diff --git a/doc/source/chapter03_advanced-tutorial/container.rst b/doc/source/chapter03_advanced-tutorial/container.rst
@@ -150,9 +150,9 @@ Run the container without mounting any directories::
 
 The ``-w`` options gives write access in the container. This is usually required. ``bash`` starts a interactive bash shell, like the ``/bin/bash`` command in Docker.
 
-Rerun the container with input/output directories mounted (the ``-b`` option is equivalent to the ``-v`` option in Docker)::
+Exit the container by ``Ctrl + d``, rerun the container with input/output directories mounted (the ``-b`` option is equivalent to the ``-v`` option in Docker)::
 
-  ch-run -b $HOME/ExtData:/ExtData -b $HOME/OutputDir:/OutputDir -w geoschem.gchp_model -- bash
+  ch-run -b $HOME/ExtData:/ExtData -b $HOME/OutputDir:/OutputDir -w geoschem.gc_model -- bash
 
 Inside the container, execute the model::
 
@@ -222,4 +222,4 @@ There are two ways of getting the data:
 
 2. `Harvard FTP <http://wiki.seas.harvard.edu/geos-chem/index.php/Downloading_GEOS-Chem_source_code_and_data>`_: This is the traditional way. The bandwidth is not as great as S3 but there is no charge on users.
 
-In our tests, transferring data from S3 is typically ~10x faster than transferring from traditional FTP (e.g. to the NASA Pleiades cluster). But this depends on the network of users' own servers.
+In our tests, transferring data from S3 is typically ~10x faster than transferring from traditional FTP (e.g. to the NASA Pleiades cluster). But this depends on the network of users' own servers.