From 588ecd3944d9a499ac13bbebb5165686d70729ff Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Tue, 15 Dec 2020 11:26:13 -0600
Subject: [PATCH] rename SpatialEarth2D to LatLonTuple
---
modules/aeolus/aeolus_amv.py | 6 +++---
modules/amv/intercompare.py | 5 ++---
modules/util/util.py | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index a3ccd197..0d50c9ed 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -5,7 +5,7 @@ import numpy as np
import xarray as xr
from netCDF4 import Dataset, Dimension, Variable
from aeolus.geos_nav import GEOSNavigation
-from util.util import haversine_np, SpatialEarth2D
+from util.util import haversine_np, LatLonTuple
from amv.intercompare import best_fit, bin_data_by, get_press_bin_ranges, spd_dir_from_uv, uv_from_spd_dir, \
direction_difference
import math
@@ -639,8 +639,8 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None, amvs_list=[], bf_
gfs_press = gfs_press.values
gfs_press = gfs_press[::-1]
- lon_idx = SpatialEarth2D._fields.index('lon')
- lat_idx = SpatialEarth2D._fields.index('lat')
+ lon_idx = LatLonTuple._fields.index('lon')
+ lat_idx = LatLonTuple._fields.index('lat')
uv_wind = get_vert_profile_s(xr_dataset, ['u-wind', 'v-wind'], locs[:, lon_idx], locs[:, lat_idx], method='nearest')
uv_wind = uv_wind.values
diff --git a/modules/amv/intercompare.py b/modules/amv/intercompare.py
index 55eafd79..73869502 100644
--- a/modules/amv/intercompare.py
+++ b/modules/amv/intercompare.py
@@ -3,7 +3,6 @@ import xarray as xr
from util.setup import home_dir
from util.lon_lat_grid import earth_to_indexs
from util.util import haversine_np
-#from deeplearning.amv_raob import get_profile_multi
from util.gfs_reader import get_vert_profile_s
import cartopy
from cartopy import *
@@ -17,7 +16,7 @@ from util.util import minimize_quadratic
from netCDF4 import Dataset
import datetime
from datetime import timezone
-from util.util import SpatialEarth2D
+from util.util import LatLonTuple
#-- AMV intercompare stuff ------------------------------------------
@@ -224,7 +223,7 @@ def get_raob_dict_cdf(pathname):
raob = np.stack([all_levs._data, all_temp._data, all_spd._data, all_dir._data], axis=1)
- raob_dct[SpatialEarth2D(lat=lat, lon=lon)] = raob
+ raob_dct[LatLonTuple(lat=lat, lon=lon)] = raob
rtgrp.close()
diff --git a/modules/util/util.py b/modules/util/util.py
index d9b9cc3d..5c1314d4 100644
--- a/modules/util/util.py
+++ b/modules/util/util.py
@@ -3,7 +3,7 @@ from metpy.units import units
from metpy.calc import thickness_hydrostatic
from collections import namedtuple
-SpatialEarth2D = namedtuple('SpatialEarth2D', ['lat', 'lon'])
+LatLonTuple = namedtuple('LatLonTuple', ['lat', 'lon'])
class MyGenericException(Exception):
--
GitLab