From d3be7eb854288bb524bf1b80ba9cb0804c55e50a Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Thu, 22 Jun 2023 19:11:13 +0000 Subject: [PATCH 1/7] replace python env with shared loc --- 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 +- 7 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 modulefiles/tasks/hera/miniconda_online-cmaq.lua create mode 100644 modulefiles/tasks/hera/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") From a1cc776b7d7038ba19ee634d2f3fe90ebfeea93d Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Thu, 22 Jun 2023 19:22:42 +0000 Subject: [PATCH 2/7] remove unnecessary env --- ush/load_modules_run_task.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh index a3b8aaca5a..fe8dc68ff2 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 - # #----------------------------------------------------------------------- # From f4d9560cba805a36a234506f7870ea8a8cefdade Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Sat, 24 Jun 2023 15:38:43 +0000 Subject: [PATCH 3/7] add test_aqm_input_basedir --- tests/WE2E/run_WE2E_tests.py | 8 +++++--- ush/config_defaults.yaml | 1 + ush/machine/cheyenne.yaml | 1 + ush/machine/hera.yaml | 1 + ush/machine/orion.yaml | 1 + ush/machine/wcoss2.yaml | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/WE2E/run_WE2E_tests.py b/tests/WE2E/run_WE2E_tests.py index f83073a735..129d4c2fe6 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: @@ -187,10 +186,13 @@ def run_we2e_tests(homedir, args) -> None: if 'task_get_extrn_lbcs' in test_cfg: test_cfg['task_get_extrn_lbcs'] = check_task_get_extrn_bcs(test_cfg,machine_defaults, config_defaults,"lbcs") - 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']['AQM_FIRE_DIR'] = 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)) @@ -484,7 +486,7 @@ def setup_logging(logfile: str = "log.run_WE2E_tests", debug: bool = False) -> N help='Explicitly set DEBUG=TRUE for all experiments') parser.add_argument('--verbose_tests', action='store_true', help='Explicitly set VERBOSE=TRUE for all experiments') - + parser._action_groups.append(optional) args = parser.parse_args() diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 7ea9dd501b..eab381455f 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/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 7604301fa3..3ef38c85fc 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 2703451bf1..8f6c9332dd 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 From 0b22f4c77444350aa2ff5c7988cc5f422a349a17 Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Sat, 24 Jun 2023 15:55:58 +0000 Subject: [PATCH 4/7] adjust line space --- tests/WE2E/run_WE2E_tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/WE2E/run_WE2E_tests.py b/tests/WE2E/run_WE2E_tests.py index 129d4c2fe6..5586a155b9 100755 --- a/tests/WE2E/run_WE2E_tests.py +++ b/tests/WE2E/run_WE2E_tests.py @@ -186,6 +186,7 @@ def run_we2e_tests(homedir, args) -> None: if 'task_get_extrn_lbcs' in test_cfg: test_cfg['task_get_extrn_lbcs'] = check_task_get_extrn_bcs(test_cfg,machine_defaults, config_defaults,"lbcs") + if 'verification' in test_cfg: logging.debug(test_cfg['verification']) @@ -486,7 +487,7 @@ def setup_logging(logfile: str = "log.run_WE2E_tests", debug: bool = False) -> N help='Explicitly set DEBUG=TRUE for all experiments') parser.add_argument('--verbose_tests', action='store_true', help='Explicitly set VERBOSE=TRUE for all experiments') - + parser._action_groups.append(optional) args = parser.parse_args() From cdcebcb68cad52ef3ceac4d71840246b45ef871d Mon Sep 17 00:00:00 2001 From: chan-hoo Date: Sat, 24 Jun 2023 16:59:45 +0000 Subject: [PATCH 5/7] update aqm-utils --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 1807bc4b3c..b0800ccd0c 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -58,7 +58,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/AQM-utils # Specify either a branch name or a hash but not both. #branch = develop -hash = 0a86f73 +hash = 17c7957 local_path = sorc/AQM-utils required = True From ca7d96bde49adb9e448183f1bc645604a28e38f3 Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Mon, 26 Jun 2023 17:03:05 +0000 Subject: [PATCH 6/7] update conda env for orion --- modulefiles/tasks/orion/aqm_ics.local.lua | 2 +- modulefiles/tasks/orion/fire_emission.local.lua | 2 ++ modulefiles/tasks/orion/miniconda_online-cmaq.lua | 4 ---- modulefiles/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 +- 7 files changed, 10 insertions(+), 8 deletions(-) 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/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") From 8638e02e65d5d2ef649b8bea7171c98bb1fe603c Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Fri, 30 Jun 2023 12:09:41 +0000 Subject: [PATCH 7/7] update aqm_fire_dir with the latest change --- tests/WE2E/run_WE2E_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/WE2E/run_WE2E_tests.py b/tests/WE2E/run_WE2E_tests.py index 6586df96e3..3ef3649efd 100755 --- a/tests/WE2E/run_WE2E_tests.py +++ b/tests/WE2E/run_WE2E_tests.py @@ -192,7 +192,7 @@ def run_we2e_tests(homedir, args) -> None: if 'cpl_aqm_parm' in test_cfg: test_aqm_input_basedir = machine_defaults['platform']['TEST_AQM_INPUT_BASEDIR'] - test_cfg['cpl_aqm_parm']['AQM_FIRE_DIR'] = f"{test_aqm_input_basedir}/RAVE_fire" + 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")