Merge pull request #315 from GEOS-ESM/develop

Author: mathomp4

.circleci/config.yml

@@ -1,12 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.17.0
-#bcs_version: &bcs_version v11.3.0
-
+#baselibs_version: &baselibs_version v7.27.0
+#bcs_version: &bcs_version v11.6.0
 
 orbs:
-  ci: geos-esm/circleci-tools@2
+  ci: geos-esm/circleci-tools@4
 
 workflows:
   build-test:
@@ -17,7 +16,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [ifort, gfortran]
+              compiler: [gfortran, ifort]
           #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true

interp_restarts.F90

@@ -45,7 +45,6 @@ program interp_restarts
 
    real(ESMF_KIND_R8), allocatable :: r8_ak(:)
    real(ESMF_KIND_R8), allocatable :: r8_bk(:)
-   real(ESMF_KIND_R8), allocatable :: r8_akbk(:)
 
    real(ESMF_KIND_R4), pointer :: r4_local(:,:,:)
    real(ESMF_KIND_R8), pointer :: r8_local(:,:,:), pt_local(:,:,:)
@@ -276,7 +275,6 @@ program interp_restarts
    call set_eta(npz,ks,ptop,pint,r8_ak,r8_bk)
    FV_Atm(1)%ak = r8_ak
    FV_Atm(1)%bk = r8_bk
-   deallocate ( r8_ak,r8_bk )
    nq = nmoist
    FV_Atm(1)%ncnst = nq/km
    if( is_master() ) then
@@ -468,12 +466,8 @@ program interp_restarts
 
 
 ! AK and BK
-      allocate ( r8_akbk(npz+1) )
-      r8_akbk = FV_Atm(1)%ak
-      if (AmWriter) call MAPL_VarWrite(OutFmt,"AK",r8_akbk)
-      r8_akbk = FV_Atm(1)%bk
-      if (AmWriter) call MAPL_VarWrite(OutFmt,"BK",r8_akbk)
-      deallocate ( r8_akbk )
+      if (AmWriter) call MAPL_VarWrite(OutFmt,"AK",r8_ak)
+      if (AmWriter) call MAPL_VarWrite(OutFmt,"BK",r8_bk)
 
       allocate(r8_local(is:ie,js:je,npz+1))
 

scripts/fv3.j

@@ -124,8 +124,8 @@ endif
 #######################################################################
 
 setenv GEOSDIR @GEOSDIR
-setenv GEOSBIN @GEOSBIN
-setenv GEOSETC @GEOSETC
+setenv GEOSBIN ${GEOSDIR}/bin
+setenv GEOSETC ${GEOSDIR}/etc
 
 set TAG = `cat $GEOSETC/.FV3_VERSION`
 set RUN_CMD = "$GEOSBIN/esma_mpirun -np "

scripts/fv3_setup

@@ -637,15 +637,8 @@ echo $EXPDIRroot > $HOME/.EXPDIRroot
 #######################################################################
 
 set     GEOSDIR  = $GEOSDEF
-
-#
-# GEOSBIN does point to the bin/ directory in each
-#
 setenv GEOSSRC  ${GEOSDIR}
 setenv GEOSBIN  ${GEOSDIR}/bin
-setenv GEOSETC  ${GEOSDIR}/etc
-
-setenv GEOSUTIL ${GEOSSRC}
 
 #######################################################################
 #                    Check for Group ID Sponsor Code
@@ -831,10 +824,6 @@ s?@BATCH_OUTPUTNAME?$BATCH_OUTPUTNAME?g
 s?@BATCH_JOINOUTERR?$BATCH_JOINOUTERR?g
 s?@SITE?$SITE?g
 s?@GEOSDIR?$GEOSDIR?g
-s?@GEOSSRC?$GEOSSRC?g
-s?@GEOSBIN?$GEOSBIN?g
-s?@GEOSETC?$GEOSETC?g
-s?@GEOSUTIL?$GEOSUTIL?g
 s?@SINGULARITY_BUILD?$SINGULARITY_BUILD?g
 s?@NATIVE_BUILD?$NATIVE_BUILD?g
 s?@SINGULARITY_SANDBOX?$SINGULARITY_SANDBOX?g