new datm optional streams - closing

[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:

• added new streams clim_1850_cmip7, clim_2000_cmip7, clim_2010_cmip7, and hist_cmip7 (currently these are only used by NorESM)
• renamed the following streams
  • clim_1850 -> clim_1850_cmip6
  • clim_2000 -> clim_2000_cmip6
  • ciim_2010 -> clim_2010_cmip6
  • hist -> hist_cmip6
    by default for CESM, the following cmip6 streams will be used (whereas for NorESM, the cmip7 streams are used)
    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 modules since this will be refactored in upcoming work.
• removed style sheet references in all component namelist_definition_dXXX.xml and stream_definition_dXXX.xml since they are not used.

Contributors other than yourself, if any: None

CDEPS Issues Fixed: #370
The following tests now have correct values of o3 sent to

ERI_D_Ld11.ne30pg3_ne30pg3_mtn14.I1850Clm60FatesNocompSpinup.betzy_gnu.clm-FatesColdSpinupAD
ERS_D_Ld11.ne30pg3_ne30pg3_mtn14.I1850Clm60FatesNocompSpinup.betzy_intel.clm-FatesColdSpinup
SMS_D_Ld1000_P1536.ne30pg3_ne30pg3_mtn14.I1850Clm60FatesNocompSpinup.betzy_gnu.clm-FatesColdSpinup

Are there dependencies on other component PRs: This PR contains all the changes from CDEPS PR #368.

Are changes expected to change answers (bfb): bfb except for Sa_o3 bug fix and when DATM_PRES_CO2 is used.

Any User Interface Changes: add new options for DATM_PRESNDEP

Testing performed: Successfully carried out aux_cdeps_noresm, aux_blom_noresm and aux_clm_noresm with a corresonding PR in NorESMhub (see testing description in NorESMhub#27).

Hashes used for testing:

[jedwards4b]

Should we just remove the commented section?

[mvertens]

I'm happy to remove this - but I thought @billsacks felt there was needed (unless my recollection is wrong).

[billsacks]

I remember talking about this or something similar, where I suggested removing it from aux_cdeps but maybe keeping it in aux_cdeps_noresm if it seemed like something that might work in NorESM or might be revived there. But I don't have strong feelings on this and am fine removing this if there is unlikely to be a desire to have this working in the near future.

[billsacks]

@mvertens - I had hoped that, by merging #368 , the diffs in this PR would be reduced and no longer include the changes from #368 , but that doesn't seem to be the case. Can you try to do whatever is needed to show just the diffs in this PR relative to what was already reviewed and merged in #368 ? Maybe it would help to merge main into this branch... if not, a new PR may be needed. I'm confused about the history here myself.

[mvertens]

closing in favor of #373