Changeset 0e29ef4 in flexpart.git for preproc

Timestamp:

Jan 29, 2015, 9:13:29 AM (9 years ago)

Author:

Anne Fouilloux <annefou@…>

Branches:

master, 10.4.1_pesei, FPv9.3.1, FPv9.3.1b_testing, FPv9.3.2, GFS_025, bugfixes+enhancements, dev, fp9.3.1-20161214-nc4, grib2nc4_repair, release-10, release-10.4.1, scaling-bug, univie

Children:

3372ef9

Parents:

30006de

Message:

bug fix when looping over months/dates

Location:

preproc

Files:

• python/FlexpartTools.py (modified) (4 diffs)
• python/FlexpartTools.pyc (deleted)
• python/GribTools.py (modified) (1 diff)
• python/GribTools.pyc (deleted)
• python/UIOTools.pyc (deleted)
• python/getEIdata.py (modified) (2 diffs)
• python/prepareFLEXPART.py (modified) (2 diffs)
• src/makefile_gfortran (added)
• src/makefile_intel (added)

preproc/python/FlexpartTools.py

@@ -353 +353 @@
         index_keys=["date","time","stepRange"]
         indexfile="date_time_stepRange.idx"
+        silentremove(indexfile)
         grib=GribTools(inputfiles.files)
         iid=grib.index(index_keys=index_keys, index_file = indexfile)
 
+        print 'index done...' 
         silentremove("fort.10")
         silentremove("fort.11")
@@ -389 +391 @@
                 step = grib_get(gid, 'stepRange')
                 cflextime = self.getFlexpartTime(type,step, time)
+#                print 'cyear '+cyear+'/'+cmonth+'/'+'/EI'+cyear[2:4]+cmonth+cday+cflextime
             while 1:  
                 if gid is None: break
@@ -420 +423 @@
 # create the corresponding output file  fort.15 (generated by CONVERT2) + fort.16 (paramId 167 and paramId 168)  
                 mkdir_p(outputdir+'/'+cyear+'/'+cmonth+'/')
+                print "outputdir = " + outputdir+'/'+cyear+'/'+cmonth+'/'+'/EI'+cyear[2:4]+cmonth+cday+cflextime
                 fout = open(outputdir+'/'+cyear+'/'+cmonth+'/EI'+cyear[2:4]+cmonth+cday+cflextime,'wb')    
                 shutil.copyfileobj(open('fort.15','rb'), fout)     
@@ -427 +431 @@
         grib_index_release(iid)
 
-    def clean(self):
+    def __del__(self):
         print "clean"
-
+        silentremove("fort.10")
+        silentremove("fort.11")
+        silentremove("fort.12")
+        silentremove("fort.13")
+        silentremove("fort.15")
+        silentremove("fort.16")
+        silentremove("fort.18")
+        silentremove("VERTICAL.EC")
+        silentremove("date_time_stepRange.idx")
+

preproc/python/GribTools.py

@@ -118 +118 @@
 # Create index from a list of files if it does not exist or read it
     def index(self,index_keys=["mars"], index_file = "my.idx"):
+        print "index to be done" 
         self.iid = None
  

preproc/python/getEIdata.py

@@ -92 +92 @@
     for date in daterange( start, end ):
 # if new year & month then we create a new directory to store output files
-        er_date = date
-        if date.strftime("%Y%m") != current_ym:
-            current_outputdir =  outputdir + "/"  + date.strftime("%Y") + '/' + date.strftime("%m") + '/' 
-            mkdir_p(current_outputdir)
-            if current_ym != "":
+        if date.strftime("%Y%m") != current_ym and current_ym != "":
                retrieve="yes"
 
@@ -106 +102 @@
                 flexpart = EIFlexpart()
                 dates= ir_date.strftime("%Y%m%d") + "/to/" + er_date.strftime("%Y%m%d") 
+                current_outputdir =  outputdir + "/"  + ir_date.strftime("%Y") + '/' + ir_date.strftime("%m") + '/' 
+                mkdir_p(current_outputdir)
+                print "retrieve " + dates + " in dir " + current_outputdir
                 flexpart.retrieve(server, dates, options.times, options.area, options.levels, current_outputdir)
-                ir_date = er_date
+                ir_date = date
+                retrieve="no"
+
+        er_date = date
 
         current_ym =  date.strftime("%Y%m")

preproc/python/prepareFLEXPART.py

@@ -90 +90 @@
 # data retrieved by year/month
            if cyear != date.year or cmonth != date.month:
-             print 'year : ' + str(date.year) + ' month : ', date.month
+             print 'Prepare year : ' + str(date.year) + ' month : ', date.month
              cyear = date.year
              cmonth = date.month
@@ -102 +102 @@
              flexpart = EIFlexpart()
              flexpart.create(inputfiles, outputdir)
+             
 
 if __name__ == "__main__":