From a5c5ebfa556876c0e3e92880ce374d096bd2060e Mon Sep 17 00:00:00 2001 From: pjpegion Date: Tue, 7 May 2024 13:53:32 -0400 Subject: [PATCH] move call to read_da_inc outside if restart logic --- tools/fv_restart.F90 | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/fv_restart.F90 b/tools/fv_restart.F90 index a3291ba91..acc765686 100644 --- a/tools/fv_restart.F90 +++ b/tools/fv_restart.F90 @@ -365,19 +365,6 @@ subroutine fv_restart(fv_domain, Atm, seconds, days, cold_start, grid_type, this else if( is_master() ) write(*,*) 'Warm starting, calling fv_io_restart' call fv_io_read_restart(Atm(n)%domain_for_read,Atm(n:n)) - !====== PJP added DA functionality ====== - if (Atm(n)%flagstruct%read_increment) then - ! print point in middle of domain for a sanity check - i = (Atm(n)%bd%isc + Atm(n)%bd%iec)/2 - j = (Atm(n)%bd%jsc + Atm(n)%bd%jec)/2 - k = Atm(n)%npz/2 - if( is_master() ) write(*,*) 'Calling read_da_inc',Atm(n)%pt(i,j,k) - call read_da_inc(Atm(n), Atm(n)%domain, Atm(n)%bd, Atm(n)%npz, Atm(n)%ncnst, & - Atm(n)%u, Atm(n)%v, Atm(n)%q, Atm(n)%delp, Atm(n)%pt, Atm(n)%delz, isd, jsd, ied, jed, & - isc, jsc, iec, jec ) - if( is_master() ) write(*,*) 'Back from read_da_inc',Atm(n)%pt(i,j,k) - endif - !====== end PJP added DA functionailty====== endif seconds = 0; days = 0 ! Restart needs to be modified to record seconds and days. @@ -478,7 +465,19 @@ subroutine fv_restart(fv_domain, Atm, seconds, days, cold_start, grid_type, this endif !external_ic vs. restart vs. idealized - + !====== PJP added DA functionality ====== + if (Atm(n)%flagstruct%read_increment) then + ! print point in middle of domain for a sanity check + i = (Atm(n)%bd%isc + Atm(n)%bd%iec)/2 + j = (Atm(n)%bd%jsc + Atm(n)%bd%jec)/2 + k = Atm(n)%npz/2 + if( is_master() ) write(*,*) 'Calling read_da_inc',Atm(n)%pt(i,j,k) + call read_da_inc(Atm(n), Atm(n)%domain, Atm(n)%bd, Atm(n)%npz, Atm(n)%ncnst, & + Atm(n)%u, Atm(n)%v, Atm(n)%q, Atm(n)%delp, Atm(n)%pt, Atm(n)%delz, isd, jsd, ied, jed, & + isc, jsc, iec, jec ) + if( is_master() ) write(*,*) 'Back from read_da_inc',Atm(n)%pt(i,j,k) + endif + !====== end PJP added DA functionailty====== endif !n==this_grid