Changeset a4531f1 in flex_extract.git for source/python/classes
- Timestamp:
- Dec 7, 2018, 4:09:42 PM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- e5884c9
- Parents:
- 4d3b052
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
source/python/classes/EcFlexpart.py
rc274d9a ra4531f1 132 132 133 133 # Pure forecast mode 134 if c. maxstep > len(c.type) and 'AN' not in c.type:134 if c.purefc: 135 135 c.type = [c.type[0]] 136 136 c.step = ['{:0>3}'.format(int(c.step[0]))] … … 146 146 self.dtime = c.dtime 147 147 i = 0 148 if fluxes and c.maxstep <= 24:148 if fluxes and not c.purefc: 149 149 self.types[str(c.acctype)] = {'times': str(c.acctime), 150 150 'steps': '{}/to/{}/by/{}'.format( … … 161 161 (ty.upper() != 'AN' and (int(c.step[i]) % int(c.dtime)) == 0 and 162 162 (int(c.step[i]) % int(c.dtime) == 0)) ) and \ 163 (int(c.time[i]) in btlist or c. maxstep > 24):163 (int(c.time[i]) in btlist or c.purefc): 164 164 165 165 if ty not in self.types.keys(): … … 800 800 t_enddate = None 801 801 802 if c. maxstep > 12:802 if c.purefc: 803 803 fnout = os.path.join(c.inputdir, 'flux' + 804 804 t_date.strftime('%Y%m%d.%H') + … … 885 885 values = disaggregation.dapoly(deac_vals[parId]) 886 886 887 if not (step == c.maxstep and c. maxstep > 12\887 if not (step == c.maxstep and c.purefc \ 888 888 or t_dt == t_enddate): 889 889 # remove first time step in list to shift … … 894 894 # if the third time step is read (per parId), 895 895 # write out the first one as a boundary value 896 if c. maxstep > 12:896 if c.purefc: 897 897 values = deac_vals[parId][1] 898 898 else: … … 902 902 codes_set_values(gid, values) 903 903 904 if c. maxstep > 12:904 if c.purefc: 905 905 codes_set(gid, 'stepRange', max(0, step-2*int(c.dtime))) 906 906 else: … … 919 919 # squeeze out information of last two steps contained 920 920 # in deac_vals[parId] 921 # if step+int(c.dtime) == c.maxstep and c. maxstep>12921 # if step+int(c.dtime) == c.maxstep and c.purefc 922 922 # or t_dt+timedelta(hours = int(c.dtime)) 923 923 # >= t_enddate: 924 924 # Note that deac_vals[parId][0] has not been popped in this case 925 925 926 if step == c.maxstep and c. maxstep > 12or \926 if step == c.maxstep and c.purefc or \ 927 927 t_dt == t_enddate: 928 928 … … 1171 1171 #============================================================================================ 1172 1172 # create name of final output file, e.g. EN13040500 (ENYYMMDDHH) 1173 if c. maxstep > 12:1173 if c.purefc: 1174 1174 suffix = cdate[2:8] + '.' + ctime + '.' + cstep 1175 1175 else:
Note: See TracChangeset
for help on using the changeset viewer.