exports for land water and energy balances #621
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Complements GEOS-ESM/GEOSgcm_GridComp#957, which provides more information.
NOTE: New and renamed exports only added to HISTORY.rc.tmpl for now. The changes in this PR still need to be applied to other HISTORY files as appropriate.
Changes:
Updates export renaming for components of land surface latent heat flux and for spurious ("accounting") terms for land surface turbulent fluxes.
Fixes a bug in the source GC of the precip, snowfall, and PAR fluxes in the "lnd" collection. These should be from Surface GC, not from Moist GC and Solar GC, resp. This appears to be correct in HISTORY template for MERRA2 but incorrect in the HISTORY templates for FP and GEOSIT. (Not sure about HISTORY templates that are used in ops.)
Open tasks and notes:
In the latest M21C HISTORY file, the "regrid_method" for the "lnd" collection is specified as "BILINEAR_MONOTONIC". In the various HISTORY templates in the "develop" branch, the "regrid_method" for the "lnd" collection is unspecified (which probably implies "BILINEAR"). I had thought that the "lnd" collection uses conservative regridding, but I don't see this implemented. This needs further investigation.
Some output collections ("S2S", "gmichem") include surface turbulent fluxes averaged over all tile types. These are not expected to change with exports and LONG_NAMES for land water and energy balances GEOSgcm_GridComp#957. However, for the land contribution it looks like the output of the surface turbulent fluxes in these collections is an inconsistent mix of what Catchment calculates (evap, sensible) and what Turbulence GC expects (latent). This should probably be cleaned up by changing the latent heat flux variable pulled from Surface GC in the respective HISTORY files.