Skip to content

Commit

Permalink
merge of minor updates from GFDL Weather and Climate Dynamics Divisio…
Browse files Browse the repository at this point in the history
…n (20210804) (NOAA-EMC#127)

* output conversion error warning in debug mode w/ Intel
* incorrect argument to mpp_max in fv_restart.F90 affecting nesting
  • Loading branch information
bensonr authored Aug 4, 2021
1 parent 0b2491a commit bfe7847
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions tools/fv_grid_tools.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1116,10 +1116,11 @@ subroutine init_grid(Atm, grid_name, grid_file, npx, npy, npz, ndims, nregions,
write(*,*) ' Radius is ', radius, ', omega is ', omega, ' small_fac = ', small_fac
write(*,* ) ' Cubed-Sphere Grid Stats : ', npx,'x',npy,'x',nregions
print*, dxN, dxM, dxAV, dxN, dxM
write(*,201) ' Grid Length : min: ', dxN,' max: ', dxM,' avg: ', dxAV, ' min/max: ',dxN/dxM
write(*,200) ' Deviation from Orthogonal : min: ',angN,' max: ',angM,' avg: ',angAV
write(*,200) ' Aspect Ratio : min: ',aspN,' max: ',aspM,' avg: ',aspAV
write(*,'(A,f11.2,A,f11.2,A,f11.2,A,f11.2)') ' Grid Length : min: ', dxN,' max: ', dxM,' avg: ', dxAV, ' min/max: ',dxN/dxM
write(*,'(A,e21.14,A,e21.14,A,e21.14)') ' Deviation from Orthogonal : min: ',angN,' max: ',angM,' avg: ',angAV
write(*,'(A,e21.14,A,e21.14,A,e21.14)') ' Aspect Ratio : min: ',aspN,' max: ',aspM,' avg: ',aspAV
write(*,* ) ''

endif
endif!if gridtype > 3

Expand Down Expand Up @@ -1562,7 +1563,7 @@ subroutine setup_orthogonal_grid(npx, npy, bd, grid_file)
write(*,210) ' GLOBAL AREA (m*m):', globalarea
write(*,* ) ''

201 format(A,f9.2,A,f9.2,A,f9.2,A,f9.2)
201 format(A,f11.2,A,f11.2,A,f11.2,A,f11.2)
209 format(A,e21.14,A,e21.14)
210 format(A,e21.14)

Expand Down
2 changes: 1 addition & 1 deletion tools/fv_restart.F90
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ subroutine fv_restart(fv_domain, Atm, dt_atmos, seconds, days, cold_start, grid_
if (.not. allocated (global_pelist)) allocate(global_pelist(mpp_npes()))

call mpp_get_current_pelist(global_pelist)
call mpp_max(BC_remap_level,ntileme,global_pelist)
call mpp_max(BC_remap_level,Atm(this_grid)%neststruct%num_nest_level,global_pelist)
call mpp_set_current_pelist(pelist)

do nest_level=1,Atm(this_grid)%neststruct%num_nest_level
Expand Down

0 comments on commit bfe7847

Please sign in to comment.