diff --git a/bld/build-namelist b/bld/build-namelist index 2b470043b8..3e28337687 100755 --- a/bld/build-namelist +++ b/bld/build-namelist @@ -895,9 +895,17 @@ if ($co2_cycle) { # Check whether user has explicitly turned off reading the aircraft CO2 dataset. # (user specification has higher precedence than the true value set above) if ($nl->get_value('co2_readflux_aircraft') =~ /$TRUE/io) { - add_default($nl, 'aircraft_specifier'); + + my $rel_filepath = get_default_value('ac_CO2_emis'); + my $emisval = quote_string('ac_CO2 -> ' . $rel_filepath); + add_default($nl, 'aircraft_specifier', 'val'=>$emisval); + add_default($nl, 'aircraft_datapath'); add_default($nl, 'aircraft_type'); + # This should be the same file as the one in the aircraft_specifier file. + # This is a workaround to get this filepath into the cam.input_data_list file + # to allow the CESM scripts to obtain all required data for a run. + add_default($nl, 'aircraft_co2_file'); } } } diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index aa77beaba3..f2748d709d 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -450,10 +450,13 @@ atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc -ac_CO2 -> ac_CO2_filelist_175001-201512_fv_0.9x1.25_c20181011.txt -ac_CO2 -> ac_CO2_filelist_175001-201512_fv_1.9x2.5_c20181011.txt -atm/cam/ggas -SERIAL +ac_CO2_filelist_175001-201512_fv_0.9x1.25_c20181011.txt +ac_CO2_filelist_175001-201512_fv_1.9x2.5_c20181011.txt +atm/cam/ggas +SERIAL + +atm/cam/ggas/emissions-cmip6_CO2_anthro_ac_175001-201512_fv_0.9x1.25_c20181011.nc +atm/cam/ggas/emissions-cmip6_CO2_anthro_ac_175001-201512_fv_1.9x2.5_c20181011.nc atm/cam/scyc/DMS_emissions_128x256_clim_c040122.nc diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml index 44dc657bf3..996c05f8df 100644 --- a/bld/namelist_files/namelist_definition.xml +++ b/bld/namelist_files/namelist_definition.xml @@ -5289,6 +5289,14 @@ Type of time interpolation for data in aircraft aerosol files. Default: 'CYCLICAL_LIST' + +Full pathname of the ac_CO2 file specified in the filelist in +{{ hilight }}aircraft_specifier{{ closehilight }}. This is only to +get this name into the cam.input_data_list for the CESM scripts. +Default: set by build-namelist. + +