Merge pull request #52 from PCMDI/issue40_durack1_UpdateDemoToDealWithNewTables

Update demo for CMOR 3.2.5; ODS-v2.0.0

Author: gleckler1

.gitignore

@@ -1,7 +1,6 @@
-CMIP6_Amon.json
 ~$.xlsx
 *.json~
 *.sh~
 *.py~
 *.swp
-demo/obs4MIPs
+demo/demo

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":{

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":{

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":{

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":{

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":{

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":{