From effeeb8dc5b8b9e16e4a8ec4170a5cbe5243667f Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Thu, 9 May 2024 11:24:11 -0600 Subject: [PATCH] removed w3emc changes, this is fixed with a different method in an upcoming PR --- physics/GWD/cires_tauamf_data.F90 | 1 - .../UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 | 1 - .../GFS_time_vary_pre.scm.meta | 1 - .../UFS_SCM_NEPTUNE/iccninterp.F90 | 1 - .../Interstitials/UFS_SCM_NEPTUNE/sfcsub.F | 2 - physics/MP/Morrison_Gettelman/aerinterp.F90 | 1 - physics/photochem/h2ointerp.f90 | 1 - physics/w3emc_wrapper.F90 | 93 ------------------- 8 files changed, 101 deletions(-) delete mode 100644 physics/w3emc_wrapper.F90 diff --git a/physics/GWD/cires_tauamf_data.F90 b/physics/GWD/cires_tauamf_data.F90 index 0893d29ab..9f5b3dcb3 100644 --- a/physics/GWD/cires_tauamf_data.F90 +++ b/physics/GWD/cires_tauamf_data.F90 @@ -166,7 +166,6 @@ end subroutine tau_amf_interp subroutine gfs_idate_calendar(idate, fhour, ddd, fddd) use machine, only: kind_phys - use w3emc, only: w3movdat implicit none ! input integer, intent(in) :: idate(4) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 index 5308137cd..17cf09ca9 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 @@ -70,7 +70,6 @@ subroutine GFS_time_vary_pre_timestep_init (jdat, idat, dtp, nsswr, & julian, yearlen, ipt, lprnt, lssav, lsswr, lslwr, solhr, errmsg, errflg) use machine, only: kind_phys, kind_dbl_prec, kind_sngl_prec - use w3emc, only: w3difdat implicit none diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta index 51abbe8ef..6eb4d9c3a 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta @@ -3,7 +3,6 @@ type = scheme relative_path = ../../ dependencies = tools/funcphys.f90,hooks/machine.F -ay to get rid of all the warnings.):physics/GFS_time_vary_pre.scm.meta ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 index e089a070c..410d2daa4 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 @@ -130,7 +130,6 @@ SUBROUTINE ciinterpol(me,npts,IDATE,FHOUR,jindx1,jindx2,ddy, & ! USE MACHINE, ONLY : kind_phys use iccn_def - use w3emc, only: w3movdat implicit none integer i1,i2, iday,j,j1,j2,l,npts,nc,n1,n2,lev,k,i real(kind=kind_phys) fhour,temj, tx1, tx2,temi diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F index cf9e8e725..494b8f7dc 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F @@ -7082,7 +7082,6 @@ subroutine clima(lugb,iy,im,id,ih,fh,len,lsoil,slmskl,slmskw, & &, tile_num_ch, i_index, j_index) ! use machine , only : kind_io8,kind_io4 - use w3emc, only: w3movdat implicit none character(len=*), intent(in) :: tile_num_ch integer, intent(in) :: i_index(len), j_index(len) @@ -8612,7 +8611,6 @@ subroutine fixrda(lugb,fngrib,kpds5,slmask, & &, outlat, outlon, me) use machine , only : kind_io8,kind_dbl_prec,kind_sngl_prec use sfccyc_module, only : mdata - use w3emc, only: w3movdat implicit none integer nrepmx,nvalid,imo,iyr,idy,jret,ihr,nrept,lskip,lugi, & & lgrib,j,ndata,i,inttyp,jmax,imax,ijmax,ij,jday,len,iret, & diff --git a/physics/MP/Morrison_Gettelman/aerinterp.F90 b/physics/MP/Morrison_Gettelman/aerinterp.F90 index d5317caba..9bd896c2a 100644 --- a/physics/MP/Morrison_Gettelman/aerinterp.F90 +++ b/physics/MP/Morrison_Gettelman/aerinterp.F90 @@ -6,7 +6,6 @@ !! This module contain subroutines of reading and interpolating !! aerosol data for MG microphysics. module aerinterp - use w3emc, only: w3movdat implicit none private read_netfaer diff --git a/physics/photochem/h2ointerp.f90 b/physics/photochem/h2ointerp.f90 index dd1b5a2fe..c4fb355fc 100644 --- a/physics/photochem/h2ointerp.f90 +++ b/physics/photochem/h2ointerp.f90 @@ -133,7 +133,6 @@ subroutine h2ointerpol(me,npts,idate,fhour,jindx1,jindx2,h2oplout,ddy) ! use machine , only : kind_phys use h2o_def - use w3emc, only: w3movdat implicit none integer j,j1,j2,l,npts,nc,n1,n2 real(kind=kind_phys) fhour,tem, tx1, tx2 diff --git a/physics/w3emc_wrapper.F90 b/physics/w3emc_wrapper.F90 deleted file mode 100644 index e121cef6c..000000000 --- a/physics/w3emc_wrapper.F90 +++ /dev/null @@ -1,93 +0,0 @@ -!> \file w3emc_wrapper.f90 -!! Wrapper with generic interfaces for w3emc library to reduce warnings -! Modules wrap w3emc routines: -! - w3difdat: https://www.nco.ncep.noaa.gov/pmb/docs/libs/w3lib/w3difdat.html -! - w3movdat: https://www.nco.ncep.noaa.gov/pmb/docs/libs/w3lib/w3movdat.html -! -! Example of w3difdat: -! 1. w3emc module has w3difdat interface which calls w3difdat_wrapper -! 2. w3emc_wrapper has w3difdat_wrapper interface which calls true w3difdat -module w3emc_wrapper - use iso_fortran_env, only: real32, real64 - - interface w3difdat_wrapper - module procedure :: w3difdat32 - module procedure :: w3difdat64 - end interface w3difdat_wrapper - - interface w3movdat_wrapper - module procedure :: w3movdat32 - module procedure :: w3movdat64 - end interface w3movdat_wrapper - -contains - subroutine w3difdat32(jdat, idat, it, rinc) - integer, intent(in) :: jdat(8), idat(8), it - real(real32), intent(out) :: rinc(5) - call w3difdat(jdat, idat, it, rinc) - end subroutine w3difdat32 - - subroutine w3difdat64(jdat, idat, it, rinc) - integer, intent(in) :: jdat(8), idat(8), it - real(real64), intent(out) :: rinc(5) - call w3difdat(jdat, idat, it, rinc) - end subroutine w3difdat64 - - subroutine w3movdat32(rinc, idat, jdat) - real(real32), intent(in) :: rinc(5) - integer, intent(in) :: idat(8) - integer, intent(out) :: jdat(8) - call w3movdat(rinc, idat, jdat) - end subroutine w3movdat32 - - subroutine w3movdat64(rinc, idat, jdat) - real(real64), intent(in) :: rinc(5) - integer, intent(in) :: idat(8) - integer, intent(out) :: jdat(8) - call w3movdat(rinc, idat, jdat) - end subroutine w3movdat64 -end module w3emc_wrapper - -! Module to be loaded -module w3emc - use iso_fortran_env, only: real32, real64 - use w3emc_wrapper, only: w3difdat_wrapper, w3movdat_wrapper - implicit none - - interface w3difdat - module procedure :: w3difdat32 - module procedure :: w3difdat64 - end interface w3difdat - - interface w3movdat - module procedure :: w3movdat32 - module procedure :: w3movdat64 - end interface w3movdat - -contains - subroutine w3difdat32(jdat, idat, it, rinc) - integer, intent(in) :: jdat(8), idat(8), it - real(real32), intent(out) :: rinc(5) - call w3difdat_wrapper(jdat, idat, it, rinc) - end subroutine w3difdat32 - - subroutine w3difdat64(jdat, idat, it, rinc) - integer, intent(in) :: jdat(8), idat(8), it - real(real64), intent(out) :: rinc(5) - call w3difdat_wrapper(jdat, idat, it, rinc) - end subroutine w3difdat64 - - subroutine w3movdat32(rinc, idat, jdat) - real(real32), intent(in) :: rinc(5) - integer, intent(in) :: idat(8) - integer, intent(out) :: jdat(8) - call w3movdat_wrapper(rinc, idat, jdat) - end subroutine w3movdat32 - - subroutine w3movdat64(rinc, idat, jdat) - real(real64), intent(in) :: rinc(5) - integer, intent(in) :: idat(8) - integer, intent(out) :: jdat(8) - call w3movdat_wrapper(rinc, idat, jdat) - end subroutine w3movdat64 -end module w3emc