Merge pull request #99 from danrosen25/fix/esmfversion

[jedwards4b]

Fix CPP ESMF_VERSION_MAJOR and ESMF_VERSION_MINOR definitions.

Description of changes

(Dan) addressed Issue #105 here:
https://github.com/ESCOMP/CMEPS/pull/99/files

The merge was complete on September 4th but it looks like the commit was dropped from the esmFlds.F90 history.
The changes were overwritten here:
#103

Specific notes

Contributors other than yourself, if any: Dan Rosen

CMEPS Issues Fixed (include github issue #):

Are changes expected to change answers?

• bit for bit
• different at roundoff level
• more substantial

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

• Yes
• No

Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required):

• (required) CIME_DRIVER=nuopc scripts_regression_tests.py
  • machines:
  • details (e.g. failed tests):
• (required) CESM testlist_drv.xml
  • machines and compilers:
  • details (e.g. failed tests):
• (optional) CESM prealpha test
  • machines and compilers
  • details (e.g. failed tests):

Testing performed if application target is UFS-S2S:

• (required) UFS-S2S testing
  • description:
  • details (e.g. failed tests):

Hashes used for testing:

• CESM:
  • repository to check out: https://github.com/ESCOMP/CESM.git
  • branch: nuopc_dev
  • hash:
• UFS-S2S, then umbrella repostiory to check out and associated hash:
  • repository to check out:
  • branch:
  • hash:

[DeniseWorthen]

So this PR will resolve #105; the changes in Dan's PR #99 would have resolved it but were over-written by my PR #103. Is that correct?

Let me test this on Hera (which is extremely slow queue right now). Thanks.

[danrosen25]

I'm looking at the updates now and I have issues with the Makefile changes.

ESMF_VERSION_MAJOR ?= 0
ESMF_VERSION_MINOR ?= 0

should go between

include $(ESMFMKFILE)
ESMF_VERSION_MAJOR ?= 0
ESMF_VERSION_MINOR ?= 0
CPPDEFS += -DESMF_VERSION_MAJOR=$(ESMF_VERSION_MAJOR) -DESMF_VERSION_MINOR=$(ESMF_VERSION_MINOR)

Then these changes can be deleted

ESMF_VERSION_MAJOR ?= 0
ESMF_VERSION_MINOR ?= 0
CPPDEFS += -DESMF_VERSION_MAJOR=$(ESMF_VERSION_MAJOR)
CPPDEFS += -DESMF_VERSION_MINOR=$(ESMF_VERSION_MINOR)

This handles the case where the ESMF_VERSION_MAJOR and ESMF_VERSION_MINOR variables aren't provided by the ESMFMKFILE file.

[DeniseWorthen]

I tested the later change and confirmed it passes all the ufs-coupled and ufs-datm RTs for ufs-weather (2e25df5). Thanks.