Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add POP tx1 grid. #201

Merged
merged 4 commits into from
Oct 9, 2018
Merged

Add POP tx1 grid. #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55bfe41
Add POP tripole support
dabail10 Oct 8, 2018
8191048
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Oct 9, 2018
6a57acf
Add tx1 test to base suite.
dabail10 Oct 9, 2018
a97a9f7
Update documentation.
dabail10 Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions configuration/scripts/options/set_nml.tx1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
dt = 3600.0
runtype = 'initial'
ice_ic = 'default'
grid_format = 'bin'
grid_type = 'tripole'
grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/tx1/grid_tx1.bin'
kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/tx1/kmt_tx1.bin'
fyear_init = 1997
atm_data_format = 'bin'
atm_data_type = 'clim'
atm_data_dir = 'none'

1 change: 1 addition & 0 deletions configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run
smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day
decomp gx3 4x2x25x29x5
restart gx1 40x4 droundrobin,short
restart tx1 40x4 dsectrobin,short
restart gx3 4x4 none
restart gx3 4x4 iobinary
restart gx3 6x2 alt01
Expand Down
4 changes: 3 additions & 1 deletion doc/source/user_guide/ug_implementation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ including that used for the column configuration. The input files
**global\_gx3.grid** and **global\_gx3.kmt** contain the
:math:`\left<3^\circ\right>` POP grid and land mask;
**global\_gx1.grid** and **global\_gx1.kmt** contain the
:math:`\left<1^\circ\right>` grid and land mask. These are binary
:math:`\left<1^\circ\right>` grid and land mask, and **global\_tx1.grid**
and **global\_tx1.kmt** contain the :math:`\left<1^\circ\right>` POP
tripole grid and land mask. These are binary
unformatted, direct access files produced on an SGI (Big Endian). If you
are using an incompatible (Little Endian) architecture, choose
`rectangular` instead of `displaced\_pole` in **ice\_in**, or follow
Expand Down
6 changes: 3 additions & 3 deletions doc/source/user_guide/ug_running.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Testing will be described in greater detail in the :ref:`testing` section.
specifies a batch account number. This is optional. See :ref:`account` for more information.

``--grid``, ``-g`` GRID
specifies the grid. This is a string and for the current CICE driver, gx1 and gx3 are supported. (default = gx3)
specifies the grid. This is a string and for the current CICE driver, gx1, gx3, and tx1 are supported. (default = gx3)

``--set``, ``-s`` SET1,SET2,SET3
specifies the optional settings for the case. The settings for ``--suite`` are defined in the suite file. Multiple settings can be specified by providing a comma deliminated set of values without spaces between settings. The available settings are in **configurations/scripts/options** and ``cice.setup --help`` will also list them. These settings files can change either the namelist values or overall case settings (such as the debug flag).
Expand Down Expand Up @@ -162,7 +162,7 @@ Some of the options are

``short``, ``medium``, ``long`` which change the batch time limit

``gx3`` and ``gx1`` are associate with grid specific settings
``gx3``, ``gx1``, ``tx1`` are associate with grid specific settings

``diag1`` which turns on diagnostics each timestep

Expand Down Expand Up @@ -355,7 +355,7 @@ Table :ref:`comp-ice` shows configuration options available in **comp_ice**.
+---------------------+--------------------------------------+------------------------------------------------------------------------------------+
| variable | options | description |
+=====================+======================================+====================================================================================+
|RES | col, gx3, gx1 | grid resolution |
|RES | col, gx3, gx1, tx1 | grid resolution |
+---------------------+--------------------------------------+------------------------------------------------------------------------------------+
|NTASK | (integer) | total number of processors |
+---------------------+--------------------------------------+------------------------------------------------------------------------------------+
Expand Down