Merge pull request #52 from PCMDI/issue40_durack1_UpdateDemoToDealWit…

…hNewTables Update demo for CMOR 3.2.5; ODS-v2.0.0
PCMDI · Jul 17, 2017 · 52c7ee1 · 52c7ee1
2 parents 2a66a56 + 87c95ff
commit 52c7ee1
Show file tree

Hide file tree

Showing 36 changed files with 7,541 additions and 1,238 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
-CMIP6_Amon.json
 ~$.xlsx
 *.json~
 *.sh~
 *.py~
 *.swp
-demo/obs4MIPs
+demo/demo
diff --git a/Tables/obs4MIPs_Aday.json b/Tables/obs4MIPs_Aday.json
@@ -10,7 +10,7 @@
         "product":"observations",
         "realm":"atmos",
         "table_date":"17 July 2017",
-        "table_id":"Table obs4MIPs_Aday"
+        "table_id":"Aday"
     },
     "variable_entry":{
         "clt":{

diff --git a/Tables/obs4MIPs_Amon.json b/Tables/obs4MIPs_Amon.json
@@ -10,7 +10,7 @@
         "product":"observations",
         "realm":"atmos",
         "table_date":"17 July 2017",
-        "table_id":"Table obs4MIPs_Amon"
+        "table_id":"Amon"
     },
     "variable_entry":{
         "ccb":{

diff --git a/Tables/obs4MIPs_Lmon.json b/Tables/obs4MIPs_Lmon.json
@@ -10,7 +10,7 @@
         "product":"observations",
         "realm":"land",
         "table_date":"17 July 2017",
-        "table_id":"Table obs4MIPs_Lmon"
+        "table_id":"Lmon"
     },
     "variable_entry":{
         "baresoilFrac":{

diff --git a/Tables/obs4MIPs_Omon.json b/Tables/obs4MIPs_Omon.json
@@ -10,7 +10,7 @@
         "product":"observations",
         "realm":"ocean",
         "table_date":"17 July 2017",
-        "table_id":"Table obs4MIPs_Omon"
+        "table_id":"Omon"
     },
     "variable_entry":{
         "agessc":{

diff --git a/Tables/obs4MIPs_SImon.json b/Tables/obs4MIPs_SImon.json
@@ -10,7 +10,7 @@
         "product":"observations",
         "realm":"seaIce",
         "table_date":"17 July 2017",
-        "table_id":"Table obs4MIPs_SImon"
+        "table_id":"SImon"
     },
     "variable_entry":{
         "siage":{

diff --git a/Tables/obs4MIPs_fx.json b/Tables/obs4MIPs_fx.json
@@ -10,7 +10,7 @@
         "product":"observations",
         "realm":"fx",
         "table_date":"17 July 2017",
-        "table_id":"Table obs4MIPs_fx"
+        "table_id":"fx"
     },
     "variable_entry":{
         "areacella":{