Update to AQM yamls.

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

@@ -22,7 +22,8 @@ workflow:
 nco:
   NET_default: aqm
 rocoto:
-  task_aqm_ics_ext: !remove
+  tasks:
+    task_aqm_ics_ext: !remove
 task_get_extrn_ics:
   envvars:
     EXTRN_MDL_NAME_ICS: FV3GFS

ush/config.aqm.yaml

@@ -25,39 +25,48 @@ workflow:
   WARMSTART_CYCLE_DIR: '/scratch2/NAGAPE/epic/SRW-AQM_DATA/aqm_data/restart/2023111000' # for hera
 #  WARMSTART_CYCLE_DIR: '/work/noaa/epic/SRW-AQM_DATA/aqm_data/restart/2023111000' # for orion/hercules
 #  WARMSTART_CYCLE_DIR: '/glade/work/chanhooj/SRW-AQM_DATA/aqm_data/restart/2023111000' # for derecho
+  taskgroups:
+    - parm/wflow/prep.yaml
+    - parm/wflow/aqm_prep.yaml
+    - parm/wflow/coldstart.yaml
+    - parm/wflow/post.yaml
 nco:
   envir_default: test_aqm_warmstart
   NET_default: aqm
   RUN_default: aqm
-rocoto:
-  tasks:
-    taskgroups: '{{ ["parm/wflow/prep.yaml", "parm/wflow/aqm_prep.yaml", "parm/wflow/coldstart.yaml", "parm/wflow/post.yaml"]|include }}'
-#    task_aqm_ics_ext:    # uncomment this in case of COLDSTART: true
-    metatask_run_ensemble:
-      task_run_fcst_mem#mem#:
-        walltime: 01:20:00
+#rocoto: # uncomment this section in case of COLDSTART: true
+#  tasks:
+#    task_aqm_ics_ext: !remove
 task_get_extrn_ics:
-  EXTRN_MDL_NAME_ICS: FV3GFS
-  FV3GFS_FILE_FMT_ICS: netcdf
-  EXTRN_MDL_ICS_OFFSET_HRS: 0
+  envvars:
+    EXTRN_MDL_NAME_ICS: FV3GFS
+    FV3GFS_FILE_FMT_ICS: netcdf
+    EXTRN_MDL_ICS_OFFSET_HRS: 0
 task_get_extrn_lbcs:
-  EXTRN_MDL_NAME_LBCS: FV3GFS
-  LBC_SPEC_INTVL_HRS: 6
-  FV3GFS_FILE_FMT_LBCS: netcdf
-  EXTRN_MDL_LBCS_OFFSET_HRS: 0
+  envvars:
+    EXTRN_MDL_NAME_LBCS: FV3GFS
+    LBC_SPEC_INTVL_HRS: 6
+    FV3GFS_FILE_FMT_LBCS: netcdf
+    EXTRN_MDL_LBCS_OFFSET_HRS: 0
 task_run_fcst:
-  OMP_NUM_THREADS_RUN_FCST: 1
-  DT_ATMOS: 180
+  fv3:
+    execution:
+      batchargs:
+        walltime: 01:20:00
+  envvars:
+    DT_ATMOS: 180
+    OMP_NUM_THREADS_RUN_FCST: 1
+    PRINT_ESMF: false
+    RESTART_INTERVAL: 12 24
+    DO_FCST_RESTART: false
   LAYOUT_X: 50
   LAYOUT_Y: 34
   BLOCKSIZE: 16
-  RESTART_INTERVAL: 12 24
   QUILTING: true
-  PRINT_ESMF: false
-  DO_FCST_RESTART: false
 task_run_post:
-  POST_OUTPUT_DOMAIN_NAME: 793
-  USE_CUSTOM_POST_CONFIG_FILE: false
+  envvars:
+    POST_OUTPUT_DOMAIN_NAME: 793
+    USE_CUSTOM_POST_CONFIG_FILE: false
 global:
   DO_ENSEMBLE: false
   NUM_ENS_MEMBERS: 2