From 88b1da8fddbfb8ab07d06700dbd0136c4c3aacdd Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Fri, 25 Oct 2024 15:16:04 -0600 Subject: [PATCH 1/2] EAMxx: change output specs for mam tests The baselines tests only check the first file, so put all snapshots in the same file, not just the t0 snap --- .../output.yaml | 1 - .../mam/homme_shoc_cld_p3_mam_optics_rrtmgp/output.yaml | 1 - .../mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/output.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/output.yaml b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/output.yaml index 5922c718e6e..92c6932fd26 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/output.yaml +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/output.yaml @@ -2,7 +2,6 @@ --- filename_prefix: homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep Averaging Type: Instant -Max Snapshots Per File: 1 Fields: Physics GLL: Field Names: diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/output.yaml b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/output.yaml index be4bb16b95d..eb6be66284a 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/output.yaml +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_p3_mam_optics_rrtmgp/output.yaml @@ -2,7 +2,6 @@ --- filename_prefix: homme_shoc_cld_p3_mam_optics_rrtmgp Averaging Type: Instant -Max Snapshots Per File: 1 Fields: Physics GLL: Field Names: diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/output.yaml b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/output.yaml index afe8437a2cf..28c3e31ff19 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/output.yaml +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav/output.yaml @@ -2,7 +2,6 @@ --- filename_prefix: homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav_output Averaging Type: Instant -Max Snapshots Per File: 1 Fields: Physics GLL: Field Names: From 30b87a90a06436dfca38b239ebcfd08ff78af48f Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Fri, 25 Oct 2024 15:19:56 -0600 Subject: [PATCH 2/2] EAMxx: don't skip layer when using add_subdirectory It prevents us from running "make" or "ctest" in the intermediate layer folder --- .../tests/multi-process/dynamics_physics/CMakeLists.txt | 8 +------- .../multi-process/dynamics_physics/mam/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 components/eamxx/tests/multi-process/dynamics_physics/mam/CMakeLists.txt diff --git a/components/eamxx/tests/multi-process/dynamics_physics/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/CMakeLists.txt index 841b7ea00c6..226a2a92c68 100644 --- a/components/eamxx/tests/multi-process/dynamics_physics/CMakeLists.txt +++ b/components/eamxx/tests/multi-process/dynamics_physics/CMakeLists.txt @@ -8,13 +8,7 @@ if (SCREAM_DOUBLE_PRECISION) add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_128levels) add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_pg2_dp) if (SCREAM_ENABLE_MAM) - # Once the mam4xx aerosol microphysics AtmosphereProcess is running, the - # corresponding test here needs to be reworked with valid aerosol - # initial conditions. - #add_subdirectory(homme_mam4xx_pg2) - add_subdirectory(mam/homme_shoc_cld_p3_mam_optics_rrtmgp) - add_subdirectory(mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep) - add_subdirectory(mam/homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav) + add_subdirectory(mam) endif() endif() endif() diff --git a/components/eamxx/tests/multi-process/dynamics_physics/mam/CMakeLists.txt b/components/eamxx/tests/multi-process/dynamics_physics/mam/CMakeLists.txt new file mode 100644 index 00000000000..c67d46d4ffe --- /dev/null +++ b/components/eamxx/tests/multi-process/dynamics_physics/mam/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(homme_shoc_cld_p3_mam_optics_rrtmgp) +add_subdirectory(homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep) +add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav)