diff --git a/ccpp/physics b/ccpp/physics index 881ee0d91..14f24dbb0 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 881ee0d91c44a8cff6a8eff4c59a134f93b90df1 +Subproject commit 14f24dbb091551a13b9a0d611c84e777e8f820be diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index 1c6732030..b0a1b0957 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 1c6732030b5bc8dd77347bb639952ff123b808ad +Subproject commit b0a1b0957d3b79d642f3c01e5cd9441936c7c832 diff --git a/fv3/module_fcst_grid_comp.F90 b/fv3/module_fcst_grid_comp.F90 index 278f2c2af..411c65bc2 100644 --- a/fv3/module_fcst_grid_comp.F90 +++ b/fv3/module_fcst_grid_comp.F90 @@ -575,7 +575,7 @@ subroutine fcst_initialize(fcst_comp, importState, exportState, clock, rc) character(8) :: bundle_grid - real(kind=8) :: mpi_wtime, timeis + real(kind=8) :: timeis type(ESMF_DELayout) :: delayout type(ESMF_DistGrid) :: distgrid @@ -1323,7 +1323,7 @@ subroutine fcst_run_phase_1(fcst_comp, importState, exportState,clock,rc) integer,save :: dt_cap=0 type(ESMF_Time) :: currTime,stopTime integer :: seconds - real(kind=8) :: mpi_wtime, tbeg1 + real(kind=8) :: tbeg1 ! !----------------------------------------------------------------------- !*********************************************************************** @@ -1390,7 +1390,7 @@ subroutine fcst_run_phase_2(fcst_comp, importState, exportState,clock,rc) integer :: date(6), seconds character(len=64) :: timestamp integer :: unit - real(kind=8) :: mpi_wtime, tbeg1 + real(kind=8) :: tbeg1 ! integer :: FBCount, i logical :: isPresent @@ -1498,7 +1498,7 @@ subroutine fcst_finalize(fcst_comp, importState, exportState,clock,rc) ! integer :: unit integer,dimension(6) :: date - real(kind=8) :: mpi_wtime, tbeg1 + real(kind=8) :: tbeg1 ! !----------------------------------------------------------------------- !*********************************************************************** diff --git a/io/module_wrt_grid_comp.F90 b/io/module_wrt_grid_comp.F90 index 3f4911d22..42ba407d2 100644 --- a/io/module_wrt_grid_comp.F90 +++ b/io/module_wrt_grid_comp.F90 @@ -1724,7 +1724,6 @@ subroutine wrt_run(wrt_comp, imp_state_write, exp_state_write,clock,rc) real(ESMF_KIND_R8) :: geo_lon, geo_lat real(ESMF_KIND_R8), parameter :: rtod=180.0/pi - real(kind=8) :: MPI_Wtime real(kind=8) :: tbeg real(kind=8) :: wbeg,wend diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 157e247a4..65d5a5176 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -46,6 +46,7 @@ subroutine post_run_fv3(wrt_int_state,grid_id,mype,mpicomp,lead_write, & lonstart,lonlast use grib2_module, only : gribit2,num_pset,nrecout,first_grbtbl use xml_perl_data,only : paramset + use post_nems_routines ! !----------------------------------------------------------------------- ! diff --git a/io/post_nems_routines.F90 b/io/post_nems_routines.F90 index 337139b1d..a7c218417 100644 --- a/io/post_nems_routines.F90 +++ b/io/post_nems_routines.F90 @@ -1,3 +1,7 @@ +module post_nems_routines + implicit none + contains + !----------------------------------------------------------------------- !%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% !----------------------------------------------------------------------- @@ -357,3 +361,5 @@ subroutine post_finalize(post_gribversion) ! end subroutine post_finalize +end module post_nems_routines + diff --git a/tests/test_post_nems_routines.F90 b/tests/test_post_nems_routines.F90 index 371c3bc8d..bf4dffd2b 100644 --- a/tests/test_post_nems_routines.F90 +++ b/tests/test_post_nems_routines.F90 @@ -5,6 +5,7 @@ program test_post_nems_routines use ctlblk_mod, only : komax,hyb_sigp,d3d_on,gocart_on, & rdaod,nasa_on,gccpp_on,d2d_chem,modelname,submodelname, lsm + use post_nems_routines implicit none diff --git a/ufsatm_cap.F90 b/ufsatm_cap.F90 index 0c9f0e6eb..a2e7ed727 100644 --- a/ufsatm_cap.F90 +++ b/ufsatm_cap.F90 @@ -193,6 +193,7 @@ subroutine InitializeAdvertise(gcomp, rc) use pio, only: PIO_IOTYPE_NETCDF, PIO_IOTYPE_PNETCDF use pio, only: PIO_IOTYPE_NETCDF4C, PIO_IOTYPE_NETCDF4P #endif + use mpi_f08, only: MPI_Wtime type(ESMF_GridComp) :: gcomp integer, intent(out) :: rc @@ -232,7 +233,7 @@ subroutine InitializeAdvertise(gcomp, rc) type(ESMF_Field), allocatable :: fieldList(:) character(len=*),parameter :: subname='(ufsatm_cap:InitializeAdvertise)' - real(kind=8) :: MPI_Wtime, timeis, timerhs, time_rh_fb_start, time_rh_start + real(kind=8) :: timeis, timerhs, time_rh_fb_start, time_rh_start integer :: wrttasks_per_group_from_parent, wrtLocalPet, num_threads character(len=64) :: rh_filename @@ -1330,6 +1331,8 @@ subroutine OutputHours_ArrayInput(noutput_fh,output_startfh) end subroutine OutputHours_ArrayInput subroutine InitializeRealize(gcomp, rc) + use mpi_f08, only : MPI_Wtime + type(ESMF_GridComp) :: gcomp integer, intent(out) :: rc @@ -1339,7 +1342,7 @@ subroutine InitializeRealize(gcomp, rc) type(ESMF_State) :: importState, exportState integer :: urc - real(8) :: MPI_Wtime, timeirs + real(8) :: timeirs rc = ESMF_SUCCESS timeirs = MPI_Wtime() @@ -1367,10 +1370,12 @@ end subroutine InitializeRealize !----------------------------------------------------------------------------- subroutine ModelAdvance(gcomp, rc) + + use mpi_f08, only : MPI_Wtime type(ESMF_GridComp) :: gcomp integer, intent(out) :: rc - real(kind=8) :: MPI_Wtime, timers + real(kind=8) :: timers !----------------------------------------------------------------------------- @@ -1396,6 +1401,8 @@ end subroutine ModelAdvance !----------------------------------------------------------------------------- subroutine ModelAdvance_phase1(gcomp, rc) + use mpi_f08, only : MPI_Wtime + type(ESMF_GridComp) :: gcomp integer, intent(out) :: rc @@ -1405,7 +1412,7 @@ subroutine ModelAdvance_phase1(gcomp, rc) logical :: fcstpe character(len=*),parameter :: subname='(ufsatm_cap:ModelAdvance_phase1)' character(240) :: msgString - real(kind=8) :: MPI_Wtime, timep1rs, timep1re + real(kind=8) :: timep1rs, timep1re !----------------------------------------------------------------------------- @@ -1451,6 +1458,8 @@ end subroutine ModelAdvance_phase1 !----------------------------------------------------------------------------- subroutine ModelAdvance_phase2(gcomp, rc) + use mpi_f08, only : MPI_Wtime + type(ESMF_GridComp) :: gcomp integer, intent(out) :: rc @@ -1470,7 +1479,7 @@ subroutine ModelAdvance_phase2(gcomp, rc) type(ESMF_Clock) :: clock, clock_out integer :: fieldCount - real(kind=8) :: MPI_Wtime, timep2rs + real(kind=8) :: timep2rs character(len=ESMF_MAXSTR) :: fb_name type(ESMF_Info) :: info @@ -1767,6 +1776,7 @@ end subroutine TimestampExport_phase1 !----------------------------------------------------------------------------- subroutine ModelFinalize(gcomp, rc) + use mpi_f08, only : MPI_Wtime ! input arguments type(ESMF_GridComp) :: gcomp @@ -1776,7 +1786,7 @@ subroutine ModelFinalize(gcomp, rc) character(len=*),parameter :: subname='(ufsatm_cap:ModelFinalize)' integer :: i, urc type(ESMF_VM) :: vm - real(kind=8) :: MPI_Wtime, timeffs + real(kind=8) :: timeffs ! !----------------------------------------------------------------------------- !*** finialize forecast