Merge pull request #4 from noaa-oar-arl/online-cmaq

Added Fengsha path to conus sample config and other small mods.
JianpingHuang-NOAA · Oct 5, 2022 · 08de772 · 08de772
2 parents 1253237 + d438323
commit 08de772
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/ush/create_aqm_rc_file.py b/ush/create_aqm_rc_file.py
@@ -66,7 +66,7 @@ def create_aqm_rc_file(cdate, run_dir, init_concentrations):
     aqm_fengsha_file_fn=AQM_FENGSHA_FILE_PREFIX+"_"+PREDEF_GRID_NAME+AQM_FENGSHA_FILE_SUFFIX
     aqm_rc_fengsha_file_fp=os.path.join(AQM_FENGSHA_DIR, aqm_fengsha_file_fn)
     aqm_canopy_file_fn=AQM_CANOPY_FILE+"."+mm+AQM_CANOPY_FILE_SUFFIX
-    aqm_rc_canopy_file_fp=os.path.join(AQM_CANOPY_DIR, aqm_canopy_file_fn)
+    aqm_rc_canopy_file_fp=os.path.join(AQM_CANOPY_DIR, PREDEF_GRID_NAME, aqm_canopy_file_fn)
     aqm_fire_file_fn=AQM_FIRE_FILE+"_"+yyyymmdd+"_t"+hh+"z"+AQM_FIRE_FILE_SUFFIX
     aqm_rc_fire_file_fp=os.path.join(AQM_FIRE_DIR, yyyymmdd, aqm_fire_file_fn)
     #

diff --git a/ush/sample_config/EMC_run/config.yaml_canopy_nco_aqmna13km_1day_hera b/ush/sample_config/EMC_run/config.yaml_canopy_nco_aqmna13km_1day_hera
@@ -7,9 +7,9 @@ user:
 workflow:
   USE_CRON_TO_RELAUNCH: true
   CRON_RELAUNCH_INTVL_MNTS: 3
-#  EXPT_BASEDIR: /scratch2/NCEPDEV/stmp3/Chan-hoo.Jeon/expt_dirs
-  EXPT_SUBDIR: aqm.v7.0.c7
-  CCPP_PHYS_SUITE: FV3_GFS_v16
+#  EXPT_BASEDIR: /scratch1/NCEPDEV/stmp4/Patrick.C.Campbell/expt_dirs
+  EXPT_SUBDIR: aqm_canopy_na13_1day
+  CCPP_PHYS_SUITE: FV3_GFS_v15p2
   DATE_FIRST_CYCL: '20200915'
   DATE_LAST_CYCL: '20200915'
   CYCL_HRS:
@@ -74,7 +74,7 @@ cpl_aqm_parm:
   AQM_FENGSHA_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/FENGSHA
   AQM_FENGSHA_FILE_PREFIX: FENGSHA_p8_10km_inputs
   AQM_FENGSHA_FILE_SUFFIX: .nc
-  AQM_CANOPY_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/canopy/793
+  AQM_CANOPY_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/canopy
   AQM_CANOPY_FILE: gfs.t12z.geo
   AQM_CANOPY_FILE_SUFFIX: .canopy_regrid.nc
   AQM_FIRE_DIR: /scratch2/NCEPDEV/naqfc/Jianping.Huang/Data/emissions/GSCE/RAVE.in.793/RAVE_RT

diff --git a/...onfig.yaml_canopy_rrfsconus13km_1day_hera → ...onfig.yaml_canopy_nco_conus13km_1day_hera b/...onfig.yaml_canopy_rrfsconus13km_1day_hera → ...onfig.yaml_canopy_nco_conus13km_1day_hera
@@ -1,13 +1,13 @@
 metadata:
-  description: config for Online-CMAQ, RRFS_CONUScompact_13km, canopy, 1cycle a day
+  description: config for Online-CMAQ, RRFS_CONUScompact_13km, 1cycle a day
 user:
   RUN_ENVIR: community
   MACHINE: hera
   ACCOUNT: naqfc
 workflow:
   USE_CRON_TO_RELAUNCH: true
   CRON_RELAUNCH_INTVL_MNTS: 3
-#  EXPT_BASEDIR: /scratch2/NCEPDEV/stmp3/Chan-hoo.Jeon/expt_dirs
+#    EXPT_BASEDIR: /scratch1/NCEPDEV/stmp4/Patrick.C.Campbell/expt_dirs
   EXPT_SUBDIR: aqm_canopy_conus13_1day
   CCPP_PHYS_SUITE: FV3_GFS_v15p2
   DATE_FIRST_CYCL: '20190801'
@@ -60,7 +60,10 @@ cpl_aqm_parm:
   AQM_CONFIG_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/aqm/epa/data
   AQM_BIO_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/aqm/bio
   AQM_BIO_FILE: BEIS_RRFScmaq_C775.ncf
-  AQM_CANOPY_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/canopy/CONUS13km
+  AQM_FENGSHA_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/FENGSHA
+  AQM_FENGSHA_FILE_PREFIX: FENGSHA_p8_10km_inputs
+  AQM_FENGSHA_FILE_SUFFIX: .nc
+  AQM_CANOPY_DIR: /scratch2/NCEPDEV/naqfc/RRFS_CMAQ/canopy
   AQM_CANOPY_FILE: gfs.t12z.geo
   AQM_CANOPY_FILE_SUFFIX: .canopy_regrid.nc
   AQM_FIRE_DIR: /scratch2/NCEPDEV/naqfc/Jianping.Huang/Data/emissions/GSCE/GBBEPx.in.C775/Reprocessed