Update CMEPS by DeniseWorthen · Pull Request #3 · NOAA-EMC/CMEPS

DeniseWorthen · 2020-06-29T17:24:12Z

Issue #1

Removes use of ifrac_nstod in med_fraction_set

Issue #2

Implements correct mapping for fractional land mode when coupling_mode is set to 'nems_frac'

Additional changes:

Creates separate DataInitialize and prep_ocn code blocks for nems modes (nems_orig, nems_frac or nems_orig_data) which are distinct from corresponding CESM modes.
Implements bulkflux fix for datm as in NEMS (PR # 69)
Adds field dictionary changes to fd_nems.yaml for CICE6.
Removes aoflux associated field bundles from nems_orig and nems_frac modes.
Minor cleanup of mis-spellings or other text.

New baselines will be required.

Related PR:
ufs-s2s-model

* added new prealpha test that does not have threading on for now * fix Makefile, log message print * bug fixes for prealpha tests * bug fixes for B1850 * fix problems with ocnalb calculation on intialization * update fd_nems.yaml for wave field, turn off profiling and histavg variables * udpates for esmf8.1 * make esmf8.0 and esmf8.1 compatible * changes to get nuopc to run without a mediator and bug fixes * updates with additional TODO notes * changes to have nuopc cases run without a mediator * updates to fix problem in running compsets with no mediator * fixes for running without a mediator and for running IRT tests * updates for cleaner nuopc.runconfig * update pio_stride * fix spelling error * this is a bugfix * add nuopc_share_methods for caps * change N3 test to use default pelayout Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu> Co-authored-by: Jim Edwards <jedwards@ucar.edu>

This reverts commit 5a4c5ee.

* driver build directory needs to be set in buildexe * Add EXTRA_MACHDIR xml variable This is needed to work with the changes in ESMCI/cime#3508 * Add the NONLOCAL xml variable This hadn't been added to the CMEPS config_component file Co-authored-by: Jim Edwards <jedwards@ucar.edu> Co-authored-by: Bill Sacks <sacks@ucar.edu>

* driver build directory needs to be set in buildexe * Add EXTRA_MACHDIR xml variable This is needed to work with the changes in ESMCI/cime#3508 * Add the NONLOCAL xml variable This hadn't been added to the CMEPS config_component file * update mediator to support CICE6 coupling in UFS * remove med_map_FB_Regrid_Norm_Frac Co-authored-by: Jim Edwards <jedwards@ucar.edu> Co-authored-by: Bill Sacks <sacks@ucar.edu> Co-authored-by: apcraig <anthony.p.craig@gmail.com>

…n/CMEPS into feature/fracgridwk2

mapping_mode is set according to coupling mode

add mapconf to FBFrac mapping for nems_frac

make changes in fldsExchange for fraction_mod changes; fix DataInitialize

clean up med_fraction_mod

DataInitialize

remove coupling mode dependence for setting ofrac in med_fraction_mod

DeniseWorthen · 2020-07-01T13:50:05Z

Baselines are running on Hera and Orion.

DeniseWorthen · 2020-07-01T17:40:57Z

New Baselines are created on Hera and Orion. Ready for merge.

No answer changes are expected for NEMS but will rerun the tests to verify

DeniseWorthen · 2020-07-06T14:52:51Z

The changes to med.F90 were tested on cheyenne and did not change answers. When I ran the RT against the new (20200701) baselines I had created for this commit, the answers for some of the tests changed: cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt
cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux
cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt.

I am now testing in a sandbox with and without this med.F90 change; I have not yet identified where the answers are changing. My initial tests in my sandbox are that all answers are reproducible.

DeniseWorthen · 2020-07-06T20:02:20Z

I believe this can be explained by an error in the RT dependency when creating a new baseline. The cold mediator re-starts were not being copied in from the newly created baseline but from the previous baseline. @MinsukJi-NOAA has identified a fix and once that is committed, I will re-create the baselines.

Authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>

DeniseWorthen · 2020-07-08T20:32:13Z

@junwang-noaa : My compile on Orion failed with the change to the Makefile. The compile on Hera was fine. Did you test the RT on both machines?

I would like to revert this change so I can get the baselines made and the S2S updated while we figure this out.

The error on Orion was:

med.F90(746): error #6580: Name in only-list does not exist or is not accessible. [ESMF_STATESET]
use ESMF , only : ESMF_StateSet, ESMF_StateIntent_Import, ESMF_StateIntent_Export
----------------------^
med.F90(780): error #6632: Keyword arguments are invalid without an explicit interface. [STATEINTENT]
call ESMF_StateSet(is_local%wrap%NStateImp(n), stateIntent=ESMF_StateIntent_Import, rc=rc)
--------------------------------------------------------^
med.F90(780): error #6632: Keyword arguments are invalid without an explicit interface. [RC]
call ESMF_StateSet(is_local%wrap%NStateImp(n), stateIntent=ESMF_StateIntent_Import, rc=rc)
---------------------------------------------------------------------------------------------^
med.F90(790): error #6632: Keyword arguments are invalid without an explicit interface. [STATEINTENT]
call ESMF_StateSet(is_local%wrap%NStateExp(n), stateIntent=ESMF_StateIntent_Export, rc=rc)
---------------------------------------------------------^
med.F90(790): error #6632: Keyword arguments are invalid without an explicit interface. [RC]
call ESMF_StateSet(is_local%wrap%NStateExp(n), stateIntent=ESMF_StateIntent_Export, rc=rc)
----------------------------------------------------------------------------------------------^
compilation aborted for med.F90 (code 1)

junwang-noaa · 2020-07-08T21:05:36Z

It should have no impact on Orion since the ESMF version is still 800 in s2s. I will test it on Orion with the top of s2s.

…

On Wed, Jul 8, 2020 at 4:32 PM Denise Worthen ***@***.***> wrote: @junwang-noaa <https://github.com/junwang-noaa> : My compile on Orion failed with the change to the Makefile. The compile on Hera was fine. Did you test the RT on both machines? I would like to revert this change so I can get the baselines made and the S2S updated while we figure this out. The error on Orion was: med.F90(746): error #6580: Name in only-list does not exist or is not accessible. [ESMF_STATESET] use ESMF , only : ESMF_StateSet, ESMF_StateIntent_Import, ESMF_StateIntent_Export ----------------------^ med.F90(780): error #6632: Keyword arguments are invalid without an explicit interface. [STATEINTENT] call ESMF_StateSet(is_local%wrap%NStateImp(n), stateIntent=ESMF_StateIntent_Import, rc=rc) --------------------------------------------------------^ med.F90(780): error #6632: Keyword arguments are invalid without an explicit interface. [RC] call ESMF_StateSet(is_local%wrap%NStateImp(n), stateIntent=ESMF_StateIntent_Import, rc=rc) ---------------------------------------------------------------------------------------------^ med.F90(790): error #6632: Keyword arguments are invalid without an explicit interface. [STATEINTENT] call ESMF_StateSet(is_local%wrap%NStateExp(n), stateIntent=ESMF_StateIntent_Export, rc=rc) ---------------------------------------------------------^ med.F90(790): error #6632: Keyword arguments are invalid without an explicit interface. [RC] call ESMF_StateSet(is_local%wrap%NStateExp(n), stateIntent=ESMF_StateIntent_Export, rc=rc) ----------------------------------------------------------------------------------------------^ compilation aborted for med.F90 (code 1) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AI7D6TNXN5SEHFNVS2XAYYDR2TJVXANCNFSM4OLNXJMQ> .

This reverts commit 2e18eb8.

DeniseWorthen · 2020-07-09T17:06:53Z

New baselines have been created for both orion and hera. @junwang-noaa are we ready to merge this branch to develop?

Sync support/HAFS branch with the emc/develop branch as of 04/16/2021

…lvars removed unneeded xml variables

…_20240201

DeniseWorthen and others added 30 commits April 17, 2020 07:41

Revert "merge escomp/cmeps master (#5)"

b9c1d6e

This reverts commit 5a4c5ee.

Merge remote-tracking branch 'NCAR/master'

6b9fec8

Merge remote-tracking branch 'upstream/master'

6643005

update esmFldsExchange for frac grid

c8caaff

remove commented out code; add TODO in prep_atm

4b53826

remove bilinr method for Sa_pslv

0895485

minor cleanup coupling mode for nems

7e59a90

fix Makefile,remove unneeded nems code in prep_atm

a7f79b4

add two small fixes from datm branch

d6a1ea4

changes for si_ifrac

0255a58

Merge remote-tracking branch 'upstream/master'

37fa3b9

Merge branch 'master' into feature/fracgridwk2

7eb1539

add ability to read dbug_flag from nems.configure MED_attributes

22e1b26

Merge branch 'feature/fracgridwk2' of https://github.com/DeniseWorthe…

4da898b

…n/CMEPS into feature/fracgridwk2

introduce mapping_mode

713fe36

mapping_mode is set according to coupling mode

add comments

fe57ceb

rename mapping_mode to maptype for consistency

9250cd5

add mapconf to FBFrac mapping for nems_frac

remove use of ifrac_nstod in fraction_mod

04a3747

make changes in fldsExchange for fraction_mod changes; fix DataInitialize

add prep_ocn with app specific custom merge routines

f727af2

update default value of PIO_REARR_COMM_MAX_PEND_REQ_COMP2IO

94b7b26

add fix from datm for nextsw_cday not being present

e0b838a

remove aoflux fields from exchange unless using nems_orig_data

cd203d2

clean up med_fraction_mod

move med_fraction_init and set into first_call for

554964a

DataInitialize

revert change to med.F90 in DataInitialize

85438fa

remove coupling mode dependence for setting ofrac in med_fraction_mod

remove TODO in history write

49572f0

update prep_ocn for bulk fluxes in nems_data_orig

62898dc

DeniseWorthen added 2 commits July 1, 2020 05:53

add variables for dictionary for cice6

49c13b8

Merge remote-tracking branch 'upstream/master' into feature/fracgridwk2

9814e4b

DeniseWorthen marked this pull request as ready for review July 1, 2020 13:49

DeniseWorthen requested review from binli2337, junwang-noaa and mvertens July 1, 2020 13:50

DeniseWorthen added 2 commits July 1, 2020 11:58

update Si_t alias for cesm + cice6

198e00a

spell surface correctly

66cb2d8

binli2337 approved these changes Jul 2, 2020

View reviewed changes

DeniseWorthen added 2 commits July 4, 2020 13:26

add entries to eliminate ifdefs in CICE6 nuopc cap

905e8e2

changes required for CESM in med.F90.

a2838cf

No answer changes are expected for NEMS but will rerun the tests to verify

MinsukJi-NOAA mentioned this pull request Jul 6, 2020

fix/change input file source location when creating baselines using rt.sh ufs-community/ufs-s2s-model#128

Merged

This was referenced Jul 6, 2020

Update CMEPS ufs-community/ufs-s2s-model#129

Merged

update mediator/Makefile to compile esmf 8.1.0 #5

Closed

update mediator/Makefile to compile esmf 8.1.0 (#12)

2e18eb8

Authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>

Revert "update mediator/Makefile to compile esmf 8.1.0 (#12)"

318e441

This reverts commit 2e18eb8.

junwang-noaa approved these changes Jul 9, 2020

View reviewed changes

DeniseWorthen merged commit b74f966 into NOAA-EMC:emc/develop Jul 9, 2020

DeniseWorthen pushed a commit to DeniseWorthen/CMEPS that referenced this pull request Aug 21, 2021

Merge pull request NOAA-EMC#3 from NOAA-EMC/emc/develop

11f210d

Sync support/HAFS branch with the emc/develop branch as of 04/16/2021

DeniseWorthen pushed a commit to DeniseWorthen/CMEPS that referenced this pull request May 9, 2023

Merge pull request NOAA-EMC#3 from mvertens/feature/remove_uneeded_xm…

76bba43

…lvars removed unneeded xml variables

DeniseWorthen pushed a commit to DeniseWorthen/CMEPS that referenced this pull request Feb 4, 2024

Merge pull request NOAA-EMC#3 from hafs-community/feature/sync_escomp…

eb87f4a

…_20240201

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update CMEPS #3

Update CMEPS #3
DeniseWorthen merged 38 commits into
NOAA-EMC:emc/developfrom
DeniseWorthen:feature/fracgridwk2

DeniseWorthen commented Jun 29, 2020 •

edited by junwang-noaa

Loading

Uh oh!

DeniseWorthen commented Jul 1, 2020

Uh oh!

DeniseWorthen commented Jul 1, 2020

Uh oh!

DeniseWorthen commented Jul 6, 2020 •

edited

Loading

Uh oh!

DeniseWorthen commented Jul 6, 2020

Uh oh!

DeniseWorthen commented Jul 8, 2020

Uh oh!

junwang-noaa commented Jul 8, 2020 via email

Uh oh!

DeniseWorthen commented Jul 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

DeniseWorthen commented Jun 29, 2020 • edited by junwang-noaa Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DeniseWorthen commented Jul 1, 2020

Uh oh!

DeniseWorthen commented Jul 1, 2020

Uh oh!

DeniseWorthen commented Jul 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DeniseWorthen commented Jul 6, 2020

Uh oh!

DeniseWorthen commented Jul 8, 2020

Uh oh!

junwang-noaa commented Jul 8, 2020 via email

Uh oh!

DeniseWorthen commented Jul 9, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DeniseWorthen commented Jun 29, 2020 •

edited by junwang-noaa

Loading

DeniseWorthen commented Jul 6, 2020 •

edited

Loading