From 6ada607b5079eac7a6202da2e9b7fcda580468da Mon Sep 17 00:00:00 2001 From: Nicholas Hannah Date: Mon, 14 Aug 2017 15:57:50 +1000 Subject: [PATCH 1/2] Don't register diagnostics conSST absSSS, abssalt, contemp unless they can be posted. #574 --- src/core/MOM.F90 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index f2286c3673..d2450a4e0a 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -2469,15 +2469,16 @@ subroutine register_diags(Time, G, GV, CS, ADp) 'Sea Surface Salinity Squared', 'ppt**2', CS%missing, cmor_field_name='sossq', & cmor_long_name='Square of Sea Surface Salinity ', cmor_units='ppt^2', & cmor_standard_name='square_of_sea_surface_salinity') - CS%id_Tcon = register_diag_field('ocean_model', 'contemp', diag%axesTL, Time, & - 'Conservative Temperature', 'Celsius') - CS%id_Sabs = register_diag_field('ocean_model', 'abssalt', diag%axesTL, Time, & - long_name='Absolute Salinity', units='g/Kg') - CS%id_sstcon = register_diag_field('ocean_model', 'conSST', diag%axesT1, Time, & - 'Sea Surface Conservative Temperature', 'Celsius', CS%missing) - CS%id_sssabs = register_diag_field('ocean_model', 'absSSS', diag%axesT1, Time, & - 'Sea Surface Absolute Salinity', 'g/Kg', CS%missing) - + if (CS%use_conT_absS) then + CS%id_Tcon = register_diag_field('ocean_model', 'contemp', diag%axesTL, Time, & + 'Conservative Temperature', 'Celsius') + CS%id_Sabs = register_diag_field('ocean_model', 'abssalt', diag%axesTL, Time, & + long_name='Absolute Salinity', units='g/Kg') + CS%id_sstcon = register_diag_field('ocean_model', 'conSST', diag%axesT1, Time, & + 'Sea Surface Conservative Temperature', 'Celsius', CS%missing) + CS%id_sssabs = register_diag_field('ocean_model', 'absSSS', diag%axesT1, Time, & + 'Sea Surface Absolute Salinity', 'g/Kg', CS%missing) + endif endif if (CS%use_temperature .and. CS%use_frazil) then From 9183c22c20531b3e53194006a9495767e2ace6f0 Mon Sep 17 00:00:00 2001 From: Nicholas Hannah Date: Mon, 14 Aug 2017 16:01:33 +1000 Subject: [PATCH 2/2] Don't register h_pre_dyn, it is never posted. #574 --- src/core/MOM.F90 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index d2450a4e0a..32ed9d2c41 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -368,9 +368,6 @@ module MOM integer :: id_T_vardec = -1 integer :: id_S_vardec = -1 - ! fields prior to doing dynamics - integer :: id_h_pre_dyn = -1 - ! diagnostic for fields prior to applying diapycnal physics integer :: id_u_predia = -1 integer :: id_v_predia = -1 @@ -2564,10 +2561,6 @@ subroutine register_diags(Time, G, GV, CS, ADp) endif endif - ! fields posted prior to dynamics step - CS%id_h_pre_dyn = register_diag_field('ocean_model', 'h_pre_dyn', diag%axesTL, Time, & - 'Layer Thickness before dynamics step', thickness_units) - ! diagnostics for values prior to diabatic and prior to ALE CS%id_u_predia = register_diag_field('ocean_model', 'u_predia', diag%axesCuL, Time, & 'Zonal velocity before diabatic forcing', 'meter second-1')