Index: trunk/tools/variables_values.dat
===================================================================
--- trunk/tools/variables_values.dat	(revision 356)
+++ trunk/tools/variables_values.dat	(revision 357)
@@ -317,173 +317,140 @@
 lwake_deltaq, 'wakedeltaq', 'wake_delta_vapor', -0.003, 0.003, 'wake|delta|mixing|ratio', 'kgkg-1s-1', 'seismic'
 LWAKE_DELTAQ, 'wakedeltaq', 'wake_delta_vapor', -0.003, 0.003, 'wake|delta|mixing|ratio', 'kgkg-1s-1', 'seismic'
-    elif varn == 'wakedeltat' or varn == 'wake_deltat' or varn == 'lwake_deltat' or  \
-      varn == 'LWAKE_DELTAT':
-        varvals = ['wakedeltat', 'wake_delta_temp', -0.003, 0.003,                   \
-          'wake|delta|temperature', '-', 'seismic']
-    elif varn == 'wakeh' or varn == 'wake_h' or varn == 'LWAKE_H':
-        varvals = ['wakeh', 'wake_height', 0., 1000., 'height|of|the|wakes', 'm',    \
-          'YlOrRd']
-    elif varn == 'wakeomg' or varn == 'wake_omg' or varn == 'lwake_omg' or           \
-      varn == 'LWAKE_OMG':
-        varvals = ['wakeomg', 'wake_omega', 0., 3., 'wake|omega', \
-          '-', 'BuGn']
-    elif varn == 'wakes' or varn == 'wake_s' or varn == 'LWAKE_S':
-        varvals = ['wakes', 'wake_area_fraction', 0., 0.5, 'wake|spatial|fraction',  \
-          '1', 'BuGn']
-    elif varn == 'wa' or varn == 'W' or varn == 'Vertical wind':
-        varvals = ['wa', 'upward_wind', -10., 10., 'upward|wind', 'ms-1',            \
-          'seismic']
-    elif varn == 'wap' or varn == 'vitw' or varn == 'LVITW':
-        varvals = ['wap', 'upward_wind', -3.e-10, 3.e-10, 'upward|wind', 'mPa-1',    \
-          'seismic']
-    elif varn == 'wss' or varn == 'SPDUV':
-        varvals = ['wss', 'air_velocity',  0., 30., 'surface|horizontal|wind|speed', \
-          'ms-1', 'Reds']
+wakedeltat, 'wakedeltat', 'wake_delta_temp', -0.003, 0.003, 'wake|delta|temperature', 'Ks-1', 'seismic'
+wake_deltat, 'wakedeltat', 'wake_delta_temp', -0.003, 0.003, 'wake|delta|temperature', 'Ks-1', 'seismic'
+lwake_deltat, 'wakedeltat', 'wake_delta_temp', -0.003, 0.003, 'wake|delta|temperature', 'Ks-1', 'seismic'
+LWAKE_DELTAT, 'wakedeltat', 'wake_delta_temp', -0.003, 0.003, 'wake|delta|temperature', 'Ks-1', 'seismic'
+wakeh, 'wakeh', 'wake_height', 0., 1000., 'height|of|the|wakes', 'm', 'YlOrRd'
+wake_h, 'wakeh', 'wake_height', 0., 1000., 'height|of|the|wakes', 'm', 'YlOrRd'
+LWAKE_H, 'wakeh', 'wake_height', 0., 1000., 'height|of|the|wakes', 'm', 'YlOrRd'
+wakeomg, 'wakeomg', 'wake_omega', 0., 3., 'wake|omega', '-', 'BuGn'
+wake_omg, 'wakeomg', 'wake_omega', 0., 3., 'wake|omega', '-', 'BuGn'
+lwake_omg, 'wakeomg', 'wake_omega', 0., 3., 'wake|omega', '-', 'BuGn'
+LWAKE_OMG, 'wakeomg', 'wake_omega', 0., 3., 'wake|omega', '-', 'BuGn'
+wakes,'wakes', 'wake_area_fraction', 0., 0.5, 'wake|spatial|fraction', '1', 'BuGn'
+wake_s, 'wakes', 'wake_area_fraction', 0., 0.5, 'wake|spatial|fraction', '1', 'BuGn'
+LWAKE_S, 'wakes', 'wake_area_fraction', 0., 0.5, 'wake|spatial|fraction', '1', 'BuGn'
+wa, 'wa', 'upward_wind', -10., 10., 'upward|wind', 'ms-1', 'seismic'
+W, 'wa', 'upward_wind', -10., 10., 'upward|wind', 'ms-1', 'seismic'
+Vertical wind, 'wa', 'upward_wind', -10., 10., 'upward|wind', 'ms-1', 'seismic'
+wap, 'wap', 'upward_wind', -3.e-10, 3.e-10, 'upward|wind', 'mPa-1', 'seismic'
+vitw, 'wap', 'upward_wind', -3.e-10, 3.e-10, 'upward|wind', 'mPa-1', 'seismic'
+LVITW, 'wap', 'upward_wind', -3.e-10, 3.e-10, 'upward|wind', 'mPa-1', 'seismic'
+wss, 'wss', 'air_velocity',  0., 30., 'surface|horizontal|wind|speed', 'ms-1', 'Reds'
+SPDUV, 'wss', 'air_velocity',  0., 30., 'surface|horizontal|wind|speed', 'ms-1', 'Reds'
 # Water budget
 # Water budget de-accumulated
-    elif varn == 'ccond' or varn == 'CCOND' or varn == 'ACCCONDde':
-        varvals = ['ccond', 'cw_cond',  0., 30.,                                     \
-          'cloud|water|condensation', 'mm', 'Reds']
-    elif varn == 'wbr' or varn == 'ACQVAPORde':
-        varvals = ['wbr', 'wbr',  0., 30., 'Water|Budget|water|wapor', 'mm', 'Blues']
-    elif varn == 'diabh' or varn == 'DIABH' or varn == 'ACDIABHde':
-        varvals = ['diabh', 'diabh',  0., 30., 'diabatic|heating', 'K', 'Reds']
-    elif varn == 'wbpw' or varn == 'WBPW' or varn == 'WBACPWde':
-        varvals = ['wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content',\
-           'mms-1', 'Reds']
-    elif varn == 'wbf' or varn == 'WBACF' or varn == 'WBACFde':
-        varvals = ['wbf', 'water_budget_hfcqv',  0., 30.,                       \
-          'Water|Budget|horizontal|convergence|of|water|vapour|(+,|' +   \
-          'conv.;|-,|div.)', 'mms-1', 'Reds']
-    elif varn == 'wbfc' or varn == 'WBFC' or varn == 'WBACFCde':
-        varvals = ['wbfc', 'water_budget_fc',  0., 30.,                         \
-          'Water|Budget|horizontal|convergence|of|cloud|(+,|conv.;|-,|' +\
-          'div.)', 'mms-1', 'Reds']
-    elif varn == 'wbfp' or varn == 'WBFP' or varn == 'WBACFPde':
-        varvals = ['wbfp', 'water_budget_cfp',  0., 30.,                        \
-          'Water|Budget|horizontal|convergence|of|precipitation|(+,|' +  \
-          'conv.;|-,|div.)', 'mms-1', 'Reds']
-    elif varn == 'wbz' or varn == 'WBZ' or varn == 'WBACZde':
-        varvals = ['wbz', 'water_budget_z',  0., 30.,                           \
-          'Water|Budget|vertical|convergence|of|water|vapour|(+,|conv.' +\
-          ';|-,|div.)', 'mms-1', 'Reds']
-    elif varn == 'wbc' or varn == 'WBC' or varn == 'WBACCde':
-        varvals = ['wbc', 'water_budget_c',  0., 30.,                           \
-          'Water|Budget|Cloud|water|species','mms-1', 'Reds']
-    elif varn == 'wbqvd' or varn == 'WBQVD' or varn == 'WBACQVDde':
-        varvals = ['wbqvd', 'water_budget_qvd',  0., 30.,                       \
-          'Water|Budget|water|vapour|divergence', 'mms-1', 'Reds']
-    elif varn == 'wbqvblten' or varn == 'WBQVBLTEN' or varn == 'WBACQVBLTENde':
-        varvals = ['wbqvblten', 'water_budget_qv_blten',  0., 30.,              \
-          'Water|Budget|QV|tendency|due|to|pbl|parameterization',        \
-          'kg kg-1 s-1', 'Reds']
-    elif varn == 'wbqvcuten' or varn == 'WBQVCUTEN' or varn == 'WBACQVCUTENde':
-        varvals = ['wbqvcuten', 'water_budget_qv_cuten',  0., 30.,              \
-          'Water|Budget|QV|tendency|due|to|cu|parameterization',         \
-          'kg kg-1 s-1', 'Reds']
-    elif varn == 'wbqvshten' or varn == 'WBQVSHTEN' or varn == 'WBACQVSHTENde':
-        varvals = ['wbqvshten', 'water_budget_qv_shten',  0., 30.,              \
-          'Water|Budget|QV|tendency|due|to|shallow|cu|parameterization', \
-          'kg kg-1 s-1', 'Reds']
-    elif varn == 'wbpr' or varn == 'WBP' or varn == 'WBACPde':
-        varvals = ['wbpr', 'water_budget_pr',  0., 30.,                         \
-          'Water|Budget|recipitation', 'mms-1', 'Reds']
-    elif varn == 'wbpw' or varn == 'WBPW' or varn == 'WBACPWde':
-        varvals = ['wbpw', 'water_budget_pw',  0., 30.,                         \
-          'Water|Budget|water|content', 'mms-1', 'Reds']
-    elif varn == 'wbcondt' or varn == 'WBCONDT' or varn == 'WBACCONDTde':
-        varvals = ['wbcondt', 'water_budget_condt',  0., 30.,                   \
-          'Water|Budget|condensation|and|deposition', 'mms-1', 'Reds']
-    elif varn == 'wbqcm' or varn == 'WBQCM' or varn == 'WBACQCMde':
-        varvals = ['wbqcm', 'water_budget_qcm',  0., 30.,                       \
-          'Water|Budget|hydrometeor|change|and|convergence', 'mms-1', 'Reds']
-    elif varn == 'wbsi' or varn == 'WBSI' or varn == 'WBACSIde':
-        varvals = ['wbsi', 'water_budget_si',  0., 30.,                         \
-          'Water|Budget|hydrometeor|sink', 'mms-1', 'Reds']
-    elif varn == 'wbso' or varn == 'WBSO' or varn == 'WBACSOde':
-        varvals = ['wbso', 'water_budget_so',  0., 30.,                         \
-          'Water|Budget|hydrometeor|source', 'mms-1', 'Reds']
+ccond, 'ccond', 'cw_cond',  0., 30., 'cloud|water|condensation', 'mm', 'Reds'
+CCOND, 'ccond', 'cw_cond',  0., 30., 'cloud|water|condensation', 'mm', 'Reds'
+ACCCONDde, 'ccond', 'cw_cond',  0., 30., 'cloud|water|condensation', 'mm', 'Reds'
+wbr, 'wbr', 'wbr',  0., 30., 'Water|Budget|water|wapor', 'mm', 'Blues'
+ACQVAPORde, 'wbr', 'wbr',  0., 30., 'Water|Budget|water|wapor', 'mm', 'Blues'
+diabh, 'diabh', 'diabh',  0., 30., 'diabatic|heating', 'K', 'Reds'
+DIABH, 'diabh', 'diabh',  0., 30., 'diabatic|heating', 'K', 'Reds'
+ACDIABHde, 'diabh', 'diabh',  0., 30., 'diabatic|heating', 'K', 'Reds'
+wbpw, 'wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content', 'mms-1', 'Reds'
+WBPW, 'wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content', 'mms-1', 'Reds'
+WBACPWde, 'wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content', 'mms-1', 'Reds'
+wbf, 'wbf', 'water_budget_hfcqv',  0., 30., 'Water|Budget|horizontal|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBACF, 'wbf', 'water_budget_hfcqv',  0., 30., 'Water|Budget|horizontal|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBACFde, 'wbf', 'water_budget_hfcqv',  0., 30., 'Water|Budget|horizontal|convergence|of|water|vapour|(+|conv.;|-,|div.)', 'mms-1', 'Reds'
+wbfc, 'wbfc', 'water_budget_fc',  0., 30., 'Water|Budget|horizontal|convergence|of|cloud|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBFC, 'wbfc', 'water_budget_fc',  0., 30., 'Water|Budget|horizontal|convergence|of|cloud|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBACFCde, 'wbfc', 'water_budget_fc',  0., 30., 'Water|Budget|horizontal|convergence|of|cloud|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+wbfp, 'wbfp', 'water_budget_cfp',  0., 30., 'Water|Budget|horizontal|convergence|of|precipitation|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBFP, 'wbfp', 'water_budget_cfp',  0., 30., 'Water|Budget|horizontal|convergence|of|precipitation|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBACFPde, 'wbfp', 'water_budget_cfp',  0., 30., 'Water|Budget|horizontal|convergence|of|precipitation|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+wbz, 'wbz', 'water_budget_z',  0., 30., 'Water|Budget|vertical|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBZ, 'wbz', 'water_budget_z',  0., 30., 'Water|Budget|vertical|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+WBACZde, 'wbz', 'water_budget_z',  0., 30., 'Water|Budget|vertical|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mms-1', 'Reds'
+wbc, 'wbc', 'water_budget_c',  0., 30., 'Water|Budget|Cloud|water|species','mms-1', 'Reds'
+WBC, 'wbc', 'water_budget_c',  0., 30., 'Water|Budget|Cloud|water|species','mms-1', 'Reds'
+WBACCde, 'wbc', 'water_budget_c',  0., 30., 'Water|Budget|Cloud|water|species','mms-1', 'Reds'
+wbqvd, 'wbqvd', 'water_budget_qvd',  0., 30., 'Water|Budget|water|vapour|divergence', 'mms-1', 'Reds'
+WBQVD, 'wbqvd', 'water_budget_qvd',  0., 30., 'Water|Budget|water|vapour|divergence', 'mms-1', 'Reds'
+WBACQVDde, 'wbqvd', 'water_budget_qvd',  0., 30., 'Water|Budget|water|vapour|divergence', 'mms-1', 'Reds'
+wbqvblten, 'wbqvblten', 'water_budget_qv_blten',  0., 30., 'Water|Budget|QV|tendency|due|to|pbl|parameterization', 'kg kg-1 s-1', 'Reds'
+WBQVBLTEN, 'wbqvblten', 'water_budget_qv_blten',  0., 30., 'Water|Budget|QV|tendency|due|to|pbl|parameterization', 'kg kg-1 s-1', 'Reds'
+WBACQVBLTENde, 'wbqvblten', 'water_budget_qv_blten',  0., 30., 'Water|Budget|QV|tendency|due|to|pbl|parameterization', 'kg kg-1 s-1', 'Reds'
+wbqvcuten, 'wbqvcuten', 'water_budget_qv_cuten',  0., 30., 'Water|Budget|QV|tendency|due|to|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+WBQVCUTEN, 'wbqvcuten', 'water_budget_qv_cuten',  0., 30., 'Water|Budget|QV|tendency|due|to|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+WBACQVCUTENde, 'wbqvcuten', 'water_budget_qv_cuten',  0., 30., 'Water|Budget|QV|tendency|due|to|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+wbqvshten, 'wbqvshten', 'water_budget_qv_shten',  0., 30., 'Water|Budget|QV|tendency|due|to|shallow|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+WBQVSHTEN, 'wbqvshten', 'water_budget_qv_shten',  0., 30., 'Water|Budget|QV|tendency|due|to|shallow|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+WBACQVSHTENde, 'wbqvshten', 'water_budget_qv_shten',  0., 30., 'Water|Budget|QV|tendency|due|to|shallow|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+wbpr, 'wbpr', 'water_budget_pr',  0., 30., 'Water|Budget|recipitation', 'mms-1', 'Reds'
+WBP, 'wbpr', 'water_budget_pr',  0., 30., 'Water|Budget|recipitation', 'mms-1', 'Reds'
+WBACPde, 'wbpr', 'water_budget_pr',  0., 30., 'Water|Budget|recipitation', 'mms-1', 'Reds'
+wbpw, 'wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content', 'mms-1', 'Reds'
+WBPW, 'wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content', 'mms-1', 'Reds'
+WBACPWde, 'wbpw', 'water_budget_pw',  0., 30., 'Water|Budget|water|content', 'mms-1', 'Reds'
+wbcondt, 'wbcondt', 'water_budget_condt',  0., 30., 'Water|Budget|condensation|and|deposition', 'mms-1', 'Reds'
+WBCONDT, 'wbcondt', 'water_budget_condt',  0., 30., 'Water|Budget|condensation|and|deposition', 'mms-1', 'Reds'
+WBACCONDTde, 'wbcondt', 'water_budget_condt',  0., 30., 'Water|Budget|condensation|and|deposition', 'mms-1', 'Reds'
+wbqcm, 'wbqcm', 'water_budget_qcm',  0., 30., 'Water|Budget|hydrometeor|change|and|convergence', 'mms-1', 'Reds'
+WBQCM, 'wbqcm', 'water_budget_qcm',  0., 30., 'Water|Budget|hydrometeor|change|and|convergence', 'mms-1', 'Reds'
+WBACQCMde, 'wbqcm', 'water_budget_qcm',  0., 30., 'Water|Budget|hydrometeor|change|and|convergence', 'mms-1', 'Reds'
+wbsi, 'wbsi', 'water_budget_si',  0., 30., 'Water|Budget|hydrometeor|sink', 'mms-1', 'Reds'
+WBSI, 'wbsi', 'water_budget_si',  0., 30., 'Water|Budget|hydrometeor|sink', 'mms-1', 'Reds'
+WBACSIde, 'wbsi', 'water_budget_si',  0., 30., 'Water|Budget|hydrometeor|sink', 'mms-1', 'Reds'
+wbso, 'wbso', 'water_budget_so',  0., 30., 'Water|Budget|hydrometeor|source', 'mms-1', 'Reds'
+WBSO, 'wbso', 'water_budget_so',  0., 30., 'Water|Budget|hydrometeor|source', 'mms-1', 'Reds'
+WBACSOde, 'wbso', 'water_budget_so',  0., 30., 'Water|Budget|hydrometeor|source', 'mms-1', 'Reds'
 # Water Budget accumulated
-    elif varn == 'ccondac' or varn == 'ACCCOND':
-        varvals = ['ccondac', 'cw_cond_ac',  0., 30.,                                \
-          'accumulated|cloud|water|condensation', 'mm', 'Reds']
-    elif varn == 'rac' or varn == 'ACQVAPOR':
-        varvals = ['rac', 'ac_r',  0., 30., 'accumualted|water|wapor', 'mm', 'Blues']
-    elif varn == 'diabhac' or varn == 'ACDIABH':
-        varvals = ['diabhac', 'diabh_ac',  0., 30., 'accumualted|diabatic|heating',  \
-          'K', 'Reds']
-    elif varn == 'wbpwac' or varn == 'WBACPW':
-        varvals = ['wbpwac', 'water_budget_pw_ac',  0., 30.,                         \
-          'Water|Budget|accumulated|water|content', 'mm', 'Reds']
-    elif varn == 'wbfac' or varn == 'WBACF':
-        varvals = ['wbfac', 'water_budget_hfcqv_ac',  0., 30.,                       \
-          'Water|Budget|accumulated|horizontal|convergence|of|water|vapour|(+,|' +   \
-          'conv.;|-,|div.)', 'mm', 'Reds']
-    elif varn == 'wbfcac' or varn == 'WBACFC':
-        varvals = ['wbfcac', 'water_budget_fc_ac',  0., 30.,                         \
-          'Water|Budget|accumulated|horizontal|convergence|of|cloud|(+,|conv.;|-,|' +\
-          'div.)', 'mm', 'Reds']
-    elif varn == 'wbfpac' or varn == 'WBACFP':
-        varvals = ['wbfpac', 'water_budget_cfp_ac',  0., 30.,                        \
-          'Water|Budget|accumulated|horizontal|convergence|of|precipitation|(+,|' +  \
-          'conv.;|-,|div.)', 'mm', 'Reds']
-    elif varn == 'wbzac' or varn == 'WBACZ':
-        varvals = ['wbzac', 'water_budget_z_ac',  0., 30.,                           \
-          'Water|Budget|accumulated|vertical|convergence|of|water|vapour|(+,|conv.' +\
-          ';|-,|div.)', 'mm', 'Reds']
-    elif varn == 'wbcac' or varn == 'WBACC':
-        varvals = ['wbcac', 'water_budget_c_ac',  0., 30.,                           \
-          'Water|Budget|accumulated|Cloud|water|species','mm', 'Reds']
-    elif varn == 'wbqvdac' or varn == 'WBACQVD':
-        varvals = ['wbqvdac', 'water_budget_qvd_ac',  0., 30.,                       \
-          'Water|Budget|accumulated|water|vapour|divergence', 'mm', 'Reds']
-    elif varn == 'wbqvbltenac' or varn == 'WBACQVBLTEN':
-        varvals = ['wbqvbltenac', 'water_budget_qv_blten_ac',  0., 30.,              \
-          'Water|Budget|accumulated|QV|tendency|due|to|pbl|parameterization',        \
-          'kg kg-1 s-1', 'Reds']
-    elif varn == 'wbqvcutenac' or varn == 'WBACQVCUTEN':
-        varvals = ['wbqvcutenac', 'water_budget_qv_cuten_ac',  0., 30.,              \
-          'Water|Budget|accumulated|QV|tendency|due|to|cu|parameterization',         \
-          'kg kg-1 s-1', 'Reds']
-    elif varn == 'wbqvshtenac' or varn == 'WBACQVSHTEN':
-        varvals = ['wbqvshtenac', 'water_budget_qv_shten_ac',  0., 30.,              \
-          'Water|Budget|accumulated|QV|tendency|due|to|shallow|cu|parameterization', \
-          'kg kg-1 s-1', 'Reds']
-    elif varn == 'wbprac' or varn == 'WBACP':
-        varvals = ['wbprac', 'water_budget_pr_ac',  0., 30.,                         \
-          'Water|Budget|accumulated|precipitation', 'mm', 'Reds']
-    elif varn == 'wbpwac' or varn == 'WBACPW':
-        varvals = ['wbpwac', 'water_budget_pw_ac',  0., 30.,                         \
-          'Water|Budget|accumulated|water|content', 'mm', 'Reds']
-    elif varn == 'wbcondtac' or varn == 'WBACCONDT':
-        varvals = ['wbcondtac', 'water_budget_condt_ac',  0., 30.,                   \
-          'Water|Budget|accumulated|condensation|and|deposition', 'mm', 'Reds']
-    elif varn == 'wbqcmac' or varn == 'WBACQCM':
-        varvals = ['wbqcmac', 'water_budget_qcm_ac',  0., 30.,                       \
-          'Water|Budget|accumulated|hydrometeor|change|and|convergence', 'mm', 'Reds']
-    elif varn == 'wbsiac' or varn == 'WBACSI':
-        varvals = ['wbsiac', 'water_budget_si_ac',  0., 30.,                         \
-          'Water|Budget|accumulated|hydrometeor|sink', 'mm', 'Reds']
-    elif varn == 'wbsoac' or varn == 'WBACSO':
-        varvals = ['wbsoac', 'water_budget_so_ac',  0., 30.,                         \
-          'Water|Budget|accumulated|hydrometeor|source', 'mm', 'Reds']
-
-    elif varn == 'xtime' or varn == 'XTIME':
-        varvals = ['xtime', 'time',  0., 1.e5, 'time',                               \
-          'minutes|since|simulation|start', 'Reds']
-    elif varn == 'x' or varn == 'X':
-        varvals = ['x', 'x',  0., 100., 'x', '-', 'Reds']
-    elif varn == 'y' or varn == 'Y':
-        varvals = ['y', 'y',  0., 100., 'y', '-', 'Blues']
-    elif varn == 'z' or varn == 'Z':
-        varvals = ['z', 'z',  0., 100., 'z', '-', 'Greens']
-    elif varn == 'zg' or varn == 'WRFght' or varn == 'Geopotential height' or        \
-      varn == 'geop' or varn == 'LGEOP':
-        varvals = ['zg', 'geopotential_height', 0., 80000., 'geopotential|height',   \
-          'm2s-2', 'rainbow']
-    elif varn == 'zmaxth' or varn == 'zmax_th'  or varn == 'LZMAX_TH':
-        varvals = ['zmaxth', 'thermal_plume_height', 0., 4000.,                     \
-          'maximum|thermals|plume|height', 'm', 'YlOrRd']
-    elif varn == 'zmla' or varn == 's_pblh' or varn == 'LS_PBLH':
-        varvals = ['zmla', 'atmosphere_boundary_layer_thickness', 0., 2500.,         \
-          'atmosphere|boundary|layer|thickness', 'm', 'Blues']
+ccondac, 'ccondac', 'cw_cond_ac',  0., 30., 'accumulated|cloud|water|condensation', 'mm', 'Reds'
+ACCCOND, 'ccondac', 'cw_cond_ac',  0., 30., 'accumulated|cloud|water|condensation', 'mm', 'Reds'
+rac, 'rac', 'ac_r',  0., 30., 'accumualted|water|wapor', 'mm', 'Blues'
+ACQVAPOR, 'rac', 'ac_r',  0., 30., 'accumualted|water|wapor', 'mm', 'Blues'
+diabhac, 'diabhac', 'diabh_ac',  0., 30., 'accumualted|diabatic|heating', 'K', 'Reds'
+ACDIABH, 'diabhac', 'diabh_ac',  0., 30., 'accumualted|diabatic|heating', 'K', 'Reds'
+wbpwac, 'wbpwac', 'water_budget_pw_ac',  0., 30., 'Water|Budget|accumulated|water|content', 'mm', 'Reds'
+WBACPW, 'wbpwac', 'water_budget_pw_ac',  0., 30., 'Water|Budget|accumulated|water|content', 'mm', 'Reds'
+wbfac, 'wbfac', 'water_budget_hfcqv_ac',  0., 30., 'Water|Budget|accumulated|horizontal|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mm', 'Reds'
+WBACF, 'wbfac', 'water_budget_hfcqv_ac',  0., 30., 'Water|Budget|accumulated|horizontal|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mm', 'Reds'
+wbfcac, 'wbfcac', 'water_budget_fc_ac',  0., 30., 'Water|Budget|accumulated|horizontal|convergence|of|cloud|(+|conv.;|-|div.)', 'mm', 'Reds'
+WBACFC, 'wbfcac', 'water_budget_fc_ac',  0., 30., 'Water|Budget|accumulated|horizontal|convergence|of|cloud|(+|conv.;|-|div.)', 'mm', 'Reds'
+wbfpac, 'wbfpac', 'water_budget_cfp_ac',  0., 30., 'Water|Budget|accumulated|horizontal|convergence|of|precipitation|(+|conv.;|-|div.)', 'mm', 'Reds'
+WBACFP, 'wbfpac', 'water_budget_cfp_ac',  0., 30., 'Water|Budget|accumulated|horizontal|convergence|of|precipitation|(+|conv.;|-|div.)', 'mm', 'Reds'
+wbzac, 'wbzac', 'water_budget_z_ac',  0., 30., 'Water|Budget|accumulated|vertical|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mm', 'Reds'
+WBACZ, 'wbzac', 'water_budget_z_ac',  0., 30., 'Water|Budget|accumulated|vertical|convergence|of|water|vapour|(+|conv.;|-|div.)', 'mm', 'Reds'
+wbcac, 'wbcac', 'water_budget_c_ac',  0., 30., 'Water|Budget|accumulated|Cloud|water|species','mm', 'Reds'
+WBACC, 'wbcac', 'water_budget_c_ac',  0., 30., 'Water|Budget|accumulated|Cloud|water|species','mm', 'Reds'
+wbqvdac, 'wbqvdac', 'water_budget_qvd_ac',  0., 30., 'Water|Budget|accumulated|water|vapour|divergence', 'mm', 'Reds'
+WBACQVD, 'wbqvdac', 'water_budget_qvd_ac',  0., 30., 'Water|Budget|accumulated|water|vapour|divergence', 'mm', 'Reds'
+wbqvbltenac, 'wbqvbltenac', 'water_budget_qv_blten_ac',  0., 30., 'Water|Budget|accumulated|QV|tendency|due|to|pbl|parameterization', 'kg kg-1 s-1', 'Reds'
+WBACQVBLTEN, 'wbqvbltenac', 'water_budget_qv_blten_ac',  0., 30., 'Water|Budget|accumulated|QV|tendency|due|to|pbl|parameterization', 'kg kg-1 s-1', 'Reds'
+wbqvcutenac, 'wbqvcutenac', 'water_budget_qv_cuten_ac',  0., 30., 'Water|Budget|accumulated|QV|tendency|due|to|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+WBACQVCUTEN, 'wbqvcutenac', 'water_budget_qv_cuten_ac',  0., 30., 'Water|Budget|accumulated|QV|tendency|due|to|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+wbqvshtenac, 'wbqvshtenac', 'water_budget_qv_shten_ac',  0., 30., 'Water|Budget|accumulated|QV|tendency|due|to|shallow|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+WBACQVSHTEN, 'wbqvshtenac', 'water_budget_qv_shten_ac',  0., 30., 'Water|Budget|accumulated|QV|tendency|due|to|shallow|cu|parameterization', 'kg kg-1 s-1', 'Reds'
+wbprac, 'wbprac', 'water_budget_pr_ac',  0., 30., 'Water|Budget|accumulated|precipitation', 'mm', 'Reds'
+WBACP, 'wbprac', 'water_budget_pr_ac',  0., 30., 'Water|Budget|accumulated|precipitation', 'mm', 'Reds'
+wbpwac, 'wbpwac', 'water_budget_pw_ac',  0., 30., 'Water|Budget|accumulated|water|content', 'mm', 'Reds'
+WBACPW, 'wbpwac', 'water_budget_pw_ac',  0., 30., 'Water|Budget|accumulated|water|content', 'mm', 'Reds'
+wbcondtac, 'wbcondtac', 'water_budget_condt_ac',  0., 30., 'Water|Budget|accumulated|condensation|and|deposition', 'mm', 'Reds'
+WBACCONDT, 'wbcondtac', 'water_budget_condt_ac',  0., 30., 'Water|Budget|accumulated|condensation|and|deposition', 'mm', 'Reds'
+wbqcmac, 'wbqcmac', 'water_budget_qcm_ac',  0., 30., 'Water|Budget|accumulated|hydrometeor|change|and|convergence', 'mm', 'Reds'
+WBACQCM, 'wbqcmac', 'water_budget_qcm_ac',  0., 30., 'Water|Budget|accumulated|hydrometeor|change|and|convergence', 'mm', 'Reds'
+wbsiac, 'wbsiac', 'water_budget_si_ac',  0., 30., 'Water|Budget|accumulated|hydrometeor|sink', 'mm', 'Reds'
+WBACSI, 'wbsiac', 'water_budget_si_ac',  0., 30., 'Water|Budget|accumulated|hydrometeor|sink', 'mm', 'Reds'
+wbsoac, 'wbsoac', 'water_budget_so_ac',  0., 30., 'Water|Budget|accumulated|hydrometeor|source', 'mm', 'Reds'
+WBACSO, 'wbsoac', 'water_budget_so_ac',  0., 30., 'Water|Budget|accumulated|hydrometeor|source', 'mm', 'Reds'
+xtime, 'xtime', 'time',  0., 1.e5, 'time', 'minutes|since|simulation|start', 'Reds'
+XTIME, 'xtime', 'time',  0., 1.e5, 'time', 'minutes|since|simulation|start', 'Reds'
+x, 'x', 'x',  0., 100., 'x', '-', 'Reds'
+X, 'x', 'x',  0., 100., 'x', '-', 'Reds'
+y, 'y', 'y',  0., 100., 'y', '-', 'Blues'
+Y, 'y', 'y',  0., 100., 'y', '-', 'Blues'
+z, 'z', 'z',  0., 100., 'z', '-', 'Greens'
+Z, 'z', 'z',  0., 100., 'z', '-', 'Greens'
+zg, 'zg', 'geopotential_height', 0., 80000., 'geopotential|height', 'm2s-2', 'rainbow'
+WRFght, 'zg', 'geopotential_height', 0., 80000., 'geopotential|height', 'm2s-2', 'rainbow'
+Geopotential height, 'zg', 'geopotential_height', 0., 80000., 'geopotential|height', 'm2s-2', 'rainbow'
+geop, 'zg', 'geopotential_height', 0., 80000., 'geopotential|height', 'm2s-2', 'rainbow'
+LGEOP, 'zg', 'geopotential_height', 0., 80000., 'geopotential|height', 'm2s-2', 'rainbow'
+zmaxth, 'zmaxth', 'thermal_plume_height', 0., 4000., 'maximum|thermals|plume|height', 'm', 'YlOrRd'
+zmax_th, 'zmaxth', 'thermal_plume_height', 0., 4000., 'maximum|thermals|plume|height', 'm', 'YlOrRd'
+LZMAX_TH, 'zmaxth', 'thermal_plume_height', 0., 4000., 'maximum|thermals|plume|height', 'm', 'YlOrRd'
+zmla, 'zmla', 'atmosphere_boundary_layer_thickness', 0., 2500., 'atmosphere|boundary|layer|thickness', 'm', 'Blues'
+s_pblh, 'zmla', 'atmosphere_boundary_layer_thickness', 0., 2500., 'atmosphere|boundary|layer|thickness', 'm', 'Blues'
+LS_PBLH, 'zmla', 'atmosphere_boundary_layer_thickness', 0., 2500., 'atmosphere|boundary|layer|thickness', 'm', 'Blues'
