From c2afebc1661471415166cf2e2d7c86789e6913cd Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 29 Mar 2022 14:20:26 +0200 Subject: [PATCH 1/3] Remove compass legacy info for cori, grizzly --- docs/users_guide/machines/cori.rst | 9 --------- docs/users_guide/machines/grizzly.rst | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/docs/users_guide/machines/cori.rst b/docs/users_guide/machines/cori.rst index 1a0a94dd64..61da4c0c18 100644 --- a/docs/users_guide/machines/cori.rst +++ b/docs/users_guide/machines/cori.rst @@ -3,15 +3,6 @@ Cori login: ``ssh $my_username@cori.nersc.gov`` -compass environment: - -.. code-block:: bash - - source /global/cfs/cdirs/e3sm/software/anaconda_envs/load_latest_compass.sh - -example compass config file: -`general.config.ocean_cori `_ - interactive login: .. code-block:: bash diff --git a/docs/users_guide/machines/grizzly.rst b/docs/users_guide/machines/grizzly.rst index d5b43213e4..c54814b6b3 100644 --- a/docs/users_guide/machines/grizzly.rst +++ b/docs/users_guide/machines/grizzly.rst @@ -64,17 +64,6 @@ Archiving * you can just copy files directly into here for a particular project. -git and compass environment, for all LANL IC machines: - -.. code-block:: bash - - module load git - module use /usr/projects/climate/SHARED_CLIMATE/modulefiles/all/ - module unload python - source /usr/projects/climate/SHARED_CLIMATE/anaconda_envs/load_latest_compass.sh - -Example compass config file for LANL IC: ``general.config.ocean_turq`` - LANL uses slurm. To obtain an interactive node: .. code-block:: bash From b09f02f016a242dbeb7ca51c7918ad48ac60276d Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 29 Mar 2022 14:22:43 +0200 Subject: [PATCH 2/3] Remove release caveat for grizzly in user's guide --- docs/users_guide/machines/grizzly.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docs/users_guide/machines/grizzly.rst b/docs/users_guide/machines/grizzly.rst index c54814b6b3..a01a2976eb 100644 --- a/docs/users_guide/machines/grizzly.rst +++ b/docs/users_guide/machines/grizzly.rst @@ -120,11 +120,6 @@ setting up test cases or a test suite: grizzly, gnu ------------ -.. note:: - - Compass 1.0.0 has not yet been released. The following will apply after - the release. - To load the compass environment and modules, and set appropriate environment variables: @@ -147,11 +142,6 @@ or grizzly, intel -------------- -.. note:: - - Compass 1.0.0 has not yet been released. The following will apply after - the release. - To load the compass environment and modules, and set appropriate environment variables: From 83f864fb56505d3b459da938254542b198273529 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 29 Mar 2022 14:28:01 +0200 Subject: [PATCH 3/3] More updates to grizzly User's Guide --- docs/users_guide/machines/grizzly.rst | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/users_guide/machines/grizzly.rst b/docs/users_guide/machines/grizzly.rst index a01a2976eb..180d377e92 100644 --- a/docs/users_guide/machines/grizzly.rst +++ b/docs/users_guide/machines/grizzly.rst @@ -131,13 +131,7 @@ To build the MPAS model with .. code-block:: bash - make CORE=landice gfortran - -or - -.. code-block:: bash - - make CORE=ocean gfortran + make gfortran grizzly, intel -------------- @@ -153,10 +147,4 @@ To build the MPAS model with .. code-block:: bash - make CORE=landice intel-mpi - -or - -.. code-block:: bash - - make CORE=ocean intel-mpi + make intel-mpi