Changeset d4696e0 in flex_extract.git for source/python/classes/EcFlexpart.py
- Timestamp:
- Jan 18, 2019, 10:50:19 PM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- 4c1d7de
- Parents:
- 6f951ca
- File:
-
- 1 edited
-
source/python/classes/EcFlexpart.py (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
source/python/classes/EcFlexpart.py
r6f951ca rd4696e0 106 106 data. 107 107 108 basetime : str108 basetime : int 109 109 The time for a half day retrieval. The 12 hours upfront are to be 110 110 retrieved. … … 276 276 i = 0 277 277 for ty, st, ti in zip(ftype, fstep, ftime): 278 btlist = range( 24)279 if self.basetime == '12':278 btlist = range(len(ftime)) 279 if self.basetime == 12: 280 280 btlist = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] 281 if self.basetime == '00':281 if self.basetime == 0: 282 282 btlist = [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0] 283 283 … … 287 287 # (int(c.time[i]) in btlist or c.purefc): 288 288 289 if (i nt(ti)in btlist) or self.purefc:289 if (i in btlist) or self.purefc: 290 290 291 291 if ((ty.upper() == 'AN' and (int(ti) % int(self.dtime)) == 0) or … … 305 305 self.types[ty]['steps'] += st 306 306 i += 1 307 307 308 return 308 309 … … 708 709 709 710 # ------ on demand path -------------------------------------------------- 710 if not self.basetime:711 if self.basetime is None: 711 712 # ******* start retrievement 712 713 self._start_retrievement(request, retr_param_dict) … … 718 719 719 720 enddate = retr_param_dict['date'].split('/')[-1] 720 elimit = datetime.strptime(enddate + s elf.basetime,721 elimit = datetime.strptime(enddate + str(self.basetime), 721 722 '%Y%m%d%H') 722 723 723 if self.basetime == '12':724 if self.basetime == 12: 724 725 # -------------- flux data ---------------------------- 725 726 if 'acc' in pk: 726 727 # Strategy:728 # if maxtime-elimit >= 24h reduce date by 1,729 # if 12h <= maxtime-elimit<12h reduce time for last date730 # if maxtime-elimit<12h reduce step for last time731 # A split of the MARS job into 2 is likely necessary.732 733 734 727 startdate = retr_param_dict['date'].split('/')[0] 735 728 enddate = datetime.strftime(elimit - t24h,'%Y%m%d') … … 756 749 self._start_retrievement(request, retr_param_dict) 757 750 758 el se: # basetime = 0751 elif self.basetime == 0: 759 752 retr_param_dict['date'] = \ 760 753 datetime.strftime(elimit - t24h, '%Y%m%d') … … 762 755 timesave = ''.join(retr_param_dict['time']) 763 756 764 if '/' in retr_param_dict['time']: 757 if ('/' in retr_param_dict['time'] and 758 pk != 'OG_OROLSM__SL' and 759 'acc' not in pk ) : 765 760 times = retr_param_dict['time'].split('/') 766 761 steps = retr_param_dict['step'].split('/') 767 while (pk != 'OG_OROLSM__SL' and 768 'acc' not in pk and 769 (int(times[0]) + int(steps[0])) <= 12): 762 print 'times', times, int(times[0]), times[1:] 763 print 'steps', steps, int(steps[0]) 764 while int(times[0]) + int(steps[0]) <= 12: 765 print 'HELLO' 770 766 times = times[1:] 771 772 if len(times) > 1: 773 retr_param_dict['time'] = '/'.join(times) 774 else: 775 retr_param_dict['time'] = times[0] 776 777 # ******* start retrievement 778 self._start_retrievement(request, retr_param_dict) 767 print 'in while 1 ', times 768 769 if len(times) > 1: 770 retr_param_dict['time'] = '/'.join(times) 771 else: 772 retr_param_dict['time'] = times[0] 773 774 print 'in while 2 ', times 775 print retr_param_dict['time'] 779 776 780 777 if (pk != 'OG_OROLSM__SL' and … … 790 787 retr_param_dict['date']) 791 788 792 # ******* start retrievement 793 self._start_retrievement(request, retr_param_dict) 789 # ******* start retrievement 790 self._start_retrievement(request, retr_param_dict) 791 else: 792 raise ValueError('ERROR: Basetime has an invalid value ' 793 '-> {}'.format(str(basetime))) 794 794 795 795 if request == 0 or request == 2: … … 985 985 t_m1dt = t_date + timedelta(hours=step-int(c.dtime)) 986 986 t_m2dt = t_date + timedelta(hours=step-2*int(c.dtime)) 987 t_enddate = None 987 if c.basetime is not None: 988 t_enddate = datetime.strptime(c.end_date + str(c.basetime), 989 '%Y%m%d%H') 990 else: 991 t_enddate = t_date + timedelta(2*int(c.dtime)) 988 992 989 993 if c.purefc: … … 1107 1111 codes_write(gid, f_handle) 1108 1112 1109 if c.basetime: 1110 t_enddate = datetime.strptime(c.end_date + c.basetime, 1111 '%Y%m%d%H') 1112 else: 1113 t_enddate = t_date + timedelta(2*int(c.dtime)) 1114 1115 # squeeze out information of last two steps 1116 # contained in deac_vals[parId] 1117 # Note that deac_vals[parId][0] has not been popped 1118 # in this case 1119 1120 if step == c.maxstep and c.purefc or \ 1121 t_dt == t_enddate: 1122 # last step 1123 if c.purefc: 1124 values = deac_vals[parId][3] 1125 codes_set_values(gid, values) 1126 codes_set(gid, 'stepRange', step) 1127 #truedatetime = t_m2dt + timedelta(hours=2*int(c.dtime)) 1128 codes_write(gid, h_handle) 1129 else: 1130 values = deac_vals[parId][3] 1131 codes_set_values(gid, values) 1132 codes_set(gid, 'stepRange', 0) 1133 truedatetime = t_m2dt + timedelta(hours=2*int(c.dtime)) 1134 codes_set(gid, 'time', truedatetime.hour * 100) 1135 codes_set(gid, 'date', int(truedatetime.strftime('%Y%m%d'))) 1136 codes_write(gid, h_handle) 1137 1138 if parId == 142 or parId == 143: 1139 values = disaggregation.darain(list(reversed(deac_vals[parId]))) 1140 else: 1141 values = disaggregation.dapoly(list(reversed(deac_vals[parId]))) 1142 1143 # step before last step 1144 if c.purefc: 1145 codes_set(gid, 'stepRange', step-int(c.dtime)) 1146 #truedatetime = t_m2dt + timedelta(hours=int(c.dtime)) 1147 codes_set_values(gid, values) 1148 codes_write(gid, g_handle) 1149 else: 1150 codes_set(gid, 'stepRange', 0) 1151 truedatetime = t_m2dt + timedelta(hours=int(c.dtime)) 1152 codes_set(gid, 'time', truedatetime.hour * 100) 1153 codes_set(gid, 'date', int(truedatetime.strftime('%Y%m%d'))) 1154 codes_set_values(gid, values) 1155 codes_write(gid, g_handle) 1113 # squeeze out information of last two steps 1114 # contained in deac_vals[parId] 1115 # Note that deac_vals[parId][0] has not been popped 1116 # in this case 1117 1118 if step == c.maxstep and c.purefc or \ 1119 t_dt == t_enddate: 1120 # last step 1121 if c.purefc: 1122 values = deac_vals[parId][3] 1123 codes_set_values(gid, values) 1124 codes_set(gid, 'stepRange', step) 1125 #truedatetime = t_m2dt + timedelta(hours=2*int(c.dtime)) 1126 codes_write(gid, h_handle) 1127 else: 1128 values = deac_vals[parId][3] 1129 codes_set_values(gid, values) 1130 codes_set(gid, 'stepRange', 0) 1131 truedatetime = t_m2dt + timedelta(hours=2*int(c.dtime)) 1132 codes_set(gid, 'time', truedatetime.hour * 100) 1133 codes_set(gid, 'date', int(truedatetime.strftime('%Y%m%d'))) 1134 codes_write(gid, h_handle) 1135 1136 if parId == 142 or parId == 143: 1137 values = disaggregation.darain(list(reversed(deac_vals[parId]))) 1138 else: 1139 values = disaggregation.dapoly(list(reversed(deac_vals[parId]))) 1140 1141 # step before last step 1142 if c.purefc: 1143 codes_set(gid, 'stepRange', step-int(c.dtime)) 1144 #truedatetime = t_m2dt + timedelta(hours=int(c.dtime)) 1145 codes_set_values(gid, values) 1146 codes_write(gid, g_handle) 1147 else: 1148 codes_set(gid, 'stepRange', 0) 1149 truedatetime = t_m2dt + timedelta(hours=int(c.dtime)) 1150 codes_set(gid, 'time', truedatetime.hour * 100) 1151 codes_set(gid, 'date', int(truedatetime.strftime('%Y%m%d'))) 1152 codes_set_values(gid, values) 1153 codes_write(gid, g_handle) 1156 1154 1157 1155 codes_release(gid) … … 1417 1415 # if the timestamp is out of basetime start/end date period, 1418 1416 # skip this specific product 1419 if c.basetime: 1420 start_time = datetime.strptime(c.end_date + c.basetime, 1417 if c.basetime is not None: 1418 time_delta = timedelta(hours=12-int(c.dtime)) 1419 start_time = datetime.strptime(c.end_date + str(c.basetime), 1421 1420 '%Y%m%d%H') - time_delta 1422 end_time = datetime.strptime(c.end_date + c.basetime,1421 end_time = datetime.strptime(c.end_date + str(c.basetime), 1423 1422 '%Y%m%d%H') 1424 1423 if timestamp < start_time or timestamp > end_time:
Note: See TracChangeset
for help on using the changeset viewer.
