Update FourSeason run scripts with version information.

docs/source/SCREAMv0/DYAMOND2/simulation_data/index.rst

@@ -2,20 +2,30 @@
 Simulation Data 
 ***************
 
-The SCREAMv0 simulation data is available on **NERSC HPSS**.
 
-**If you have an account on NERSC**, you can retrieve the data locally or remotely using Globus.
 
-To download simulation data locally on a NERSC machine, refer to NERSC's documentation `here <https://docs.nersc.gov/filesystems/archive/#hsi-commands>`_.
+Instructions
+************
+
+The SCREAMv0 simulation data are available on **NERSC HPSS**.
+
+**If you have an account on NERSC**, you can retrieve the data locally or remotely using Globus. To download simulation data locally on a NERSC machine, refer to NERSC's documentation `here <https://docs.nersc.gov/filesystems/archive/#hsi-commands>`_.
 
 **If you do not have access to NERSC**, you can download simulation data directly through the  NERSC HPSS
 `web interface <https://portal.nersc.gov/archive/home/t/terai/www/SCREAM/SCREAMv0.SCREAM-DY2.ne1024pg2.20201127>`_.
 Note that this will be slow given the large file sizes.
 
+Original Run Scripts
+*********************
+
 Scripts originally used to run SCREAMv0 DYAMOND2 simulations are available `here <https://github.com/E3SM-Project/e3sm_data_docs/tree/main/run_scripts/SCREAMv0/original/>`_.
 
+**Warning, these will not run out-of-the-box**.  They are provided to give guidance for setting up a similar run.
+
+Table of simulation data
+************************
+
 .. toctree::
    :maxdepth: 2
-   :caption: Contents:
 
-   simulation_table
+   simulation_table

docs/source/SCREAMv1/FourSeasons/simulation_data/index.rst

@@ -2,34 +2,30 @@
 Simulation Data 
 ***************
 
-The SCREAMv1 FourSeasons simulation data is available on **NERSC HPSS**.
 
-**If you have an account on NERSC**, you can retrieve the data locally or remotely using Globus.
 
-To download simulation data locally on a NERSC machine: ::
+Instructions
+************
 
-   zstash extract --hpss=<HPSS path below>
+The SCREAMv1 FourSeasons simulation data are available on **NERSC HPSS**.
 
-To download simulation data remotely using the zstash Globus interface: ::
-
-   zstash extract --hpss=globus://nersc/<HPSS path below>
-
-or ::
-
-   zstash extract --hpss=globus://9cd89cfd-6d04-11e5-ba46-22000b92c6ec/<HPSS path below>
-
-Note that the data management tool `zstash <https://github.com/E3SM-Project/zstash>`_ is available from the `E3SM-Unified <https://github.com/E3SM-Project/e3sm-unified>`_ conda environment. 
-
-For more information, refer to `zstash usage <https://e3sm-project.github.io/zstash/_build/html/master/usage.html#extract>`_. 
+**If you have an account on NERSC**, you can retrieve the data locally or remotely using Globus. To download simulation data locally on a NERSC machine, refer to NERSC's documentation `here <https://docs.nersc.gov/filesystems/archive/#hsi-commands>`_.
 
 **If you do not have access to NERSC**, you can download simulation data directly through the  NERSC HPSS
 `web interface <https://portal.nersc.gov/archive/home/a/adonahue/www/>`_.
-Note that this will be slow and inefficient since you'll have to download the individual files.
+Note that this will be slow given the large file sizes.
+
+Original Run Scripts
+*********************
 
 Scripts originally used to run SCREAMv1 FourSeasons simulations are available `here <https://github.com/E3SM-Project/e3sm_data_docs/tree/main/run_scripts/SCREAMv1/original/>`_.
 
+**Warning, these will not run out-of-the-box**.  They are provided to give guidance for setting up a similar run.
+
+Table of simulation data
+************************
+
 .. toctree::
    :maxdepth: 2
-   :caption: Contents:
 
    simulation_table

run_scripts/SCREAMv1/original/run.production.ne1024pg2_screamv1.Apr.sh

@@ -5,11 +5,23 @@
 # Description:
 #
 # Submission script used for a 40-day ne1024pg2
-# simulation with the DYAMOND2 configuration.
+# simulation with the April configuration.
 #
+# All versions of the code used for FourSeasons
+# simulations can be found at:
+#
+# https://github.com/AaronDonahue/scream/releases
+#
+# Individual Hashes for versions:
+#
+#   Full Runs:    78d6bb1f8086b5aa1c13efa879ac36ea8d3c23f5
+#   SHOC Tuning:  793dde7b0f45a772a641993fb4ce32a1578a214a
+#   TMS:          a718a526952797af3adf08304f7d0561bc87acc7
+#   Cloud Tuning: 7ab7ecaaa8d36bc908a79aa9d5d9cdd976fc1e1f
 #==============================================#
 
 ## Location of eamxx codebase
+# NOTE TO USER: See above notes about which version of the code to use.
 eamxx_src=~/Code/scream
 ## Location of eamxx output control files
 eamxx_out_files_root=~/Code/scream-docs

run_scripts/SCREAMv1/original/run.production.ne1024pg2_screamv1.Oct.sh

@@ -5,11 +5,23 @@
 # Description:
 #
 # Submission script used for a 40-day ne1024pg2
-# simulation with the DYAMOND2 configuration.
+# simulation with the October configuration.
 #
+# All versions of the code used for FourSeasons
+# simulations can be found at:
+#
+# https://github.com/AaronDonahue/scream/releases
+#
+# Individual Hashes for versions:
+#
+#   Full Runs:    78d6bb1f8086b5aa1c13efa879ac36ea8d3c23f5
+#   SHOC Tuning:  793dde7b0f45a772a641993fb4ce32a1578a214a
+#   TMS:          a718a526952797af3adf08304f7d0561bc87acc7
+#   Cloud Tuning: 7ab7ecaaa8d36bc908a79aa9d5d9cdd976fc1e1f
 #==============================================#
 
 ## Location of eamxx codebase
+# NOTE TO USER: See above notes about which version of the code to use.
 eamxx_src=~/Code/scream
 ## Location of eamxx output control files
 eamxx_out_files_root=~/Code/scream-docs

run_scripts/SCREAMv1/original/run.production.ne1024pg2_screamv1.dyamond1.sh

@@ -5,11 +5,23 @@ USER_ENTRY#!/bin/sh -e
 # Description:
 #
 # Submission script used for a 40-day ne1024pg2
-# simulation with the DYAMOND2 configuration.
+# simulation with the DYAMOND1 configuration.
 #
+# All versions of the code used for FourSeasons
+# simulations can be found at:
+#
+# https://github.com/AaronDonahue/scream/releases
+#
+# Individual Hashes for versions:
+#
+#   Full Runs:    78d6bb1f8086b5aa1c13efa879ac36ea8d3c23f5
+#   SHOC Tuning:  793dde7b0f45a772a641993fb4ce32a1578a214a
+#   TMS:          a718a526952797af3adf08304f7d0561bc87acc7
+#   Cloud Tuning: 7ab7ecaaa8d36bc908a79aa9d5d9cdd976fc1e1f
 #==============================================#
 
 ## Location of eamxx codebase
+# NOTE TO USER: See above notes about which version of the code to use.
 eamxx_src=~/Code/scream
 ## Location of eamxx output control files
 eamxx_out_files_root=~/Code/scream-docs

run_scripts/SCREAMv1/original/run.production.ne1024pg2_screamv1.dyamond2.sh

@@ -7,9 +7,21 @@
 # Submission script used for a 40-day ne1024pg2
 # simulation with the DYAMOND2 configuration.
 #
+# All versions of the code used for FourSeasons
+# simulations can be found at:
+#
+# https://github.com/AaronDonahue/scream/releases
+#
+# Individual Hashes for versions:
+#
+#   Full Runs:    78d6bb1f8086b5aa1c13efa879ac36ea8d3c23f5
+#   SHOC Tuning:  793dde7b0f45a772a641993fb4ce32a1578a214a
+#   TMS:          a718a526952797af3adf08304f7d0561bc87acc7
+#   Cloud Tuning: 7ab7ecaaa8d36bc908a79aa9d5d9cdd976fc1e1f
 #==============================================#
 
 ## Location of eamxx codebase
+# NOTE TO USER: See above notes about which version of the code to use.
 eamxx_src=~/Code/scream
 ## Location of eamxx output control files
 eamxx_out_files_root=~/Code/scream-docs

utils/generate_html.bash

@@ -1,4 +1,4 @@
-pr_num=50
+pr_num=52
 
 # Chrysalis
 #destination_dir=/lcrc/group/e3sm/public_html/diagnostic_output/$USER/data_docs_${pr_num}
@@ -7,7 +7,7 @@ pr_num=50
 destination_dir=/global/cfs/cdirs/e3sm/www/$USER/data_docs_${pr_num}
 web_page="https://portal.nersc.gov/cfs/e3sm/$USER/data_docs_${pr_num}/html/"
 
-python generate_tables.py
+#python generate_tables.py
 cd ../docs/ && make html
 rm -rf ls ${destination_dir}
 mv _build ${destination_dir}