Return Var instead of None for equivalent units. Update tests.

NCAR · Jan 2, 2025 · 0bfe13b · 0bfe13b
1 parent a45179d
commit 0bfe13b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/scripts/conversion_tools/unit_conversion.py b/scripts/conversion_tools/unit_conversion.py
@@ -182,8 +182,8 @@ def erg_cm_minus_2_s_minus_1__to__W_m_minus_2():
 ##################
 def m2_s_minus_2__to__J_kg_minus_1():
     """Equivalent units"""
-    return None
+    return '{var}'
 
 def J_kg_minus_1__to__m2_s_minus_2():
     """Equivalent units"""
-    return None
+    return '{var}'
diff --git a/test/var_compatibility_test/test_host.F90 b/test/var_compatibility_test/test_host.F90
@@ -362,7 +362,7 @@ program test
         'flag_indicating_cloud_microphysics_has_graupel            ',         &
         'flag_indicating_cloud_microphysics_has_ice                '/)
 
-   character(len=cm), target :: test_outvars1(8) = (/                         &
+   character(len=cm), target :: test_outvars1(9) = (/                         &
         'ccpp_error_code                                           ',         &
         'ccpp_error_message                                        ',         &
         'effective_radius_of_stratiform_cloud_ice_particle         ',         &

diff --git a/test/var_compatibility_test/test_reports.py b/test/var_compatibility_test/test_reports.py
@@ -83,6 +83,7 @@ def usage(errmsg=None):
                            "effective_radius_of_stratiform_cloud_snow_particle",
                            "cloud_ice_number_concentration",
                            "effective_radius_of_stratiform_cloud_rain_particle",
+                           "turbulent_kinetic_energy",
                            "scalar_variable_for_testing"]
 _REQUIRED_VARS_VAR_ACTION = _INPUT_VARS_VAR_ACTION + _OUTPUT_VARS_VAR_ACTION