Make sure that the bareground patch is being labeled with patchno of zero

[glemieux]

Description:

Fixes #973.

This PR includes the main fix for the issue #973 and includes some additional code clean up.

The main fix is encapsulated in b5cadd5, which makes sure that the patch number is set correctly for bare ground patches in all nocomp+fbg modes (which is inclusive of sp mode).

In troubleshooting this bug, it was noted that we only ever set the bareground patch area for fbg + nocomp modes. Previously we had been allocating and checking for bareground patches as long as nocomp was set, which was fine although technically too permissive. As such, I've restricted the allocation and check to match the cases in which we set the bareground area (i.e. fbg + nocomp and sp mode).

Finally, this update required adding checks around and within the fire model as the current ncar test mods allow spitfire to be on in scalar lightning mode for all reduced complexity modes, excepting sp mode.

Collaborators:

@JessicaNeedham

Expectation of Answer Changes:

Should be b4b, except for the fbg+nocomp testmod.

Checklist:

• My change requires a change to the documentation.
• I have updated the in-code documentation .AND. (the technical note .OR. the wiki) accordingly.
• I have read the CONTRIBUTING document.
• FATES PASS/FAIL regression tests were run
• If answers were expected to change, evaluation was performed and provided

Test Results:

CTSM (or) E3SM (specify which) test hash-tag:

• e3sm: 8d5d9ec327 (locally merged from E3SM-Project/E3SM@3730a54)
• ctsm: ctsm5.1.dev115

CTSM (or) E3SM (specify which) baseline hash-tag:

• ctsm: ctsm5.1.dev115

FATES baseline hash-tag: sci.1.61.0_api.25.0.0

Test Output:

E3SM passing case:

/global/homes/g/glemieux/cori-scratch/e3sm-cases/issue793test_shijie_nocomp_tempC-nodiag.fates-sci.1.61.0_api.25.0.0-v2.1.0-C8d5d9ec327-F8131daee.intel/

CTSM regression tests:
/glade/u/home/glemieux/scratch/ctsm-tests/tests_pr976-fates

[rgknox]

looks great!

[glemieux]

All expected tests on cheyenne pass b4b against the baseline, with the exception of the fbg+nocomp test mod. Reviewing the results, we see that the initial differences are in the fire variables relating to the variables that rely on the fuel fraction. Looking at the values of the maximum differences the test case now have zero as a result, likely due to the fact that these are the bareground patches being appropriately set to zero now. Thus that the fire model is now correctly avoiding using that bareground patch and using the first vegetated patch.

Folder location on cheyenne: /glade/u/home/glemieux/scratch/ctsm-tests/tests_pr976-fates