Commit 18635987 authored by GROUAZEL's avatar GROUAZEL

fix listing generation ending date

parent 267c90ab
......@@ -5,6 +5,15 @@ echo 'fasten your seat belt, the job will start in a minute'
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_1.txt
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_2.txt
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_2015_v2.txt
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_2016_v1.txt #2245674 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_2016_v2.txt # 3774 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_2017_v1.txt # 2100000 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_2018_v1.txt # 2300000 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_s1a_2019_v1.txt # 2269506 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_s1a_2020_v1.txt # 1045000 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_s1b_2016_v1.txt # 1187000 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_s1b_2017_v1.txt # 2500000 lines
listing=/home1/scratch/agrouaze/prun/S1l2spectragen/listing_s1b_2018_v1.txt # 2430000 lines
echo 'dollar1 '$1
if [ "$1" = 'list' ]; then
echo 'redo input listing '
......@@ -16,6 +25,6 @@ else
echo 'no listing to redo'
fi
echo $listing
/appli/prun/bin/prun --split-max-jobs=100 --mem=301m --name S1l2spectragen --max-time=28:30:00 --background -e /home1/datahome/satwave/sources_en_exploitation2/wavetoolbox/create_sentinel1_spectra_l2_png.pbs $listing
/appli/prun/bin/prun --split-max-jobs=2000 --mem=301m --name S1l2spectragen --max-time=28:30:00 --background -e /home1/datahome/satwave/sources_en_exploitation2/wavetoolbox/create_sentinel1_spectra_l2_png.pbs $listing
echo 'va voir dans les logs '
echo 'ou bien va voir ici /home/datawork-cersat-public/project/mpc-sentinel1/data/esl/ifremer/aggregation_L2/'
......@@ -115,6 +115,7 @@ def getinputfilelist(repdata,options,startdate,enddate,version_outputdir,write_t
startdate = datetime.datetime.strptime(startdate,'%Y%m%d')
enddate = datetime.datetime.strptime(enddate,'%Y%m%d')
enddate += datetime.timedelta(hours=23,minutes=59,seconds=59) #added agrouaze July 2020 to allow all acquisition of the last day given
tifflist = []
......@@ -144,7 +145,6 @@ def getinputfilelist(repdata,options,startdate,enddate,version_outputdir,write_t
#Walk throught the folder list to search corresponding files
for repdatatype_date in listrepdatatype_date:
for root, dirnames, filenames in os.walk(repdatatype_date):
# logging.debug('filenames %s',filenames)
for filename in fnmatch.filter(filenames,pattern):
fullpath = os.path.join(root,filename)
datesar = os.path.splitext(filename)[0].split('-')[4]
......@@ -180,11 +180,9 @@ def getinputfolder(options):
"""
inputfolder = ""
if options.source == 'SAT':
# inputfolder = '/home/cercache/project/mpc-sentinel1/data/esa/'+SAT[options.platform]+'/L2/'
inputfolder = '/home/datawork-cersat-public/project/mpc-sentinel1/data/esa/'+SAT[options.platform]+'/L2/'
elif options.source == "WW3":
sat = options.platform.lower()
# inputfolder = '/home/cercache/project/mpc-sentinel1/data/colocation/'+SAT[options.platform]+'/sar-model/ww3spectra'
inputfolder = '/home/datawork-cersat-public/project/mpc-sentinel1/data/colocation/'+SAT[options.platform]+'/sar-model/ww3spectra'
elif options.source == "BUOY":
inputfolder = ''
......
......@@ -34,7 +34,9 @@ cdict = {'red': ((0., 1, 1),
sp_cmap = matplotlib.colors.LinearSegmentedColormap('my_colormap',cdict,256)
ccc = ['black','red','magenta','green','orange','cyan','blue','grey','yellow']
def do_polar_spectra_plot_l2s_swim_averaged(xx,yy0,cc,ind_k_ok,title,fig=None,ax=None,max_wl=200.0,trackangle=None,
cut_off=None,levels=None,vmax=None,vmin=None,cmap=None,no_cb=False,no_circle=False,toradians=True,mask_partitions=None,wsys=None,typespectra='s1',u=None,v=None,add_legend=False):
cut_off=None,levels=None,vmax=None,vmin=None,cmap=None,no_cb=False,no_circle=False,toradians=True,
mask_partitions=None,wsys=None,typespectra='s1',u=None,v=None,
add_legend=False,titlefs=18):
"""
inspired from Nouguier's snippet Sept 2019
:args:
......@@ -91,7 +93,7 @@ def do_polar_spectra_plot_l2s_swim_averaged(xx,yy0,cc,ind_k_ok,title,fig=None,ax
ax.set_xlabel('', fontsize=20)
# ax.tick_params(labelsize=10)
# qm.set_clim([0,100])
ax.set_title(title, fontsize=18)
ax.set_title(title, fontsize=titlefs)
if True:
qm.colorbar.remove()
# fig.xlabel.remove()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment