diff --git a/aosstower/level_a0/autoRun.bash b/aosstower/level_a0/autoRun.bash index fc7d48d1ad37dee42afbdf8de8a9c5e887bbc3ce..2987a7c16ca6fe8208774095dda88da2460e9b46 100755 --- a/aosstower/level_a0/autoRun.bash +++ b/aosstower/level_a0/autoRun.bash @@ -1,6 +1,6 @@ -!/usr/bin/env bash -PYENV=/home/kgao/env/ -SCRIPT=/home/kgao/Code/finished/Aoss_Tower_a1_Conversion/convertFromASCIIToNETCDF/autoRun.py +#!/usr/bin/env bash +PYENV=~/anaconda3/envs/env +SCRIPT=/home/kgao/Code/curr_projects/ncGenerate/AossTower/aosstower/level_a0/autoRun.py ( flock -x -n 200 || exit $? $PYENV/bin/python $SCRIPT diff --git a/aosstower/level_a0/bundle.py b/aosstower/level_a0/bundle.py index 918af3de5acbd53b47b25547043a8f240062381d..052b5e945598b18d90e482c836f1b0d2ddac1fd1 100644 --- a/aosstower/level_a0/bundle.py +++ b/aosstower/level_a0/bundle.py @@ -6,6 +6,26 @@ import time from netCDF4 import Dataset import os +def writeBack(frame, filename, cur_dt): + #get start + startString = str(frame.index[0]) + startObj = dt.strptime(startString.split(" ")[0], '%Y-%m-%d') + createDirectory(startObj) + + #get end + endObj = startObj.replace(hour=23, minute=59, second=59, microsecond=59) + + #input file + inputFiles = [] + inputFiles.append(filename) + inputFiles.append(createFilename(cur_dt - delta(days=1))) + + #output filename + outputFilename = 'aoss_tower.' + startString.split(" ")[0] + '.nc' + + #create file + createGiantNetCDF(startObj, endObj, inputFiles, outputFilename, True, None, False) + def createDirectory(stamp): if os.path.exists("/mnt/inst-data/regen_netcdf/aoss/tower/" + stamp.strftime('%Y/%m')): os.chdir("/mnt/inst-data/regen_netcdf/aoss/tower/" + stamp.strftime('%Y/%m')) @@ -79,26 +99,18 @@ def create_files(start_date, end_date): #get second frame frame = DFList[1] - - #get start - startString = str(frame.index[0]) - startObj = dt.strptime(startString.split(" ")[0], '%Y-%m-%d') - createDirectory(startObj) - - #get end - endObj = startObj.replace(hour=23, minute=59, second=59, microsecond=59) - - #input file - inputFiles = [] - inputFiles.append(filename) - inputFiles.append(createFilename(cur_dt - delta(days=1))) - - #output filename - outputFilename = 'aoss_tower.' + startString.split(" ")[0] + '.nc' - - #create file - createGiantNetCDF(startObj, endObj, inputFiles, outputFilename, True, None, False) + writeBack(frame, filename, cur_dt) + + else: + frame = DFList[1] + createNCFile(frame, filename) + + #get second frame + frame = DFList[0] + + writeBack(frame, filename, cur_dt) + else: print(len(DFList)) diff --git a/aosstower/level_a0/bundle.pyc b/aosstower/level_a0/bundle.pyc new file mode 100644 index 0000000000000000000000000000000000000000..99b5245907dca7496a03515d81c8f008c7504070 Binary files /dev/null and b/aosstower/level_a0/bundle.pyc differ diff --git a/aosstower/level_a0/nc.pyc b/aosstower/level_a0/nc.pyc new file mode 100644 index 0000000000000000000000000000000000000000..55c6b53922aadd2cd6e5fd6b266f2e5839dbdea0 Binary files /dev/null and b/aosstower/level_a0/nc.pyc differ