uda cmip6 again

Author: aradhakrishnanGFDL

catalogbuilder/intakebuilder/getinfo.py

@@ -74,21 +74,22 @@ def getInfoFromFilename(filename,dictInfo,logger):
     if(filename.endswith(".nc")):
         ncfilename = filename.split(".")[0].split("_")
         varname = ncfilename[0]
-        dictInfo["variable"] = varname
-        dictInfo["mip_table"] = miptable
+        dictInfo["variable_id"] = varname
+        table_id = ncfilename[1]
+        dictInfo["table_id"] = table_id 
         modelname = ncfilename[2]
-        dictInfo["model"] = modelname
+        dictInfo["source_id"] = modelname
         expname = ncfilename[3]
         dictInfo["experiment_id"] = expname
         ens = ncfilename[4]
-        dictInfo["ensemble_member"] = ens
+        dictInfo["member_id"] = ens
         grid = ncfilename[5]
         dictInfo["grid_label"] = grid
         try:
            tsubset = ncfilename[6]
         except IndexError:
            tsubset = "null" #For fx fields
-        dictInfo["temporal_subset"] = tsubset
+        dictInfo["time_range"] = tsubset
     else:
         logger.debug("Filename not compatible with this version of the builder:"+filename)
     return dictInfo

catalogbuilder/intakebuilder/gfdlcrawler.py

@@ -75,7 +75,7 @@ def crawlLocal(projectdir, dictFilter,dictFilterIgnore,logger,configyaml,slow):
                    continue
                #if our filename expectations are not met compared to the output_file_path_template in config, skip the loop. TODO revisit for statics
                if ("static" not in filename):
-                 if ((len(filename.split('.'))-1) != len(set_ftemplate)):
+                 if ((len(filename.split('.'))-1) != len(set_ftemplate)) and ((len(filename.split('_'))) != len(set_ftemplate)):
                    logger.debug("Skipping "+filename)
                    continue 
                logger.debug(dirpath+"/"+filename)

catalogbuilder/scripts/gen_intake_gfdl.py

@@ -14,6 +14,7 @@
 
 try:
     from catalogbuilder.intakebuilder import gfdlcrawler, CSVwriter, configparser, getinfo
+    from catalogbuilder.tests.compval import compval as cv
 except ModuleNotFoundError:
     logger.warning("The module intakebuilder is not installed. Do you have intakebuilder in your sys.path or have you activated the conda environment with the intakebuilder package in it? ")
     logger.warning("Attempting again with adjusted sys.path ")