Skip to content

Rearrange allocation of hgt_1d in mtnlm7_oclsm.f to fix errors on MacOS #245

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

Merged
JeffBeck-NOAA merged 2 commits into from
Feb 1, 2021
Merged

Rearrange allocation of hgt_1d in mtnlm7_oclsm.f to fix errors on MacOS #245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72f60dc
Rearrange allocation of hgt_1d in mtnlm7_oclsm.f to fix errors on MacOS
mkavulich Jan 22, 2021
50f97df
Add matching deallocate statement, fix subroutine name in comment
mkavulich Jan 25, 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
7 changes: 4 additions & 3 deletions sorc/orog_mask_tools.fd/orog.fd/mtnlm7_oclsm.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,7 @@ SUBROUTINE MAKEMT2(ZAVG,ZSLM,ORO,SLM,land_frac,VAR,VAR4,
implicit none
real, parameter :: D2R = 3.14159265358979/180.
integer, parameter :: MAXSUM=20000000
real hgt_1d(MAXSUM)
real, dimension(:), allocatable :: hgt_1d
integer IM, JM, IMN, JMN
real GLAT(JMN), GLON(IMN)
INTEGER ZAVG(IMN,JMN),ZSLM(IMN,JMN)
Expand All @@ -1806,6 +1806,7 @@ SUBROUTINE MAKEMT2(ZAVG,ZSLM,ORO,SLM,land_frac,VAR,VAR4,
! --- mskocn=1 Use ocean model sea land mask, OK and present,
! --- mskocn=0 dont use Ocean model sea land mask, not OK, not present
print *,' _____ SUBROUTINE MAKEMT2 '
allocate(hgt_1d(MAXSUM))
C---- GLOBAL XLAT AND XLON ( DEGREE )
C
JM1 = JM - 1
Expand Down Expand Up @@ -1901,9 +1902,9 @@ SUBROUTINE MAKEMT2(ZAVG,ZSLM,ORO,SLM,land_frac,VAR,VAR4,
ENDDO
ENDDO
!$omp end parallel do
WRITE(6,*) "! MAKEMT ORO SLM VAR VAR4 DONE"
WRITE(6,*) "! MAKEMT2 ORO SLM VAR VAR4 DONE"
C

deallocate(hgt_1d)
RETURN
END

Expand Down