From cff6f5c6e48bb04033f49e05bd170072d1f2f590 Mon Sep 17 00:00:00 2001 From: "Chan-Hoo.Jeon-NOAA" <60152248+chan-hoo@users.noreply.github.com> Date: Wed, 5 Jul 2023 12:30:15 -0400 Subject: [PATCH] [develop] Change conda env for AQM on Hera to shared one and fix input data issue on WCOSS2 (#844) * Change the python environments for AQM to the conda in the shared location on Hera and Orion. * Add the input data for AQM fire emission (TEST_AQM_INPUT_BASEDIR) to the shared directory for WE2E. * Fix the missing source attribute in AQM_ICS on WCOSS2 (Cactus). --- modulefiles/tasks/hera/aqm_ics.local.lua | 2 +- modulefiles/tasks/hera/fire_emission.local.lua | 2 +- modulefiles/tasks/hera/miniconda_online-cmaq.lua | 5 ----- modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua | 4 ++++ modulefiles/tasks/hera/nexus_emission.local.lua | 2 +- modulefiles/tasks/hera/nexus_post_split.local.lua | 2 +- modulefiles/tasks/hera/point_source.local.lua | 2 +- modulefiles/tasks/orion/aqm_ics.local.lua | 2 +- modulefiles/tasks/orion/fire_emission.local.lua | 2 ++ modulefiles/tasks/orion/miniconda_online-cmaq.lua | 4 ---- .../tasks/orion/miniconda_regional_workflow_cmaq.lua | 4 ++++ modulefiles/tasks/orion/nexus_emission.local.lua | 2 +- modulefiles/tasks/orion/nexus_post_split.local.lua | 2 +- modulefiles/tasks/orion/point_source.local.lua | 2 +- tests/WE2E/run_WE2E_tests.py | 5 ++++- ush/config_defaults.yaml | 1 + ush/load_modules_run_task.sh | 6 ------ ush/machine/cheyenne.yaml | 1 + ush/machine/hera.yaml | 1 + ush/machine/orion.yaml | 1 + ush/machine/wcoss2.yaml | 1 + 21 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 modulefiles/tasks/hera/miniconda_online-cmaq.lua create mode 100644 modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua create mode 100644 modulefiles/tasks/orion/fire_emission.local.lua delete mode 100644 modulefiles/tasks/orion/miniconda_online-cmaq.lua create mode 100644 modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua diff --git a/modulefiles/tasks/hera/aqm_ics.local.lua b/modulefiles/tasks/hera/aqm_ics.local.lua index 836582f847..4202cbf232 100644 --- a/modulefiles/tasks/hera/aqm_ics.local.lua +++ b/modulefiles/tasks/hera/aqm_ics.local.lua @@ -1,2 +1,2 @@ -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) diff --git a/modulefiles/tasks/hera/fire_emission.local.lua b/modulefiles/tasks/hera/fire_emission.local.lua index 0260ca57cf..ef04528a3f 100644 --- a/modulefiles/tasks/hera/fire_emission.local.lua +++ b/modulefiles/tasks/hera/fire_emission.local.lua @@ -1,3 +1,3 @@ load("hpss") -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) diff --git a/modulefiles/tasks/hera/miniconda_online-cmaq.lua b/modulefiles/tasks/hera/miniconda_online-cmaq.lua deleted file mode 100644 index 9712c40628..0000000000 --- a/modulefiles/tasks/hera/miniconda_online-cmaq.lua +++ /dev/null @@ -1,5 +0,0 @@ -prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -setenv("AQM_ENV_FP", "/scratch2/NCEPDEV/naqfc/RRFS_CMAQ/PY_VENV") -setenv("AQM_ENV", "online-cmaq") diff --git a/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua b/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua new file mode 100644 index 0000000000..c0094e0ab2 --- /dev/null +++ b/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua @@ -0,0 +1,4 @@ +prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "regional_workflow_cmaq") diff --git a/modulefiles/tasks/hera/nexus_emission.local.lua b/modulefiles/tasks/hera/nexus_emission.local.lua index 027881a685..5a7b0cece6 100644 --- a/modulefiles/tasks/hera/nexus_emission.local.lua +++ b/modulefiles/tasks/hera/nexus_emission.local.lua @@ -1,2 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/hera/nexus_post_split.local.lua b/modulefiles/tasks/hera/nexus_post_split.local.lua index 836582f847..4202cbf232 100644 --- a/modulefiles/tasks/hera/nexus_post_split.local.lua +++ b/modulefiles/tasks/hera/nexus_post_split.local.lua @@ -1,2 +1,2 @@ -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) diff --git a/modulefiles/tasks/hera/point_source.local.lua b/modulefiles/tasks/hera/point_source.local.lua index 0ef3de3b66..07cacc8ce2 100644 --- a/modulefiles/tasks/hera/point_source.local.lua +++ b/modulefiles/tasks/hera/point_source.local.lua @@ -1 +1 @@ -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/aqm_ics.local.lua b/modulefiles/tasks/orion/aqm_ics.local.lua index 027881a685..5a7b0cece6 100644 --- a/modulefiles/tasks/orion/aqm_ics.local.lua +++ b/modulefiles/tasks/orion/aqm_ics.local.lua @@ -1,2 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/fire_emission.local.lua b/modulefiles/tasks/orion/fire_emission.local.lua new file mode 100644 index 0000000000..5a7b0cece6 --- /dev/null +++ b/modulefiles/tasks/orion/fire_emission.local.lua @@ -0,0 +1,2 @@ +load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/miniconda_online-cmaq.lua b/modulefiles/tasks/orion/miniconda_online-cmaq.lua deleted file mode 100644 index 3b01515fb6..0000000000 --- a/modulefiles/tasks/orion/miniconda_online-cmaq.lua +++ /dev/null @@ -1,4 +0,0 @@ -load(pathJoin("miniconda", os.getenv("miniconda_ver") or "4.12.0")) - -setenv("SRW_ENV", "/work/noaa/fv3-cam/RRFS_CMAQ/PY_VENV") -setenv("SRW_ENV", "online-cmaq") diff --git a/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua b/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua new file mode 100644 index 0000000000..9d84332bd5 --- /dev/null +++ b/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua @@ -0,0 +1,4 @@ +prepend_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/nexus_emission.local.lua b/modulefiles/tasks/orion/nexus_emission.local.lua index 027881a685..5a7b0cece6 100644 --- a/modulefiles/tasks/orion/nexus_emission.local.lua +++ b/modulefiles/tasks/orion/nexus_emission.local.lua @@ -1,2 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/nexus_post_split.local.lua b/modulefiles/tasks/orion/nexus_post_split.local.lua index 027881a685..5a7b0cece6 100644 --- a/modulefiles/tasks/orion/nexus_post_split.local.lua +++ b/modulefiles/tasks/orion/nexus_post_split.local.lua @@ -1,2 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/point_source.local.lua b/modulefiles/tasks/orion/point_source.local.lua index 0ef3de3b66..07cacc8ce2 100644 --- a/modulefiles/tasks/orion/point_source.local.lua +++ b/modulefiles/tasks/orion/point_source.local.lua @@ -1 +1 @@ -load("miniconda_online-cmaq") +load("miniconda_regional_workflow_cmaq") diff --git a/tests/WE2E/run_WE2E_tests.py b/tests/WE2E/run_WE2E_tests.py index 4a2e6babe0..3ef3649efd 100755 --- a/tests/WE2E/run_WE2E_tests.py +++ b/tests/WE2E/run_WE2E_tests.py @@ -178,7 +178,6 @@ def run_we2e_tests(homedir, args) -> None: if args.verbose_tests: test_cfg['workflow'].update({"VERBOSE": args.verbose_tests}) - logging.debug(f"Overwriting WE2E-test-specific settings for test \n{test_name}\n") if 'task_get_extrn_ics' in test_cfg: @@ -191,6 +190,10 @@ def run_we2e_tests(homedir, args) -> None: if 'verification' in test_cfg: logging.debug(test_cfg['verification']) + 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" + logging.debug(f"Writing updated config.yaml for test {test_name}\n"\ "based on specified command-line arguments:\n") logging.debug(cfg_to_yaml_str(test_cfg)) diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 5a83c090e9..39f76501ac 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -372,6 +372,7 @@ platform: #----------------------------------------------------------------------- # TEST_EXTRN_MDL_SOURCE_BASEDIR: "" + TEST_AQM_INPUT_BASEDIR: "" TEST_PREGEN_BASEDIR: "" TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: "" TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: "" diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh index fcd64d6b64..d3806b279c 100755 --- a/ush/load_modules_run_task.sh +++ b/ush/load_modules_run_task.sh @@ -192,12 +192,6 @@ if [ -n "${SRW_ENV:-}" ] ; then set -u fi -if [ -n "${AQM_ENV:-}" ] ; then - set +u - source "${AQM_ENV_FP}/${AQM_ENV}/bin/activate" - set -u -fi - # #----------------------------------------------------------------------- # diff --git a/ush/machine/cheyenne.yaml b/ush/machine/cheyenne.yaml index c738a772fc..c0e6a3566c 100644 --- a/ush/machine/cheyenne.yaml +++ b/ush/machine/cheyenne.yaml @@ -21,6 +21,7 @@ platform: RUN_CMD_AQMLBC: mpirun -np ${NUMTS} PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' TEST_EXTRN_MDL_SOURCE_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data + TEST_AQM_INPUT_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/aqm_data TEST_PREGEN_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/FV3LAM_pregen TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml index 121e3a91ef..75258583e4 100644 --- a/ush/machine/hera.yaml +++ b/ush/machine/hera.yaml @@ -25,6 +25,7 @@ platform: SCHED_NATIVE_CMD: --export=NONE PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' TEST_EXTRN_MDL_SOURCE_BASEDIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/input_model_data + TEST_AQM_INPUT_BASEDIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/aqm_data TEST_PREGEN_BASEDIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/FV3LAM_pregen TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml index 14221024f3..8393661e45 100644 --- a/ush/machine/orion.yaml +++ b/ush/machine/orion.yaml @@ -25,6 +25,7 @@ platform: SCHED_NATIVE_CMD: --export=NONE PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' TEST_EXTRN_MDL_SOURCE_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/input_model_data + TEST_AQM_INPUT_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/aqm_data TEST_PREGEN_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/FV3LAM_pregen FIXaer: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/fix/fix_aer FIXgsi: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/fix/fix_gsi diff --git a/ush/machine/wcoss2.yaml b/ush/machine/wcoss2.yaml index 6da06b7288..062b00099f 100644 --- a/ush/machine/wcoss2.yaml +++ b/ush/machine/wcoss2.yaml @@ -22,6 +22,7 @@ platform: SCHED_NATIVE_CMD: -l place=excl PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' TEST_EXTRN_MDL_SOURCE_BASEDIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/input_model_data + TEST_AQM_INPUT_BASEDIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/aqm_data TEST_PREGEN_BASEDIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/FV3LAM_pregen FIXaer: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_aer FIXgsm: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/fix/fix_am