From 61106b34eca95709d5c79eaf5376ea5158074abb Mon Sep 17 00:00:00 2001 From: Jonas Gunz Date: Mon, 22 Jul 2024 23:28:21 +0200 Subject: slightly changed index --- plotter/horizontal.py | 6 ++++-- plotter/meteogram.py | 24 +++++++++++------------- plotter/vertical_from_grib.py | 6 ++++-- 3 files changed, 19 insertions(+), 17 deletions(-) (limited to 'plotter') diff --git a/plotter/horizontal.py b/plotter/horizontal.py index d75236b..218fd33 100755 --- a/plotter/horizontal.py +++ b/plotter/horizontal.py @@ -87,14 +87,16 @@ def _plot(data, output, name, layers, area = None): 'file': outname, 'init': init_str, 'valid': valid_str, - 'valid_offset': hours_since_init_str + 'valid_offset': hours_since_init_str, + 'display_name': name, + 'id': name } ) with open(os.path.join(output, f'{name}.index.json'), 'w') as f: f.write(json.dumps(index, indent=4)) - return { 'name': name, 'indexfile': f'{name}.index.json' } + return { 'name': name, 'indexfile': f'{name}.index.json', 'list_title': 'INIT+' } def _layer(data, layertype, **kwargs): layertypes={ diff --git a/plotter/meteogram.py b/plotter/meteogram.py index f05502f..724e9b2 100755 --- a/plotter/meteogram.py +++ b/plotter/meteogram.py @@ -12,14 +12,17 @@ import misc HEIGHT = 13 -def run(data, plots, output='.'): +def run(data, plots, output='.', name='meteogram'): misc.create_output_dir(output) index = [] for plot in plots: index.append(_plot(data, output, **plot)) - return index + with open(os.path.join(output, f'{name}.index.json'), 'w') as f: + f.write(json.dumps(index, indent=4)) + + return [{ 'name': name, 'indexfile': f'{name}.index.json', 'list_title': 'Location' }] def _get_next_subplot(size, counter=0): ret = (counter + 1, counter + size) @@ -50,7 +53,7 @@ def _add_temp_dewpoint(ax, data): ### Temp + Dewpoint ax.plot(data.valid_time, data.t2m.metpy.convert_units('degC').transpose(), color='red', label='Temperature (2m)') ax.plot(data.valid_time, mpcalc.dewpoint_from_relative_humidity(data.t2m, data.r2).transpose(), color='blue', label='Dewpoint (2m)') - ax.plot(data.valid_time, data.sel(isobaricInhPa=850.0).t.metpy.convert_units('degC').transpose(), color='grey', label='Tempreature (850hPa)') + ax.plot(data.valid_time, data.sel(isobaricInhPa=850.0).t.metpy.convert_units('degC').transpose(), color='grey', label='Temperature (850hPa)') ax.set_ylabel('Temperature [degC]') ax.legend(loc='lower right') @@ -150,17 +153,12 @@ def _plot(data, output, name, lat, lon): plt.savefig(os.path.join(output, outname)) plt.close('all') - index = [] - index.append( + return ( { 'file': outname, 'init': init_str, 'valid': init_str, - 'valid_offset': '00' - } - ) - - with open(os.path.join(output, f'{name}.index.json'), 'w') as f: - f.write(json.dumps(index, indent=4)) - - return { 'name': name, 'indexfile': f'{name}.index.json' } + 'valid_offset': '00', + 'display_name': name, + 'id': name + }) diff --git a/plotter/vertical_from_grib.py b/plotter/vertical_from_grib.py index ff454b3..8e4fd60 100755 --- a/plotter/vertical_from_grib.py +++ b/plotter/vertical_from_grib.py @@ -86,14 +86,16 @@ def _plot(data, output, name, lat=None, lon=None, analysis=None): 'file': outname, 'init': init_str, 'valid': valid_str, - 'valid_offset': hours_since_init_str + 'valid_offset': hours_since_init_str, + 'display_name': name, + 'id': name } ) with open(os.path.join(output, f'skewt_{name}.index.json'), 'w') as f: f.write(json.dumps(index, indent=4)) - return {'name': name, 'indexfile': f'skewt_{name}.index.json'} + return {'name': name, 'indexfile': f'skewt_{name}.index.json', 'list_title': 'Location'} if __name__ == '__main__': run(**config) -- cgit v1.2.3