Skip to content

Dev/gfdl_test to dev/gfdl #205

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

Merged
laurenchilutti merged 1 commit into from
Aug 1, 2022
Merged

Dev/gfdl_test to dev/gfdl #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions tools/external_ic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module external_ic_mod
use tracer_manager_mod, only: get_tracer_names, get_number_tracers, get_tracer_index
use tracer_manager_mod, only: set_tracer_profile
use field_manager_mod, only: MODEL_ATMOS

use platform_mod, only: r4_kind, r8_kind
use constants_mod, only: pi=>pi_8, omega, grav, kappa, rdgas, rvgas, cp_air
use fv_arrays_mod, only: fv_atmos_type, fv_grid_type, fv_grid_bounds_type, R_GRID
use fv_diagnostics_mod,only: prt_maxmin, prt_gb_nh_sh, prt_height
Expand Down Expand Up @@ -1493,7 +1493,7 @@ subroutine get_ncep_ic( Atm, fv_domain, nq )
call ncep2fms(im, jm, lon, lat, wk2)
if( is_master() ) then
write(*,*) 'External_ic_mod: i_sst=', i_sst, ' j_sst=', j_sst
call pmaxmin( 'SST_ncep_fms', sst_ncep, i_sst, j_sst, 1.)
call pmaxmin( 'SST_ncep_fms', real(sst_ncep), i_sst, j_sst, 1.)
endif
#endif
endif !(read_ts)
Expand Down Expand Up @@ -2463,10 +2463,10 @@ subroutine get_fv_ic( Atm, fv_domain, nq )

! Share the load
if(is_master()) call pmaxmin( 'ZS_data', gz0, im, jm, 1./grav)
if(mpp_pe()==1) call pmaxmin( 'U_data', u0, im*jm, km, 1.)
if(mpp_pe()==1) call pmaxmin( 'V_data', v0, im*jm, km, 1.)
if(mpp_pe()==2) call pmaxmin( 'T_data', t0, im*jm, km, 1.)
if(mpp_pe()==3) call pmaxmin( 'DEL-P', dp0, im*jm, km, 0.01)
if(mpp_pe()==1) call pmaxmin( 'U_data', reshape(u0, (/ im*jm, km /)), im*jm, km, 1.)
if(mpp_pe()==1) call pmaxmin( 'V_data', reshape(v0, (/ im*jm, km /)), im*jm, km, 1.)
if(mpp_pe()==2) call pmaxmin( 'T_data', reshape(t0, (/ im*jm, km /)), im*jm, km, 1.)
if(mpp_pe()==3) call pmaxmin( 'DEL-P', reshape(dp0, (/ im*jm, km /)), im*jm, km, 0.01)
call close_file(Latlon_dyn)

else
Expand Down Expand Up @@ -2504,8 +2504,8 @@ subroutine get_fv_ic( Atm, fv_domain, nq )
deallocate ( u0 )
deallocate ( v0 )

if(mpp_pe()==4) call pmaxmin( 'UA', ua, im*jm, km, 1.)
if(mpp_pe()==4) call pmaxmin( 'VA', va, im*jm, km, 1.)
if(mpp_pe()==4) call pmaxmin( 'UA', reshape(ua, (/ im*jm, km /)), im*jm, km, 1.)
if(mpp_pe()==4) call pmaxmin( 'VA', reshape(va, (/ im*jm, km /)), im*jm, km, 1.)

do j=1,jm
do i=1,im
Expand Down Expand Up @@ -3903,8 +3903,6 @@ subroutine d2a3d(u, v, ua, va, im, jm, km, lon)

end subroutine d2a3d



subroutine pmaxmin( qname, a, im, jm, fac )

integer, intent(in):: im, jm
Expand Down Expand Up @@ -3940,7 +3938,7 @@ subroutine pmaxmin( qname, a, im, jm, fac )

end subroutine pmaxmin

subroutine pmaxmn(qname, q, is, ie, js, je, km, fac, area, domain)
subroutine pmaxmn(qname, q, is, ie, js, je, km, fac, area, domain)
character(len=*), intent(in):: qname
integer, intent(in):: is, ie, js, je
integer, intent(in):: km
Expand Down
4 changes: 2 additions & 2 deletions tools/fv_nudge.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ module fv_nwp_nudge_mod
use mpp_mod, only: mpp_error, FATAL, stdlog, get_unit, mpp_pe, input_nml_file
use mpp_domains_mod, only: mpp_update_domains, domain2d
use time_manager_mod, only: time_type, get_time, get_date
use platform_mod, only: r4_kind, r8_kind

use fv_grid_utils_mod, only: great_circle_dist, intp_great_circle
use fv_grid_utils_mod, only: latlon2xyz, vect_cross, normalize_vect
Expand Down Expand Up @@ -1522,7 +1523,7 @@ subroutine get_ncep_analysis ( ps, u, v, t, q, zvir, ts, nfile, fname, bd )
#ifndef DYCORE_SOLO
! Perform interp to FMS SST format/grid
call ncep2fms( wk1 )
if(master) call pmaxmin( 'SST_ncep', sst_ncep, i_sst, j_sst, 1.)
if(master) call pmaxmin( 'SST_ncep', real(sst_ncep), i_sst, j_sst, 1.)
! if(nfile/=1 .and. master) call pmaxmin( 'SST_anom', sst_anom, i_sst, j_sst, 1.)
#endif
deallocate ( wk1 )
Expand Down Expand Up @@ -3389,7 +3390,6 @@ logical function leap_year(ny)

end function leap_year


subroutine pmaxmin( qname, a, imax, jmax, fac )

character(len=*) qname
Expand Down