Per #2769, update to tc_diag_driver version 0.11.0.

dtcenter · Dec 15, 2023 · 1a9dac9 · 1a9dac9
1 parent 79654f0
commit 1a9dac9
Show file tree

Hide file tree

Showing 9 changed files with 493 additions and 261 deletions.
diff --git a/scripts/python/tc_diag/config/post_resample.yml b/scripts/python/tc_diag/config/post_resample.yml
@@ -100,23 +100,25 @@ pressure_independent_computation_specs:
     callable: *div_vort_func 
     output_vars: [850DVRG, 850VORT] 
     kwargs: {u_name: *u_vert_name, v_name: *v_vert_name, level_hPa: 850, radius_km: *div_vort_max_km}
+    units: [/S, /S]
   div_vort_200: 
     callable: *div_vort_func
     output_vars: [200DVRG, 200VORT] 
     kwargs: {u_name: *u_vert_name, v_name: *v_vert_name, level_hPa: 200, radius_km: *div_vort_max_km}
+    units: [/S, /S]
 
 
   shear: 
     batch_order: 1
     callable: tc_diag_driver.met_diag_vars.shear 
     output_vars: [SHR_MAG, SHR_HDG] 
-    kwargs: {u_name: u, v_name: v, bottom_hPa: 850, top_hPa: 200}
+    kwargs: {u_name: U, v_name: V, bottom_hPa: 850, top_hPa: 200}
     unit_converters: [tc_diag_driver.met_post_process.mps_to_kt, pass]
     units: [KT, DEG]
   TGRD:
     batch_order: 1
     callable: tc_diag_driver.met_diag_vars.temperature_gradient
-    kwargs: {u_name: u, v_name: v, bottom_hPa: 850, top_hPa: 700}
+    kwargs: {u_name: U, v_name: V, bottom_hPa: 850, top_hPa: 700}
     units: "10^7C/M"
 
 sounding_computation_specs:
@@ -161,4 +163,4 @@ comment_format: |
   *   850VORT, 200DVRG averaged from {div_vort_min}-{div_vort_max} km around storm center [x10^7 /s, x10^7 /s]   *
   *   850TANG averaged from {rad_tan_min}-{rad_tan_max} km around storm center [x10 m/s]   *
   *   T, R, Z, P averaged from {therm_min}-{therm_max} km around storm center [x10 C, %, dm, mb]   *
-  *   TPW averaged from {tpw_min}-{tpw_max} km around storm center [mm]   *
+  *   TPW averaged from {tpw_min}-{tpw_max} km around storm center [mm]   *
diff --git a/scripts/python/tc_diag/config/post_resample_nest.yml b/scripts/python/tc_diag/config/post_resample_nest.yml
@@ -100,23 +100,25 @@ pressure_independent_computation_specs:
     callable: *div_vort_func 
     output_vars: [850DVRG, 850VORT] 
     kwargs: {u_name: *u_vert_name, v_name: *v_vert_name, level_hPa: 850, radius_km: *div_vort_max_km}
+    units: [/S, /S]
   div_vort_200: 
     callable: *div_vort_func
     output_vars: [200DVRG, 200VORT] 
     kwargs: {u_name: *u_vert_name, v_name: *v_vert_name, level_hPa: 200, radius_km: *div_vort_max_km}
+    units: [/S, /S]
 
 
   shear: 
     batch_order: 1
     callable: tc_diag_driver.met_diag_vars.shear 
     output_vars: [SHR_MAG, SHR_HDG] 
-    kwargs: {u_name: u, v_name: v, bottom_hPa: 850, top_hPa: 200}
+    kwargs: {u_name: U, v_name: V, bottom_hPa: 850, top_hPa: 200}
     unit_converters: [tc_diag_driver.met_post_process.mps_to_kt, pass]
     units: [KT, DEG]
   TGRD:
     batch_order: 1
     callable: tc_diag_driver.met_diag_vars.temperature_gradient
-    kwargs: {u_name: u, v_name: v, bottom_hPa: 850, top_hPa: 700}
+    kwargs: {u_name: U, v_name: V, bottom_hPa: 850, top_hPa: 700}
     units: "10^7C/M"
 
 sounding_computation_specs:
@@ -161,4 +163,4 @@ comment_format: |
   *   850VORT, 200DVRG averaged from {div_vort_min}-{div_vort_max} km around storm center [x10^7 /s, x10^7 /s]   *
   *   850TANG averaged from {rad_tan_min}-{rad_tan_max} km around storm center [x10 m/s]   *
   *   T, R, Z, P averaged from {therm_min}-{therm_max} km around storm center [x10 C, %, dm, mb]   *
-  *   TPW averaged from {tpw_min}-{tpw_max} km around storm center [mm]   *
+  *   TPW averaged from {tpw_min}-{tpw_max} km around storm center [mm]   *
diff --git a/scripts/python/tc_diag/tc_diag_driver/__init__.py b/scripts/python/tc_diag/tc_diag_driver/__init__.py
@@ -1 +1 @@
-__version__ = "0.9.0"
+__version__ = "0.11.0"
diff --git a/scripts/python/tc_diag/tc_diag_driver/computation_engine.py b/scripts/python/tc_diag/tc_diag_driver/computation_engine.py
@@ -251,6 +251,21 @@ def get_result_names(computations: List[DiagComputation]) -> List[str]:
     return names
 
 
+def get_all_result_units(
+    pressure_indedpendent: List[DiagComputation], sounding: List[DiagComputation]
+) -> Tuple[List[str], List[str]]:
+    pi_var_units = get_result_units(pressure_indedpendent)
+    snd_var_units = get_result_units(sounding)
+    return pi_var_units, snd_var_units
+
+
+def get_result_units(computations: List[DiagComputation]) -> List[str]:
+    units = []
+    for c in computations:
+        units.extend(c.units)
+    return units
+
+
 def get_computation_batches(
     pressure_indedpendent: List[DiagComputation], sounding: List[DiagComputation]
 ) -> List[ComputationBatch]: