From b9a23f43d4157f5087b0f2a7513d9133ef63fef6 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 1 May 2015 16:44:45 -0400 Subject: [PATCH] Revert "Update diagnostic name, old name has been obsoleted. Closes #155" This reverts commit 7f5cc91732efd1360e3f87d5b248802ec20c9b3c. - We are going to replace this commit with removing the conflicting line in MOM_obsolete_diagnostics.F90. --- src/core/MOM_forcing_type.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/MOM_forcing_type.F90 b/src/core/MOM_forcing_type.F90 index 6c25a74117..0b8013b6a2 100644 --- a/src/core/MOM_forcing_type.F90 +++ b/src/core/MOM_forcing_type.F90 @@ -1147,7 +1147,7 @@ subroutine register_forcing_type_diags(Time, diag, use_temperature, handles) cmor_standard_name='surface_downward_latent_heat_flux', & cmor_long_name='Surface Downward Latent Heat Flux') - handles%id_lat_evap = register_diag_field('ocean_model', 'latent_evap_diag', diag%axesT1, Time, & + handles%id_lat_evap = register_diag_field('ocean_model', 'latent_evap', diag%axesT1, Time, & 'Latent heat flux into ocean due to evaporation/condensation', 'Watt/m^2') handles%id_lat_fprec = register_diag_field('ocean_model', 'latent_fprec_diag', diag%axesT1, Time,&