Revert "Feature 1319 no pickle"

met/data/wrappers/Makefile.am

@@ -23,12 +23,10 @@ wrappersdir = $(pkgdatadir)/wrappers
 wrappers_DATA = \
      generic_python.py \
      generic_pickle.py \
-     read_tmp_dataplane.py \
-     write_tmp_dataplane.py \
+     read_pickle_dataplane.py \
+     write_pickle_dataplane.py \
      write_pickle_mpr.py \
-     read_tmp_ascii.py \
-     write_pickle_point.py \
-     write_tmp_point.py
+     write_pickle_point.py
 
 EXTRA_DIST = ${wrappers_DATA}
 

met/data/wrappers/read_pickle_dataplane.py

@@ -0,0 +1,15 @@
+########################################################################
+#
+#    Reads temporary pickle file into memory.
+#
+#    usage:  /path/to/python read_pickle_dataplane.py pickle.tmp
+#
+########################################################################
+
+import sys
+import numpy as np
+import pickle
+
+print('Python Script:\t', sys.argv[0])
+print('Load Pickle:\t', sys.argv[1])
+met_info = pickle.load(open(sys.argv[1], "rb"))

met/data/wrappers/write_tmp_point.py → met/data/wrappers/write_pickle_dataplane.py

@@ -3,30 +3,40 @@
 #    Adapted from a script provided by George McCabe
 #    Adapted by Randy Bullock
 #
-#    usage:  /path/to/python write_tmp_point.py \
-#            tmp_ascii_output_filename <user_python_script>.py <args>
+#    usage:  /path/to/python write_pickle_dataplane.py \
+#            pickle_output_filename <user_python_script>.py <args>
 #
 ########################################################################
 
 import os
 import sys
+import pickle
 import importlib.util
+import xarray as xr
 
 print('Python Script:\t', sys.argv[0])
 print('User Command:\t',  sys.argv[2:])
-print('Write Temporary Ascii:\t',  sys.argv[1])
+print('Write Pickle:\t',  sys.argv[1])
 
-tmp_filename = sys.argv[1]
+pickle_filename = sys.argv[1]
 
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]
 
+if not pyembed_module_name.endswith('.py'):
+    pyembed_module_name += '.py'
+
 user_base = os.path.basename(pyembed_module_name).replace('.py','')
 
 spec = importlib.util.spec_from_file_location(user_base, pyembed_module_name)
 met_in = importlib.util.module_from_spec(spec)
 spec.loader.exec_module(met_in)
 
-f = open(tmp_filename, 'w')
-for line in met_in.point_data:
-    f.write(str(line) + '\n')
+if isinstance(met_in.met_data, xr.DataArray):
+    met_info = { 'attrs': met_in.met_data.attrs, 'met_data': met_in.met_data }
+else:
+    met_info = { 'attrs': met_in.attrs, 'met_data': met_in.met_data }
+
+print(met_info)
+
+pickle.dump( met_info, open( pickle_filename, "wb" ) )

met/data/wrappers/write_pickle_mpr.py

@@ -18,7 +18,6 @@
 print('Write Pickle:\t',  sys.argv[1])
 
 pickle_filename = sys.argv[1]
-tmp_filename = pickle_filename + '.txt'
 
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]
@@ -29,8 +28,6 @@
 met_in = importlib.util.module_from_spec(spec)
 spec.loader.exec_module(met_in)
 
-f = open(tmp_filename, 'w')
-for line in met_in.mpr_data:
-    f.write(str(line) + '\n')
+print(met_in)
 
 pickle.dump( met_in.mpr_data, open( pickle_filename, "wb" ) )

met/data/wrappers/write_pickle_point.py

@@ -18,7 +18,6 @@
 print('Write Pickle:\t',  sys.argv[1])
 
 pickle_filename = sys.argv[1]
-tmp_filename = pickle_filename + '.txt'
 
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]
@@ -29,8 +28,4 @@
 met_in = importlib.util.module_from_spec(spec)
 spec.loader.exec_module(met_in)
 
-f = open(tmp_filename, 'w')
-for line in met_in.point_data:
-    f.write(str(line) + '\n')
-
 pickle.dump( met_in.point_data, open( pickle_filename, "wb" ) )