From 4d4f8e7f38aba1eac565b02328a7c714343d6e18 Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Wed, 30 Oct 2024 20:49:11 -0600 Subject: [PATCH 1/2] EAMxx: ensure download of standalone input file --- .../mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt index 41a915b9265..3f5103cb199 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt @@ -70,6 +70,7 @@ set (TEST_INPUT_FILES scream/init/spa_init_ne2np4.nc scream/init/spa_file_unified_and_complete_ne2np4L72_20231222.nc scream/init/${EAMxx_tests_IC_FILE_72lev} + scream/init/scream_unit_tests_aerosol_optics_ne2np4L72_20220822.nc cam/topo/${EAMxx_tests_TOPO_FILE} ) foreach (file IN ITEMS ${TEST_INPUT_FILES}) From 4606db33d1939c62fb6e33a573889812db4ea0f7 Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Wed, 30 Oct 2024 22:03:06 -0600 Subject: [PATCH 2/2] EAMxx: use standard mam4xx IC file for wetscav test too --- .../homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt | 1 - .../mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/input.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt index 3f5103cb199..41a915b9265 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/CMakeLists.txt @@ -70,7 +70,6 @@ set (TEST_INPUT_FILES scream/init/spa_init_ne2np4.nc scream/init/spa_file_unified_and_complete_ne2np4L72_20231222.nc scream/init/${EAMxx_tests_IC_FILE_72lev} - scream/init/scream_unit_tests_aerosol_optics_ne2np4L72_20220822.nc cam/topo/${EAMxx_tests_TOPO_FILE} ) foreach (file IN ITEMS ${TEST_INPUT_FILES}) diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/input.yaml b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/input.yaml index c9b493a2958..6778e18ad8d 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/input.yaml +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/input.yaml @@ -9,7 +9,7 @@ time_stepping: number_of_steps: ${NUM_STEPS} initial_conditions: - Filename: ${SCREAM_DATA_DIR}/init/scream_unit_tests_aerosol_optics_ne2np4L72_20220822.nc + Filename: ${SCREAM_DATA_DIR}/init/${EAMxx_tests_IC_FILE_MAM4xx_72lev} topography_filename: ${TOPO_DATA_DIR}/${EAMxx_tests_TOPO_FILE} pbl_height: 25.0 phis : 0.1