Relocate gfs/gefs/sfs control files (#990)

* Relocate gfs/gefs/sfs control files * Update * Rename dataset to GFSGOES in postcntrl_gfs_goes.xml * Increase datset length. * add hera RT log * add orion RT log * add hercules RT log --------- Co-authored-by: FernandoAndrade-NOAA <[email protected]>
NOAA-EMC · Jul 18, 2024 · 97ea655 · 97ea655
1 parent 47358ed
commit 97ea655
Show file tree

Hide file tree

Showing 48 changed files with 227 additions and 370 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@
 # USE CAUTION WHEN ADDING WILDCARDS, as some builds use different filename   #
 # conventions than others                                                    #
 ##############################################################################
+build
+install
 build/*/
 install*/
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,7 +113,6 @@ if(IFI_FOUND OR INTERNAL_IFI)
 endif()
 
 add_subdirectory(sorc)
-add_subdirectory(parm)
 
 # If desired, build the doxygen docs.
 if(ENABLE_DOCS)

diff --git a/parm/CMakeLists.txt b/parm/CMakeLists.txt
diff --git a/parm/postcntrl_gefs.xml → parm/gefs/postcntrl_gefs.xml b/parm/postcntrl_gefs.xml → parm/gefs/postcntrl_gefs.xml
diff --git a/parm/postcntrl_gefs_aerosol.xml → parm/gefs/postcntrl_gefs_aerosol.xml b/parm/postcntrl_gefs_aerosol.xml → parm/gefs/postcntrl_gefs_aerosol.xml
diff --git a/parm/postcntrl_gefs_aerosol_f00.xml → parm/gefs/postcntrl_gefs_aerosol_f00.xml b/parm/postcntrl_gefs_aerosol_f00.xml → parm/gefs/postcntrl_gefs_aerosol_f00.xml
diff --git a/parm/postcntrl_gefs_chem.xml → parm/gefs/postcntrl_gefs_chem.xml b/parm/postcntrl_gefs_chem.xml → parm/gefs/postcntrl_gefs_chem.xml
diff --git a/parm/postcntrl_gefs_f00.xml → parm/gefs/postcntrl_gefs_f00.xml b/parm/postcntrl_gefs_f00.xml → parm/gefs/postcntrl_gefs_f00.xml
diff --git a/parm/postcntrl_gefs_wafs.xml → parm/gefs/postcntrl_gefs_wafs.xml b/parm/postcntrl_gefs_wafs.xml → parm/gefs/postcntrl_gefs_wafs.xml
diff --git a/parm/postxconfig-NT-GEFS-aerosol.txt → parm/gefs/postxconfig-NT-gefs-aerosol.txt b/parm/postxconfig-NT-GEFS-aerosol.txt → parm/gefs/postxconfig-NT-gefs-aerosol.txt
diff --git a/parm/postxconfig-NT-gefs-chem.txt → parm/gefs/postxconfig-NT-gefs-chem.txt b/parm/postxconfig-NT-gefs-chem.txt → parm/gefs/postxconfig-NT-gefs-chem.txt
diff --git a/parm/postxconfig-NT-GEFS-F00-aerosol.txt → .../gefs/postxconfig-NT-gefs-f00-aerosol.txt b/parm/postxconfig-NT-GEFS-F00-aerosol.txt → .../gefs/postxconfig-NT-gefs-f00-aerosol.txt
diff --git a/parm/postxconfig-NT-GEFS-F00.txt → parm/gefs/postxconfig-NT-gefs-f00.txt b/parm/postxconfig-NT-GEFS-F00.txt → parm/gefs/postxconfig-NT-gefs-f00.txt
diff --git a/parm/postxconfig-NT-GEFS-WAFS.txt → parm/gefs/postxconfig-NT-gefs-wafs.txt b/parm/postxconfig-NT-GEFS-WAFS.txt → parm/gefs/postxconfig-NT-gefs-wafs.txt
diff --git a/parm/postxconfig-NT-GEFS.txt → parm/gefs/postxconfig-NT-gefs.txt b/parm/postxconfig-NT-GEFS.txt → parm/gefs/postxconfig-NT-gefs.txt
diff --git a/parm/post_tag_gfs128 → parm/gfs/post_tag_gfs128 b/parm/post_tag_gfs128 → parm/gfs/post_tag_gfs128
diff --git a/parm/post_tag_gfs65 → parm/gfs/post_tag_gfs65 b/parm/post_tag_gfs65 → parm/gfs/post_tag_gfs65
diff --git a/parm/postcntrl_gfs.xml → parm/gfs/postcntrl_gfs.xml b/parm/postcntrl_gfs.xml → parm/gfs/postcntrl_gfs.xml
diff --git a/parm/postcntrl_gfs_anl.xml → parm/gfs/postcntrl_gfs_anl.xml b/parm/postcntrl_gfs_anl.xml → parm/gfs/postcntrl_gfs_anl.xml
diff --git a/parm/postcntrl_gfs_f00.xml → parm/gfs/postcntrl_gfs_f00.xml b/parm/postcntrl_gfs_f00.xml → parm/gfs/postcntrl_gfs_f00.xml
diff --git a/parm/postcntrl_gfs_f00_two.xml → parm/gfs/postcntrl_gfs_f00_two.xml b/parm/postcntrl_gfs_f00_two.xml → parm/gfs/postcntrl_gfs_f00_two.xml
diff --git a/parm/postcntrl_gfs_flux.xml → parm/gfs/postcntrl_gfs_flux.xml b/parm/postcntrl_gfs_flux.xml → parm/gfs/postcntrl_gfs_flux.xml
diff --git a/parm/postcntrl_gfs_flux_f00.xml → parm/gfs/postcntrl_gfs_flux_f00.xml b/parm/postcntrl_gfs_flux_f00.xml → parm/gfs/postcntrl_gfs_flux_f00.xml
diff --git a/parm/postcntrl_gfs_goes.xml → parm/gfs/postcntrl_gfs_goes.xml b/parm/postcntrl_gfs_goes.xml → parm/gfs/postcntrl_gfs_goes.xml
@@ -2,7 +2,7 @@
 <postxml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="EMC_POST_CTRL_Schema.xsd">
 <!--  Lin Gan:  20150411 validated -->
   <paramset>
-    <datset>GFSPRS</datset>
+    <datset>GFSGOES</datset>
     <grid_num>0</grid_num>
     <sub_center>ncep_nco</sub_center>
     <version_no>v2003</version_no>

diff --git a/parm/postcntrl_gfs_two.xml → parm/gfs/postcntrl_gfs_two.xml b/parm/postcntrl_gfs_two.xml → parm/gfs/postcntrl_gfs_two.xml
diff --git a/parm/postcntrl_gfs_wafs.xml → parm/gfs/postcntrl_gfs_wafs.xml b/parm/postcntrl_gfs_wafs.xml → parm/gfs/postcntrl_gfs_wafs.xml
diff --git a/parm/postcntrl_gfs_wafs_anl.xml → parm/gfs/postcntrl_gfs_wafs_anl.xml b/parm/postcntrl_gfs_wafs_anl.xml → parm/gfs/postcntrl_gfs_wafs_anl.xml
diff --git a/parm/postcntrl_gfs_wafs_ext.xml → parm/gfs/postcntrl_gfs_wafs_ext.xml b/parm/postcntrl_gfs_wafs_ext.xml → parm/gfs/postcntrl_gfs_wafs_ext.xml
diff --git a/parm/postxconfig-NT-GFS-ANL.txt → parm/gfs/postxconfig-NT-gfs-anl.txt b/parm/postxconfig-NT-GFS-ANL.txt → parm/gfs/postxconfig-NT-gfs-anl.txt
diff --git a/parm/postxconfig-NT-GFS-F00-TWO.txt → parm/gfs/postxconfig-NT-gfs-f00-two.txt b/parm/postxconfig-NT-GFS-F00-TWO.txt → parm/gfs/postxconfig-NT-gfs-f00-two.txt
diff --git a/parm/postxconfig-NT-GFS-F00.txt → parm/gfs/postxconfig-NT-gfs-f00.txt b/parm/postxconfig-NT-GFS-F00.txt → parm/gfs/postxconfig-NT-gfs-f00.txt
diff --git a/parm/postxconfig-NT-GFS-FLUX-F00.txt → parm/gfs/postxconfig-NT-gfs-flux-f00.txt b/parm/postxconfig-NT-GFS-FLUX-F00.txt → parm/gfs/postxconfig-NT-gfs-flux-f00.txt
diff --git a/parm/postxconfig-NT-GFS-FLUX.txt → parm/gfs/postxconfig-NT-gfs-flux.txt b/parm/postxconfig-NT-GFS-FLUX.txt → parm/gfs/postxconfig-NT-gfs-flux.txt
diff --git a/parm/postxconfig-NT-GFS-GOES.txt → parm/gfs/postxconfig-NT-gfs-goes.txt b/parm/postxconfig-NT-GFS-GOES.txt → parm/gfs/postxconfig-NT-gfs-goes.txt
@@ -1,6 +1,6 @@
 1
 4
-GFSPRS
+GFSGOES
 0
 ncep_nco
 v2003

diff --git a/parm/postxconfig-NT-GFS-TWO.txt → parm/gfs/postxconfig-NT-gfs-two.txt b/parm/postxconfig-NT-GFS-TWO.txt → parm/gfs/postxconfig-NT-gfs-two.txt
diff --git a/parm/postxconfig-NT-GFS-WAFS-ANL.txt → parm/gfs/postxconfig-NT-gfs-wafs-anl.txt b/parm/postxconfig-NT-GFS-WAFS-ANL.txt → parm/gfs/postxconfig-NT-gfs-wafs-anl.txt
diff --git a/parm/postxconfig-NT-GFS-WAFS-EXT.txt → parm/gfs/postxconfig-NT-gfs-wafs-ext.txt b/parm/postxconfig-NT-GFS-WAFS-EXT.txt → parm/gfs/postxconfig-NT-gfs-wafs-ext.txt
diff --git a/parm/postxconfig-NT-GFS-WAFS.txt → parm/gfs/postxconfig-NT-gfs-wafs.txt b/parm/postxconfig-NT-GFS-WAFS.txt → parm/gfs/postxconfig-NT-gfs-wafs.txt
diff --git a/parm/postxconfig-NT-GFS.txt → parm/gfs/postxconfig-NT-gfs.txt b/parm/postxconfig-NT-GFS.txt → parm/gfs/postxconfig-NT-gfs.txt
diff --git a/parm/makefile b/parm/makefile
@@ -18,66 +18,66 @@ RM=rm -f
 # Make sure all of the .txt files are in the ALL_TXT variable.
 
 ALL_TXT= \
-  postxconfig-NT-GFS.txt \
-  postxconfig-NT-GFS-GOES.txt \
-  postxconfig-NT-GFS-ANL.txt \
-  postxconfig-NT-GFS-F00.txt \
-  postxconfig-NT-GFS-FLUX.txt \
-  postxconfig-NT-GFS-FLUX-F00.txt \
+  ./gfs/postxconfig-NT-gfs.txt \
+  ./gfs/postxconfig-NT-gfs-goes.txt \
+  ./gfs/postxconfig-NT-gfs-anl.txt \
+  ./gfs/postxconfig-NT-gfs-f00.txt \
+  ./gfs/postxconfig-NT-gfs-flux.txt \
+  ./gfs/postxconfig-NT-gfs-flux-f00.txt \
+  ./gfs/postxconfig-NT-gfs-two.txt \
+  ./gfs/postxconfig-NT-gfs-f00-two.txt \
+  ./gefs/postxconfig-NT-gefs.txt \
+  ./gefs/postxconfig-NT-gefs-f00.txt \
+  ./gefs/postxconfig-NT-gefs-aerosol.txt \
+  ./gefs/postxconfig-NT-gefs-f00-aerosol.txt \
+  ./sfs/postxconfig-NT-sfs.txt \
   postxconfig-NT-NMM.txt \
   postxconfig-NT-NGAC.txt \
-  postxconfig-NT-GEFS.txt \
-  postxconfig-NT-GEFS-F00.txt \
   postxconfig-NT-hafs_ar_nosat.txt \
   postxconfig-NT-hafs_ar_nosat_l65.txt \
   postxconfig-NT-hafs_sat.txt \
   postxconfig-NT-hafs_nosat.txt \
   postxconfig-NT-hafs.txt \
-  postxconfig-NT-GFS-TWO.txt \
-  postxconfig-NT-GFS-F00-TWO.txt \
   postxconfig-NT-hrrr.txt \
   postxconfig-NT-rap.txt \
   postxconfig-NT-rrfs.txt \
   postxconfig-NT-rrfs_subh.txt \
   postxconfig-NT-UFS-aerosol.txt \
   postxconfig-NT-UFS-aerosol-F00.txt \
-  postxconfig-NT-GEFS-aerosol.txt \
-  postxconfig-NT-GEFS-F00-aerosol.txt \
-  postxconfig-NT-AQM.txt \
-  postxconfig-NT-SFS.txt
+  postxconfig-NT-AQM.txt
 
 .PHONY: all clean
 all: $(ALL_TXT)
 clean:
 	$(RM) $(ALL_TXT)
 
-postxconfig-NT-GFS.txt:              postcntrl_gfs.xml              post_avblflds.xml
-postxconfig-NT-GFS-GOES.txt:         postcntrl_gfs_goes.xml         post_avblflds.xml
-postxconfig-NT-GFS-ANL.txt:          postcntrl_gfs_anl.xml          post_avblflds.xml
-postxconfig-NT-GFS-F00.txt:          postcntrl_gfs_f00.xml          post_avblflds.xml
-postxconfig-NT-GFS-FLUX.txt:         postcntrl_gfs_flux.xml         post_avblflds.xml
-postxconfig-NT-GFS-FLUX-F00.txt:     postcntrl_gfs_flux_f00.xml     post_avblflds.xml
+./gfs/postxconfig-NT-gfs.txt:               ./gfs/postcntrl_gfs.xml               post_avblflds.xml
+./gfs/postxconfig-NT-gfs-goes.txt:          ./gfs/postcntrl_gfs_goes.xml          post_avblflds.xml
+./gfs/postxconfig-NT-gfs-anl.txt:           ./gfs/postcntrl_gfs_anl.xml           post_avblflds.xml
+./gfs/postxconfig-NT-gfs-f00.txt:           ./gfs/postcntrl_gfs_f00.xml           post_avblflds.xml
+./gfs/postxconfig-NT-gfs-flux.txt:          ./gfs/postcntrl_gfs_flux.xml          post_avblflds.xml
+./gfs/postxconfig-NT-gfs-flux-f00.txt:      ./gfs/postcntrl_gfs_flux_f00.xml      post_avblflds.xml
+./gfs/postxconfig-NT-gfs-two.txt:           ./gfs/postcntrl_gfs_two.xml           post_avblflds.xml
+./gfs/postxconfig-NT-gfs-f00-two.txt:       ./gfs/postcntrl_gfs_f00_two.xml       post_avblflds.xml
+./gefs/postxconfig-NT-gefs.txt:             ./gefs/postcntrl_gefs.xml             post_avblflds.xml
+./gefs/postxconfig-NT-gefs-f00.txt:         ./gefs/postcntrl_gefs_f00.xml         post_avblflds.xml
+./gefs/postxconfig-NT-gefs-aerosol.txt:     ./gefs/postcntrl_gefs_aerosol.xml     post_avblflds.xml
+./gefs/postxconfig-NT-gefs-f00-aerosol.txt: ./gefs/postcntrl_gefs_aerosol_f00.xml post_avblflds.xml
+./sfs/postxconfig-NT-sfs.txt:		    ./sfs/postcntrl_sfs.xml	          post_avblflds.xml
 postxconfig-NT-NMM.txt:              nam_cntrl_cmaq.xml             nam_post_avblflds.xml
 postxconfig-NT-NGAC.txt:             ngac_postcntrl.xml             ngac_post_avblflds.xml
-postxconfig-NT-GEFS.txt:             postcntrl_gefs.xml             post_avblflds.xml
-postxconfig-NT-GEFS-F00.txt:         postcntrl_gefs_f00.xml         post_avblflds.xml
 postxconfig-NT-hafs_sat.txt:         postcntrl_hafs_sat.xml         post_avblflds.xml
 postxconfig-NT-hafs_nosat.txt:       postcntrl_hafs_nosat.xml       post_avblflds.xml
 postxconfig-NT-hafs_ar_nosat.txt:    postcntrl_hafs_ar_nosat.xml    post_avblflds.xml
 postxconfig-NT-hafs_ar_nosat_l65.txt: postcntrl_hafs_ar_nosat_l65.xml post_avblflds.xml
 postxconfig-NT-hafs.txt:             postcntrl_hafs.xml             post_avblflds.xml
-postxconfig-NT-GFS-TWO.txt:          postcntrl_gfs_two.xml          post_avblflds.xml
-postxconfig-NT-GFS-F00-TWO.txt:      postcntrl_gfs_f00_two.xml      post_avblflds.xml
 postxconfig-NT-hrrr.txt:             hrrr_postcntrl.xml             post_avblflds_raphrrr.xml
 postxconfig-NT-rap.txt:              rap_postcntrl.xml              post_avblflds_raphrrr.xml
 postxconfig-NT-rrfs.txt:             rrfs_postcntrl.xml             post_avblflds.xml
 postxconfig-NT-rrfs_subh.txt:        rrfs_postcntrl_subh.xml        post_avblflds.xml
 postxconfig-NT-UFS-aerosol.txt:      postcntrl_ufs_aerosol.xml      post_avblflds.xml
 postxconfig-NT-UFS-aerosol-F00.txt:  postcntrl_ufs_aerosol_f00.xml  post_avblflds.xml
-postxconfig-NT-GEFS-aerosol.txt:     postcntrl_gefs_aerosol.xml     post_avblflds.xml
-postxconfig-NT-GEFS-F00-aerosol.txt: postcntrl_gefs_aerosol_f00.xml post_avblflds.xml
 postxconfig-NT-AQM.txt:              aqm.xml                        post_avblflds.xml
-postxconfig-NT-SFS.txt:		     postcntrl_sfs.xml		    post_avblflds.xml
 
 %.txt:
 	$(PERL) $(PERLXML) $^ $@
diff --git a/parm/postcntrl_gfs_goes.xml-new b/parm/postcntrl_gfs_goes.xml-new
diff --git a/parm/postcntrl_sfs.xml → parm/sfs/postcntrl_sfs.xml b/parm/postcntrl_sfs.xml → parm/sfs/postcntrl_sfs.xml
diff --git a/parm/postxconfig-NT-SFS.txt → parm/sfs/postxconfig-NT-sfs.txt b/parm/postxconfig-NT-SFS.txt → parm/sfs/postxconfig-NT-sfs.txt
diff --git a/sorc/ncep_post.fd/RQSTFLD.f b/sorc/ncep_post.fd/RQSTFLD.f
@@ -20,6 +20,7 @@
 !> 2019-09-03 | Jesse Meng | Added cape related variables for hrrr (950-957)
 !> 2021-08-31 | Lin Zhu | Added ssmis-f17 channels 15-18 grib2 output
 !> 2021-11-03 | Tracy Hertneky | Removed all grib1 settings
+!> 2024-07-15 | Wen Meng  | Increase DATSET length
 !--------------------------------------------------------------------
     module RQSTFLD_mod
 
@@ -29,7 +30,7 @@ module RQSTFLD_mod
       INTEGER, PARAMETER :: MXFLD=1200    !< Available model field IDs
       INTEGER, PARAMETER :: MXLVL=500     !< Available model levels
 
-      CHARACTER*6 DATSET                  !< String set in the postcntrl.xml file DATSET parameter
+      CHARACTER*20 DATSET                  !< String set in the postcntrl.xml file DATSET parameter
 !
       LOGICAL RITEHD                      !< Flag to open new output file
 !

diff --git a/sorc/ncep_post.fd/xml_perl_data.f b/sorc/ncep_post.fd/xml_perl_data.f
@@ -9,6 +9,7 @@ module xml_perl_data
 !> -----|------------|---------
 !> March, 2015 | Lin Gan   | Initial Code
 !> July,  2016 | J. Carley | Clean up prints 
+!> July, 2024  | Wen Meng  | Increase datset length
 !>
 !------------------------------------------------------------------------
 !> @defgroup xml_perl_data_mod xml_perl_data
@@ -73,7 +74,7 @@ module xml_perl_data
 !> @{ Parameters that are used to read in Perl XML processed flat file
 !! and handle parameter marshalling for existing POST program.
           type paramset_t
-	    character(len=6)                     :: datset=''
+	    character(len=20)                     :: datset=''
 	    integer                              :: grid_num=255
 	    character(len=20)                    :: sub_center=''
 	    character(len=20)                    :: version_no=''
-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
-    GFSPRS
+    GFSGOES
     ncep_nco
     v2003
@@ Expand Down @@