diff --git a/src/marbl_interface.F90 b/src/marbl_interface.F90 index e869a821..5af36629 100644 --- a/src/marbl_interface.F90 +++ b/src/marbl_interface.F90 @@ -997,7 +997,7 @@ subroutine interior_tendency_compute(this) zooplankton_local = this%zooplankton_local, & zooplankton_share = this%zooplankton_share, & saved_state = this%interior_tendency_saved_state, & - output_for_gcm = this%interior_tendency_output, & + interior_tendency_output = this%interior_tendency_output, & marbl_timers = this%timers, & interior_tendency_share = this%interior_tendency_share, & marbl_particulate_share = this%particulate_share, & @@ -1047,7 +1047,7 @@ subroutine surface_flux_compute(this) marbl_tracer_indices = this%tracer_indices, & saved_state = this%surface_flux_saved_state, & saved_state_ind = this%surf_state_ind, & - output_for_gcm = this%surface_flux_output, & + surface_flux_output = this%surface_flux_output, & surface_flux_internal = this%surface_flux_internal, & surface_flux_share = this%surface_flux_share, & surface_flux_diags = this%surface_flux_diags, & diff --git a/src/marbl_interior_tendency_mod.F90 b/src/marbl_interior_tendency_mod.F90 index 0a7590af..a9ace9a4 100644 --- a/src/marbl_interior_tendency_mod.F90 +++ b/src/marbl_interior_tendency_mod.F90 @@ -115,7 +115,7 @@ subroutine marbl_interior_tendency_compute( & zooplankton_local, & zooplankton_share, & saved_state, & - output_for_gcm, & + interior_tendency_output, & marbl_timers, & interior_tendency_share, & marbl_particulate_share, & @@ -163,7 +163,7 @@ subroutine marbl_interior_tendency_compute( & type(zooplankton_local_type), intent(inout) :: zooplankton_local type(zooplankton_share_type), intent(inout) :: zooplankton_share type(marbl_saved_state_type), intent(inout) :: saved_state - type(marbl_output_for_GCM_type), intent(inout) :: output_for_gcm + type(marbl_output_for_GCM_type), intent(inout) :: interior_tendency_output type(marbl_internal_timers_type), intent(inout) :: marbl_timers type(marbl_interior_tendency_share_type), intent(inout) :: interior_tendency_share type(marbl_particulate_share_type), intent(inout) :: marbl_particulate_share @@ -277,10 +277,10 @@ subroutine marbl_interior_tendency_compute( & !----------------------------------------------------------------------- if (ofg_ind%total_Chl_id.ne.0) then - output_for_gcm%outputs_for_GCM(ofg_ind%total_Chl_id)%forcing_field_1d(1,:) = c0 + interior_tendency_output%outputs_for_GCM(ofg_ind%total_Chl_id)%forcing_field_1d(1,:) = c0 do auto_ind = 1,autotroph_cnt - output_for_gcm%outputs_for_GCM(ofg_ind%total_Chl_id)%forcing_field_1d(1,:) = & - output_for_gcm%outputs_for_GCM(ofg_ind%total_Chl_id)%forcing_field_1d(1,:) & + interior_tendency_output%outputs_for_GCM(ofg_ind%total_Chl_id)%forcing_field_1d(1,:) = & + interior_tendency_output%outputs_for_GCM(ofg_ind%total_Chl_id)%forcing_field_1d(1,:) & + tracer_local(marbl_tracer_indices%auto_inds(auto_ind)%Chl_ind,:) end do end if diff --git a/src/marbl_surface_flux_mod.F90 b/src/marbl_surface_flux_mod.F90 index c29c9055..8190b8cf 100644 --- a/src/marbl_surface_flux_mod.F90 +++ b/src/marbl_surface_flux_mod.F90 @@ -65,7 +65,7 @@ subroutine marbl_surface_flux_compute( & marbl_tracer_indices, & saved_state, & saved_state_ind, & - output_for_gcm, & + surface_flux_output, & surface_flux_internal, & surface_flux_share, & surface_flux_diags, & @@ -106,7 +106,7 @@ subroutine marbl_surface_flux_compute( & type(marbl_saved_state_type) , intent(inout) :: saved_state type(marbl_surface_flux_saved_state_indexing_type), intent(in) :: saved_state_ind type(marbl_surface_flux_internal_type) , intent(inout) :: surface_flux_internal - type(marbl_output_for_GCM_type) , intent(inout) :: output_for_gcm + type(marbl_output_for_GCM_type) , intent(inout) :: surface_flux_output type(marbl_surface_flux_share_type) , intent(inout) :: surface_flux_share type(marbl_diagnostics_type) , intent(inout) :: surface_flux_diags type(co2calc_coeffs_type) , intent(inout) :: co2calc_coeffs @@ -245,7 +245,7 @@ subroutine marbl_surface_flux_compute( & totalChl_loc = totalChl_loc + & max(c0, tracers_at_surface(:,marbl_tracer_indices%auto_inds(auto_ind)%Chl_ind)) end do - output_for_gcm%outputs_for_GCM(ofg_ind%total_surfChl_id)%forcing_field_0d(:) = totalChl_loc + surface_flux_output%outputs_for_GCM(ofg_ind%total_surfChl_id)%forcing_field_0d(:) = totalChl_loc end if !----------------------------------------------------------------------- @@ -262,7 +262,7 @@ subroutine marbl_surface_flux_compute( & flux_o2_loc(:) = pv_o2(:) * (o2sat(:) - tracers_at_surface(:, o2_ind)) surface_fluxes(:, o2_ind) = surface_fluxes(:, o2_ind) + flux_o2_loc(:) if (ofg_ind%flux_o2_id.ne.0) then - output_for_gcm%outputs_for_GCM(ofg_ind%flux_o2_id)%forcing_field_0d(:) = flux_o2_loc + surface_flux_output%outputs_for_GCM(ofg_ind%flux_o2_id)%forcing_field_0d(:) = flux_o2_loc end if else schmidt_o2(:) = c0 @@ -325,7 +325,7 @@ subroutine marbl_surface_flux_compute( & flux_co2(:) = pv_co2(:) * dco2star(:) if (ofg_ind%flux_co2_id.ne.0) then - output_for_gcm%outputs_for_GCM(ofg_ind%flux_co2_id)%forcing_field_0d(:) = flux_co2 + surface_flux_output%outputs_for_GCM(ofg_ind%flux_co2_id)%forcing_field_0d(:) = flux_co2 end if !------------------------------------------------------------------- @@ -409,7 +409,7 @@ subroutine marbl_surface_flux_compute( & nhx_surface_emis = nhx_surface_emis) if (ofg_ind%flux_nhx_id.ne.0) then - output_for_gcm%outputs_for_GCM(ofg_ind%flux_nhx_id)%forcing_field_0d(:) = nhx_surface_emis + surface_flux_output%outputs_for_GCM(ofg_ind%flux_nhx_id)%forcing_field_0d(:) = nhx_surface_emis end if surface_fluxes(:, nh4_ind) = surface_fluxes(:, nh4_ind) - nhx_surface_emis(:)