Skip to content

Commit

Permalink
Don't need to set tendencies to 0 multiple times
Browse files Browse the repository at this point in the history
We set surface_fluxes(:,:) and interior_tendencies(:,:) to c0 at the beginning
of their respective compute routines, so the abio and ciso versions of those
routines don't need to set the specific subset to c0 as well.

Note that these subroutines no longer require abio_ind_beg, abio_ind_end, or
the ciso equivalents.
  • Loading branch information
mnlevy1981 committed Oct 13, 2023
1 parent 149c0c0 commit 0ce48a8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 22 deletions.
5 changes: 1 addition & 4 deletions src/marbl_abio_dic_interior_tendency_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,9 @@ subroutine marbl_abio_dic_interior_tendency_compute(marbl_tracer_indices, &
dic => tracer_local(marbl_tracer_indices%abio_dic_ind, :), &
di14c => tracer_local(marbl_tracer_indices%abio_di14c_ind, :), &
! Tracer indices
di14c_ind => marbl_tracer_indices%abio_di14c_ind, &
abio_ind_beg => marbl_tracer_indices%abio_dic%ind_beg, &
abio_ind_end => marbl_tracer_indices%abio_dic%ind_end &
di14c_ind => marbl_tracer_indices%abio_di14c_ind &
)

interior_tendencies(abio_ind_beg:abio_ind_end, :) = c0
interior_tendencies(di14c_ind, :) = -c14_lambda * di14c(:)

call marbl_abio_dic_diagnostics_interior_tendency_compute(dic, di14c, interior_tendency_diags)
Expand Down
10 changes: 1 addition & 9 deletions src/marbl_abio_dic_surface_flux_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,9 @@ subroutine marbl_abio_dic_surface_flux_compute(&
ph_surf => saved_state%state(saved_state_ind%abio_dic_ph_surf)%field_2d, &
! Tracer indices
dic_ind => marbl_tracer_indices%abio_dic_ind, &
di14c_ind => marbl_tracer_indices%abio_di14c_ind, &
abio_ind_beg => marbl_tracer_indices%abio_dic%ind_beg, &
abio_ind_end => marbl_tracer_indices%abio_dic%ind_end &
di14c_ind => marbl_tracer_indices%abio_di14c_ind &
)

!-----------------------------------------------------------------------
! abio fluxes initially set to 0
!-----------------------------------------------------------------------

surface_fluxes(:,abio_ind_beg:abio_ind_end) = c0

!-----------------------------------------------------------------------
! Set C14 ratios
!-----------------------------------------------------------------------
Expand Down
10 changes: 1 addition & 9 deletions src/marbl_ciso_surface_flux_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,9 @@ subroutine marbl_ciso_surface_flux_compute(&
di13c_ind => marbl_tracer_indices%di13c_ind , &
do13ctot_ind => marbl_tracer_indices%do13ctot_ind , &
di14c_ind => marbl_tracer_indices%di14c_ind , &
do14ctot_ind => marbl_tracer_indices%do14ctot_ind , &
ciso_ind_beg => marbl_tracer_indices%ciso%ind_beg , &
ciso_ind_end => marbl_tracer_indices%ciso%ind_end &
do14ctot_ind => marbl_tracer_indices%do14ctot_ind &
)

!-----------------------------------------------------------------------
! ciso fluxes initially set to 0
!-----------------------------------------------------------------------

surface_fluxes(:,ciso_ind_beg:ciso_ind_end) = c0

!-----------------------------------------------------------------------
! initialize R13C_atm and R14C_atm
!-----------------------------------------------------------------------
Expand Down

0 comments on commit 0ce48a8

Please sign in to comment.