update test for stat and windspharm

shenyulu · Dec 10, 2023 · 9629d62 · 9629d62
1 parent ad33707
commit 9629d62
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/test/test_core_stat.py b/test/test_core_stat.py
@@ -119,15 +119,13 @@ def test_calc_linregress_spatial2():
 def test_calc_detrend_data():
     result_data = ecl.calc_detrend_data(sic_data_Barents_Sea_12.sel(lon = slice(34.5, 36.5), lat = slice(78.5, 80.5)), time_dim = 'time').mean(dim = ('lat', 'lon')).data
     result_data = round_sf_np_new(result_data)
-    refer_data = np.array([-5.899e-02, -4.946e-02, -4.549e-02, -4.948e-01, -2.198e-02,
-       -4.670e-03,  2.042e-02,  3.328e-02,  1.281e-02,  2.901e-02,
-       -3.457e-04,  2.474e-02,  5.316e-02,  3.047e-02,  5.556e-02,
-        1.495e-01,  5.795e-02,  1.486e-01,  1.537e-01,  1.532e-01,
-        2.164e-02,  1.212e-01,  1.796e-01,  1.502e-01,  1.153e-01,
-       -3.252e-01, -9.784e-02,  1.572e-01, -1.243e-01,  2.941e-01,
-        1.325e-01, -4.224e-01,  1.760e-01,  2.689e-01, -2.038e-01,
-       -6.221e-01, -2.347e-01, -6.008e-01,  3.943e-01,  5.829e-02,
-        3.934e-01, -7.820e-02])
+    refer_data = np.array([-5.9e-02, -4.9e-02, -4.5e-02, -4.9e-01, -2.2e-02, -4.7e-03,
+        2.0e-02,  3.3e-02,  1.3e-02,  2.9e-02, -3.5e-04,  2.5e-02,
+        5.3e-02,  3.0e-02,  5.6e-02,  1.5e-01,  5.8e-02,  1.5e-01,
+        1.5e-01,  1.5e-01,  2.2e-02,  1.2e-01,  1.8e-01,  1.5e-01,
+        1.2e-01, -3.3e-01, -9.8e-02,  1.6e-01, -1.2e-01,  2.9e-01,
+        1.3e-01, -4.2e-01,  1.8e-01,  2.7e-01, -2.0e-01, -6.2e-01,
+       -2.3e-01, -6.0e-01,  3.9e-01,  5.8e-02,  3.9e-01, -7.8e-02])
     assert np.isclose(result_data, refer_data).all()
 
 def test_calc_ttestSpatialPattern_spatial():

diff --git a/test/test_windspharm.py b/test/test_windspharm.py
@@ -9,7 +9,7 @@
 import pandas as pd
 import os
 from .const_define import TEST_DATA_PATH
-from .util import round_sf_np_new
+from .util import round_sf_np_new # Intel fortran outputs for Windows and linux are quit different
 
 u_data_sample = ecl.open_tutorial_dataset('uwnd_202201_mon_mean').uwnd.isel(time = 0).sel(level = 500)
 v_data_sample = ecl.open_tutorial_dataset('vwnd_202201_mon_mean').vwnd.isel(time = 0).sel(level = 500)
@@ -114,22 +114,22 @@ def test_calc_helmholtz():
         u_data = u_data_sample,
         v_data = v_data_sample,
     )
-    result_data1 = result_data['uchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    result_data1 = result_data['uchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     result_data1 = round_sf_np_new(result_data1)
-    result_data2 = result_data['vchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    result_data2 = result_data['vchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     result_data2 = round_sf_np_new(result_data2)
-    result_data3 = result_data['upsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    result_data3 = result_data['upsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     result_data3 = round_sf_np_new(result_data3)
-    result_data4 = result_data['vpsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    result_data4 = result_data['vpsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     result_data4 = round_sf_np_new(result_data4)
     refer_data = xr.open_dataset(os.path.join(TEST_DATA_PATH, 'test_output_calc_helmholtz.nc'))
-    refer_data1 = refer_data['uchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    refer_data1 = refer_data['uchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     refer_data1 = round_sf_np_new(refer_data1)
-    refer_data2 = refer_data['vchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    refer_data2 = refer_data['vchi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     refer_data2 = round_sf_np_new(refer_data2)
-    refer_data3 = refer_data['upsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()[0:6]
+    refer_data3 = refer_data['upsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data.flatten()
     refer_data3 = round_sf_np_new(refer_data3)
-    refer_data4 = refer_data['vpsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data .flatten()[0:6]
+    refer_data4 = refer_data['vpsi'].sel(lon = slice(lon_start, lon_end), lat = slice(lat_end, lat_start)).data .flatten()
     refer_data4 = round_sf_np_new(refer_data4)
     assert np.isclose(result_data1, refer_data1).all()
     assert np.isclose(result_data2, refer_data2).all()