From dbaf0cfc90d1b207f1b2181b702aa3f7a98aaaa7 Mon Sep 17 00:00:00 2001
From: mauzey1 <mauzey1@llnl.gov>
Date: Fri, 29 May 2020 13:26:13 -0700
Subject: [PATCH 1/2] Add orog2d and ps2d to formula terms.

---
 src/CMOR3_formula_terms.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/CMOR3_formula_terms.json b/src/CMOR3_formula_terms.json
index d81820d..fe4bedc 100644
--- a/src/CMOR3_formula_terms.json
+++ b/src/CMOR3_formula_terms.json
@@ -144,6 +144,15 @@
             "type": "real",
             "units": "m"
         },
+        "orog2d": {
+            "dimensions": "latitude", 
+            "long_name": "Surface Altitude", 
+            "name": "orog2d",
+            "out_name": "orog", 
+            "standard_name": "", 
+            "type": "real", 
+            "units": "m"
+        }, 
         "p0": {
             "dimensions": "",
             "long_name": "vertical coordinate formula term: reference pressure",
@@ -180,6 +189,15 @@
             "type": "real",
             "units": "Pa"
         },
+        "ps2d": {
+            "dimensions": "latitude time1",
+            "long_name": "Surface Air Pressure", 
+            "name": "ps2d",  
+            "out_name": "ps", 
+            "standard_name": "air_pressure", 
+            "type": "real",
+            "units": "Pa"
+        },
         "ptop": {
             "dimensions": "",
             "long_name": "pressure at top of model",

From 41eb61a81c5abb03a77ad6178e15c3da7415d805 Mon Sep 17 00:00:00 2001
From: mauzey1 <mauzey1@llnl.gov>
Date: Fri, 29 May 2020 13:33:04 -0700
Subject: [PATCH 2/2] Add orog2d and ps2d to CMIP6_formula_terms.json

---
 tables/CMIP6_formula_terms.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tables/CMIP6_formula_terms.json b/tables/CMIP6_formula_terms.json
index 37b931f..afcef0c 100644
--- a/tables/CMIP6_formula_terms.json
+++ b/tables/CMIP6_formula_terms.json
@@ -128,6 +128,14 @@
             "standard_name": "", 
             "type": "real"
         }, 
+        "orog2d": {
+            "long_name": "Surface Altitude", 
+            "units": "m", 
+            "dimensions": "latitude", 
+            "out_name": "orog", 
+            "standard_name": "", 
+            "type": "real"
+        }, 
         "p0": {
             "long_name": "vertical coordinate formula term: reference pressure", 
             "units": "Pa", 
@@ -160,6 +168,14 @@
             "standard_name": "air_pressure", 
             "type": "real"
         }, 
+        "ps2d": {
+            "long_name": "Surface Air Pressure", 
+            "units": "Pa", 
+            "dimensions": "latitude time1", 
+            "out_name": "ps", 
+            "standard_name": "air_pressure", 
+            "type": "real"
+        }, 
         "ptop": {
             "long_name": "pressure at top of model", 
             "units": "Pa",