Alaea 2.4.2__tar.gz → 2.4.3__tar.gz

{alaea-2.4.2 → alaea-2.4.3}/Alaea/Standard/__init__.py

@@ -9,5 +9,7 @@
 """
 
 """
+from .vars_name import *
 from .xr_attrs import *
+from .xr_ice import *
 from .xr_wave import *

alaea-2.4.3/Alaea/Standard/vars_name.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#  日期 : 2026/4/24 10:48
+#  作者 : Christmas
+#  邮箱 : 273519355@qq.com
+#  项目 : Alaea
+#  版本 : python 3
+#  摘要 :
+"""
+
+"""
+
+
+NAME_lon = ['lon', 'longitude']
+NAME_lat = ['lat', 'latitude']
+
+NAME_time = ['time']
+NAME_TIME = ['TIME']
+
+NAME_u10 = ['wind_U10', 'U10', 'u10']
+NAME_v10 = ['wind_V10', 'V10', 'v10']
+NAME_wpsd10max = ['WSPD10MAX']
+
+NAME_t2 = ['temperature', 'T2', 't2']
+
+NAME_visi = ['visibility', 'AFWA_VIS', 'VISIBILITY']
+
+NAME_swr = ['SWR', 'Shortwave', 'SWDOWN']
+NAME_lwr = ['LWR', 'Longwave', 'GLW']
+NAME_swrn = ['SWRN', 'SWDOWN_NORM', 'SWNORM']
+
+NAME_tcc = ['tcc', 'TCC', 'cloud_cover']
+
+NAME_prec = ['precipitation', 'tp', 'TP', 'Precipitation']
+
+NAME_slp = ['slp', 'SLP']
+
+NAME_swh = ['swh', 'SWH', 'Significant_wave_height']
+NAME_mwp = ['mwp', 'MWP', 'Mean_wave_period']
+NAME_mwd = ['mwd', 'MWD', 'Mean_wave_direction']
+NAME_mwl = ['mwl', 'MWL', 'Mean_wave_length']
+NAME_shww = ['shww', 'SHWW', 'Significant_wave_height_of_swell']
+NAME_shts = ['shts', 'SHTS', 'Significant_wave_height_of_sea']
+NAME_mdww = ['mdww', 'MDWW', 'Mean_wave_direction_of_swell']
+NAME_mdts = ['mdts', 'MDTS', 'Mean_wave_direction_of_sea']
+NAME_mpww = ['mpww', 'MPWW', 'Mean_wave_period_of_swell']
+NAME_mpts = ['mpts', 'MPTS', 'Mean_wave_period_of_sea']
+NAME_pp1d = ['pp1d', 'PP1D', 'Peak_period_of_1st_wave_component']
+NAME_hmax = ['hmax', 'HMAX', 'Max_wave_height']
+
+NAME_aice = ['aice', 'AICE', 'sea_ice_concentration']
+NAME_tice = ['tice', 'TICE', 'sea_ice_thickness']

{alaea-2.4.2 → alaea-2.4.3}/Alaea/Standard/xr_attrs.py

@@ -14,13 +14,15 @@ from typing import Optional, Union
 import numpy as np
 import xarray as xr
 
+from .vars_name import *
+
 # from .. import new_filename
 
 __all__ = ['add_coors_attrs',
            'add_lon_attrs', 'add_lat_attrs', 'add_time_attrs', 'add_TIME_attrs',
            'add_wind_attrs', 'add_temperature_attrs', 'add_precipitation_attrs', 'add_slp_attrs',
-           'add_wave_attrs', 'add_ice_attrs', 'add_visibility_attrs', 'add_radiation_attrs',
-           'add_cloudCover_attrs',
+           'add_wave_attrs', 'add_visibility_attrs', 'add_radiation_attrs', 'add_cloudCover_attrs',
+           'add_ice_attrs', 'transpose_dims',
            'fixed_encoding', 'calc_scale_offset', 'compress_scale_offset',
            'calc_dtype', 'calc_fillvalue',
            ]
@@ -42,10 +44,10 @@ def add_coors_attrs(
     :param TIME_name: TIME维度名，默认为自动识别
     :return: xarray.Dataset
     """
-    lon_name = next((x for x in ['lon', 'longitude'] if x in _ds.dims), None) if lon_name is None else lon_name
-    lat_name = next((x for x in ['lat', 'latitude'] if x in _ds.dims), None) if lat_name is None else lat_name
-    time_name = next((x for x in ['time'] if x in _ds.dims), None) if time_name is None else time_name
-    TIME_name = next((x for x in ['TIME'] if x in _ds.dims), None) if TIME_name is None else TIME_name
+    lon_name = next((x for x in NAME_lon if x in _ds.dims), None) if lon_name is None else lon_name
+    lat_name = next((x for x in NAME_lat if x in _ds.dims), None) if lat_name is None else lat_name
+    time_name = next((x for x in NAME_time if x in _ds.dims), None) if time_name is None else time_name
+    TIME_name = next((x for x in NAME_TIME if x in _ds.variables), None) if TIME_name is None else TIME_name
 
     add_lon_attrs(_ds, lon_name)
     add_lat_attrs(_ds, lat_name)
@@ -133,12 +135,12 @@ def add_TIME_attrs(
     :return: xarray.Dataset
     """
     _ds[TIME_name].attrs = {
-        'reference_time': ''.join(_ds[TIME_name].data[0].astype(str))[:10],
+        'reference_time': ''.join(_ds[TIME_name].values[0].astype(str))[:10],
         'long_name': 'UTC time',
         'standard_name': 'UTC_time',
         'calendar': 'gregorian',
-        'start_time': ''.join(_ds[TIME_name].data[0].astype(str)),
-        'end_time': ''.join(_ds[TIME_name].data[-1].astype(str))
+        'start_time': ''.join(_ds[TIME_name].values[0].astype(str)),
+        'end_time': ''.join(_ds[TIME_name].values[-1].astype(str))
     }
     _ds[TIME_name].encoding['char_dim_name'] = dim_name
     # _ds[TIME_name].encoding['zlib'] = True
@@ -147,32 +149,37 @@ def add_TIME_attrs(
 
 def add_wind_attrs(
         _ds: xr.Dataset,
-        U10_name: Optional[str] = None,
-        V10_name: Optional[str] = None,
+        u10_name: Optional[str] = None,
+        v10_name: Optional[str] = None,
+        wpsd10max_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的风添加属性
     :param _ds: xarray.Dataset
-    :param U10_name: U10变量名，默认为自动识别
-    :param V10_name: V10变量名，默认为自动识别
+    :param u10_name: u10变量名，默认为自动识别
+    :param v10_name: v10变量名，默认为自动识别
+    :param wpsd10max_name: wpsd10max变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    U10_name = next((x for x in ['wind_U10', 'U10', 'u10'] if x in _ds.data_vars), None) if U10_name is None else U10_name
-    V10_name = next((x for x in ['wind_V10', 'V10', 'v10'] if x in _ds.data_vars), None) if V10_name is None else V10_name
-    _ds[U10_name].attrs = {
+    u10_name = next((x for x in NAME_u10 if x in _ds.data_vars), None) if u10_name is None else u10_name
+    v10_name = next((x for x in NAME_v10 if x in _ds.data_vars), None) if v10_name is None else v10_name
+    wpsd10max_name = next((x for x in NAME_wpsd10max if x in _ds.data_vars), None) if wpsd10max_name is None else wpsd10max_name
+    _ds[u10_name].attrs = {
         'units': 'm s-1',
         'long_name': '10 meter U wind component',
         'standard_name': 'eastward_wind',
     }
-    _ds[V10_name].attrs = {
+    _ds[v10_name].attrs = {
         'units': 'm s-1',
         'long_name': '10 meter V wind component',
         'standard_name': 'northward_wind',
     }
-    dtype = calc_dtype(_ds[U10_name].data)
-    _ds[U10_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
-    dtype = calc_dtype(_ds[V10_name].data)
-    _ds[V10_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[u10_name].data)
+    _ds[u10_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[v10_name].data)
+    _ds[v10_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
     if 'AGL_heights' in _ds.variables:
         _ds['AGL_heights'].attrs = {
@@ -180,7 +187,8 @@ def add_wind_attrs(
             'long_name': 'Above Ground Level Height',
             'standard_name': 'height',
         }
-        _ds['AGL_heights'].encoding = {'_FillValue': None, 'dtype': calc_dtype(_ds['AGL_heights'].data), 'zlib': True}
+        dtype = calc_dtype(_ds['AGL_heights'].data)
+        _ds['AGL_heights'].encoding =  dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
     if 'U_AGL' in _ds.variables and 'V_AGL' in _ds.variables:
         _ds['U_AGL'].attrs = {
@@ -195,6 +203,7 @@ def add_wind_attrs(
         }
         dtype = calc_dtype(_ds['U_AGL'].data)
         _ds['U_AGL'].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+        dtype = calc_dtype(_ds['V_AGL'].data)
         _ds['V_AGL'].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
     if 'MSL_heights' in _ds.variables:
@@ -203,7 +212,8 @@ def add_wind_attrs(
             'long_name': 'Mean Sea Level Height',
             'standard_name': 'height',
         }
-        _ds['MSL_heights'].encoding = {'_FillValue': None, 'dtype': calc_dtype(_ds['MSL_heights'].data), 'zlib': True}
+        dtype = calc_dtype(_ds['MSL_heights'].data)
+        _ds['MSL_heights'].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
     if 'U_MSL' in _ds.variables and 'V_MSL' in _ds.variables:
         _ds['U_MSL'].attrs = {
@@ -218,203 +228,233 @@ def add_wind_attrs(
         }
         dtype = calc_dtype(_ds['U_MSL'].data)
         _ds['U_MSL'].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+        dtype = calc_dtype(_ds['V_MSL'].data)
         _ds['V_MSL'].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
-    if 'WSPD10MAX' in _ds.variables:
-        _ds['WSPD10MAX'].attrs = {
+    if wpsd10max_name in _ds:
+        _ds[wpsd10max_name].attrs = {
             'units': 'm s-1',
             'long_name': 'Maximum 10m wind speed',
             'standard_name': 'maximum_10m_wind_speed',
         }
-        dtype = calc_dtype(_ds['WSPD10MAX'].data)
-        _ds['WSPD10MAX'].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+        dtype = calc_dtype(_ds[wpsd10max_name].data)
+        _ds[wpsd10max_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+
+    _ds = transpose_dims(_ds)
 
     new_order = ['longitude', 'latitude', 'time', 'TIME',
-                 U10_name, V10_name,
+                 u10_name, v10_name,
                  'U_AGL', 'V_AGL',
                  'U_MSL', 'V_MSL',
-                 'WSPD10MAX',
+                 wpsd10max_name,
                  ]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
 def add_temperature_attrs(
         _ds: xr.Dataset,
-        T2_name: Optional[str] = None,
+        t2_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的温度添加属性
     :param _ds: xarray.Dataset
-    :param T2_name: T2变量名，默认为自动识别
+    :param t2_name: T2变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    T2_name = next((x for x in ['temperature', 'T2', 't2'] if x in _ds.data_vars), None) if T2_name is None else T2_name
+    t2_name = next((x for x in NAME_t2 if x in _ds.data_vars), None) if t2_name is None else t2_name
 
-    _ds[T2_name].attrs = {
+    _ds[t2_name].attrs = {
         'units': 'K',
         'long_name': 'temperature at 2m',
         'standard_name': 'temperature_at_2m'
     }
-    dtype = calc_dtype(_ds[T2_name].data)
-    _ds[T2_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[t2_name].data)
+    _ds[t2_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+
+    _ds = transpose_dims(_ds)
 
-    new_order = ['longitude', 'latitude', 'time', 'TIME', T2_name]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    new_order = ['longitude', 'latitude', 'time', 'TIME', t2_name]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
 def add_visibility_attrs(
         _ds: xr.Dataset,
-        visibility_name: Optional[str] = None
+        visi_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的能见度添加属性
     :param _ds: xarray.Dataset
-    :param visibility_name: 能见度变量名，默认为自动识别
+    :param visi_name: 能见度变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    visibility_name = next((x for x in ['visibility', 'AFWA_VIS', 'VISIBILITY'] if x in _ds.data_vars), None) if visibility_name is None else visibility_name
+    visi_name = next((x for x in NAME_visi if x in _ds.data_vars), None) if visi_name is None else visi_name
 
-    _ds[visibility_name].attrs = {
+    _ds[visi_name].attrs = {
         'units': 'm',
         'long_name': 'visibility',
         'standard_name': 'visibility'
     }
-    dtype = calc_dtype(_ds[visibility_name].data)
-    _ds[visibility_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[visi_name].data)
+    _ds[visi_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
-    new_order = ['longitude', 'latitude', 'time', 'TIME', visibility_name]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    _ds = transpose_dims(_ds)
+
+    new_order = ['longitude', 'latitude', 'time', 'TIME', visi_name]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
 def add_radiation_attrs(
         _ds: xr.Dataset,
-        shortwave_name: Optional[str] = None,
-        longwave_name: Optional[str] = None,
-        swnorm_name: Optional[str] = None
+        swr_name: Optional[str] = None,
+        lwr_name: Optional[str] = None,
+        swrn_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的辐射添加属性
     :param _ds: xarray.Dataset
-    :param shortwave_name: 短波辐射变量名，默认为自动识别
-    :param longwave_name: 长波辐射变量名，默认为自动识别
-    :param swnorm_name: 短波辐射法向量变量名，默认为自动识别
+    :param swr_name: 短波辐射变量名，默认为自动识别
+    :param lwr_name: 长波辐射变量名，默认为自动识别
+    :param swrn_name: 短波辐射法向量变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    shortwave_name = next((x for x in ['SWR', 'Shortwave', 'SWDOWN'] if x in _ds.data_vars), None) if shortwave_name is None else shortwave_name
-    longwave_name = next((x for x in ['LWR', 'Longwave', 'GLW'] if x in _ds.data_vars), None) if longwave_name is None else longwave_name
+    swr_name = next((x for x in NAME_swr if x in _ds.data_vars), None) if swr_name is None else swr_name
+    lwr_name = next((x for x in NAME_lwr if x in _ds.data_vars), None) if lwr_name is None else lwr_name
+    swrn_name = next((x for x in NAME_swrn if x in _ds.data_vars), None) if swrn_name is None else swrn_name
 
-    _ds[shortwave_name].attrs = {
+    _ds[swr_name].attrs = {
         'units': 'W/m^2',
         'long_name': 'Short wave radiation',
         'standard_name': 'Short_wave_radiation',
         'description': 'Short wave radiation, positive for ocean gaining energy',
     }
-    dtype = calc_dtype(_ds[shortwave_name].data)
-    _ds[shortwave_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[swr_name].data)
+    _ds[swr_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
-    _ds[longwave_name].attrs = {
+    _ds[lwr_name].attrs = {
         'units': 'W/m^2',
         'long_name': 'Long wave radiation',
         'standard_name': 'Long_wave_radiation',
         'description': 'Long wave radiation, positive for ocean gaining energy',
     }
-    dtype = calc_dtype(_ds[longwave_name].data)
-    _ds[longwave_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[lwr_name].data)
+    _ds[lwr_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
-    swnorm_name = next((x for x in ['SWRN', 'SWDOWN_NORM', 'SWNORM'] if x in _ds.data_vars), None) if swnorm_name is None else swnorm_name
-    if swnorm_name in _ds:
-        _ds[swnorm_name].attrs = {
+    if swrn_name in _ds:
+        _ds[swrn_name].attrs = {
             'units': 'W/m^2',
             'long_name': 'Short wave radiation normal',
             'standard_name': 'Short_wave_radiation_normal',
             'description': 'normal short wave flux at ground surface (slope-dependent)',
         }
-        dtype = calc_dtype(_ds[swnorm_name].data)
-        _ds[swnorm_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+        dtype = calc_dtype(_ds[swrn_name].data)
+        _ds[swrn_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
-    new_order = ['longitude', 'latitude', 'time', 'TIME',
-                 shortwave_name, longwave_name, swnorm_name,]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    _ds = transpose_dims(_ds)
+
+    new_order = ['longitude', 'latitude', 'time', 'TIME', swr_name, lwr_name, swrn_name]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
 def add_cloudCover_attrs(
         _ds: xr.Dataset,
-        cloud_cover_name: Optional[str] = None
+        tcc_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的云量添加属性
     :param _ds: xarray.Dataset
-    :param cloud_cover_name: 云量变量名，默认为自动识别
+    :param tcc_name: 云量变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    cloud_cover_name = next((x for x in ['tcc', 'TCC', 'cloud_cover'] if x in _ds.data_vars), None) if cloud_cover_name is None else cloud_cover_name
+    tcc_name = next((x for x in NAME_tcc if x in _ds.data_vars), None) if tcc_name is None else tcc_name
 
-    _ds[cloud_cover_name].attrs = {
+    _ds[tcc_name].attrs = {
         'units': '1',
         'long_name': 'total cloud cover',
         'standard_name': 'total_cloud_cover',
         'description': 'Total cloud cover, percentage of the sky covered by clouds'
     }
-    dtype = calc_dtype(_ds[cloud_cover_name].data)
-    _ds[cloud_cover_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[tcc_name].data)
+    _ds[tcc_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
-    new_order = ['longitude', 'latitude', 'time', 'TIME', cloud_cover_name]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    _ds = transpose_dims(_ds)
+
+    new_order = ['longitude', 'latitude', 'time', 'TIME', tcc_name]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
 def add_precipitation_attrs(
         _ds: xr.Dataset,
-        precipitation_name: Optional[str] = None
+        prec_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的降水添加属性
     :param _ds: xarray.Dataset
-    :param precipitation_name: 降水变量名，默认为自动识别
+    :param prec_name: 降水变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    precipitation_name = next((x for x in ['precipitation', 'tp', 'TP', 'Precipitation'] if x in _ds.data_vars), None) if precipitation_name is None else precipitation_name
+    prec_name = next((x for x in NAME_prec if x in _ds.data_vars), None) if prec_name is None else prec_name
 
-    _ds[precipitation_name].attrs = {
+    _ds[prec_name].attrs = {
         'units': 'mm',
         'long_name': 'precipitation, positive for ocean gaining water',
         'standard_name': 'precipitation_positive_ocean_gaining_water'
     }
-    dtype = calc_dtype(_ds[precipitation_name].data)
-    _ds[precipitation_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+    dtype = calc_dtype(_ds[prec_name].data)
+    _ds[prec_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
+
+    _ds = transpose_dims(_ds)
 
-    new_order = ['longitude', 'latitude', 'time', 'TIME', precipitation_name]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    new_order = ['longitude', 'latitude', 'time', 'TIME', prec_name]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
 def add_slp_attrs(
         _ds: xr.Dataset,
-        slp_name: Optional[str] = None
+        slp_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的海平面气压添加属性
     :param _ds: xarray.Dataset
     :param slp_name: 海平面气压变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    slp_name = next((x for x in ['slp', 'SLP'] if x in _ds.data_vars), None) if slp_name is None else slp_name
+    slp_name = next((x for x in NAME_slp if x in _ds.data_vars), None) if slp_name is None else slp_name
 
     _ds[slp_name].attrs = {
         'units': 'Pa',
@@ -424,9 +464,12 @@ def add_slp_attrs(
     dtype = calc_dtype(_ds[slp_name].data)
     _ds[slp_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
+    _ds = transpose_dims(_ds)
+
     new_order = ['longitude', 'latitude', 'time', 'TIME', slp_name]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
@@ -444,7 +487,8 @@ def add_wave_attrs(
         mpww_name: Optional[str] = None,
         mpts_name: Optional[str] = None,
         pp1d_name: Optional[str] = None,
-        hmax_name: Optional[str] = None
+        hmax_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的海浪添加属性
@@ -461,22 +505,23 @@ def add_wave_attrs(
     :param mpts_name: 涌浪平均波周期变量名，默认为自动识别
     :param pp1d_name: 谱峰周期变量名，默认为自动识别
     :param hmax_name: 最大波高变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    swh_name = next((x for x in ['swh', 'SWH'] if x in _ds.data_vars), None) if swh_name is None else swh_name
-    mwp_name = next((x for x in ['mwp', 'MWP'] if x in _ds.data_vars), None) if mwp_name is None else mwp_name
-    mwd_name = next((x for x in ['mwd', 'MWD'] if x in _ds.data_vars), None) if mwd_name is None else mwd_name
-    mwl_name = next((x for x in ['mwl', 'MWL'] if x in _ds.data_vars), None) if mwl_name is None else mwl_name
-
-    shww_name = next((x for x in ['shww', 'SHWW'] if x in _ds.data_vars), None) if shww_name is None else shww_name  # 风浪有效波高
-    shts_name = next((x for x in ['shts', 'SHTS'] if x in _ds.data_vars), None) if shts_name is None else shts_name  # 涌浪有效波高
-    mdww_name = next((x for x in ['mdww', 'MDWW'] if x in _ds.data_vars), None) if mdww_name is None else mdww_name  # 风浪平均波向
-    mdts_name = next((x for x in ['mdts', 'MDTS'] if x in _ds.data_vars), None) if mdts_name is None else mdts_name  # 涌浪平均波向
-    mpww_name = next((x for x in ['mpww', 'MPWW'] if x in _ds.data_vars), None) if mpww_name is None else mpww_name  # 风浪平均波周期
-    mpts_name = next((x for x in ['mpts', 'MPTS'] if x in _ds.data_vars), None) if mpts_name is None else mpts_name  # 涌浪平均波周期
-    
-    pp1d_name = next((x for x in ['pp1d', 'PP1D'] if x in _ds.data_vars), None) if pp1d_name is None else pp1d_name  # 谱峰周期
-    hmax_name = next((x for x in ['hmax', 'HMAX'] if x in _ds.data_vars), None) if hmax_name is None else hmax_name  # 最大波高
+    swh_name = next((x for x in NAME_swh if x in _ds.data_vars), None) if swh_name is None else swh_name
+    mwp_name = next((x for x in NAME_mwp if x in _ds.data_vars), None) if mwp_name is None else mwp_name
+    mwd_name = next((x for x in NAME_mwd if x in _ds.data_vars), None) if mwd_name is None else mwd_name
+    mwl_name = next((x for x in NAME_mwl if x in _ds.data_vars), None) if mwl_name is None else mwl_name
+
+    shww_name = next((x for x in NAME_shww if x in _ds.data_vars), None) if shww_name is None else shww_name  # 风浪有效波高
+    shts_name = next((x for x in NAME_shts if x in _ds.data_vars), None) if shts_name is None else shts_name  # 涌浪有效波高
+    mdww_name = next((x for x in NAME_mdww if x in _ds.data_vars), None) if mdww_name is None else mdww_name  # 风浪平均波向
+    mdts_name = next((x for x in NAME_mdts if x in _ds.data_vars), None) if mdts_name is None else mdts_name  # 涌浪平均波向
+    mpww_name = next((x for x in NAME_mpww if x in _ds.data_vars), None) if mpww_name is None else mpww_name  # 风浪平均波周期
+    mpts_name = next((x for x in NAME_mpts if x in _ds.data_vars), None) if mpts_name is None else mpts_name  # 涌浪平均波周期
+
+    pp1d_name = next((x for x in NAME_pp1d if x in _ds.data_vars), None) if pp1d_name is None else pp1d_name  # 谱峰周期
+    hmax_name = next((x for x in NAME_hmax if x in _ds.data_vars), None) if hmax_name is None else hmax_name  # 最大波高
 
     if swh_name in _ds:
         _ds[swh_name].attrs = {
@@ -593,6 +638,8 @@ def add_wave_attrs(
         dtype = calc_dtype(_ds[hmax_name].data)
         _ds[hmax_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
+    _ds = transpose_dims(_ds)
+
     new_order = ['longitude', 'latitude', 'time', 'TIME', 
                  swh_name, mwp_name, mwd_name, 
                  mwl_name, pp1d_name, hmax_name,
@@ -600,8 +647,9 @@ def add_wave_attrs(
                  mdww_name, mdts_name, 
                  mpww_name, mpts_name,
                  ]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
@@ -609,17 +657,19 @@ def add_wave_attrs(
 def add_ice_attrs(
         _ds: xr.Dataset,
         aice_name: Optional[str] = None,
-        tice_name: Optional[str] = None
+        tice_name: Optional[str] = None,
+        _exclude_other_vars: bool = False,
 ) -> xr.Dataset:
     """
     给xarray.Dataset的海冰添加属性
     :param _ds: xarray.Dataset
     :param aice_name: 海冰浓度变量名，默认为自动识别
     :param tice_name: 海冰厚度变量名，默认为自动识别
+    :param _exclude_other_vars: 是否排除其他变量，默认为False
     :return: xarray.Dataset
     """
-    aice_name = next((x for x in ['aice'] if x in _ds.data_vars), None) if aice_name is None else aice_name
-    tice_name = next((x for x in ['tice'] if x in _ds.data_vars), None) if tice_name is None else tice_name
+    aice_name = next((x for x in NAME_aice if x in _ds.data_vars), None) if aice_name is None else aice_name
+    tice_name = next((x for x in NAME_tice if x in _ds.data_vars), None) if tice_name is None else tice_name
 
     if aice_name in _ds:
         _ds[aice_name].attrs = {
@@ -639,13 +689,34 @@ def add_ice_attrs(
         dtype = calc_dtype(_ds[tice_name].data)
         _ds[tice_name].encoding = dict(_FillValue=calc_fillvalue(dtype), dtype=dtype, zlib=True)
 
+    _ds = transpose_dims(_ds)
+
     new_order = ['longitude', 'latitude', 'time', 'TIME', aice_name, tice_name]
-    existing_vars = [var for var in new_order if var in _ds.data_vars]
-    _ds = _ds[existing_vars + [var for var in _ds.data_vars if var not in existing_vars]]
+    existing_vars = [var for var in new_order if var is not None and var in _ds.variables]
+    existing_vars += [var for var in _ds.data_vars if var not in existing_vars] if not _exclude_other_vars else existing_vars
+    _ds = _ds[existing_vars]
 
     return _ds
 
 
+def transpose_dims(_ds: xr.Dataset) -> xr.Dataset:
+    """
+    转置xarray.Dataset的维度顺序为（time, latitude, longitude）
+    """
+    if 'DateStr' in _ds.dims:
+        transpose_order = ['DateStr', 'time', 'latitude', 'longitude']
+    elif 'TIME' in _ds.dims:
+        transpose_order = ['TIME', 'time', 'latitude', 'longitude']
+    else:
+        transpose_order = ['time', 'latitude', 'longitude']
+
+    # 有其他维度的话放在前面
+    for _dim in _ds.dims:
+        transpose_order.insert(0, _dim) if _dim not in transpose_order else None
+
+    return _ds.transpose(*transpose_order)
+
+
 def fixed_encoding(_ds, **kwargs):
     """
     修正xarray.Dataset的encoding
@@ -794,6 +865,7 @@ def calc_dtype(_values) -> type:
     # 其他情况兜底
     return np.float32
 
+
 def calc_fillvalue(_dtype):
     """
     根据数据类型计算合适的_FillValue

{alaea-2.4.2 → alaea-2.4.3}/Alaea/baysalt/erosion_coastline.py

@@ -362,6 +362,7 @@ def erosion_via_id_multi_times(weights: List,
         new_value = erosion_via_id(weight, new_value)
     return new_value
 
+
 def erosion_via_id_multi_vars(weights: dict,
                               viss: dict,
                               _workers=-1,

{alaea-2.4.2 → alaea-2.4.3/Alaea.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Alaea
-Version: 2.4.2
+Version: 2.4.3
 Summary: Some simple tools by Christmas
 Author: Christmas
 Author-email: 273519355@qq.com

{alaea-2.4.2 → alaea-2.4.3}/Alaea.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ Alaea/SameAsMATLAB/CoorTrans.py
 Alaea/SameAsMATLAB/__init__.py
 Alaea/SameAsMATLAB/calculatefuns.py
 Alaea/Standard/__init__.py
+Alaea/Standard/vars_name.py
 Alaea/Standard/xr_attrs.py
 Alaea/Standard/xr_ice.py
 Alaea/Standard/xr_wave.py

{alaea-2.4.2/Alaea.egg-info → alaea-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Alaea
-Version: 2.4.2
+Version: 2.4.3
 Summary: Some simple tools by Christmas
 Author: Christmas
 Author-email: 273519355@qq.com

{alaea-2.4.2 → alaea-2.4.3}/setup.py

@@ -8,7 +8,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="Alaea",
-    version="2.4.2",
+    version="2.4.3",
     author="Christmas",
     author_email="273519355@qq.com",
     description="Some simple tools by Christmas",