Merge pull request #214 from olyson/master

Backwards compatibility for model versions that don't have NPP_NUPTAKE
NCAR · Nov 4, 2019 · 469c5da · 469c5da
2 parents bcaa6d7 + 0f4bf3d
commit 469c5da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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