Changeset 3867 for trunk/LMDZ.MARS/util

Timestamp:

Jul 24, 2025, 3:43:18 PM (3 weeks ago)

Author:

jbclement

Message:

Mars PCM:
Small usage improvements for the script "display_netcdf.py".
JBC

Location:

trunk/LMDZ.MARS/util

Files:

• display_netcdf.py (modified) (11 diffs)
• display_netcdf.yml (modified) (9 diffs)

trunk/LMDZ.MARS/util/display_netcdf.py

@@ -173 +173 @@
 
 
-def attach_format_coord(ax, mat, x, y, is_pcolormesh=True, data_crs=ccrs.PlateCarree()):
+def attach_format_coord(ax, mat, x, y, x_dim, y_dim, varname, is_pcolormesh=True, data_crs=ccrs.PlateCarree()):
     """
     Attach a format_coord function to the axes to display x, y, and value at cursor.
@@ -185 +185 @@
     else:
         raise ValueError(f"Unsupported mat shape {mat.shape}")
+
     # Edges or extents
     if is_pcolormesh:
@@ -194 +195 @@
     # Detect if ax is a GeoAxes with a projection we can invert
     proj = getattr(ax, 'projection', None)
-    use_geo = isinstance(proj, ccrs.Projection)
+    geo_axes = (
+        isinstance(proj, ccrs.Projection)
+        and x_dim.lower() in LON_DIMS
+        and y_dim.lower() in LAT_DIMS
+    )
 
     def format_coord(xp, yp):
-        # If GeoAxes, invert back to geographic lon/lat
-        if use_geo:
+        # Geographic transform if appropriate
+        if geo_axes:
             try:
                 lonp, latp = data_crs.transform_point(xp, yp, src_crs=proj)
@@ -215 +220 @@
             row = int((yi - y0) / (y1 - y0) * ny)
 
-        # Within bounds?
+        # Build the label
+        label_xy = f"{x_dim}={xi:.3g}, {y_dim}={yi:.3g}"
         if 0 <= row < ny and 0 <= col < nx:
             if mat.ndim == 2:
                 v = mat[row, col]
-                return f"lon={xi:.3g}, lat={yi:.3g}, val={v:.3g}"
+                return f"{label_xy}, {varname}={v:.3g}"
             else:
                 vals = mat[row, col]
                 txt = ", ".join(f"{vv:.3g}" for vv in vals[:3])
-                return f"lon={xi:.3g}, lat={yi:.3g}, val=({txt})"
-        # Out of bounds: still show coords
-        return f"lon={xi:.3g}, lat={yi:.3g}"
+                return f"{label_xy}, {varname}=({txt})"
+        else:
+            return label_xy
 
     ax.format_coord = format_coord
@@ -277 +283 @@
         uniq_lons = np.unique(lon2d.ravel())
         uniq_lats = np.unique(lat2d.ravel())
-        attach_format_coord(ax, data2d, uniq_lons, uniq_lats, is_pcolormesh=True)
+        attach_format_coord(ax, data2d, uniq_lons, uniq_lats, 'lon', 'lat', varname, is_pcolormesh=True)
 
         # Optionally overlay MOLA topography
@@ -497 +503 @@
         prompt = (
                 f"Available options for '{dim}' (size {size}):\n"
-                f"  - '1–{size}' to pick that index\n"
-                "  - 'a' to average over this dimension\n"
-                "  - 'e' or Enter to take all values\n"
+                f"  > '1–{size}' to pick that index\n"
+                "  > 'a' to average over this dimension\n"
+                "  > 'e' or Enter to take all values\n"
                 "Choose: "
         )
@@ -577 +583 @@
         )
         cf = ax.pcolormesh(lon2d, lat2d, grid, shading='auto', cmap=colormap, transform=ccrs.PlateCarree())
-        attach_format_coord(ax, grid, uniq_lons, uniq_lats, is_pcolormesh=True)
+        attach_format_coord(ax, grid, uniq_lons, uniq_lats, 'lon', 'lat', varname, is_pcolormesh=True)
         overlay_topography(ax, transform=proj, levels=10) # Overlay MOLA topography
         cbar = fig.colorbar(cf, ax=ax, pad=0.02)
@@ -651 +657 @@
         fig, ax = plt.subplots(figsize=(8, 6))
         im = ax.pcolormesh(x_coords, y_coords, plot_data, shading='auto', cmap=colormap)
-        attach_format_coord(ax, plot_data, x_coords, y_coords, is_pcolormesh=True)
+        attach_format_coord(ax, plot_data, x_coords, y_coords, x_dim, y_dim, varname, is_pcolormesh=True)
         cbar = fig.colorbar(im, ax=ax, pad=0.02)
         cbar.set_label(varname)
@@ -658 +664 @@
         ax.set_title(f"{varname} ({y_dim} vs {x_dim})")
         ax.grid(True)
-        # Prompt for polar-stereo views if interactive
-        if sys.stdin.isatty() and input("Display polar-stereo views? [y = yes, anything else = no]: ").strip().lower() == "y":
-            units = getattr(dataset.variables[varname], "units", None)
-            plot_polar_views(x_coords, y_coords, plot_data, colormap, varname, units)
-        # Prompt for 3D globe view if interactive
-        if sys.stdin.isatty() and input("Display 3D globe view? [y = yes, anything else = no]: ").strip().lower() == "y":
-            units = getattr(dataset.variables[varname], "units", None)
-            plot_3D_globe(x_coords, y_coords, plot_data, colormap, varname, units)
+        if {x_dim, y_dim} & set(LAT_DIMS) and {x_dim, y_dim} & set(LON_DIMS):
+            # Prompt for polar-stereo views if interactive
+            if sys.stdin.isatty() and input("Display polar-stereo views? [y = yes, anything else = no]: ").strip().lower() == "y":
+                units = getattr(dataset.variables[varname], "units", None)
+                plot_polar_views(x_coords, y_coords, plot_data, colormap, varname, units)
+            # Prompt for 3D globe view if interactive
+            if sys.stdin.isatty() and input("Display 3D globe view? [y = yes, anything else = no]: ").strip().lower() == "y":
+                units = getattr(dataset.variables[varname], "units", None)
+                plot_3D_globe(x_coords, y_coords, plot_data, colormap, varname, units)
         if output_path:
             fig.savefig(output_path, bbox_inches='tight')
@@ -708 +715 @@
         print("\nAvailable variables:")
         for name in var_list:
-            print(f"  - {name}")
-        varname = input("\nEnter variable name to plot (or 'q' to quit): ").strip()
-        if varname.lower() in ("q", "quit", "exit"):
+            print(f"  > {name}")
+        varname = input("\nEnter variable name to plot (or Enter to quit): ").strip()
+        if varname == "":
             print("Exiting.")
             break
@@ -722 +729 @@
         print(f"\nVariable '{varname}' has dimensions:")
         for dim, size in zip(dims, shape):
-            print(f"  > {dim}: size {size}")
+            print(f"  - {dim} (size {size})")
         print()
 

trunk/LMDZ.MARS/util/display_netcdf.yml

@@ -30 +30 @@
   - deprecated=1.2.18=pyhd8ed1ab_0
   - double-conversion=3.3.1=h5888daf_0
-  - ffmpeg=7.1.1=gpl_h127656b_906
+  - ffmpeg=7.1.1=gpl_hea4b676_907
   - font-ttf-dejavu-sans-mono=2.37=hab24e00_0
   - font-ttf-inconsolata=3.000=h77eed37_0
@@ -42 +42 @@
   - fribidi=1.0.10=h36c2ea0_0
   - frozenlist=1.7.0=py312h447239a_0
-  - gdk-pixbuf=2.42.12=hb9ae30d_0
+  - gdk-pixbuf=2.42.12=h7b179bb_1
   - geos=3.13.1=h97f6797_0
-  - gettext=0.25.1=h5888daf_0
-  - gettext-tools=0.25.1=h5888daf_0
+  - gettext=0.25.1=h3f43e3d_1
+  - gettext-tools=0.25.1=h3f43e3d_1
   - gl2ps=1.4.2=hae5d5c5_1
   - gmp=6.3.0=hac33072_2
   - graphite2=1.3.14=h5888daf_0
-  - harfbuzz=11.2.1=h3beb420_0
+  - harfbuzz=11.3.2=hbb57e21_0
   - hdf4=4.2.15=h2a13503_7
-  - hdf5=1.14.6=nompi_h6e4c0c1_102
+  - hdf5=1.14.6=nompi_h6e4c0c1_103
   - icu=75.1=he02047a_0
   - idna=3.10=pyhd8ed1ab_1
@@ -63 +63 @@
   - lerc=4.0.0=h0aef613_1
   - level-zero=1.23.1=h84d6215_0
-  - libabseil=20250127.1=cxx17_hbbce691_0
+  - libabseil=20250512.1=cxx17_hba17884_0
   - libaec=1.1.4=h3f801dc_0
-  - libasprintf=0.25.1=h8e693c7_0
-  - libasprintf-devel=0.25.1=h8e693c7_0
-  - libass=0.17.3=h52826cd_2
+  - libasprintf=0.25.1=h3f43e3d_1
+  - libasprintf-devel=0.25.1=h3f43e3d_1
+  - libass=0.17.4=h96ad9f0_0
   - libblas=3.9.0=32_h59b9bed_openblas
   - libbrotlicommon=1.1.0=hb9d3cd8_3
@@ -91 +91 @@
   - libgcc-ng=15.1.0=h69a702a_3
   - libgcrypt-lib=1.11.1=hb9d3cd8_0
-  - libgettextpo=0.25.1=h5888daf_0
-  - libgettextpo-devel=0.25.1=h5888daf_0
+  - libgettextpo=0.25.1=h3f43e3d_1
+  - libgettextpo-devel=0.25.1=h3f43e3d_1
   - libgfortran=15.1.0=h69a702a_3
   - libgfortran5=15.1.0=hcea5267_3
@@ -101 +101 @@
   - libgomp=15.1.0=h767d61c_3
   - libgpg-error=1.55=h3f2d84a_0
-  - libhwloc=2.11.2=default_h3d81e11_1002
+  - libhwloc=2.12.1=default_h3d81e11_1000
   - libiconv=1.18=h4ce23a2_1
   - libjpeg-turbo=3.1.0=hb9d3cd8_0
@@ -114 +114 @@
   - libopenblas=0.3.30=pthreads_h94d23a6_0
   - libopengl=1.7.0=ha4b6fd6_2
-  - libopenvino=2025.0.0=hdc3f47d_3
-  - libopenvino-auto-batch-plugin=2025.0.0=h4d9b6c2_3
-  - libopenvino-auto-plugin=2025.0.0=h4d9b6c2_3
-  - libopenvino-hetero-plugin=2025.0.0=h981d57b_3
-  - libopenvino-intel-cpu-plugin=2025.0.0=hdc3f47d_3
-  - libopenvino-intel-gpu-plugin=2025.0.0=hdc3f47d_3
-  - libopenvino-intel-npu-plugin=2025.0.0=hdc3f47d_3
-  - libopenvino-ir-frontend=2025.0.0=h981d57b_3
-  - libopenvino-onnx-frontend=2025.0.0=h0e684df_3
-  - libopenvino-paddle-frontend=2025.0.0=h0e684df_3
-  - libopenvino-pytorch-frontend=2025.0.0=h5888daf_3
-  - libopenvino-tensorflow-frontend=2025.0.0=h684f15b_3
-  - libopenvino-tensorflow-lite-frontend=2025.0.0=h5888daf_3
+  - libopenvino=2025.2.0=hb617929_1
+  - libopenvino-auto-batch-plugin=2025.2.0=hed573e4_1
+  - libopenvino-auto-plugin=2025.2.0=hed573e4_1
+  - libopenvino-hetero-plugin=2025.2.0=hd41364c_1
+  - libopenvino-intel-cpu-plugin=2025.2.0=hb617929_1
+  - libopenvino-intel-gpu-plugin=2025.2.0=hb617929_1
+  - libopenvino-intel-npu-plugin=2025.2.0=hb617929_1
+  - libopenvino-ir-frontend=2025.2.0=hd41364c_1
+  - libopenvino-onnx-frontend=2025.2.0=h1862bb8_1
+  - libopenvino-paddle-frontend=2025.2.0=h1862bb8_1
+  - libopenvino-pytorch-frontend=2025.2.0=hecca717_1
+  - libopenvino-tensorflow-frontend=2025.2.0=h0767aad_1
+  - libopenvino-tensorflow-lite-frontend=2025.2.0=hecca717_1
   - libopus=1.5.2=hd0c01bc_0
   - libpciaccess=0.18=hb9d3cd8_0
   - libpng=1.6.50=h943b412_0
   - libpq=17.5=h27ae623_0
-  - libprotobuf=5.29.3=h501fc15_1
+  - libprotobuf=6.31.1=h9ef548d_1
   - librsvg=2.58.4=he92a37e_3
   - libsndfile=1.2.2=hc60ed4a_1
-  - libsqlite=3.50.2=hee844dc_2
+  - libsqlite=3.50.3=hee844dc_1
   - libssh2=1.11.1=hcf80075_0
   - libstdcxx=15.1.0=h8f9b012_3
@@ -154 +154 @@
   - libxkbcommon=1.10.0=h65c71a3_0
   - libxml2=2.13.8=h4bc477f_0
-  - libxslt=1.1.39=h76b75d6_0
+  - libxslt=1.1.43=h7a3aeb2_0
   - libzip=1.11.2=h6991a6a_0
   - libzlib=1.3.1=hb9d3cd8_2
@@ -181 +181 @@
   - pillow=11.3.0=py312h80c1187_0
   - pip=25.1.1=pyh8b19718_0
-  - pixman=0.46.2=h29eaf8c_0
+  - pixman=0.46.4=h537e5f6_0
   - proj=9.6.2=h0054346_0
   - propcache=0.3.1=py312h178313f_0
@@ -204 +204 @@
   - setuptools=80.9.0=pyhff2d567_0
   - shapely=2.1.1=py312h21f5128_0
-  - six=1.17.0=pyhd8ed1ab_0
-  - snappy=1.2.1=h8bd8927_1
-  - sqlite=3.50.2=heff268d_2
+  - six=1.17.0=pyhe01879c_1
+  - snappy=1.2.2=h03e3b7b_0
+  - sqlite=3.50.3=heff268d_1
   - svt-av1=3.0.2=h5888daf_0
-  - tbb=2022.1.0=h4ce085d_0
+  - tbb=2022.2.0=hb60516a_0
   - tk=8.6.13=noxft_hd72426e_102
   - tornado=6.5.1=py312h66e93f0_0