Added missing integer parameter for setting up variable. Using table values instead of file values for setting up variable.

Author: mauzey1

LibCV/PrePARE/PrePARE.py

@@ -535,8 +535,9 @@ def ControlVocab(self, ncfile, variable=None, print_all=True):
         # Setup variable
         # -------------------------------------------------------------------
         varid = cmip6_cv.setup_variable(variable_cmor_entry,
-                                        self.dictVar['units'],
-                                        self.dictVar['_FillValue'],
+                                        cmor_table['variable_entry'][variable_cmor_entry]['units'],
+                                        float(cmor_table['Header']['missing_value']),
+                                        int(cmor_table['Header']['int_missing_value']),
                                         startime,
                                         endtime,
                                         startimebnds,

LibCV/pywrapper.py

@@ -375,7 +375,7 @@ def check_ISOTime():
     return(ierr)
 
 
-def setup_variable(name, units, missing, startime,
+def setup_variable(name, units, missing, imissing, startime,
                    endtime, startimebnds, endtimebnds):
     '''
     Create variable  attributes from the table loaded by load_table.
@@ -385,7 +385,8 @@ def setup_variable(name, units, missing, startime,
     Where:
         name is the variable name to validate
         units are the variable units
-        missing is the missing value for this variable.
+        missing is the missing floating-point value for this variable.
+        imissing is the missing integer value for this variable.
         startime: time value for first part of timestap -- time[0]
         endtime: time value for last part of timestap -- time[-1]
         startimebnds: time bound value for first part of timestap -- time_bnds[0]
@@ -397,6 +398,7 @@ def setup_variable(name, units, missing, startime,
         name,
         units,
         missing,
+        imissing,
         startime,
         endtime,
         startimebnds,

Src/_controlvocabulary.c

@@ -4,7 +4,7 @@
 #include "numpy/arrayobject.h"
 #include "cmor.h"
 
-extern int cmor_CV_variable(int *, char *, char *, double *,
+extern int cmor_CV_variable(int *, char *, char *, float *, int *,
                             double, double, double, double);
 
 /************************************************************************/
@@ -570,7 +570,7 @@ static PyObject *PyCMOR_getincvalues(PyObject * self, PyObject * args)
 }
 
 /************************************************************************/
-/*                       PyCV_check_variable()                          */
+/*                       PyCV_setup_variable()                          */
 /************************************************************************/
 static PyObject *PyCV_setup_variable(PyObject * self, PyObject * args)
 {
@@ -585,13 +585,13 @@ static PyObject *PyCV_setup_variable(PyObject * self, PyObject * args)
 
     int var_id;
 
-    if (!PyArg_ParseTuple(args, "ssfdddd", &name, &units, &missing,
+    if (!PyArg_ParseTuple(args, "ssfidddd", &name, &units, &missing, &imissing,
                           &startime, &endtime, &startimebnds, &endtimebnds)) {
         return (Py_BuildValue("i", -1));
     }
 
-    cmor_CV_variable(&var_id, name, units, &missing, startime, endtime,
-                     startimebnds, endtimebnds);
+    cmor_CV_variable(&var_id, name, units, &missing, &imissing, 
+                     startime, endtime, startimebnds, endtimebnds);
 
     return (Py_BuildValue("i", var_id));
 

Src/cmor_CV.c

@@ -2289,7 +2289,8 @@ int cmor_CV_checkISOTime(char *szAttribute)
 /************************************************************************/
 /*                         cmor_CV_variable()                           */
 /************************************************************************/
-int cmor_CV_variable(int *var_id, char *name, char *units, float *missing,
+int cmor_CV_variable(int *var_id, char *name, char *units, 
+                     float *missing, int *imissing,
                      double startime, double endtime,
                      double startimebnds, double endtimebnds)
 {
@@ -2466,13 +2467,11 @@ int cmor_CV_variable(int *var_id, char *name, char *units, float *missing,
     }
 
     if (refvar.type == 'i') {
-        int nMissing;
-        nMissing = (int) *missing;
         cmor_vars[vrid].type = 'i';
         cmor_set_variable_attribute_internal(vrid, VARIABLE_ATT_MISSINGVALUES,
-                                         'i', &nMissing);
+                                         'i', &imissing);
         cmor_set_variable_attribute_internal(vrid, VARIABLE_ATT_FILLVAL, 'i',
-                                             &nMissing);
+                                             &imissing);
     } else {
         if (refvar.type == '\0') {
             cmor_vars[vrid].type = 'f';