Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for 4diau with iau_filter_increments=T #167

Merged
merged 5 commits into from
Feb 4, 2022
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix time interval for 3DIAU
  • Loading branch information
jswhit2 committed Jan 12, 2022
commit ddc90d1b51ff3500802ee0a392a6916154446d62
25 changes: 16 additions & 9 deletions tools/fv_iau_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ subroutine IAU_initialize (IPD_Control, IAU_Data,Init_parm)
allocate (iau_state%inc1%tracer_inc(is:ie, js:je, km,ntracers))
iau_state%hr1=IPD_Control%iaufhrs(1)
iau_state%wt = 1.0 ! IAU increment filter weights (default 1.0)
iau_state%wt_normfact = 1.0
if (IPD_Control%iau_filter_increments) then
! compute increment filter weights, sum to obtain normalization factor
dtp=IPD_control%dtp
Expand Down Expand Up @@ -305,17 +306,24 @@ subroutine getiauforcing(IPD_Control,IAU_Data)
return
endif

if (nfiles .eq. 1) then
t1 = IPD_Control%iaufhrs(1)-0.5*IPD_Control%iau_delthrs
t2 = IPD_Control%iaufhrs(1)+0.5*IPD_Control%iau_delthrs
else
t1 = IPD_Control%iaufhrs(1)
t2 = IPD_Control%iaufhrs(nfiles)
endif
if (IPD_Control%iau_filter_increments) then
! compute increment filter weight
! IPD_Control%iaufhrs(1) beginning of window, IPD_Control%iaufhrs(nfiles) end of window
! t1 isbeginning of window, t2 end of window
! IPD_Control%fhour current time
! in window kstep=-nstep,nstep (2*nstep+1 total)
! time step IPD_control%dtp
dtp=IPD_control%dtp
nstep = 0.5*IPD_Control%iau_delthrs*3600/dtp
! compute normalized filter weight
kstep = ((IPD_Control%fhour-IPD_Control%iaufhrs(1)) - 0.5*IPD_Control%iau_delthrs)*3600./dtp
if (IPD_Control%fhour >= IPD_Control%iaufhrs(1) .and. IPD_Control%fhour < IPD_Control%iaufhrs(nfiles)) then
kstep = ((IPD_Control%fhour-t1) - 0.5*IPD_Control%iau_delthrs)*3600./dtp
if (IPD_Control%fhour >= t1 .and. IPD_Control%fhour < t2) then
sx = acos(-1.)*kstep/nstep
wx = acos(-1.)*kstep/(nstep+1)
if (kstep .ne. 0) then
Expand All @@ -324,7 +332,7 @@ subroutine getiauforcing(IPD_Control,IAU_Data)
wt = 1.
endif
iau_state%wt = iau_state%wt_normfact*wt
if (is_master()) print *,'filter wt',kstep,IPD_Control%iaufhrs(1),IPD_Control%fhour,IPD_Control%iaufhrs(nfiles),iau_state%wt/iau_state%wt_normfact
!if (is_master()) print *,'kstep,t1,t,t2,filter wt=',kstep,t1,IPD_Control%fhour,t2,iau_state%wt/iau_state%wt_normfact
else
iau_state%wt = 0.
endif
Expand All @@ -333,23 +341,22 @@ subroutine getiauforcing(IPD_Control,IAU_Data)
if (nfiles.EQ.1) then
! on check to see if we are in the IAU window, no need to update the
! tendencies since they are fixed over the window
if (IPD_Control%fhour < IPD_Control%iaufhrs(1) .or. IPD_Control%fhour >= IPD_Control%iaufhrs(nfiles)) then
IAU_Data%in_interval=.false.
if (IPD_Control%fhour < t1 .or. IPD_Control%fhour >= t2) then
else
if (IPD_Control%iau_filter_increments) call setiauforcing(IPD_Control,IAU_Data,iau_state%wt)
if (is_master()) print *,'apply iau forcing',IPD_Control%iaufhrs(1),IPD_Control%fhour,IPD_Control%iaufhrs(nfiles)
if (is_master()) print *,'apply iau forcing t1,t,t2,filter wt=',t1,IPD_Control%fhour,t2,iau_state%wt/iau_state%wt_normfact
IAU_Data%in_interval=.true.
endif
return
endif

if (nfiles > 1) then
t2=2
if (IPD_Control%fhour < IPD_Control%iaufhrs(1) .or. IPD_Control%fhour >= IPD_Control%iaufhrs(nfiles)) then
if (IPD_Control%fhour < t1 .or. IPD_Control%fhour >= t2) then
! if (is_master()) print *,'no iau forcing',IPD_Control%iaufhrs(1),IPD_Control%fhour,IPD_Control%iaufhrs(nfiles)
IAU_Data%in_interval=.false.
else
if (is_master()) print *,'apply iau forcing',IPD_Control%iaufhrs(1),IPD_Control%fhour,IPD_Control%iaufhrs(nfiles)
if (is_master()) print *,'apply iau forcing t1,t,t2,filter wt=',t1,IPD_Control%fhour,t2,iau_state%wt/iau_state%wt_normfact
IAU_Data%in_interval=.true.
do k=nfiles,1,-1
if (IPD_Control%iaufhrs(k) > IPD_Control%fhour) then
Expand Down