Merge pull request #19 from cedadev/issue18

Set default location for standard name/area type table when called inline
cedadev · Mar 23, 2017 · 80f7235 · 80f7235
2 parents 2896960 + 977f8fb
commit 80f7235
Show file tree

Hide file tree

Showing 58 changed files with 33 additions and 33 deletions.
diff --git a/src/cfchecker/cfchecks.py b/src/cfchecker/cfchecks.py
@@ -284,7 +284,7 @@ class FatalCheckerError(Exception):
 #======================
 class CFChecker:
 
-  def __init__(self, uploader=None, useFileName="yes", badc=None, coards=None, cfStandardNamesXML=None, cfAreaTypesXML=None, version=newest_version, debug=False, silent=False):
+  def __init__(self, uploader=None, useFileName="yes", badc=None, coards=None, cfStandardNamesXML=STANDARDNAME, cfAreaTypesXML=AREATYPES, version=newest_version, debug=False, silent=False):
       self.uploader = uploader
       self.useFileName = useFileName
       self.badc = badc

diff --git a/test_files/CF_1_0_OK.check b/test_files/CF_1_0_OK.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CF_1_0_OK.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/CF_1_0_OK.nc.gz b/test_files/CF_1_0_OK.nc.gz
diff --git a/test_files/CRM018_test1.check b/test_files/CRM018_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM018_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (2.6.1): No 'Conventions' attribute present
 ERROR: (7.1): bounds attribute referencing non-existent variable bounds_lat

diff --git a/test_files/CRM018_test1.nc.gz b/test_files/CRM018_test1.nc.gz
diff --git a/test_files/CRM021_test1.check b/test_files/CRM021_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM021_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/CRM021_test1.nc.gz b/test_files/CRM021_test1.nc.gz
diff --git a/test_files/CRM024_test1.check b/test_files/CRM024_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM024_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 ERROR: (2.6.1): This netCDF file does not appear to contain CF Convention data.
 ERROR: (5.6): MSLP - Invalid syntax for 'grid_mapping' attribute

diff --git a/test_files/CRM024_test1.nc.gz b/test_files/CRM024_test1.nc.gz
diff --git a/test_files/CRM026_test2.check b/test_files/CRM026_test2.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM026_test2.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/CRM026_test2.nc.gz b/test_files/CRM026_test2.nc.gz
diff --git a/test_files/CRM027_test1.check b/test_files/CRM027_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM027_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (7.1): Data for variable time lies outside cell boundaries
 

diff --git a/test_files/CRM027_test1.nc.gz b/test_files/CRM027_test1.nc.gz
diff --git a/test_files/CRM027_test2.check b/test_files/CRM027_test2.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM027_test2.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (7.1): Data for variable time lies outside cell boundaries
 

diff --git a/test_files/CRM027_test2.nc.gz b/test_files/CRM027_test2.nc.gz
diff --git a/test_files/CRM028_test1.check b/test_files/CRM028_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM028_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (2.6.1): No 'Conventions' attribute present
 

diff --git a/test_files/CRM028_test1.nc.gz b/test_files/CRM028_test1.nc.gz
diff --git a/test_files/CRM032_test1.check b/test_files/CRM032_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM032_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 ERROR: (2.6.1): This netCDF file does not appear to contain CF Convention data.
 ERROR: (5.6): MSLP - Invalid syntax for 'grid_mapping' attribute

diff --git a/test_files/CRM032_test1.nc.gz b/test_files/CRM032_test1.nc.gz
diff --git a/test_files/CRM033_test1.check b/test_files/CRM033_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM033_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (2.6.1): No 'Conventions' attribute present
 

diff --git a/test_files/CRM033_test1.nc.gz b/test_files/CRM033_test1.nc.gz
diff --git a/test_files/CRM035.check b/test_files/CRM035.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM035.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (2.6.1): No 'Conventions' attribute present
 

diff --git a/test_files/CRM035.nc.gz b/test_files/CRM035.nc.gz
diff --git a/test_files/CRM037.check b/test_files/CRM037.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM037.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/CRM037.nc.gz b/test_files/CRM037.nc.gz
diff --git a/test_files/CRM038.check b/test_files/CRM038.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM038.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/CRM038.nc.gz b/test_files/CRM038.nc.gz
diff --git a/test_files/CRM041.check b/test_files/CRM041.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: CRM041.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/CRM041.nc.gz b/test_files/CRM041.nc.gz
diff --git a/test_files/GregRappa.check b/test_files/GregRappa.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: GregRappa.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/GregRappa.nc.gz b/test_files/GregRappa.nc.gz
diff --git a/test_files/Trac020_test1.check b/test_files/Trac020_test1.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: Trac020_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/Trac020_test1.nc.gz b/test_files/Trac020_test1.nc.gz
diff --git a/test_files/Trac020_test2.check b/test_files/Trac020_test2.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: Trac020_test2.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/Trac020_test2.nc.gz b/test_files/Trac020_test2.nc.gz
diff --git a/test_files/Trac022.check b/test_files/Trac022.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: Trac022.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (2.6.1): No 'Conventions' attribute present
 

diff --git a/test_files/Trac022.nc.gz b/test_files/Trac022.nc.gz
diff --git a/test_files/Trac049_test1.check b/test_files/Trac049_test1.check
@@ -2,8 +2,8 @@ CHECKING NetCDF FILE: Trac049_test1.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.4
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
-Using Area Type Table Version 5 (25 January 2017)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
+Using Area Type Table Version 6 (22 February 2017)
 
 
 ------------------

diff --git a/test_files/Trac049_test1.nc.gz b/test_files/Trac049_test1.nc.gz
diff --git a/test_files/Trac049_test2.check b/test_files/Trac049_test2.check
@@ -2,8 +2,8 @@ CHECKING NetCDF FILE: Trac049_test2.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.4
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
-Using Area Type Table Version 5 (25 January 2017)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
+Using Area Type Table Version 6 (22 February 2017)
 
 
 ------------------

diff --git a/test_files/Trac049_test2.nc.gz b/test_files/Trac049_test2.nc.gz
diff --git a/test_files/UpgradeVn.pl b/test_files/UpgradeVn.pl
@@ -14,7 +14,7 @@
 #           $standardNameVN as appropriate.
 #-------------------------------------------------------------------------- 
 $checkerVN="3.0.0";
-$standardNameVN="39 (2016-12-16T16:59:53Z)";
+$standardNameVN="41 (2017-02-22T08:54:22Z)";
 
 $TEST_FILES_DIR="/home/ros/puma2/git-projects/cf-checker/test_files";
 chdir $TEST_FILES_DIR or die "Failed to cd to $TEST_FILES_DIR: $!\n";

diff --git a/test_files/badc_units.check b/test_files/badc_units.check
@@ -2,7 +2,7 @@
 CHECKING NetCDF FILE: badc_units.nc
 =====================
 Using CF Checker Version 3.0.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARNING (7.1): Data for variable time lies outside cell boundaries
 

diff --git a/test_files/cell_measures.check b/test_files/cell_measures.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: cell_measures.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 ERROR: (7.1): Incorrect dimensions for boundary variable: lon_vertices
 WARN: (7.1): Data for variable lon lies outside cell boundaries

diff --git a/test_files/cell_measures.nc.gz b/test_files/cell_measures.nc.gz
diff --git a/test_files/cell_methods.check b/test_files/cell_methods.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: cell_methods.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 ERROR: (7.1): Incorrect dimensions for boundary variable: lon_vertices
 WARN: (7.1): Data for variable lon lies outside cell boundaries

diff --git a/test_files/cell_methods.nc.gz b/test_files/cell_methods.nc.gz
diff --git a/test_files/complex.check b/test_files/complex.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: complex.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (2.6.1): No 'Conventions' attribute present
 WARN: (7.1): Data for variable lat lies outside cell boundaries

diff --git a/test_files/complex.nc.gz b/test_files/complex.nc.gz
diff --git a/test_files/flag_tests.check b/test_files/flag_tests.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: flag_tests.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.3
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/flag_tests.nc.gz b/test_files/flag_tests.nc.gz
diff --git a/test_files/formula_terms.check b/test_files/formula_terms.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: formula_terms.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 WARN: (7.1): Data for variable lat lies outside cell boundaries
 

diff --git a/test_files/formula_terms.nc.gz b/test_files/formula_terms.nc.gz
diff --git a/test_files/hfogo_O1_labelVariable_KT.check b/test_files/hfogo_O1_labelVariable_KT.check
@@ -2,7 +2,7 @@ CHECKING NetCDF FILE: hfogo_O1_labelVariable_KT.nc
 =====================
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.0
-Using Standard Name Table Version 40 (2017-01-25T13:15:07Z)
+Using Standard Name Table Version 41 (2017-02-22T08:54:22Z)
 
 
 ------------------

diff --git a/test_files/hfogo_O1_labelVariable_KT.nc.gz b/test_files/hfogo_O1_labelVariable_KT.nc.gz
diff --git a/test_files/stdName_test.check b/test_files/stdName_test.check
@@ -3,7 +3,7 @@ CHECKING NetCDF FILE: stdName_test.nc
 Using CF Checker Version 3.0.0
 Checking against CF Version CF-1.6
 Using Standard Name Table Version 2 (2006-09-26T18:12:43Z)
-Using Area Type Table Version 5 (25 January 2017)
+Using Area Type Table Version 6 (22 February 2017)
 
 WARN: (2.6.1): Inconsistency - This netCDF file appears to contain CF-1.0 data, but you've requested a validity check against CF-1.6
 ERROR: (7.1): Boundary var time_bnds has inconsistent std_name to time

diff --git a/test_files/stdName_test.nc.gz b/test_files/stdName_test.nc.gz
diff --git a/test_files/tests.sh b/test_files/tests.sh
@@ -9,7 +9,7 @@ mkdir $outdir
 std_name_table=http://cfconventions.org/Data/cf-standard-names/current/src/cf-standard-name-table.xml
 area_table=http://cfconventions.org/Data/area-type-table/current/src/area-type-table.xml
 
-cfchecker="cfchecks"
+cfchecker="/home/ros/puma2/dev/bin/cfchecks"
 
 failed=0