Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions generic_tracers/generic_COBALT.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,7 @@ module generic_COBALT
runoff_flux_sldop,&
runoff_flux_srdop,&
dry_fed, wet_fed,&
dry_alk, wet_alk,&
dry_lith, wet_lith,&
dry_no3, wet_no3,&
dry_nh4, wet_nh4,&
Expand Down Expand Up @@ -1071,6 +1072,8 @@ module generic_COBALT
id_dep_wet_po4 = -1, &
id_dep_wet_lith = -1, &
id_dep_dry_lith = -1, &
id_dep_wet_alk = -1, &
id_dep_dry_alk = -1, &
id_omega_arag = -1, &
id_omega_calc = -1, &
id_chl = -1, &
Expand Down Expand Up @@ -2833,6 +2836,14 @@ subroutine generic_COBALT_register_diag(diag_list)
! Save river, depositon and bulk elemental fluxes
!

vardesc_temp = vardesc("dep_dry_alk","Dry Deposition of Alkalinity on to the ocean",'h','1','s','mol m-2 s-1','f')
cobalt%id_dep_dry_alk = register_diag_field(package_name, vardesc_temp%name, axes(1:2),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("dep_wet_alk","Wet Deposition of Alkalinity on to the ocean",'h','1','s','mol m-2 s-1','f')
cobalt%id_dep_wet_alk = register_diag_field(package_name, vardesc_temp%name, axes(1:2),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)

vardesc_temp = vardesc("dep_dry_fed","Dry Deposition of Iron to the ocean",'h','1','s','mol m-2 s-1','f')
cobalt%id_dep_dry_fed = register_diag_field(package_name, vardesc_temp%name, axes(1:2),&
init_time, vardesc_temp%longname,vardesc_temp%units, missing_value = missing_value1)
Expand Down Expand Up @@ -5879,6 +5890,8 @@ subroutine user_add_tracers(tracer_list)
units = 'mol/kg', &
prog = .true., &
flux_runoff= .true., &
flux_wetdep= .true., &
flux_drydep= .true., &
flux_param = (/ 1.0e-03 /), &
flux_bottom= .true. )
!
Expand Down Expand Up @@ -9518,6 +9531,8 @@ subroutine generic_COBALT_update_from_source(tracer_list,Temp,Salt,rho_dzt,dzt,h
call g_tracer_get_values(tracer_list,'fed','runoff_tracer_flux',cobalt%runoff_flux_fed,isd,jsd)
call g_tracer_get_values(tracer_list,'fed','drydep',cobalt%dry_fed,isd,jsd)
call g_tracer_get_values(tracer_list,'fed','wetdep',cobalt%wet_fed,isd,jsd)
call g_tracer_get_values(tracer_list,'alk','drydep',cobalt%dry_alk,isd,jsd)
call g_tracer_get_values(tracer_list,'alk','wetdep',cobalt%wet_alk,isd,jsd)
call g_tracer_get_values(tracer_list,'lith','runoff_tracer_flux',cobalt%runoff_flux_lith,isd,jsd)
call g_tracer_get_values(tracer_list,'lith','drydep',cobalt%dry_lith,isd,jsd)
call g_tracer_get_values(tracer_list,'lith','wetdep',cobalt%wet_lith,isd,jsd)
Expand Down Expand Up @@ -10498,6 +10513,14 @@ subroutine generic_COBALT_update_from_source(tracer_list,Temp,Salt,rho_dzt,dzt,h
used = g_send_data(cobalt%id_dep_wet_po4, cobalt%wet_po4, &
model_time, rmask = grid_tmask(:,:,1),&
is_in=isc, js_in=jsc, ie_in=iec, je_in=jec)
if (cobalt%id_dep_wet_alk .gt. 0) &
used = g_send_data(cobalt%id_dep_wet_alk, cobalt%wet_alk, &
model_time, rmask = grid_tmask(:,:,1),&
is_in=isc, js_in=jsc, ie_in=iec, je_in=jec)
if (cobalt%id_dep_dry_alk .gt. 0) &
used = g_send_data(cobalt%id_dep_dry_alk, cobalt%dry_alk, &
model_time, rmask = grid_tmask(:,:,1),&
is_in=isc, js_in=jsc, ie_in=iec, je_in=jec)
if (cobalt%id_runoff_flux_alk .gt. 0) &
used = g_send_data(cobalt%id_runoff_flux_alk, cobalt%runoff_flux_alk, &
model_time, rmask = grid_tmask(:,:,1),&
Expand Down Expand Up @@ -13045,6 +13068,8 @@ subroutine user_allocate_arrays
allocate(cobalt%runoff_flux_srdop(isd:ied, jsd:jed)); cobalt%runoff_flux_srdop=0.0
allocate(cobalt%dry_fed(isd:ied, jsd:jed)); cobalt%dry_fed=0.0
allocate(cobalt%wet_fed(isd:ied, jsd:jed)); cobalt%wet_fed=0.0
allocate(cobalt%dry_alk(isd:ied, jsd:jed)); cobalt%dry_alk=0.0
allocate(cobalt%wet_alk(isd:ied, jsd:jed)); cobalt%wet_alk=0.0
allocate(cobalt%dry_lith(isd:ied, jsd:jed)); cobalt%dry_lith=0.0
allocate(cobalt%wet_lith(isd:ied, jsd:jed)); cobalt%wet_lith=0.0
allocate(cobalt%dry_no3(isd:ied, jsd:jed)); cobalt%dry_no3=0.0
Expand Down Expand Up @@ -13528,6 +13553,8 @@ subroutine user_deallocate_arrays
deallocate(cobalt%runoff_flux_srdop)
deallocate(cobalt%dry_fed)
deallocate(cobalt%wet_fed)
deallocate(cobalt%dry_alk)
deallocate(cobalt%wet_alk)
deallocate(cobalt%dry_lith)
deallocate(cobalt%wet_lith)
deallocate(cobalt%dry_no3)
Expand Down
8 changes: 4 additions & 4 deletions generic_tracers/generic_tracer_utils.F90
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module g_tracer_utils

#ifdef _USE_MOM6_DIAG
use MOM_diag_mediator, only : register_diag_field_MOM=>register_diag_field
use MOM_diag_mediator, only : post_data_MOM=>post_data, post_data_1d_k
use MOM_diag_mediator, only : post_data_MOM=>post_data
use MOM_diag_mediator, only : g_diag_ctrl=>diag_ctrl
#else
use diag_manager_mod, only : register_diag_field_FMS=>register_diag_field
Expand Down Expand Up @@ -3885,7 +3885,7 @@ LOGICAL FUNCTION g_send_data_1d(diag_field_id, field, time, is_in, mask, rmask,
else
call g_tracer_get_diagCS(diag_CS_ptr)
endif
call post_data_1d_k(diag_field_id, field, diag_CS_ptr)
call post_data_MOM(diag_field_id, field, diag_CS_ptr)
g_send_data_1d = .TRUE.
#else
g_send_data_1d = send_data_FMS(diag_field_id, field, time, is_in, mask, rmask, ie_in, weight, err_msg)
Expand Down Expand Up @@ -3913,7 +3913,7 @@ LOGICAL FUNCTION g_send_data_2d(diag_field_id, field, time, is_in, js_in, &
else
call g_tracer_get_diagCS(diag_CS_ptr)
endif
call post_data_MOM(diag_field_id, field, diag_CS_ptr)!, mask=rmask)
call post_data_MOM(diag_field_id, field, diag_CS_ptr)
g_send_data_2d = .TRUE.
#else
g_send_data_2d = send_data_FMS(diag_field_id, field, time, is_in, js_in, &
Expand Down Expand Up @@ -3942,7 +3942,7 @@ LOGICAL FUNCTION g_send_data_3d(diag_field_id, field, time, is_in, js_in, ks_in,
else
call g_tracer_get_diagCS(diag_CS_ptr)
endif
call post_data_MOM(diag_field_id, field, diag_CS_ptr)!, mask=rmask)
call post_data_MOM(diag_field_id, field, diag_CS_ptr)
g_send_data_3d = .TRUE.
#else
g_send_data_3d = send_data_FMS(diag_field_id, field, time, is_in, js_in, ks_in, &
Expand Down