Skip to content

Commit

Permalink
Merge pull request #699 from PCMDI/cmor_3.7.2
Browse files Browse the repository at this point in the history
CMOR 3.7.2 Release
  • Loading branch information
mauzey1 authored Mar 23, 2023
2 parents 5b1acac + 78499da commit 8a5260d
Show file tree
Hide file tree
Showing 12 changed files with 1,867 additions and 1,148 deletions.
10 changes: 7 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ aliases:
name: setup_miniconda
command: |
source $BASH_ENV
git clone https://github.com/CDAT/cdat.git $WORKDIR/cdat
python $WORKDIR/cdat/scripts/install_miniconda.py -w $WORKDIR -p 'py3'
if [[ $OS == 'osx-64' ]]; then
curl -L https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o miniconda.sh
else
curl -L https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh
fi
bash miniconda.sh -b -p $WORKDIR/miniconda
- &conda_rerender
name: conda_rerender
Expand Down Expand Up @@ -110,7 +114,7 @@ jobs:
executor: << parameters.os >>
environment:
PKG_NAME: "cmor"
VERSION: "3.7.1"
VERSION: "3.7.2"
PYTHON_VERSION: << parameters.python_version >>
CHANNELS: "-c conda-forge"
steps:
Expand Down
6 changes: 3 additions & 3 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"description": "<p>Climate Model Output Rewriter</p>",
"access_right": "open",
"license": "BSD-3-Clause",
"title": "PCMDI/CMOR: CMOR v3.7.1",
"version": "v3.7.1",
"title": "PCMDI/CMOR: CMOR v3.7.2",
"version": "v3.7.2",
"upload_type": "software",
"publication_date": "2022-11-29",
"publication_date": "2023-03-23",
"creators": [
{
"name": "Mauzey, Chris",
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
INSTALLATION INSTRUCTIONS
-------------------------
Climate Model Output Rewriter (CMOR) version 3.7.1 installation instructions.
Climate Model Output Rewriter (CMOR) version 3.7.2 installation instructions.


DOWNLOAD
Expand All @@ -13,7 +13,7 @@ cd CMOR

INSTALLATION
------------
CMOR 3.7.1 requires external packages that need to be installed first.
CMOR 3.7.2 requires external packages that need to be installed first.
It can be compiled/linked against either NetCDF3 or NetCDF4. If you
decide to go with NetCDF4 be sure to build NetCDF4 with the
--enable-netcdf-4 option!
Expand Down
4 changes: 2 additions & 2 deletions Test/test_cmor_append_associated.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ void loopRoutine(char *times, char *returnvalue)
read_time(i, &Time[i-k*ntimes], &bnds_time[2 * (i-k*ntimes)]);

if(times)
ierr = cmor_axis(&axes_ids[0], "time", "months since 1980", NULL, NULL, 'd',
NULL, NULL, NULL);
ierr = cmor_axis(&axes_ids[0], "time", "months since 1980", 0, NULL, 'd',
NULL, 0, NULL);
else
ierr = cmor_axis(&axes_ids[0], "time", "months since 1980", ntimes, &Time[0], 'd',
&bnds_time[0], 2, NULL);
Expand Down
2 changes: 1 addition & 1 deletion Test/test_cmor_append_associated_point.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void loopRoutine(char *times, char *returnvalue)
read_time(i, &Time[i-k*ntimes], &bnds_time[2 * (i-k*ntimes)]);

if(times)
ierr = cmor_axis(&axes_ids[0], "time1", "months since 1980", NULL, NULL, 'd',
ierr = cmor_axis(&axes_ids[0], "time1", "months since 1980", 0, NULL, 'd',
NULL, 0, NULL);
else
ierr = cmor_axis(&axes_ids[0], "time1", "months since 1980", ntimes, &Time[0], 'd',
Expand Down
2 changes: 1 addition & 1 deletion Test/test_cmor_depth_coord_half.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int main()
ierr |= cmor_variable(&myvars[0], "zhalfo", "m", 4, axes_ids, 'd', NULL,
NULL, "", "zhalfo", "no history", "no future");

ierr |= cmor_write(myvars[0], zhalfo_data, 'd', NULL, NULL, NULL, NULL, NULL);
ierr |= cmor_write(myvars[0], zhalfo_data, 'd', NULL, 0, NULL, NULL, NULL);

ierr |= cmor_close_variable(myvars[0], returnvalue, NULL);

Expand Down
2 changes: 1 addition & 1 deletion Test/test_cmor_singleton_and_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ int main()
double lambda550[1] = {550.};

ierr |= cmor_axis(&axes_ids[4], "lambda550nm", "nm", 1, lambda550, 'd',
NULL, NULL, "");
NULL, 0, "");

double p0[1] = {101325.0};
double a_val[4] = {0, 0, 36.0317993164062, 171.845031738281};
Expand Down
2 changes: 1 addition & 1 deletion cmip6-cmor-tables
Loading

0 comments on commit 8a5260d

Please sign in to comment.