Skip to content

Commit

Permalink
Merge pull request #226 from PCMDI/cmor_3.4.0
Browse files Browse the repository at this point in the history 
Cmor 3.4.0
  • Loading branch information
@mauzey1
mauzey1 authored Dec 20, 2018
2 parents 18afc42 + 7e335ef commit fdc5477
Show file tree
Hide file tree
Showing 46 changed files with 102 additions and 99 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
- run: *setup_cmor
- run: *run_prepare_tests


linux_cmip6:
machine:
image: circleci/classic:latest
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_3hr.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table 3hr",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_6hrLev.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table 6hrLev",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_6hrPlev.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table 6hrPlev",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_6hrPlevPt.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table 6hrPlevPt",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_AERday.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table AERday",
"realm": "aerosol",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
8 changes: 4 additions & 4 deletions Tables/CMIP6_AERhr.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table AERhr",
"realm": "aerosol",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
"approx_interval": "1.0",
"generic_levels": "0.017361",
"approx_interval": "0.041667",
"generic_levels": "alevel alevhalf",
"mip_era": "CMIP6",
"Conventions": "CF-1.7 CMIP-6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_AERmon.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table AERmon",
"realm": "aerosol",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_AERmonZ.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table AERmonZ",
"realm": "aerosol",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_Amon.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table Amon",
"realm": "atmos atmosChem",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_CF3hr.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table CF3hr",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_CFday.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table CFday",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_CFmon.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table CFmon",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
6 changes: 4 additions & 2 deletions Tables/CMIP6_CFsubhr.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table CFsubhr",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
"approx_interval": "0.017361",
"approx_interval_error": "0.90",
"approx_interval_warning": "0.5",
"generic_levels": "alevel alevhalf",
"mip_era": "CMIP6",
"Conventions": "CF-1.7 CMIP-6.2"
Expand Down
Empty file removed Tables/CMIP6_CV_test.json
View file
Empty file.
6 changes: 3 additions & 3 deletions Tables/CMIP6_E1hr.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table E1hr",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
"approx_interval": "0.017361",
"approx_interval": "0.041667",
"generic_levels": "",
"mip_era": "CMIP6",
"Conventions": "CF-1.7 CMIP-6.2"
Expand Down
6 changes: 3 additions & 3 deletions Tables/CMIP6_E1hrClimMon.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table E1hrClimMon",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
"approx_interval": "0.017361",
"approx_interval": "0.041667",
"generic_levels": "",
"mip_era": "CMIP6",
"Conventions": "CF-1.7 CMIP-6.2"
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_E3hr.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table E3hr",
"realm": "land",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_E3hrPt.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table E3hrPt",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_E6hrZ.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table E6hrZ",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_Eday.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table Eday",
"realm": "land",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_EdayZ.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table EdayZ",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_Efx.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table Efx",
"realm": "land",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_Emon.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table Emon",
"realm": "land",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_EmonZ.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table EmonZ",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
6 changes: 4 additions & 2 deletions Tables/CMIP6_Esubhr.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table Esubhr",
"realm": "atmos",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
"approx_interval": "0.017361",
"approx_interval_error": "0.90",
"approx_interval_warning": "0.5",
"generic_levels": "alevel alevhalf",
"mip_era": "CMIP6",
"Conventions": "CF-1.7 CMIP-6.2"
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_Eyr.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table Eyr",
"realm": "land",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_IfxAnt.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table IfxAnt",
"realm": "landIce",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
4 changes: 2 additions & 2 deletions Tables/CMIP6_IfxGre.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Header": {
"data_specs_version": "01.00.29",
"cmor_version": "3.3",
"cmor_version": "3.4",
"table_id": "Table IfxGre",
"realm": "landIce",
"table_date": "13 December 2018",
"table_date": "14 December 2018",
"missing_value": "1e20",
"int_missing_value": "-999",
"product": "model-output",
Expand Down
Loading

0 comments on commit fdc5477

Please sign in to comment.