Skip to content

Commit 1aae45b

Browse files
authored
Merge pull request #311 from GEOS-ESM/feature/bmauer/fixes-develop-#309
fixes #309
2 parents cd4f41f + 5455d2b commit 1aae45b

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

.circleci/config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
version: 2.1
22

33
# Anchors in case we need to override the defaults from the orb
4-
#baselibs_version: &baselibs_version v7.17.0
5-
#bcs_version: &bcs_version v11.3.0
6-
4+
#baselibs_version: &baselibs_version v7.27.0
5+
#bcs_version: &bcs_version v11.6.0
76

87
orbs:
9-
ci: geos-esm/circleci-tools@2
8+
ci: geos-esm/circleci-tools@4
109

1110
workflows:
1211
build-test:
@@ -17,7 +16,7 @@ workflows:
1716
- docker-hub-creds
1817
matrix:
1918
parameters:
20-
compiler: [ifort, gfortran]
19+
compiler: [gfortran, ifort]
2120
#baselibs_version: *baselibs_version
2221
repo: GEOSgcm
2322
checkout_fixture: true

interp_restarts.F90

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ program interp_restarts
4545

4646
real(ESMF_KIND_R8), allocatable :: r8_ak(:)
4747
real(ESMF_KIND_R8), allocatable :: r8_bk(:)
48-
real(ESMF_KIND_R8), allocatable :: r8_akbk(:)
4948

5049
real(ESMF_KIND_R4), pointer :: r4_local(:,:,:)
5150
real(ESMF_KIND_R8), pointer :: r8_local(:,:,:), pt_local(:,:,:)
@@ -276,7 +275,6 @@ program interp_restarts
276275
call set_eta(npz,ks,ptop,pint,r8_ak,r8_bk)
277276
FV_Atm(1)%ak = r8_ak
278277
FV_Atm(1)%bk = r8_bk
279-
deallocate ( r8_ak,r8_bk )
280278
nq = nmoist
281279
FV_Atm(1)%ncnst = nq/km
282280
if( is_master() ) then
@@ -468,12 +466,8 @@ program interp_restarts
468466

469467

470468
! AK and BK
471-
allocate ( r8_akbk(npz+1) )
472-
r8_akbk = FV_Atm(1)%ak
473-
if (AmWriter) call MAPL_VarWrite(OutFmt,"AK",r8_akbk)
474-
r8_akbk = FV_Atm(1)%bk
475-
if (AmWriter) call MAPL_VarWrite(OutFmt,"BK",r8_akbk)
476-
deallocate ( r8_akbk )
469+
if (AmWriter) call MAPL_VarWrite(OutFmt,"AK",r8_ak)
470+
if (AmWriter) call MAPL_VarWrite(OutFmt,"BK",r8_bk)
477471

478472
allocate(r8_local(is:ie,js:je,npz+1))
479473

0 commit comments

Comments
 (0)