Merge pull request NCAR#7 from climbfuji/update_gsd_develop_from_dev_emc

Update gsd/develop from NOAA-EMC dev/emc
climbfuji · Aug 7, 2020 · e8896bc · e8896bc
2 parents 664d0dc + 3344224
commit e8896bc
Show file tree

Hide file tree

Showing 9 changed files with 296 additions and 6,527 deletions.
diff --git a/makefile b/makefile
@@ -23,7 +23,7 @@ endif
 
 LIBRARY  = libfv3core.a
 
-FFLAGS   += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io
+FFLAGS   += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io -I.
 
 SRCS_f   =
 

diff --git a/model/fv_control.F90 b/model/fv_control.F90
@@ -996,7 +996,7 @@ subroutine read_namelist_fv_grid_nml
        ! Read Main namelist
        read (f_unit,fv_grid_nml,iostat=ios)
        ierr = check_nml_error(ios,'fv_grid_nml')
-       rewind (f_unit)
+       call close_file (f_unit)
 #endif
        call write_version_number ( 'FV_CONTROL_MOD', version )
        unit = stdlog()

diff --git a/model/fv_regional_bc.F90 b/model/fv_regional_bc.F90
diff --git a/model/multi_gases.F90 b/model/multi_gases.F90
@@ -39,7 +39,7 @@ module multi_gases_mod
       use constants_mod,     only: rdgas, rvgas, cp_air
       use     fv_mp_mod,     only: is_master
       use mpp_mod,           only: stdlog, input_nml_file
-      use fms_mod,           only: check_nml_error
+      use fms_mod,           only: check_nml_error, open_namelist_file, close_file
 
 
       implicit none

diff --git a/tools/external_ic.F90 b/tools/external_ic.F90
@@ -577,7 +577,6 @@ subroutine get_nggps_ic (Atm, fv_domain, dt_atmos )
       call get_data_source(source,Atm%flagstruct%regional)
       if (trim(source) == source_fv3gfs) then
          call mpp_error(NOTE, "READING FROM REGRIDDED FV3GFS NEMSIO FILE")
-         levp = 65
       endif
 !
 !--- read in ak and bk from the gfs control file using fms_io read_data ---
@@ -810,15 +809,15 @@ subroutine get_nggps_ic (Atm, fv_domain, dt_atmos )
                    Atm%gridstruct%dxc, Atm%gridstruct%dyc, Atm%gridstruct%sin_sg, &
                    Atm%flagstruct%n_zs_filter, cnst_0p20*Atm%gridstruct%da_min, &
                    .false., oro_g, Atm%gridstruct%bounded_domain, &
-                    Atm%domain, Atm%bd)
+	           Atm%domain, Atm%bd)
             if ( is_master() ) write(*,*) 'Warning !!! del-2 terrain filter has been applied ', &
                    Atm%flagstruct%n_zs_filter, ' times'
           else if( Atm%flagstruct%nord_zs_filter == 4 ) then
             call del4_cubed_sphere(Atm%npx, Atm%npy, Atm%phis, Atm%gridstruct%area_64, &
                    Atm%gridstruct%dx, Atm%gridstruct%dy,   &
                    Atm%gridstruct%dxc, Atm%gridstruct%dyc, Atm%gridstruct%sin_sg, &
                    Atm%flagstruct%n_zs_filter, .false., oro_g, &
-                   Atm%gridstruct%bounded_domain, &
+	           Atm%gridstruct%bounded_domain, &
                    Atm%domain, Atm%bd)
             if ( is_master() ) write(*,*) 'Warning !!! del-4 terrain filter has been applied ', &
                    Atm%flagstruct%n_zs_filter, ' times'

diff --git a/tools/fv_diagnostics.F90 b/tools/fv_diagnostics.F90
@@ -1549,7 +1549,7 @@ subroutine fv_diag(Atm, zvir, Time, print_freq)
                           isc, iec, jsc, jec, 0, npz, 1.)
           call prt_maxmin('Bottom DZ (m)', Atm(n)%delz(isc:iec,jsc:jec,npz),    &
                           isc, iec, jsc, jec, 0, 1, 1.)
-!         call prt_maxmin('Top DZ (m)', Atm(n)%delz(is:ie,js:jec,1),    &
+!         call prt_maxmin('Top DZ (m)', Atm(n)%delz(isc:iec,jsc:jec,1),    &
 !                         isc, iec, jsc, jec, 0, 1, 1.)
         endif