Reduce memory required by MERRA2 option; fix diag_tables for P7 tests; adds C384 P7 tests to Cheyenne.intel

[DeniseWorthen]

PR Checklist

• Ths PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.

• This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

• An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
  are specified below.

• If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

• Updates the ingest of MERRA2 data to reduce the memory footprint of the ingested data.
• Adds MERRA2 fields to the forecast files for both Coupled and Standalone P7 tests. Removes fields which are not also present in diag_table_gfsv16
• Adds C384 P7 tests (cpld_control_c384_p7 and cpld_bmark_p7) tests to Cheyenne.intel

Issue(s) addressed

• fixes diag_tables for P7 tests do not include merra2 variables #865
• fixes C384 P7 coupled tests fail on cheyenne #698

Testing

Testing on hera.intel and hera.gnu show that all P7 tests (coupled and standalone) fail comparison only because of the changes to the forecast files associated with the updated diag_table. All common fields in the forecast files are B4B and all restart files are B4B.

For hera.gnu, the failed tests are:

control_debug_p7 029 failed in check_result
cpld_debug_p7 033 failed in check_result
control_p7 010 failed in check_result
cpld_control_p7 032 failed in check_result

For hera.intel, the failed tests are:

control_debug_p7 063 failed in check_result
control_p7 026 failed in check_result
cpld_control_p7 001 failed in check_result
control_decomp_p7 028 failed in check_result
cpld_decomp_p7 004 failed in check_result
cpld_2threads_p7 003 failed in check_result
control_2threads_p7 029 failed in check_result
cpld_debug_p7 011 failed in check_result
cpld_control_wave_p7 005 failed in check_result
cpld_bmark_p7 010 failed in check_result
cpld_control_c384_p7 008 failed in check_result
cpld_control_c192_p7 006 failed in check_result

RegressionTests_hera.gnu.log
RegressionTests_hera.intel.log

Comparing the sfcf006.nc file in the cpld_control_c384_p7 test against the current baseline using the comparison tool cprnc gives the result:

SUMMARY of cprnc:
 A total number of    158 fields were compared
          of which      0 had non-zero differences
               and      0 had differences in fill patterns
               and      0 had different dimension sizes
 A total number of      0 fields could not be analyzed
 A total number of      6 time-varying fields on file 1 were not found on file 2.
 A total number of      0 time-constant fields on file 1 were not found on file 2.
 A total number of      0 time-varying fields on file 2 were not found on file 1.
 A total number of      0 time-constant fields on file 2 were not found on file 1.
  diff_test: the two files DIFFER only in their field lists

• hera.intel
• hera.gnu
• orion.intel
• cheyenne.intel
• cheyenne.gnu
• gaea.intel
• jet.intel
• wcoss_cray
• wcoss_dell_p3
• CI

Dependencies

• ncar/ccpp #757
• noaa-emc/fv3atm #410

[climbfuji]

Thanks for getting the C384 P7 tests going on Cheyenne!

[junwang-noaa]

@DeniseWorthen Is the diag_table for cpld_bmark_p7 correct? Since it has merra2 update, I assume the diag_table will contain the 6 AOD fields too.

[DeniseWorthen]

@junwang-noaa All the coupled tests use the same file, diag_table_template. This is identical to diag_table_gfsv16_merra2 but with the addition of the MOM6 output. The standalone P7 tests will now also use diag_table_gfsv16_merra2.

[DeniseWorthen]

Closed. Code will be committed in PR #831