Skip to content

Commit 127b6d0

Browse files
authored
Merge pull request #342 from xylar/fix_users_guide
A few more small fixes to the User's Guide
2 parents e892185 + 83f864f commit 127b6d0

File tree

2 files changed

+2
-44
lines changed

2 files changed

+2
-44
lines changed

docs/users_guide/machines/cori.rst

-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ Cori
33

44
login: ``ssh [email protected]``
55

6-
compass environment:
7-
8-
.. code-block:: bash
9-
10-
source /global/cfs/cdirs/e3sm/software/anaconda_envs/load_latest_compass.sh
11-
12-
example compass config file:
13-
`general.config.ocean_cori <https://gist.github.com/mark-petersen/c61095d65216415ee0bb62a76da3c6cb>`_
14-
156
interactive login:
167

178
.. code-block:: bash

docs/users_guide/machines/grizzly.rst

+2-35
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@ Archiving
6464

6565
* you can just copy files directly into here for a particular project.
6666

67-
git and compass environment, for all LANL IC machines:
68-
69-
.. code-block:: bash
70-
71-
module load git
72-
module use /usr/projects/climate/SHARED_CLIMATE/modulefiles/all/
73-
module unload python
74-
source /usr/projects/climate/SHARED_CLIMATE/anaconda_envs/load_latest_compass.sh
75-
76-
Example compass config file for LANL IC: ``general.config.ocean_turq``
77-
7867
LANL uses slurm. To obtain an interactive node:
7968

8069
.. code-block:: bash
@@ -131,11 +120,6 @@ setting up test cases or a test suite:
131120
grizzly, gnu
132121
------------
133122

134-
.. note::
135-
136-
Compass 1.0.0 has not yet been released. The following will apply after
137-
the release.
138-
139123
To load the compass environment and modules, and set appropriate environment
140124
variables:
141125

@@ -147,22 +131,11 @@ To build the MPAS model with
147131

148132
.. code-block:: bash
149133
150-
make CORE=landice gfortran
151-
152-
or
153-
154-
.. code-block:: bash
155-
156-
make CORE=ocean gfortran
134+
make gfortran
157135
158136
grizzly, intel
159137
--------------
160138

161-
.. note::
162-
163-
Compass 1.0.0 has not yet been released. The following will apply after
164-
the release.
165-
166139
To load the compass environment and modules, and set appropriate environment
167140
variables:
168141

@@ -174,10 +147,4 @@ To build the MPAS model with
174147

175148
.. code-block:: bash
176149
177-
make CORE=landice intel-mpi
178-
179-
or
180-
181-
.. code-block:: bash
182-
183-
make CORE=ocean intel-mpi
150+
make intel-mpi

0 commit comments

Comments
 (0)