Skip to content
Merged
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
12 changes: 11 additions & 1 deletion src/fabm/gotm_fabm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ module gotm_fabm
REALTYPE,allocatable,dimension(:),target :: par,pres,swr,k_par,z,nuh_ct

! External variables
REALTYPE :: dt,dt_eff ! External and internal time steps
REALTYPE, target :: dt,dt_eff ! External and internal time steps
integer :: w_adv_ctr ! Scheme for vertical advection (0 if not used)
REALTYPE,pointer,dimension(:) :: nuh,h,bioshade,w,rho
REALTYPE,pointer,dimension(:) :: SRelaxTau,sProf,salt
Expand All @@ -124,6 +124,7 @@ module gotm_fabm
REALTYPE,pointer :: I_0,A,g1,g2
integer,pointer :: yearday,secondsofday
REALTYPE, target :: decimal_yearday
REALTYPE, target :: decimal_year
logical :: fabm_ready

REALTYPE,pointer :: fabm_airp
Expand Down Expand Up @@ -836,6 +837,13 @@ subroutine init_gotm_fabm_state(nlev)

!-----------------------------------------------------------------------
!BOC

if ( model%variable_needs_values( standard_variables%calendar_year ) ) then
if ( associated(fabm_calendar_date) .and. associated(fabm_julianday) ) then
call model%link_scalar( standard_variables%calendar_year, decimal_year )
end if
end if

call fabm_check_ready(model)
fabm_ready = .true.

Expand Down Expand Up @@ -1032,6 +1040,7 @@ subroutine set_env_gotm_fabm(latitude,longitude,dt_,w_adv_method_,w_adv_ctr_,tem

! Calculate and save internal time step.
dt_eff = dt/split_factor
call model%link_scalar( standard_variables%maximum_time_step, dt_eff )

I_0 => I_0_
A => A_
Expand Down Expand Up @@ -1229,6 +1238,7 @@ subroutine do_gotm_fabm(nlev,itime)
do split=1,split_factor
if (has_date) then
call fabm_update_time(model, itime, yyyy, mm, dd, real(secondsofday, gotmrk))
decimal_year = real( yyyy, gotmrk )
else
call fabm_update_time(model, itime)
end if
Expand Down