Updated for new release - 1.1.2; CMOR 3.2.3

PCMDI · Apr 20, 2017 · e90e97d · e90e97d
1 parent 4d1afdf
commit e90e97d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/make_newVsOldDiffsMP.py b/make_newVsOldDiffsMP.py
@@ -26,6 +26,7 @@
 PJD 20 Oct 2016     - Update to 1.1.1
 PJD 14 Apr 2017     - Update to 1.1.2
 PJD 19 Apr 2017     - Updated to deal with K -> degC units change in tos
+PJD 20 Apr 2017     - Corrected incorrect file open for s2 variable
 
 @author: durack1
 """
@@ -91,7 +92,6 @@ def initVCS(x,levs1,levs2,split):
 
     return iso1,iso2,title,t1,t2,t3
 
-
 #%% Create input file list
 newList    = sorted(glob.glob('/work/durack1/Shared/150219_AMIPForcingData/CMIP6/input4MIPs/PCMDI/SSTsAndSeaIce/CMIP/mon/*/PCMDI-AMIP-1-1-2/*/gn/*/*.nc'))
 for x,filePath in enumerate(newList):
@@ -184,7 +184,7 @@ def initVCS(x,levs1,levs2,split):
         else:
             varNameNewRead = varNameRead
             inflationFactor = 1
-            unitFactor = 273.16
+            unitFactor = 273.16 ; # Fudge for errored V1.1.2 and earlier
         newList = eval(''.join([varName,BC,'List']))
         oldList = eval(''.join([varName,BC,'List2']))
         x = vcs.init()
@@ -195,7 +195,7 @@ def initVCS(x,levs1,levs2,split):
         f1  = cdm.open(newList) ; # New files
         s1  = f1(varNameNewRead,time=(str(y1),str(y2)))
         f2  = cdm.open(oldList) ; # Downloadable files ~2012
-        s2  = f1(varNameNewRead,time=(str(y1),str(y2)))
+        s2  = f2(varNameNewRead,time=(str(y1),str(y2)))
         # Deal with older file formats
         for count,y in enumerate(range(y1,y2),start=y1-1870):
             for m in range(12):