From 7203e34a0dec16e22dce7a0e3cb8d9c2968c1c57 Mon Sep 17 00:00:00 2001 From: sloosvel Date: Mon, 29 Apr 2019 12:39:14 +0200 Subject: [PATCH 1/3] Fix utau_ice problem --- earthdiagnostics/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/earthdiagnostics/config.py b/earthdiagnostics/config.py index 0a79a89f..6bdf281a 100644 --- a/earthdiagnostics/config.py +++ b/earthdiagnostics/config.py @@ -264,7 +264,7 @@ class CMORConfig(object): Log.warning('Variable {0} not recognized. It will not be cmorized', domain_var) continue if ModelingRealm(splitted[0]) != cmor_var.domain: - Log.warning('Domain {0} for variable {1} is not correct: is {2}', splitted[0], cmor_var.short_name, + Log.warning('Domain {0} for variable {1} is not correct: is {2}', splitted[0], splitted[1], cmor_var.domain) continue self._variable_list.append('{0.domain}:{0.short_name}'.format(cmor_var)) -- GitLab From 8aed650d88d4e54a1f01230e874f86e81b2c834c Mon Sep 17 00:00:00 2001 From: sloosvel Date: Mon, 29 Apr 2019 12:39:56 +0200 Subject: [PATCH 2/3] Add hc300 to the tables --- earthdiagnostics/cmor_tables/default.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/earthdiagnostics/cmor_tables/default.csv b/earthdiagnostics/cmor_tables/default.csv index 9d562abf..f73d00fe 100644 --- a/earthdiagnostics/cmor_tables/default.csv +++ b/earthdiagnostics/cmor_tables/default.csv @@ -347,3 +347,4 @@ zqlw,rlntds,surface_net_downward_longwave_flux,Surface Net Downward Longwave Rad var78,tclw,total_column_liquid_water,Total column liquid water,atmos,,kg m-2,,,, var79,tciw,total_column_ice_water,Total column ice water,atmos,,kg m-2,,,, rho,rhopoto,sea_water_potential_density,Sea Water Potential Density,ocean,,kg m-3,,,, +hc300,heat_content_to_300m_depth,Heat Content to 300m depth,ocean,K,,,, \ No newline at end of file -- GitLab From c1b0e149d580025b8ece1a461ad8c97e3a39fa59 Mon Sep 17 00:00:00 2001 From: sloosvel Date: Mon, 29 Apr 2019 14:28:27 +0200 Subject: [PATCH 3/3] Add hc300 to variable list --- earthdiagnostics/cmor_tables/default.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/earthdiagnostics/cmor_tables/default.csv b/earthdiagnostics/cmor_tables/default.csv index f73d00fe..7133c04f 100644 --- a/earthdiagnostics/cmor_tables/default.csv +++ b/earthdiagnostics/cmor_tables/default.csv @@ -347,4 +347,4 @@ zqlw,rlntds,surface_net_downward_longwave_flux,Surface Net Downward Longwave Rad var78,tclw,total_column_liquid_water,Total column liquid water,atmos,,kg m-2,,,, var79,tciw,total_column_ice_water,Total column ice water,atmos,,kg m-2,,,, rho,rhopoto,sea_water_potential_density,Sea Water Potential Density,ocean,,kg m-3,,,, -hc300,heat_content_to_300m_depth,Heat Content to 300m depth,ocean,K,,,, \ No newline at end of file +hc300,hc300,,Heat Content to 300m depth,ocean,J m-2,,,, \ No newline at end of file -- GitLab