From e25952351bac7414da6f1e20cf80d4b83b3171b4 Mon Sep 17 00:00:00 2001 From: Roger Lee Date: Mon, 5 Feb 2024 14:40:46 +0800 Subject: [PATCH] 0.0.4 --- docs/sg_execution_times.rst | 166 --------------------------- examples/1D/0-plot_trace.py | 2 +- examples/1D/1-plot_trace.py | 2 +- examples/1D/2-plot_multi_traces.py | 2 +- examples/2D/08-plot2d_disc.py | 2 +- examples/2D/09-plot2d_disc_cbar.py | 2 +- examples/more_demos/011-disc_cbar.py | 2 +- examples/more_demos/020-overlay.py | 2 +- examples/more_demos/061-well_logs.py | 1 - examples/more_demos/070-f3.py | 18 ++- examples/more_demos/071-f3.py | 2 +- 11 files changed, 16 insertions(+), 185 deletions(-) delete mode 100644 docs/sg_execution_times.rst diff --git a/docs/sg_execution_times.rst b/docs/sg_execution_times.rst deleted file mode 100644 index e5a6153..0000000 --- a/docs/sg_execution_times.rst +++ /dev/null @@ -1,166 +0,0 @@ - -:orphan: - -.. _sphx_glr_sg_execution_times: - - -Computation times -================= -**00:00.000** total execution time for 44 files **from all galleries**: - -.. container:: - - .. raw:: html - - - - - - - - .. list-table:: - :header-rows: 1 - :class: table table-striped sg-datatable - - * - Example - - Time - - Mem (MB) - * - :ref:`sphx_glr_gallery_1D_0-plot_trace.py` (``../examples/1D/0-plot_trace.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_1D_1-plot_trace.py` (``../examples/1D/1-plot_trace.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_1D_2-plot_multi_traces.py` (``../examples/1D/2-plot_multi_traces.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_1D_3-plot_station.py` (``../examples/1D/3-plot_station.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_01-plot2d.py` (``../examples/2D/01-plot2d.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_02-plot2d_rgt_fx.py` (``../examples/2D/02-plot2d_rgt_fx.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_03-plot2d_well_logs.py` (``../examples/2D/03-plot2d_well_logs.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_04-plot2d_well_pos.py` (``../examples/2D/04-plot2d_well_pos.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_05-plot2d_subplots.py` (``../examples/2D/05-plot2d_subplots.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_06-plot2d_rgt.py` (``../examples/2D/06-plot2d_rgt.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_07-plot2d_rgt_isoline.py` (``../examples/2D/07-plot2d_rgt_isoline.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_08-plot2d_disc.py` (``../examples/2D/08-plot2d_disc.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_09-plot2d_disc_cbar.py` (``../examples/2D/09-plot2d_disc_cbar.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_10-plot2d_ticks.py` (``../examples/2D/10-plot2d_ticks.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_11-plot2d_fonts.py` (``../examples/2D/11-plot2d_fonts.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_12-plot2d_aspect.py` (``../examples/2D/12-plot2d_aspect.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_2D_13-plot2d_f3.py` (``../examples/2D/13-plot2d_f3.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_01-slice.py` (``../examples/3Dvispy/01-slice.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_02-overlay_fault.py` (``../examples/3Dvispy/02-overlay_fault.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_03-overlay_rgt.py` (``../examples/3Dvispy/03-overlay_rgt.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_04-overlay_rgt_fault.py` (``../examples/3Dvispy/04-overlay_rgt_fault.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_05-surfaces.py` (``../examples/3Dvispy/05-surfaces.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_06-bodys.py` (``../examples/3Dvispy/06-bodys.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_07-well_logs_tube.py` (``../examples/3Dvispy/07-well_logs_tube.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_08-well_log_multi_traces.py` (``../examples/3Dvispy/08-well_log_multi_traces.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_09-slice_surf_body_logs.py` (``../examples/3Dvispy/09-slice_surf_body_logs.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_10-multi_canvas.py` (``../examples/3Dvispy/10-multi_canvas.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_11-share_cameras.py` (``../examples/3Dvispy/11-share_cameras.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_3Dvispy_12-surf-overlay.py` (``../examples/3Dvispy/12-surf-overlay.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_colormap_01-plot_cmap.py` (``../examples/colormap/01-plot_cmap.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_colormap_02-plot_all_custom_cmap.py` (``../examples/colormap/02-plot_all_custom_cmap.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_colormap_03-plot_stratum_cmap.py` (``../examples/colormap/03-plot_stratum_cmap.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_010-slices.py` (``../examples/more_demos/010-slices.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_011-disc_cbar.py` (``../examples/more_demos/011-disc_cbar.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_020-overlay.py` (``../examples/more_demos/020-overlay.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_030-overlay2.py` (``../examples/more_demos/030-overlay2.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_040-surface1.py` (``../examples/more_demos/040-surface1.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_041-surface1.py` (``../examples/more_demos/041-surface1.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_050-bodys1.py` (``../examples/more_demos/050-bodys1.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_060-well_logs.py` (``../examples/more_demos/060-well_logs.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_061-well_logs.py` (``../examples/more_demos/061-well_logs.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_070-f3.py` (``../examples/more_demos/070-f3.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_071-f3.py` (``../examples/more_demos/071-f3.py``) - - 00:00.000 - - 0.0 - * - :ref:`sphx_glr_gallery_more_demos_080-channels.py` (``../examples/more_demos/080-channels.py``) - - 00:00.000 - - 0.0 diff --git a/examples/1D/0-plot_trace.py b/examples/1D/0-plot_trace.py index b2a121c..23c7be1 100644 --- a/examples/1D/0-plot_trace.py +++ b/examples/1D/0-plot_trace.py @@ -19,7 +19,7 @@ import numpy as np import cigvis -root = '/Users/lijintao/work/mygit/pyseisview/data/' +root = '../../data/' sxp = root + 'seis_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/1D/1-plot_trace.py b/examples/1D/1-plot_trace.py index 70776eb..52a0b26 100644 --- a/examples/1D/1-plot_trace.py +++ b/examples/1D/1-plot_trace.py @@ -20,7 +20,7 @@ import cigvis import matplotlib.pyplot as plt -root = '/Users/lijintao/work/mygit/pyseisview/data/' +root = '../../data/' sxp = root + 'seis_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/1D/2-plot_multi_traces.py b/examples/1D/2-plot_multi_traces.py index 3010561..5f8b66f 100644 --- a/examples/1D/2-plot_multi_traces.py +++ b/examples/1D/2-plot_multi_traces.py @@ -18,7 +18,7 @@ import cigvis import matplotlib.pyplot as plt -root = '/Users/lijintao/work/mygit/pyseisview/data/' +root = '../../data/' sxp = root + 'seis_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/2D/08-plot2d_disc.py b/examples/2D/08-plot2d_disc.py index 1ad810e..1453206 100644 --- a/examples/2D/08-plot2d_disc.py +++ b/examples/2D/08-plot2d_disc.py @@ -17,7 +17,7 @@ import numpy as np import cigvis -root = '/Users/lijintao/work/mygit/pyseisview/data/' +root = '../../data/' sxp = root + 'seis_h360x600x400.dat' lxp = root + 'label_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/2D/09-plot2d_disc_cbar.py b/examples/2D/09-plot2d_disc_cbar.py index f0e5f74..55a864f 100644 --- a/examples/2D/09-plot2d_disc_cbar.py +++ b/examples/2D/09-plot2d_disc_cbar.py @@ -19,7 +19,7 @@ from cigvis import colormap import matplotlib.pyplot as plt -root = '/Users/lijintao/work/mygit/pyseisview/data/' +root = '../../data/' sxp = root + 'seis_h360x600x400.dat' lxp = root + 'label_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/more_demos/011-disc_cbar.py b/examples/more_demos/011-disc_cbar.py index 0e6227a..1b56e12 100644 --- a/examples/more_demos/011-disc_cbar.py +++ b/examples/more_demos/011-disc_cbar.py @@ -82,7 +82,7 @@ def show_discrete_cbar(d): if __name__ == '__main__': - root = '/Users/lijintao/work/mygit/pyseisview/data/' + root = '../../data/' lxp = root + 'label_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/more_demos/020-overlay.py b/examples/more_demos/020-overlay.py index 458db2c..2bca470 100644 --- a/examples/more_demos/020-overlay.py +++ b/examples/more_demos/020-overlay.py @@ -138,7 +138,7 @@ def show(bg, fg): if __name__ == '__main__': - root = '/Users/lijintao/work/mygit/pyseisview/data/' + root = '../../data/' sxp = root + 'seis_h360x600x400.dat' lxp = root + 'label_h360x600x400.dat' ni, nx, nt = 400, 600, 360 diff --git a/examples/more_demos/061-well_logs.py b/examples/more_demos/061-well_logs.py index 0b0fd93..59f26f6 100644 --- a/examples/more_demos/061-well_logs.py +++ b/examples/more_demos/061-well_logs.py @@ -25,7 +25,6 @@ def show(sx, points, values, null_value): v2 = v.copy() v2[v2 < -900] = v[v!=-999.25].min() logs1 = np.concatenate([points, v2[:, np.newaxis]], axis=1) - print(v2.min(), v2.max()) nodes0 = cigvis.create_slices(sx) nodes0 += cigvis.create_Line_logs( logs1[:, :4], diff --git a/examples/more_demos/070-f3.py b/examples/more_demos/070-f3.py index 6490ab4..c9b8572 100644 --- a/examples/more_demos/070-f3.py +++ b/examples/more_demos/070-f3.py @@ -28,7 +28,7 @@ def load_wellLog(p): x = [259, 619, 339, 141] y = [33, 545, 704, 84] z = np.arange(0, 0.2 * npoints, 0.2) - v = np.fromfile(p, '>f4').reshape(nlog, npoints) + v = np.fromfile(p, np.float32).reshape(nlog, npoints) v = 0.5 * np.log(v) nodes = [] @@ -45,36 +45,34 @@ def load_wellLog(p): if __name__ == '__main__': - root = '/Users/lijintao/Downloads/F3/f3d/data/' + root = '/Users/lijintao/Downloads/data/F3/' seisp = root + 'seis.dat' saltp = root + 'salt.dat' - hz1p = root + 'hz1.dat' - hz2p = root + 'hz2.dat' + hz2p = root + 'hz.dat' uncp = root + 'unc.dat' - unc1p = root + 'unc1.dat' unc2p = root + 'unc2.dat' ni, nx, nt = 591, 951, 362 shape = (ni, nx, nt) # seismic slices - seis = np.memmap(seisp, '>f4', 'c', shape=shape) + seis = np.memmap(seisp, np.float32, 'c', shape=shape) nodes = cigvis.create_slices(seis, pos=[ni - 2, 25, nt - 2], cmap='gray', clim=[-2.0, 1.5]) # salt (geologic body) - salt = np.memmap(saltp, '>f4', 'c', shape=shape) + salt = np.memmap(saltp, np.float32, 'c', shape=shape) nodes += cigvis.create_bodys(salt, 0.0, 0.0, color='cyan') # hrizon (surface) - hz2 = np.fromfile(hz2p, '>f4').reshape(ni, nx) + hz2 = np.fromfile(hz2p, np.float32).reshape(ni, nx) nodes += cigvis.create_surfaces([hz2], color='yellow') # displacement field of unconformity (volume) - unc = np.fromfile(uncp, '>f4').reshape(shape).astype(np.float32) + unc = np.fromfile(uncp, np.float32).reshape(shape).astype(np.float32) # unconformity (surface) - unc2 = np.fromfile(unc2p, '>f4').reshape(ni, nx).astype(np.float32) + unc2 = np.fromfile(unc2p, np.float32).reshape(ni, nx).astype(np.float32) nodes += cigvis.create_surfaces([unc2], volume=unc, value_type='amp') # well logs diff --git a/examples/more_demos/071-f3.py b/examples/more_demos/071-f3.py index 59145e9..1e3f89d 100644 --- a/examples/more_demos/071-f3.py +++ b/examples/more_demos/071-f3.py @@ -91,7 +91,7 @@ def load_wellLog(p): nodes += load_wellLog(root + 'logs.dat') - # nodes += cigvis.create_fault_skin(root + 'skins/') + nodes += cigvis.create_fault_skin(root + 'skins/') cigvis.plot3D(nodes, azimuth=-65.0,