'workaround for cam.input_data_list

Imported from https://svn-ccsm-models.cgd.ucar.edu/cam1/trunk@90267
Committed by Brian Eaton <[email protected]> at 2018-11-30 15:18:04 -0700
Original svn commit message:

workaround for cam.input_data_list'

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');
         }
     }
 }

bld/namelist_files/namelist_defaults_cam.xml

@@ -450,10 +450,13 @@
 <co2flux_fuel_file hgrid="0.9x1.25" sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_file>
 <co2flux_fuel_file hgrid="1.9x2.5"  sim_year="1850-2000">atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_1.9x2.5_c20181011.nc</co2flux_fuel_file>
 
-<aircraft_specifier hgrid="0.9x1.25" sim_year="1850-2000">ac_CO2 -> ac_CO2_filelist_175001-201512_fv_0.9x1.25_c20181011.txt</aircraft_specifier>
-<aircraft_specifier hgrid="1.9x2.5"  sim_year="1850-2000">ac_CO2 -> ac_CO2_filelist_175001-201512_fv_1.9x2.5_c20181011.txt</aircraft_specifier>
-<aircraft_datapath sim_year="1850-2000">atm/cam/ggas</aircraft_datapath>
-<aircraft_type sim_year="1850-2000">SERIAL</aircraft_type>
+<ac_CO2_emis hgrid="0.9x1.25">ac_CO2_filelist_175001-201512_fv_0.9x1.25_c20181011.txt</ac_CO2_emis>
+<ac_CO2_emis hgrid="1.9x2.5" >ac_CO2_filelist_175001-201512_fv_1.9x2.5_c20181011.txt</ac_CO2_emis>
+<aircraft_datapath >atm/cam/ggas</aircraft_datapath>
+<aircraft_type     >SERIAL</aircraft_type>
+<!-- These CO2 aircraft emission files are the same as in the aircraft_specifier file above (for cam.input_data_list) -->
+<aircraft_co2_file  hgrid="0.9x1.25">atm/cam/ggas/emissions-cmip6_CO2_anthro_ac_175001-201512_fv_0.9x1.25_c20181011.nc</aircraft_co2_file>
+<aircraft_co2_file  hgrid="1.9x2.5" >atm/cam/ggas/emissions-cmip6_CO2_anthro_ac_175001-201512_fv_1.9x2.5_c20181011.nc</aircraft_co2_file>
 
 <!-- DMS surface emissions -->
 <bndtvdms          hgrid="128x256"  >atm/cam/scyc/DMS_emissions_128x256_clim_c040122.nc</bndtvdms>

bld/namelist_files/namelist_definition.xml

@@ -5289,6 +5289,14 @@ Type of time interpolation for data in aircraft aerosol files.
 Default: 'CYCLICAL_LIST'
 </entry>
 
+<entry id="aircraft_co2_file" type="char*256" input_pathname="abs" category="cam_chem"
+       group="camexp" valid_values="" >
+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.
+</entry>
+
 
 
 <entry id="gcr_ionization_datapath" type="char*256" input_pathname="abs" category="cam_chem"

doc/ChangeLog

@@ -1,5 +1,71 @@
 ===============================================================
 
+Tag name: cam6_1_003
+Originator(s): eaton
+Date: Fri Nov 30 15:08:35 MST 2018
+One-line Summary: workaround for cam.input_data_list
+
+Purpose of changes:
+
+. Implement workaround so that the aircraft CO2 emissions used by BGC shows
+  up in the cam.input_data_list file.
+
+. Fix how the aircraft_specifier string is added to the namelist.  Remove
+  illegal characters from the namelist_defaults_cam.xml file.
+
+Bugs fixed (include bugzilla ID): none
+
+Describe any changes made to build system: none
+
+Describe any changes made to the namelist: none
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by: eaton
+
+List all files eliminated: eaton
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+
+components/cam/bld/build-namelist
+. Add default for aircraft_co2_file when BGC is enabled.
+. construct the aircraft_specifier string rather than getting the string
+  from the defaults file.
+
+components/cam/bld/namelist_files/namelist_defaults_cam.xml
+. Add defaults for aircraft_co2_file.
+. Remove illegal xml entry used for aircraft_specifier.  Replaced by entries
+  for ac_CO2_emis which just provides the filename.
+
+components/cam/bld/namelist_files/namelist_definition.xml
+. Add namelist variable aircraft_co2_file to group camexp.  The purpose of
+  this variable is to create an entry in the cam.input_data_list file.
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+cheyenne/intel: PASS
+
+cheyenne/intel/aux_cam: PASS
+
+hobart/nag: PASS
+
+hobart/pgi: PASS
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: BFB
+
+===============================================================
+===============================================================
+
 Tag name: cam6_1_002
 Originator(s): eaton, fvitt
 Date: Thu Nov 29 10:42:15 MST 2018