From 240c27cf8e8cc300857546342a33f58ac83a9c85 Mon Sep 17 00:00:00 2001 From: Nicholas Hannah Date: Wed, 3 Jun 2015 10:06:28 -0700 Subject: [PATCH] Set conditions on *_preale diagnostic registration. Closes #186 --- src/core/MOM.F90 | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index 1c1cc2e105..c78182c60d 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -2365,16 +2365,18 @@ subroutine register_diags(Time, G, CS, ADp) 'Layer Thickness before diabatic forcing', thickness_units) CS%id_e_predia = register_diag_field('ocean_model', 'e_predia', diag%axesTi, Time, & 'Interface Heights before diabatic forcing', 'meter') - CS%id_u_preale = register_diag_field('ocean_model', 'u_preale', diag%axesCuL, Time, & - 'Zonal velocity before remapping', 'meter second-1') - CS%id_v_preale = register_diag_field('ocean_model', 'v_preale', diag%axesCvL, Time, & - 'Meridional velocity before remapping', 'meter second-1') - CS%id_h_preale = register_diag_field('ocean_model', 'h_preale', diag%axesTL, Time, & - 'Layer Thickness before remapping', thickness_units) - CS%id_T_preale = register_diag_field('ocean_model', 'T_preale', diag%axesTL, Time, & - 'Temperature before remapping', 'degC') - CS%id_S_preale = register_diag_field('ocean_model', 'S_preale', diag%axesTL, Time, & - 'Salinity before remapping', 'ppt') + if (CS%diabatic_first .and. (.not. CS%adiabatic)) then + CS%id_u_preale = register_diag_field('ocean_model', 'u_preale', diag%axesCuL, Time, & + 'Zonal velocity before remapping', 'meter second-1') + CS%id_v_preale = register_diag_field('ocean_model', 'v_preale', diag%axesCvL, Time, & + 'Meridional velocity before remapping', 'meter second-1') + CS%id_h_preale = register_diag_field('ocean_model', 'h_preale', diag%axesTL, Time, & + 'Layer Thickness before remapping', thickness_units) + CS%id_T_preale = register_diag_field('ocean_model', 'T_preale', diag%axesTL, Time, & + 'Temperature before remapping', 'degC') + CS%id_S_preale = register_diag_field('ocean_model', 'S_preale', diag%axesTL, Time, & + 'Salinity before remapping', 'ppt') + endif if (CS%use_temperature) then CS%id_T_predia = register_diag_field('ocean_model', 'temp_predia', diag%axesTL, Time, & 'Potential Temperature', 'Celsius')