update to have complete output for cross_section and horizonal_slice

Author: meihuisu

dist/ucvm_plotting-0.0.6-py3-none-any.whl

@@ -9,10 +9,11 @@
 #  Imports
 from .cvm_ucvm import Point, MaterialProperties, UCVM, UCVM_CVMS
 from .cvm_plot import Plot, math, plot_cmapDiscretize, cm, mcolors, basemap, plt, np
-from .cvm_common import VERSION
+from .cvm_common import VERSION, pycvm_filestub
 
 import random
 import string
+import pdb
 
 try:
     import pyproj
@@ -96,9 +97,16 @@ def __init__(self, startingpoint, endingpoint, meta={}):
             self.cvm = self.meta['cvm']
         else:
             self.cvm = None
-        
+
+        self.skip = None
+        if ('skip' in self.meta) and (self.meta['skip'] == '1') :
+            self.skip = True
+
         if 'data_type' in self.meta :
            self.mproperty = self.meta['data_type']
+           if self.meta['data_type'] == 'all' :
+               if self.skip == None:
+                  self.mproperty = "vs"
         else:
            self.mproperty = "vs"
 
@@ -140,11 +148,6 @@ def __init__(self, startingpoint, endingpoint, meta={}):
                         self.startingpoint.latitude, self.endingpoint.longitude, self.endingpoint.latitude)
             self.meta['title']=self.title
 
-        if 'skip' in self.meta:
-            self.skip= True;
-        else:
-            self.skip = None
-
         self.ucvm = UCVM(install_dir=self.installdir, config_file=self.configfile, z_range=self.z_range, floors=self.floors)
 
 
@@ -235,18 +238,19 @@ def getplotvals(self, mproperty='vs'):
 
         ## The 2D array of retrieved material properties.
             self.materialproperties = [[MaterialProperties(-1, -1, -1) for x in range(self.num_x)] for y in range(self.num_y)] 
-
-        
             for y in range(0, self.num_y):
                 for x in range(0, self.num_x):   
                     self.materialproperties[y][x] = data[y * self.num_x + x]     
+
     ## 
     #  Plots the cross section slice either to an image or a file name.
     # 
     def plot(self):
-
         if self.skip :
-            self._file()
+            if self.mproperty == "all" :
+                self._file_all()
+            else:
+                self._file()
         else:
             self._plot_file()
 
@@ -514,3 +518,53 @@ def _file(self) :
               f = "cross_section"+rnd
               ucvm.export_metadata(self.meta,f)
               ucvm.export_np_float_array(datapoints,f)
+
+
+    ## 
+    #  Create the cross section slice data files for vs, vp and density
+    #
+    def _file_all(self) :
+
+        # make sure meta.datafile is None
+        self.datafile = None
+
+        #label_uid_something.png
+        if self.filename != None:
+            fstub=pycvm_filestub(self.filename)
+        else:
+            rnd=''.join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(6))
+            fstub = "cross_section_"+rnd
+
+        self.getplotvals()
+        
+        datapoints = np.arange(self.num_x * self.num_y,dtype=np.float32).reshape(self.num_y, self.num_x)
+            
+        for mproperty in ['vs', 'vp', 'density' ] :
+
+            self.meta['data_type']=mproperty
+            # process for label + UID
+            f = fstub+"_"+mproperty
+
+            for i in range(0, self.num_y):
+                for j in range(0, self.num_x):
+                    datapoints[i][j] = self.materialproperties[i][j].getProperty(mproperty)
+
+            self.max_val= np.nanmax(datapoints)
+            self.min_val=np.nanmin(datapoints)
+            self.mean_val=np.mean(datapoints)
+
+            ucvm = self.ucvm
+
+            self.meta['num_x'] = self.num_x
+            self.meta['num_y'] = self.num_y
+            self.meta['datapoints'] = datapoints.size
+            self.meta['max'] = self.max_val.item()
+            self.meta['min'] = self.min_val.item()
+            self.meta['mean'] = self.mean_val.item()
+            self.meta['lon_list'] = self.lon_list
+            self.meta['lat_list'] = self.lat_list
+            self.meta['depth_list'] = self.depth_list
+
+            ucvm.export_metadata(self.meta,f+"_meta.json")
+            ucvm.export_np_float_array(datapoints,f+"_data.bin")
+

dist/ucvm_plotting-0.0.6.tar.gz

@@ -175,3 +175,13 @@ def pycvm_is_num(value):
         return True
     except Exception:
         return False
+##
+#  Returns file stub that is made of label_uid
+#
+#  @param filename The string to extract label and uid from
+#  @return file_uid string
+def pycvm_filestub(fname):
+    tokens = fname.split("_")
+    label=tokens[0]
+    uid=tokens[1]
+    return label+"_"+uid

pycvm/cross_section.py

@@ -10,7 +10,7 @@
 #  Imports
 from .cvm_ucvm import Point, MaterialProperties, UCVM, UCVM_CVMS
 from .cvm_plot import Plot, math, plot_cmapDiscretize, cm, mcolors, basemap, plt, np
-from .cvm_common import VERSION
+from .cvm_common import VERSION, pycvm_filestub
 
 ##
 #  @class HorizontalSlice
@@ -134,16 +134,18 @@ def __init__(self, upperleftpoint, bottomrightpoint, meta={}) :
             self.title = "%s%s Horizontal Slice at %.0fm" % (location_text, cvmdesc, self.upperleftpoint.depth)
             self.meta['title'] = self.title
 
+        self.skip = None
+        if ('skip' in self.meta) and (self.meta['skip'] == '1'):
+           self.skip = True
+
         if 'data_type' in self.meta :
            self.mproperty = self.meta['data_type']
+           if self.meta['data_type'] == 'all' :
+               if self.skip == None:
+                   self.mproperty = "vs"
         else:
            self.mproperty = "vs"
 
-        if 'skip' in self.meta:
-           self.skip =  self.meta['skip']
-        else:
-           self.skip = None;
-    
         self.ucvm = UCVM(install_dir=self.installdir, config_file=self.configfile, z_range=self.z_range, floors=self.floors)
 
     ##
@@ -227,7 +229,10 @@ def getplotvals(self, mproperty="vs"):
     def plot(self, horizontal_label = None):
 
         if self.skip :
-            self._file(horizontal_label)
+           if self.mproperty == "all" :
+                self._file_all(horizontal_label)
+           else:
+                self._file(horizontal_label)
         else: 
             self._plot_file(horizontal_label) 
 
@@ -467,3 +472,50 @@ def _file(self, horizontal_label = None):
               ucvm.export_metadata(self.meta,f)
               ucvm.export_np_float_array(datapoints,f)
 
+
+    ## 
+    #  Create the horizontal slice data file only and one of each of vs, vp, density
+    # 
+    def _file_all(self, horizontal_label = None):
+
+        self.datafile = None
+
+        self.getplotvals()
+
+        #label_uid_something.png
+        if self.filename != None:
+            fstub=pycvm_filestub(self.filename)
+        else:
+            rnd=''.join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(6))
+            fstub = "horizontal_slice_"+rnd
+
+        # Get the properties.
+        datapoints = np.arange(self.num_x * self.num_y,dtype=np.float32).reshape(self.num_y, self.num_x)
+        for mproperty in ['vs', 'vp', 'density' ] :
+
+          self.meta['data_type']=mproperty
+          # process for label + UID
+          f = fstub+"_"+mproperty
+
+          for i in range(0, self.num_y):
+            for j in range(0, self.num_x):
+                datapoints[i][j] = self.materialproperties[i][j].getProperty(mproperty)
+
+          self.max_val= np.nanmax(datapoints)
+          self.min_val=np.nanmin(datapoints)
+          self.mean_val=np.mean(datapoints)
+
+          ucvm = self.ucvm 
+
+          self.meta['num_x'] = self.num_x
+          self.meta['num_y'] = self.num_y
+          self.meta['datapoints'] = datapoints.size
+          self.meta['max'] = self.max_val.item()
+          self.meta['min'] = self.min_val.item()
+          self.meta['mean'] = self.mean_val.item()
+          self.meta['lon_list']=self.lons
+          self.meta['lat_list']=self.lats
+
+          ucvm.export_metadata(self.meta,f+"_meta.json")
+          ucvm.export_np_float_array(datapoints,f+"_data.bin")
+

pycvm/cvm_common.py

@@ -21,7 +21,7 @@ def usage():
     print("\t-e, --ending: ending depth for cross-section (meters)")
     print("\t-h, --horizontal: horizontal spacing for cross-section (meters)")
     print("\t-v, --vertical: vertical spacing for cross-section (meters)")
-    print("\t-d, --datatype: either 'vs', 'vp', 'density', or 'poisson', without quotation marks")
+    print("\t-d, --datatype: either 'vs', 'vp', 'density', 'all', or 'poisson', without quotation marks")
     print("\t-c, --cvm: one of the installed CVMs")
     print("\t-z, --zrange: optional Z-range for elygtl:ely (e.g. -z 0,350)")
     print("\t-L, --floors: optional vs/vp/density floors for taper (e.g. -L 500,1700,1700)")

pycvm/horizontal_slice.py

@@ -20,7 +20,7 @@ def usage():
     print("\t-u, --upperright: upper-right latitude, longitude (e.g. 35,-117)")
     print("\t-s, --spacing: grid spacing in degrees (typically 0.01)")
     print("\t-e, --depth: depth for horizontal slice in meters (e.g. 1000)")
-    print("\t-d, --datatype: either 'vs', 'vp', 'density', or 'poisson', without quotation marks")
+    print("\t-d, --datatype: either 'vs', 'vp', 'density', 'all', or 'poisson', without quotation marks")
     print("\t-c, --cvm: one of the installed velocity models")
     print("\t-z, --zrange: optional Z-range for elygtl:ely (e.g. -z 0,350)")
     print("\t-L, --floors: optional vs/vp/density floors for taper (e.g. -L 500,1700,1700)")