Skip to content

Commit

Permalink
grib1 cleanup (NOAA-EMC#410)
Browse files Browse the repository at this point in the history
* remove grib1 control files from parm/

* Cleanup grib1 RQSTFLD.F, remove READCNTRL.f, INITPOST_NEMS.f, INITPOST_GFS_NEMS.f, INITPOST_GFS_SIGIO.f from CMakeLists.txt, remove unused variables from a number of INITPOST* routines that were initialized in RQSTFLD.F

* Revert back to use nemsio_module in WRFPOST.f

* Add INITPOST_NEMS.f back, since nmmb is still tested

* remove INITPOST_GFS_NEMS.f and INITPOST_GFS_SIGIO.f from source directory

* Add back GETNEMSANDSCATTER

* Add INITPOST_GFS_NEMS back

* remove use rqstfld_mod

* WRFPOST mods

* WRFPOST mods

* remove sigio from module files

* Remove READCNTRL.F from sorc dir since it is no longer used

* Remove sigio lines from WRFPOST

* rename RQSTFLD.F to RQSTFLD.f

* Add change logs

* Update to RQSTFLD.f in CMakeLists

* Add sigio module back

Co-authored-by: Tracy <tracy.hertneky@noaa.gov>
  • Loading branch information
hertneky and Tracy authored Nov 17, 2021
1 parent c939eae commit d903e3e
Show file tree
Hide file tree
Showing 17 changed files with 83 additions and 8,850 deletions.
1,304 changes: 0 additions & 1,304 deletions parm/nam_cntrl_cmaq.parm

This file was deleted.

503 changes: 0 additions & 503 deletions parm/nmb_cntrl.parm

This file was deleted.

365 changes: 0 additions & 365 deletions parm/rap_wrf_cntrl.parm

This file was deleted.

499 changes: 0 additions & 499 deletions parm/wrf_cntrl.parm

This file was deleted.

4 changes: 1 addition & 3 deletions sorc/ncep_post.fd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,10 @@ list(APPEND LIB_SRC
PMICRPH.f
POLEAVG.f
PROCESS.f
READCNTRL.F
READ_xml.f
retrieve_index.f
RHGRD.f
RQSTFLD.F
RQSTFLD.f
SCLFLD.f
SELECT_CHANNELS.f
SERVER.f
Expand Down Expand Up @@ -147,7 +146,6 @@ list(APPEND EXE_SRC
INITPOST_GFS_NEMS_MPIIO.f
INITPOST_GFS_NETCDF.f
INITPOST_GFS_NETCDF_PARA.f
INITPOST_GFS_SIGIO.f
INITPOST_NEMS.f
INITPOST_NEMS_MPIIO.f
INITPOST_NETCDF.f
Expand Down
73 changes: 36 additions & 37 deletions sorc/ncep_post.fd/INITPOST_GFS_NEMS.f
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
nbin_oc, nbin_su, gocart_on, pt_tbl, hyb_sigp
use gridspec_mod, only: maptype, gridtype, latstart, latlast, lonstart, lonlast, cenlon, &
dxval, dyval, truelat2, truelat1, psmapf, cenlat
use rqstfld_mod, only: igds, avbl, iq, is
use upp_physics, only: fpvsnew
! use wrf_io_flags_mod, only: ! Do we need this?
!- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -127,7 +126,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
CHARACTER*40 CONTRL,FILALL,FILMST,FILTMP,FILTKE,FILUNV,FILCLD,FILRAD,FILSFC
CHARACTER*4 RESTHR
CHARACTER FNAME*255,ENVAR*50
INTEGER IDATE(8),JDATE(8),JPDS(200),JGDS(200),KPDS(200),KGDS(200)
INTEGER IDATE(8),JDATE(8),JPDS(200),JGDS(200),KPDS(200),KGDS(200),IGDS(18)
! LOGICAL*1 LB(IM,JM)
!
! INCLUDE COMMON BLOCKS.
Expand Down Expand Up @@ -2546,11 +2545,11 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
if(iostatusD3D == 0) then ! start reading d3d file
! retrieve longwave tendency using getgb
Index=41
VarName=avbl(index)
VarName='LW RAD TEMP TNDY'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(6)=is(index)
jpds(5)=251
jpds(6)=109
do l=1,lm
jpds(7)=l
ll=lm-l+1 !flip 3d fields to count from top down
Expand All @@ -2561,11 +2560,11 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &

! retrieve shortwave tendency using getgb
Index=40
VarName=avbl(index)
VarName='SW RAD TEMP TNDY'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(6)=is(index)
jpds(5)=250
jpds(6)=109
do l=1,lm
jpds(7)=l
ll=lm-l+1 !flip 3d fields to count from top down
Expand All @@ -2579,7 +2578,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='VDIFF TNDY'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=246
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2591,11 +2590,11 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &

! retrieve deep convective tendency using getgb
Index=79
VarName=avbl(index)
VarName='AVE CNVCT RN TMPTDY'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(6)=is(index)
jpds(5)=242
jpds(6)=109
do l=1,lm
jpds(7)=l
ll=lm-l+1 !flip 3d fields to count from top down
Expand All @@ -2609,7 +2608,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='S CNVCT TNDY'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=244
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2621,11 +2620,11 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &

! retrieve grid scale latent heat tendency using getgb
Index=78
VarName=avbl(index)
VarName='AVE GRDSCL RN TMPTDY'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(6)=is(index)
jpds(5)=241
jpds(6)=109
do l=1,lm
jpds(7)=l
ll=lm-l+1 !flip 3d fields to count from top down
Expand All @@ -2639,7 +2638,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='Vertical diffusion moistening'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=249
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2654,7 +2653,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='deep convection moistening'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=243
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2669,7 +2668,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='shallow convection moistening'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=245
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2684,7 +2683,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='non-radiation tendency'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=173
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2699,7 +2698,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='Vertical diffusion of ozone'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=174
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2714,7 +2713,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='Ozone production'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=175
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2729,7 +2728,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='Ozone tendency'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=188
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2744,7 +2743,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='Mass weighted PV'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=139
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2759,7 +2758,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='?'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=239
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2774,7 +2773,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='VDIFF Z ACCE'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=247
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2789,7 +2788,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='G DRAG Z ACCE'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=181
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2804,7 +2803,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT U M MIX'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=183
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2819,7 +2818,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='VDIFF M ACCE'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=248
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2834,7 +2833,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='G DRAG M ACCE'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=182
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2849,7 +2848,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT V M MIX'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=184
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2864,7 +2863,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='N CNVCT CLD FRA'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=213
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2879,7 +2878,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT U M FLX'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=202
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2894,7 +2893,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT D M FLX'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=209
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2909,7 +2908,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT DET M FLX'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=219
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2924,7 +2923,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT G DRAG Z ACCE'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=196
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand All @@ -2939,7 +2938,7 @@ SUBROUTINE INITPOST_GFS_NEMS(NREC,iostatusFlux,iostatusD3D, &
VarName='CNVCT G DRAG M ACCE'
jpds=-1.0
jgds=-1.0
jpds(5)=iq(index)
jpds(5)=197
jpds(6)=109
do l=1,lm
jpds(7)=l
Expand Down
1 change: 0 additions & 1 deletion sorc/ncep_post.fd/INITPOST_GFS_NEMS_MPIIO.f
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ SUBROUTINE INITPOST_GFS_NEMS_MPIIO(iostatusAER)
iSF_SURFACE_PHYSICS
use gridspec_mod, only: maptype, gridtype, latstart, latlast, lonstart, lonlast, cenlon, &
dxval, dyval, truelat2, truelat1, psmapf, cenlat
use rqstfld_mod, only: igds, avbl, iq, is
use nemsio_module_mpi
use upp_physics, only: fpvsnew
!- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
1 change: 0 additions & 1 deletion sorc/ncep_post.fd/INITPOST_GFS_NETCDF.f
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ SUBROUTINE INITPOST_GFS_NETCDF(ncid3d)
use gridspec_mod, only: maptype, gridtype, latstart, latlast, lonstart, lonlast, cenlon, &
dxval, dyval, truelat2, truelat1, psmapf, cenlat,lonstartv, lonlastv, cenlonv, &
latstartv, latlastv, cenlatv,latstart_r,latlast_r,lonstart_r,lonlast_r
use rqstfld_mod, only: igds, avbl, iq, is
use upp_physics, only: fpvsnew
!- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
implicit none
Expand Down
2 changes: 1 addition & 1 deletion sorc/ncep_post.fd/INITPOST_GFS_NETCDF_PARA.f
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ SUBROUTINE INITPOST_GFS_NETCDF_PARA(ncid3d)
use gridspec_mod, only: maptype, gridtype, latstart, latlast, lonstart, lonlast, cenlon, &
dxval, dyval, truelat2, truelat1, psmapf, cenlat,lonstartv, lonlastv, cenlonv, &
latstartv, latlastv, cenlatv,latstart_r,latlast_r,lonstart_r,lonlast_r
use rqstfld_mod, only: igds, avbl, iq, is

use upp_physics, only: fpvsnew
!- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
implicit none
Expand Down
Loading

0 comments on commit d903e3e

Please sign in to comment.