ctsm5.4.034: bug fix to the FATES land use driver input code

[adrifoster]

Description of changes

This PR includes a cherry-picked fix from NorESMhub/CTSM #209 to address swap in the order of rangeland and pasture in the reading of the landuse drivers.

Specific notes

Contributors other than yourself, if any: @rosiealice

Are answers expected to change (and if so in what way)? Yes - for FATES land use runs

Any User Interface Changes (namelist or namelist defaults changes)? No

Does this create a need to change or add documentation? Did you do so? No

Testing performed, if any:

aux_clm on derecho

0408-140208de_gnu: 87 tests
    FAIL ERI_Ld41.f10_f10_mg37.I2000Clm60BgcCrop.derecho_gnu.clm-default COMPARE_branch_hybrid (EXPECTED FAILURE)
    FAIL ERP_P64x2_D_Ld3.f10_f10_mt232.IHistClm60BgcCropCrujra.derecho_gnu.clm-default--clm-all_outputs COMPARE_base_rest (EXPECTED FAILURE)
    FAIL SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default NLCOMP
    PASS SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_gnu.mizuroute-default RUN time=319 (UNEXPECTED: expected FAIL)
    PEND SMS_Ln9.f10_f10_mg37.I1850Clm45Bgc.derecho_gnu.clm-clm45cam4LndTuningModeZDustSoilErod RUN

 
0408-140208de_int: 209 tests
    FAIL ERP_D_P64x2_Ld10.f10_f10_mg37.I2000Clm60Bgc.derecho_intel.clm-Hillslope RUN time=90 (EXPECTED FAILURE)
    PEND ERP_D_P64x2_Ld10.f10_f10_mg37.I2000Clm60Bgc.derecho_intel.clm-Hillslope COMPARE_base_rest
    PASS ERP_D_P64x2_Ld3.f10_f10_mg37.I2000Clm50BgcCru.derecho_intel.clm-flexCN_FUN--clm-matrixcnOn_ignore_warnings COMPARE_base_rest (UNEXPECTED: expected FAIL)
    PASS ERP_D_P64x2_Ld3.f10_f10_mg37.I2000Clm50BgcCru.derecho_intel.clm-flexCN_FUN--clm-matrixcnOn_ignore_warnings BASELINE ctsm5.4.030: (UNEXPECTED: expected FAIL)
    PASS ERP_D_P64x2_Ld3.f10_f10_mg37.I2000Clm50BgcCru.derecho_intel.clm-noFUN_flexCN--clm-matrixcnOn_ignore_warnings COMPARE_base_rest (UNEXPECTED: expected FAIL)
    PASS ERP_D_P64x2_Ld3.f10_f10_mg37.I2000Clm50BgcCru.derecho_intel.clm-noFUN_flexCN--clm-matrixcnOn_ignore_warnings BASELINE ctsm5.4.030: (UNEXPECTED: expected FAIL)
    FAIL ERP_Ld9.f45_f45_mg37.I2000Clm50FatesRs.derecho_intel.clm-FatesColdAllVars COMPARE_base_rest (EXPECTED FAILURE)
    FAIL ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-mimicsFatesCold RUN time=69 (EXPECTED FAILURE)
    PEND ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-mimicsFatesCold COMPARE_base_rest
    FAIL ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings BASELINE ctsm5.4.030: DIFF (EXPECTED FAILURE)
    FAIL ERS_D_Ld7_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropRs.derecho_intel.clm-decStart1851_noinitial RUN time=83 (EXPECTED FAILURE)
    FAIL ERS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm60FatesRs.derecho_intel.clm-FatesCold RUN time=197 (EXPECTED FAILURE)
    FAIL PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_intel.clm-FatesColdSeedDisp COMPARE_base_modpes (EXPECTED FAILURE)
    FAIL REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings COMPARE_base_rep2 (EXPECTED FAILURE)
    FAIL REP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings BASELINE ctsm5.4.030: DIFF (EXPECTED FAILURE)
    PEND SMS_D.f10_f10_mg37.I2000Clm60Bgc.derecho_intel RUN
    PEND SMS_D_Ld3_PS.f09_g17.I1850Clm60BgcNoAnthro.derecho_intel.clm-decStart1851_noinitial--clm-matrixcnOn RUN
    FAIL SMS_D_Ld5.5x5_amazon_rHDMA.I2000Clm60SpMizGs.derecho_intel.mizuroute-default NLCOMP
    FAIL SMS_D_Ly6_Mmpi-serial.1x1_smallvilleIA.IHistClm45BgcCropQianRs.derecho_intel.clm-cropMonthOutput RUN time=30 (EXPECTED FAILURE)
    FAIL SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_intel.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO RUN time=125 (EXPECTED FAILURE)
    FAIL SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdHydro RUN time=53 (EXPECTED FAILURE)
    FAIL SUBSETDATAPOINT_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default NLCOMP (EXPECTED FAILURE)
    FAIL SUBSETDATAPOINT_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default RUN time=42 (EXPECTED FAILURE)
    FAIL SUBSETDATAREGION_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default NLCOMP (EXPECTED FAILURE)
    FAIL SUBSETDATAREGION_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default RUN time=62 (EXPECTED FAILURE)

 
0408-140208de_nvh: 3 tests

 
========================================================================
Non-PASS results for select phases:
TPUTCOMP non-passes: 9
MEMCOMP non-passes: 0

fates on derecho

0408-140452de_gnu: 15 tests
    FAIL PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp COMPARE_base_modpes (EXPECTED FAILURE)
    FAIL SMS_D_Ld3.f09_g17.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhen_prescribed RUN time=86 (EXPECTED FAILURE)

 
0408-140452de_int: 41 tests
    PASS ERP_Ld9.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdAllVars RUN time=248 (UNEXPECTED: expected FAIL)
    FAIL ERP_Ld9.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdAllVars COMPARE_base_rest (EXPECTED FAILURE)
    FAIL ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-mimicsFatesCold RUN time=69 (EXPECTED FAILURE)
    PEND ERP_P256x2_Ld30.f45_f45_mg37.I2000Clm60FatesRs.derecho_intel.clm-mimicsFatesCold COMPARE_base_rest
    FAIL ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLUH2 RUN time=28 (EXPECTED FAILURE)
    FAIL ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLUH2HarvestArea RUN time=30 (EXPECTED FAILURE)
    FAIL ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLUH2HarvestMass RUN time=30 (EXPECTED FAILURE)
    FAIL PVT_Lm3.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesLUPFT RUN time=31 (EXPECTED FAILURE)
    FAIL SMS_D_Ld180.f45_f45_mg37.I2000Clm60Fates.derecho_intel.clm-FatesColdTRS RUN time=91 (EXPECTED FAILURE)
    FAIL SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_intel.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO RUN time=131 (EXPECTED FAILURE)
    FAIL SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdHydro RUN time=60 (EXPECTED FAILURE)

 
0408-140452de_nvh: 1 test

 
========================================================================
Non-PASS results for select phases:
TPUTCOMP non-passes: 3
MEMCOMP non-passes: 0

[samsrabin]

Nice

[adrifoster]

okay well it's hard to tell if this is working as intended because we don't have any LUH tests that don't die in the RUN phase?

[glemieux]

okay well it's hard to tell if this is working as intended because we don't have any LUH tests that don't die in the RUN phase?

@adrifoster I talked about this with @ckoven yesterday. I could have a "quick" fix for this that would require an update to the LUH datasets and the FATES code. I'll start working on that; what do you think about holding on this until that's updated?

[samsrabin]

That seems like a reasonable approach to me, especially considering the b4b-dev merge is supposed to happen today.

[rosiealice]

Just to confirm that this code change is what we implemented in NorESM and that it's all working fine there. But agree that this might be a good reason to create the relevant working tests!

[glemieux]

Just to confirm that this code change is what we implemented in NorESM and that it's all working fine there. But agree that this might be a good reason to create the relevant working tests!

@rosiealice @mvdebolskiy Do y'all run the tests are we see failing here: #3789 (comment)?

[mvdebolskiy]

@glemieux no, we don't and the latest NorESM has not yet been updated to 5.4.030.

[mvdebolskiy]

@rosiealice it is fine only because we did not yet updated to sam's files.

[samsrabin]

This PR will come in after @glemieux fixes the FATES land use tests, which will happen in a separate master tag.

[glemieux]

The FATES-side fix appears to be working. I'll make the PR on the fates side for review and link it here.