From 914085e82a8b10edc036a5d2a5bc2a5985222fe7 Mon Sep 17 00:00:00 2001 From: Ryan Abernathey Date: Mon, 11 Jan 2021 19:18:01 -0500 Subject: [PATCH 1/6] fix variable metadata typos --- xmitgcm/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmitgcm/variables.py b/xmitgcm/variables.py index 66ea40f7..5266fa33 100644 --- a/xmitgcm/variables.py +++ b/xmitgcm/variables.py @@ -637,7 +637,7 @@ units='dJ/(m2 s-1)')), 'ADJkapgm': dict(dims=['k', 'j', 'i'], attrs=dict( standard_name="ADJkapgm", - long_name='dJ/dkapgm: Sensitivity to meridional surface stress', + long_name='dJ/dkapgm: Sensitivity to GM Intensity', units='dJ/(m2 s-1)')), 'ADJkapredi': dict(dims=['k', 'j', 'i'], attrs=dict( standard_name="ADJkapredi", From f0293162e3e3fcab14d2175dd3060bcd7861d575 Mon Sep 17 00:00:00 2001 From: Ryan Abernathey Date: Mon, 11 Jan 2021 19:19:22 -0500 Subject: [PATCH 2/6] Update variables.py --- xmitgcm/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmitgcm/variables.py b/xmitgcm/variables.py index 5266fa33..111ea352 100644 --- a/xmitgcm/variables.py +++ b/xmitgcm/variables.py @@ -641,7 +641,7 @@ units='dJ/(m2 s-1)')), 'ADJkapredi': dict(dims=['k', 'j', 'i'], attrs=dict( standard_name="ADJkapredi", - long_name='dJ/dkapredi: Sensitivity to meridional surface stress', + long_name='dJ/dkapredi: Sensitivity to Redi coefficient', units='dJ/(m2 s-1)')), 'ADJeddypsix': dict(dims=['k', 'j', 'i_g'], attrs=dict( standard_name="ADJeddypsix", From cc514b742b2af08036f969fcba3fa6e55d9ad031 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 11 Jan 2021 18:00:42 -0700 Subject: [PATCH 3/6] Update variables.py some more adjoint fixes --- xmitgcm/variables.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xmitgcm/variables.py b/xmitgcm/variables.py index 111ea352..356c5122 100644 --- a/xmitgcm/variables.py +++ b/xmitgcm/variables.py @@ -625,8 +625,8 @@ units='dJ/(kg m-2 s-1)')), 'ADJqsw': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJqsw", - long_name='dJ/dqsw: Sensitivity to net upward heat flux', - units='dJ/(N m-2)')), + long_name='dJ/dqsw: Sensitivity to net shortwave radiation', + units='dJ/(W m-2)')), 'ADJggl90tke': dict(dims=['k', 'j', 'i'], attrs=dict( standard_name="ADJggl90tke", long_name='dJ/dggl90tke: Sensitivity to TKE', @@ -687,12 +687,12 @@ units='dJ/(m s-1)')), 'ADJatemp': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJatemp", - long_name='dJ/datemp: Sensitivity to atmosperic surface temperature', + long_name='dJ/datemp: Sensitivity to atmospheric surface temperature', units='dJ/K')), 'ADJaqh': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJaqh", long_name='dJ/daqh: Sensitivity to specific surface humidity', - units='dJ/K')), + units='dJ/(kg kg-1)')), 'ADJswdown': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJswdown", long_name='dJ/dswdown: Sensitivity to downward solar radiation', @@ -712,11 +712,11 @@ 'ADJprecip': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJprecip", long_name='dJ/dprecip: Sensitivity to precipitation flux', - units='dJ/(kg m-2 s-1)')), + units='dJ/(m s-1)')), 'ADJrunoff': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJrunoff", long_name='dJ/drunoff: Sensitivity to runoff', - units='dJ/(kg m-2 s-1)')), + units='dJ/(m s-1)')), 'ADJclimsst': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJclimsst", long_name='dJ/dclimsst: Sensitivity to restoring surface temperature', @@ -724,7 +724,7 @@ 'ADJclimsss': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJclimsss", long_name='dJ/dclimsss: Sensitivity to restoring surface salinity', - units='dJ/pss)')), + units='dJ/psu)')), 'ADJarea': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJarea", long_name='dJ/darea: Sensitivity to sea ice concentration', From bafc77f63bd0d7029d8fa2c0905a6fe0ba7e1ed6 Mon Sep 17 00:00:00 2001 From: Timothy Smith Date: Mon, 11 Jan 2021 18:12:26 -0700 Subject: [PATCH 4/6] Update variables.py --- xmitgcm/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmitgcm/variables.py b/xmitgcm/variables.py index 356c5122..35f35d6b 100644 --- a/xmitgcm/variables.py +++ b/xmitgcm/variables.py @@ -660,7 +660,7 @@ 'ADJsss': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJsss", long_name='dJ/dsss: Sensitivity to sea surface salinity', - units='dJ/pss)')), + units='dJ/psu)')), 'ADJbottomdrag': dict(dims=['j', 'i'], attrs=dict( standard_name="ADbottomdrag", long_name='dJ/dbottomdrag: Sensitivity to linear bottom drag coeff', From 0327ac7387907a74b8d127957dfb7f9bb613875c Mon Sep 17 00:00:00 2001 From: Martin Losch Date: Tue, 12 Jan 2021 14:56:00 +0100 Subject: [PATCH 5/6] fix two more instances of sloppiness --- xmitgcm/variables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmitgcm/variables.py b/xmitgcm/variables.py index 35f35d6b..fa8abb64 100644 --- a/xmitgcm/variables.py +++ b/xmitgcm/variables.py @@ -699,11 +699,11 @@ units='dJ/(W m-2)')), 'ADJlwdown': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJlwdown", - long_name='dJ/dswdown: Sensitivity to downward longwave radiation', + long_name='dJ/dlwdown: Sensitivity to downward longwave radiation', units='dJ/(W m-2)')), 'ADJhflux': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJhflux", - long_name='dJ/dswdown: Sensitivity to upward heat flux', + long_name='dJ/dhflux: Sensitivity to upward heat flux', units='dJ/(W m-2)')), 'ADJsflux': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJsflux", From 914bd69d54f12211920f5c333d86bd2291f9734a Mon Sep 17 00:00:00 2001 From: Martin Losch Date: Thu, 21 Jan 2021 08:56:06 +0100 Subject: [PATCH 6/6] replace "psu" by "g/kg" --- xmitgcm/variables.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xmitgcm/variables.py b/xmitgcm/variables.py index fa8abb64..e7f8e696 100644 --- a/xmitgcm/variables.py +++ b/xmitgcm/variables.py @@ -295,7 +295,7 @@ long_name='Potential Temperature', units='degree_Celcius')), S = dict(dims=['k','j','i'], attrs=dict( standard_name="sea_water_salinity", - long_name='Salinity', units='psu')), + long_name='Salinity', units='g kg-1')), PH= dict(dims=['k','j','i'], attrs=dict( standard_name="sea_water_dynamic_pressue", long_name='Hydrostatic Pressure Pot.(p/rho) Anomaly', @@ -322,7 +322,7 @@ long_name='Potential Temperature', units='degree_Celcius')), Stave = dict(dims=['k','j','i'], attrs=dict( standard_name="sea_water_salinity", - long_name='Salinity', units='psu')), + long_name='Salinity', units='g kg-1')), PhHytave= dict(dims=['k','j','i'], attrs=dict( standard_name="sea_water_dynamic_pressue", long_name='Hydrostatic Pressure Pot.(p/rho) Anomaly', @@ -369,7 +369,7 @@ UStave=dict(dims=['k','j','i_g'], attrs=dict( standard_name="product_of_sea_water_x_velocity_and_salinity", long_name="Zonal Transport of Salinity", - units="psu m s-1", mate='VStave')), + units="g kg-1 m s-1", mate='VStave')), UTtave=dict(dims=['k','j','i_g'], attrs=dict( standard_name="product_of_sea_water_x_velocity_and_" "potential_temperature", @@ -392,7 +392,7 @@ VStave=dict(dims=['k','j_g','i'], attrs=dict( standard_name="product_of_sea_water_y_velocity_and_salinity", long_name="Meridional Transport of Salinity", - units="psu m s-1", mate='UStave')), + units="g kg-1 m s-1", mate='UStave')), VTtave=dict(dims=['k','j_g','i'], attrs=dict( standard_name="product_of_sea_water_y_velocity_and_" "potential_temperature", @@ -405,7 +405,7 @@ WStave=dict(dims=['k_l','j','i'], attrs=dict( standard_name="product_of_sea_water_z_velocity_and_salinity", long_name="Vertical Transport of Salinity", - units="psu m s-1")), + units="g kg-1 m s-1")), WTtave=dict(dims=['k_l','j','i'], attrs=dict( standard_name="product_of_sea_water_z_velocity_and_" "potential_temperature", @@ -461,7 +461,7 @@ 'KPPg_SLT': dict(dims=['k_l','j','i'], attrs=dict( standard_name='KPP_salt_flux', long_name='KPP non-local Flux of Salinity', - units='psu m3 s-1')), + units='g kg-1 m3 s-1')), # pkg/thsice variables 'ice_fract': dict(dims=['j', 'i'], attrs=dict( standard_name="sea_ice_area_fraction", @@ -660,7 +660,7 @@ 'ADJsss': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJsss", long_name='dJ/dsss: Sensitivity to sea surface salinity', - units='dJ/psu)')), + units='dJ/(g kg-1)')), 'ADJbottomdrag': dict(dims=['j', 'i'], attrs=dict( standard_name="ADbottomdrag", long_name='dJ/dbottomdrag: Sensitivity to linear bottom drag coeff', @@ -724,7 +724,7 @@ 'ADJclimsss': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJclimsss", long_name='dJ/dclimsss: Sensitivity to restoring surface salinity', - units='dJ/psu)')), + units='dJ/(g kg-1)')), 'ADJarea': dict(dims=['j', 'i'], attrs=dict( standard_name="ADJarea", long_name='dJ/darea: Sensitivity to sea ice concentration',