From f2964a6547533366897d20a47ce6035453b916ca Mon Sep 17 00:00:00 2001 From: nicholasbalasus Date: Fri, 20 Oct 2023 15:41:35 -0400 Subject: [PATCH] updates for v2023-10 boundary conditions --- envs/Harvard-Cannon/config.harvard-cannon.yml | 6 +++--- src/write_BCs/config_boundary_conditions.yml | 8 ++++---- src/write_BCs/run_boundary_conditions.sh | 12 +++++++++++- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/envs/Harvard-Cannon/config.harvard-cannon.yml b/envs/Harvard-Cannon/config.harvard-cannon.yml index 7bb79e41..2884030d 100644 --- a/envs/Harvard-Cannon/config.harvard-cannon.yml +++ b/envs/Harvard-Cannon/config.harvard-cannon.yml @@ -168,14 +168,14 @@ RestartDownload: false ## Path to initial GEOS-Chem restart file + prefix ## ("YYYYMMDD_0000z.nc4" will be appended) -RestartFilePrefix: "/n/holylfs05/LABS/jacob_lab/imi/ch4/tropomi-boundary-conditions/v2023-06/GEOSChem.BoundaryConditions." -RestartFilePreviewPrefix: "/n/holylfs05/LABS/jacob_lab/imi/ch4/tropomi-boundary-conditions/v2023-06/GEOSChem.BoundaryConditions." +RestartFilePrefix: "/n/holylfs05/LABS/jacob_lab/imi/ch4/tropomi-boundary-conditions/v2023-10/GEOSChem.BoundaryConditions." +RestartFilePreviewPrefix: "/n/holylfs05/LABS/jacob_lab/imi/ch4/tropomi-boundary-conditions/v2023-10/GEOSChem.BoundaryConditions." ## Path to GEOS-Chem boundary condition files (for nested grid simulations) ## Must put backslash before $ in $YYYY$MM$DD to properly work in sed command ## BCversion will be appended to the end of this path. ${BCpath}/${BCversion} BCpath: "/n/holylfs05/LABS/jacob_lab/imi/ch4/tropomi-boundary-conditions" -BCversion: "v2023-06" +BCversion: "v2023-10" ## Options to download missing GEOS-Chem input data from AWS S3 ## NOTE: Must have AWS CLI enabled diff --git a/src/write_BCs/config_boundary_conditions.yml b/src/write_BCs/config_boundary_conditions.yml index d265f6b8..1f751a10 100644 --- a/src/write_BCs/config_boundary_conditions.yml +++ b/src/write_BCs/config_boundary_conditions.yml @@ -1,9 +1,9 @@ ## Date range (inclusive) that you want to generate BCs for startDate: "20180401" -endDate: "20180531" +endDate: "20230630" ## A directory with a lot of space where you can write the BCs (and intermediate files) -workDir: "/n/holylfs05/LABS/jacob_lab/Users/nbalasus/v2023-09-IMI-Blended-BCs" +workDir: "/n/holylfs05/LABS/jacob_lab/Users/nbalasus/v2023-10-IMI-Blended-BCs" ## Paths to TROPOMI data and blended TROPOMI+GOSAT data tropomiDir: "/n/holylfs05/LABS/jacob_lab/Lab/imi/ch4/tropomi" @@ -13,10 +13,10 @@ blendedDir: "/n/holylfs05/LABS/jacob_lab/Lab/imi/ch4/blended" condaEnv: imi_env geosChemEnv: "/n/home06/nbalasus/envs/gcclassic.rocky+gnu10.minimal.env" geosChemDataPath: "/n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/gcdata/ExtData" -partition: huce_cascade +partition: huce_cascade,seas_compute,huce_ice ## A restart file for GEOS-Chem for your simulation start date (startdate - 16 days) restartFilePath: "/path/to/restart/file" # Debug or not? -debug: false \ No newline at end of file +debug: true \ No newline at end of file diff --git a/src/write_BCs/run_boundary_conditions.sh b/src/write_BCs/run_boundary_conditions.sh index c35cc5f1..72d4f36d 100644 --- a/src/write_BCs/run_boundary_conditions.sh +++ b/src/write_BCs/run_boundary_conditions.sh @@ -98,9 +98,19 @@ if ! ${debug}; then rm "${cwd}/debug.log" fi +# Modify HEMCO_Config.rc to allow for post-2022 GFED4 +sed -i -e "s|DM_TEMP 1997-2022/1-12/01/0 RF|DM_TEMP 1997-2022/1-12/01/0 C|g" \ + -e "s|DM_AGRI 1997-2022/1-12/01/0 RF|DM_AGRI 1997-2022/1-12/01/0 C|g" \ + -e "s|DM_DEFO 1997-2022/1-12/01/0 RF|DM_DEFO 1997-2022/1-12/01/0 C|g" \ + -e "s|DM_BORF 1997-2022/1-12/01/0 RF|DM_BORF 1997-2022/1-12/01/0 C|g" \ + -e "s|DM_PEAT 1997-2022/1-12/01/0 RF|DM_PEAT 1997-2022/1-12/01/0 C|g" \ + -e "s|DM_SAVA 1997-2022/1-12/01/0 RF|DM_SAVA 1997-2022/1-12/01/0 C|g" \ + -e "s|GFED_FRACDAY 2003-2022/1-12/1-31/0 RF|GFED_FRACDAY 2003-2022/1-12/1-31/0 C|g" \ + -e "s|GFED_FRAC3HR 2003-2022/1-12/1/0-23 RF|GFED_FRAC3HR 2003-2022/1-12/1/0-23 C|g" HEMCO_Config.rc + # Modify and submit the run script cp runScriptSamples/operational_examples/harvard_cannon/geoschem.run . -sed -i -e "s|huce_intel,seas_compute,shared|huce_cascade|g" \ +sed -i -e "s|huce_intel,seas_compute,shared|${partition}|g" \ -e "s|--mem=15000|--mem=64000|g" \ -e "s|-t 0-12:00|-t 07-00:00|g"\ -e "s|-c 8|-c 24|g" geoschem.run