Merge pull request #6 from clevelam/case_file

Fix case file plotting and update default color map
lanl · Jun 2, 2020 · e006e8a · e006e8a
2 parents 4404f8c + 4a6c482
commit e006e8a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/opppy/interactive_utils.py b/opppy/interactive_utils.py
@@ -586,7 +586,7 @@ def plot_3d_parser(self, subparser):
         plot_parser.set_defaults(func=self.plot_3d)
 
     def plot_3d(self, args):
-        dictionaries = generate_dump_dictionary_list(args.dump_names, self.dump_parser, args.key_words, args.pickle_files)
+        dictionaries = generate_dump_dictionary_list(args.dump_names, self.dump_parser, args.key_words, args.pickle_files, args.case_files)
         self.ploter_3d.plot_3d_slice(args, dictionaries[0])
 
 
@@ -597,7 +597,7 @@ def plot_2d(self, args):
 
 
     def plot_1d(self, args):
-        dictionaries = generate_dump_dictionary_list(args.dump_names, self.dump_parser, args.key_words, args.pickle_files)
+        dictionaries = generate_dump_dictionary_list(args.dump_names, self.dump_parser, args.key_words, args.pickle_files, args.case_files)
         self.ploter_1d.plot_1d(args, dictionaries, args.dump_names)
 
 

diff --git a/opppy/plot_dump_dictionary.py b/opppy/plot_dump_dictionary.py
@@ -379,7 +379,13 @@ def plot_2d(self, args, dictionary):
         else:
             griddata = data2grid(dictionary,xname,yname,data_name,args.num_grid,args.interp_method)
 
-        PyPloter.imshow(griddata[data_name] , extent=(griddata[xname].min(),griddata[xname].max(),griddata[yname].min(),griddata[yname].max()), origin='lower')
+        if(args.data_bounds):
+            vmin = args.data_bounds[0]
+            vmax = args.data_bounds[1]
+        else:
+            vmin = None
+            vmax = None
+        PyPloter.imshow(griddata[data_name], vmin=vmin, vmax=vmax, extent=(griddata[xname].min(),griddata[xname].max(),griddata[yname].min(),griddata[yname].max()), origin='lower', cmap='jet')
         PyPloter.colorbar()
 
         if(args.find_max_value):
@@ -521,7 +527,14 @@ def plot_3d_slice(self, args, dictionary):
 
         griddata = data2grid3Dslice(dictionary,xname,yname,zname,data_name,args.z_slice,args.num_grid,args.interp_method)
 
-        PyPloter.imshow(griddata[data_name] , extent=(griddata[xname].min(),griddata[xname].max(),griddata[yname].min(),griddata[yname].max()), origin='lower')
+        if(args.data_bounds):
+            vmin = args.data_bounds[0]
+            vmax = args.data_bounds[1]
+        else:
+            vmin = None
+            vmax = None
+
+        PyPloter.imshow(griddata[data_name], vmin=vmin,vmax=vmax, extent=(griddata[xname].min(),griddata[xname].max(),griddata[yname].min(),griddata[yname].max()), origin='lower', cmap='jet')
         PyPloter.colorbar()
 
         if(args.find_max_value):
@@ -948,15 +961,19 @@ def init_contour():
 
             PyPloter.legend(loc='best')
 
-            imshow = PyPloter.imshow(series_pair.grid[0][dname], extent=(xmin,xmax,ymin,ymax), vmin=vmin, vmax=vmax, origin='lower', animated=True)
+            if(args.data_bounds):
+                vmin = args.data_bounds[0]
+                vmax = args.data_bounds[1]
+
+            imshow = PyPloter.imshow(series_pair.grid[0][dname], extent=(xmin,xmax,ymin,ymax), vmin=vmin, vmax=vmax, origin='lower', animated=True, cmap='jet')
             PyPloter.colorbar()
 
             return imshow, xmin, xmax, ymin, ymax, vmin, vmax
 
         imshow, xmin, xmax, ymin, ymax, vmin, vmax = init_contour()
         ims = []
         for data in series_pair.grid:
-            ims.append([PyPloter.imshow(data[args.data_name], extent=(xmin,xmax,ymin,ymax), vmin=vmin, vmax=vmax, origin='lower', animated=True)])
+            ims.append([PyPloter.imshow(data[args.data_name], extent=(xmin,xmax,ymin,ymax), vmin=vmin, vmax=vmax, origin='lower', animated=True, cmap='jet')])
 
         ani = ArtistAnimation(fig, ims, interval=200, blit=True)