Merge branch 'jkrasting:main' into add_cmip_variables

mdtf_test_data/config/cmip_day.yml

@@ -4,6 +4,11 @@ variables :
     - "tas"
     - "psl"
     - "zg500"
+    - "huss"
+    - "sfcWind"
+    - "hfls"
+    - "ts"
+    - "pr"
 tas :
   atts :
     long_name : 'Near-Surface Air Temperature'
@@ -48,3 +53,61 @@ zg500 :
     original_name : 'zg500'
   stats :
     - [5500.68798828125, 351.7859802246094]
+
+huss:
+  atts:
+    long_name: 'Near-Surface Specific Humidity'
+    units: '1'
+    cell_methods: 'area: time: mean'
+    cell_measures: 'area: areacella'
+    standard_name: 'specific_humidity'
+    interp_method: 'conserve_order1'
+    original_name: 'huss'
+  stats:
+    - [ 0.008853504, 0.001309792 ]
+
+hfls:
+  atts:
+    long_name: 'Surface Upward Latent Heat Flux'
+    units: 'W m-2'
+    cell_methods: 'area: time: mean'
+    cell_measures: 'area: areacella'
+    standard_name: 'surface_upward_latent_heat_flux'
+    interp_method: 'conserve_order1'
+    original_name: 'hfls'
+  stats:
+    - [ 200.8302, 30.204777 ]
+
+sfcWind:
+  atts:
+    long_name: 'Daily-Mean Near-Surface Wind Speed'
+    units: 'm s-1'
+    cell_methods: 'area: time: mean'
+    cell_measures: 'area: areacella'
+    standard_name: 'wind_speed'
+    interp_method: 'conserve_order1'
+    original_name: 'sfcWind'
+  stats:
+    - [ 6.75016, 1.806484 ]
+ts :
+  atts :
+    long_name : 'Surface Temperature'
+    units : 'K'
+    cell_methods : 'area: time: mean'
+    cell_measures : 'area: areacella'
+    standard_name : 'surface_temperature'
+    interp_method : 'conserve_order2'
+    original_name : 'ts'
+  stats :
+    - [299.31054, 2.530572]
+pr :
+  atts :
+    long_name : "Precipitation"
+    units : "kg m-2 s-1"
+    cell_methods : "time : mean"
+    cell_measures : "area : area"
+    time_avg_info" : "average_T1,average_T2,average_DT"
+    standard_name : "precipitation_flux"
+    interp_method": "conserve_order1"
+  stats :
+    - [3.116272e-05, 2.2157835e-05]

mdtf_test_data/config/cmip_mon.yml

@@ -150,41 +150,41 @@ so :
     variable_id : 'so'
   grid : "tripolar"
   stats :
-    - [ 37.091705, 37.169098 ]
-    - [ 37.090427, 37.16815 ]
-    - [ 37.086548, 37.163586 ]
-    - [ 37.054672, 37.13838 ]
-    - [ 36.948807, 37.03889 ]
-    - [ 36.872665, 36.96365 ]
-    - [ 36.825863, 36.92407 ]
-    - [ 36.793346, 36.899162 ]
-    - [ 36.767387, 36.878147 ]
-    - [ 36.744244, 36.85687 ]
-    - [ 36.721256, 36.8339 ]
-    - [ 36.698128, 36.80898 ]
-    - [ 36.673008, 36.782074 ]
-    - [ 36.644700, 36.753128 ]
-    - [ 36.61258,  36.72212 ]
-    - [ 36.576668, 36.689003 ]
-    - [ 36.537296, 36.65366 ]
-    - [ 36.495052, 36.615482 ]
-    - [ 36.45111, 36.574173 ]
-    - [ 36.406807, 36.529804 ]
-    - [ 36.36356, 36.483067 ]
-    - [ 36.322468, 36.43506 ]
-    - [ 36.28378, 36.387257 ]
-    - [ 36.247128, 36.340984 ]
-    - [ 36.21161, 36.297478 ]
-    - [ 36.176785, 36.257397 ]
-    - [ 36.14187, 36.22075 ]
-    - [ 36.106518, 36.186737 ]
-    - [ 36.07005, 36.154045 ]
-    - [ 36.03362, 36.121113 ]
-    - [ 36.000076, 36.087433 ]
-    - [ 35.974377, 36.05332 ]
-    - [ 35.96569, 36.020916 ]
-    - [ 35.982994, 35.994526 ]
-    - [ 36.03397, 35.97875 ]
+    - [ 37.091705, 5.169098 ]
+    - [ 37.090427, 5.16815 ]
+    - [ 37.086548, 4.163586 ]
+    - [ 37.054672, 4.13838 ]
+    - [ 36.948807, 3.03889 ]
+    - [ 36.872665, 3.96365 ]
+    - [ 36.825863, 3.92407 ]
+    - [ 36.793346, 3.899162 ]
+    - [ 36.767387, 3.878147 ]
+    - [ 36.744244, 3.85687 ]
+    - [ 36.721256, 3.8339 ]
+    - [ 36.698128, 3.80898 ]
+    - [ 36.673008, 3.782074 ]
+    - [ 36.644700, 3.753128 ]
+    - [ 36.61258,  3.72212 ]
+    - [ 36.576668, 3.689003 ]
+    - [ 36.537296, 3.65366 ]
+    - [ 36.495052, 3.615482 ]
+    - [ 36.45111, 3.574173 ]
+    - [ 36.406807, 3.529804 ]
+    - [ 36.36356, 3.483067 ]
+    - [ 36.322468, 3.43506 ]
+    - [ 36.28378, 3.387257 ]
+    - [ 36.247128, 3.340984 ]
+    - [ 36.21161, 3.297478 ]
+    - [ 36.176785, 3.257397 ]
+    - [ 36.14187, 3.22075 ]
+    - [ 36.106518, 3.186737 ]
+    - [ 36.07005, 3.154045 ]
+    - [ 36.03362, 3.121113 ]
+    - [ 36.000076, 3.087433 ]
+    - [ 35.974377, 3.05332 ]
+    - [ 35.96569, 3.020916 ]
+    - [ 35.982994, 3.994526 ]
+    - [ 36.03397, 3.97875 ]
 
 thetao:
   atts:
@@ -208,41 +208,41 @@ thetao:
     variable_id: 'thetao'
   grid: "tripolar"
   stats:
-    - [ 23.438206, 23.501827 ]
-    - [ 23.393858, 23.457973 ]
-    - [ 23.332743, 23.399124 ]
-    - [ 23.145956, 23.248714 ]
-    - [ 22.192282, 22.395288 ]
-    - [ 21.162468, 21.3618 ]
-    - [ 20.480297, 20.662258 ]
-    - [ 20.052425, 20.224604 ]
-    - [ 19.769545, 19.938387 ]
-    - [ 19.559475, 19.728683 ]
-    - [ 19.38311, 19.554249 ]
-    - [ 19.219982, 19.393152 ]
-    - [ 19.060669, 19.235872 ]
-    - [ 18.89744, 19.073635 ]
-    - [ 18.726213, 18.900887 ]
-    - [ 18.545187, 18.714998 ]
-    - [ 18.352053, 18.513506 ]
-    - [ 18.143354, 18.293566 ]
-    - [ 17.917408, 18.054794 ]
-    - [ 17.674921, 17.799715 ]
-    - [ 17.41897, 17.532667 ]
-    - [ 17.154121, 17.25874 ]
-    - [ 16.885664, 16.982744 ]
-    - [ 16.61834, 16.708748 ]
-    - [ 16.356245, 16.439966 ]
-    - [ 16.10178, 16.178211 ]
-    - [ 15.854486, 15.922733 ]
-    - [ 15.610342, 15.66957 ]
-    - [ 15.362126, 15.412205 ]
-    - [ 15.101099, 15.14296 ]
-    - [ 14.81898, 14.854497 ]
-    - [ 14.509788, 14.541605 ]
-    - [ 14.171214, 14.202383 ]
-    - [ 13.806399, 13.840008 ]
-    - [ 13.422476, 13.461085 ]
+    - [ 23.438206, 2.501827 ]
+    - [ 23.393858, 3.457973 ]
+    - [ 23.332743, 3.399124 ]
+    - [ 23.145956, 2.248714 ]
+    - [ 22.192282, 2.395288 ]
+    - [ 21.162468, 1.3618 ]
+    - [ 20.480297, 2.662258 ]
+    - [ 20.052425, 2.224604 ]
+    - [ 19.769545, 3.938387 ]
+    - [ 19.559475, 2.728683 ]
+    - [ 19.38311, 3.554249 ]
+    - [ 19.219982, 3.393152 ]
+    - [ 19.060669, 5.235872 ]
+    - [ 18.89744, 6.073635 ]
+    - [ 18.726213, 5.900887 ]
+    - [ 18.545187, 4.714998 ]
+    - [ 18.352053, 2.513506 ]
+    - [ 18.143354, 2.293566 ]
+    - [ 17.917408, 2.054794 ]
+    - [ 17.674921, 2.799715 ]
+    - [ 17.41897, 3.532667 ]
+    - [ 17.154121, 3.25874 ]
+    - [ 16.885664, 2.982744 ]
+    - [ 16.61834, 2.708748 ]
+    - [ 16.356245, 2.439966 ]
+    - [ 16.10178, 2.178211 ]
+    - [ 15.854486, 2.922733 ]
+    - [ 15.610342, 3.66957 ]
+    - [ 15.362126, 3.412205 ]
+    - [ 15.101099, 2.14296 ]
+    - [ 14.81898, 2.854497 ]
+    - [ 14.509788, 2.541605 ]
+    - [ 14.171214, 1.202383 ]
+    - [ 13.806399, 2.840008 ]
+    - [ 13.422476, 3.461085 ]
 
 zg :
   atts:

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mdtf_test_data
-version = 1.0.4.post1
+version = 1.0.4.post2
 description = Tools for working with MDTF Diagnostics test data sets
 url = https://github.com/jkrasting/mdtf_test_data
 author = MDTF Development Team