From 5588bb481b26cea63a2cd825aba7b0b46dcf3bcc Mon Sep 17 00:00:00 2001
From: "Walter.Kolczynski" <Walter.Kolczynski@noaa.gov>
Date: Wed, 15 Nov 2023 16:31:01 -0600
Subject: [PATCH] Move aerosol overrides to config.aero

---
 parm/config/gefs/config.ufs | 10 ++--------
 parm/config/gfs/config.aero | 11 +++++++++--
 parm/config/gfs/config.ufs  | 11 +----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs
index 5341134d0b9..82b8ff5f5e8 100644
--- a/parm/config/gefs/config.ufs
+++ b/parm/config/gefs/config.ufs
@@ -461,14 +461,8 @@ fi
 
 # GOCART specific settings
 if [[ "${DO_AERO}" = "YES" ]]; then # temporary settings for aerosol coupling
-    export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
-    export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
-    AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
-    export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
-    export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
-    export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
-    export fscav_aero="${aero_conv_scav_factors:-${fscav_aero}}"
-    export dnats_aero="${aero_diag_tracers:-0}"
+  export cplchm=".true."
+  model_list="${model_list}.aero"
 fi
 
 # Set the name of the UFS (previously nems) configure template to use
diff --git a/parm/config/gfs/config.aero b/parm/config/gfs/config.aero
index fbd2d86ac87..8fcd9beff0d 100644
--- a/parm/config/gfs/config.aero
+++ b/parm/config/gfs/config.aero
@@ -34,10 +34,17 @@ esac
 # Biomass burning emission dataset. Choose from: GBBEPx, QFED, NONE (default)
 AERO_EMIS_FIRE=QFED
 
+export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
+export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
+AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
+export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
+export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
+export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
+
 # Aerosol convective scavenging factors (list of string array elements)
 # Element syntax: '<tracer_name>:<factor>'. Use <tracer_name> = * to set default factor for all aerosol tracers
 # Scavenging factors are set to 0 (no scavenging) if unset
-aero_conv_scav_factors="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','oc1:0.4','oc2:0.4','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5'"
+fscav_aero="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc1:0.6','bc2:0.6','oc1:0.4','oc2:0.4','dust1:0.6','dust2:0.6', 'dust3:0.6','dust4:0.6','dust5:0.6','seas1:0.5','seas2:0.5','seas3:0.5','seas4:0.5','seas5:0.5'"
 #
 # Number of diagnostic aerosol tracers (default: 0)
-aero_diag_tracers=2
+dnats_aero=2
diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
index 0edf4563c22..8839e3e3560 100644
--- a/parm/config/gfs/config.ufs
+++ b/parm/config/gfs/config.ufs
@@ -469,16 +469,7 @@ fi
 # GOCART specific settings
 if [[ "${DO_AERO}" = "YES" ]]; then # temporary settings for aerosol coupling
   export cplchm=".true."
-
-  model_list="${model_list}.aero"  
-  export AERO_DIAG_TABLE="${AERO_DIAG_TABLE:-${HOMEgfs}/parm/ufs/fv3/diag_table.aero}"
-  export AERO_FIELD_TABLE="${AERO_FIELD_TABLE:-${HOMEgfs}/parm/ufs/fv3/field_table.aero}"
-  AERO_EMIS_FIRE="${AERO_EMIS_FIRE:-none}"
-  export AERO_EMIS_FIRE=${AERO_EMIS_FIRE,,}
-  export AERO_CONFIG_DIR="${AERO_CONFIG_DIR:-${HOMEgfs}/parm/ufs/chem}"
-  export AERO_INPUTS_DIR="${AERO_INPUTS_DIR:-}"
-  export fscav_aero="${aero_conv_scav_factors:-${fscav_aero}}"
-  export dnats_aero="${aero_diag_tracers:-0}"
+  model_list="${model_list}.aero"
 fi
 
 # Set the name of the UFS (previously nems) configure template to use