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.

Sign up for GitHub

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

non-sense change to satisfy odd compiler behavior #48

Merged
merged 2 commits into from
Jul 21, 2021
Merged

non-sense change to satisfy odd compiler behavior #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8e3e2f
non-sense change to satisfy odd compiler behavior
rtodling Jul 20, 2021
bce450e
Merge branch 'develop' into feature/rtodling/change_due2odd_compiler_bug
mathomp4 Jul 21, 2021
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
39 changes: 23 additions & 16 deletions GEOSaana_GridComp/GEOSgsi_Coupler/geos_StateIO.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,41 +1188,41 @@ subroutine gcm2gsi1_ ( xpert, xx, sg, GSI_xGrid, stat )
i_ph = MAPL_SimpleBundleGetIndex ( xpert, 'phis' , 2, rc=status )
if (i_u>0.and.i_v>0) then
allocate(sub_u(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_u)%qr4 , sub_u , ierr )
call pert2gsi_ ( xpert%r3(i_u)%qr4 , sg, sub_u , ierr )
allocate(sub_v(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_v)%qr4 , sub_v , ierr )
call pert2gsi_ ( xpert%r3(i_v)%qr4 , sg, sub_v , ierr )
endif
if (i_t>0) then
allocate(sub_tv(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_t)%qr4 , sub_tv , ierr )
call pert2gsi_ ( xpert%r3(i_t)%qr4 , sg, sub_tv , ierr )
endif
if (i_q>0) then
allocate(sub_q(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_q)%qr4 , sub_q , ierr )
call pert2gsi_ ( xpert%r3(i_q)%qr4 , sg, sub_q , ierr )
endif
if (i_oz>0) then
allocate(sub_oz(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_oz)%qr4, sub_oz , ierr )
call pert2gsi_ ( xpert%r3(i_oz)%qr4, sg, sub_oz , ierr )
endif
if (i_cl>0) then
allocate(sub_cl(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_cl)%qr4, sub_cl , ierr )
call pert2gsi_ ( xpert%r3(i_cl)%qr4, sg, sub_cl , ierr )
endif
if (i_ci>0) then
allocate(sub_ci(sg%lat2,sg%lon2,nsig), stat=ierr )
call pert2gsi_ ( xpert%r3(i_ci)%qr4, sub_ci , ierr )
call pert2gsi_ ( xpert%r3(i_ci)%qr4, sg, sub_ci , ierr )
endif
if (i_ps>0) then
allocate(sub_ps(sg%lat2,sg%lon2))
call pert2gsi2d_ ( xpert%r2(i_ps)%qr4, sub_ps, ierr )
call pert2gsi2d_ ( xpert%r2(i_ps)%qr4, sg, sub_ps, ierr )
endif
if (i_ph>0) then
allocate(sub_ph(sg%lat2,sg%lon2))
call pert2gsi2d_ ( xpert%r2(i_ph)%qr4, sub_ph, ierr )
call pert2gsi2d_ ( xpert%r2(i_ph)%qr4, sg, sub_ph, ierr )
endif
if (i_ts>0) then
allocate(sub_ts(sg%lat2,sg%lon2))
call pert2gsi2d_ ( xpert%r2(i_ts)%qr4, sub_ts, ierr )
call pert2gsi2d_ ( xpert%r2(i_ts)%qr4, sg, sub_ts, ierr )
endif
if ( ierr/=0 ) then
stat = 99
Expand Down Expand Up @@ -1340,7 +1340,7 @@ subroutine gcm2gsi1_ ( xpert, xx, sg, GSI_xGrid, stat )
if(mype==ROOT) print*, trim(myname_), ': Alloc(sub_cr)'
return
end if
call pert2gsi_ ( xpert%r3(j_cr)%qr4, sub_cr , ierr )
call pert2gsi_ ( xpert%r3(j_cr)%qr4, sg, sub_cr , ierr )
endif
if (i_cr>0) then ! present in xpert
do k=1,nsig
Expand All @@ -1364,7 +1364,7 @@ subroutine gcm2gsi1_ ( xpert, xx, sg, GSI_xGrid, stat )
if(mype==ROOT) print*, trim(myname_), ': Alloc(sub_cs)'
return
end if
call pert2gsi_ ( xpert%r3(j_cs)%qr4, sub_cs , ierr )
call pert2gsi_ ( xpert%r3(j_cs)%qr4, sg, sub_cs , ierr )
endif
if (i_cs>0) then ! present in xpert
do k=1,nsig
Expand Down Expand Up @@ -1423,11 +1423,15 @@ subroutine gcm2gsi1_ ( xpert, xx, sg, GSI_xGrid, stat )
if(allocated(sub_cl)) deallocate(sub_cl)
if(allocated(sub_ci)) deallocate(sub_ci)

CONTAINS
end subroutine gcm2gsi1_
! CONTAINS

subroutine pert2gsi2d_ ( fld, sub, stat_ )
subroutine pert2gsi2d_ ( fld, sg, sub, stat_ )

use general_sub2grid_mod, only: sub2grid_info
implicit none
real(4), intent(in) :: fld(:,:)
type(sub2grid_info),intent(in) :: sg ! subdomain grid
real(r_kind), intent(out) :: sub(:,:)
integer(i_kind),intent(out) :: stat_

Expand All @@ -1448,9 +1452,12 @@ subroutine pert2gsi2d_ ( fld, sub, stat_ )
call timer_fnl('pert2gsi_')
end subroutine pert2gsi2d_

subroutine pert2gsi_ ( fld, sub, stat_ )
subroutine pert2gsi_ ( fld, sg, sub, stat_ )

use general_sub2grid_mod, only: sub2grid_info
implicit none
real(4), intent(in) :: fld(:,:,:)
type(sub2grid_info), intent(in) :: sg ! subdomain grid
real(r_kind), intent(out) :: sub(:,:,:)
integer(i_kind),intent(out) :: stat_

Expand Down Expand Up @@ -1479,7 +1486,7 @@ subroutine pert2gsi_ ( fld, sub, stat_ )
call timer_fnl('pert2gsi_')
end subroutine pert2gsi_

end subroutine gcm2gsi1_
! end subroutine gcm2gsi1_

!------ BELOW THIS POINT: Routines of general (internal-only) use --------

Expand Down