new datm optional streams for ndep, presaero, co2 and o3

[mvertens]

Description of changes

This introduces the following new stream modules that are optional and can be added to the datamode streams already in place:

Specific notes

The following new modules have been added

• datm_pres_aero_mod.F90
• datm_pres_co2_mod.F90
• datm_pres_ndep_mod.F90
• datm_pres_o3_mod.F90

For datm_pres_ndep_mod.F90:

• also added new nitrogen deposition cmip7 stream which be accessed by the settings for DATM_PRESNDEP: clim_1850_cmip7 and hist_cmip7. These are currently not the default and need to be set vial an xmlchange command - e.g. ./xmlchage DATM_PRESNDEP=clim_1850_cmip7. Also note that for the cmip7 data, no unit conversion is done whereas for the default cmip6 data the input data is converted from g/m2/sec to kg/m2/sec.

For datm_pres_co2_mod.F90:

• added the following logic which will change answers for non-CPLHIST mode

  if (datamode == 'CPLHIST') then
       Sa_co2diag(:) = strm_Sa_co2diag(:)
       Sa_co2prog(:) = strm_Sa_co2prog(:)
  else
       ! This is intentional since we don't have any Sa_co2prog - but for now
       ! will set Sa_co2prog equal to Sa_co2diag
       Sa_co2diag(:) = strm_Sa_co2diag(:)
       Sa_co2prog(:) = strm_Sa_co2diag(:)
  end if

Also removed references to water isotopes in DATM since this will be refactored in upcoming work.

Contributors other than yourself, if any: None

CDEPS Issues Fixed: #30

Are there dependencies on other component PRs: No

Are changes expected to change answers (bfb): bfb unless the cmip7 ndep is used, or when datm_pres_co2 is used

Any User Interface Changes: add new options for DATM_PRESNDEP

Testing performed:

• ran aux_cdeps_noresm and compared to noresm3_0_beta09
  • the only diffs were for CO2_PROG which has been changed based on the above.
• ran aux_blom_noresm and compared to noresm3_0_beta09
  • all results are bfb as well as expected fails EXCEPT for the ndep fields and Sa_co2prog fields from DATM
• ran aux_clm_noresm and compared to ctsm5.4.002_noresm_v1
  • everything is bfb - but diffs are that atmImp_Sa_co2prog and lndExp_Sa_co2prog are both nonzero, and lndExp_Sa_o3 is now on the mediator history files

Hashes used for testing:
noresm3_0_beta09 with the above cdeps branch

[mvertens]

Reopening to make smaller PRs.

[gold2718]

This mostly looks okay but I have a few suggestions. In addition to the suggestions below, there are a few that are not related to the recent changes:

Should dlnd/stream_definition_dlnd.xml be deleted?

In the stream_definition_dxxx.xml files, I think this line:

<?xml-stylesheet type="text/xsl" href="namelist_definition.xsl"?>

should be removed. The correct schema is in <root>/cime_config/stream_definition_v2.0.xsd, however, I'm not sure how to document this other than what is already in the top level <stream_data> tag.

I think the namelist_definition_dxxx.xml files also have an outdated and non-functional stylesheet header.

[mvertens]

@gold2718 - I have only updated the files in datm/*.F90 with these suggestions. I think they are relevant to all of the data component files - but I will defer that to the major refactor PR #28.

[gold2718]

This looks great now, thanks!

[gold2718]

Please make the one small fix before merging but otherwise, this looks good.

[gold2718]

Please fix this:

Suggested change

	character(*),parameter :: subName = '(shr_lnd2rof_tracers_readnl) '
	character(len=*),parameter :: subName = '(shr_lnd2rof_tracers_readnl) '

[mvertens]

This is code used by UFS and needs to stay in sync with ESCOMP moving forwards.