Skip to content

Commit ce8cc30

Browse files
authored
Update Icepack, update documentation, minor bibtex and gptl updates (CICE-Consortium#1015)
Update Icepack to #51695d08d92c20 April 4, 2025. Includes - Update derecho gnu and code coverage capability - Update Copyright - Fix bug with calc_Tsfc=F, set_sfcflux arguments reversed in icepack_therm_vertical.F90 - Fix negative silicate bgc bug - Update of Mosaic forcing option Comment out gptl pid check in ice_memusage_gptl.c. The check is not needed, and the arbitrary value of 999999 occasionally fails because on many systems the upper limit is higher. This has not come up in CICE, but it has been noted in other models' use of gptl, https://cerfacs.fr/site-oasis/forum/oa_main.php?c=177. Update documentation regarding history variable units and cona and conb history variable conversion terms. Update sphinx-bibtex version in doc requirements. Readthedocs now works with the latest version.
1 parent 3466a02 commit ce8cc30

5 files changed

Lines changed: 20 additions & 7 deletions

File tree

cicecore/cicedyn/infrastructure/ice_memusage_gptl.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,12 @@ int ice_memusage_gptl (int *size, int *rss, int *share, int *text, int *datastac
179179
*/
180180

181181
pid = (int) getpid ();
182-
if (pid > 999999) {
183-
fprintf (stderr, "get_memusage: pid %d is too large\n", pid);
184-
return -1;
185-
}
182+
/* tcraig, not needed and can be problematic
183+
** if (pid > 999999) {
184+
** fprintf (stderr, "get_memusage: pid %d is too large\n", pid);
185+
** return -1;
186+
** }
187+
*/
186188

187189
sprintf (file, "%s%d%s", head, pid, tail);
188190
if ((fd = fopen (file, "r")) < 0) {

doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
22
#
3-
sphinxcontrib-bibtex<2.0.0
3+
sphinxcontrib-bibtex
44
#
55
#

doc/source/cice_index.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ Index of primary variables and parameters
77

88
This index defines many (but not all) of the symbols used frequently in the CICE model
99
code. All quantities in the code are expressed in MKS units (temperatures may take
10-
either Celsius or Kelvin units). Deprecated parameters are listed at the end.
10+
either Celsius or Kelvin units). Deprecated parameters are listed at the end. Units are
11+
as defined inside the model. Units on history files may be different and are documented
12+
in history file metadata.
1113

1214
Namelist variables are partly included here, but they are fully documented in
1315
section :ref:`tabnamelist`.
@@ -110,6 +112,8 @@ section :ref:`tabnamelist`.
110112
"cm_to_m", "cm to meters conversion", "0.01"
111113
"coldice", "value for constant albedo parameterization", "0.70"
112114
"coldsnow", "value for constant albedo parameterization", "0.81"
115+
"cona", "history units conversion variable, multiplication term", "1.0"
116+
"conb", "history units conversion variable, additive term", "0.0"
113117
"conduct", "conductivity parameterization", ""
114118
"congel", "basal ice growth", "m"
115119
"conserv_check", "if true, check conservation", ""

doc/source/user_guide/ug_implementation.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,6 +1366,13 @@ another that is multiplied by :math:`a_i`, representing an average over
13661366
the grid cell area. Our naming convention attaches the suffix “_ai" to
13671367
the grid-cell-mean variable names.
13681368

1369+
The units of the variables on the history file may not match internal model units. For
1370+
netCDF files, variable units are defined in metadata. History variable conversion from
1371+
internal model units is carried out by the ``cona`` and ``conb`` arguments defined in
1372+
subroutine **define_hist_field**. ``cona`` and ``conb`` are multiplicative and additive
1373+
terms respectively that are hardwired into the source code to convert model units to
1374+
history units.
1375+
13691376
Beginning with CICE v6, history variables requested by the Sea Ice Model Intercomparison
13701377
Project (SIMIP) :cite:`Notz16` have been added as possible history output variables (e.g.
13711378
``f_sithick``, ``f_sidmassgrowthbottom``, etc.). The lists of

0 commit comments

Comments
 (0)