Changeset e879023 in flex_extract.git

Timestamp:

Jan 14, 2019, 10:48:28 PM (5 years ago)

Author:

anphi <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

9a91826

Parents:

20577dc

Message:

fixed bug in retrieving with basetime

Location:

python

Files:

• FlexpartTools.py (modified) (5 diffs)
• getMARSdata.py (modified) (1 diff)

python/FlexpartTools.py

@@ -827 +827 @@
         else:
             for ty,st,ti in zip(c.type,c.step,c.time):
-                btlist=range(24)
+                btlist=range(len(c.time))
                 if c.basetime=='12':
                     btlist=[1,2,3,4,5,6,7,8,9,10,11,12]
@@ -837 +837 @@
                    (ty.upper() != 'AN' and mod(int(c.step[i]),int(c.dtime))==0 and \
                     mod(int(c.step[i]),int(c.dtime))==0) ) and \
-                   (int(c.time[i]) in btlist or c.maxstep>24):
+                   (i in btlist or c.maxstep>24):
                     if ty not in self.types.keys():
                         self.types[ty]={'times':'','steps':''}
@@ -1155 +1155 @@
                         mftimesave=''.join(mftime)
 
+                        if pk=='OG_OROLSM__SL':
+                            mfdate=self.dates.split('/')[0]
+                            mftarget=self.inputdir+"/"+pk+'.'+mfdate+'.'+str(os.getppid())+'.'+str(os.getpid())+".grb"
+
                         if '/' in mftime:
                             times=mftime.split('/')
@@ -1163 +1167 @@
                                 else:
                                     mftime=times[0]
+
+                        if int(mftimesave.split('/')[0])==0 and int(mfstep.split('/')[0])==0 and pk!='OG_OROLSM__SL':
+                            mfdate=datetime.datetime.strftime(elimit,'%Y%m%d')
+                            mftime='00'
+                            mfstep='000'
+                            mftarget=self.inputdir+"/"+ftype+pk+'.'+mfdate+'.'+str(os.getppid())+'.'+str(os.getpid())+".grb"
+
                         # increase number of mars requests
                         self.mreq_count += 1
@@ -1179 +1190 @@
                             MR.displayInfo()
                             MR.dataRetrieve()
-
-                        if int(mftimesave.split('/')[0])==0 and int(mfstep.split('/')[0])==0 and pk!='OG_OROLSM__SL':
-                            mfdate=datetime.datetime.strftime(elimit,'%Y%m%d')
-                            mftime='00'
-                            mfstep='000'
-                            mftarget=self.inputdir+"/"+ftype+pk+'.'+mfdate+'.'+str(os.getppid())+'.'+str(os.getpid())+".grb"
-                            # increase number of mars requests
-                            self.mreq_count += 1
-                            MR= MARSretrieval(self.server, self.public, dataset=self.dataset, marsclass=self.marsclass, stream=self.stream,
-                                              type=mftype, levtype=pv[1], levelist=pv[2],resol=self.resol, gaussian=gaussian,
-                                          accuracy=self.accuracy,grid=pv[3],target=mftarget,area=area,
-                                          date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0])
-
-                            if request == 0:
-                                MR.displayInfo()
-                                MR.dataRetrieve()
-                            elif request == 1:
-                                MR.print_infodata_csv(self.inputdir, self.mreq_count)
-                            elif request == 2:
-                                MR.print_infodata_csv(self.inputdir, self.mreq_count)
-                                MR.displayInfo()
-                                MR.dataRetrieve()
 
 

python/getMARSdata.py

@@ -73 +73 @@
         del attrs['server']
         del attrs['public']
-        marsfile = os.path.join(c.inputdir, 'mars_request.csv')
+        marsfile = os.path.join(c.inputdir, 'mars_requests.csv')
         with open(marsfile, 'w') as f:
             f.write('request_number' + ', ')