[develop] Fix sample script and WE2E test for AQM (ufs-community#1040)

 * Fixes the failure on the sample script ush/config.aqm.community.yaml.
 * Fixes the failure on the WE2E test test/WE2E/test_configs/aqm/config.aqm_grid_AQM_NA13km_suite_GFS_v16.yaml for AQM.

.gitignore

@@ -1,4 +1,5 @@
 bin/
+conda/
 exec/
 build/
 fix/

modulefiles/tasks/hera/aqm_lbcs.local.lua

@@ -1,2 +1,2 @@
+load("python_srw_cmaq")
 load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3"))
-load("miniconda_regional_workflow_cmaq")

scripts/exregional_fire_emission.sh

@@ -70,8 +70,8 @@ hh_mh1=${CDATE_mh1:8:2}
 aqm_fire_file_fn="${AQM_FIRE_FILE_PREFIX}_${yyyymmdd}_t${hh}z${AQM_FIRE_FILE_SUFFIX}"
 
 # Check if the fire file exists in the designated directory
-if [ -e "${DCOMINfire}/${yyyymmdd}/${aqm_fire_file_fn}" ]; then
-  cp_vrfy "${DCOMINfire}/${yyyymmdd}/${aqm_fire_file_fn}" "${FIRE_EMISSION_STAGING_DIR}"
+if [ -e "${DCOMINfire}/${aqm_fire_file_fn}" ]; then
+  cp_vrfy "${DCOMINfire}/${aqm_fire_file_fn}" "${FIRE_EMISSION_STAGING_DIR}"
 else
   # Copy raw data 
   for ihr in {0..23}; do

tests/WE2E/run_WE2E_tests.py

@@ -224,10 +224,6 @@ def run_we2e_tests(homedir, args) -> None:
                     logging.debug(f'Setting {obvar} = {mach_path} from machine file')
                     test_cfg['platform'][obvar] = mach_path
 
-        if 'cpl_aqm_parm' in test_cfg:
-            test_aqm_input_basedir = machine_defaults['platform']['TEST_AQM_INPUT_BASEDIR']
-            test_cfg['cpl_aqm_parm']['DCOMINfire_default'] = f"{test_aqm_input_basedir}/RAVE_fire"
-
         if args.compiler == "gnu":
             # 2D decomposition doesn't work with GNU compilers.  Deactivate 2D decomposition for GNU
             if 'task_run_post' in test_cfg:

tests/WE2E/test_configs/aqm/config.aqm_grid_AQM_NA13km_suite_GFS_v16.yaml

@@ -5,13 +5,10 @@ user:
 workflow:
   PREDEF_GRID_NAME: AQM_NA_13km
   CCPP_PHYS_SUITE: FV3_GFS_v16
-  DATE_FIRST_CYCL: '2023021700'
-  DATE_LAST_CYCL: '2023021706'
-  INCR_CYCL_FREQ: 6
-  FCST_LEN_HRS: -1
-  FCST_LEN_CYCL:
-    - 6
-    - 12
+  DATE_FIRST_CYCL: '2023111000'
+  DATE_LAST_CYCL: '2023111100'
+  INCR_CYCL_FREQ: 24
+  FCST_LEN_HRS: 24
   PREEXISTING_DIR_METHOD: rename
   DIAG_TABLE_TMPL_FN: diag_table_aqm.FV3_GFS_v16
   FIELD_TABLE_TMPL_FN: field_table_aqm.FV3_GFS_v16
@@ -24,7 +21,7 @@ rocoto:
     task_aqm_ics_ext:
     metatask_run_ensemble:
       task_run_fcst_mem#mem#:
-        walltime: 02:00:00
+        walltime: 01:00:00
 task_get_extrn_ics:
   EXTRN_MDL_NAME_ICS: FV3GFS
   FV3GFS_FILE_FMT_ICS: netcdf
@@ -41,7 +38,7 @@ task_run_fcst:
   LAYOUT_X: 50
   LAYOUT_Y: 34
   BLOCKSIZE: 16
-  RESTART_INTERVAL: 6
+  RESTART_INTERVAL: 12 24
   QUILTING: true
   PRINT_ESMF: false
   DO_FCST_RESTART: false

ush/config.aqm.community.yaml

@@ -10,16 +10,13 @@ workflow:
   EXPT_SUBDIR: aqm_community_aqmna13
   PREDEF_GRID_NAME: AQM_NA_13km
   CCPP_PHYS_SUITE: FV3_GFS_v16
-  DATE_FIRST_CYCL: '2023021700'
-  DATE_LAST_CYCL: '2023021706'
-  INCR_CYCL_FREQ: 6
-  FCST_LEN_HRS: -1
-  FCST_LEN_CYCL:
-    - 6
-    - 12
+  DATE_FIRST_CYCL: '2023111000'
+  DATE_LAST_CYCL: '2023111100'
+  INCR_CYCL_FREQ: 24
+  FCST_LEN_HRS: 24
   PREEXISTING_DIR_METHOD: rename
   VERBOSE: true
-  DEBUG: true
+  DEBUG: false
   COMPILER: intel
   DIAG_TABLE_TMPL_FN: diag_table_aqm.FV3_GFS_v16
   FIELD_TABLE_TMPL_FN: field_table_aqm.FV3_GFS_v16
@@ -32,7 +29,7 @@ rocoto:
     task_aqm_ics_ext:
     metatask_run_ensemble:
       task_run_fcst_mem#mem#:
-        walltime: 02:00:00
+        walltime: 01:00:00
 task_get_extrn_ics:
   EXTRN_MDL_NAME_ICS: FV3GFS
   FV3GFS_FILE_FMT_ICS: netcdf
@@ -47,7 +44,7 @@ task_run_fcst:
   LAYOUT_X: 50
   LAYOUT_Y: 34
   BLOCKSIZE: 16
-  RESTART_INTERVAL: 6
+  RESTART_INTERVAL: 12 24
   QUILTING: true
   PRINT_ESMF: false
   DO_FCST_RESTART: false

ush/machine/hera.yaml

@@ -38,8 +38,8 @@ platform:
   EXTRN_MDL_DATA_STORES: hpss aws nomads
 
 cpl_aqm_parm:
-  AQM_CONFIG_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/aqm/epa/data
-  DCOMINbio_default: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/aqm/bio
+  AQM_CONFIG_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/fix/aqm/epa/data
+  DCOMINbio_default: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/fix/aqm/bio
   DCOMINdust_default: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/FENGSHA
   DCOMINcanopy_default: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/canopy
   DCOMINfire_default: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/RAVE_fire