From d1e2e2a0c75c6329414eaab105e144a30d52b4b7 Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Tue, 20 May 2025 16:56:16 +0200 Subject: [PATCH 1/2] Removed hard coded noaa20 --- run/run_viirs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/run_viirs.py b/run/run_viirs.py index 4239d788..13bd408a 100644 --- a/run/run_viirs.py +++ b/run/run_viirs.py @@ -12,7 +12,7 @@ if __name__ == "__main__": outdir="/esarchive/scratch/cmeikle/" - indir="/esarchive/obs/nasa/viirs_noaa20_aerdb_l2/original_files/VIIRS/" + indir="/esarchive/obs/nasa/viirs_snpp_aerdb_l2_v2/original_files/VIIRS/" start_time = time.time() -- GitLab From 5bda66d85d33b5a085087517dc45a3b15eee6aa9 Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Tue, 20 May 2025 17:23:52 +0200 Subject: [PATCH 2/2] Updated to remove hardcoded NOAA20 --- mapies/viirs.py | 2 +- run/run_viirs.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mapies/viirs.py b/mapies/viirs.py index 462fdbfc..f2568d91 100644 --- a/mapies/viirs.py +++ b/mapies/viirs.py @@ -97,7 +97,7 @@ class VIIRS(MAPIES): for date in self.dates_slice: date = datetime.strptime(date, '%Y%m%d%H%M').strftime('%Y%j') - filepaths = f'{self.indir}/**/AERDB_L2_VIIRS_NOAA20.A{date}*' + filepaths = f'{self.indir}/**/AERDB_L2_VIIRS_*.A{date}*' file_patterns.append(filepaths) files = sorted(get_file_list(file_patterns)) diff --git a/run/run_viirs.py b/run/run_viirs.py index 13bd408a..1bc50375 100644 --- a/run/run_viirs.py +++ b/run/run_viirs.py @@ -12,15 +12,15 @@ if __name__ == "__main__": outdir="/esarchive/scratch/cmeikle/" - indir="/esarchive/obs/nasa/viirs_snpp_aerdb_l2_v2/original_files/VIIRS/" + indir="/esarchive/obs/nasa/viirs_snpp_aerdb_l2_v2/original_files/VIIRS" start_time = time.time() - c = VIIRS(start_date, end_date, dest=outdir, indir=indir, grid_repr="global") + c = VIIRS(start_date, end_date, dest=outdir, indir=indir, grid_repr="bdrc") c.gather_nc_files() - c.process_avg_data(monthly_avg=False, batch_size=20, save=True) + c.process_avg_data(frequency_avg=None, batch_size=10, save=True) c.plot_2D_observations(months=[0], filename="month_without_min_obs_and_qa_applied.png", outdir=outdir) c.plot_2D_num_obs(months=[0], outdir=outdir) #c.process_lazy_data(apply_qa=True, save=False) -- GitLab