Changeset 65748f4 in flex_extract.git
- Timestamp:
- Sep 29, 2018, 9:36:59 PM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- 27fe969
- Parents:
- 295ff45
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
source/python/classes/EcFlexpart.py
r295ff45 r65748f4 492 492 oro = False 493 493 494 # define times 494 # define times with datetime module 495 495 t12h = timedelta(hours=12) 496 496 t24h = timedelta(hours=24) 497 497 498 498 # dictionary which contains all parameter for the mars request 499 # Entries with a "None" will change for different requests and therefore500 # willbe set in each request seperately499 # entries with a "None" will change in different requests and will 500 # therefore be set in each request seperately 501 501 retr_param_dict = {'marsclass':self.marsclass, 502 502 'stream':None, … … 518 518 519 519 for ftype in self.types: 520 # fk contains field stypes such as520 # fk contains field types such as 521 521 # [AN, FC, PF, CV] 522 522 # fv contains all of the items of the belonging key … … 535 535 retr_param_dict['date'] = self.dates 536 536 retr_param_dict['stream'] = self.stream 537 retr_param_dict['target'] = self.inputdir + "/" + ftype +\538 pk + '.' + self.dates.split('/')[0] + '.' + \539 str(os.getppid()) + '.' + str(os.getpid()) + ".grb"537 retr_param_dict['target'] = \ 538 self._mk_targetname(ftype, pk, 539 retr_param_dict['date'].split('/')[0]) 540 540 retr_param_dict['param'] = pv[0] 541 541 retr_param_dict['levtype'] = pv[1] … … 564 564 # ------ on demand path -------------------------------------------------- 565 565 if not self.basetime: 566 # ******* start retrievement 566 567 self._start_retrievement(request, retr_param_dict) 567 568 # ------ operational path ------------------------------------------------ 568 569 else: 569 570 # check if mars job requests fields beyond basetime. 570 # If yes eliminate those fields since they may not571 # if yes eliminate those fields since they may not 571 572 # be accessible with user's credentials 572 if 'by' in retr_param_dict['step']: 573 sm1 = 2 574 else: 575 sm1 = -1 576 577 if 'by' in retr_param_dict['time']: 578 tm1 = 2 579 else: 580 tm1 = -1 581 582 maxdate = datetime.strptime(retr_param_dict['date'].split('/')[-1] + 583 retr_param_dict['time'].split('/')[tm1], 584 '%Y%m%d%H') 585 maxtime = maxdate + \ 586 timedelta(hours=int(retr_param_dict['step'].split('/')[sm1])) 587 588 elimit = datetime.strptime(retr_param_dict['date'].split('/')[-1] + 589 self.basetime, '%Y%m%d%H') 573 574 enddate = retr_param_dict['date'].split('/')[-1] 575 elimit = datetime.strptime(enddate + self.basetime, 576 '%Y%m%d%H') 590 577 591 578 if self.basetime == '12': … … 602 589 startdate = retr_param_dict['date'].split('/')[0] 603 590 enddate = datetime.strftime(elimit - t24h,'%Y%m%d') 604 retr_param_dict['date'] = '/'.join([startdate, 'to', enddate]) 605 591 retr_param_dict['date'] = '/'.join([startdate, 592 'to', 593 enddate]) 594 595 # ******* start retrievement 606 596 self._start_retrievement(request, retr_param_dict) 607 597 … … 613 603 retr_param_dict['date']) 614 604 605 # ******* start retrievement 615 606 self._start_retrievement(request, retr_param_dict) 616 607 617 608 # -------------- non flux data ------------------------ 618 609 else: 610 # ******* start retrievement 619 611 self._start_retrievement(request, retr_param_dict) 620 612 … … 638 630 retr_param_dict['time'] = times[0] 639 631 632 # ******* start retrievement 640 633 self._start_retrievement(request, retr_param_dict) 641 634 … … 652 645 retr_param_dict['date']) 653 646 647 # ******* start retrievement 654 648 self._start_retrievement(request, retr_param_dict) 655 649
Note: See TracChangeset
for help on using the changeset viewer.