Merge pull request #219 from rigoudyg/V2.0.2_fix_small_issues

V2.0.2 fix small issues

climaf/classes.py

@@ -352,7 +352,10 @@ def __init__(self, **kwargs):
 
         Some attributes have a special format or processing :
 
-        - period : see :py:func:`~climaf.period.init_period`
+        - period : see :py:func:`~climaf.period.init_period`. See also  
+          function :py:func:`climaf.classes.ds` for added
+          flexibility in defining periods as last of first set of years 
+          among available data
 
         - domain : allowed values are either 'global' or a list for
           latlon corners ordered as in : [ latmin, latmax, lonmin,
@@ -781,20 +784,26 @@ def baseFiles(self, force=False, ensure_dataset=True):
         for the dataset
 
         Use cached value (i.e. attribute 'files') unless called with arg force=True
+
         If ensure_dataset is True, forbid ambiguous datasets
         """
         if (force and self.project != 'file') or self.files is None:
             if ensure_dataset:
                 self.explore()
             else:
-                self.explore(option='choices')
+                cases = self.explore(option='choices')
+                list_keys = [ k for k in cases if type(cases[k]) is list and k != 'period' ]
+                if len(list_keys) > 0:
+                    clogger.error("The dataset is ambiguous on %s; its CRS is %s"%(cases,self))
+                    return None
         return self.files
 
     def listfiles(self, force=False, ensure_dataset=True):
         """ Returns the list of (local or remote) files which include the data
         for the dataset
 
         Use cached value unless called with arg force=True
+
         If ensure_dataset is True, forbid ambiguous datasets
         """
         return self.baseFiles(force=force, ensure_dataset=ensure_dataset)

climaf/functions.py

@@ -176,7 +176,7 @@ def fadd(dat1, dat2):
 
 def fsub(dat1, dat2):
     """
-    Substraction of two CliMAF object, or multiplication of the CliMAF object given as first argument
+    Substraction of two CliMAF object, or substraction of the CliMAF object given as first argument
     and a constant as second argument (string, float or integer)
 
     Shortcut to ccdo(dat,operator='subc,'+str(c)) and ccdo2(dat1,dat2,operator='sub')

climaf/projects/em.py

@@ -65,18 +65,18 @@
 
     # User simulations
     pathg = "${root}/${group}/${simulation}/"
-    pathA = pathg + "${realm}/${simulation}PLYYYY.nc"  # GSAG
-    pathL = pathg + "${realm}/${simulation}SFXYYYY.nc"
-    pathI = pathg + "${realm}/${variable}_O1_YYYY-YYYY.nc"  # HISTNATr8
+    pathA = pathg + "${realm}/${simulation}PL${PERIOD}.nc"  # GSAG
+    pathL = pathg + "${realm}/${simulation}SFX${PERIOD}.nc"
+    pathI = pathg + "${realm}/${variable}_O1_${PERIOD}-${PERIOD}.nc"  # HISTNATr8
     pathO = pathg + "${realm}/${simulation}_1${frequency}_${PERIOD}_grid_${variable}.nc"  # var:T_table2.2
     pathO2 = pathg + "${realm}/${simulation}_1${frequency}_${PERIOD}_scalar_table2.2.nc"  # PICTLWS2, PRE6CPLCr2alb
 
     dataloc(project="em", organization="generic", url=[pathA, pathL, pathI, pathO, pathO2])
 
     # Shared simulations - example : group=SC
     pathg = "/cnrm/cmip/cnrm/simulations/${group}/"
-    pathgA = pathg + "${realm}/Regu/${frequency}/${simulation}/${simulation}PLYYYY.nc"  # C1P60
-    pathgL = pathg + "${realm}/Regu/${frequency}/${simulation}/${simulation}SFXYYYY.nc"  # C1P60
+    pathgA = pathg + "${realm}/Regu/${frequency}/${simulation}/${simulation}PL${PERIOD}.nc"  # C1P60
+    pathgL = pathg + "${realm}/Regu/${frequency}/${simulation}/${simulation}SFX${PERIOD}.nc"  # C1P60
     pathgI = pathg + "${realm}/Origin/Monthly/${simulation}/${variable}_O1_${PERIOD}.nc"  # HISTNATr8
     pathgO = pathg + "${realm}/Origin/Monthly/${simulation}/${simulation}_1${frequency}_${PERIOD}_grid_${variable}.nc"
 

climaf/projects/example.py

@@ -27,8 +27,8 @@
 cproject("example", ("frequency", "monthly"), separator='|')
 cfreqs('example', {'monthly': 'mon'})
 
-data_pattern_L = cpath + "/../examples/data/${simulation}/L/${simulation}SFXYYYY.nc"
-data_pattern_A = cpath + "/../examples/data/${simulation}/A/${simulation}PLYYYY.nc"
+data_pattern_L = cpath + "/../examples/data/${simulation}/L/${simulation}SFX${PERIOD}.nc"
+data_pattern_A = cpath + "/../examples/data/${simulation}/A/${simulation}PL${PERIOD}.nc"
 data_pattern_histmth = cpath + "/../examples/data/${simulation}_SE_1982_1991_1M_ua_pres.nc"
 dataloc(project="example", organization="generic", url=[data_pattern_A, data_pattern_L, data_pattern_histmth])
 

climaf/projects/ref_climatos_and_ts.py

@@ -101,6 +101,5 @@
 calias(project='ref_ts', variable='moc', fileVariable='stream_function_mar', filenameVar='moc')
 
 if root:
-    # pattern1=root+"ts/*/${frequency}/${variable}/${variable}_*mon_${product}*_YYYYMM-YYYYMM.nc"
     pattern1 = root + "ts/*/${frequency}/${variable}/${variable}_${table}_${product}_${obs_type}_${PERIOD}.nc"
     dataloc(project='ref_ts', organization='generic', url=[pattern1])

doc/news.rst

@@ -6,6 +6,11 @@ What's new
 
 Changes, newest first:
 
+- V2.0.2:
+
+  - Fix `issue 193<https://github.com/rigoudyg/climaf/issues/193>` regarding behaviour of listfiles
+    for ambiguous cases
+
 - V2.0.1:
 
   - **Scripts can now process multiple ensembles, and ensembles which are not the first argument**:

doc/scripts/ccdo.rst

@@ -5,7 +5,7 @@ ccdo : |sk| invoke CDO with a unary operator
 
 Apply CDO on a single dataset or object, with a CDO operator as argument 
 
-**References** : https://code.zmaw.de/projects/cdo/embedded/1.6.4/cdo.html
+**References** : https://code.zmaw.de/projects/cdo/embedded/index.html
 
 **Provider / contact** : climaf at meteo dot fr