Merge remote-tracking branch 'upstream/develop' into develop

parm/makefile

@@ -28,6 +28,8 @@ RAPFLATFILENAME         = postxconfig-NT-rap.txt
 RRFSFLATFILENAME        = postxconfig-NT-fv3lam_rrfs.txt
 UFSAEROSOLFLATFILENAME  = postxconfig-NT-UFS-aerosol.txt
 UFSAERO00FLATFILENAME   = postxconfig-NT-UFS-aerosol-F00.txt
+GEFSAEROSOLFLATFILENAME = postxconfig-NT-GEFS-aerosol.txt
+GEFSAERO00FLATFILENAME  = postxconfig-NT-GEFS-F00-aerosol.txt
 AQMFLATFILENAME         = postxconfig-NT-AQM.txt
 
 # Source Post XML file
@@ -58,6 +60,8 @@ RRFSAVAILXMLFILENAME    = post_avblflds.xml
 RRFSCTRLFILENAME        = fv3lam_rrfs.xml
 UFSAEROSOLCTRFILENAME   = postcntrl_ufs_aerosol.xml 
 UFSAEROSOL00CTRFILENAME = postcntrl_ufs_aerosol_f00.xml 
+GEFSAEROSOLCTRFILENAME  = postcntrl_gefs_aerosol.xml 
+GEFSAEROSOL00CTRFILENAME= postcntrl_gefs_aerosol_f00.xml 
 AQMCTRLFILENAME         = aqm.xml
 
 # Post flat file generator
@@ -84,6 +88,8 @@ PERLXMLRAP              = /usr/bin/perl $(PERLXML) $(RAPCTRLFILENAME) $(RAPAVAIL
 PERLXMLRRFS             = /usr/bin/perl $(PERLXML) $(RRFSCTRLFILENAME) $(RRFSAVAILXMLFILENAME) $(RRFSFLATFILENAME)
 PERLXMLUFSAEROSOL	= /usr/bin/perl $(PERLXML) $(UFSAEROSOLCTRFILENAME) $(AVAILXMLFILENAME) $(UFSAEROSOLFLATFILENAME)
 PERLXMLUFSAEROSOL00	= /usr/bin/perl $(PERLXML) $(UFSAEROSOL00CTRFILENAME) $(AVAILXMLFILENAME) $(UFSAERO00FLATFILENAME)
+PERLXMLGEFSAEROSOL	= /usr/bin/perl $(PERLXML) $(GEFSAEROSOLCTRFILENAME) $(AVAILXMLFILENAME) $(GEFSAEROSOLFLATFILENAME)
+PERLXMLGEFSAEROSOL00	= /usr/bin/perl $(PERLXML) $(GEFSAEROSOL00CTRFILENAME) $(AVAILXMLFILENAME) $(GEFSAERO00FLATFILENAME)
 PERLXMLAQM              = /usr/bin/perl $(PERLXML) $(AQMCTRLFILENAME) $(AVAILXMLFILENAME) $(AQMFLATFILENAME)
 
 # File to look for change
@@ -108,10 +114,12 @@ RAPXMLS = $(RAPAVAILXMLFILENAME) $(RAPCTRLFILENAME)
 RRFSXMLS = $(RRFSAVAILXMLFILENAME) $(RRFSCTRLFILENAME)
 UFSAEROSOLXMLS = $(AVAILXMLFILENAME) $(UFSAEROSOLCTRLFILENAME)
 UFSAEROSOL00XMLS = $(AVAILXMLFILENAME) $(UFSAEROSOL00CTRLFILENAME)
+GEFSAEROSOLXMLS = $(AVAILXMLFILENAME) $(GEFSAEROSOLCTRLFILENAME)
+GEFSAEROSOL00XMLS = $(AVAILXMLFILENAME) $(GEFSAEROSOL00CTRLFILENAME)
 AQMXMLS    = $(AVAILXMLFILENAME) $(AQMCTRLFILENAME)
 
 # If action is triggered; run the following
-all: $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(GFSFLUXFLATFILENAME) $(GFSFLUXF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSF00FLATFILENAME) $(HAFSSATFLATFILENAME) $(HAFSNOSATFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOFLATFILENAME) $(GFSTWOF00FLATFILENAME) $(HRRRFLATFILENAME) $(RAPFLATFILENAME) $(RRFSFLATFILENAME) $(UFSAEROSOLFLATFILENAME) $(UFSAERO00FLATFILENAME) $(AQMFLATFILENAME) 
+all: $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(GFSFLUXFLATFILENAME) $(GFSFLUXF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSF00FLATFILENAME) $(HAFSSATFLATFILENAME) $(HAFSNOSATFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOFLATFILENAME) $(GFSTWOF00FLATFILENAME) $(HRRRFLATFILENAME) $(RAPFLATFILENAME) $(RRFSFLATFILENAME) $(UFSAEROSOLFLATFILENAME) $(UFSAERO00FLATFILENAME) $(GEFSAEROSOLFLATFILENAME) $(GEFSAERO00FLATFILENAME) $(AQMFLATFILENAME) 
 $(GFSFLATFILENAME): $(GFSXMLS)
 	$(PERLXMLGFS)
 $(GFSGOESFLATFILENAME): $(GFSGOESXMLS)
@@ -152,6 +160,10 @@ $(UFSAEROSOLFLATFILENAME): $(UFSAEROSOLXMLS)
 	$(PERLXMLUFSAEROSOL)
 $(UFSAERO00FLATFILENAME): $(UFSAEROSOL00XMLS)
 	$(PERLXMLUFSAEROSOL00)
+$(GEFSAEROSOLFLATFILENAME): $(GEFSAEROSOLXMLS)
+	$(PERLXMLGEFSAEROSOL)
+$(GEFSAERO00FLATFILENAME): $(GEFSAEROSOL00XMLS)
+	$(PERLXMLGEFSAEROSOL00)
 $(AQMFLATFILENAME): $(AQMXMLS)
 	$(PERLXMLAQM)
 
@@ -160,4 +172,4 @@ $(AQMFLATFILENAME): $(AQMXMLS)
 clean:
 	@echo
 	@echo '==== CLEAN ==================================================='
-	/bin/rm -f $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSF00FLATFILENAME) $(HAFSSATFLATFILENAME) $(GFSTWOFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOF00FLATFILENAME) $(HRRRFLATFILENAME) $(RAPFLATFILENAME) $(UFSAEROSOLFLATFILENAME) $(UFSAERO00FLATFILENAME) $(AQMFLATFILENAME)
+	/bin/rm -f $(GFSFLATFILENAME) $(GFSGOESFLATFILENAME) $(GFSANLFLATFILENAME) $(GFSF00FLATFILENAME) $(NMMFLATFILENAME) $(NGACFLATFILENAME) $(GEFSFLATFILENAME) $(GEFSF00FLATFILENAME) $(HAFSSATFLATFILENAME) $(GFSTWOFLATFILENAME) $(HAFSFLATFILENAME) $(GFSTWOF00FLATFILENAME) $(HRRRFLATFILENAME) $(RAPFLATFILENAME) $(UFSAEROSOLFLATFILENAME) $(UFSAERO00FLATFILENAME) $(GEFSAEROSOLFLATFILENAME) $(GEFSAERO00FLATFILENAME) $(AQMFLATFILENAME)