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

Update with 'cmeps0.14.2' tag #1

Merged
merged 107 commits into from
May 12, 2023
Merged

Conversation

gdicker1
Copy link

Advance EarthWorksOrg/CMEPS to include changes from the ESCOMP/CMEPS 'cmeps0.14.2' tag. This matches with updates of other externals to what's used in ESCOMP/CESM tag 'cesm2_3_beta11'

DeniseWorthen and others added 30 commits October 29, 2021 12:31
* updates CMEPS with latests changes from ESCOMP, including

- xgrid capablility (cesm only)
- refactored accumulation field bundles 
- cleaned up med.F90 for mesh creation 
- refactored mediatory history functionality
* moved files into ufs
* implemented different interface for ufs flux_atmocn_mod
* add compile fixes for ufs
* removed reference to util and replaced with ufs
* clean up of Makefile
* removed references to use of med_kind_mod and introduced ufs_kind_mod
* removed unneeded files needed by ufs
* Optional tiled history files for ATM (ESCOMP#257)
…oupling through CMEPS (ESCOMP#61)


* Add Wave slow loop coupling and Field Exchanges for waves in nems
* Updates CMEPS for dynamic allocation in med_internalstate
…MP#65)


* Refactor source and destination masking
* Refactor esmFieldsExchange with the advertise and initialize phases
* Implement a check that each component pair for a field advertise is present. 
* Permit coupling of ATM-WAV with the CMEPS mediator.
        modified:   cesm/nuopc_cap_share/seq_drydep_mod.F90
        new file:   cesm/nuopc_cap_share/shr_drydep_mod.F90
        modified:   cesm/nuopc_cap_share/shr_drydep_mod.F90
* add new flux computation for UFS model and add new coupling mode for exchange grid implementation
* fix area field for new flux algorithm
* send fluxes to atmospheric model
* initial implementation for sending fluxes to UFS ATM
* update CCPP host model
* fix latent and sensible heat fluxes and clean code
* add new coupling mode for side by side flux comparison
* fix CCPP host model for latent and sensible heat fluxes
* fix aoflux calculation on agrid and add missing error checks
* add option to write meshes and update code that retrieve area information from xgrid
* update ccpp host based on recent changes in ccpp framework
* fix for providing cell area to CCPP host model
* make ccpp physics options configurable
* Refactor nems field exchange; set default masks for mapping in med_internalstate (ESCOMP#279)
Refactors esmFldsExchange_nems.F90 to use separate advertise and initialize phases and to check that a component is present before advertising a field to or from that component. Implements default src and dst mask values in place of the code currently in med_map_mod.F90. Fixes ESCOMP#63 and ESCOMP#64.
* use mesh file instead of grid name (ESCOMP#285)
This was done so that vertical component used in grid name does not affect tests.

Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
Co-authored-by: Francis Vitt <fvitt@ucar.edu>
Co-authored-by: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Co-authored-by: Jim Edwards <jedwards@ucar.edu>
Co-authored-by: mvertens <mvertens@users.noreply.github.com>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>
Co-authored-by: Ufuk Turuncoglu <ufuk.turuncoglu@noaa.gov>
* add bilnr_nstod mapping between ocn/ice/waves
jedwards4b and others added 11 commits November 29, 2022 14:39
### Description of changes
Make the med_fldList fields a linked list instead of an array.   This avoids a lot of small allocations and memory fragmentation.  

### Specific notes

Contributors other than yourself, if any: Denise 

CMEPS Issues Fixed: ESCOMP#321 

Are changes expected to change answers? bfb

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

### Testing performed

Testing performed if application target is CESM:
- [X] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
   - machines: cheyenne, intel
   - details (e.g. failed tests):  all pass
- [ ] (recommended) CESM testlist_drv.xml
   - machines and compilers:
   - details (e.g. failed tests):
- [X] (optional) CESM prealpha test 
   - machines and compilers cheyenne, intel 
   - details (e.g. failed tests):  All pass except expected fails of cesm2_3_alpha10c
- [ ] (other) please described in detail
   - machines and compilers
   - details (e.g. failed tests):

Testing performed if application target is UFS-coupled:
- [X] (recommended) UFS-coupled testing
   - description: gnu and intel
   - details (e.g. failed tests):

Testing performed if application target is UFS-HAFS:
- [ ] (recommended) UFS-HAFS testing
   - description:
   - details (e.g. failed tests):

### Hashes used for testing:

- [ ] CESM:
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch/hash:
- [ ] UFS-coupled, then umbrella repostiory to check out and associated hash:
  - repository to check out:
  - branch/hash:
- [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash:
  - repository to check out:
  - branch/hash:
update flds_exchange_nems for wave coupling changes
### Description of changes

Changes mapping type for UFS between wave-ice-ocn to be bilinear with nstod fill.
Adds optional wave-ice coupling for UFS. 
Minor trailing whitespace cleanup.

### Testing performed

Testing performed if application target is CESM:
- [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
   - machines:
   - details (e.g. failed tests):
- [ ] (recommended) CESM testlist_drv.xml
   - machines and compilers:
   - details (e.g. failed tests):
- [ ] (optional) CESM prealpha test
   - machines and compilers
   - details (e.g. failed tests):
- [ ] (other) please described in detail
   - machines and compilers
   - details (e.g. failed tests):

Testing performed if application target is UFS-coupled:
- [X] (recommended) UFS-coupled testing
   - description: all tests are B4B against current develop branch
   - details (e.g. failed tests):

Testing performed if application target is UFS-HAFS:
- [X] (recommended) UFS-HAFS testing
   - description: all tests are B4B against current develop branch
   - details (e.g. failed tests):

### Hashes used for testing:

- [ ] CESM:
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch/hash:
- [x] UFS-coupled, then umbrella repostiory to check out and associated hash:
  - repository to check out: https://github.com/ufs-community/ufs-weather-model
  - branch/hash: [3a8533c](ufs-community/ufs-weather-model@3a8533c)
- [x] UFS-HAFS, then umbrella repostiory to check out and associated hash:
  - repository to check out: https://github.com/ufs-community/ufs-weather-model
  - branch/hash: [3a8533c](ufs-community/ufs-weather-model@3a8533c)
move shr_file_getLogUnit to shr_log_getLogUnit
### Description of changes
Clean up usage of log files

### Specific notes
Depricated shr_file_getLogUnit and added shr_log_getLogUnit
Depends on ESCOMP/CESM_share#36
Contributors other than yourself, if any:

CMEPS Issues Fixed (include github issue #):

Are changes expected to change answers? (specify if bfb, different at roundoff, more substantial) 

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

### Testing performed

Testing performed if application target is CESM:
- [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
   - machines:
   - details (e.g. failed tests):
- [ ] (recommended) CESM testlist_drv.xml
   - machines and compilers:
   - details (e.g. failed tests):
- [X] (optional) CESM prealpha test
   - machines and compilers cheyenne intel
   - details (e.g. failed tests): all consistant with baselines. 
- [ ] (other) please described in detail
   - machines and compilers
   - details (e.g. failed tests):

Testing performed if application target is UFS-coupled:
- [ ] (recommended) UFS-coupled testing
   - description:
   - details (e.g. failed tests):

Testing performed if application target is UFS-HAFS:
- [ ] (recommended) UFS-HAFS testing
   - description:
   - details (e.g. failed tests):

### Hashes used for testing:

- [ ] CESM:
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch/hash:
- [ ] UFS-coupled, then umbrella repostiory to check out and associated hash:
  - repository to check out:
  - branch/hash:
- [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash:
  - repository to check out:
  - branch/hash:
@gdicker1 gdicker1 force-pushed the update/cesm2_3_beta11/cmeps branch from 175bd16 to 86b910b Compare April 28, 2023 03:58
…cesm_mod.F90

Since EarthWorksOrg/cmeps has been based on 'cmeps0.13.68' the routine
signatures are different to those used in 'cmeps0.14.2'. So, logic added
for mpas-ocean and mpas-seaice fields did not automatically update to
the new implementations. This commit manually does that update.
Update EarthWorksOrg/CMEPS with upstream work from 'ESCOMP/CESM/cesm2_3_beta11' version.
@gdicker1 gdicker1 force-pushed the update/cesm2_3_beta11/cmeps branch from 86b910b to 5da160c Compare May 3, 2023 17:52
@gdicker1
Copy link
Author

gdicker1 commented May 3, 2023

The force push was to include 6c56358 which changes routines that @dazlich added to a new interface for addfld and addmap routines.

@gdicker1 gdicker1 marked this pull request as ready for review May 3, 2023 18:09
@gdicker1
Copy link
Author

gdicker1 commented May 3, 2023

The force push was to include 6c56358 which changes routines that @dazlich added to a new interface for addfld and addmap routines.

@dazlich, this is why I added you as a reviewer here. I tested that this builds with FullyCoupled compset, but if you would double check the work in this commit I'd appreciate it.

@dazlich
Copy link

dazlich commented May 3, 2023 via email

@gdicker1
Copy link
Author

gdicker1 commented May 3, 2023

Ok, will do @gdicker1. So, if I check out the develop branch of EarthWorks, what do I want the checkout of CMEPS in Externals.cfg to read to that I am testing this?

Since it is a CMEPS change it is a little difficult to test in isolation (cime, ccs_configs, and others need to play nicely together). Maybe this PR is best tested through EarthWorksOrg/EarthWorks#12.

To more directly answer the question, git clone -b update/cesm2_3_beta11 https://github.com/EarthWorksOrg/EarthWorks should get you what you need and after running manage_externals you should have CMEPS checked out with the cmeps-ew1.0.001 tag.

@gdicker1 gdicker1 merged commit 2e8a03a into ew-develop May 12, 2023
@gdicker1 gdicker1 deleted the update/cesm2_3_beta11/cmeps branch June 23, 2023 14:56
gdicker1 pushed a commit that referenced this pull request Jun 23, 2023
minor fixes for ww3/cice coupling and update of code to cmeps0.14.24.
gdicker1 pushed a commit that referenced this pull request Jun 23, 2023
make history_n integer variables
gdicker1 pushed a commit that referenced this pull request Aug 23, 2024
Gust mods suggested changes for cam_dev
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.

9 participants