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

Update dtc/develop from NOAA-EMC dev/emc 2020/07/21 #16

Merged
merged 3 commits into from
Jul 21, 2020
Merged

Update dtc/develop from NOAA-EMC dev/emc 2020/07/21 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b108ed2
Add Tom's regional DA dycore fix (#26)
junwang-noaa Jul 14, 2020
7c4c21f
Merge branch 'dev/emc' of https://github.com/NOAA-EMC/GFDL_atmos_cube…
climbfuji Jul 21, 2020
4adaeaf
model/multi_gases.F90: add missing import statements
climbfuji Jul 21, 2020
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
2 changes: 1 addition & 1 deletion model/fv_control.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
636 changes: 289 additions & 347 deletions model/fv_regional_bc.F90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion model/multi_gases.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions tools/external_ic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---
Expand Down Expand Up @@ -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'
Expand Down
Loading