Skip to content

Commit

Permalink
Final updates for fire tests
Browse files Browse the repository at this point in the history 
 - New variable to WE2E test data, we should use this to consolidate test variables in the future
 - Shorten fire tests to 3 hours
 - Fix extra prints in workflow generation
  • Loading branch information
@mkavulich
mkavulich committed Nov 8, 2024
1 parent 966326e commit a12b8e1
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tests/WE2E/test_configs/fire/config.UFS_FIRE_multifire_one-way-coupled.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ workflow:
PREDEF_GRID_NAME: SUBCONUS_CO_3km
DATE_FIRST_CYCL: '2020081318'
DATE_LAST_CYCL: '2020081318'
FCST_LEN_HRS: 6 # 27 hours of LBCs staged on Derecho
FCST_LEN_HRS: 3 # 27 hours of LBCs staged on Derecho
PREEXISTING_DIR_METHOD: rename
task_get_extrn_ics:
USE_USER_STAGED_EXTRN_FILES: true
Expand All @@ -33,7 +33,7 @@ task_plot_allvars:
fire:
UFS_FIRE: True
FIRE_NUM_TASKS: 1
FIRE_INPUT_DIR: /glade/derecho/scratch/kavulich/FIRE/2024/test_data
FIRE_INPUT_DIR: '{{ platform.WE2E_TEST_DATA }}/UFS_FIRE/{{ workflow.DATE_FIRST_CYCL }}'
DT_FIRE: 0.5
OUTPUT_DT_FIRE: 300
FIRE_NUM_IGNITIONS: 2
Expand Down
4 changes: 2 additions & 2 deletions tests/WE2E/test_configs/fire/config.UFS_FIRE_one-way-coupled.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ workflow:
PREDEF_GRID_NAME: SUBCONUS_CO_3km
DATE_FIRST_CYCL: '2020081318'
DATE_LAST_CYCL: '2020081318'
FCST_LEN_HRS: 6 # 27 hours of LBCs staged on Derecho
FCST_LEN_HRS: 3 # 27 hours of LBCs staged on Derecho
PREEXISTING_DIR_METHOD: rename
task_get_extrn_ics:
USE_USER_STAGED_EXTRN_FILES: true
Expand All @@ -33,7 +33,7 @@ task_plot_allvars:
fire:
UFS_FIRE: True
FIRE_NUM_TASKS: 1
FIRE_INPUT_DIR: /glade/derecho/scratch/kavulich/FIRE/2024/test_data
FIRE_INPUT_DIR: '{{ platform.WE2E_TEST_DATA }}/UFS_FIRE/{{ workflow.DATE_FIRST_CYCL }}'
DT_FIRE: 0.5
OUTPUT_DT_FIRE: 300
FIRE_NUM_IGNITIONS: 1
Expand Down
1 change: 0 additions & 1 deletion ush/generate_FV3LAM_wflow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,6 @@ def generate_FV3LAM_wflow(

nmle = f"{setting.lower()}{i+1}"
fire_nml_dict['fire'][nmle] = expt_config['fire'][setting][i]
print(f"{fire_nml_dict['fire'][nmle]=}")

realize(
input_config=expt_config['workflow']['FIRE_NML_BASE_FP'],
Expand Down
1 change: 1 addition & 0 deletions ush/machine/derecho.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 128
SCHED: pbspro
WE2E_TEST_DATA: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/gaea.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 128
SCHED: slurm
WE2E_TEST_DATA: /gpfs/f5/epic/world-shared/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /gpfs/f5/epic/world-shared/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /gpfs/f5/epic/world-shared/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /gpfs/f5/epic/world-shared/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/hera.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 40
SCHED: slurm
WE2E_TEST_DATA: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/hercules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 80
SCHED: slurm
WE2E_TEST_DATA: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/jet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 24
SCHED: slurm
WE2E_TEST_DATA: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/noaacloud.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: '{{ 44 if (user.ACCOUNT == "cz-epic") else 36 if (user.ACCOUNT == "ca-epic") else 28 }}'
SCHED: slurm
WE2E_TEST_DATA: /contrib/EPIC/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/odin.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 24
SCHED: slurm
WE2E_TEST_DATA: /scratch/ywang/UFS_SRW_App/develop
DOMAIN_PREGEN_BASEDIR: /scratch/ywang/UFS_SRW_App/develop/FV3LAM_pregen
PARTITION_DEFAULT: workq
QUEUE_DEFAULT: workq
Expand Down
1 change: 1 addition & 0 deletions ush/machine/orion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 40
SCHED: slurm
WE2E_TEST_DATA: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop
TEST_CCPA_OBS_DIR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/obs_data/ndas/proc
Expand Down
1 change: 1 addition & 0 deletions ush/machine/stampede.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 68
SCHED: slurm
WE2E_TEST_DATA: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop
DOMAIN_PREGEN_BASEDIR: /work2/00315/tg455890/stampede2/UFS_SRW_App/develop/FV3LAM_pregen
PARTITION_DEFAULT: normal
QUEUE_DEFAULT: normal
Expand Down
1 change: 1 addition & 0 deletions ush/machine/wcoss2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ platform:
WORKFLOW_MANAGER: rocoto
NCORES_PER_NODE: 128
SCHED: pbspro
WE2E_TEST_DATA: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop
TEST_CCPA_OBS_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/obs_data/ccpa/proc
TEST_MRMS_OBS_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/obs_data/mrms/proc
TEST_NDAS_OBS_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/obs_data/ndas/proc
Expand Down

0 comments on commit a12b8e1

Please sign in to comment.