Merge pull request #3066 from E3SM-Project/bartgol/eamxx/fix-mam-standalone-baselines-test

bartgol · web-flow · commit 65dca4e0e66f · 2024-10-28T08:45:47.000-06:00
diff --git 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
@@ -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)
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
@@ -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
@@ -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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+add_subdirectory(homme_shoc_cld_p3_mam_optics_rrtmgp)`
	`2`	`+add_subdirectory(homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep)`
	`3`	`+add_subdirectory(homme_shoc_cld_spa_p3_rrtmgp_mam4_wetscav)`