Changeset e879023 in flex_extract.git for python/FlexpartTools.py
- Timestamp:
- Jan 14, 2019, 10:48:28 PM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- 9a91826
- Parents:
- 20577dc
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
python/FlexpartTools.py
r2193808 re879023 827 827 else: 828 828 for ty,st,ti in zip(c.type,c.step,c.time): 829 btlist=range( 24)829 btlist=range(len(c.time)) 830 830 if c.basetime=='12': 831 831 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 \ 838 838 mod(int(c.step[i]),int(c.dtime))==0) ) and \ 839 (i nt(c.time[i])in btlist or c.maxstep>24):839 (i in btlist or c.maxstep>24): 840 840 if ty not in self.types.keys(): 841 841 self.types[ty]={'times':'','steps':''} … … 1155 1155 mftimesave=''.join(mftime) 1156 1156 1157 if pk=='OG_OROLSM__SL': 1158 mfdate=self.dates.split('/')[0] 1159 mftarget=self.inputdir+"/"+pk+'.'+mfdate+'.'+str(os.getppid())+'.'+str(os.getpid())+".grb" 1160 1157 1161 if '/' in mftime: 1158 1162 times=mftime.split('/') … … 1163 1167 else: 1164 1168 mftime=times[0] 1169 1170 if int(mftimesave.split('/')[0])==0 and int(mfstep.split('/')[0])==0 and pk!='OG_OROLSM__SL': 1171 mfdate=datetime.datetime.strftime(elimit,'%Y%m%d') 1172 mftime='00' 1173 mfstep='000' 1174 mftarget=self.inputdir+"/"+ftype+pk+'.'+mfdate+'.'+str(os.getppid())+'.'+str(os.getpid())+".grb" 1175 1165 1176 # increase number of mars requests 1166 1177 self.mreq_count += 1 … … 1179 1190 MR.displayInfo() 1180 1191 MR.dataRetrieve() 1181 1182 if int(mftimesave.split('/')[0])==0 and int(mfstep.split('/')[0])==0 and pk!='OG_OROLSM__SL':1183 mfdate=datetime.datetime.strftime(elimit,'%Y%m%d')1184 mftime='00'1185 mfstep='000'1186 mftarget=self.inputdir+"/"+ftype+pk+'.'+mfdate+'.'+str(os.getppid())+'.'+str(os.getpid())+".grb"1187 # increase number of mars requests1188 self.mreq_count += 11189 MR= MARSretrieval(self.server, self.public, dataset=self.dataset, marsclass=self.marsclass, stream=self.stream,1190 type=mftype, levtype=pv[1], levelist=pv[2],resol=self.resol, gaussian=gaussian,1191 accuracy=self.accuracy,grid=pv[3],target=mftarget,area=area,1192 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0])1193 1194 if request == 0:1195 MR.displayInfo()1196 MR.dataRetrieve()1197 elif request == 1:1198 MR.print_infodata_csv(self.inputdir, self.mreq_count)1199 elif request == 2:1200 MR.print_infodata_csv(self.inputdir, self.mreq_count)1201 MR.displayInfo()1202 MR.dataRetrieve()1203 1192 1204 1193
Note: See TracChangeset
for help on using the changeset viewer.