Skip to content

Conversation

@jedwards4b
Copy link
Collaborator

Description of changes

Change of approach based on discussion in #534

Specific notes

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

Please describe the tests along with the target model and machine(s)
If possible, please also added hashes that were used in the testing

@DeniseWorthen
Copy link
Collaborator

@jedwards4b Sorry I missed this review request. I'll try to test today or tomorrow.

@DeniseWorthen
Copy link
Collaborator

@uturuncoglu I'm having trouble getting this PR to pass the UFS RTs for the some of atm-lnd configurations. This is very puzzling because I can't see any reason why the lnd configurations would fail

rt_control_p8_atmlnd_debug_intel.log:Test control_p8_atmlnd_debug_intel FAIL
rt_control_p8_atmlnd_intel.log:Test control_p8_atmlnd_intel FAIL
rt_cpld_control_p8_lnd_intel.log:Test cpld_control_p8_lnd_intel FAIL

I've tested the develop branch, and they're all passing. The tests are failing completely, for example

/glade/work/worthen/ufs_cmeps/tests/logs/log_derecho/rt_cpld_control_p8_lnd_intel.log

I'm testing using a CDEPs and CMEPs branch. I can do some more debugging and let you know if I figure anything out but am I missing something?

@uturuncoglu
Copy link
Collaborator

@DeniseWorthen Strange. Are you merging this to NOAA-EMC CMEPS? We have some additional change in NOAA-EMC CMEPS. There are NOAA-EMC@cdbed6c and not pushed to ESCOMP. It might change the answers.

@uturuncoglu
Copy link
Collaborator

@DeniseWorthen As I remember, by default, samegrid_atmlnd is set to False.

@DeniseWorthen
Copy link
Collaborator

@uturuncoglu Actually I think I just figured it out. I think I'm missing your "same grid" fixes in my branch! I'll let you know if that doesn't fix it.

@DeniseWorthen
Copy link
Collaborator

@uturuncoglu Sorry for the confusion, everything is good now.

@jedwards4b This tests fine for UFS, when matched w/ CDEPS ESCOMP/CDEPS#321

@uturuncoglu
Copy link
Collaborator

@DeniseWorthen I am glad that it is solved in your end. BTW, may be we could also push those extra changes in the NOAA-EMC side to ESCOMP.

@DeniseWorthen
Copy link
Collaborator

I actually just noticed (had lost track of it...) that we still have two open PRs to push up our latest (one CMEPS, one CDEPS) for the flexible restart times. But yes, I'll get the new land-same-grid fix pushed back too.

@jedwards4b
Copy link
Collaborator Author

@DeniseWorthen Did you want to do more testing with this or can I merge?

@DeniseWorthen
Copy link
Collaborator

@jedwards4b No, I tracked down my failures (user error), so this is fine. Thanks.

@jedwards4b jedwards4b merged commit c83271e into ESCOMP:main Feb 12, 2025
4 checks passed
@jedwards4b jedwards4b deleted the shr_log_error branch February 12, 2025 15:34
DeniseWorthen added a commit to DeniseWorthen/CMEPS that referenced this pull request Oct 24, 2025
commit e9c9d564329ab7a639901d4c5382d8388b64d673
Author: Jim Edwards <[email protected]>
Date:   Mon Oct 20 07:38:52 2025 -0600

    uncomment tmate to debug workflow

commit bc50b6df2dbb7a1dce2c3c701e60df8a0767c3ce
Author: Mariana Vertenstein <[email protected]>
Date:   Sun Oct 19 14:18:49 2025 +0200

    fixed comment

commit 4a35ebe2bb74d2503cbb9dc6d40e1a26612759fc
Author: Mariana Vertenstein <[email protected]>
Date:   Sun Oct 19 11:57:15 2025 +0200

    addressed issue raised in PR review

commit 7442cb213f1e804a2bf119ae0cf7bd2474d4a455
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 20:42:08 2025 +0200

    another compiler fix

commit cc8f24e7b4fa9306d64f5b0870cae161cbc05258
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 20:34:33 2025 +0200

    more compile fixes

commit 9682c52fd73d143bfb8b190e7bc580250c2b5bce
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 20:11:05 2025 +0200

    more updates to get code to compile successfully

commit 175641390d170dc2d7795baee115b86f4ad2f6ed
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 20:08:38 2025 +0200

    updates to get compilation working

commit a570a159d558127fe2b7362479379dc0691f1de2
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 16:49:35 2025 +0200

    more compile problem fixes in git workflow

commit 9f548a4ad8321495b07b0bb5fbe0fb5b7f8a62f5
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 16:27:42 2025 +0200

    fixed compiler issue

commit c3e34f4e33aedf41a1ed6cadd11f63c9a8bc9561
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Oct 17 11:47:52 2025 +0200

    some cleanup of routine

commit 0856db6cf1490280a3a9d4a27e9ce5666fa70f9e
Author: Mariana Vertenstein <[email protected]>
Date:   Thu Oct 16 23:04:00 2025 +0200

    reintroduced usage of shr_wv_sat_qsat that was lost in the cherry-pick from NorESMHub

commit 5c47bc7be6ee81eac87d7a77b1e5c4d5b2457aee
Author: Mariana Vertenstein <[email protected]>
Date:   Thu Oct 16 22:53:21 2025 +0200

    removed CPL_EPBAL

commit d9eb391f045243f22c25ac230843ca10ac7365eb
Author: Mariana Vertenstein <[email protected]>
Date:   Thu Oct 16 22:23:44 2025 +0200

    compile fixes for removing isotopes

commit 47a6c78f091905289eb9bcbc87cb78fc60ecccff
Author: mvertens <[email protected]>
Date:   Thu Oct 16 21:14:34 2025 +0200

    removed all references to water isotopes - since this will be heavily refactored in upcoming work

commit d8e15933159d18dfca598fbaf62b6d0ba751d02e
Author: Mariana Vertenstein <[email protected]>
Date:   Thu Oct 16 19:41:19 2025 +0200

    compile with intel is now successful

commit 0130cb2a24d024e6a0cb47feea36b92cb48ae89d
Merge: 3a50750a 60c6514c
Author: Jim Edwards <[email protected]>
Date:   Mon Oct 6 14:37:14 2025 -0400

    Merge pull request #599 from samsrabin/fix-buildnml-set_value

    Wrap buildnml call of Case.set_value() in non-readonly context

commit 60c6514c07fc326562b861ee184fe5b95a9d57f2
Merge: d74bc450 3a50750a
Author: Sam Rabin <[email protected]>
Date:   Mon Oct 6 11:48:26 2025 -0600

    Merge branch 'main' into fix-buildnml-set_value

commit d74bc4509859cee61f8a5eef83151c2d8d6b7e21
Author: Sam Rabin <[email protected]>
Date:   Mon Oct 6 11:46:03 2025 -0600

    Wrap buildnml call of Case.set_value() in non-readonly context.

commit 3a50750a3e08fcad1289861c482b0d433530155c
Merge: 0ee0fdc6 599dad1d
Author: Jim Edwards <[email protected]>
Date:   Tue Sep 30 15:45:59 2025 -0400

    Merge pull request #595 from mvertens/feature/cleanup_config_settings

    change of CPL_ALBAV for MOM6 and other cleanup

commit 599dad1d5dc8a14d9af53120c2ad0a62f0260022
Author: Mariana Vertenstein <[email protected]>
Date:   Tue Sep 30 09:25:18 2025 +0200

    fixed comment

commit 9bc366979fd2a273d407c9c8d9bcd78d683ee0f9
Author: Mariana Vertenstein <[email protected]>
Date:   Tue Sep 30 09:06:43 2025 +0200

    fixed comment for CCSM_CO2_PPMV

commit 913811d2aa13c862921250e2fc97c9a2a0df4487
Author: Mariana Vertenstein <[email protected]>
Date:   Mon Sep 29 13:38:25 2025 +0200

    removed references for CPL_EPBAL from buildnml

commit 96d50c3210ba09386ca4cb70960c70641ea5d93d
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Sep 26 20:45:58 2025 +0200

    reintroduced PAUSE xml variables for now

commit 08fee479e30b89102032495cca414e18073e54b5
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Sep 26 17:39:50 2025 +0200

    change of CPL_ALBAV for MOM6, removal of POP variables (including CPL_EPBAL) and removal of pause/resume settings and other removal of variables that are not used by CESM

commit 0ee0fdc68221964dd0fafce18077a8c51da76fe8
Merge: d25a2aa8 13457345
Author: Jim Edwards <[email protected]>
Date:   Mon Sep 29 09:01:12 2025 -0400

    Merge pull request #597 from jedwards4b/fix_gust_factors

    Fix gust factors

commit 13457345a71ce61c242799b99df49461e18bd3ee
Author: Jim Edwards <[email protected]>
Date:   Mon Sep 29 06:12:34 2025 -0600

    remove unintended change

commit e7f5cdfdd8c811ca35904545dcc307d0c7caba36
Author: Jim Edwards <[email protected]>
Date:   Sat Sep 27 19:06:43 2025 -0400

    Update namelist_definition_drv.xml

commit 1778ed0eb5559446857d7df1ed4dbeb41cb49608
Author: Jim Edwards <[email protected]>
Date:   Sat Sep 27 11:27:14 2025 -0600

    fix merge errors

commit 579b4339af3072bdac3c900bcf65ffe04ff0eaba
Author: Jim Edwards <[email protected]>
Date:   Sat Sep 27 11:18:28 2025 -0600

    replace qsat calculation

commit 1f93647d8778530f1dd229e50881eead2b70c70b
Author: Jim Edwards <[email protected]>
Date:   Sat Sep 27 11:11:50 2025 -0600

    changes to gust factor

commit d25a2aa8ae4ce431a841e1f331f35d98cba412ef
Merge: a0735ecd 99156eab
Author: Jim Edwards <[email protected]>
Date:   Fri Sep 12 10:30:49 2025 -0400

    Merge pull request #592 from sjsprecious/update_casper_amd_gpu

    Update AMD GPUs on Casper

commit a0735ecdb5a3e1150797a8f05ded6e4b6a271b41
Merge: dab9de1a 7a24e2cd
Author: fischer-ncar <[email protected]>
Date:   Mon Sep 8 13:15:01 2025 -0600

    Merge pull request #593 from fischer-ncar/main

    Rename B compsets in testlist.

commit 7a24e2cdcabdbac05307278cf89b45acb99bd3cc
Author: Chris Fischer <[email protected]>
Date:   Mon Sep 8 12:20:03 2025 -0600

    Change so to t4s chemistry

commit ef94e201eb4a88fea33530ae391812769416c3cd
Author: Chris Fischer <[email protected]>
Date:   Mon Sep 8 12:01:26 2025 -0600

    Rename B compsets.

commit 99156eabb7e1fb9e32cef543b43e9fb949402c0c
Author: Jian Sun <[email protected]>
Date:   Fri Sep 5 12:53:16 2025 -0600

    update AMD GPUs on Casper

commit dab9de1abe0993bee708168b9428bdecc63ae608
Merge: 286ddaf6 80ed8c89
Author: Jim Edwards <[email protected]>
Date:   Wed Sep 3 18:49:05 2025 -0400

    Merge pull request #591 from fischer-ncar/main

    Fix mpi-serial restart tests.

commit 80ed8c895366c8fc725ea48f12205662baf0339d
Author: Chris Fischer <[email protected]>
Date:   Wed Sep 3 13:14:08 2025 -0600

    Fix mpi-serial restart tests.

commit 286ddaf6e9c324aec82ebf53e1700e090c3bbfe9
Merge: b875259c 2f469b07
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 13:49:24 2025 -0400

    Merge pull request #589 from jedwards4b/shr_flux_usage

    Shr flux usage https://github.com/ESCOMP/CMEPS/pull/588#issuecomment-3237751276

commit 2f469b073f7133fa467785a38ee208fd67363cf7
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 11:30:07 2025 -0600

    remove share calculation from unused diurnal subroutine

commit 926f244d11e477ac578d488f886c4dd74c3ff989
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 10:49:36 2025 -0600

    correct path to artifacts

commit fd90f95a0b6f4af743e2e926b979d41d7f243d84
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 10:46:24 2025 -0600

    correct path to artifacts

commit 90e73f59baeb9ab7d4c08125dec17ec964fa8f47
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 10:44:21 2025 -0600

    correct path to artifacts

commit fac1d081615f723435355be7664a115bbd85a2f0
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 10:39:48 2025 -0600

    correct path to artifacts

commit 2118e8b0850dada1506da9d7cc1e431af522c5c3
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 10:03:03 2025 -0600

    correct path to artifacts

commit 1ccf4fac0fd6734b000226443c7b66af313b635a
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 09:41:12 2025 -0600

    correct path to artifacts

commit f9e9dc111767db4e1c006f51385b3a85b055d2ff
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 09:31:28 2025 -0600

    correct path to artifacts

commit 6d83bcc7f3c190b2d33e508dba95ee5b249dac81
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 09:20:44 2025 -0600

    add artifact to github testing

commit b875259c7d3f229104142e6004a8adb60b8a21ba
Merge: 60034eb2 60a8e234
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 29 10:50:11 2025 -0400

    Merge pull request #584 from jedwards4b/move_liblist_to_driver

    moves liblist to driver buildnml making cime more generic.
    3.8 failure is expected, will be fixed in next cesm tag.

commit 10bceb1c236150b8614fa722502408a933df8469
Author: Jiang Zhu <[email protected]>
Date:   Fri Aug 29 08:46:00 2025 -0600

    Make qsat calculation consistent with CAM

commit 60a8e23437602cf89bb2abd88f16027f01fc6634
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 28 07:57:53 2025 -0600

    reponse to copilot review

commit 4161f31cf2d22c3ce8f04c2afd8cf2c2f20f5119
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 28 07:47:46 2025 -0600

    update documentation

commit 60034eb2f67e8f95ca030aef355490fea47c462f
Merge: 535a038f be5903f1
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 27 10:02:22 2025 -0400

    Merge pull request #586 from jedwards4b/nag_format_fix

    fix for nag formatting error

commit be5903f152af7b731c402d3ce7b4f17fd30e2cac
Author: Jim Edwards <[email protected]>
Date:   Tue Aug 26 14:12:33 2025 -0600

    fix for nag formatting error

commit dbf5588452b1c4da3415f0e3cc500f0fa95eb4cf
Author: Jim Edwards <[email protected]>
Date:   Tue Aug 26 12:46:27 2025 -0600

    clean up;

commit 5536f787159a37245e670dfacaf10721326f74c9
Author: Jim Edwards <[email protected]>
Date:   Tue Aug 26 07:50:34 2025 -0600

    move defaults to xml

commit 535a038f76615d67c626be21a9610c9a932e48ea
Merge: d8001305 d76c1015
Author: Jim Edwards <[email protected]>
Date:   Tue Aug 26 09:22:40 2025 -0400

    Merge pull request #585 from dabail10/wavice3

    Make wave ice coupling default, build 3.8 fail is expected.

commit d76c10156dd3fcb42e7286a0559653cdc8f216e9
Author: David Bailey <[email protected]>
Date:   Fri Aug 22 14:40:26 2025 -0600

    Make wave ice coupling default

commit 32d3d9d84800b157b8bf89f0006f9879d30a9d3f
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 22 08:27:15 2025 -0600

    add comment

commit e4030eb391b56bdea396147aa2286aff71568716
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 21 08:06:26 2025 -0600

    allow for other components to modify CASE_SUPPORT_LIBRARIES

commit 22f1dce3ff5ddf8888bdd67e8a6aef38fed7f170
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 20 08:46:38 2025 -0600

    moves liblist to driver buildnml making cime more generic

commit d8001305ed45f9644185b9ac4f34d21c3b190c04
Merge: 289d1f7d db0557d8
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 14 10:45:39 2025 -0400

    Merge pull request #580 from mvdebolskiy/fix/fco2lnd

    Bugfix for co2 fluxes comming from land to atmosphere

commit 289d1f7d49bef184cd7173f371325d16cd4eded7
Merge: 62db914f c9790bef
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 13 15:46:26 2025 -0400

    Merge pull request #582 from jedwards4b/add_err_to_tests_avoiding_eor_restart

    add the err test to those avoiding end of run restarts

commit c9790bef1bd9050b7a7f856ed83f29a409d1d0a2
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 13 12:43:25 2025 -0600

    add the err test to those avoiding end of run restarts

commit 62db914fa29490ba10fc4a4803b74960b7d2f059
Merge: 3612d697 a4533b24
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 13 10:48:36 2025 -0400

    Merge pull request #579 from sjsprecious/add_cirrus_gpu

    Add CIRRUS and Casper GPU types

commit 3612d69768e71a05d9366f72198d3803f177aba8
Merge: 903c4827 1b8d1d2f
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 13 10:48:05 2025 -0400

    Merge pull request #578 from gdicker1/update_ncpl_mpascompsets

    Update ATM_NCPL for MPAS Compsets

commit 903c4827aaef766379198058a6b37b70fcf9c4c1
Merge: aeb81084 1280f5e0
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 13 06:22:44 2025 -0400

    Merge pull request #581 from DeniseWorthen/feature/sync_ufs

    Sync EMC CMEPS

commit 1280f5e029091551da18f469ab2440951aa8c5a2
Author: Denise Worthen <[email protected]>
Date:   Tue Aug 12 17:59:50 2025 -0400

    update cdeps_version

commit b1d5ad050bbc382de1f7bcb97cba19819b9f4d48
Merge: 50b7c759 aeb81084
Author: Denise Worthen <[email protected]>
Date:   Tue Aug 12 13:03:50 2025 -0400

    Merge remote-tracking branch 'ESCOMP/main' into feature/sync_ufs

commit db0557d8e20ce4d7a48ec4f17bd2a4db92fd8059
Author: Marit Sandstad <[email protected]>
Date:   Mon Aug 11 09:32:09 2025 +0200

    Adding Alok's fixed file for the fco2 land flux mediation

    (cherry picked from commit ae2d923dc5397a61a921fea8dd8d9dd01f614f93)

commit 1b8d1d2f0c8409ab5f65a1ee58a15efe32185921
Author: G. Dylan Dickerson <[email protected]>
Date:   Wed Jul 30 13:41:14 2025 -0600

    Adjust for _MPAS compsets using NCPL_BASE_PERIOD=hour

commit 0c0d8ff0d451e1d786fb56dd54c7bd040cf6d167
Author: G. Dylan Dickerson <[email protected]>
Date:   Wed Jul 30 13:40:21 2025 -0600

    Put mpasa ATM_NCPL lines next to other resolution-dependent values

commit a4533b24feb659218749312165de448117bf4060
Author: Jian Sun <[email protected]>
Date:   Mon Jul 28 22:07:07 2025 -0600

    add cirrus and casper gpu types

commit aeb81084f338b06b4b9ad94dbb9ee39208f2d74d
Merge: b0660360 e0ae5ad0
Author: Jim Edwards <[email protected]>
Date:   Fri Jul 25 15:20:41 2025 -0400

    Merge pull request #576 from jedwards4b/add_interim_restart_testmod

    add a testmod to test the interim restart feature

commit e0ae5ad0fa84183bc249dcb34af9e7c4dc89ec8b
Author: Jim Edwards <[email protected]>
Date:   Fri Jul 25 08:59:09 2025 -0600

    add a testmod to test the interim restart feature, this mod requires cime PR 4827

commit b06603607492c34e7fe6ec1f66e198f6a854b532
Merge: e06d8512 dcd1c7c4
Author: Jim Edwards <[email protected]>
Date:   Mon Jul 7 09:21:12 2025 -0400

    Merge pull request #569 from gdicker1/eworg_mpaso_mpassi

    Add MPAS-O and MPAS-SI from EarthWorksOrg/EarthWorks

commit e06d8512edcd868101714effb2700a045beac219
Merge: bd3ff831 643d2d31
Author: Jim Edwards <[email protected]>
Date:   Mon Jul 7 09:20:35 2025 -0400

    Merge pull request #572 from DeniseWorthen/feature/fix_uv3dunits

    add unit fix for uv3d mapping

commit 643d2d31bacf807cca2e4f023bc233a8600ea628
Author: Denise Worthen <[email protected]>
Date:   Wed Jun 25 10:31:58 2025 -0400

    add unit fix for uv3d mapping

commit bd3ff83126516a16263fc7c4c16bbdeb4bd753b3
Merge: 57e50265 a28d8999
Author: Jim Edwards <[email protected]>
Date:   Wed Jun 18 16:47:08 2025 -0400

    Merge pull request #570 from adamrher/cmeps-natl

    Add ATM_NCPL entry for new NATLx8 grid

commit a28d8999e88c2bfacf1d21848d2838150d766f5f
Author: adamrher <[email protected]>
Date:   Wed Jun 18 14:07:32 2025 -0600

    add ATM_NCPL entry for NATLx8 grid

commit c43077c3032e8c846a03076f0c9cbbd18f5cc7d0
Merge: d8920287 57e50265
Author: adamrher <[email protected]>
Date:   Wed Jun 18 14:05:56 2025 -0600

    Merge tag 'cmeps1.1.1'

    cmeps1.1.1

commit dcd1c7c416b3e567be9305fc98d130abcd41e89a
Merge: 832a0856 57e50265
Author: Jim Edwards <[email protected]>
Date:   Wed Jun 18 15:29:40 2025 -0400

    Merge branch 'main' into eworg_mpaso_mpassi

commit 832a08562cf5eb586b78422af425303474b0cf8c
Author: G. Dylan Dickerson <[email protected]>
Date:   Wed Jun 18 13:23:41 2025 -0600

    Reveiw req., consolidate exchange MPAS guards

commit 5209116642af42ea4e6d85190d994556fda89ced
Author: G. Dylan Dickerson <[email protected]>
Date:   Tue Jun 17 18:06:59 2025 -0600

    Review request, guard field exchanges added by MPAS-O and MPAS-SI

    This change tries to ensure that adding MPAS-O and MPAS-SI won't affect
    CESM results.

commit e44ab5127ff4dcc09b83947ee95f5d2b82921aad
Merge: ce2f732e dfe357ec
Author: G. Dylan Dickerson <[email protected]>
Date:   Wed Jun 11 10:56:12 2025 -0600

    Merge tag 'cmeps1.0.47' into branch 'eworg_mpasso_mpassi'

    Catch up to development, especially to cesm3_0_beta06 version.

commit 57e5026521b939209236b3a5dd09574ce8af87e8
Author: Jim Edwards <[email protected]>
Date:   Wed May 14 08:37:38 2025 -0600

    revert change in bumpversion

commit f1c0df1b276b11d69eb2649e091a9c07c1d9c778
Author: Jim Edwards <[email protected]>
Date:   Wed May 14 08:30:55 2025 -0600

    trigger minor version change due to shr_megan_mod api change in cmeps1.0.48 #minor

commit 0524c14fe4c3cbf25f844c82e0bdefd1e03c7a7a
Author: Jim Edwards <[email protected]>
Date:   Wed May 14 08:27:45 2025 -0600

    test push of minor revision change

commit 34722f51bae8522e4ffd0f5a97db6d09760c5a38
Merge: b72438ed a1f511de
Author: Jim Edwards <[email protected]>
Date:   Tue May 13 14:23:02 2025 -0400

    Merge pull request #564 from kdraeder/cmeps_st-arch_dart

    Make st_archive handle the .hx coupler history files

commit ce2f732ef83992fe7a3d9041819fe7f192f7d6eb
Merge: decbf4e4 4b636c6f
Author: G. Dylan Dickerson <[email protected]>
Date:   Mon May 12 20:11:58 2025 -0600

    Merge tag ESCOMP/CMEPS 'cmeps1.0.33' into 'eworg_mpaso_mpassi'

commit decbf4e4eb1cc77275ad1789563b40ac6ccdd725
Author: Donald Dazlich <[email protected]>
Date:   Wed Oct 9 14:41:06 2024 -0600

    Typo fix

commit be66c78bfd5702f99abff8809f3a5f1cb5947277
Author: Donald Dazlich <[email protected]>
Date:   Mon Oct 7 13:01:22 2024 -0600

    MPAS-Ocean update
    Necessary coupling fields associated with the new version of
    MPAS-Ocean have been added. These fields are associated
    with Stokes drift and may not actually be used.

commit 1d7b135775a95b3869e347cef5133e7f702aa1b2
Merge: d7cf7d69 5b7d7697
Author: G. Dylan Dickerson <[email protected]>
Date:   Mon May 12 20:06:32 2025 -0600

    Merge tag ESCOMP/CMEPS 'cmeps1.0.16' into 'eworg_mpaso_mpassi'

commit d7cf7d69de141120c29ea32aae9273d2923e206b
Author: G. Dylan Dickerson <[email protected]>
Date:   Fri May 17 11:39:47 2024 -0600

    Duplicate mpasa grid NCPL entries for _MPAS compsets

    If the compset name contains "_MPAS" then NCPL_BASE_PERIOD changes to
    hour instead of day. The new values are equivalent to the day-based
    values.

    Also add an entry for ROF, so that it is set to ATM_NCPL if the compset
    includes "_MPAS" in the name.

commit c0570015c2f0465cc0b79e7fc731315087bf0494
Author: G. Dylan Dickerson <[email protected]>
Date:   Mon May 12 20:00:26 2025 -0600

    Configure ATM_NCPL based on mpasa grids used

    As the resolution of simulation increases, it makes sense to also
    increase the coupling intervals to maintain stability and realism.

commit 3f20fc7166cc080dabdcf8e8e649fe73967b491b
Merge: 5c3a8409 01bf4114
Author: G. Dylan Dickerson <[email protected]>
Date:   Mon May 12 19:58:54 2025 -0600

    Merge tag ESCOMP/CMEPS 'cmeps0.14.45' into 'eworg_mpaso_mpassi'

commit 5c3a8409a24cdd393d7cb626bca3098e668a928e
Author: G. Dylan Dickerson <[email protected]>
Date:   Fri Apr 28 10:08:30 2023 -0600

    Compatability patch before merging 'cmeps0.14.2' for esmFldsExchange_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.

commit add92e95aaac6ed66658ca4b4e8d14a666522e6d
Merge: e187b541 3782c38e
Author: G. Dylan Dickerson <[email protected]>
Date:   Mon May 12 19:57:56 2025 -0600

    Merge tag ESCOMP/CMEPS 'cmeps0.13.68' into 'eworg_mpaso_mpassi'

commit b72438eda538ac6410aeaea27dd305f4d370d1ce
Merge: 319042c8 21c28034
Author: Jim Edwards <[email protected]>
Date:   Mon May 12 15:35:47 2025 -0400

    Merge pull request #565 from jedwards4b/cmeps1.0.47_ftorch

    Cmeps1.0.47 ftorch

commit 21c28034c334742fe1770a0a716ced57ea02a2b5
Author: Jim Edwards <[email protected]>
Date:   Mon May 12 11:24:07 2025 -0600

    add FTorch support

commit a20f5e35e5b465a166cc877e3595e241225104b6
Merge: dfe357ec 0a246bb7
Author: Jim Edwards <[email protected]>
Date:   Mon May 12 09:40:05 2025 -0600

    Merge remote-tracking branch 'mydev/ftorch_branch_1355710f' into HEAD

commit 0a246bb7e7ad2a93aa5190b95cecdf3e75be1ad5
Author: Jim Edwards <[email protected]>
Date:   Thu May 8 07:38:08 2025 -0600

    update for external compatibilty

commit a1f511de4bb90784f5ec1437e6d3a209413450dd
Merge: dfa3cb7f 319042c8
Author: kdraeder <[email protected]>
Date:   Tue May 6 13:18:48 2025 -0600

    Merge branch 'ESCOMP:main' into cmeps_st-arch_dart

commit 3b69aeab2dd93a04276a51e68c9d5e9c92c88712
Author: Jim Edwards <[email protected]>
Date:   Tue May 6 12:45:14 2025 -0600

    add TORCH_DIR xml variable

commit 89aaadbc9263634702d5e80747a8302c58bca811
Author: Jim Edwards <[email protected]>
Date:   Fri May 2 09:17:09 2025 -0600

    add USE_FTORCH variable

commit 319042c8ae3d96965b25dafb8d9274f13f413e5e
Merge: 3ebb7459 45e055d4
Author: Jim Edwards <[email protected]>
Date:   Wed Apr 30 11:45:47 2025 -0400

    Merge pull request #556 from kdraeder/dflt_ROF_NCPL

    Make check of ROF_NCPL pass by updating default

commit 3ebb7459448def2a4a5f64ed06077e10ecc87d67
Merge: b7b50a64 c13a393b
Author: Jim Edwards <[email protected]>
Date:   Wed Apr 30 11:45:00 2025 -0400

    Merge pull request #562 from DeniseWorthen/bugfix/consf_uv3d

    add missing if-statement for uv3d mapping case

commit b7b50a64d66a76490a9bb39e0050acd179391342
Merge: dfe357ec 17810f3d
Author: Jim Edwards <[email protected]>
Date:   Wed Apr 30 11:44:08 2025 -0400

    Merge pull request #557 from fvitt/megan_coefs_fix

    megan coefs fix

commit c13a393bc0ba6b7dd1a465c98120d456fafe64ed
Author: Denise Worthen <[email protected]>
Date:   Fri Apr 25 10:50:57 2025 -0400

    add missing if-statement

commit dfe357ec28da465b1d0e435594c6bd6700ce62f3
Merge: d8f47f2c a086e920
Author: Jim Edwards <[email protected]>
Date:   Wed Apr 23 14:45:34 2025 -0400

    Merge pull request #558 from jedwards4b/st_archive_fix

    fix st_archive issues with timestamped rpointer files

commit d8f47f2c8ec3bf157b96a913cc01a99a585bd879
Merge: 7eb29948 34c03b79
Author: Jim Edwards <[email protected]>
Date:   Wed Apr 23 09:15:24 2025 -0400

    Merge pull request #559 from billsacks/doc_histaux

    Improve description of histaux_l2x1yrg

commit dfa3cb7f3c562e1c073686133987b2619b4e921e
Author: kdraeder <[email protected]>
Date:   Tue Apr 22 11:48:12 2025 -0600

    Added code to make st-archive handle DART files

commit 34c03b799c83fa83d497a7063f90fbbdc24093c5
Author: Bill Sacks <[email protected]>
Date:   Fri Apr 18 11:53:46 2025 -0600

    Improve description of histaux_l2x1yrg

    Use a description more like what was in cpl7.

commit a086e9201bcfb3d29396725f03a03462fecfcb09
Author: Jim Edwards <[email protected]>
Date:   Mon Apr 14 15:09:27 2025 -0600

    fix st_archive issues with timestamped rpointer files

commit 17810f3dfd8522afb8fe530de5ef7971a9179969
Author: Francis Vitt <[email protected]>
Date:   Thu Apr 10 16:05:42 2025 -0600

    megan coefs fix

commit 45e055d4d492a3f23c7a1fe93861a13547ba1d85
Author: kdraeder <[email protected]>
Date:   Thu Apr 10 09:12:21 2025 -0600

    Make check of ROF_NCPL pass by updating default

    Fixes issue #551.
    Components with "_DATM.*_MOM6.*_DROF" in their names have ROF_NCPL
    set to $ATM_NCPL by default, which can fail the check against $OCN_NCPL.
    This change enables a resolution TL319_t232 in compset G_JRA_RYF
    in cesm3.0_alphabranch to build.

commit 7eb29948972402e618609d9655ba6a6b61585195
Merge: 65ccfe5f 655c342b
Author: Jim Edwards <[email protected]>
Date:   Thu Apr 10 10:41:33 2025 -0400

    Merge pull request #547 from billsacks/separate_glc_rof_fields

    Keep glc-derived runoff as separate fields to ocn if possible

commit 655c342b9e2b1c69166e5b60f0df293c5b81cb98
Author: Bill Sacks <[email protected]>
Date:   Tue Apr 8 19:09:51 2025 -0600

    Add glc-derived runoff fluxes and associated heat fluxes to budgets

    The glc-derived runoff fluxes were being folded into the overall runoff
    fluxes rather than separated out; the associated heat fluxes were
    missing entirely.

commit 65ccfe5f37e533fc60c7894c84f3cff189bbfe26
Merge: 77e1c102 eba8a689
Author: Jim Edwards <[email protected]>
Date:   Mon Mar 31 14:42:37 2025 -0400

    Merge pull request #554 from jedwards4b/allow_yr_beyond_9999

    Allow yr beyond 9999

commit eba8a68989eb76d2e85decd21ce02bcebdd79e81
Author: Jim Edwards <[email protected]>
Date:   Fri Mar 28 08:11:54 2025 -0600

    update pio hash in github workflow

commit 9aa34f489444d86210b5f62b3f357d3ce70c5852
Author: Jim Edwards <[email protected]>
Date:   Thu Mar 27 14:22:12 2025 -0600

    change from <= to .le.

commit a5e7ab492cd38e1acb869839cdfcd6606cb3ca5a
Author: Jim Edwards <[email protected]>
Date:   Thu Mar 27 13:46:55 2025 -0600

    allow years up to 999999

commit 72f8b4ca8b344176a65a3e5258455dbe45fecac0
Author: Jim Edwards <[email protected]>
Date:   Thu Mar 27 08:31:49 2025 -0600

    try updating some externals

commit 77e1c1021c6d028b12f86a3da1f1d5b12a5963fa
Merge: b807d198 80cdb4ab
Author: Jim Edwards <[email protected]>
Date:   Thu Mar 27 10:14:58 2025 -0400

    Merge pull request #552 from DeniseWorthen/feature/addRHuv3dmapping

    Add explicit RH creation for uv3d mapping

commit b807d19851267c3203ada6aceffa0da25a39c91a
Merge: d8920287 a283c1fd
Author: Jim Edwards <[email protected]>
Date:   Wed Mar 26 12:07:37 2025 -0400

    Merge pull request #550 from adamrher/cmeps-polarcap

    add ATM_NCPL entry for POLARCAP

commit 80cdb4ab867c16dd7cfd69f1d1394f86634dae6e
Author: denise.worthen <[email protected]>
Date:   Wed Mar 26 09:04:22 2025 -0600

    remove tab, fix typo

commit 99de402d12845f7d6af65e34796da96c1a9594de
Author: Denise Worthen <[email protected]>
Date:   Wed Mar 26 09:29:04 2025 -0400

    explicitly create RHs for uv3d mapping

    * add consf_uv3d option, needed by UFS

commit a283c1fdb4fcb98d80765e29cdfcfeaf297900e5
Author: adamrher <[email protected]>
Date:   Sat Mar 22 15:38:39 2025 -0600

    add ATM_NCPL entry for POLARCAP

commit d8920287bdb7f3339efb1ac55ad237e29f53a277
Merge: e203956c 57ed117f
Author: Jim Edwards <[email protected]>
Date:   Fri Mar 21 12:28:46 2025 -0400

    Merge pull request #522 from DeniseWorthen/feature/ufs_restartfh

    Add arbitrary restart hour for UFS

commit 57ed117f05aebf8ce82b76418b76d1c3052637cf
Author: Jim Edwards <[email protected]>
Date:   Fri Mar 21 08:41:44 2025 -0600

    update cdeps external in github workflow

commit bfd40ad89acf2c8539ece4aef3cb9649196f6433
Author: Jim Edwards <[email protected]>
Date:   Fri Mar 21 07:24:38 2025 -0600

    update cdeps tag in github workflow

commit e3d938377dab602cf031ea794ed460378b95bc0b
Merge: 11d0522d e203956c
Author: Denise Worthen <[email protected]>
Date:   Thu Mar 20 18:42:50 2025 -0400

    Merge remote-tracking branch 'ESCOMP/main' into feature/ufs_restartfh

commit e203956cb10e8589b3199c563c2f6637607e0328
Merge: 189b02e2 dcd0f474
Author: Jim Edwards <[email protected]>
Date:   Wed Mar 19 13:47:23 2025 -0400

    Merge pull request #546 from jedwards4b/pass_version_to_fortran

    add connection between xml and fortran

commit dcd0f47429d4024938d07b889d1d1aaa52673bc8
Author: Jim Edwards <[email protected]>
Date:   Wed Mar 19 08:02:41 2025 -0600

    an additional change required

commit de95504bfb43348b3abd0d25d33a18aa3b6ff486
Author: Jim Edwards <[email protected]>
Date:   Wed Mar 19 07:46:36 2025 -0600

    add connection between xml and fortran

commit ab2329d5b3ae216eff096c1d04adc77461aa6ad0
Author: Bill Sacks <[email protected]>
Date:   Tue Mar 18 17:23:10 2025 -0600

    Keep glc-derived runoff as separate fields to ocn if possible

commit 11d0522d63510acb13816c6a8d5e9a44cf8e5097
Author: Jim Edwards <[email protected]>
Date:   Thu Mar 13 10:16:16 2025 -0600

    update externals for extbuild

commit b81860e645e0807a19906e789651b82fa5463de4
Merge: e3a4803b 189b02e2
Author: Jim Edwards <[email protected]>
Date:   Thu Mar 13 11:51:37 2025 -0400

    Merge branch 'main' into feature/ufs_restartfh

commit 189b02e2b36b9a5a064150179721de45af3bbacf
Merge: 3536cc52 7c3581fd
Author: Jim Edwards <[email protected]>
Date:   Thu Feb 27 11:14:35 2025 -0500

    Merge pull request #543 from jedwards4b/datm_ogrid

    always set atmocn grid to ogrid with datm

commit 7c3581fde820d6ed03d3e4b0753819090478566a
Author: Jim Edwards <[email protected]>
Date:   Thu Feb 27 08:37:20 2025 -0700

    update description

commit da893cb9db31a0dc651ddbcc342e4634df050cf4
Author: Jim Edwards <[email protected]>
Date:   Thu Feb 27 08:17:33 2025 -0700

    always set atmocn grid to ogrid with datm

commit 3536cc52c548175779426cf0eadf0ab55133893a
Merge: b4695c41 bbadee83
Author: Jim Edwards <[email protected]>
Date:   Wed Feb 19 15:58:28 2025 -0500

    Merge pull request #540 from kieranricardo/bugfix-FB-init-dim-mismatch

    Bugfix: field bundle initialisation can miss ungridded dimensions

commit b4695c417635ffdd58fa5a4a9ff1bcec22676e2c
Merge: 83a81776 e35f3c7a
Author: Jim Edwards <[email protected]>
Date:   Wed Feb 19 15:58:01 2025 -0500

    Merge pull request #542 from fvitt/rm_seq_drydep_mod

    remove seq_drydep_mod.F90

commit 83a81776775a71e49ed0dbb8793ab8cc13477e0f
Merge: c83271e9 42b254c6
Author: Jim Edwards <[email protected]>
Date:   Wed Feb 19 15:57:28 2025 -0500

    Merge pull request #537 from mnlevy1981/add_postprocessing

    Add RUN_POSTPROCESSING variable to env_run.xml

commit e35f3c7addeaec492f83452615fc28294426ea68
Author: Francis Vitt <[email protected]>
Date:   Thu Feb 13 15:29:37 2025 -0700

    remove seq_drydep_mod.F90

commit c83271e90ea70363148f1e4597bac256f4d67f95
Merge: bc29792d 22ea13bf
Author: Jim Edwards <[email protected]>
Date:   Wed Feb 12 10:34:45 2025 -0500

    Merge pull request #535 from jedwards4b/shr_log_error

    Shr log error

commit 22ea13bf0bfc94d4283cb343abd320ac4df27f8d
Author: James Edwards <[email protected]>
Date:   Wed Feb 12 08:24:40 2025 -0600

    update externals

commit bbadee833f7ff92e2c12e9d316d14ad6258caf8a
Merge: ccecf9f6 bc29792d
Author: kieranricardo <[email protected]>
Date:   Mon Feb 10 10:25:19 2025 +1100

    Merge branch 'main' into bugfix-FB-init-dim-mismatch

commit 42b254c655648557225f89886756b917c01695ba
Author: Michael Levy <[email protected]>
Date:   Tue Feb 4 11:58:11 2025 -0700

    Add RUN_POSTPROCESSING variable to env_run.xml

    This variable will be FALSE by default, but setting it to TRUE will
    (eventually) run some postprocessing scripts as part of the default workflow.
    In that respect, its behavior will be similar to how DOUT_S controls the
    short-term archiver.

commit a8843353beb1cbf868b36ec52de2939cdb73a694
Author: Jim Edwards <[email protected]>
Date:   Fri Jan 31 09:54:40 2025 -0700

    more clean up

commit 0fabc2eb41c56c8049597a57612e1342ea38f709
Author: Jim Edwards <[email protected]>
Date:   Fri Jan 31 08:33:34 2025 -0700

    shr_log_error and return up stack

commit 2593f60da24cc4f22c2852520eea1df28495bde2
Author: Jim Edwards <[email protected]>
Date:   Thu Jan 30 10:08:27 2025 -0700

    write errors using shr_log_error and return up the stack

commit bc29792d76c16911046dbbfcfc7f4c3ae89a6f00
Merge: 4b636c6f 3b010339
Author: Jim Edwards <[email protected]>
Date:   Wed Jan 29 11:51:17 2025 -0500

    Merge pull request #532 from jedwards4b/all_errors_to_log

    replace esmf_logmsg_error with calls to shr_abort

commit 3b010339f0f2dc2e54191be1fd674bd78bb07846
Author: Jim Edwards <[email protected]>
Date:   Wed Jan 29 09:14:48 2025 -0700

    change resolution of a couple of tests

commit 68fc53bb09d8b53d7b7658632a740d54e79cd4ea
Author: Jim Edwards <[email protected]>
Date:   Tue Jan 28 13:37:53 2025 -0700

    add back X compset tests

commit 67b278f02ea41d9b703bac96da98f35f99403528
Author: Jim Edwards <[email protected]>
Date:   Tue Jan 28 13:19:21 2025 -0700

    remove more esmf_logmsg_error statements

commit 92deb1663eb6bbe0aa25dec390deb4be481bd65a
Author: Jim Edwards <[email protected]>
Date:   Tue Jan 28 13:11:36 2025 -0700

    remove more esmf_logmsg_error statements

commit 80e806c5e8be28de637de4490bf745d266f4b67c
Author: Jim Edwards <[email protected]>
Date:   Tue Jan 28 13:05:48 2025 -0700

    remove more esmf_logmsg_error statements

commit d17661ce2452428bde3b676756baa9c45551bc19
Author: Jim Edwards <[email protected]>
Date:   Tue Jan 28 12:55:46 2025 -0700

    remove more esmf_logmsg_error statements

commit d1a50236859181398a40f0852c6315053b9f653e
Author: Jim Edwards <[email protected]>
Date:   Fri Jan 24 13:31:36 2025 -0700

    update externals in extbuild workflow

commit 8a2a3c2f7ce1cc27a111ed77e46121584bc3cb29
Author: Jim Edwards <[email protected]>
Date:   Thu Jan 23 11:36:07 2025 -0700

    replace esmf_logmsg_error with calls to shr_abort

commit e3a4803bee77b33e24a90400478ad405f3eeabbc
Author: Denise Worthen <[email protected]>
Date:   Wed Dec 18 11:30:14 2024 -0500

    protect write_restartfh w/ CESM ifdef

commit 191214bcd1e16ce40b4cb5f3ddc778df4f787263
Merge: b5d1cc18 4b636c6f
Author: Denise Worthen <[email protected]>
Date:   Wed Dec 18 10:20:52 2024 -0500

    Merge remote-tracking branch 'ESCOMP/main' into feature/ufs_restartfh

commit 4b636c6f794ca02d854d15c620e26644751b449b
Merge: a91cedfe 7ad0de04
Author: Jim Edwards <[email protected]>
Date:   Tue Dec 17 12:48:32 2024 -0700

    Merge pull request #519 from jedwards4b/fix_github_workflow

    remove unused variable isPresent

commit 7ad0de04df3f234951fb466ef51873526bf0a112
Merge: baf8cf5f a91cedfe
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 16 13:51:35 2024 -0700

    Merge remote-tracking branch 'origin/main' into fix_github_workflow

commit a91cedfe58658a9fc391195481137a2d83372c25
Merge: 51d4124f 108a8f69
Author: Jim Edwards <[email protected]>
Date:   Fri Dec 13 10:51:42 2024 -0700

    Merge pull request #521 from jedwards4b/testcase_unset

    replace testcase None in config with unset

commit 108a8f690f946ee2b36827c4619651f4fc8dc435
Merge: 51db2685 7ced1d3b
Author: Jim Edwards <[email protected]>
Date:   Fri Dec 13 10:32:56 2024 -0700

    Merge branch 'fix_github_workflow' into testcase_unset

commit 51db2685eaa26275c1d352aee7011f08ea14d72e
Author: Jim Edwards <[email protected]>
Date:   Fri Dec 13 10:09:31 2024 -0700

    remove unused variable isPresent

commit d1b7b71e6d4f19efd36ee733cc555b4536035133
Author: Jim Edwards <[email protected]>
Date:   Thu Dec 12 16:44:50 2024 -0700

    replace testcase None in config with unset

commit baf8cf5fb9fa95e1ac3bd5ce15579acddfcdb4e5
Author: Jim Edwards <[email protected]>
Date:   Wed Dec 11 13:19:40 2024 -0700

    make it test all three python flavors

commit 7d8ab4a58e54bc0527d722161b91778108f74ef6
Author: Jim Edwards <[email protected]>
Date:   Wed Dec 11 12:15:44 2024 -0700

    try some specific python versions

commit 7ced1d3b0ed8abcd864cb4d9c04d9cb5764c3a55
Author: Jim Edwards <[email protected]>
Date:   Tue Dec 10 09:57:23 2024 -0700

    another unused variable

commit 1903016e682ca34c542b4a1c084ae2ea0a33c5c6
Author: Jim Edwards <[email protected]>
Date:   Tue Dec 10 09:33:35 2024 -0700

    replace tabs with spaces

commit a525ebd63ab2c704a66a55ca930d6df8eb432822
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 9 16:07:28 2024 -0700

    remove unused variable isPresent

commit 51d4124feb0eb47b99d7ae790b5ea77ce2adfbe7
Merge: 18d5cb7e 6b270ada
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 9 15:51:33 2024 -0700

    Merge pull request #518 from jedwards4b/add_eri_to_excpetions

    restart at end of run needs to be false for these tests

commit 6b270ada17be1434e6b5da959cdf2f3750e6b5e9
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 9 15:09:26 2024 -0700

    update cdeps version in extbuild

commit 18d5cb7e58a09cf186d51ed9f7cba2649321daa0
Merge: d8b01555 d4e74627
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 9 14:35:39 2024 -0700

    Merge pull request #507 from dabail10/wavice2

    Update ice2wav maps

commit d8b015556facee5d4832da752b66a99b45865546
Merge: 63a4a319 e1f50a21
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 9 14:34:50 2024 -0700

    Merge pull request #517 from DeniseWorthen/feature/fbdstatus

    update retrieval and writing of dststatus fields

commit 1ba5f11a753c56b958340862a64bb0383b369013
Author: Jim Edwards <[email protected]>
Date:   Mon Dec 9 14:15:47 2024 -0700

    restart at end of run needs to be false for these tests

commit e1f50a211dad878cf15774411d48f112a00ba8f4
Author: Denise Worthen <[email protected]>
Date:   Sun Dec 8 06:13:41 2024 -0500

    update retrieval and writing of dststatus fields

    * create a FB to hold the returned dststatus fields
    * write all dststatus fields into one file via med_io_write_FB
    in med.F90 if requested
    * add mask to the FBdststatus

commit 63a4a319c26a27a6790452043aa10e4b343ca29a
Merge: 0e5ca488 dd8d177b
Author: Jim Edwards <[email protected]>
Date:   Fri Dec 6 15:01:34 2024 -0700

    Merge pull request #503 from jedwards4b/fix/ocnalb_orbprint

    Fix/ocnalb orbprint

commit 0e5ca488923e556588212d219fe51df236d9ac07
Merge: 6d47c507 630c9350
Author: Jim Edwards <[email protected]>
Date:   Thu Dec 5 09:52:49 2024 -0700

    Merge pull request #516 from jedwards4b/erc_test_fix

    do not write restart at end of erc test

commit 630c93503d55ca78fa8242d9cff28879eb9a2ad5
Author: Jim Edwards <[email protected]>
Date:   Thu Dec 5 07:15:10 2024 -0700

    do not write restart at end of erc test

commit 6d47c5070696f099f4152e8a56d0b9b0adaa1bb5
Merge: 959e9a0b 4883961d
Author: Jim Edwards <[email protected]>
Date:   Wed Dec 4 15:36:49 2024 -0700

    Merge pull request #500 from jedwards4b/add_timestamp_rpointer

    Add timestamp rpointer

commit 959e9a0b1aa3c602de4674f0553875efa8f6c1b6
Merge: 27f4ecb8 507aa7a6
Author: Jim Edwards <[email protected]>
Date:   Fri Nov 22 13:07:14 2024 -0700

    Merge pull request #513 from jedwards4b/add_mem_variables

    add memory usage variables for use on derecho

commit 27f4ecb85338eaeeb5e2eefbbea4d71d4c1c7af4
Merge: 0de751f3 aa7f5c10
Author: Jim Edwards <[email protected]>
Date:   Thu Oct 24 17:56:55 2024 -0600

    Merge pull request #515 from billsacks/xgrid_default

    Make xgrid the default aoflux_grid when atm and ocn are running on different grids

commit aa7f5c109216309889e6c51320c392cdeb1e64ee
Merge: e649244f 0de751f3
Author: Bill Sacks <[email protected]>
Date:   Wed Oct 23 21:18:39 2024 -0600

    Merge branch 'main' into xgrid_default

commit 0de751f35ccc254a6a19290cbeec49cee5a912e8
Merge: 1355710f d9255d5f
Author: Bill Sacks <[email protected]>
Date:   Wed Oct 23 14:45:49 2024 -0600

    Merge pull request #514 from billsacks/allocate_psfc

    Fix logic for adding psfc to aoflux_in

    ### Description of changes

    Fix the logic for adding psfc to aoflux_in, particularly needed for cases using the exchange grid.

    This is needed to avoid a segmentation fault in the call to flux_atmocn in SMS_Ld2.ne30pg3_t232.BMT1850.derecho_gnu.allactive-defaultio when running with aoflux_grid=xgrid. (This shows up when running with xgrid because the FB_fldchk can't be used in this situation - see details in my [comment below](https://github.com/ESCOMP/CMEPS/pull/514#issuecomment-2427645256).)

    ### Specific notes

    Contributors other than yourself, if any:

    CMEPS Issues Fixed (include github issue #):

    Are changes expected to change answers? No

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

    ### Testing performed

    SMS_Ld2.ne30pg3_t232.BMT1850.derecho_gnu.allactive-defaultio with aoflux_grid="xgrid", from cesm3_0_beta03

    Also ran many other tests from the CESM prealpha and prebeta test suite.

commit d9255d5f8ee1a4d3374f06c49c10866bc30712bc
Author: Bill Sacks <[email protected]>
Date:   Tue Oct 22 12:54:18 2024 -0600

    Tweak conditional for setting psfc for ufs

    Based on discussion in https://github.com/ESCOMP/CMEPS/pull/514

commit 0bbdcd010ff651b8b761863c10354c2f4dcd1f14
Author: Bill Sacks <[email protected]>
Date:   Fri Oct 18 16:40:42 2024 -0600

    More correct fix to ensure psfc is allocated when needed

    This is needed to avoid a segmentation fault in the call to flux_atmocn
    in SMS_Ld2.ne30pg3_t232.BMT1850.derecho_gnu.allactive-defaultio when
    running with aoflux_grid=xgrid.

    I think that the previous fix wasn't correct when using xgrid, because I
    think nothing is originally in fldbun_a in that case.

commit de948030029248138d0004b3aec4bcd50cf6688f
Author: Bill Sacks <[email protected]>
Date:   Thu Oct 17 16:45:36 2024 -0600

    Ensure psfc is always allocated

    This is needed to avoid a segmentation fault in the call to flux_atmocn
    in SMS_Ld2.ne30pg3_t232.BMT1850.derecho_gnu.allactive-defaultio when
    running with aoflux_grid=xgrid

commit 4883961d284402f0234c1a4bed6b6a3ffa7b04d8
Author: Jim Edwards <[email protected]>
Date:   Thu Oct 17 09:02:59 2024 -0600

    do not stop ringing alarm

commit e649244fba5968d5d376288eaea004d595e7d0f7
Author: Bill Sacks <[email protected]>
Date:   Tue Oct 15 21:46:51 2024 -0600

    Add a test with aoflux_grid = ogrid

commit 15a480e9dd2c37a79852fd6238fc615cf2726287
Author: Bill Sacks <[email protected]>
Date:   Tue Oct 15 21:25:47 2024 -0600

    Use xgrid for aoflux calculation unless atm & ocn are on the same grid

    Resolves ESCOMP/CMEPS#502

commit 8a892c5134153c3d32e13f5a5f38928d52e2aa56
Author: Jim Edwards <[email protected]>
Date:   Mon Oct 14 12:56:02 2024 -0600

    rearrange externals

commit 3cc308f4c18532e1bcdf1209f206dec24ea52d38
Author: Jim Edwards <[email protected]>
Date:   Mon Oct 14 12:29:48 2024 -0600

    debug github workflow

commit 507aa7a617983970c2c3eabc8eab865ac972be55
Author: Jim Edwards <[email protected]>
Date:   Wed Oct 9 14:19:26 2024 -0600

    add memory usage variables for use on derecho

commit 1355710f04fa6286a13e8056e35c6736e7250e3d
Merge: deedc25c 6fbffcb6
Author: Jim Edwards <[email protected]>
Date:   Mon Oct 7 11:32:32 2024 -0600

    Merge pull request #512 from sjsprecious/update_xml_vars_for_gpu_config

    Update XML variables for GPU configurations

commit 6fbffcb6d64a44d72936b450cf8565c76f0f9991
Author: Jian Sun <[email protected]>
Date:   Fri Oct 4 01:23:15 2024 -0600

    add new xml vars for GPU configuration

commit deedc25cdccc5cf414af4dc97438f5ce50ef9df4
Merge: f4f64c32 d6b8a217
Author: Jim Edwards <[email protected]>
Date:   Wed Oct 2 10:13:03 2024 -0600

    Merge pull request #511 from jedwards4b/fix/ocn2wav_smap_issue

    variable name mismatch

commit d6b8a21776437f00c7f6b6e6e3e894f96e60387c
Author: Jim Edwards <[email protected]>
Date:   Wed Oct 2 09:51:42 2024 -0600

    variable name in namelist_definition_drv.xml did not match that used in buildnml

commit 43bd7bf768bb3dc74ef09b405d73142d4d717c36
Merge: 27c2af7d f4f64c32
Author: Jim Edwards <[email protected]>
Date:   Wed Oct 2 09:17:13 2024 -0600

    Merge remote-tracking branch 'origin/main' into add_timestamp_rpointer

commit d4e74627ee698b4e9b82bdebafa5a72e9de7df52
Author: David Bailey <[email protected]>
Date:   Tue Oct 1 15:09:03 2024 -0600

    Update ice2wav maps

commit 27c2af7dc990bcc660c98b0b11572949df35e0db
Author: Jim Edwards <[email protected]>
Date:   Tue Oct 1 08:30:48 2024 -0600

    remove unused subroutine

commit f4f64c324469c33a78e0118ce1dd7944e85521d6
Merge: a664d62e 7c75a568
Author: Jim Edwards <[email protected]>
Date:   Mon Sep 30 12:43:14 2024 -0600

    Merge pull request #504 from mvertens/feature/update_dms_exchange

    update dms exchange

commit a664d62e8f2af2a3ffba648ab65ca212c064e45b
Merge: 842be8a6 9c3751ef
Author: Jim Edwards <[email protected]>
Date:   Mon Sep 30 11:47:27 2024 -0600

    Merge pull request #498 from jedwards4b/reintroduce_wav2ocn_maps

    wav2ocn and ocn2wav maps are still needed in some cases

commit 7c75a568f95ffb71f394512b58d669fb84e8a8f8
Author: Jim Edwards <[email protected]>
Date:   Mon Sep 30 11:43:37 2024 -0600

    update github workflow

commit c0ec79e643c521f89aaf0695899bc59b167d00a7
Author: Jim Edwards <[email protected]>
Date:   Mon Sep 30 11:41:25 2024 -0600

    update github workflow

commit 842be8a65a2a7d03bd43fbdd473cba96d4051e6c
Merge: b1e23250 17b48d93
Author: Bill Sacks <[email protected]>
Date:   Sat Sep 28 08:45:21 2024 -0600

    Merge pull request #506 from billsacks/fix_xgrid_reproducibility

    Fix xgrid reproducibility by using srcTermProcessing=0 for all xgrid FieldRegridStore calls

    ### Description of changes

    Use srcTermProcessing=0 for all xgrid FieldRegridStore calls.

    This is needed for bit-for-bit reproducibility. Most of the calls to FieldRegridStore weren't setting srcTermProcessing at all; this can lead to irreproducibility of the results. Two of the calls had srcTermProcessing set to 1 before, which leads to reproducibility but (according to Gerhard Theurich) is often worse for performance than a value of 0.

    Note that we use a value of 0 in the calls in med_map_mod.

    ### Specific notes

    Contributors other than yourself, if any: Guidance from @oehmke and @theurich

    CMEPS Issues Fixed (include github issue #): Resolves #505

    Are changes expected to change answers? YES: roundoff-level differences expected for runs with `aoflux_grid = "xgrid"` (but those runs had expected roundoff-level differences from run to run before this fix anyway)

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

    ### Testing performed
    Please describe the tests along with the target model and machine(s)
    If possible, please also added hashes that were used in the testing

    In the context of cesm3_0_alpha03c, with the change here put on top of the change in #501, ran `REP_Ld2.ne30pg3_t232.BLT1850.derecho_intel.allactive-xgrid`, where the `xgrid` testmod contained:

    include_user_mods:
    ```
    ../defaultio
    ```

    user_nl_cpl:
    ```
    aoflux_grid = "xgrid"
    ```

commit b1e2325050eea9889195ab33ab3f26bd189dcac2
Merge: 5b7d7697 771c4d4b
Author: Bill Sacks <[email protected]>
Date:   Sat Sep 28 08:44:13 2024 -0600

    Merge pull request #501 from billsacks/fix_xgrid_f_compset

    Fix for exchange grid with add_gusts false: Only add gust fields if add_gusts is true

    ### Description of changes

    Runs with `aoflux_grid = "xgrid"` and `add_gusts = .false.` have been failing with:

    ```
    20240903 141813.539 ERROR            PET003 ESMCI_Container.h:178 ESMCI::Container::get() Invalid argument  - key does not exist: So_ugustOut
    ```

    This PR fixes this issue by avoiding adding the two new gust fields to the list of mediator fields if add_gusts is false.

    The explanation for why this caused an issue with the exchange grid is:
    - In `mediator/esmFldsExchange_cesm_mod.F90`: `esmFldsExchange_cesm`, `So_ugustOut` and `So_u10withGust` are added as atmosphere-ocean fluxes regardless of the value of `add_gusts`.
    - But in `mediator/med_phases_aofluxes_mod.F90`: `set_aoflux_out_pointers`, the `fldbun_getfldptr` call is only made if `add_gusts` is true.
    - There is a difference in behavior with xgrid than with ogrid here: with xgrid, the call to `fldbun_getfldptr` is responsible for adding the field to `FBaof_x`. (I think with ogrid or agrid, the fields have been added to the relevant field bundle already.)
    - So we end up with these gust fields not in `FBaof_x`, but still in `fldnames_aof_out`, and this leads to an inconsistency.

    **@megandevlan and @jedwards4b: I'm not positive that this is the right fix: It does solve the issue, but I'd like one or both of your input on whether this is the right way to solve the issue. In particular, can we rely on CAM working correctly when add_gusts is false if these fields are absent? It looks to me like CAM will set the relevant fields to 0 if they are absent; will that lead to correct behavior when add_gusts = .false.?**

    ### Specific notes

    Contributors other than yourself, if any:

    CMEPS Issues Fixed (include github issue #):

    Are changes expected to change answers? No, but there are FIELDLIST diffs for cases with add_gusts false: the following fields will no longer be present on the cpl hi files when add_gusts is false:
    - Med_aoflux_ocn_So_u10withGust
    - Med_aoflux_ocn_So_ugustOut
    - Med_aoflux_atm_So_u10withGust
    - Med_aoflux_atm_So_ugustOut
    - atmExp_So_u10withGust
    - atmExp_So_ugustOut

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

    ### Testing performed
    Please describe the tests along with the target model and machine(s)
    If possible, please also added hashes that were used in the testing

    Ran three versions of `SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s` from cesm3_0_alpha03c:
    1. `add_gusts = .false.`, `aoflux_grid = "ogrid"`
    2. `add_gusts = .false.`, `aoflux_grid = "xgrid"` (**This is the case that was failing previously.**
    3. `add_gusts = .true.`, `aoflux_grid = "xgrid"`

    All three pass now.

    Also ran `SMS_Ld40.TL319_t232.C_JRA.derecho_intel` (which has add_gusts = .false.) with `aoflux_grid = "xgrid"`; this also passes now but failed before the changes in this PR.

    I have also run the following tests with comparisons against baselines: all pass and are bit-for-bit, though with FIELDLIST diffs as expected:
    - SMS.TL319_t232.G_JRA.derecho_intel.mom-no_stoch_physics
    -  ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s
    - SMS_Ld2.ne30pg3_t232.BLT1850.derecho_intel.allactive-defaultio with change to user_nl_cpl to set add_gusts false

commit 17b48d93d316d0218837b4205b6362f8969899f5
Author: Bill Sacks <[email protected]>
Date:   Fri Sep 27 14:40:51 2024 -0600

    Use srcTermProcessing=0 for all xgrid FieldRegridStore calls

    This is needed for bit-for-bit reproducibility. Most of the calls to
    FieldRegridStore weren't setting srcTermProcessing at all; this can lead
    to irreproducibility of the results. Two of the calls had
    srcTermProcessing set to 1 before, which leads to reproducibility but
    (according to Gerhard Theurich) is often worse for performance than a
    value of 0.

commit 5021dd819310521fd0d25181105376e56bda9b1e
Author: Mariana Vertenstein <[email protected]>
Date:   Fri Sep 27 13:49:42 2024 +0200

    updated code to work on betzy

commit dd8d177b1c5c14b269a1f8edc9ebd93dc3c589c8
Author: Jim Edwards <[email protected]>
Date:   Thu Sep 26 15:54:29 2024 -0600

    improve print timing of orbital parameters

commit 680221e2630280922b2058fc63a7c89c1dfc76c9
Merge: 79a598d6 5b7d7697
Author: Mariana Vertenstein <[email protected]>
Date:   Mon Sep 23 11:14:37 2024 +0200

    Merge branch 'main' into feature/update_dms_exchange

commit 81ac924fb478bbefbd15bd308525e6a0dcedf156
Author: Jim Edwards <[email protected]>
Date:   Sun Sep 22 10:24:56 2024 -0600

    first_time needs to be saved

commit 771c4d4bb8c758d7fc2c3e1555510e12af39c325
Author: Bill Sacks <[email protected]>
Date:   Fri Sep 20 15:34:08 2024 -0600

    Only add gust fields if add_gusts is true

commit 79a598d6a51db653b8f491245ca62577195f8d32
Author: Mariana Vertenstein <[email protected]>
Date:   Sat Sep 14 20:44:45 2024 +0200

    updated dms exchange

commit 0341aebe58d21af78f551a03ebf15bfd7c15d969
Author: Jim Edwards <[email protected]>
Date:   Fri Sep 6 10:46:43 2024 -0600

    add timestamps to rpointer files

commit f67cb8a8c587f23a9d50c41ed618147d3e38f513
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 30 07:50:49 2024 -0600

    add timestamps to rpointer files

commit 5b7d76978e2fdc661ec2de4ba9834b985decadc6
Merge: 864b7cea 0db15541
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 22 08:31:33 2024 -0600

    Merge pull request #447 from jedwards4b/fix/nsteps_alarms

    alarms based on nsteps

commit 0db155415d08d49244a892c1bab04878f0d2d24f
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 22 08:03:34 2024 -0600

    update github workflow

commit 086762bf3d138014e3198b70b2d6a925883857a2
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 22 07:44:44 2024 -0600

    remove unused variable

commit bfb0c28f6b209c05511db4ae1e8f83efaf67645c
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 22 07:40:01 2024 -0600

    update github workflow

commit 59b0c10da06f1681cc3163d4e36f554714ce538d
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 21 14:45:24 2024 -0600

    remove unused code

commit ee628d11ed412ea98e81e3823343a2f21fc4db01
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 21 13:12:56 2024 -0600

    fix dglc setting and remove end run alarm for the moment

commit 36770944aa96c2a3d36792633b58a3374c9791f3
Merge: 0b6518d0 864b7cea
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 21 09:21:08 2024 -0600

    Merge remote-tracking branch 'origin/main' into fix/nsteps_alarms

commit 0b6518d0c5d0942a2daa0476f16808110670c1c7
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 21 07:22:23 2024 -0600

    cleanup work

commit 865adc1df09274067d9986ad01aa1608e0eeb637
Merge: 57290e24 d8b08657
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 21 07:13:13 2024 -0600

    removed rpointer timestamp, merged to main

commit 864b7ceaca2db0f2a117e3dfeedb782ae3550fc1
Merge: d8b08657 612ba590
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 21 00:53:57 2024 -0600

    Merge pull request #499 from mvertens/feature/fix_erp_dglc_test

    fix problem with no coupler file written at restart interval

commit 612ba59092d49a99938a3c8c6d18cc29ca51f527
Author: Mariana Vertenstein <[email protected]>
Date:   Tue Aug 20 16:30:46 2024 +0200

    fix problem with no coupler file written at restart interval

commit 9c3751ef8c326f30e04e2418b8b50021a3497214
Author: Jim Edwards <[email protected]>
Date:   Mon Aug 12 15:20:14 2024 -0600

    add samegrid_ocn_wav to buildnml and use in namelist generation

commit d8b086573b48a0430bc32ef73a12be3fd2069b86
Author: mvertens <[email protected]>
Date:   Mon Aug 12 22:40:16 2024 +0200

    fix bug in med_diag_mod for ice runoff  (#497)

    * send Si_thick from cice to wav if advertised
    * fix BUDGETS correctly for BLOM

commit 1fd6c7b0e3c79e0cd2c50ebfb53807cb2c0d5a48
Author: Jim Edwards <[email protected]>
Date:   Mon Aug 12 11:50:55 2024 -0600

    fix variable names

commit 34acae41e8f884854777c28e54013b449eed69c5
Author: Jim Edwards <[email protected]>
Date:   Mon Aug 12 11:25:39 2024 -0600

    wav2ocn and ocn2wav maps are still needed in some cases

commit e71a5aa81e31f2fd996cb79dd3390fdc213f35e8
Merge: d96fdf77 1e4bba0a
Author: Bill Sacks <[email protected]>
Date:   Fri Aug 9 09:59:27 2024 -0600

    Merge pull request #495 from billsacks/simplify_glc_renormalize_smb

    Simplify logic for glc_renormalize_smb

    ### Description of changes

    Remove the glc_renormalize_smb option on_if_glc_coupled_fluxes. This had been the default. Change the default to 'on'. This maintains consistent behavior between different configurations.

    ### Specific notes

    Contributors other than yourself, if any:

    CMEPS Issues Fixed (include github issue #): Resolves ESCOMP/CMEPS#133

    Are changes expected to change answers? YES: changes answers by greater than roundoff for T compsets (active GLC with DLND) (now SMB is remapped with renormalization for T compsets by default); answers should be bit-for-bit in all other configurations (unless there is some configuration/combination that I'm not thinking of...)

    Any User Interface Changes (namelist or namelist defaults changes)? Removes `on_if_glc_coupled_fluxes` option to `glc_renormalize_smb`

    ### Testing performed
    Please describe the tests along with the target model and machine(s)
    If possible, please also added hashes that were used in the testing

    Tested in the context of `cesm3_0_beta02`: ran:
    - SMS_Ld5.f10_f10_ais8gris4_mg37.I1850Clm50SpGag.derecho_intel.cism-test_coupling
    - SMS_Ld5.f10_f10_mg37.1850_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_MOSART_DGLC%NOEVOLVE_SWAV.derecho_intel [Like an I compset but with DGLC%NOEVOLVE]
    - SMS_Ly2.f09_g17_gris20.T1850Gg.derecho_intel

    All tests passed; the T compset test changed answers as expected but the other two were bit-for-bit.

commit 1e4bba0ac391e877e46c51750b55d9592a8e65e1
Author: Bill Sacks <[email protected]>
Date:   Thu Aug 8 11:22:46 2024 -0600

    Simplify logic for glc_renormalize_smb

    Remove the glc_renormalize_smb option on_if_glc_coupled_fluxes. This had
    been the default. Change the default to 'on'. This maintains consistent
    behavior between different configurations.

    Changes answers for T compsets.

    Resolves ESCOMP/CMEPS#133

commit d96fdf77f6d8aa84cc1db3b36dfebe491d861320
Merge: 7585948d a02f2ef3
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 8 10:55:45 2024 -0600

    Merge pull request #493 from mnlevy1981/add_MARBL

    Add marbl

commit 7585948d1ab9b2d652446dfc943722460469ac03
Merge: 6c5b8fb3 2fba8e8d
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 7 17:08:45 2024 -0600

    Merge pull request #494 from jedwards4b/add_case_git_repository

    add CASE_GIT_REPOSITORY variable

commit 2fba8e8d68ab79f1efa3ee715278e95df6bbd233
Author: Jim Edwards <[email protected]>
Date:   Wed Aug 7 08:46:05 2024 -0600

    add CASE_GIT_REPOSITORY variable

commit a02f2ef333676a832702df4751bf25f62c7e737f
Author: Michael Levy <[email protected]>
Date:   Mon Aug 5 09:08:49 2024 -0600

    Remove POP2 references from config_component_cesm

commit 326ccf62c3c015be6ae7afd3037a49bc9dde5e8e
Merge: e3eba337 6c5b8fb3
Author: Michael Levy <[email protected]>
Date:   Mon Aug 5 09:07:49 2024 -0600

    Merge branch 'main' into add_MARBL

commit 6c5b8fb3d9bdd36776b2dbc81e58d91f55ae184d
Merge: a41d9c27 6851c9db
Author: Jim Edwards <[email protected]>
Date:   Fri Aug 2 13:10:54 2024 -0600

    Merge pull request #492 from briandobbins/change_to_64bit_data_format

    Changes the default PIO format from 64bit_offset to 64bit_data

commit 6851c9db196322a925224569ec308bc0a3d01a77
Author: Brian Dobbins <[email protected]>
Date:   Fri Aug 2 12:39:02 2024 -0600

    Changes the default PIO format from 64bit_offset to 64bit_data

commit a41d9c27fe91a1605f4e61c7f33ffe07cf83c788
Merge: 739b9645 5adf83aa
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 1 08:01:35 2024 -0600

    Merge pull request #490 from jedwards4b/fix_nan_in_pslv

    nan was picked up in pslv field on first pass

commit 739b9645ae371207395052fbcc1bb8eb30436b49
Merge: 72280ddf e6ad6526
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 1 08:01:19 2024 -0600

    Merge pull request #489 from alperaltuntas/add_glc_runoff_heat_content

    Compute and export heat content associated with glc runoffs

commit 72280ddf3314fd85efed0f30419a98efdd0c266f
Merge: 45200514 882d4850
Author: Jim Edwards <[email protected]>
Date:   Thu Aug 1 08:00:50 2024 -0600

    Merge pull request #488 from DeniseWorthen/feature/fixfloat4auxhist

    Fix aux history files for use_float=.true.

commit 5adf83aa59447efdfbc4783eae56f5e2c93d8950
Author: Jim Edwards <[email protected]>
Date:   Wed Jul 31 17:14:52 2024 -0600

    nan was picked up in pslv field on first pass

commit e6ad65267e79aff0c3bc5af5c399df18dfe79609
Author: alperaltuntas <[email protected]>
Date:   Sat Jul 27 02:16:22 2024 -0600

    Compute and export heat content associated with glc runoffs

commit 882d4850238b2c9b1ce81602fc68f9744a29df9d
Author: Denise Worthen <[email protected]>
Date:   Fri Jul 26 08:26:01 2024 -0400

    fix garbled print statement for scalars

    * don't print messages if nstate is not created

commit 674f026a7e3b8fa6313cd4d514c44620df7d3542
Merge: 8a30f508 45200514
Author: Denise Worthen <[email protected]>
Date:   Fri Jul 26 08:22:36 2024 -0400

    Merge remote-tracking branch 'ESCOMP/main' into HEAD

commit 452005149deea59768410c296b09b8457fd06bcd
Merge: 10ffcc82 fdb9e0e1
Author: Jim Edwards <[email protected]>
Date:   Thu Jul 25 13:59:53 2024 -0600

    Merge pull request #487 from jedwards4b/fix/aoflux_merge_error

    fix an error in the aoflux wind_gust fields

commit fdb9e0e119d14f0573b81096b1bba31566de4a77
Author: Jim Edwards <[email protected]>
Date:   Thu Jul 25 10:07:23 2024 -0600

    fix an error in the aoflux wind_gust fields

commit 10ffcc820ba1af602478c41dc51b660bcd7705fb
Merge: ce9cfe28 df41c299
Author: Jim Edwards <[email protected]>
Date:   Thu Jul 25 10:06:21 2024 -0600

    Merge pull request #485 from billsacks/declare_cnt

    Declare cnt variable needed with ESMF_AWARE_THREADING

commit 8a30f5083e4cec3747b328497e766e477badcd28
Author: denise.worthen <[email protected]>
Date:   Thu Jul 25 06:41:22 2024 -0600

    fixes from testing for ATM auxhist output

commit f62eff7b73ab0c114989062e2f739e19830ed3c6
Merge: 2bb653da ce9cfe28
Author: Denise Worthen <[email protected]>
Date:   Wed Jul 24 09:09:25 2024 -0400

    Merge remote-tracking branch 'ESCOMP/main' into feature/fixfloat4auxhist

commit ce9cfe287907720f1cf159e1f9aff68865a75c5a
Author: mvertens <[email protected]>
Date:   Fri Jul 12 20:30:24 2024 +0200

    fix bug in ocn2glc_coupling and add blom  (#484)

    * add new functionality for transferring dms,bfr,n2o and nh3 from ocn to atm (only valid for BLOM)
    * added blom configurations
    * fixed bug in that advertising for So_t_depth and So_s_depth was never happening
    * addressed issues isn PR review
    Co-authored-by: Mariana Vertenstein <[email protected]>

commit df41c29960dc9f641d434d71d45d6c2d39a64946
Author: Bill Sacks <[email protected]>
Date:   Fri Jul 12 12:08:18 2024 -0600

    Declare cnt variable needed with ESMF_AWARE_THREADING

    This was mistakenly removed in 4d9073d8 when cleaning up unused
    variables.

    Resolves ESCOMP/CMEPS#482

commit e4a5e5849abfd2164458741681b5b34f140ff13c
Author: Jim Edwards <[email protected]>
Date:   Thu Jul 11 05:57:33 2024 -0600

    make sure variables are allocated before deallocating (#480)

commit 1b8920c3bf6c64056d6c1b1b88393617de2fefa3
Merge: c2ef06d1 df46cf16
Author: Bill Sacks <[email protected]>
Date:   Wed Jul 10 10:40:07 2024 -0600

    Merge pull request #481 from billsacks/remove_negative_runoff_land_only

    Separate the control of removing negative runoff for lnd vs glc, and set default to false for glc-derived runoff

    ### Description of changes

    This is a follow-up to #471 .

    At least for now, we want the default to be to remove negative runoff for lnd-derived runoff, but NOT for glc-derived runoff. This PR implements that change. Note that this changes behavior for the correction of glc-derived runoff, but keeps the behavior the same as before for lnd-derived runoff.

    ### Specific notes

    Are changes expected to change answers? (specify if bfb, different at roundoff, more substantial): **Yes - changes answers substantially for runoff fields in some B compsets (or other configurations with both active land/river and active ocean) - but only for configurations that have glc-derived runoff; this can currently come from configurations with CISM in EVOLVE mode or DGLC (even in NOEVOLVE mode). Note that this change just undoes part of the answer changes that came from #471 .**

    Any User Interface Changes (namelist or namelist defaults changes)? Separates the namelist item remove_negative_runoff into two separate options: remove_negative_runoff_lnd and remove_negative_runoff_glc.

    ### Testing performed
    Please describe the tests along with the target model and machine(s)
    If possible, please also added hashes that were used in the testing

    Using `cesm2_3_beta17` (with CISM at `756cfa6f0514d89977d2732ad06a4d364da5d418`, mosart at mosart1.1.02, and removing the contents of `cime_config/testmods_dirs/allactive/defaultio/user_nl_mosart`: Ran three versions of `SMS_D_Ld3.f19_g17.B1850G.derecho_intel.allactive-cism-test_coupling`:
    - One with default flags
    - One with `remove_negative_runoff_glc` set to true
    - One with `remove_negative_runoff_lnd` set to false

    I checked the behavior in these in runs with dbug_flag set to 21 so I would see diagnostics of what fields were being adjusted, and confirmed that the correct fields were being operated on in all three cases.

commit df46cf16bd736d30bd18d3209721fa77a64654ac
Author: Bill Sacks <[email protected]>
Date:   Tue Jul 9 16:02:52 2024 -0600

    Separate the control of removing negative runoff for lnd vs glc

    At least for now, we want the default to be to remove negative runoff
    for lnd-derived runoff, but NOT for glc-derived runoff.

commit c2ef06d14ba74f7786aa616d3df26bda1f6c2afb
Merge: 47fb4e…
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.

3 participants