Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEMS prep ocn cleanup #103

Merged
merged 12 commits into from
Sep 21, 2020
Merged

Conversation

DeniseWorthen
Copy link
Collaborator

Description of changes

  • Removes special nems_orig_data prep ocean phase which is no longer required if corresponding changes are made in esmFldsExchange_nems to make use of the auto-merge feature.

  • Modifies fd_nems.yaml to account for differing field names between the nems active and nems data ATM being used for the same ocean import field

Specific notes

Contributors other than yourself, if any:

CMEPS Issues Fixed (include github issue #):

Are changes expected to change answers?

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

Testing on hera and orion for S2S shows all fields are b4b except for the mediator files. However, manual comparison on the mediator files using either nccmp -d or cpnrc -m show no differences.

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:

DeniseWorthen and others added 12 commits August 19, 2020 15:23
Update to latest ESCOMP/master

Co-authored-by: Jim Edwards <[email protected]>
Co-authored-by: uturuncoglu <[email protected]>
Co-authored-by: alperaltuntas <[email protected]>
Co-authored-by: Mariana Vertenstein <[email protected]>
Co-authored-by: mvertens <[email protected]>
* Enable fine-grained timing in the mediator using ESMF

* Fix code comments
regression tests fail comparison of mediator restart files but
all other files reproduce. cprnc not working on orion, so will
run on hera to try to determine cause
@DeniseWorthen
Copy link
Collaborator Author

@danrosen25 Your changes to CMEPS/mediator/Makefile were merged w/o review by EMC. The changes here are what EMC is currently using. Could you verify this does not break CMEPS for you?

@mvertens mvertens requested a review from jedwards4b September 21, 2020 16:50
@mvertens
Copy link
Collaborator

@jedwards4b - I'd like you to review the changes to the minor and major versions via the CPP if-defs. All the other changes look fine to me.

@jedwards4b jedwards4b merged commit 32129aa into ESCOMP:master Sep 21, 2020
@DeniseWorthen DeniseWorthen deleted the feature/prepocn_cleanup branch October 7, 2020 21:17
jedwards4b added a commit to jedwards4b/CMEPS that referenced this pull request Jun 9, 2022
### Description of changes

Add support for downloading and checking the NEON data inventory file listing.csv
Generated new baselines due to FIELDLIST field lists differ  jul12
### Specific notes

Contributors other than yourself, if any:

CMEPS Issues Fixed (include github issue #):

Are there dependencies on other component PRs
 - [X] CIME (list)  hash 5f05541 on the trunk
 - [ ] CMEPS (list)

Are changes expected to change answers?
 - [X] bit for bit
 - [ ] different at roundoff level
 - [ ] more substantial

Any User Interface Changes (namelist or namelist defaults changes)?
 - [ ] Yes
 - [X] No

Testing performed:
- [X] (required) aux_cdeps
   - machines and compilers:
   - details (e.g. failed tests):
- [ ] (optional) CESM prealpha test
   - machines and compilers
   - details (e.g. failed tests):

Hashes used for testing:
- [X] CIME
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch:
  - hash:5f05541 
- [X] CMEPS
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch:
  - hash: cmeps0.13.15
- [ ] CESM
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch:
  - hash:
uturuncoglu pushed a commit to uturuncoglu/CMEPS that referenced this pull request Jan 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants