Skip to content

Commit 0b317ca

Browse files
Adds capability to automatically pick the init file and removes init files from testmods
1 parent a7b69b6 commit 0b317ca

File tree

8 files changed

+8
-46
lines changed

8 files changed

+8
-46
lines changed

components/eamxx/cime_config/namelist_defaults_scream.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ be lost if SCREAM_HACK_XML is not enabled.
3737
<selector name="hgrid" case_env="ATM_GRID"/>
3838
<selector name="dyn" case_env="CAM_TARGET"/>
3939
<selector name="nlev" case_env="SCREAM_CMAKE_OPTIONS" regex=".*SCREAM_NUM_VERTICAL_LEV ([0-9]+).*"/>
40+
<selector name="ntracers" case_env="SCREAM_CMAKE_OPTIONS" regex=".*SCREAM_NUM_TRACERS ([0-9]+).*"/>
41+
4042
</selectors>
4143

4244
<!-- List of scream grids for a given compset. I/O can only happen on these grids -->
@@ -245,7 +247,7 @@ be lost if SCREAM_HACK_XML is not enabled.
245247

246248
<!-- MAM4xx-Dry Deposition -->
247249
<mam4_drydep inherit="atm_proc_base">
248-
<fractional_land_use_file type="file" doc="File containing Fractional land use data for drydep">${DIN_LOC_ROOT}/atm/scream/mam4xx/drydep/ne4pg2/atmsrf_ne30pg2_c20241017.nc</fractional_land_use_file>
250+
<fractional_land_use_file type="file" doc="File containing Fractional land use data for drydep">${DIN_LOC_ROOT}/atm/scream/mam4xx/drydep/ne30pg2/atmsrf_ne30pg2_c20241017.nc</fractional_land_use_file>
249251
<fractional_land_use_file hgrid="ne4np4.pg2" type="file" doc="File containing Fractional land use data for drydep">${DIN_LOC_ROOT}/atm/scream/mam4xx/drydep/ne4pg2/atmsrf_ne4pg2_c20241017.nc</fractional_land_use_file>
250252

251253
<!-- Mapping Files for finer resolutions -->
@@ -497,8 +499,10 @@ be lost if SCREAM_HACK_XML is not enabled.
497499
<initial_conditions>
498500
<Filename type="file">UNSET</Filename>
499501
<Filename hgrid="ne4np4">${DIN_LOC_ROOT}/atm/scream/init/screami_ne4np4L72_20220823.nc</Filename>
502+
<Filename hgrid="ne4np4" ntracers="41">${DIN_LOC_ROOT}/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc</Filename>
500503
<Filename hgrid="ne30np4" nlev="72">${DIN_LOC_ROOT}/atm/scream/init/screami_ne30np4L72_20220823.nc</Filename>
501504
<Filename hgrid="ne30np4" nlev="128">${DIN_LOC_ROOT}/atm/scream/init/screami_ne30np4L128_20221004.nc</Filename>
505+
<Filename hgrid="ne30np4" nlev="72" ntracers="41">${DIN_LOC_ROOT}/atm/scream/init/screami_mam_ne30np4L72_c20240623.nc</Filename>
502506
<Filename hgrid="ne120np4" nlev="72">${DIN_LOC_ROOT}/atm/scream/init/screami_ne120np4L72_20220823.nc</Filename>
503507
<Filename hgrid="ne120np4" nlev="128">${DIN_LOC_ROOT}/atm/scream/init/screami_ne120np4L128_20230215.nc</Filename>
504508
<Filename hgrid="ne256np4">${DIN_LOC_ROOT}/atm/scream/init/screami_ne256np4L128_ifs-20200120_20220914.nc</Filename>

components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/aci/shell_commands

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
#------------------------------------------------------
66
$CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh
77

8-
#modify initial condition file to get aerosol species ICs
9-
$CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b
10-
118
# Add spa as RRTMG needs spa
129
$CIMEROOT/../components/eamxx/scripts/atmchange physics::atm_procs_list="mac_aero_mic,spa,rrtmgp" -b
1310

components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/drydep/shell_commands

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
$CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh -b
99

1010
#------------------------------------------------------
11-
#Update IC file and add drydep process
11+
# Add drydep process
1212
#------------------------------------------------------
13-
$CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b
1413
$CIMEROOT/../components/eamxx/scripts/atmchange physics::atm_procs_list="mac_aero_mic,rrtmgp,mam4_drydep" -b
1514

1615

components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/optics/shell_commands

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#------------------------------------------------------
55
$CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh
66

7-
$CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b
87
$CIMEROOT/../components/eamxx/scripts/atmchange physics::atm_procs_list="mac_aero_mic,mam4_optics,rrtmgp" -b
98

109

components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/srf_online_emiss_constituent_fluxes/shell_commands

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
$CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh -b
99

1010
#------------------------------------------------------
11-
#Update IC file and add the processes
11+
# Add the processes
1212
#------------------------------------------------------
13-
$CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b
1413
$CIMEROOT/../components/eamxx/scripts/atmchange physics::atm_procs_list="mam4_constituent_fluxes,mac_aero_mic,rrtmgp,mam4_srf_online_emiss" -b
1514

1615

components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/wetscav/shell_commands

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
$CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh -b
88

99
#------------------------------------------------------
10-
#Update IC file and add wetscav process
10+
# Add wetscav process
1111
#------------------------------------------------------
12-
$CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b
1312
$CIMEROOT/../components/eamxx/scripts/atmchange physics::atm_procs_list="mac_aero_mic,mam4_wetscav,rrtmgp" -b

components/eamxx/src/physics/mam/readfiles/common_file_read_func.hpp

Lines changed: 0 additions & 33 deletions
This file was deleted.

components/eamxx/src/physics/mam/srf_emission_impl.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ void srfEmissFunctions<S, D>::update_srfEmiss_data_from_file(
219219
srfEmiss_horiz_interp.get_tgt_field(i).get_view<const Real *>();
220220
const auto emiss =
221221
Kokkos::subview(srfEmiss_input.data.emiss_sectors, i, Kokkos::ALL());
222-
printf("BALLI:%i, %i,%i, %i\n",emiss.extent(0),emiss.extent(1),sector.extent(0),sector.extent(1));
223222
Kokkos::deep_copy(emiss, sector);
224223
}
225224

@@ -282,7 +281,6 @@ void srfEmissFunctions<S, D>::init_srf_emiss_objects(
282281
SrfEmissData_start = srfEmissInput(ncol, sectors.size());
283282
SrfEmissData_end = srfEmissInput(ncol, sectors.size());
284283
SrfEmissData_out.init(ncol, 1, true);
285-
std::cout<<"BALLI-ncol1:"<<ncol<<":"<<SrfEmissData_start.data.emiss_sectors.extent(0)<<std::endl;
286284

287285
// Create reader (an AtmosphereInput object)
288286
SrfEmissDataReader =

0 commit comments

Comments
 (0)