From b533b202c013b4245047c04b55115e2a7fde6759 Mon Sep 17 00:00:00 2001 From: Steve Goldhaber Date: Thu, 19 Sep 2024 14:26:32 +0200 Subject: [PATCH] Use dms_from_ocn from phys_control instead of coupling layer Remove unused import Small code cleanup --- src/aero_model.F90 | 10 ++++++---- src/oslo_aero_ocean.F90 | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/aero_model.F90 b/src/aero_model.F90 index 9c6b90b..f83c421 100644 --- a/src/aero_model.F90 +++ b/src/aero_model.F90 @@ -60,7 +60,6 @@ module aero_model use oslo_aero_aerodry_tables, only: initdry use oslo_aero_aerocom_tables, only: initaeropt use oslo_aero_logn_tables, only: initlogn - use atm_import_export, only: dms_from_ocn implicit none private @@ -79,8 +78,10 @@ module aero_model ! Misc private data integer :: pblh_idx= 0 - integer :: ndx_h2so4, ndx_soa_lv, ndx_soa_sv ! for surf_area_dens - logical :: convproc_do_aer + integer :: ndx_h2so4 = -1 ! for surf_area_dens + integer :: ndx_soa_lv = -1 ! for surf_area_dens + integer :: ndx_soa_sv = -1 ! for surf_area_dens + logical :: convproc_do_aer = .false. ! Namelist variables real(r8) :: sol_facti_cloud_borne = 1._r8 @@ -580,6 +581,7 @@ end subroutine aero_model_gasaerexch !============================================================================= subroutine aero_model_emissions( state, cam_in ) + use phys_control, only: dms_from_ocn ! Arguments: type(physics_state), intent(in) :: state ! Physics state variables @@ -593,7 +595,7 @@ subroutine aero_model_emissions( state, cam_in ) call oslo_aero_seasalt_emis(state%ncol, state%lchnk, & state%u(:,pver), state%v(:,pver), state%zm(:,pver), & cam_in%ocnfrac, cam_in%icefrac, cam_in%sst, cam_in%cflx) - endif + end if ! Pick up correct DMS emissions (replace values from file if requested) ! If DMS is sent from the ocean then cflx is updated in the nuopc cap diff --git a/src/oslo_aero_ocean.F90 b/src/oslo_aero_ocean.F90 index 32aee0c..66d7bd3 100644 --- a/src/oslo_aero_ocean.F90 +++ b/src/oslo_aero_ocean.F90 @@ -24,7 +24,6 @@ module oslo_aero_ocean use physics_types, only : physics_state use physics_buffer, only : physics_buffer_desc use tracer_data, only : trfld, trfile, trcdata_init, advance_trcdata - use atm_import_export, only : brf_from_ocn ! use oslo_aero_control, only: oslo_aero_getopts