Fix virtual potential temperature in the total energy calculation

[XiaqiongZhou-NOAA]

Description
Fix virtual potential temperature (Tv) in the total energy calculation (TE) when hydrostatic=.T. and -DUSE_COND compiling flag on.
This change will not impact non-hydrostatic runs and hydrostatic run with -DUSE_COND flag off.
The "condensate" modification part of Tv is added when -DUSE_COND is on for hydrostatic runs in order to have consistent TE calculation in fv_dynamics.F90 and fv_mapz.F90.
Note that the hydrostatic solver might not function correctly with USE_COND and/or MOIST_CAPPA in other places. Additional testing may be required.

How Has This Been Tested?

It was tested on Orion for SHiELD.

Checklist:

Please check all whether they apply or not

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• Any dependent changes have been merged and published in downstream modules

[lharris4]

This is a good find, thank you. Please note that there may be other places in the code where USE_COND and/or MOIST_CAPPA may not work correctly with the hydrostatic solver; further testing may be necessary.

[XiaqiongZhou-NOAA]

This is a good find, thank you. Please note that there may be other places in the code where USE_COND and/or MOIST_CAPPA may not work correctly with the hydrostatic solver; further testing may be necessary.

Agree. I added this in the description.

[bensonr]

@XiaqiongZhou-NOAA - do you need the fix cherry-picked in to the dev/emc branch or can it wait for the reconciliation?

[XiaqiongZhou-NOAA]

@XiaqiongZhou-NOAA - do you need the fix cherry-picked in to the dev/emc branch or can it wait for the reconciliation?

I can wait for the reconciliation. In addition, UFS always has -DUSE_COND and -DMOIST_CAPPA on to compile. Perhaps we need to add the option to remove these two flags when compiling hydrostatic runs in the future as SHiELD.