diff --git a/.gitignore b/.gitignore index 8f7abb420..570d174f6 100644 --- 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 index dd59b532b..3c07f5e64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,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 deleted file mode 100644 index 64e8bd8fc..000000000 --- a/parm/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -list(APPEND parmfiles - postxconfig-NT-GFS.txt - postxconfig-NT-GFS-F00.txt) - -install(FILES ${parmfiles} DESTINATION share) diff --git a/parm/postcntrl_gefs.xml b/parm/gefs/postcntrl_gefs.xml similarity index 100% rename from parm/postcntrl_gefs.xml rename to parm/gefs/postcntrl_gefs.xml diff --git a/parm/postcntrl_gefs_aerosol.xml b/parm/gefs/postcntrl_gefs_aerosol.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gefs_aerosol.xml rename to parm/gefs/postcntrl_gefs_aerosol.xml diff --git a/parm/postcntrl_gefs_aerosol_f00.xml b/parm/gefs/postcntrl_gefs_aerosol_f00.xml similarity index 100% rename from parm/postcntrl_gefs_aerosol_f00.xml rename to parm/gefs/postcntrl_gefs_aerosol_f00.xml diff --git a/parm/postcntrl_gefs_chem.xml b/parm/gefs/postcntrl_gefs_chem.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gefs_chem.xml rename to parm/gefs/postcntrl_gefs_chem.xml diff --git a/parm/postcntrl_gefs_f00.xml b/parm/gefs/postcntrl_gefs_f00.xml similarity index 100% rename from parm/postcntrl_gefs_f00.xml rename to parm/gefs/postcntrl_gefs_f00.xml diff --git a/parm/postcntrl_gefs_wafs.xml b/parm/gefs/postcntrl_gefs_wafs.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gefs_wafs.xml rename to parm/gefs/postcntrl_gefs_wafs.xml diff --git a/parm/postxconfig-NT-GEFS-aerosol.txt b/parm/gefs/postxconfig-NT-gefs-aerosol.txt similarity index 100% rename from parm/postxconfig-NT-GEFS-aerosol.txt rename to parm/gefs/postxconfig-NT-gefs-aerosol.txt diff --git a/parm/postxconfig-NT-gefs-chem.txt b/parm/gefs/postxconfig-NT-gefs-chem.txt similarity index 100% rename from parm/postxconfig-NT-gefs-chem.txt rename to parm/gefs/postxconfig-NT-gefs-chem.txt diff --git a/parm/postxconfig-NT-GEFS-F00-aerosol.txt b/parm/gefs/postxconfig-NT-gefs-f00-aerosol.txt similarity index 100% rename from parm/postxconfig-NT-GEFS-F00-aerosol.txt rename to parm/gefs/postxconfig-NT-gefs-f00-aerosol.txt diff --git a/parm/postxconfig-NT-GEFS-F00.txt b/parm/gefs/postxconfig-NT-gefs-f00.txt similarity index 100% rename from parm/postxconfig-NT-GEFS-F00.txt rename to parm/gefs/postxconfig-NT-gefs-f00.txt diff --git a/parm/postxconfig-NT-GEFS-WAFS.txt b/parm/gefs/postxconfig-NT-gefs-wafs.txt similarity index 100% rename from parm/postxconfig-NT-GEFS-WAFS.txt rename to parm/gefs/postxconfig-NT-gefs-wafs.txt diff --git a/parm/postxconfig-NT-GEFS.txt b/parm/gefs/postxconfig-NT-gefs.txt similarity index 100% rename from parm/postxconfig-NT-GEFS.txt rename to parm/gefs/postxconfig-NT-gefs.txt diff --git a/parm/global_1x1_paramlist_g2 b/parm/gfs/global_1x1_paramlist_g2 similarity index 100% rename from parm/global_1x1_paramlist_g2 rename to parm/gfs/global_1x1_paramlist_g2 diff --git a/parm/global_1x1_paramlist_g2.anl b/parm/gfs/global_1x1_paramlist_g2.anl similarity index 100% rename from parm/global_1x1_paramlist_g2.anl rename to parm/gfs/global_1x1_paramlist_g2.anl diff --git a/parm/global_1x1_paramlist_g2.f000 b/parm/gfs/global_1x1_paramlist_g2.f000 similarity index 100% rename from parm/global_1x1_paramlist_g2.f000 rename to parm/gfs/global_1x1_paramlist_g2.f000 diff --git a/parm/global_1x1_paramlist_g2.f000_chem b/parm/gfs/global_1x1_paramlist_g2.f000_chem similarity index 100% rename from parm/global_1x1_paramlist_g2.f000_chem rename to parm/gfs/global_1x1_paramlist_g2.f000_chem diff --git a/parm/global_1x1_paramlist_g2_chem b/parm/gfs/global_1x1_paramlist_g2_chem similarity index 100% rename from parm/global_1x1_paramlist_g2_chem rename to parm/gfs/global_1x1_paramlist_g2_chem diff --git a/parm/global_master-catchup_parmlist_g2 b/parm/gfs/global_master-catchup_parmlist_g2 similarity index 100% rename from parm/global_master-catchup_parmlist_g2 rename to parm/gfs/global_master-catchup_parmlist_g2 diff --git a/parm/post_tag_gfs128 b/parm/gfs/post_tag_gfs128 similarity index 100% rename from parm/post_tag_gfs128 rename to parm/gfs/post_tag_gfs128 diff --git a/parm/post_tag_gfs65 b/parm/gfs/post_tag_gfs65 similarity index 100% rename from parm/post_tag_gfs65 rename to parm/gfs/post_tag_gfs65 diff --git a/parm/postcntrl_gfs.xml b/parm/gfs/postcntrl_gfs.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs.xml rename to parm/gfs/postcntrl_gfs.xml diff --git a/parm/postcntrl_gfs_anl.xml b/parm/gfs/postcntrl_gfs_anl.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_anl.xml rename to parm/gfs/postcntrl_gfs_anl.xml diff --git a/parm/postcntrl_gfs_f00.xml b/parm/gfs/postcntrl_gfs_f00.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_f00.xml rename to parm/gfs/postcntrl_gfs_f00.xml diff --git a/parm/postcntrl_gfs_f00_two.xml b/parm/gfs/postcntrl_gfs_f00_two.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_f00_two.xml rename to parm/gfs/postcntrl_gfs_f00_two.xml diff --git a/parm/postcntrl_gfs_flux.xml b/parm/gfs/postcntrl_gfs_flux.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_flux.xml rename to parm/gfs/postcntrl_gfs_flux.xml diff --git a/parm/postcntrl_gfs_flux_f00.xml b/parm/gfs/postcntrl_gfs_flux_f00.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_flux_f00.xml rename to parm/gfs/postcntrl_gfs_flux_f00.xml diff --git a/parm/postcntrl_gfs_goes.xml b/parm/gfs/postcntrl_gfs_goes.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_goes.xml rename to parm/gfs/postcntrl_gfs_goes.xml diff --git a/parm/postcntrl_gfs_goes.xml-new b/parm/gfs/postcntrl_gfs_goes.xml-new old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_goes.xml-new rename to parm/gfs/postcntrl_gfs_goes.xml-new diff --git a/parm/postcntrl_gfs_two.xml b/parm/gfs/postcntrl_gfs_two.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_two.xml rename to parm/gfs/postcntrl_gfs_two.xml diff --git a/parm/postcntrl_gfs_wafs.xml b/parm/gfs/postcntrl_gfs_wafs.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_wafs.xml rename to parm/gfs/postcntrl_gfs_wafs.xml diff --git a/parm/postcntrl_gfs_wafs_anl.xml b/parm/gfs/postcntrl_gfs_wafs_anl.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_wafs_anl.xml rename to parm/gfs/postcntrl_gfs_wafs_anl.xml diff --git a/parm/postcntrl_gfs_wafs_ext.xml b/parm/gfs/postcntrl_gfs_wafs_ext.xml old mode 100755 new mode 100644 similarity index 100% rename from parm/postcntrl_gfs_wafs_ext.xml rename to parm/gfs/postcntrl_gfs_wafs_ext.xml diff --git a/parm/postxconfig-NT-GFS-ANL.txt b/parm/gfs/postxconfig-NT-gfs-anl.txt similarity index 100% rename from parm/postxconfig-NT-GFS-ANL.txt rename to parm/gfs/postxconfig-NT-gfs-anl.txt diff --git a/parm/postxconfig-NT-GFS-F00-TWO.txt b/parm/gfs/postxconfig-NT-gfs-f00-two.txt similarity index 100% rename from parm/postxconfig-NT-GFS-F00-TWO.txt rename to parm/gfs/postxconfig-NT-gfs-f00-two.txt diff --git a/parm/postxconfig-NT-GFS-F00.txt b/parm/gfs/postxconfig-NT-gfs-f00.txt similarity index 100% rename from parm/postxconfig-NT-GFS-F00.txt rename to parm/gfs/postxconfig-NT-gfs-f00.txt diff --git a/parm/postxconfig-NT-GFS-FLUX-F00.txt b/parm/gfs/postxconfig-NT-gfs-flux-f00.txt similarity index 100% rename from parm/postxconfig-NT-GFS-FLUX-F00.txt rename to parm/gfs/postxconfig-NT-gfs-flux-f00.txt diff --git a/parm/postxconfig-NT-GFS-FLUX.txt b/parm/gfs/postxconfig-NT-gfs-flux.txt similarity index 100% rename from parm/postxconfig-NT-GFS-FLUX.txt rename to parm/gfs/postxconfig-NT-gfs-flux.txt diff --git a/parm/postxconfig-NT-GFS-GOES.txt b/parm/gfs/postxconfig-NT-gfs-goes.txt similarity index 100% rename from parm/postxconfig-NT-GFS-GOES.txt rename to parm/gfs/postxconfig-NT-gfs-goes.txt diff --git a/parm/postxconfig-NT-GFS-TWO.txt b/parm/gfs/postxconfig-NT-gfs-two.txt similarity index 100% rename from parm/postxconfig-NT-GFS-TWO.txt rename to parm/gfs/postxconfig-NT-gfs-two.txt diff --git a/parm/postxconfig-NT-GFS-WAFS-ANL.txt b/parm/gfs/postxconfig-NT-gfs-wafs-anl.txt similarity index 100% rename from parm/postxconfig-NT-GFS-WAFS-ANL.txt rename to parm/gfs/postxconfig-NT-gfs-wafs-anl.txt diff --git a/parm/postxconfig-NT-GFS-WAFS-EXT.txt b/parm/gfs/postxconfig-NT-gfs-wafs-ext.txt similarity index 100% rename from parm/postxconfig-NT-GFS-WAFS-EXT.txt rename to parm/gfs/postxconfig-NT-gfs-wafs-ext.txt diff --git a/parm/postxconfig-NT-GFS-WAFS.txt b/parm/gfs/postxconfig-NT-gfs-wafs.txt similarity index 100% rename from parm/postxconfig-NT-GFS-WAFS.txt rename to parm/gfs/postxconfig-NT-gfs-wafs.txt diff --git a/parm/postxconfig-NT-GFS.txt b/parm/gfs/postxconfig-NT-gfs.txt similarity index 100% rename from parm/postxconfig-NT-GFS.txt rename to parm/gfs/postxconfig-NT-gfs.txt diff --git a/parm/makefile b/parm/makefile index 55a82d860..a0a1a7119 100644 --- a/parm/makefile +++ b/parm/makefile @@ -18,60 +18,60 @@ 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_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-fv3lam_rrfs.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 .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 -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.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-fv3lam_rrfs.txt: fv3lam_rrfs.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 +./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-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.txt: postcntrl_hafs.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-fv3lam_rrfs.txt: fv3lam_rrfs.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-AQM.txt: aqm.xml post_avblflds.xml %.txt: $(PERL) $(PERLXML) $^ $@ diff --git a/parm/postcntrl_sfs.xml b/parm/sfs/postcntrl_sfs.xml similarity index 100% rename from parm/postcntrl_sfs.xml rename to parm/sfs/postcntrl_sfs.xml diff --git a/parm/postxconfig-NT-SFS.txt b/parm/sfs/postxconfig-NT-sfs.txt similarity index 100% rename from parm/postxconfig-NT-SFS.txt rename to parm/sfs/postxconfig-NT-sfs.txt