small change
This commit is contained in:
@@ -29,9 +29,9 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
start = time.time()
|
start = time.time()
|
||||||
logging.info("Starting to process DAT to ASC")
|
logging.info("Starting to process DAT to ASC")
|
||||||
|
batch_checkpoint = time.time()
|
||||||
if dat_file_count != asc_file_count:
|
if dat_file_count != asc_file_count:
|
||||||
batch.process_nimrod_files()
|
batch.process_nimrod_files()
|
||||||
batch_checkpoint = time.time()
|
|
||||||
elapsed_time = batch_checkpoint - start
|
elapsed_time = batch_checkpoint - start
|
||||||
logging.info(f"DAT to ASC completed in {elapsed_time:.2f} seconds")
|
logging.info(f"DAT to ASC completed in {elapsed_time:.2f} seconds")
|
||||||
else:
|
else:
|
||||||
@@ -47,7 +47,10 @@ if __name__ == "__main__":
|
|||||||
logging.info(f"{place[0]} completed in {since_asc_create:.2f} seconds")
|
logging.info(f"{place[0]} completed in {since_asc_create:.2f} seconds")
|
||||||
logging.info(f'total time so far {elapsed_time:.2f} seconds')
|
logging.info(f'total time so far {elapsed_time:.2f} seconds')
|
||||||
|
|
||||||
|
logging.info('combining CSVs into groups')
|
||||||
combiner.combine_csv_files()
|
combiner.combine_csv_files()
|
||||||
|
logging.info('CSVs combined!')
|
||||||
|
end = time.time()
|
||||||
logging.info(f'All Complete')
|
elapsed_time = end - start
|
||||||
|
|
||||||
|
logging.info(f'All Complete total time {elapsed_time:.2f} seconds')
|
||||||
@@ -32,6 +32,9 @@ class BatchNimrod():
|
|||||||
|
|
||||||
with open(out_file_path, "w") as outfile:
|
with open(out_file_path, "w") as outfile:
|
||||||
image.extract_asc(outfile)
|
image.extract_asc(outfile)
|
||||||
|
|
||||||
|
# delete dat file here
|
||||||
|
|
||||||
logging.debug(f"Successfully processed: {in_file_full}")
|
logging.debug(f"Successfully processed: {in_file_full}")
|
||||||
|
|
||||||
except Nimrod.HeaderReadError as e:
|
except Nimrod.HeaderReadError as e:
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ class CombineTimeseries:
|
|||||||
|
|
||||||
def combine_csv_files(self):
|
def combine_csv_files(self):
|
||||||
for group, loc_list in self.grouped_locations.items():
|
for group, loc_list in self.grouped_locations.items():
|
||||||
print(f"Group {group}:")
|
|
||||||
combined_df = None
|
combined_df = None
|
||||||
for loc in loc_list:
|
for loc in loc_list:
|
||||||
csv_to_load = f'./csv_files/{loc[0]}_timeseries_data.csv'
|
csv_to_load = f'./csv_files/{loc[0]}_timeseries_data.csv'
|
||||||
|
|||||||
Reference in New Issue
Block a user