From 6a63a809d7af22e76b757a144abca950005bc1ec Mon Sep 17 00:00:00 2001
From: Keith Oleson <oleson@ucar.edu>
Date: Tue, 30 Jul 2019 13:23:10 -0600
Subject: [PATCH 1/3] Adding build directories to .gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index c5eef823..73dcf5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,12 @@ diag_utils/dist/
 diagnostics/dist/
 timeseries/dist/
 
+cesm_utils/build/
+conform/build/
+diag_utils/build/
+diagnostics/build/
+timeseries/build/
+
 # Ignore cesm-env2
 cesm-env2/
 

From 3ad90811790346396beb0f4b8cc07b856e7df0bd Mon Sep 17 00:00:00 2001
From: Keith Oleson <oleson@ucar.edu>
Date: Thu, 31 Oct 2019 15:55:27 -0600
Subject: [PATCH 2/3] Backwards compatibility for model versions that don't
 have NPP_NUPTAKE

---
 lnd_diag/model1-model2/set_1.ncl |  1 +
 lnd_diag/shared/lnd_func.ncl     | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lnd_diag/model1-model2/set_1.ncl b/lnd_diag/model1-model2/set_1.ncl
index 089611dc..354ba45a 100755
--- a/lnd_diag/model1-model2/set_1.ncl
+++ b/lnd_diag/model1-model2/set_1.ncl
@@ -247,6 +247,7 @@ trendsFlag = stringtointeger(getenv("trends_match_Flag"))
               if (isvar("x")) then
                  delete(x)
               end if        
+              data(m,:) = data@_FillValue
               plot_check = False
               continue
            end if
diff --git a/lnd_diag/shared/lnd_func.ncl b/lnd_diag/shared/lnd_func.ncl
index 843d5bf2..8235e530 100755
--- a/lnd_diag/shared/lnd_func.ncl
+++ b/lnd_diag/shared/lnd_func.ncl
@@ -505,14 +505,19 @@ begin
 
   if(var_name.eq."NUPTAKE_FRACTION")then
     npp = ptr ->NPP
-    npp_nuptake = ptr ->NPP_NUPTAKE
+    if (isfilevar(ptr,"NPP_NUPTAKE")) then
+      npp_nuptake = ptr ->NPP_NUPTAKE
 
-    var = npp                    ; trick to retain meta data
-    nuptake_npp = npp_nuptake + npp
-    if (any(nuptake_npp .eq. 0)) then    ; set zeros to _FillValue
-      nuptake_npp = mask(nuptake_npp,(nuptake_npp .eq. 0),False)
+      var = npp                    ; trick to retain meta data
+      nuptake_npp = npp_nuptake + npp
+      if (any(nuptake_npp .eq. 0)) then    ; set zeros to _FillValue
+        nuptake_npp = mask(nuptake_npp,(nuptake_npp .eq. 0),False)
+      end if
+      var = npp_nuptake/nuptake_npp
+    else
+      var = npp
+      var = var@_FillValue
     end if
-    var = npp_nuptake/nuptake_npp
     return(var)
   end if
 

From 0f4bf3da63ba841709e7c80a9841d6e7b29d207e Mon Sep 17 00:00:00 2001
From: Keith Oleson <oleson@ucar.edu>
Date: Fri, 1 Nov 2019 10:39:03 -0600
Subject: [PATCH 3/3] Fix .gitignore

---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f53d191..d2aaf016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,12 +24,6 @@ diagnostics/dist/
 timeseries/dist/
 ocean_remap/dist/
 
-cesm_utils/build/
-conform/build/
-diag_utils/build/
-diagnostics/build/
-timeseries/build/
-
 # Ignore cesm-env2
 cesm-env2/