diff --git a/example_local_prepare.py b/example_local_prepare.py index 92a50eb2b370c5b4e888da3d5e54a02391d27502..a035a37c3032d536886b44a0efe2938c84f8ce9a 100644 --- a/example_local_prepare.py +++ b/example_local_prepare.py @@ -22,8 +22,9 @@ comp = FUSION_MATLAB() #interval = TimeInterval(granule, granule+timedelta(minutes=0)) satellite = 'snpp' +#satellite = 'jpss1' #satellite = 'aqua' -version = '1.0dev7' # base VIIRS level-1b +version = '1.0dev10' # base VIIRS level-1b def local_execute_example(interval, satellite, version, skip_prepare=False, skip_execute=False, verbosity=2): @@ -31,6 +32,8 @@ def local_execute_example(interval, satellite, version, skip_prepare=False, skip if satellite == 'snpp': LOG.info("We are doing NPP...") + if satellite == 'jpss1': + LOG.info("We are doing JPSS-1 / NOAA-20...") elif satellite == 'aqua': LOG.info("We are doing AQUA...") else: diff --git a/example_local_prepare_ql.py b/example_local_prepare_ql.py index ea9f969c81e2d49aab480cf20ab56391e7479a7d..450e7d8a5bea265ed1fbd8024c7dfdc8daf23424 100644 --- a/example_local_prepare_ql.py +++ b/example_local_prepare_ql.py @@ -22,8 +22,9 @@ comp = FUSION_MATLAB_QL() #interval = TimeInterval(granule, granule+timedelta(minutes=0)) satellite = 'snpp' +#satellite = 'jpss1' #satellite = 'aqua' -version = '1.0dev5' # base VIIRS level-1b +version = '1.0dev7' # base VIIRS level-1b def local_execute_example(interval, satellite, version, skip_prepare=False, skip_execute=False, verbosity=2): @@ -31,6 +32,8 @@ def local_execute_example(interval, satellite, version, skip_prepare=False, skip if satellite == 'snpp': LOG.info("We are doing NPP...") + if satellite == 'jpss1': + LOG.info("We are doing JPSS-1 / NOAA-20...") elif satellite == 'aqua': LOG.info("We are doing AQUA...") else: diff --git a/source/flo/__init__.py b/source/flo/__init__.py index 2271849fdb2f4041af6f580158fed507eda9a5ad..fdba044b2fee98ddf350a26370b137f3ecc560a4 100644 --- a/source/flo/__init__.py +++ b/source/flo/__init__.py @@ -92,7 +92,7 @@ class FUSION_MATLAB(Computation): def find_contexts(self, time_interval, satellite, version): ''' - Here we assume that the granule boundaries fall along 6-minute (snpp/jpss1) or + Here we assume that the granule boundaries fall along 6-minute (snpp/jpss1) or 5-minute (aqua) increments, starting at the top of the hour: SNPP: [0., 6., 12., 18., 24., 30., 36., 42., 48., 54.] @@ -1158,12 +1158,16 @@ class FUSION_MATLAB_QL(Computation): geo_keys = [key for key in inputs.keys() if 'geo' in key] geo_inputs = {key: inputs[key] for key in geo_keys} symlink_inputs_to_working_dir(geo_inputs) + for geo_file in glob('VJ103*.nc'): + shutil.move(geo_file, geo_file.replace('VJ103', 'VNP03')) os.chdir(current_dir) os.chdir(fsn_dir) fsn_keys = [key for key in inputs.keys() if 'l1b' in key] fsn_inputs = {key: inputs[key] for key in fsn_keys} symlink_inputs_to_working_dir(fsn_inputs) + for geo_file in glob('VJ102*.nc'): + shutil.move(geo_file, geo_file.replace('VJ102', 'VNP02')) os.chdir(current_dir) # Setup the require keyword arguments for the fusion_matlab package