Index: /cf-checker/trunk/test_files/CRM041.check
===================================================================
--- /cf-checker/trunk/test_files/CRM041.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM041.check (revision 95)
@@ -4,5 +4,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/complex.check
===================================================================
--- /cf-checker/trunk/test_files/complex.check (revision 81)
+++ /cf-checker/trunk/test_files/complex.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 Warning: bounds variable not found in complex.nc: bounds_lat2d
Index: /cf-checker/trunk/test_files/GregRappa.check
===================================================================
--- /cf-checker/trunk/test_files/GregRappa.check (revision 81)
+++ /cf-checker/trunk/test_files/GregRappa.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/badc_units.check
===================================================================
--- /cf-checker/trunk/test_files/badc_units.check (revision 81)
+++ /cf-checker/trunk/test_files/badc_units.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (7.1): Data for variable time lies outside cell boundaries
Index: /cf-checker/trunk/test_files/Trac022.check
===================================================================
--- /cf-checker/trunk/test_files/Trac022.check (revision 81)
+++ /cf-checker/trunk/test_files/Trac022.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (2.6.1): No 'Conventions' attribute present
Index: /cf-checker/trunk/test_files/cell_measures.check
===================================================================
--- /cf-checker/trunk/test_files/cell_measures.check (revision 81)
+++ /cf-checker/trunk/test_files/cell_measures.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 ERROR (7.1): Incorrect dimensions for boundary variable: lon_vertices
Index: /cf-checker/trunk/test_files/CRM021_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM021_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM021_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/CRM024_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM024_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM024_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 ERROR (2.6.1): This netCDF file does not appear to contain CF Convention data.
Index: /cf-checker/trunk/test_files/UpgradeVn.pl
===================================================================
--- /cf-checker/trunk/test_files/UpgradeVn.pl (revision 81)
+++ /cf-checker/trunk/test_files/UpgradeVn.pl (revision 95)
@@ -15,5 +15,5 @@
 #-------------------------------------------------------------------------- 
 $checkerVN="1.10";
-$standardNameVN="11 (2008-11-11T11:00:00Z)";
+$standardNameVN="11 (2008-12-01T11:00:00Z)";
 
 $TEST_FILES_DIR="/home/ros/cf-checker/trunk/test_files";
Index: /cf-checker/trunk/test_files/CRM026_test2.check
===================================================================
--- /cf-checker/trunk/test_files/CRM026_test2.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM026_test2.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/CRM027_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM027_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM027_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (7.1): Data for variable time lies outside cell boundaries
Index: /cf-checker/trunk/test_files/Trac020_test1.check
===================================================================
--- /cf-checker/trunk/test_files/Trac020_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/Trac020_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/CRM027_test2.check
===================================================================
--- /cf-checker/trunk/test_files/CRM027_test2.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM027_test2.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (7.1): Data for variable time lies outside cell boundaries
Index: /cf-checker/trunk/test_files/CRM028_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM028_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM028_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (2.6.1): No 'Conventions' attribute present
Index: /cf-checker/trunk/test_files/flag_tests.check
===================================================================
--- /cf-checker/trunk/test_files/flag_tests.check (revision 84)
+++ /cf-checker/trunk/test_files/flag_tests.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/Trac020_test2.check
===================================================================
--- /cf-checker/trunk/test_files/Trac020_test2.check (revision 81)
+++ /cf-checker/trunk/test_files/Trac020_test2.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/tests.sh
===================================================================
--- /cf-checker/trunk/test_files/tests.sh (revision 84)
+++ /cf-checker/trunk/test_files/tests.sh (revision 95)
@@ -8,5 +8,5 @@
 
 export PYTHONPATH=/home/ros/software/python/cdat-lite:/home/ros/software/python/udunits
-std_name_table=http://cf-pcmdi.llnl.gov/documents/cf-standard-names/current/cf-standard-name-table.xml
+std_name_table=http://cf-pcmdi.llnl.gov/documents/cf-standard-names/standard-name-table/current/cf-standard-name-table.xml
 for file in `ls *.nc`
 do
Index: /cf-checker/trunk/test_files/cell_methods.check
===================================================================
--- /cf-checker/trunk/test_files/cell_methods.check (revision 81)
+++ /cf-checker/trunk/test_files/cell_methods.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 ERROR (7.1): Incorrect dimensions for boundary variable: lon_vertices
Index: /cf-checker/trunk/test_files/hfogo_O1_labelVariable_KT.check
===================================================================
--- /cf-checker/trunk/test_files/hfogo_O1_labelVariable_KT.check (revision 81)
+++ /cf-checker/trunk/test_files/hfogo_O1_labelVariable_KT.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/CRM035.check
===================================================================
--- /cf-checker/trunk/test_files/CRM035.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM035.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (2.6.1): No 'Conventions' attribute present
Index: /cf-checker/trunk/test_files/CRM037.check
===================================================================
--- /cf-checker/trunk/test_files/CRM037.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM037.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/CRM038.check
===================================================================
--- /cf-checker/trunk/test_files/CRM038.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM038.check (revision 95)
@@ -4,5 +4,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/formula_terms.check
===================================================================
--- /cf-checker/trunk/test_files/formula_terms.check (revision 81)
+++ /cf-checker/trunk/test_files/formula_terms.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (7.1): Data for variable lat lies outside cell boundaries
Index: /cf-checker/trunk/test_files/CF_1_0_OK.check
===================================================================
--- /cf-checker/trunk/test_files/CF_1_0_OK.check (revision 81)
+++ /cf-checker/trunk/test_files/CF_1_0_OK.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 
Index: /cf-checker/trunk/test_files/CRM032_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM032_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM032_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 ERROR (2.6.1): This netCDF file does not appear to contain CF Convention data.
Index: /cf-checker/trunk/test_files/CRM033_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM033_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM033_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (2.6.1): No 'Conventions' attribute present
Index: /cf-checker/trunk/test_files/CRM018_test1.check
===================================================================
--- /cf-checker/trunk/test_files/CRM018_test1.check (revision 81)
+++ /cf-checker/trunk/test_files/CRM018_test1.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 11 (2008-11-11T11:00:00Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING (2.6.1): No 'Conventions' attribute present
Index: /cf-checker/trunk/test_files/stdName_test.check
===================================================================
--- /cf-checker/trunk/test_files/stdName_test.check (revision 84)
+++ /cf-checker/trunk/test_files/stdName_test.check (revision 95)
@@ -3,5 +3,5 @@
 =====================
 Using CF Checker version 1.10
-Using Standard Name Table Version 2 (2006-09-26T18:12:43Z)
+Using Standard Name Table Version 11 (2008-12-01T11:00:00Z)
 
 WARNING: Inconsistency - The conventions attribute is set to CF-1.0, but you've requested a validity check against CF 1.3
Index: /cf-checker/trunk/src/cfchecks.py
===================================================================
--- /cf-checker/trunk/src/cfchecks.py (revision 84)
+++ /cf-checker/trunk/src/cfchecks.py (revision 95)
@@ -1616,5 +1616,6 @@
   #----------------------------
       var=self.f[varName]
-
+      rc=1
+      
       if var.attributes.has_key('flag_meanings'):
           # Flag to indicate whether one of flag_values or flag_masks present
@@ -1625,5 +1626,6 @@
                 print "ERROR (3.5): Invalid syntax for 'flag_meanings' attribute"
                 self.err = self.err+1
-                
+                rc=0
+          
           if var.attributes.has_key('flag_values'):
               values_or_masks=1
@@ -1637,12 +1639,15 @@
               if retcode == -1:
                   print "ERROR (3.5): Problem in subroutine equalNumOfValues"
+                  rc = 0
               elif not retcode:
                   print "ERROR (3.5): Number of flag_values values must equal the number or words/phrases in flag_meanings"
                   self.err = self.err + 1
-
+                  rc = 0
+                  
               # flag_values values must be mutually exclusive
               if not self.uniqueList(values):
                   print "ERROR (3.5): flag_values attribute must contain a list of unique values"
                   self.err = self.err + 1
+                  rc = 0
                   
           if var.attributes.has_key('flag_masks'):
@@ -1653,8 +1658,10 @@
               if retcode == -1:
                   print "ERROR (3.5): Problem in subroutine equalNumOfValues"
+                  rc = 0
               elif not retcode:
                   print "ERROR (3.5): Number of flag_masks values must equal the number or words/phrases in flag_meanings"
                   self.err = self.err + 1
-
+                  rc = 0
+                  
               # flag_values values must be non-zero
               for v in masks:
@@ -1662,5 +1669,6 @@
                       print "ERROR (3.5): flag_masks values must be non-zero"
                       self.err = self.err + 1
-
+                      rc = 0
+                      
           # Doesn't make sense to do bitwise comparision for char variable
           if var.typecode() != 'c':
@@ -1680,7 +1688,14 @@
           if values_or_masks == 0:
               # flag_meanings attribute present, but no flag_values or flag_masks
-              print "WARNING (3.5): flag_meanings present, but no flag_values or flag_masks specified"
-              self.warn = self.warn + 1
-          
+              print "ERROR (3.5): flag_meanings present, but no flag_values or flag_masks specified"
+              self.err = self.err + 1
+              rc = 0
+
+          if var.attributes.has_key('flag_values') and not var.attributes.has_key('flag_meanings'):
+              print "ERROR (3.5): flag_meanings attribute is missing"
+              self.err = self.err + 1
+              rc = 0
+              
+      return rc
 
   #-----------------------
@@ -1731,6 +1746,4 @@
 
       
-      
-      
   #------------------------------------------
   def chkMultiDimCoord(self, varName, axes):
@@ -1749,4 +1762,5 @@
               print "             should not match the name of any of its dimensions."
               self.warn = self.warn + 1
+
 
   #--------------------------------------