Skip to content

Commit 0cb1490

Browse files
Adds missing frac land use file in the namelist for multi-process tests
1 parent ef0721e commit 0cb1490

File tree

7 files changed

+18
-3
lines changed

7 files changed

+18
-3
lines changed

components/eamxx/src/physics/mam/eamxx_mam_dry_deposition_process_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void MAMDryDep::set_grids(
208208

209209
const auto mapping_file = m_params.get<std::string>("drydep_remap_file", "");
210210
const std::string frac_landuse_data_file =
211-
m_params.get<std::string>("fractional_land_use_file", "");
211+
m_params.get<std::string>("fractional_land_use_file");
212212

213213
// Field to be read from file
214214
const std::string field_name = "fraction_landuse";

components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ set (TEST_INPUT_FILES
7979
scream/mam4xx/physprops/ocpho_rrtmg_c20240206.nc
8080
scream/mam4xx/physprops/bcpho_rrtmg_c20240206.nc
8181
scream/mam4xx/physprops/poly_rrtmg_c20240206.nc
82+
scream/mam4xx/drydep/ne2np4/atmsrf_ne2np4_c20241017.nc
8283
)
8384

8485
foreach (file IN ITEMS ${TEST_INPUT_FILES})

components/eamxx/tests/multi-process/dynamics_physics/mam/homme_shoc_cld_mam_aci_p3_mam_optics_rrtmgp_mam_drydep/input.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ atmosphere_processes:
9696
rrtmgp_cloud_optics_file_sw: ${SCREAM_DATA_DIR}/init/rrtmgp-cloud-optics-coeffs-sw.nc
9797
rrtmgp_cloud_optics_file_lw: ${SCREAM_DATA_DIR}/init/rrtmgp-cloud-optics-coeffs-lw.nc
9898
enable_column_conservation_checks: true
99+
mam4_drydep:
100+
# Fractional land use file
101+
drydep_remap_file: ""
102+
fractional_land_use_file: ${SCREAM_DATA_DIR}/mam4xx/drydep/ne2np4/atmsrf_ne2np4_c20241017.nc
99103

100104
grids_manager:
101105
Type: Homme

components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ set (SHOC_MAX_DT 300)
2121
math (EXPR MAC_MIC_SUBCYCLES "(${ATM_TIME_STEP} + ${SHOC_MAX_DT} - 1) / ${SHOC_MAX_DT}")
2222

2323
# Ensure test input files are present in the data dir
24+
set (TEST_INPUT_FILES
25+
scream/mam4xx/drydep/ne2np4/atmsrf_ne2np4_c20241017.nc
26+
)
27+
foreach (file IN ITEMS ${TEST_INPUT_FILES})
28+
GetInputFile(${file})
29+
endforeach()
30+
2431
GetInputFile(scream/init/${EAMxx_tests_IC_FILE_MAM4xx_72lev})
2532
GetInputFile(cam/topo/${EAMxx_tests_TOPO_FILE})
2633

components/eamxx/tests/multi-process/physics_only/mam/shoc_mam4_drydep/input.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ atmosphere_processes:
2929
c_diag_3rd_mom: 7.0
3030
Ckh: 0.1
3131
Ckm: 0.1
32+
mam4_drydep:
33+
# Fractional land use file
34+
drydep_remap_file: ""
35+
fractional_land_use_file: ${SCREAM_DATA_DIR}/mam4xx/drydep/ne2np4/atmsrf_ne2np4_c20241017.nc
3236

3337
grids_manager:
3438
Type: Mesh Free

components/eamxx/tests/single-process/mam/drydep/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/input.yaml
2222
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/output.yaml
2323
${CMAKE_CURRENT_BINARY_DIR}/output.yaml)
2424

25-
# Ensure test input files are present in the data dir
2625
# Ensure test input files are present in the data dir
2726
set (TEST_INPUT_FILES
2827
scream/mam4xx/drydep/ne2np4/atmsrf_ne2np4_c20241017.nc

components/eamxx/tests/single-process/mam/drydep/input.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ time_stepping:
1111
atmosphere_processes:
1212
atm_procs_list: [mam4_drydep]
1313
mam4_drydep:
14-
# MAM4xx-Surface-Emissions
14+
# Fractional land use file
1515
drydep_remap_file: ""
1616
fractional_land_use_file: ${SCREAM_DATA_DIR}/mam4xx/drydep/ne2np4/atmsrf_ne2np4_c20241017.nc
1717

0 commit comments

Comments
 (0)