Downstream merge of scream/eamxx fork into E3SM #6153

jgfouca · 2024-01-18T17:51:58Z

Downstream merge of scream/eamxx fork into E3SM

The build system fixes on the fork are needed for E3SM.
Also updates E3SM with latest version of eamxx.

Merge remote-tracking branch 'scream/master' into jgfouca/scream_downstream_merge

Updates submodules:

ekat
haero
mam4xx

EAM updates:

Consolidate shoc_Ck nml settings
New iop_coriolis nml setting (for nudging)
initialize IOP information on the first restart time step
SHOC updates
Add wet/dry qv_sat (saturation mixing ratio), old qv_sat is still available for backwards compatibility
P3 updates (scream version only)

This PR now includes #5925 :

Update the YAKL submodule, and update PAM submodule to work with the YAKL update.

[YAKL]
[BFB] - (except for SCREAM/EAMXX and MMF2 cases)

…sion-nano-fix Automatically Merged using E3SM Pull Request AutoTester PR Title: EAMxx: fix setting of FillValue based on fp precision PR Author: bartgol PR LABELS: I/O, AT: AUTOMERGE, bugfix

Automatically Merged using E3SM Pull Request AutoTester PR Title: Fixes scream case builds on a couple systems PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

It causes things to break for some eamxx cases.

…n_cice Automatically Merged using E3SM Pull Request AutoTester PR Title: Disable snan init for cice PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

thanks ben

the lw ones seem to be flaky, not sure why.

…p_dp_class_and_unit_test Automatically Merged using E3SM Pull Request AutoTester PR Title: DP-SCREAM: Add IOP class and unit test PR Author: tcclevenger PR LABELS: AT: AUTOMERGE, DP-SCREAM

The shared kokkos config did not quite match the config that was being used for the eamxx build of kokkos.

…iffs Automatically Merged using E3SM Pull Request AutoTester PR Title: Fix chrysalis cmake macro to fix DIFFs PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

Default behavior is still to explicitly flush only at closure, but user can now request a different flush frequency via yaml file.

This solves a link error that for some reason does not always appear. Both homme and scream define a function with C linkage with the same name. We could change the name of the fcn in Homme, but that requires lengthier process (due to PR workflow in E3SM)

* Pass libs via optional argument, to increase readability * Fortran flags are already set to main scream libs * Default include dirs are unused

* Most tests in the eamxx/tests subfolder are doing the exact same thing, so we may as well have a template source file, good for most case * Add special version of create unit test cmake functions, which takes care of setting the source file to scream_ad_test.cpp

* Use CreateADUnitTest where appropriate * Remove src file in test folder * Rename output yaml files to just 'output.yaml', to make tab completion in bld folder faster * FIXTURE_XYZ is now supported by CreateUnitTest, so no need to prepend PROPERTIES (which in fact causes cmake warning) * Use FIXTURE_SETUP_INDIVIDUAL when appropriate, to increase tests concurrency

Use some cmake vars to store fixtures/test names, to avoid typos

Also, FIXTURES_[SETUP|REQUIRED] should be preferred to the DEP keyword

rljacob · 2024-01-22T17:00:06Z

@jgfouca can you fix the title and mention the externals that are being updated in the description?

jgfouca · 2024-01-22T17:04:09Z

@rljacob , done

rljacob · 2024-01-22T17:32:54Z

There should also be a description of what's changing in EAM.

rljacob · 2024-01-22T17:45:59Z

Since you're updating ekat, how does this PR relate to #6101

jgfouca · 2024-01-22T17:47:29Z

@rljacob , I added an EAM change list. There might be a minor conflict with that other EKAT PR, should be very easy to resolve (just take the newer sha).

bartgol · 2024-01-22T18:20:27Z

Since you're updating ekat, how does this PR relate to #6101

That PR is relatively orthogonal. The only thing it does is updating the kokkos submodule in ekat (and adjusting for API changes). I am trying to get all of that testing completed. but it's taking me a long time. I don't want that PR to block this one in any way. I will adjust that one if need be.

rljacob · 2024-01-23T16:51:52Z

2 SCREAM diffs, as expected, but 1 MMF build fail: SMS_Ln3.ne4pg2_ne4pg2.F2010-MMF2

ambrad · 2024-01-23T18:25:00Z

I think this PR is causing these new build failures: https://my.cdash.org/build/2477124

jgfouca · 2024-01-23T18:28:24Z

I think so too; I'm looking at the three cases on chrysalis now.

…into jgfouca/scream_downstream_merge * abag/abagusetty/yakl-submodule-update: Update PAM for build fixes Update PAM to work with YAKL updates Fix YAKL fortran interface build [YAKL] update yakl to latest tip [YAKL] update YAKL submodule

jgfouca · 2024-01-24T16:54:58Z

I've added #5925 to this PR since both branches depend on each other now.

rljacob · 2024-01-24T17:51:54Z

@jgfouca be sure to update the description then.

jgfouca · 2024-01-24T17:54:21Z

@rljacob , done.

Merge 2 for this PR for various fixes to things impacted by the scream update. * jgfouca/scream_downstream_merge: Set pam subm to latest master Increase gator pool size for pm-cpu Bring in latest PAM branch Another update to PAM to fix build errors on mappy Update PAM for build fixes Add EAMxx component to master list Change EAMxx site name for docs Update PAM to work with YAKL updates Fix YAKL fortran interface build [YAKL] update yakl to latest tip [YAKL] update YAKL submodule

Merge 3 for this PR to fix Homme standalone cmakelist.txt file to reflect recent changes to EkatBuildKokkos module. * jgfouca/scream_downstream_merge: Fix Homme Cmake, EKAT subm update changed the EkatBuildKokkos module

jgfouca and others added 30 commits November 13, 2023 16:34

Fix ascent macro

9308db5

Merge Pull Request #2596 from E3SM-Project/scream/bartgol/io/fp-preci…

8e28e91

…sion-nano-fix Automatically Merged using E3SM Pull Request AutoTester PR Title: EAMxx: fix setting of FillValue based on fp precision PR Author: bartgol PR LABELS: I/O, AT: AUTOMERGE, bugfix

Merge Pull Request #2598 from E3SM-Project/scream/jgfouca/fix_builds

7b4de1b

Automatically Merged using E3SM Pull Request AutoTester PR Title: Fixes scream case builds on a couple systems PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

Disable snan init for cice

a99e38a

It causes things to break for some eamxx cases.

Merge Pull Request #2599 from E3SM-Project/scream/jgfouca/disable_sna…

1bdd7eb

…n_cice Automatically Merged using E3SM Pull Request AutoTester PR Title: Disable snan init for cice PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

typos in docs strings

c78fa38

thanks ben

start setting up unit test for rrtmgp_[sl]w

10b5566

add sanity check of sw clnsky to rrtmgp_tests

d797fb7

the lw ones seem to be flaky, not sure why.

Merge Pull Request #2587 from E3SM-Project/scream/tcclevenger/dp/setu…

26f1eda

…p_dp_class_and_unit_test Automatically Merged using E3SM Pull Request AutoTester PR Title: DP-SCREAM: Add IOP class and unit test PR Author: tcclevenger PR LABELS: AT: AUTOMERGE, DP-SCREAM

fix bug in lw cln/clr calls and add checks

8f43e4d

Fix chrysalis cmake macro to fix DIFFs

4bb58b1

The shared kokkos config did not quite match the config that was being used for the eamxx build of kokkos.

Merge Pull Request #2600 from E3SM-Project/scream/jgfouca/fix_chrys_d…

7cb3c20

…iffs Automatically Merged using E3SM Pull Request AutoTester PR Title: Fix chrysalis cmake macro to fix DIFFs PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

comment out rrtmgp_[ls]w unit test for now

f887c85

EAMxx: Allow to flush output files before they are closed

14c61fa

Default behavior is still to explicitly flush only at closure, but user can now request a different flush frequency via yaml file.

EAMxx: fix typo

28a500c

Modifies CMAKE to send SCREAM CMAKE info to HAERO/MAM4xx

d306f09

Removes Fortran cmake

9fcab48

Merge pull request #2606 from E3SM-Project/bartgol/rename-cxx-wraps

4c8dccd

EAMxx: small mod to CreateUnitTest

104b9eb

* Pass libs via optional argument, to increase readability * Fortran flags are already set to main scream libs * Default include dirs are unused

EAMxx: always add scream_share as a LIB dep to all unit tests

48f3a92

EAMxx: use PUBLIC explicitly in target_link_libraries

730b636

EAMxx: silence compiler warning

80263d3

EAMxx: fix some tests dependencies

261025d

Use some cmake vars to store fixtures/test names, to avoid typos

EAMxx: fix typo bug in fail_check test

97f5495

EAMxx: remove un-needed test dependency

2aa4942

Also, FIXTURES_[SETUP|REQUIRED] should be preferred to the DEP keyword

EAMxx: fix some typos in unit tests names

ba5c41b

EAMxx: removed pointless spec in shoc_p3_nudged tests

cf8544e

jgfouca changed the title ~~Jgfouca/scream downstream merge~~ Downstream merge of scream/eamxx fork into E3SM Jan 22, 2024

rljacob added eam Atmosphere CMake build system labels Jan 22, 2024

rljacob self-requested a review January 22, 2024 18:50

rljacob approved these changes Jan 22, 2024

View reviewed changes

brhillman and others added 2 commits January 23, 2024 15:45

Update PAM for build fixes

f370642

rljacob mentioned this pull request Jan 24, 2024

[YAKL] Update YAKL and PAM submodules #5925

Closed

jgfouca added 4 commits January 24, 2024 12:35

Another update to PAM to fix build errors on mappy

95c0a58

Bring in latest PAM branch

373ebcd

Increase gator pool size for pm-cpu

2140ebc

Set pam subm to latest master

1708b46

Fix Homme Cmake, EKAT subm update changed the EkatBuildKokkos module

0c8b36d

jgfouca merged commit 7f3280f into master Jan 26, 2024
4 checks passed

jgfouca deleted the jgfouca/scream_downstream_merge branch January 26, 2024 20:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Downstream merge of scream/eamxx fork into E3SM #6153

Downstream merge of scream/eamxx fork into E3SM #6153

jgfouca commented Jan 18, 2024 •

edited

Loading

rljacob commented Jan 22, 2024

jgfouca commented Jan 22, 2024

rljacob commented Jan 22, 2024

rljacob commented Jan 22, 2024

jgfouca commented Jan 22, 2024

bartgol commented Jan 22, 2024

rljacob commented Jan 23, 2024

ambrad commented Jan 23, 2024

jgfouca commented Jan 23, 2024

jgfouca commented Jan 24, 2024

rljacob commented Jan 24, 2024

jgfouca commented Jan 24, 2024

Downstream merge of scream/eamxx fork into E3SM #6153

Downstream merge of scream/eamxx fork into E3SM #6153

Conversation

jgfouca commented Jan 18, 2024 • edited Loading

rljacob commented Jan 22, 2024

jgfouca commented Jan 22, 2024

rljacob commented Jan 22, 2024

rljacob commented Jan 22, 2024

jgfouca commented Jan 22, 2024

bartgol commented Jan 22, 2024

rljacob commented Jan 23, 2024

ambrad commented Jan 23, 2024

jgfouca commented Jan 23, 2024

jgfouca commented Jan 24, 2024

rljacob commented Jan 24, 2024

jgfouca commented Jan 24, 2024

jgfouca commented Jan 18, 2024 •

edited

Loading