From 56d6d81510ebc6dc64d938a7d3472936b011eab4 Mon Sep 17 00:00:00 2001 From: apcraig Date: Sat, 10 Aug 2019 17:26:26 +0000 Subject: [PATCH] update documentation --- doc/source/developer_guide/dg_scripts.rst | 2 +- doc/source/user_guide/ug_running.rst | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/source/developer_guide/dg_scripts.rst b/doc/source/developer_guide/dg_scripts.rst index 7d8d10b37..de5257bb6 100755 --- a/doc/source/developer_guide/dg_scripts.rst +++ b/doc/source/developer_guide/dg_scripts.rst @@ -86,7 +86,7 @@ Build Scripts CICE uses gmake to build the model. There is a common **Makefile** for all machines. Each machine provides a Macros file to define some Makefile variables and and an env file to specify the modules/software stack for each compiler. -The machine is build by the cice.build script which invokes gmake. +The machine is built by the cice.build script which invokes gmake. There is a special trap for circular dependencies in the cice.build script to highlight this error when it occurs. diff --git a/doc/source/user_guide/ug_running.rst b/doc/source/user_guide/ug_running.rst index c96622805..9b3569f80 100644 --- a/doc/source/user_guide/ug_running.rst +++ b/doc/source/user_guide/ug_running.rst @@ -13,6 +13,7 @@ Software Requirements ------- To run stand-alone, CICE requires + - gmake - Fortran and C compilers (intel, pgi, gnu, cray, and nag have been tested) - netcdf @@ -24,6 +25,7 @@ point, we are regularly testing on several different compilers, but not necessar possible compiler versions. The consortium has tested the following compilers at some point, + - intel 15.0.3.187 - intel 16.0.1.150 - intel 17.0.1.132 @@ -41,6 +43,7 @@ The consortium has tested the following compilers at some point, - nag 6.2 The consortium has tested the following mpi versions, + - mpich 7.3.2 - mpich 7.5.3 - mpich 7.6.2 @@ -54,6 +57,7 @@ The consortium has tested the following mpi versions, - openmpi 1.6.5 The netcdf implementation is relatively general and should work with any version of netcdf 3 or 4. The consortium has tested + - netcdf 4.3.0 - netcdf 4.3.2 - netcdf 4.4.0