- Timestamp:
- Dec 18, 2018, 2:01:31 PM (5 years ago)
- Branches:
- master, ctbto, dev
- Children:
- 8255fce
- Parents:
- 75ed4bc
- Location:
- python
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
python/FlexpartTools.py
rfb8810c r5862eb9 98 98 help="Public mode - retrieves the public datasets") 99 99 100 parser.add_argument("--request", dest="request", default= 0,100 parser.add_argument("--request", dest="request", default=None, 101 101 help="list all mars request in file mars_requests.dat \ 102 102 and skip submission to mars") … … 193 193 194 194 # set request attribute to control file 195 if args.request != '0': 196 c.request=args.request 197 198 if c.request != '0': 195 if args.request != None: 196 c.request=int(args.request) 197 else: 198 c.request = 0 199 200 if c.request != 0: 199 201 marsfile = os.path.join(c.inputdir, 'mars_requests.csv') 200 202 if os.path.isfile(marsfile): … … 577 579 578 580 if not hasattr(self,'request'): 579 self.request='0' 580 elif self.request != 0: 581 self.request=0 582 elif int(self.request) != 0: 583 self.request=int(self.request) 581 584 marsfile = os.path.join(self.inputdir, 582 585 'mars_requests.csv') … … 1031 1034 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0]) 1032 1035 1033 if request == "0":1036 if request == 0: 1034 1037 MR.displayInfo() 1035 1038 MR.dataRetrieve() 1036 elif request == "1":1039 elif request == 1: 1037 1040 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1038 elif request == "2":1041 elif request == 2: 1039 1042 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1040 1043 MR.displayInfo() … … 1070 1073 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0]) 1071 1074 1072 if request == "0":1075 if request == 0: 1073 1076 MR.displayInfo() 1074 1077 MR.dataRetrieve() 1075 elif request == "1":1078 elif request == 1: 1076 1079 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1077 elif request == "2":1080 elif request == 2: 1078 1081 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1079 1082 MR.displayInfo() … … 1090 1093 accuracy=self.accuracy,grid=pv[3],target=mftarget,area=area, 1091 1094 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0]) 1092 if request == "0":1095 if request == 0: 1093 1096 MR.displayInfo() 1094 1097 MR.dataRetrieve() 1095 elif request == "1":1098 elif request == 1: 1096 1099 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1097 elif request == "2":1100 elif request == 2: 1098 1101 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1099 1102 MR.displayInfo() … … 1107 1110 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0]) 1108 1111 1109 if request == "0":1112 if request == 0: 1110 1113 MR.displayInfo() 1111 1114 MR.dataRetrieve() 1112 elif request == "1":1115 elif request == 1: 1113 1116 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1114 elif request == "2":1117 elif request == 2: 1115 1118 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1116 1119 MR.displayInfo() … … 1137 1140 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0]) 1138 1141 1139 if request == "0":1142 if request == 0: 1140 1143 MR.displayInfo() 1141 1144 MR.dataRetrieve() 1142 elif request == "1":1145 elif request == 1: 1143 1146 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1144 elif request == "2":1147 elif request == 2: 1145 1148 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1146 1149 MR.displayInfo() … … 1159 1162 date=mfdate, time=mftime,number=self.number,step=mfstep, expver=self.expver, param=pv[0]) 1160 1163 1161 if request == "0":1164 if request == 0: 1162 1165 MR.displayInfo() 1163 1166 MR.dataRetrieve() 1164 elif request == "1":1167 elif request == 1: 1165 1168 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1166 elif request == "2":1169 elif request == 2: 1167 1170 MR.print_infodata_csv(self.inputdir, self.mreq_count) 1168 1171 MR.displayInfo() … … 1170 1173 1171 1174 1172 if request == "0" or request == "2":1175 if request == 0 or request == 2: 1173 1176 print('MARS retrieve done ... ') 1174 elif request == "1":1177 elif request == 1: 1175 1178 print('MARS request printed ...') 1176 1179 … … 1472 1475 for key in index_keys: 1473 1476 key_vals = grib_index_get(iid,key) 1474 print key_vals1475 1477 1476 1478 l=[] … … 1481 1483 for k in l: 1482 1484 key_vals.append(str(k)) 1483 1485 print key_vals 1484 1486 index_vals.append(key_vals) 1485 1487 … … 1581 1583 grib_set_values(gid, values) 1582 1584 if c.maxstep>12: 1583 grib_set(gid,'step ',max(0,step-2*int(c.dtime)))1585 grib_set(gid,'stepRange',max(0,step-2*int(c.dtime))) 1584 1586 else: 1585 grib_set(gid,'step ',0)1587 grib_set(gid,'stepRange',0) 1586 1588 grib_set(gid,'time',fdate.hour*100) 1587 1589 grib_set(gid,'date',fdate.year*10000+fdate.month*100+fdate.day) … … 1601 1603 values=svdp[3] 1602 1604 grib_set_values(gid, values) 1603 grib_set(gid,'step ',0)1605 grib_set(gid,'stepRange',0) 1604 1606 truedatetime=fdate+datetime.timedelta(hours=2*int(c.dtime)) 1605 1607 grib_set(gid,'time',truedatetime.hour*100) … … 1613 1615 values=dapoly(list(reversed(svdp))) 1614 1616 1615 grib_set(gid,'step ',0)1617 grib_set(gid,'stepRange',0) 1616 1618 truedatetime=fdate+datetime.timedelta(hours=int(c.dtime)) 1617 1619 grib_set(gid,'time',truedatetime.hour*100) -
python/getMARSdata.py
ra9c7f3e r5862eb9 112 112 113 113 datechunk=datetime.timedelta(days=int(c.date_chunk)) 114 if c.request == '0' or c.request == '2':114 if c.request == 0 or c.request == 2: 115 115 print 'removing content of '+c.inputdir 116 116 tobecleaned=glob.glob(c.inputdir+'/*_acc_*.'+str(os.getppid())+'.*.grb') … … 151 151 152 152 153 if c.request == '0' or c.request == '2':153 if c.request == 0 or c.request == 2: 154 154 print 'removing content of '+c.inputdir 155 155 tobecleaned=glob.glob(c.inputdir+'/*__*.'+str(os.getppid())+'.*.grb') -
python/job.temp
rb38d750 r5862eb9 25 25 26 26 set -x 27 export VERSION=7.0. 327 export VERSION=7.0.4 28 28 case $HOST in 29 29 *ecg*) … … 33 33 module load grib_api/1.14.5 34 34 module load emos/437-r64 35 export PATH=${PATH}:${HOME}/flex_extract_v7.0. 3/python35 export PATH=${PATH}:${HOME}/flex_extract_v7.0.4/python 36 36 ;; 37 37 *cca*) … … 41 41 module load python 42 42 export SCRATCH=$TMPDIR 43 export PATH=${PATH}:${HOME}/flex_extract_v7.0. 3/python43 export PATH=${PATH}:${HOME}/flex_extract_v7.0.4/python 44 44 ;; 45 45 esac
Note: See TracChangeset
for help on using the changeset viewer.